Changes for page Per A.Y.

From version 51.1
edited by Andrea Omicini
on 26/07/2023 06:26
Change comment: There is no comment for this version
To version 48.3
edited by Andrea Omicini
on 20/07/2023 10:26
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,8 +1,6 @@
1 1  {{velocity}}
2 2  {{html clean="false" wiki="true"}}
3 3  #template('apice_macros.vm')
4 -#nodoclang()
5 -#nolangpar()
6 6  #setobjectspace("Courses")
7 7  #template('apice_course_macros.vm')
8 8  #template('apice_user_param.vm')
... ... @@ -17,18 +17,18 @@
17 17   #stop
18 18   #end
19 19   #if( $personalCourseDoc.maxYears && $personalCourseDoc.maxYears != "" )
20 - #set( $maxCourseYears = $numbertool.toNumber($personalCourseDoc.display('maxYears','view')) )
18 + #set( $maxCourseYears = $personalCourseDoc.display('maxYears','view') )
21 21   #end
22 22   #if( $personalCourseDoc.firstYear && $personalCourseDoc.firstYear != "" )
23 - #set( $firstYearCourse = $numbertool.toNumber($personalCourseDoc.display('firstYear','view')) )
21 + #set( $firstYearCourse = $personalCourseDoc.display('firstYear','view') )
24 24   #end
25 25   #if( $personalCourseDoc.lastYear && $personalCourseDoc.lastYear != "" )
26 - #set( $lastYearCourse = $numbertool.toNumber($personalCourseDoc.display('lastYear','view')) )
24 + #set( $lastYearCourse = $personalCourseDoc.display('lastYear','view') )
27 27   #end
28 28  #end
29 29  ## years / parameters takes precedence
30 -#set( $firstYear = $numbertool.toNumber($firstYearCourse) )
31 -#set( $lastYear = $numbertool.toNumber($lastYearCourse) )
28 +#set( $firstYear = $firstYearCourse )
29 +#set( $lastYear = $lastYearCourse )
32 32  #template('apice_year_param.vm')
33 33  ##
34 34  ## DATA STRUCTURES / START
... ... @@ -35,7 +35,7 @@
35 35  #set( $itemMap = {} )
36 36  #set( $itemNo = 0 )
37 37  ## cycle over years
38 -#foreach( $year in $yearList )
36 +#foreach( $year in $yearList)
39 39   #set( $year1 = $year + 1 )
40 40   #set( $ayear = $year + "/" + $year1 )
41 41   #set( $query = ", BaseObject as objCourse, StringProperty as propYear, LargeStringProperty as propProfessor, LargeStringProperty as propOtherprofessors, LargeStringProperty as propTutors
... ... @@ -66,11 +66,7 @@
66 66   #set( $ayear = $year + "/" + $year1 )
67 67   $ayear
68 68  #else
69 - #set( $firstYear1 = $firstYear + 1 )
70 - #set( $lastYear1 = $lastYear + 1 )
71 - #set( $aFirstYear = $firstYear + "/" + $firstYear1 )
72 - #set( $aLastYear = $lastYear + "/" + $lastYear1 )
73 - $aFirstYear<span class="textsecondary">&ensp;&mdash;&ensp;</span>$aLastYear
67 + $firstYear–$lastYear
74 74  #end
75 75  #if( $oneUser )
76 76   <span class="textsecondary">&ensp;/&ensp;</span>
... ... @@ -112,7 +112,7 @@
112 112  ## year display / start
113 113  <div style="font-style: normal"><ul>
114 114   #foreach( $item in $itemMap[$year] )
115 -<li>#courselinked($item)</li>
109 +<li>{{course}}$item{{/course}}</li>
116 116   #end
117 117  </ul></div>
118 118  ## year display / end