Changes for page Per Year

From version 89.2
edited by Andrea Omicini
on 29/10/2021 15:53
Change comment: There is no comment for this version
To version 96.3
edited by Andrea Omicini
on 30/10/2021 16:14
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,6 +1,7 @@
1 1  {{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
2 2  #set( $thesisMenu = true )
3 3  #set( $oneYear = false )
4 +#set( $selectedYear = '' )
4 4  ### START YEAR
5 5  ## year parameter
6 6  #set( $yearPar = $mathtool.toInteger($request.year) )
... ... @@ -12,7 +12,8 @@
12 12  #if( $yearPar > 0 )
13 13   #set( $oneYear = true )
14 14   #set( $firstYear = $yearPar )
15 - #set( $lastYear = $toPar )
16 + #set( $lastYear = $yearPar )
17 + #set( $selectedYear = $yearPar )
16 16   #set( $yearList = [$yearPar] )
17 17  #else
18 18   #if( $fromPar != '' && ($fromPar > $firstYear) )
... ... @@ -25,6 +25,7 @@
25 25   #end
26 26   #if( $lastYear <= $firstYear )
27 27   #set( $oneYear = true )
30 + #set( $lastYear = $firstYear )
28 28   #set( $selectedYear = $firstYear )
29 29   #set( $yearList = [$firstYear] )
30 30   #else
... ... @@ -33,29 +33,13 @@
33 33  #end
34 34  $oneYear
35 35  $yearList
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
39 +### END YEAR
53 53  ##
54 -### START USER & ROLE
41 +### START USER & CYCLE
55 55  #set( $userNamePar = $request.user.trim() )
56 56  ## default values
57 57  #set( $oneUser = false )
58 -#set( $oneRole = false )
45 +#set( $oneCycle = false )
59 59  #set( $userFirstName = "" )
60 60  #set( $userLastName = "" )
61 61  #if( $userName || $userNamePar )
... ... @@ -75,41 +75,42 @@
75 75   #stop
76 76   #end
77 77  ##user selected and existing user page
78 - #set( $rolePar = $request.role.trim().toLowerCase() )
79 - #set( $selectedRole = '' )
80 - #if( $rolePar != '' && $allThesisRoles.contains($rolePar) )
81 - #set( $oneRole = true )
82 - #set( $selectedRole = $rolePar )
65 + #set( $cyclePar = $request.cycle.trim().toUpperCase() )
66 + #set( $selectedCycle = '' )
67 + #if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) )
68 + #set( $oneCycle = true )
69 + #set( $selectedCycle = $cyclePar )
83 83   #end
84 84  #end
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
72 +## $oneUser and $oneCycle set properly
73 +$oneUser
74 +$oneCycle
75 +### END USER & CYCLE
90 90  ##
91 91  ## title
92 ->#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'/}}
78 +>#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'/}}
93 93  ## index
94 -#if( !$oneStatus )
95 -(% 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)))
96 -#elseif( $oneUser && !$oneRole )
97 -(% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $role in $allThesisRoles )#if ($velocityCount > 1) | #end [[{{thesisRole}}$role{{/thesisRole}}>>||anchor="$role"]]#end)))
80 +#if( !$oneYear )
81 +(% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $year in $yearList )#if ($velocityCount > 1) | #end[[$year>>||anchor="$year"]]#end)))
82 +###elseif( $oneUser && !$oneCycle )
83 +#elseif( !$oneCycle )
84 +(% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $cycle in $allThesisCycles )#if ($velocityCount > 1) | #end [[{{thesisCycle}}$cycle{{/thesisCycle}}>>||anchor="$cycle"]]#end)))
98 98  #end{{id name='index'/}}
86 +
87 +#stop
88 +
99 99  ## search theses
100 100  #set( $thesisNo = 0 )
101 -#foreach( $status in $allThesisStatuses )
102 - #if( !$oneStatus || $selectedStatus == $status )
103 - #set( $thesisStatusNo = 0 )
104 - #if( !$oneStatus )
105 -(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$status'/}}{{thesisStatus plural='true' uppercase='true' short='true'}}$status{{/thesisStatus}}
91 +#foreach( $year in $yearList )
92 + #if( !$oneYear || $selectedYear == $year )
93 + #set( $thesisYearNo = 0 )
94 + #if( !$oneYear )
95 +(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}$year
106 106   #end
107 -## some selected status or all statuses / now $status
108 - #if( $oneUser )
109 -## some user selected
110 - #foreach( $role in $allThesisRoles )
111 - #set( $thesisStatusRoleNo = 0 )
112 - #if( !$oneRole || $selectedRole == $role )
97 +## some selected year or year list / now $year
98 + #foreach( $cycle in $allThesisCycles )
99 + #set( $thesisYearCycleNo = 0 )
100 + #if( !$oneCycle || $selectedCycle == $cycle )
113 113   #if( $role == "contact" )
114 114   #set( $selectedRoleFieldName = "contacts" )
115 115   #elseif( $role == "cosupervisor" )