Changes for page Per A.Y.

From version 48.1
edited by Andrea Omicini
on 20/07/2023 10:19
Change comment: There is no comment for this version
To version 48.6
edited by Andrea Omicini
on 20/07/2023 10:33
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 = '${objectSpace}.Class' and propUser.id.id = objPersonalCourse.id and propUser.name = 'user' and propUser.value = '$userName' " )
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' " )
11 11   #set( $personalCourseDocs = $xwiki.searchDocuments($query) )
12 12   #if( $personalCourseDocs.size() > 0 )
13 13   #set( $personalCourseDoc = $xwiki.getDocument($personalCourseDocs[0]) )
... ... @@ -21,7 +21,7 @@
21 21   #set( $firstYearCourse = $personalCourseDoc.display('firstYear','view') )
22 22   #end
23 23   #if( $personalCourseDoc.lastYear && $personalCourseDoc.lastYear != "" )
24 - #set( $lastYearCourse = $personalCourseDoc.display('lastYear','view') )
24 + #set( $lastYearCourse = $numbertool.toNumber($personalCourseDoc.display('lastYear','view')) )
25 25   #end
26 26  #end
27 27  ## years / parameters takes precedence
... ... @@ -60,9 +60,15 @@
60 60  #end
61 61  <span class="textsecondary">&ensp;/&ensp;</span>
62 62  #if( $oneYear )
63 - $year
63 + #set( $year1 = $year + 1 )
64 + #set( $ayear = $year + "/" + $year1 )
65 + $ayear
64 64  #else
65 - $firstYear–$lastYear
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
66 66  #end
67 67  #if( $oneUser )
68 68   <span class="textsecondary">&ensp;/&ensp;</span>