Changes for page Per A.Y.

From version 48.8
edited by Andrea Omicini
on 20/07/2023 10:35
Change comment: There is no comment for this version
To version 48.2
edited by Andrea Omicini
on 20/07/2023 10:21
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -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
... ... @@ -33,7 +33,7 @@
33 33  #set( $itemMap = {} )
34 34  #set( $itemNo = 0 )
35 35  ## cycle over years
36 -#foreach( $year in $yearList )
36 +#foreach( $year in $yearList)
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
... ... @@ -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>