Changes for page Per Year

Summary

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

Details

Page properties

Content

...	...	@@ -1,5 +1,4 @@
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')
...	...	@@ -28,7 +28,43 @@
28	28	## years / parameters takes precedence
29	29	#set( $firstYear = $firstYearThesis )
30	30	#set( $lastYear = $lastYearThesis )
31		-#template('apice_years_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
32	32	#### handle cycle
33	33	## $cycleList gets the list of cycles to be shown
34	34	## $oneCycle true if just one cycle to be shown
...	...	@@ -53,12 +53,12 @@
53	53	## INVARIANT: $oneCycle and $cycleList are correctly and coherently initialised
54	54	#### HANDLE PARAMETERS / END
55	55	##
56		-## DATA STRUCTURES / START
	91	+## query to structures
57	57	#set( $itemMap = {} )
58	58	#set( $itemNo = 0 )
59	59	#foreach( $year in $yearList )
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 = '${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" )
62	62	## do query
63	63	#set( $itemFound = $xwiki.searchDocuments($query) )
64	64	## set counters
...	...	@@ -68,36 +68,12 @@
68	68	#set( $itemNo = $itemNo + $itemYearNo )
69	69	#end
70	70	#end
71		-## DATA STRUCTURES / END
72	72	##
73		-## DISPLAY / START
	107	+## output results
74	74	## page subtitle
75		-<div class="mainheader">
76		-$itemNo
77		-#if( $itemNo == 1 )
78		- #if( $oneCycle )
79		- {{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}
80		- #else
81		- $services.localization.render('thesis').toLowerCase()
82		- #end
83		-#{else}
84		- #if( $oneCycle )
85		- {{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}
86		- #else
87		- $services.localization.render('theses').toLowerCase()
88		- #end
89		-#{end}
90		-<span class="textsecondary">&ensp;/&ensp;</span>
91		-#if( $oneYear )
92		- $year
93		-#else
94		- $firstYear–$lastYear
95		-#{end}
96		-#if( $oneUser )
97		- <span class="textsecondary">&ensp;/&ensp;</span>
98		- $userFirstName $userLastName
99		-#end
100		-</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	+
101	101	## stop if no thesis is found
102	102	#if( $itemNo == 0 || $itemMap.keySet().size() == 0 )
103	103	## redundant double check
...	...	@@ -116,14 +116,15 @@
116	116	##
117	117	#foreach( $year in $itemMap.keySet() )
118	118	(% 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"}}
119	119	<div style="font-style: normal"><ul>
120	120	#foreach( $item in $itemMap[$year] )
121	121	<li>#thesislinked($item)</li>
122	122	#end
123	123	</ul></div>
	136	+{{/html}}
124	124	#set( $itemYearNo = $itemMap[$year].size() )
125	125	(% 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"]]
126	126	#end
127		-{{/html}}
128	128	{{/velocity}}
129	129	{{id name="bottom"/}}