Changes for page Per Year

Summary

• Page properties (1 modified, 0 added, 0 removed)

Details

Page properties

Content

...	...	@@ -1,8 +1,7 @@
1	1	{{velocity}}
2		-{{html wiki="true" clean="false"}}
3	3	#template('apice_boolean.vm')
4	4	#### HANDLE PARAMETERS / START
5		-#template('apice_theses.vm')
	4	+#template('apice_publications.vm')
6	6	#template('apice_user_param.vm')
7	7	## YEARS / START
8	8	#set( $yearPar = $request.year.trim() )
...	...	@@ -89,12 +89,12 @@
89	89	## INVARIANT: $oneCycle and $cycleList are correctly and coherently initialised
90	90	#### HANDLE PARAMETERS / END
91	91	##
92		-## DATA STRUCTURES / START
	91	+## query to structures
93	93	#set( $itemMap = {} )
94	94	#set( $itemNo = 0 )
95	95	#foreach( $year in $yearList )
96		- #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
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" )
	95	+ #set( $query = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4, LargeStringProperty as prop5
	96	+ where obj.name = doc.fullName and obj.className = '${objectSpace}.${objectClass}' and obj.name <> '${objectSpace}.${objectTemplate}' and prop0.id.id = obj.id and prop1.id.id = obj.id and prop2.id.id = obj.id and prop3.id.id = obj.id and prop4.id.id = obj.id and prop5.id.id = obj.id and prop0.name = 'cycle' and prop1.name = 'end' and prop2.name = 'status' and prop3.name = 'supervisors' and prop4.name = 'cosupervisors' and prop5.name = 'contacts' #if( $oneCycle ) and prop0.value = '$cycle'#end and year(prop1.value) = $year and lower(prop2.value) = 'completed' #if( $oneUser )and ( prop3.value like '%$userString%' or prop4.value like '%$userString%' or prop5.value like '%$userString%' )#end order by prop1.value desc" )
98	98	## do query
99	99	#set( $itemFound = $xwiki.searchDocuments($query) )
100	100	## set counters
...	...	@@ -104,36 +104,12 @@
104	104	#set( $itemNo = $itemNo + $itemYearNo )
105	105	#end
106	106	#end
107		-## DATA STRUCTURES / END
108	108	##
109		-## DISPLAY / START
	107	+## output results
110	110	## page subtitle
111		-<div class="mainheader">
112		-$itemNo
113		-#if( $itemNo == 1 )
114		- #if( $oneCycle )
115		- {{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}
116		- #else
117		- $services.localization.render('thesis').toLowerCase()
118		- #end
119		-#{else}
120		- #if( $oneCycle )
121		- {{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}
122		- #else
123		- $services.localization.render('theses').toLowerCase()
124		- #end
125		-#{end}
126		-<span class="textsecondary">&ensp;/&ensp;</span>
127		-#if( $oneYear )
128		- $year
129		-#else
130		- $firstYear–$lastYear
131		-#{end}
132		-#if( $oneUser )
133		- <span class="textsecondary">&ensp;/&ensp;</span>
134		- $userFirstName $userLastName
135		-#end
136		-</div>
	109	+{{id name="top"/}}
	110	+>(%%)$itemNo #if( $itemNo == 1 )#if( $oneCycle ){{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}#else$services.localization.render('thesis').toLowerCase()#end#{else}#if( $oneCycle ){{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}#else$services.localization.render('theses').toLowerCase()#end#{end} / #if( $oneYear )$year#else$firstYear–$lastYear#{end}#if( $oneUser ) / $userFirstName $userLastName#{end}(%%)
	111	+
137	137	## stop if no thesis is found
138	138	#if( $itemNo == 0 || $itemMap.keySet().size() == 0 )
139	139	## redundant double check
...	...	@@ -152,14 +152,15 @@
152	152	##
153	153	#foreach( $year in $itemMap.keySet() )
154	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	+{{html wiki="true" clean="false"}}
155	155	<div style="font-style: normal"><ul>
156	156	#foreach( $item in $itemMap[$year] )
157	157	<li>#thesislinked($item)</li>
158	158	#end
159	159	</ul></div>
	136	+{{/html}}
160	160	#set( $itemYearNo = $itemMap[$year].size() )
161	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"]]
162	162	#end
163		-{{/html}}
164	164	{{/velocity}}
165	165	{{id name="bottom"/}}