Changes for page Per Year
From version 76.1
edited by Andrea Omicini
on 29/10/2021 15:35
on 29/10/2021 15:35
Change comment:
There is no comment for this version
To version 79.1
edited by Andrea Omicini
on 29/10/2021 15:39
on 29/10/2021 15:39
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -6,18 +6,18 @@ 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 12 #if( $yearPar != '' ) 13 13 #set( $oneYear = true ) 14 - $yearList = [$yearPar] 14 + #set( $yearList = [$yearPar] ) 15 15 #else 16 - #if( $fromPar != '' && $ yearList.contains($fromPar))16 + #if( $fromPar != '' && $fromPar > $firstYear ) 17 17 #set( $firstYear = $fromPar ) 18 18 #set( $yearList = [$lastYear..$firstYear] ) 19 19 #end 20 - #if( $toPar != '' && $ yearList.contains($toPar))20 + #if( $toPar != '' && $toPar > $lastYear) 21 21 #set( $lastYear = $toPar ) 22 22 #set( $yearList = [$lastYear..$firstYear] ) 23 23 #end