Changes for page Per Year

From version 104.1
edited by Andrea Omicini
on 30/10/2021 17:12
Change comment: There is no comment for this version
To version 111.1
edited by Andrea Omicini
on 30/10/2021 17:31
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 )
... ... @@ -34,17 +34,21 @@
34 34   #set( $yearList = [$lastYear..$firstYear] )
35 35   #end
36 36  #end
46 +## $selectedYear, $yearList and $oneYear set properly
37 37  ### END YEAR
38 38  ##
39 -### START USER & CYCLE
40 -#set( $userNamePar = $request.user.trim() )
49 +### START USER
41 41  ## default values
42 42  #set( $oneUser = false )
43 -#set( $oneCycle = false )
52 +#set( $selectedUser = '' )
44 44  #set( $userFirstName = "" )
45 45  #set( $userLastName = "" )
55 +## user parameter
56 +#if( $request.user )
57 + #set( $userNamePar = $request.user.trim() )
58 +#end
46 46  #if( $userName || $userNamePar )
47 -## a user is specified for all roles
60 +## try to specify a user
48 48   #if( !$userName )
49 49   #set( $selectedUser = "XWiki.$userNamePar" )
50 50   #else
... ... @@ -59,25 +59,39 @@
59 59  {{warning}} $selectedUser is not an {{apice/}} user{{/warning}}
60 60   #stop
61 61   #end
62 -##user selected and existing user page
75 +#end
76 +## $selectedUser and $oneUser set properly
77 +### END USER
78 +##
79 +### START CYCLE
80 +#set( $oneCycle = false )
81 +#set( $selectedCycle = '' )
82 +## cycle parameter
83 +#if( $request.cycle )
63 63   #set( $cyclePar = $request.cycle.trim().toUpperCase() )
64 - #set( $selectedCycle = '' )
65 - #if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) )
66 - #set( $oneCycle = true )yeaaaa
67 - #set( $selectedCycle = $cyclePar )
68 - #end
69 69  #end
70 -## $oneUser and $oneCycle set properly
86 +## set cycle
87 +#if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) )
88 + #set( $oneCycle = true )
89 + #set( $selectedCycle = $cyclePar )
90 +#end
91 +## $selectedCycle and $oneCycle set properly
92 +### END CYCLE
71 71  $yearList
72 72  #if( $oneYear )
73 73   $selectedYear
96 +#else
97 + $yearList
74 74  #end
75 75  #if( $oneUser )
76 76   $selectedUser
101 +#else
102 + ALL USERS
77 77  #end
78 78  #if( $oneCycle )
79 79   $selectedCycle
80 - {{thesisCycle short='no'}}$selectedCycle{{/thesisCycle}}
106 +#else
107 + ALL USERS
81 81  #end
82 82  ### END USER & CYCLE
83 83  ##