Modifiche per il documento Per anno

Dalla versione 78.1
modificato da Andrea Omicini
il 29/10/2021 15:37
Cambia il commento: Nessun commento per questa versione
Alla versione 88.1
modificato da Andrea Omicini
il 29/10/2021 15:50
Cambia il commento: Nessun commento per questa versione

Summary

Details

Page properties
Content
... ... @@ -9,15 +9,17 @@
9 9  #set( $firstYear = $mathtool.toInteger($firstYearTh) )$firstYear
10 10  #set( $lastYear = $mathtool.toInteger($lastYearTh) )$lastYear
11 11  #set( $yearList = [$lastYear..$firstYear] )
12 -#if( $yearPar != '' )
12 +#if( $yearPar > 0 )
13 13   #set( $oneYear = true )
14 + #set( $firstYear = $yearPar )
15 + #set( $lastYear = $toPar )
14 14   #set( $yearList = [$yearPar] )
15 15  #else
16 - #if( $fromPar != '' && $yearList.contains($fromPar) )
18 + #if( $fromPar != '' && ($fromPar > $firstYear) )
17 17   #set( $firstYear = $fromPar )
18 18   #set( $yearList = [$lastYear..$firstYear] )
19 19   #end
20 - #if( $toPar != '' && $yearList.contains($toPar) )
22 + #if( $toPar != '' && ($toPar < $lastYear) )
21 21   #set( $lastYear = $toPar )
22 22   #set( $yearList = [$lastYear..$firstYear] )
23 23   #end
... ... @@ -29,8 +29,6 @@
29 29   #end
30 30  #end
31 31  $oneYear
32 -$firstYear
33 -$lastYear
34 34  $yearList
35 35  #stop
36 36  ##check velocity variable, takes precedence