Changes for page Per Year
From version 95.1
edited by Andrea Omicini
on 29/10/2021 16:17
on 29/10/2021 16:17
Change comment:
There is no comment for this version
To version 89.1
edited by Andrea Omicini
on 29/10/2021 15:50
on 29/10/2021 15:50
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -15,7 +15,7 @@ 15 15 #set( $lastYear = $toPar ) 16 16 #set( $yearList = [$yearPar] ) 17 17 #else 18 - #if( $fromPar != '' && ($fromPar > $firstYear) 18 + #if( $fromPar != '' && ($fromPar > $firstYear) ) 19 19 #set( $firstYear = $fromPar ) 20 20 #set( $yearList = [$lastYear..$firstYear] ) 21 21 #end ... ... @@ -26,7 +26,6 @@ 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,13 +33,29 @@ 33 33 #end 34 34 $oneYear 35 35 $yearList 36 -### END YEAR 35 +#stop 36 +##check velocity variable, takes precedence 37 +#if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) ) 38 + #set( $oneStatus = true ) 39 + #set( $selectedStatus = $thesisStatus.trim().toLowerCase() ) 40 +#end 41 +## set ordering field 42 +#if( $selectedStatus == "available" ) 43 + #set( $orderingDateFieldName = "availabilityDate" ) 44 +#elseif( $selectedStatus == "ongoing" ) 45 + #set( $orderingDateFieldName = "startDate" ) 46 +#else 47 +## default for no selected status, too 48 + #set( $orderingDateFieldName = "endDate" ) 49 +#end 50 +## invariant: $oneStatus set, $selectedStatus & $orderingDateFieldName set accordingly 51 +### END STATUS 37 37 ## 38 -### START USER & CYCLE53 +### START USER & ROLE 39 39 #set( $userNamePar = $request.user.trim() ) 40 40 ## default values 41 41 #set( $oneUser = false ) 42 -#set( $one Cycle = false )57 +#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( $selected Cycle = '' )64 - #if( $ cyclePar != '' && $allThesisCycles.contains($cyclePar) )65 - #set( $one Cycle = true )66 - #set( $selected Cycle = $cyclePar )77 + #set( $rolePar = $request.role.trim().toLowerCase() ) 78 + #set( $selectedRole = '' ) 79 + #if( $rolePar != '' && $allThesisRoles.contains($rolePar) ) 80 + #set( $oneRole = true ) 81 + #set( $selectedRole = $rolePar ) 67 67 #end 68 68 #end 69 -## $oneUser and $oneCycle set properly 70 -$oneUser 71 -$oneCycle 72 -### END USER & CYCLE 84 +## $oneUser and $oneRole set properly, other related variables set accordingly 85 +## $oneRole has meaning only if $oneUser 86 +## if $oneUser, $oneRole false means one user for all roles 87 +## if $oneUser, $oneRole true means one specific role for one user selected 88 +## 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 - 91 +>#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)))