Changes for page Per Year

From version 88.1
edited by Andrea Omicini
on 29/10/2021 15:50
Change comment: There is no comment for this version
To version 74.1
edited by Andrea Omicini
on 29/10/2021 15:30
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -3,23 +3,21 @@
3 3  #set( $oneYear = false )
4 4  ### START YEAR
5 5  ## year parameter
6 -#set( $yearPar = $mathtool.toInteger($request.year) )
7 -#set( $fromPar = $mathtool.toInteger($request.from) )
8 -#set( $toPar = $mathtool.toInteger($request.to) )
9 -#set( $firstYear = $mathtool.toInteger($firstYearTh) )$firstYear
10 -#set( $lastYear = $mathtool.toInteger($lastYearTh) )$lastYear
6 +#set( $yearPar = $request.year )$yearPar
7 +#set( $fromPar = $request.from )$fromPar
8 +#set( $toPar = $request.to )$toPar
9 +#set( $firstYear = $firstYearTh )
10 +#set( $lastYear = $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 = [$yearPar] )
14 + #set( $selectedYear = $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
... ... @@ -31,6 +31,9 @@
31 31   #end
32 32  #end
33 33  $oneYear
32 +$selectedYear
33 +$firstYear
34 +$lastYear
34 34  $yearList
35 35  #stop
36 36  ##check velocity variable, takes precedence