Changes for page Per Year
From version 96.3
edited by Andrea Omicini
on 30/10/2021 16:14
on 30/10/2021 16:14
Change comment:
There is no comment for this version
To version 94.1
edited by Andrea Omicini
on 29/10/2021 16:16
on 29/10/2021 16:16
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -1,7 +1,6 @@ 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) ) ... ... @@ -13,8 +13,7 @@ 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 20 #if( $fromPar != '' && ($fromPar > $firstYear) ) ... ... @@ -27,7 +27,6 @@ 27 27 #end 28 28 #if( $lastYear <= $firstYear ) 29 29 #set( $oneYear = true ) 30 - #set( $lastYear = $firstYear ) 31 31 #set( $selectedYear = $firstYear ) 32 32 #set( $yearList = [$firstYear] ) 33 33 #else ... ... @@ -75,29 +75,31 @@ 75 75 ### END USER & CYCLE 76 76 ## 77 77 ## title 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'/}} 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))) 85 -#end{{id name='index'/}} 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'/}} 86 86 87 87 #stop 88 88 79 + 80 +## index 81 +#if( !$oneStatus ) 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))) 83 +#elseif( $oneUser && !$oneRole ) 84 +(% 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 +#end{{id name='index'/}} 89 89 ## search theses 90 90 #set( $thesisNo = 0 ) 91 -#foreach( $ yearin $yearList )92 - #if( !$one Year|| $selectedYear== $year)93 - #set( $thesis YearNo = 0 )94 - #if( !$one Year)95 -(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$ year'/}}$year88 +#foreach( $status in $allThesisStatuses ) 89 + #if( !$oneStatus || $selectedStatus == $status ) 90 + #set( $thesisStatusNo = 0 ) 91 + #if( !$oneStatus ) 92 +(% 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}} 96 96 #end 97 -## some selected year or year list / now $year 98 - #foreach( $cycle in $allThesisCycles ) 99 - #set( $thesisYearCycleNo = 0 ) 100 - #if( !$oneCycle || $selectedCycle == $cycle ) 94 +## some selected status or all statuses / now $status 95 + #if( $oneUser ) 96 +## some user selected 97 + #foreach( $role in $allThesisRoles ) 98 + #set( $thesisStatusRoleNo = 0 ) 99 + #if( !$oneRole || $selectedRole == $role ) 101 101 #if( $role == "contact" ) 102 102 #set( $selectedRoleFieldName = "contacts" ) 103 103 #elseif( $role == "cosupervisor" )