Changes for page Per Year

From version 77.1
edited by Andrea Omicini
on 29/10/2021 15:36
Change comment: There is no comment for this version
To version 87.2
edited by Andrea Omicini
on 29/10/2021 15:49
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -6,20 +6,22 @@
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 -#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) ) LT
21 21   #set( $lastYear = $toPar )
22 - #set( $yearList = [$lastYear..$firstYear] )
24 + #set( $yearList = [$lastYear..$firstYear] )$yearList
23 23   #end
24 24   #if( $lastYear <= $firstYear )
25 25   #set( $oneYear = true )
... ... @@ -28,10 +28,6 @@
28 28   #set( $yearList = [$lastYear..$firstYear] )
29 29   #end
30 30  #end
31 -$oneYear
32 -$firstYear
33 -$lastYear
34 -$yearList
35 35  #stop
36 36  ##check velocity variable, takes precedence
37 37  #if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) )