Changes for page Per Year

From version 112.1
edited by Andrea Omicini
on 30/10/2021 17:32
Change comment: There is no comment for this version
To version 109.1
edited by Andrea Omicini
on 30/10/2021 17:27
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -43,7 +43,6 @@
43 43   #set( $yearList = [$lastYear..$firstYear] )
44 44   #end
45 45  #end
46 -## $selectedYear, $yearList and $oneYear set properly
47 47  ### END YEAR
48 48  ##
49 49  ### START USER
... ... @@ -73,37 +73,30 @@
73 73   #stop
74 74   #end
75 75  #end
76 -## $selectedUser and $oneUser set properly
77 77  ### END USER
78 -##
76 +##if user selected, existing user page
79 79  ### START CYCLE
80 80  #set( $oneCycle = false )
81 81  #set( $selectedCycle = '' )
82 -## cycle parameter
83 83  #if( $request.cycle )
84 84   #set( $cyclePar = $request.cycle.trim().toUpperCase() )
82 + $cyclePar
85 85  #end
86 -## set cycle
87 87  #if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) )
88 88   #set( $oneCycle = true )
89 89   #set( $selectedCycle = $cyclePar )
90 90  #end
91 -## $selectedCycle and $oneCycle set properly
92 -### END CYCLE
88 +## $oneUser and $oneCycle set properly
89 +$yearList
93 93  #if( $oneYear )
94 94   $selectedYear
95 -#else
96 - $yearList
97 97  #end
98 98  #if( $oneUser )
99 99   $selectedUser
100 -#else
101 - ALL USERS
102 102  #end
103 103  #if( $oneCycle )
104 104   $selectedCycle
105 -#else
106 - ALL USERS
98 + {{thesisCycle short='no'}}$selectedCycle{{/thesisCycle}}
107 107  #end
108 108  ### END USER & CYCLE
109 109  ##