Changes for page Per Year

From version 82.1
edited by Andrea Omicini
on 29/10/2021 15:44
Change comment: There is no comment for this version
To version 89.1
edited by Andrea Omicini
on 29/10/2021 15:50
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) )$firstYear
10 -#set( $lastYear = $mathtool.toInteger($lastYearTh) )$lastYear
9 +#set( $firstYear = $mathtool.toInteger($firstYearTh) )
10 +#set( $lastYear = $mathtool.toInteger($lastYearTh) )
11 11  #set( $yearList = [$lastYear..$firstYear] )
12 -#if( $yearPar > 0 )??
12 +#if( $yearPar > 0 )
13 13   #set( $oneYear = true )
14 14   #set( $firstYear = $yearPar )
15 15   #set( $lastYear = $toPar )
16 - #set( $yearList = [$lastYear..$firstYear] )
16 + #set( $yearList = [$yearPar] )
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
... ... @@ -31,8 +31,6 @@
31 31   #end
32 32  #end
33 33  $oneYear
34 -$firstYear
35 -$lastYear
36 36  $yearList
37 37  #stop
38 38  ##check velocity variable, takes precedence