Changes for page Per Year

From version 85.1
edited by Andrea Omicini
on 29/10/2021 15:48
Change comment: There is no comment for this version
To version 95.1
edited by Andrea Omicini
on 29/10/2021 16:17
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) )$firstYear
10 -#set( $lastYear = $mathtool.toInteger($lastYearTh) )$lastYear
9 +#set( $firstYear = $mathtool.toInteger($firstYearTh) )
10 +#set( $lastYear = $mathtool.toInteger($lastYearTh) )
11 11  #set( $yearList = [$lastYear..$firstYear] )
12 -#if( $yearPar > 0 )ONE YEAR
12 +#if( $yearPar > 0 )
13 13   #set( $oneYear = true )
14 14   #set( $firstYear = $yearPar )
15 15   #set( $lastYear = $toPar )
16 - #set( $yearList = [$yearPar] )$yearList
16 + #set( $yearList = [$yearPar] )
17 17  #else
18 - #if( $fromPar != '' && $fromPar > $firstYear )
18 + #if( $fromPar != '' && ($fromPar > $firstYear) )
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,33 +26,20 @@
26 26   #if( $lastYear <= $firstYear )
27 27   #set( $oneYear = true )
28 28   #set( $selectedYear = $firstYear )
29 + #set( $yearList = [$firstYear] )
29 29   #else
30 30   #set( $yearList = [$lastYear..$firstYear] )
31 31   #end
32 32  #end
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
34 +$oneYear
35 +$yearList
36 +### END YEAR
50 50  ##
51 -### START USER & ROLE
38 +### START USER & CYCLE
52 52  #set( $userNamePar = $request.user.trim() )
53 53  ## default values
54 54  #set( $oneUser = false )
55 -#set( $oneRole = false )
42 +#set( $oneCycle = false )
56 56  #set( $userFirstName = "" )
57 57  #set( $userLastName = "" )
58 58  #if( $userName || $userNamePar )
... ... @@ -72,21 +72,24 @@
72 72   #stop
73 73   #end
74 74  ##user selected and existing user page
75 - #set( $rolePar = $request.role.trim().toLowerCase() )
76 - #set( $selectedRole = '' )
77 - #if( $rolePar != '' && $allThesisRoles.contains($rolePar) )
78 - #set( $oneRole = true )
79 - #set( $selectedRole = $rolePar )
62 + #set( $cyclePar = $request.cycle.trim().toUpperCase() )
63 + #set( $selectedCycle = '' )
64 + #if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) )
65 + #set( $oneCycle = true )
66 + #set( $selectedCycle = $cyclePar )
80 80   #end
81 81  #end
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
69 +## $oneUser and $oneCycle set properly
70 +$oneUser
71 +$oneCycle
72 +### END USER & CYCLE
87 87  ##
88 88  ## title
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'/}}
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 +
90 90  ## index
91 91  #if( !$oneStatus )
92 92  (% 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)))