Changes for page Per Year

From version 68.5
edited by Andrea Omicini
on 28/10/2021 01:03
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
Title
... ... @@ -1,1 +1,1 @@
1 -#set($title="Theses per Status")#if($xcontext.language=='it')#set($title="Tesi per stato")#end$title
1 +#if($xcontext.language=='it')Tesi per anno#{else}Theses per Year#end
Content
... ... @@ -1,36 +1,48 @@
1 1  {{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
2 2  #set( $thesisMenu = true )
3 -### START STATUS
4 -## hypothesis: $thesisStatus set, default "Completed"
5 -## status parameter
6 -#set( $statusPar = $request.status.trim().toLowerCase() )
7 -#set( $oneStatus = false )
8 -#if( $statusPar != '' && $allThesisStatuses.contains($statusPar) )
9 - #set( $oneStatus = true )
10 - #set( $selectedStatus = $statusPar )
11 -#end
12 -##check velocity variable, takes precedence
13 -#if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) )
14 - #set( $oneStatus = true )
15 - #set( $selectedStatus = $thesisStatus.trim().toLowerCase() )
16 -#end
17 -## set ordering field
18 -#if( $selectedStatus == "available" )
19 - #set( $orderingDateFieldName = "availabilityDate" )
20 -#elseif( $selectedStatus == "ongoing" )
21 - #set( $orderingDateFieldName = "startDate" )
3 +#set( $oneYear = false )
4 +#set( $selectedYear = '' )
5 +### START YEAR
6 +## year parameter
7 +#set( $yearPar = $mathtool.toInteger($request.year) )
8 +#set( $fromPar = $mathtool.toInteger($request.from) )
9 +#set( $toPar = $mathtool.toInteger($request.to) )
10 +#set( $firstYear = $mathtool.toInteger($firstYearTh) )
11 +#set( $lastYear = $mathtool.toInteger($lastYearTh) )
12 +#set( $yearList = [$lastYear..$firstYear] )
13 +#if( $yearPar > 0 )
14 + #set( $oneYear = true )
15 + #set( $firstYear = $yearPar )
16 + #set( $lastYear = $yearPar )
17 + #set( $selectedYear = $yearPar )
18 + #set( $yearList = [$yearPar] )
22 22  #else
23 -## default for no selected status, too
24 - #set( $orderingDateFieldName = "endDate" )
20 + #if( $fromPar != '' && ($fromPar > $firstYear) )
21 + #set( $firstYear = $fromPar )
22 + #set( $yearList = [$lastYear..$firstYear] )
23 + #end
24 + #if( $toPar != '' && ($toPar < $lastYear) )
25 + #set( $lastYear = $toPar )
26 + #set( $yearList = [$lastYear..$firstYear] )
27 + #end
28 + #if( $lastYear <= $firstYear )
29 + #set( $oneYear = true )
30 + #set( $lastYear = $firstYear )
31 + #set( $selectedYear = $firstYear )
32 + #set( $yearList = [$firstYear] )
33 + #else
34 + #set( $yearList = [$lastYear..$firstYear] )
35 + #end
25 25  #end
26 -## invariant: $oneStatus set, $selectedStatus & $orderingDateFieldName set accordingly
27 -### END STATUS
37 +$oneYear
38 +$yearList
39 +### END YEAR
28 28  ##
29 -### START USER & ROLE
41 +### START USER & CYCLE
30 30  #set( $userNamePar = $request.user.trim() )
31 31  ## default values
32 32  #set( $oneUser = false )
33 -#set( $oneRole = false )
45 +#set( $oneCycle = false )
34 34  #set( $userFirstName = "" )
35 35  #set( $userLastName = "" )
36 36  #if( $userName || $userNamePar )
... ... @@ -50,41 +50,42 @@
50 50   #stop
51 51   #end
52 52  ##user selected and existing user page
53 - #set( $rolePar = $request.role.trim().toLowerCase() )
54 - #set( $selectedRole = '' )
55 - #if( $rolePar != '' && $allThesisRoles.contains($rolePar) )
56 - #set( $oneRole = true )
57 - #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 )
58 58   #end
59 59  #end
60 -## $oneUser and $oneRole set properly, other related variables set accordingly
61 -## $oneRole has meaning only if $oneUser
62 -## if $oneUser, $oneRole false means one user for all roles
63 -## if $oneUser, $oneRole true means one specific role for one user selected
64 -## 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
65 65  ##
66 66  ## title
67 ->#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'/}}
68 68  ## index
69 -#if( !$oneStatus )
70 -(% 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)))
71 -#elseif( $oneUser && !$oneRole )
72 -(% 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)))
73 73  #end{{id name='index'/}}
86 +
87 +#stop
88 +
74 74  ## search theses
75 75  #set( $thesisNo = 0 )
76 -#foreach( $status in $allThesisStatuses )
77 - #if( !$oneStatus || $selectedStatus == $status )
78 - #set( $thesisStatusNo = 0 )
79 - #if( !$oneStatus )
80 -(% 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
81 81   #end
82 -## some selected status or all statuses / now $status
83 - #if( $oneUser )
84 -## some user selected
85 - #foreach( $role in $allThesisRoles )
86 - #set( $thesisStatusRoleNo = 0 )
87 - #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 )
88 88   #if( $role == "contact" )
89 89   #set( $selectedRoleFieldName = "contacts" )
90 90   #elseif( $role == "cosupervisor" )