Changes for page Per Year

Summary

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

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		-#template('apice_theses.vm')
	4	+#template('apice_publications.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
...	...	@@ -18,13 +18,49 @@
18	18	#set( $firstYearThesis = $personalThesisDoc.display('firstYear','view') )
19	19	#end
20	20	#if( $personalThesisDoc.lastYear && $personalThesisDoc.lastYear != "" )
21		- #set( $lastYearThesis = $personalThesisDoc.display('lastYear','view') )
	24	+ #set( $lastYearThesis = $.display('lastYear','view') )
22	22	#end
23	23	#end
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
...	...	@@ -49,12 +49,12 @@
49	49	## INVARIANT: $oneCycle and $cycleList are correctly and coherently initialised
50	50	#### HANDLE PARAMETERS / END
51	51	##
52		-## DATA STRUCTURES / START
	91	+## query to structures
53	53	#set( $itemMap = {} )
54	54	#set( $itemNo = 0 )
55	55	#foreach( $year in $yearList )
56		- #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
57		- 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" )
58	58	## do query
59	59	#set( $itemFound = $xwiki.searchDocuments($query) )
60	60	## set counters
...	...	@@ -64,36 +64,12 @@
64	64	#set( $itemNo = $itemNo + $itemYearNo )
65	65	#end
66	66	#end
67		-## DATA STRUCTURES / END
68	68	##
69		-## DISPLAY / START
	107	+## output results
70	70	## page subtitle
71		-<div class="mainheader">
72		-$itemNo
73		-#if( $itemNo == 1 )
74		- #if( $oneCycle )
75		- {{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}
76		- #else
77		- $services.localization.render('thesis').toLowerCase()
78		- #end
79		-#{else}
80		- #if( $oneCycle )
81		- {{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}
82		- #else
83		- $services.localization.render('theses').toLowerCase()
84		- #end
85		-#{end}
86		-<span class="textsecondary">&ensp;/&ensp;</span>
87		-#if( $oneYear )
88		- $year
89		-#else
90		- $firstYear–$lastYear
91		-#{end}
92		-#if( $oneUser )
93		- <span class="textsecondary">&ensp;/&ensp;</span>
94		- $userFirstName $userLastName
95		-#end
96		-</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	+
97	97	## stop if no thesis is found
98	98	#if( $itemNo == 0 || $itemMap.keySet().size() == 0 )
99	99	## redundant double check
...	...	@@ -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']]
	130	+{{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>
	136	+{{/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"/}}