Changes for page Per Year
From version 96.2
edited by Andrea Omicini
on 30/10/2021 16:11
on 30/10/2021 16:11
Change comment:
There is no comment for this version
To version 87.3
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
-
... ... @@ -1,48 +1,58 @@ 1 1 {{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}} 2 2 #set( $thesisMenu = true ) 3 3 #set( $oneYear = false ) 4 -#set( $selectedYear = '' ) 5 5 ### START YEAR 6 6 ## year parameter 7 7 #set( $yearPar = $mathtool.toInteger($request.year) ) 8 8 #set( $fromPar = $mathtool.toInteger($request.from) ) 9 9 #set( $toPar = $mathtool.toInteger($request.to) ) 10 -#set( $firstYear = $mathtool.toInteger($firstYearTh) ) 11 -#set( $lastYear = $mathtool.toInteger($lastYearTh) ) 9 +#set( $firstYear = $mathtool.toInteger($firstYearTh) )$firstYear 10 +#set( $lastYear = $mathtool.toInteger($lastYearTh) )$lastYear 12 12 #set( $yearList = [$lastYear..$firstYear] ) 13 13 #if( $yearPar > 0 ) 14 14 #set( $oneYear = true ) 15 15 #set( $firstYear = $yearPar ) 16 - #set( $lastYear = $yearPar ) 17 - #set( $selectedYear = $yearPar ) 15 + #set( $lastYear = $toPar ) 18 18 #set( $yearList = [$yearPar] ) 19 19 #else 20 - #if( $fromPar != '' && ($fromPar > $firstYear) 18 + #if( $fromPar != '' && ($fromPar > $firstYear) ) 21 21 #set( $firstYear = $fromPar ) 22 22 #set( $yearList = [$lastYear..$firstYear] ) 23 23 #end 24 - #if( $toPar != '' && ($toPar < $lastYear) ) 22 + #if( $toPar != '' && ($toPar < $lastYear) ) LT 25 25 #set( $lastYear = $toPar ) 26 - #set( $yearList = [$lastYear..$firstYear] ) 24 + #set( $yearList = [$lastYear..$firstYear] )$yearList 27 27 #end 28 28 #if( $lastYear <= $firstYear ) 29 29 #set( $oneYear = true ) 30 - #set( $lastYear = $firstYear ) 31 31 #set( $selectedYear = $firstYear ) 32 - #set( $yearList = [$firstYear] ) 33 33 #else 34 34 #set( $yearList = [$lastYear..$firstYear] ) 35 35 #end 36 36 #end 37 -$oneYear 38 -$yearList 39 -### END YEAR 33 +#stop 34 +##check velocity variable, takes precedence 35 +#if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) ) 36 + #set( $oneStatus = true ) 37 + #set( $selectedStatus = $thesisStatus.trim().toLowerCase() ) 38 +#end 39 +## set ordering field 40 +#if( $selectedStatus == "available" ) 41 + #set( $orderingDateFieldName = "availabilityDate" ) 42 +#elseif( $selectedStatus == "ongoing" ) 43 + #set( $orderingDateFieldName = "startDate" ) 44 +#else 45 +## default for no selected status, too 46 + #set( $orderingDateFieldName = "endDate" ) 47 +#end 48 +## invariant: $oneStatus set, $selectedStatus & $orderingDateFieldName set accordingly 49 +### END STATUS 40 40 ## 41 -### START USER & CYCLE51 +### START USER & ROLE 42 42 #set( $userNamePar = $request.user.trim() ) 43 43 ## default values 44 44 #set( $oneUser = false ) 45 -#set( $one Cycle = false )55 +#set( $oneRole = false ) 46 46 #set( $userFirstName = "" ) 47 47 #set( $userLastName = "" ) 48 48 #if( $userName || $userNamePar ) ... ... @@ -62,33 +62,30 @@ 62 62 #stop 63 63 #end 64 64 ##user selected and existing user page 65 - #set( $ cyclePar = $request.cycle.trim().toUpperCase() )66 - #set( $selected Cycle = '' )67 - #if( $ cyclePar != '' && $allThesisCycles.contains($cyclePar) )68 - #set( $one Cycle = true )69 - #set( $selected Cycle = $cyclePar )75 + #set( $rolePar = $request.role.trim().toLowerCase() ) 76 + #set( $selectedRole = '' ) 77 + #if( $rolePar != '' && $allThesisRoles.contains($rolePar) ) 78 + #set( $oneRole = true ) 79 + #set( $selectedRole = $rolePar ) 70 70 #end 71 71 #end 72 -## $oneUser and $oneCycle set properly 73 -$oneUser 74 -$oneCycle 75 -### END USER & CYCLE 82 +## $oneUser and $oneRole set properly, other related variables set accordingly 83 +## $oneRole has meaning only if $oneUser 84 +## if $oneUser, $oneRole false means one user for all roles 85 +## if $oneUser, $oneRole true means one specific role for one user selected 86 +## if $oneUser is false, $oneRole means nothing -- so all users, all roles / just status 76 76 ## 77 77 ## title 78 ->#if( $one Role){{thesisCyclehort='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'/}}89 +>#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'/}} 79 79 ## index 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))) 91 +#if( !$oneStatus ) 92 +(% 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))) 93 +#elseif( $oneUser && !$oneRole ) 94 +(% 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))) 85 85 #end{{id name='index'/}} 86 - 87 -#stop 88 - 89 89 ## search theses 90 90 #set( $thesisNo = 0 ) 91 -#foreach( $ yearin $yearList )98 +#foreach( $status in $allThesisStatuses ) 92 92 #if( !$oneStatus || $selectedStatus == $status ) 93 93 #set( $thesisStatusNo = 0 ) 94 94 #if( !$oneStatus )