Changes for page Per A.Y.

From version 48.7
edited by Andrea Omicini
on 20/07/2023 10:34
Change comment: There is no comment for this version
To version 47.1
edited by Andrea Omicini
on 20/07/2023 10:18
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -7,7 +7,7 @@
7 7  ## years / personal
8 8  #if( $isUserSpace )
9 9   #set( $query = ", BaseObject as objPersonalCourse, LargeStringProperty as propUser
10 - where objPersonalCourse.name = doc.fullName and objPersonalCourse.className = '${mainSpace}.Personal.Class' and propUser.id.id = objPersonalCourse.id and propUser.name = 'user' and propUser.value = '$userName' " )
10 + where objPersonalCourse.name = doc.fullName and objPersonalCourse.className = '${objectSpace}.Class' and propUser.id.id = objPersonalCourse.id and propUser.name = 'user' and propUser.value = '$userName' " )
11 11   #set( $personalCourseDocs = $xwiki.searchDocuments($query) )
12 12   #if( $personalCourseDocs.size() > 0 )
13 13   #set( $personalCourseDoc = $xwiki.getDocument($personalCourseDocs[0]) )
... ... @@ -15,18 +15,18 @@
15 15   #stop
16 16   #end
17 17   #if( $personalCourseDoc.maxYears && $personalCourseDoc.maxYears != "" )
18 - #set( $maxCourseYears = $numbertool.toNumber($personalCourseDoc.display('maxYears','view')) )
18 + #set( $maxCourseYears = $personalCourseDoc.display('maxYears','view') )
19 19   #end
20 20   #if( $personalCourseDoc.firstYear && $personalCourseDoc.firstYear != "" )
21 - #set( $firstYearCourse = $numbertool.toNumber($personalCourseDoc.display('firstYear','view')) )
21 + #set( $firstYearCourse = $personalCourseDoc.display('firstYear','view') )
22 22   #end
23 23   #if( $personalCourseDoc.lastYear && $personalCourseDoc.lastYear != "" )
24 - #set( $lastYearCourse = $numbertool.toNumber($personalCourseDoc.display('lastYear','view')) )
24 + #set( $lastYearCourse = $personalCourseDoc.display('lastYear','view') )
25 25   #end
26 26  #end
27 27  ## years / parameters takes precedence
28 -#set( $firstYear = $numbertool.toNumber($firstYearCourse) )
29 -#set( $lastYear = $numbertool.toNumber($lastYearCourse) )
28 +#set( $firstYear = $firstYearCourse )
29 +#set( $lastYear = $lastYearCourse )
30 30  #template('apice_year_param.vm')
31 31  ##
32 32  ## DATA STRUCTURES / START
... ... @@ -37,7 +37,7 @@
37 37   #set( $year1 = $year + 1 )
38 38   #set( $ayear = $year + "/" + $year1 )
39 39   #set( $query = ", BaseObject as objCourse, StringProperty as propYear, LargeStringProperty as propProfessor, LargeStringProperty as propOtherprofessors, LargeStringProperty as propTutors
40 - where objCourse.name = doc.fullName and objCourse.className = '${mainSpace}.Class' and objCourse.name <> '${objectPool}.Template' and propYear.id.id = objCourse.id and propProfessor.id.id = objCourse.id and propOtherprofessors.id.id = objCourse.id and propTutors.id.id = objCourse.id and propYear.name = 'ay' and propProfessor.name = 'professor' and propOtherprofessors.name = 'otherProfessors' and propTutors.name = 'tutors' and propYear.value = '$ayear' #if( $oneUser )and ( propProfessor.value like '%$userName%' or propOtherprofessors.value like '%$userName%' or propTutors.value like '%$userName%' )#end ")
40 + where objCourse.name = doc.fullName and objCourse.className = '${objectSpace}.${objectClass}' and objCourse.name <> '${objectSpace}.${objectTemplate}' and propYear.id.id = objCourse.id and propProfessor.id.id = objCourse.id and propOtherprofessors.id.id = objCourse.id and propTutors.id.id = objCourse.id and propYear.name = 'ay' and propProfessor.name = 'professor' and propOtherprofessors.name = 'otherProfessors' and propTutors.name = 'tutors' and propYear.value = '$ayear' #if( $oneUser )and ( propProfessor.value like '%$userName%' or propOtherprofessors.value like '%$userName%' or propTutors.value like '%$userName%' )#end ")
41 41  ## execute query
42 42   #set( $itemFound = $xwiki.searchDocuments($query) )
43 43  ## set counters
... ... @@ -60,15 +60,9 @@
60 60  #end
61 61  <span class="textsecondary">&ensp;/&ensp;</span>
62 62  #if( $oneYear )
63 - #set( $year1 = $year + 1 )
64 - #set( $ayear = $year + "/" + $year1 )
65 - $ayear
63 + $year
66 66  #else
67 - #set( $firstYear1 = $firstYear + 1 )
68 - #set( $lastYear1 = $lastYear + 1 )
69 - #set( $aFirstYear = $firstYear + "/" + $firstYear1 )
70 - #set( $aLastYear = $lastYear + "/" + $lastYear1 )
71 - $aFirstYear<span class="textsecondary">&ensp;&mdash;&ensp;</span>$aLastYear
65 + $firstYear–$lastYear
72 72  #end
73 73  #if( $oneUser )
74 74   <span class="textsecondary">&ensp;/&ensp;</span>