Changes for page Per Year

From version 90.3
edited by Andrea Omicini
on 29/10/2021 16:08
Change comment: There is no comment for this version
To version 75.1
edited by Andrea Omicini
on 29/10/2021 15:32
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -3,23 +3,21 @@
3 3  #set( $oneYear = false )
4 4  ### START YEAR
5 5  ## year parameter
6 -#set( $yearPar = $mathtool.toInteger($request.year) )
7 -#set( $fromPar = $mathtool.toInteger($request.from) )
8 -#set( $toPar = $mathtool.toInteger($request.to) )
6 +#set( $yearPar = $mathtool.toInteger($request.year) )$yearPar
7 +#set( $fromPar = $mathtool.toInteger($request.from) )$fromPar
8 +#set( $toPar = $mathtool.toInteger($request.to) )$toPar
9 9  #set( $firstYear = $mathtool.toInteger($firstYearTh) )
10 10  #set( $lastYear = $mathtool.toInteger($lastYearTh) )
11 11  #set( $yearList = [$lastYear..$firstYear] )
12 -#if( $yearPar > 0 )
12 +#if( $yearPar != '' )
13 13   #set( $oneYear = true )
14 - #set( $firstYear = $yearPar )
15 - #set( $lastYear = $toPar )
16 - #set( $yearList = [$yearPar] )
14 + #set( $selectedYear = $yearPar )
17 17  #else
18 - #if( $fromPar != '' && ($fromPar > $firstYear) )
16 + #if( $fromPar != '' && $yearList.contains($fromPar) )
19 19   #set( $firstYear = $fromPar )
20 20   #set( $yearList = [$lastYear..$firstYear] )
21 21   #end
22 - #if( $toPar != '' && ($toPar < $lastYear) )
20 + #if( $toPar != '' && $yearList.contains($toPar) )
23 23   #set( $lastYear = $toPar )
24 24   #set( $yearList = [$lastYear..$firstYear] )
25 25   #end
... ... @@ -26,20 +26,38 @@
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 34  $oneYear
32 +$selectedYear
33 +$firstYear
34 +$lastYear
35 35  $yearList
36 -### END YEAR
36 +#stop
37 +##check velocity variable, takes precedence
38 +#if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) )
39 + #set( $oneStatus = true )
40 + #set( $selectedStatus = $thesisStatus.trim().toLowerCase() )
41 +#end
42 +## set ordering field
43 +#if( $selectedStatus == "available" )
44 + #set( $orderingDateFieldName = "availabilityDate" )
45 +#elseif( $selectedStatus == "ongoing" )
46 + #set( $orderingDateFieldName = "startDate" )
47 +#else
48 +## default for no selected status, too
49 + #set( $orderingDateFieldName = "endDate" )
50 +#end
51 +## invariant: $oneStatus set, $selectedStatus & $orderingDateFieldName set accordingly
52 +### END STATUS
37 37  ##
38 -### START USER & CYCLE
54 +### START USER & ROLE
39 39  #set( $userNamePar = $request.user.trim() )
40 40  ## default values
41 41  #set( $oneUser = false )
42 -#set( $oneCycle = false )
58 +#set( $oneRole = false )
43 43  #set( $userFirstName = "" )
44 44  #set( $userLastName = "" )
45 45  #if( $userName || $userNamePar )
... ... @@ -59,20 +59,18 @@
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 )
78 + #set( $rolePar = $request.role.trim().toLowerCase() )
79 + #set( $selectedRole = '' )
80 + #if( $rolePar != '' && $allThesisRoles.contains($rolePar) )
81 + #set( $oneRole = true )
82 + #set( $selectedRole = $rolePar )
67 67   #end
68 68  #end
69 -## $oneUser and $oneCycle set properly
70 -$oneUser
71 -$oneCycle
72 -### END USER & CYCLE
73 -#stop
74 -
75 -
85 +## $oneUser and $oneRole set properly, other related variables set accordingly
86 +## $oneRole has meaning only if $oneUser
87 +## if $oneUser, $oneRole false means one user for all roles
88 +## if $oneUser, $oneRole true means one specific role for one user selected
89 +## if $oneUser is false, $oneRole means nothing -- so all users, all roles / just status
76 76  ##
77 77  ## title
78 78  >#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'/}}