Changes for page Per Year

From version 111.1
edited by Andrea Omicini
on 30/10/2021 17:31
Change comment: There is no comment for this version
To version 104.1
edited by Andrea Omicini
on 30/10/2021 17:12
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,24 +1,15 @@
1 1  {{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
2 2  #set( $thesisMenu = true )
3 -## get environment variables & derived
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) )
4 4  #set( $firstYear = $mathtool.toInteger($firstYearTh) )
5 5  #set( $lastYear = $mathtool.toInteger($lastYearTh) )
6 6  #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
22 22  #if( $yearPar > 0 )
23 23   #set( $oneYear = true )
24 24   #set( $firstYear = $yearPar )
... ... @@ -43,21 +43,17 @@
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 -### START USER
39 +### START USER & CYCLE
40 +#set( $userNamePar = $request.user.trim() )
50 50  ## default values
51 51  #set( $oneUser = false )
52 -#set( $selectedUser = '' )
43 +#set( $oneCycle = false )
53 53  #set( $userFirstName = "" )
54 54  #set( $userLastName = "" )
55 -## user parameter
56 -#if( $request.user )
57 - #set( $userNamePar = $request.user.trim() )
58 -#end
59 59  #if( $userName || $userNamePar )
60 -## try to specify a user
47 +## a user is specified for all roles
61 61   #if( !$userName )
62 62   #set( $selectedUser = "XWiki.$userNamePar" )
63 63   #else
... ... @@ -72,39 +72,25 @@
72 72  {{warning}} $selectedUser is not an {{apice/}} user{{/warning}}
73 73   #stop
74 74   #end
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 )
62 +##user selected and existing user page
84 84   #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
85 85  #end
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
70 +## $oneUser and $oneCycle set properly
93 93  $yearList
94 94  #if( $oneYear )
95 95   $selectedYear
96 -#else
97 - $yearList
98 98  #end
99 99  #if( $oneUser )
100 100   $selectedUser
101 -#else
102 - ALL USERS
103 103  #end
104 104  #if( $oneCycle )
105 105   $selectedCycle
106 -#else
107 - ALL USERS
80 + {{thesisCycle short='no'}}$selectedCycle{{/thesisCycle}}
108 108  #end
109 109  ### END USER & CYCLE
110 110  ##