Changes for page Per Year

From version 103.4
edited by Andrea Omicini
on 30/10/2021 17:10
Change comment: There is no comment for this version
To version 108.1
edited by Andrea Omicini
on 30/10/2021 17:24
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,15 +1,24 @@
1 1  {{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
2 2  #set( $thesisMenu = true )
3 -#set( $oneYear = false )
4 -#set( $selectedYear = '' )
5 -### START YEAR
6 -## year parameter
7 -#set( $yearPar = $mathtool.toInteger($request.year) )
8 -#set( $fromPar = $mathtool.toInteger($request.from) )
9 -#set( $toPar = $mathtool.toInteger($request.to) )
3 +## get environment variables & derived
10 10  #set( $firstYear = $mathtool.toInteger($firstYearTh) )
11 11  #set( $lastYear = $mathtool.toInteger($lastYearTh) )
12 12  #set( $yearList = [$lastYear..$firstYear] )
7 +### START YEAR
8 +## defaults
9 +#set( $oneYear = false )
10 +#set( $selectedYear = '' )
11 +## year parameters
12 +#if( $request.year )
13 + #set( $yearPar = $mathtool.toInteger($request.year) )
14 +#end
15 +#if( $request.from )
16 + #set( $fromPar = $mathtool.toInteger($request.from) )
17 +#end
18 +#if( $request.to )
19 + #set( $toPar = $mathtool.toInteger($request.to) )
20 +#end
21 +##set years
13 13  #if( $yearPar > 0 )
14 14   #set( $oneYear = true )
15 15   #set( $firstYear = $yearPar )
... ... @@ -37,12 +37,15 @@
37 37  ### END YEAR
38 38  ##
39 39  ### START USER & CYCLE
40 -#set( $userNamePar = $request.user.trim() )
41 41  ## default values
42 42  #set( $oneUser = false )
43 -#set( $oneCycle = false )
51 +#set( $selectedUser = '' )
44 44  #set( $userFirstName = "" )
45 45  #set( $userLastName = "" )
54 +## user parameter
55 +#if( $request.user )
56 + #set( $userNamePar = $request.user.trim() )
57 +#end
46 46  #if( $userName || $userNamePar )
47 47  ## a user is specified for all roles
48 48   #if( !$userName )
... ... @@ -59,14 +59,15 @@
59 59  {{warning}} $selectedUser is not an {{apice/}} user{{/warning}}
60 60   #stop
61 61   #end
62 -##user selected and existing user page
63 - #set( $cyclePar = $request.cycle.trim().toUpperCase() )
64 - #set( $selectedCycle = '' )
65 - #if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) )
66 - #set( $oneCycle = true )
67 - #set( $selectedCycle = $cyclePar )
68 - #end
69 69  #end
75 +##if user selected, existing user page
76 +#set( $oneCycle = false )
77 +#set( $selectedCycle = '' )
78 +#set( $cyclePar = $request.cycle.trim().toUpperCase() )
79 +#if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) )
80 + #set( $oneCycle = true )
81 + #set( $selectedCycle = $cyclePar )
82 +#end
70 70  ## $oneUser and $oneCycle set properly
71 71  $yearList
72 72  #if( $oneYear )
... ... @@ -77,6 +77,7 @@
77 77  #end
78 78  #if( $oneCycle )
79 79   $selectedCycle
93 + {{thesisCycle short='no'}}$selectedCycle{{/thesisCycle}}
80 80  #end
81 81  ### END USER & CYCLE
82 82  ##