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		-#### SET PARAMETERS / START
	3	+#### 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,9 +24,44 @@
24	24	## years / parameters takes precedence
25	25	#set( $firstYear = $firstYearThesis )
26	26	#set( $lastYear = $lastYearThesis )
27		-#template('apice_year_param.vm')
28		-##
29		-## CYCLES / START
	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
	67	+#### handle cycle
30	30	## $cycleList gets the list of cycles to be shown
31	31	## $oneCycle true if just one cycle to be shown
32	32	#if( $request.cycle && $request.cycle.trim() != "" )
...	...	@@ -48,16 +48,14 @@
48	48	#set( $cycle = "" )
49	49	#end
50	50	## INVARIANT: $oneCycle and $cycleList are correctly and coherently initialised
51		-## CYCLES / END
	89	+#### HANDLE PARAMETERS / END
52	52	##
53		-#### SET PARAMETERS / END
54		-##
55		-## DATA STRUCTURES / START
	91	+## query to structures
56	56	#set( $itemMap = {} )
57	57	#set( $itemNo = 0 )
58	58	#foreach( $year in $yearList )
59		- #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
60		- 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" )
61	61	## do query
62	62	#set( $itemFound = $xwiki.searchDocuments($query) )
63	63	## set counters
...	...	@@ -67,36 +67,12 @@
67	67	#set( $itemNo = $itemNo + $itemYearNo )
68	68	#end
69	69	#end
70		-## DATA STRUCTURES / END
71	71	##
72		-## DISPLAY / START
	107	+## output results
73	73	## page subtitle
74		-<div class="mainheader">
75		-$itemNo
76		-#if( $itemNo == 1 )
77		- #if( $oneCycle )
78		- {{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}
79		- #else
80		- $services.localization.render('thesis').toLowerCase()
81		- #end
82		-#{else}
83		- #if( $oneCycle )
84		- {{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}
85		- #else
86		- $services.localization.render('theses').toLowerCase()
87		- #end
88		-#{end}
89		-<span class="textsecondary">&ensp;/&ensp;</span>
90		-#if( $oneYear )
91		- $year
92		-#else
93		- $firstYear–$lastYear
94		-#{end}
95		-#if( $oneUser )
96		- <span class="textsecondary">&ensp;/&ensp;</span>
97		- $userFirstName $userLastName
98		-#end
99		-</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	+
100	100	## stop if no thesis is found
101	101	#if( $itemNo == 0 || $itemMap.keySet().size() == 0 )
102	102	## redundant double check
...	...	@@ -106,14 +106,8 @@
106	106	## page index
107	107	#if( $itemMap.keySet().size() > 1 )
108	108	## found more than one year
109		-<div class="mainselectbar" id="index">
110		- #foreach( $year in $itemMap.keySet() )
111		- #if( !$foreach.first )
112		- &ensp;&bull;&ensp;
113		- #end
114		- [[$year>>||anchor="$year"]]
115		- #end
116		-</div>
	121	+{{id name="index"/}}
	122	+(% 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)))
117	117	#end
118	118	## theses displayed per year
119	119	##
...	...	@@ -120,24 +120,16 @@
120	120	#template('apice_thesis_macros.vm')
121	121	##
122	122	#foreach( $year in $itemMap.keySet() )
123		-## year top / start
124		-<div class="mainselectseparator">
125		- <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")>
126		- $year
127		- </a>
128		-</div>
129		-## year top / end
130		-##
131		-## year display / start
	129	+(% 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"}}
132	132	<div style="font-style: normal"><ul>
133	133	#foreach( $item in $itemMap[$year] )
134	134	<li>#thesislinked($item)</li>
135	135	#end
136	136	</ul></div>
137		-<div> #set( $itemYearNo = $itemMap[$year].size() )
	136	+{{/html}}
	137	+ #set( $itemYearNo = $itemMap[$year].size() )
138	138	(% 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"]]
139		-</div>
140	140	#end
141		-{{/html}}
142	142	{{/velocity}}
143	143	{{id name="bottom"/}}