Changes for page Per Year
From version 89.2
edited by Andrea Omicini
on 29/10/2021 15:53
on 29/10/2021 15:53
Change comment:
There is no comment for this version
To version 91.1
edited by Andrea Omicini
on 29/10/2021 16:13
on 29/10/2021 16:13
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -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 36 +### END YEAR 53 53 ## 54 -### START USER & ROLE38 +### START USER & CYCLE 55 55 #set( $userNamePar = $request.user.trim() ) 56 56 ## default values 57 57 #set( $oneUser = false ) 58 -#set( $one Role = false )42 +#set( $oneCycle = false ) 59 59 #set( $userFirstName = "" ) 60 60 #set( $userLastName = "" ) 61 61 #if( $userName || $userNamePar ) ... ... @@ -75,21 +75,24 @@ 75 75 #stop 76 76 #end 77 77 ##user selected and existing user page 78 - #set( $ rolePar = $request.role.trim().toLowerCase() )79 - #set( $selected Role = '' )80 - #if( $ rolePar != '' && $allThesisRoles.contains($rolePar) )81 - #set( $one Role = true )82 - #set( $selected Role = $rolePar )62 + #set( $cyclePar = $request.cycle.trim().toUpperCase() ) 63 + #set( $selectedCycle = '' ) 64 + #if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) ) 65 + #set( $oneCycle = true ) 66 + #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 69 +## $oneUser and $oneCycle set properly 70 +$oneUser 71 +$oneCycle 72 +### 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'/}} 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 + 93 93 ## index 94 94 #if( !$oneStatus ) 95 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)))