Changes for page Per Year

From version 126.2
edited by Andrea Omicini
on 10/03/2022 13:41
Change comment: There is no comment for this version
To version 127.3
edited by Andrea Omicini
on 21/06/2022 10:59
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -6,6 +6,9 @@
6 6  #set( $firstYear = $mathtool.toInteger($firstYearThesis) )
7 7  #set( $lastYear = $mathtool.toInteger($lastYearThesis) )
8 8  #set( $yearList = [$lastYear..$firstYear] )
9 +#set( $yearPar = 0 )
10 +#set( $fromPar = 0 )
11 +#set( $toPar = 0 )
9 9  ### START YEAR
10 10  ## defaults
11 11  #set( $oneYear = false )
... ... @@ -28,11 +28,11 @@
28 28   #set( $selectedYear = $yearPar )
29 29   #set( $yearList = [$yearPar] )
30 30  #else
31 - #if( $fromPar != '' && ($fromPar > $firstYear) )
34 + #if( $fromPar != '' && $fromPar > 0 && ($fromPar > $firstYear) )
32 32   #set( $firstYear = $fromPar )
33 33   #set( $yearList = [$lastYear..$firstYear] )
34 34   #end
35 - #if( $toPar != '' && ($toPar < $lastYear) )
38 + #if( $toPar != '' && $toPar > 0 && ($toPar < $lastYear) )
36 36   #set( $lastYear = $toPar )
37 37   #set( $yearList = [$lastYear..$firstYear] )
38 38   #end
... ... @@ -91,6 +91,11 @@
91 91   #set( $selectedCycle = $cyclePar )
92 92  #end
93 93  ## $selectedCycle and $oneCycle set properly
97 +#if( $showPhDTheses )
98 + #set( $cycles = $allThesisCycles )
99 +#else
100 + #set( $cycles = $lowThesisCycles )
101 +#end
94 94  ### END CYCLE
95 95  ##
96 96  ## title
... ... @@ -100,7 +100,7 @@
100 100  (% 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)))
101 101  ###elseif( $oneUser && !$oneCycle )
102 102  #elseif( !$oneCycle )
103 -(% 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)))
111 +(% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $cycle in $cycles )#if ($velocityCount > 1) | #end [[{{thesisCycle}}$cycle{{/thesisCycle}}>>||anchor="$cycle"]]#end)))
104 104  #end{{id name='index'/}}
105 105  ## search theses
106 106  #set( $thesisNo = 0 )
... ... @@ -110,7 +110,7 @@
110 110  (% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}[[$year>>$doc.name||queryString='year=$year#if( $oneCycle )&cycle=$selectedCycle#end']]
111 111   #end
112 112  ## some selected year or year list / now $year
113 - #foreach( $cycle in $allThesisCycles )
121 + #foreach( $cycle in $cycles )
114 114   #set( $thesisYearCycleNo = 0 )
115 115   #if( !$oneCycle || $selectedCycle == $cycle )
116 116  ## some selected cycle or all cycles / now $cycle