Changes for page Per Year

From version 165.1
edited by Andrea Omicini
on 06/07/2023 19:27
Change comment: There is no comment for this version
To version 149.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,14 +1,17 @@
1 1  {{velocity}}
2 2  {{html wiki="true" clean="false"}}
3 -#template('apice_macros.vm')
4 -#setobjectspace("Theses")
5 -#template('apice_thesis_macros.vm')
6 -#### SET PARAMETERS / START
3 +#template('apice_boolean.vm')
4 +#### HANDLE PARAMETERS / START
5 +#template('apice_theses.vm')
7 7  #template('apice_user_param.vm')
7 +## YEARS / START
8 +#set( $yearPar = $request.year.trim() )
9 +#set( $firstYearPar = $request.from.trim() )
10 +#set( $lastYearPar = $request.to.trim() )
8 8  ## years / personal
9 9  #if( $isUserSpace )
10 10   #set( $query = ", BaseObject as objPersonalThesis, LargeStringProperty as propUser
11 - where objPersonalThesis.name = doc.fullName and objPersonalThesis.className = '${mainSpace}.Personal.Class' and propUser.id.id = objPersonalThesis.id and propUser.name = 'user' and propUser.value = '$userName' " )
14 + where objPersonalThesis.name = doc.fullName and objPersonalThesis.className = '${objectSpace}.Personal.${objectClass}' and propUser.id.id = objPersonalThesis.id and propUser.name = 'user' and propUser.value = '$userName' " )
12 12   #set( $personalThesisDocs = $xwiki.searchDocuments($query) )
13 13   #if( $personalThesisDocs.size() > 0 )
14 14   #set( $personalThesisDoc = $xwiki.getDocument($personalThesisDocs[0]) )
... ... @@ -25,9 +25,44 @@
25 25  ## years / parameters takes precedence
26 26  #set( $firstYear = $firstYearThesis )
27 27  #set( $lastYear = $lastYearThesis )
28 -#template('apice_year_param.vm')
29 -##
30 -## CYCLES / START
31 +#if( $yearPar )
32 + #set( $yearInt = $numbertool.toNumber($yearPar) )
33 + #if( $yearInt > 0 )
34 + #set( $firstYear = $yearInt )
35 + #set( $lastYear = $yearInt )
36 + #end
37 +#end
38 +#if( $firstYearPar )
39 + #set( $yearInt = $numbertool.toNumber($firstYearPar) )
40 + #if( $yearInt > 0 )
41 + #set( $firstYear = $yearInt )
42 + #end
43 +#end
44 +#if( $lastYearPar )
45 + #set( $yearInt = $numbertool.toNumber($lastYearPar) )
46 + #if( $yearInt > 0 )
47 + #set( $lastYear = $yearInt )
48 + #end
49 +#end
50 +#if( $lastYear < $firstYear )
51 +## swap
52 + #set( $yearTemp = $lastYear )
53 + #set( $lastYear = $firstYear )
54 + #set( $firstYear = $yearTemp )
55 +#end
56 +## invariant: $lastYear >= $firstYear
57 +#if( $lastYear > $firstYear )
58 + #set( $year = -1 )
59 + #set( $yearList = [$lastYear..$firstYear] )
60 + #set( $oneYear = false )
61 +#else
62 +## $lastYear = $firstYear
63 + #set( $year = $lastYear )
64 + #set( $yearList = [$year] )
65 + #set( $oneYear = true )
66 +#end
67 +## YEARS / END
68 +#### handle cycle
31 31  ## $cycleList gets the list of cycles to be shown
32 32  ## $oneCycle true if just one cycle to be shown
33 33  #if( $request.cycle && $request.cycle.trim() != "" )
... ... @@ -49,16 +49,14 @@
49 49   #set( $cycle = "" )
50 50  #end
51 51  ## INVARIANT: $oneCycle and $cycleList are correctly and coherently initialised
52 -## CYCLES / END
90 +#### HANDLE PARAMETERS / END
53 53  ##
54 -#### SET PARAMETERS / END
55 -##
56 56  ## DATA STRUCTURES / START
57 57  #set( $itemMap = {} )
58 58  #set( $itemNo = 0 )
59 59  #foreach( $year in $yearList )
60 60   #set( $query = ", BaseObject as objThesis #if( $oneCycle ), StringProperty as propCycle #end, DateProperty as propEnddate, StringProperty as propStatus, LargeStringProperty as propSupervisor, LargeStringProperty as propCosupervisor, LargeStringProperty as propContact
61 - where objThesis.name = doc.fullName and objThesis.className = '${mainSpace}.Class' and objThesis.name <> '${objectPool}.Template' and propEnddate.id.id = objThesis.id and propStatus.id.id = objThesis.id and propSupervisor.id.id = objThesis.id and propCosupervisor.id.id = objThesis.id and propContact.id.id = objThesis.id and propEnddate.name = 'end' and propStatus.name = 'status' and propSupervisor.name = 'supervisors' and propCosupervisor.name = 'cosupervisors' and propContact.name = 'contacts' #if( $oneCycle ) and propCycle.id.id = objThesis.id and propCycle.name = 'cycle' and propCycle.value = '$cycle' #end and year(propEnddate.value) = $year and lower(propStatus.value) = 'completed' #if( $oneUser )and ( propSupervisor.value like '%$userString%' or propCosupervisor.value like '%$userString%' or propContact.value like '%$userString%' )#end order by propEnddate.value desc" )
97 + where objThesis.name = doc.fullName and objThesis.className = '${objectSpace}.${objectClass}' and objThesis.name <> '${objectSpace}.${objectTemplate}' and propEnddate.id.id = objThesis.id and propStatus.id.id = objThesis.id and propSupervisor.id.id = objThesis.id and propCosupervisor.id.id = objThesis.id and propContact.id.id = objThesis.id and propEnddate.name = 'end' and propStatus.name = 'status' and propSupervisor.name = 'supervisors' and propCosupervisor.name = 'cosupervisors' and propContact.name = 'contacts' #if( $oneCycle ) and propCycle.id.id = objThesis.id and propCycle.name = 'cycle' and propCycle.value = '$cycle' #end and year(propEnddate.value) = $year and lower(propStatus.value) = 'completed' #if( $oneUser )and ( propSupervisor.value like '%$userString%' or propCosupervisor.value like '%$userString%' or propContact.value like '%$userString%' )#end order by propEnddate.value desc" )
62 62  ## do query
63 63   #set( $itemFound = $xwiki.searchDocuments($query) )
64 64  ## set counters
... ... @@ -107,57 +107,23 @@
107 107  ## page index
108 108  #if( $itemMap.keySet().size() > 1 )
109 109  ## found more than one year
110 -<div class="mainselectbar" id="index">
111 - #foreach( $year in $itemMap.keySet() )
112 - #if( !$foreach.first )
113 - &ensp;&bull;&ensp;
114 - #end
115 - [[$year>>||anchor="$year"]]
116 - #end
117 -</div>
146 +{{id name="index"/}}
147 +(% style="font-size:smaller; text-align:right; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $year in $itemMap.keySet() )#if( !$foreach.first ) | #end[[$year>>$doc||anchor=$year]]#end)))
118 118  #end
119 119  ## theses displayed per year
120 -#foreach( $year in $itemMap.keySet() )
121 -## year top / start
122 -<div class="mainselectseparator">
123 - <a class="mainselectseparatorlink" id="$year" href=$xwiki.getURL($doc,"view","year=$year#if( $apiceUser )&user=$userName#elseif( $oneUser )&name=$userFirstName&surname=$userLastName#end#if( $oneCycle )&cycle=$cycle#end")>
124 - $year
125 - </a>
126 -</div>
127 -## year top / end
128 128  ##
129 -## year display / start
151 +#template('apice_thesis_macros.vm')
152 +##
153 +#foreach( $year in $itemMap.keySet() )
154 +(% 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']]
130 130  <div style="font-style: normal"><ul>
131 - #foreach( $item in $itemMap[$year] )
132 -<li>#thesisyear($item)</li>
133 - #end
156 +#foreach( $item in $itemMap[$year] )
157 +<li>#thesislinked($item)</li>
158 +#end
134 134  </ul></div>
135 -## year display / end
136 -##
137 -## year bottom / start
138 -<div #if( $foreach.last )id="bottom"#end class="mainselectbottom">
139 139   #set( $itemYearNo = $itemMap[$year].size() )
140 - $itemYearNo
141 - #if( $oneCycle )
142 - #if( $itemYearNo == 1 )
143 - {{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}
144 - #else
145 - {{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}
146 - #end
147 - #else
148 - #if( $itemYearNo == 1 )
149 - $services.localization.render('thesis').toLowerCase()
150 - #else
151 - $services.localization.render('theses').toLowerCase()
152 - #end
153 - #end
154 - <span class="textsecondary">&ensp;/&ensp;</span>
155 - $year
156 - &ensp;&bull;&ensp;
157 - #anchorlinks()
158 -</div>
159 -## year bottom / end
161 +(% 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"]]
160 160  #end
161 -## DISPLAY / END
162 162  {{/html}}
163 -{{/velocity}}{{pageDisplay sort="objectservice"/}}
164 +{{/velocity}}
165 +{{id name="bottom"/}}