Changes for page Per Year
From version 82.1
edited by Andrea Omicini
on 29/10/2021 15:44
on 29/10/2021 15:44
Change comment:
There is no comment for this version
To version 77.1
edited by Andrea Omicini
on 29/10/2021 15:36
on 29/10/2021 15:36
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -6,20 +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) ) $firstYear10 -#set( $lastYear = $mathtool.toInteger($lastYearTh) ) $lastYear9 +#set( $firstYear = $mathtool.toInteger($firstYearTh) ) 10 +#set( $lastYear = $mathtool.toInteger($lastYearTh) ) 11 11 #set( $yearList = [$lastYear..$firstYear] ) 12 -#if( $yearPar >0)??12 +#if( $yearPar != '' ) 13 13 #set( $oneYear = true ) 14 - #set( $firstYear = $yearPar ) 15 - #set( $lastYear = $toPar ) 16 - #set( $yearList = [$lastYear..$firstYear] ) 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 != '' && $to Par > $lastYear)20 + #if( $toPar != '' && $yearList.contains($toPar) ) 23 23 #set( $lastYear = $toPar ) 24 24 #set( $yearList = [$lastYear..$firstYear] ) 25 25 #end