Changes for page Per Year

From version 74.1
edited by Andrea Omicini
on 29/10/2021 15:30
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
... ... @@ -3,23 +3,25 @@
3 3  #set( $oneYear = false )
4 4  ### START YEAR
5 5  ## year parameter
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 )
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
11 11  #set( $yearList = [$lastYear..$firstYear] )
12 -#if( $yearPar != '' )
12 +#if( $yearPar > 0 )
13 13   #set( $oneYear = true )
14 - #set( $selectedYear = $yearPar )
14 + #set( $firstYear = $yearPar )
15 + #set( $lastYear = $toPar )
16 + #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,11 +28,6 @@
28 28   #set( $yearList = [$lastYear..$firstYear] )
29 29   #end
30 30  #end
31 -$oneYear
32 -$selectedYear
33 -$firstYear
34 -$lastYear
35 -$yearList
36 36  #stop
37 37  ##check velocity variable, takes precedence
38 38  #if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) )