Changes for page Per Year

From version 84.1
edited by Andrea Omicini
on 29/10/2021 15:47
Change comment: There is no comment for this version
To version 78.1
edited by Andrea Omicini
on 29/10/2021 15:37
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -9,17 +9,15 @@
9 9  #set( $firstYear = $mathtool.toInteger($firstYearTh) )$firstYear
10 10  #set( $lastYear = $mathtool.toInteger($lastYearTh) )$lastYear
11 11  #set( $yearList = [$lastYear..$firstYear] )
12 -#if( $yearPar > 0 )ONE YEAR
12 +#if( $yearPar != '' )
13 13   #set( $oneYear = true )
14 - #set( $firstYear = $yearPar )
15 - #set( $lastYear = $toPar )
16 - #set( $yearList = [$lastYear..$firstYear] )$yearList
14 + #set( $yearList = [$yearPar] )
17 17  #else
18 - #if( $fromPar != '' && $fromPar > $firstYear )
16 + #if( $fromPar != '' && $yearList.contains($fromPar) )
19 19   #set( $firstYear = $fromPar )
20 20   #set( $yearList = [$lastYear..$firstYear] )
21 21   #end
22 - #if( $toPar != '' && $toPar > $lastYear)
20 + #if( $toPar != '' && $yearList.contains($toPar) )
23 23   #set( $lastYear = $toPar )
24 24   #set( $yearList = [$lastYear..$firstYear] )
25 25   #end
... ... @@ -30,6 +30,10 @@
30 30   #set( $yearList = [$lastYear..$firstYear] )
31 31   #end
32 32  #end
31 +$oneYear
32 +$firstYear
33 +$lastYear
34 +$yearList
33 33  #stop
34 34  ##check velocity variable, takes precedence
35 35  #if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) )