Changes for page Per Year

From version 91.1
edited by Andrea Omicini
on 29/10/2021 16:13
Change comment: There is no comment for this version
To version 86.1
edited by Andrea Omicini
on 29/10/2021 15:48
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -6,20 +6,20 @@
6 6  #set( $yearPar = $mathtool.toInteger($request.year) )
7 7  #set( $fromPar = $mathtool.toInteger($request.from) )
8 8  #set( $toPar = $mathtool.toInteger($request.to) )
9 -#set( $firstYear = $mathtool.toInteger($firstYearTh) )
10 -#set( $lastYear = $mathtool.toInteger($lastYearTh) )
9 +#set( $firstYear = $mathtool.toInteger($firstYearTh) )$firstYear
10 +#set( $lastYear = $mathtool.toInteger($lastYearTh) )$lastYear
11 11  #set( $yearList = [$lastYear..$firstYear] )
12 12  #if( $yearPar > 0 )
13 13   #set( $oneYear = true )
14 14   #set( $firstYear = $yearPar )
15 15   #set( $lastYear = $toPar )
16 - #set( $yearList = [$yearPar] )
16 + #set( $yearList = [$yearPar] )$yearList
17 17  #else
18 - #if( $fromPar != '' && ($fromPar > $firstYear) )
18 + #if( $fromPar != '' && ($fromPar > $firstYear) )GT
19 19   #set( $firstYear = $fromPar )
20 20   #set( $yearList = [$lastYear..$firstYear] )
21 21   #end
22 - #if( $toPar != '' && ($toPar < $lastYear) )
22 + #if( $toPar != '' && $toPar > $lastYear)
23 23   #set( $lastYear = $toPar )
24 24   #set( $yearList = [$lastYear..$firstYear] )
25 25   #end
... ... @@ -26,20 +26,33 @@
26 26   #if( $lastYear <= $firstYear )
27 27   #set( $oneYear = true )
28 28   #set( $selectedYear = $firstYear )
29 - #set( $yearList = [$firstYear] )
30 30   #else
31 31   #set( $yearList = [$lastYear..$firstYear] )
32 32   #end
33 33  #end
34 -$oneYear
35 -$yearList
36 -### END YEAR
33 +#stop
34 +##check velocity variable, takes precedence
35 +#if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) )
36 + #set( $oneStatus = true )
37 + #set( $selectedStatus = $thesisStatus.trim().toLowerCase() )
38 +#end
39 +## set ordering field
40 +#if( $selectedStatus == "available" )
41 + #set( $orderingDateFieldName = "availabilityDate" )
42 +#elseif( $selectedStatus == "ongoing" )
43 + #set( $orderingDateFieldName = "startDate" )
44 +#else
45 +## default for no selected status, too
46 + #set( $orderingDateFieldName = "endDate" )
47 +#end
48 +## invariant: $oneStatus set, $selectedStatus & $orderingDateFieldName set accordingly
49 +### END STATUS
37 37  ##
38 -### START USER & CYCLE
51 +### START USER & ROLE
39 39  #set( $userNamePar = $request.user.trim() )
40 40  ## default values
41 41  #set( $oneUser = false )
42 -#set( $oneCycle = false )
55 +#set( $oneRole = false )
43 43  #set( $userFirstName = "" )
44 44  #set( $userLastName = "" )
45 45  #if( $userName || $userNamePar )
... ... @@ -59,24 +59,21 @@
59 59   #stop
60 60   #end
61 61  ##user selected and existing user page
62 - #set( $cyclePar = $request.cycle.trim().toUpperCase() )
63 - #set( $selectedCycle = '' )
64 - #if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) )
65 - #set( $oneCycle = true )
66 - #set( $selectedCycle = $cyclePar )
75 + #set( $rolePar = $request.role.trim().toLowerCase() )
76 + #set( $selectedRole = '' )
77 + #if( $rolePar != '' && $allThesisRoles.contains($rolePar) )
78 + #set( $oneRole = true )
79 + #set( $selectedRole = $rolePar )
67 67   #end
68 68  #end
69 -## $oneUser and $oneCycle set properly
70 -$oneUser
71 -$oneCycle
72 -### END USER & CYCLE
82 +## $oneUser and $oneRole set properly, other related variables set accordingly
83 +## $oneRole has meaning only if $oneUser
84 +## if $oneUser, $oneRole false means one user for all roles
85 +## if $oneUser, $oneRole true means one specific role for one user selected
86 +## if $oneUser is false, $oneRole means nothing -- so all users, all roles / just status
73 73  ##
74 74  ## title
75 ->if( $oneRole ){{thesisCycle short='no'}}$selecteCycle{{/thesisCycle}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end / #if( $oneYear )$selectedYear#else$firstYear—$lastYear#end#if( $oneUser ) / $userFirstName **$userLastName**#end#{{id name='top'/}}
76 -
77 -#stop
78 -
79 -
89 +>#if( $oneStatus ){{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/thesisStatus}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end#if( $oneUser ) / $userFirstName **$userLastName**#end#if( $oneRole ) / {{thesisRole short='yes'}}$selectedRole{{/thesisRole}}#end{{id name='top'/}}
80 80  ## index
81 81  #if( !$oneStatus )
82 82  (% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $status in $allThesisStatuses )#if ($velocityCount > 1) | #end[[{{thesisStatus plural="true" uppercase="false"}}$status{{/thesisStatus}}>>||anchor="$status"]]#end)))