Changes for page Per Year

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

Summary

Details

Page properties
Content
... ... @@ -33,13 +33,29 @@
33 33  #end
34 34  $oneYear
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,24 +59,21 @@
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
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
73 73  ##
74 74  ## title
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 -
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'/}}
80 80  ## index
81 81  #if( !$oneStatus )
82 82  (% 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)))