Changes for page Per Year

From version 89.2
edited by Andrea Omicini
on 29/10/2021 15:53
Change comment: There is no comment for this version
To version 85.1
edited by Andrea Omicini
on 29/10/2021 15:48
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -6,20 +6,20 @@
6 6  #set( $yearPar = $mathtool.toInteger($request.year) )
7 7  #set( $fromPar = $mathtool.toInteger($request.from) )
8 8  #set( $toPar = $mathtool.toInteger($request.to) )
9 -#set( $firstYear = $mathtool.toInteger($firstYearTh) )
10 -#set( $lastYear = $mathtool.toInteger($lastYearTh) )
9 +#set( $firstYear = $mathtool.toInteger($firstYearTh) )$firstYear
10 +#set( $lastYear = $mathtool.toInteger($lastYearTh) )$lastYear
11 11  #set( $yearList = [$lastYear..$firstYear] )
12 -#if( $yearPar > 0 )
12 +#if( $yearPar > 0 )ONE YEAR
13 13   #set( $oneYear = true )
14 14   #set( $firstYear = $yearPar )
15 15   #set( $lastYear = $toPar )
16 - #set( $yearList = [$yearPar] )
16 + #set( $yearList = [$yearPar] )$yearList
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
22 - #if( $toPar != '' && ($toPar < $lastYear) )
22 + #if( $toPar != '' && $toPar > $lastYear)
23 23   #set( $lastYear = $toPar )
24 24   #set( $yearList = [$lastYear..$firstYear] )
25 25   #end
... ... @@ -26,13 +26,10 @@
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 33  #end
34 -$oneYear
35 -$yearList
36 36  #stop
37 37  ##check velocity variable, takes precedence
38 38  #if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) )