Changes for page Per Year

From version 88.1
edited by Andrea Omicini
on 29/10/2021 15:50
Change comment: There is no comment for this version
To version 90.1
edited by Andrea Omicini
on 29/10/2021 16:06
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -6,8 +6,8 @@
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 12  #if( $yearPar > 0 )
13 13   #set( $oneYear = true )
... ... @@ -15,7 +15,7 @@
15 15   #set( $lastYear = $toPar )
16 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
... ... @@ -26,6 +26,7 @@
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,29 +32,13 @@
32 32  #end
33 33  $oneYear
34 34  $yearList
35 -#stop
36 -##check velocity variable, takes precedence
37 -#if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) )
38 - #set( $oneStatus = true )
39 - #set( $selectedStatus = $thesisStatus.trim().toLowerCase() )
40 -#end
41 -## set ordering field
42 -#if( $selectedStatus == "available" )
43 - #set( $orderingDateFieldName = "availabilityDate" )
44 -#elseif( $selectedStatus == "ongoing" )
45 - #set( $orderingDateFieldName = "startDate" )
46 -#else
47 -## default for no selected status, too
48 - #set( $orderingDateFieldName = "endDate" )
49 -#end
50 -## invariant: $oneStatus set, $selectedStatus & $orderingDateFieldName set accordingly
51 -### END STATUS
36 +### END YEAR
52 52  ##
53 -### START USER & ROLE
38 +### START USER & CYCLE
54 54  #set( $userNamePar = $request.user.trim() )
55 55  ## default values
56 56  #set( $oneUser = false )
57 -#set( $oneRole = false )
42 +#set( $oneCycle = false )
58 58  #set( $userFirstName = "" )
59 59  #set( $userLastName = "" )
60 60  #if( $userName || $userNamePar )
... ... @@ -74,18 +74,20 @@
74 74   #stop
75 75   #end
76 76  ##user selected and existing user page
77 - #set( $rolePar = $request.role.trim().toLowerCase() )
78 - #set( $selectedRole = '' )
79 - #if( $rolePar != '' && $allThesisRoles.contains($rolePar) )
80 - #set( $oneRole = true )
81 - #set( $selectedRole = $rolePar )
62 + #set( $cyclePar = $request.cycle.trim().toLowerCase() )
63 + #set( $selectedCycle = '' )
64 + #if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) )
65 + #set( $oneCycle = true )
66 + #set( $selectedCycle = $cyclePar )
82 82   #end
83 83  #end
84 -## $oneUser and $oneRole set properly, other related variables set accordingly
85 -## $oneRole has meaning only if $oneUser
86 -## if $oneUser, $oneRole false means one user for all roles
87 -## if $oneUser, $oneRole true means one specific role for one user selected
88 -## 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
73 +#stop
74 +
75 +
89 89  ##
90 90  ## title
91 91  >#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'/}}