Changes for page Per Year

From version 152.1
edited by Andrea Omicini
on 30/06/2023 21:20
Change comment: There is no comment for this version
To version 148.1
edited by Andrea Omicini
on 30/06/2023 20:37
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,9 +1,12 @@
1 1  {{velocity}}
2 -{{html wiki="true" clean="false"}}
3 3  #template('apice_boolean.vm')
4 4  #### HANDLE PARAMETERS / START
5 5  #template('apice_theses.vm')
6 6  #template('apice_user_param.vm')
6 +## YEARS / START
7 +#set( $yearPar = $request.year.trim() )
8 +#set( $firstYearPar = $request.from.trim() )
9 +#set( $lastYearPar = $request.to.trim() )
7 7  ## years / personal
8 8  #if( $isUserSpace )
9 9   #set( $query = ", BaseObject as objPersonalThesis, LargeStringProperty as propUser
... ... @@ -24,7 +24,43 @@
24 24  ## years / parameters takes precedence
25 25  #set( $firstYear = $firstYearThesis )
26 26  #set( $lastYear = $lastYearThesis )
27 -#template('apice_year_param.vm')
30 +#if( $yearPar )
31 + #set( $yearInt = $numbertool.toNumber($yearPar) )
32 + #if( $yearInt > 0 )
33 + #set( $firstYear = $yearInt )
34 + #set( $lastYear = $yearInt )
35 + #end
36 +#end
37 +#if( $firstYearPar )
38 + #set( $yearInt = $numbertool.toNumber($firstYearPar) )
39 + #if( $yearInt > 0 )
40 + #set( $firstYear = $yearInt )
41 + #end
42 +#end
43 +#if( $lastYearPar )
44 + #set( $yearInt = $numbertool.toNumber($lastYearPar) )
45 + #if( $yearInt > 0 )
46 + #set( $lastYear = $yearInt )
47 + #end
48 +#end
49 +#if( $lastYear < $firstYear )
50 +## swap
51 + #set( $yearTemp = $lastYear )
52 + #set( $lastYear = $firstYear )
53 + #set( $firstYear = $yearTemp )
54 +#end
55 +## invariant: $lastYear >= $firstYear
56 +#if( $lastYear > $firstYear )
57 + #set( $year = -1 )
58 + #set( $yearList = [$lastYear..$firstYear] )
59 + #set( $oneYear = false )
60 +#else
61 +## $lastYear = $firstYear
62 + #set( $year = $lastYear )
63 + #set( $yearList = [$year] )
64 + #set( $oneYear = true )
65 +#end
66 +## YEARS / END
28 28  #### handle cycle
29 29  ## $cycleList gets the list of cycles to be shown
30 30  ## $oneCycle true if just one cycle to be shown
... ... @@ -112,14 +112,15 @@
112 112  ##
113 113  #foreach( $year in $itemMap.keySet() )
114 114  (% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}[[$year>>$doc||style="text-decoration:none; color:$theme.textPrimaryColor" queryString='year=$year#if( $oneUser )#if( $apiceUser )&user=$userName#{else}&name=$userFirstName&surname=$userLastName#end#end#if( $oneCycle )&cycle=$cycle#end']]
154 +{{html wiki="true" clean="false"}}
115 115  <div style="font-style: normal"><ul>
116 116  #foreach( $item in $itemMap[$year] )
117 117  <li>#thesislinked($item)</li>
118 118  #end
119 119  </ul></div>
160 +{{/html}}
120 120   #set( $itemYearNo = $itemMap[$year].size() )
121 121  (% style="border-style:hidden solid solid hidden; border-color:$theme.borderColor; text-align:right; font-style:oblique; font-size:smaller" %)|($itemYearNo #if( $oneCycle )#if( $itemYearNo == 1 ){{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}#{else}{{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}#end#else#if( $itemYearNo == 1 )$services.localization.render('thesis').toLowerCase()#else$services.localization.render('theses').toLowerCase()#end#end / $year) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]
122 122  #end
123 -{{/html}}
124 124  {{/velocity}}
125 125  {{id name="bottom"/}}