Changes for page Per Year

Summary

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

Details

Page properties

Content

...	...	@@ -1,202 +1,153 @@
1		-= {{italiano}}Per anno{{/italiano}}{{english}}Per Year{{/english}} =
	1	+= {{italiano}}Per anno e livello{{/italiano}}{{english}}Per Year & Cycle{{/english}} =
2	2
3		-{{include reference="Main.Environment" excludeFirstHeading="true"/}}{{include reference="Theses.Environment" excludeFirstHeading="true"/}}{{velocity}}
	3	+{{include reference="Theses.Environment" excludeFirstHeading="true"/}}{{velocity}}
4	4	#set( $thesisMenu = true )
5		-#### HANDLE PARAMETERS / START
6		-##
7		-## inline display
8		-#set( $inlinePar = $request.inline.trim() )
9		-## who
10		-#set( $userNamePar = $request.user.trim() )
11		-#set( $firstNamePar = $request.name.trim() )
12		-#set( $lastNamePar = $request.surname.trim() )
13		-#### handle who
14		-#if( $userName )
15		-## from a personal page, "XWiki.$userName" $userName form
16		- #if( !$xwiki.exists( $userName ) )
17		-{{warning}}User $userName does not exist{{/warning}}
18		- #stop
	5	+## get environment variables & derived
	6	+#set( $firstYear = $mathtool.toInteger($firstYearThesis) )
	7	+#set( $lastYear = $mathtool.toInteger($lastYearThesis) )
	8	+#set( $yearList = [$lastYear..$firstYear] )
	9	+### START YEAR
	10	+## defaults
	11	+#set( $oneYear = false )
	12	+#set( $selectedYear = '' )
	13	+## year parameters
	14	+#if( $request.year )
	15	+ #set( $yearPar = $mathtool.toInteger($request.year) )
	16	+#end
	17	+#if( $request.from )
	18	+ #set( $fromPar = $mathtool.toInteger($request.from) )
	19	+#end
	20	+#if( $request.to )
	21	+ #set( $toPar = $mathtool.toInteger($request.to) )
	22	+#end
	23	+##set years
	24	+#if( $yearPar > 0 )
	25	+ #set( $oneYear = true )
	26	+ #set( $firstYear = $yearPar )
	27	+ #set( $lastYear = $yearPar )
	28	+ #set( $selectedYear = $yearPar )
	29	+ #set( $yearList = [$yearPar] )
	30	+#else
	31	+ #if( $fromPar != '' && ($fromPar > $firstYear) )
	32	+ #set( $firstYear = $fromPar )
	33	+ #set( $yearList = [$lastYear..$firstYear] )
19	19	#end
20		- #set( $apiceUser = true )
21		- #set( $oneUser = true )
22		- #set( $userdoc = $xwiki.getDocument($userName) )
23		- #set( $userFirstName = $userdoc.display("first_name") )
24		- #set( $userLastName = $userdoc.display("last_name") )
25		-#elseif( $userNamePar )
26		-## from the URL, "user=$userNamePar" parameter
27		- #if( $userNamePar.contains('XWiki.') )
28		- #set( $userName = "$userNamePar" )
	35	+ #if( $toPar != '' && ($toPar < $lastYear) )
	36	+ #set( $lastYear = $toPar )
	37	+ #set( $yearList = [$lastYear..$firstYear] )
	38	+ #end
	39	+ #if( $lastYear <= $firstYear )
	40	+ #set( $oneYear = true )
	41	+ #set( $lastYear = $firstYear )
	42	+ #set( $selectedYear = $firstYear )
	43	+ #set( $yearList = [$firstYear] )
29	29	#else
30		- #set( $userName = "XWiki.$userNamePar" )
	45	+ #set( $yearList = [$lastYear..$firstYear] )
31	31	#end
32		- #if( !$xwiki.exists( $userName ) )
33		- #if( $services.localization.currentLocale == 'it' )
34		-{{warning}}L'utente “$userNamePar” non esiste{{/warning}}
35		- #else
36		-{{warning}}User “$userNamePar” does not exist{{/warning}}
37		- #end
38		- #stop
39		- #end
40		- #set( $apiceUser = true )
41		- #set( $oneUser = true)
42		- #set( $userdoc = $xwiki.getDocument($userName) )
43		- #set( $userFirstName = $userdoc.display("first_name") )
44		- #set( $userLastName = $userdoc.display("last_name") )
45		-#elseif( $firstNamePar && $lastNamePar )
46		-## from the URL, "name=Firstname&surname=Lastname" parameter
47		- #set( $apiceUser = false )
48		- #set( $oneUser = true )
49		- #set( $userFirstName = $firstNamePar )
50		- #set( $userLastName = $lastNamePar )
51		-#else
52		- #set( $apiceUser = false )
53		- #set( $oneUser = false )
54		- #set( $userFirstName = "" )
55		- #set( $userLastName = "" )
56	56	#end
57		-#if( $oneUser )
58		- #if( $apiceUser )
59		- #set( $userString = "%$userName%" )
	48	+## $selectedYear, $yearList and $oneYear set properly
	49	+### END YEAR
	50	+##
	51	+### START USER
	52	+## default values
	53	+#set( $oneUser = false )
	54	+#set( $selectedUser = '' )
	55	+#set( $userFirstName = "" )
	56	+#set( $userLastName = "" )
	57	+## user parameter
	58	+#if( $request.user )
	59	+ #set( $userNamePar = $request.user.trim() )
	60	+#end
	61	+#if( $userName || $userNamePar )
	62	+## try to specify a user
	63	+ #if( !$userName )
	64	+ #set( $selectedUser = "XWiki.$userNamePar" )
60	60	#else
61		- #set( $userString = "%$userFirstName $userLastName%" )
	66	+ #set( $selectedUser = $userName )
62	62	#end
63		-#else
64		- #set( $userString = "%%" )
65		-#end
66		-#### handle cycle
67		-## $cycleList gets the list of cycles to be shown
68		-## $oneCycle true if just one cycle to be shown
69		-#if( $request.cycle && $request.cycle.trim() != "" )
70		- #set( $cyclePar = $request.cycle.trim().toUpperCase() )
71		- #if( $allThesisCycles.contains($cyclePar) )
72		-## 'cycle' parameter is an admissible thesis cycle value
73		- #set( $cycleList = [$cyclePar])
74		- #set( $oneCycle = true )
75		- #set( $cycle = $cyclePar )
	68	+ #if( $xwiki.exists($selectedUser) )
	69	+ #set( $oneUser = true )
	70	+ #set( $userdoc = $xwiki.getDocument($selectedUser) )
	71	+ #set( $userFirstName = $userdoc.display("first_name") )
	72	+ #set( $userLastName = $userdoc.display("last_name") )
76	76	#else
77		-## 'cycle' parameter is not an admissible thesis cycle value
78		-{{warning}}$cyclePar is not an admissible cycle for APICe theses{{/warning}}
	74	+{{warning}} $selectedUser is not an {{apice/}} user{{/warning}}
79	79	#stop
80	80	#end
81		-#else
82		-## default: all cycles
83		- #if( $showPhDTheses )
84		- #set( $cycleList = $allThesisCycles )
85		- #else
86		- #set( $cycleList = $lowThesisCycles )
87		- #end
88		- #set( $oneCycle = false )
89		- #set( $cycle = "" )
90	90	#end
91		-## INVARIANT: $oneCycle and $cycleList are correctly and coherently initialised
	78	+## $selectedUser and $oneUser set properly
	79	+### END USER
92	92	##
93		-## when
94		-#set( $yearPar = $request.year.trim() )
95		-#set( $firstYearPar = $request.from.trim() )
96		-#set( $lastYearPar = $request.to.trim() )
97		-#### handle when
98		-#set( $firstYear = $mathtool.toInteger($firstYearThesis) )
99		-#set( $lastYear = $mathtool.toInteger($lastYearThesis) )
100		-#if( $lastYear < $firstYear )
101		- #set( $lastYear = $firstYear )
	81	+### START CYCLE
	82	+#set( $oneCycle = false )
	83	+#set( $selectedCycle = '' )
	84	+## cycle parameter
	85	+#if( $request.cycle )
	86	+ #set( $cyclePar = $request.cycle.trim().toUpperCase() )
102	102	#end
103		-## parameters takes precedence
104		-#if( $yearPar )
105		- #set( $yearInt = $mathtool.toInteger($yearPar) )
106		- #if( $yearInt > 0 )
107		- #set( $firstYear = $yearInt )
108		- #set( $lastYear = $yearInt )
109		- #end
	88	+## set cycle
	89	+#if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) )
	90	+ #set( $oneCycle = true )
	91	+ #set( $selectedCycle = $cyclePar )
110	110	#end
111		-#if( $firstYearPar )
112		- #set( $yearInt = $mathtool.toInteger($firstYearPar) )
113		- #if( $yearInt > 0 )
114		- #set( $firstYear = $yearInt )
115		- #end
116		-#end
117		-#if( $lastYearPar )
118		- #set( $yearInt = $mathtool.toInteger($lastYearPar) )
119		- #if( $yearInt > 0 )
120		- #set( $lastYear = $yearInt )
121		- #end
122		-#end
123		-#if( $lastYear < $firstYear )
124		-## swap
125		- #set( $yearTemp = $lastYear )
126		- #set( $lastYear = $firstYear )
127		- #set( $firstYear = $yearTemp )
128		-#end
129		-## invariant: $lastYear >= $firstYear
130		-#if( $lastYear > $firstYear )
131		- #set( $year = -1 )
132		- #set( $yearList = [$lastYear..$firstYear] )
133		- #set( $oneYear = false )
	93	+## $selectedCycle and $oneCycle set properly
	94	+#if( $showPhDTheses )
	95	+ #set( $cycles = $allThesisCycles )
134	134	#else
135		-## $lastYear = $firstYear
136		- #set( $year = $lastYear )
137		- #set( $yearList = [$year] )
138		- #set( $oneYear = true )
	97	+ #set( $cycles = $lowThesisCycles )
139	139	#end
140		-## handle when / end
	99	+### END CYCLE
141	141	##
142		-## $oneUser, $apiceUser, $userString, $userFirstName, $userLastName, $oneCycle, $cycleList, $oneYear, $yearList are properly set
143		-##
144		-## handle inline / start
145		-##
146		-## default: false
147		-#set( $showInline = false )
148		-## check $inlinePar
149		-#if( $inlinePar != "" && $trueStringList.contains($inlinePar.toLowerCase()) )
150		- #set( $showInline = true )
151		-#end
152		-##
153		-## handle inline / end
154		-##
155		-#### HANDLE PARAMETERS / END
156		-##
157		-## query to structures
158		-#set( $itemMap = {} )
159		-#set( $itemNo = 0 )
	101	+## title
	102	+>#if( $oneCycle ){{thesisCycle uppercase='yes' short='no'}}$selectedCycle{{/thesisCycle}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end / #if( $oneYear )**$selectedYear**#else**$firstYear–$lastYear**#end#if( $oneUser ) / $userFirstName $userLastName#end{{id name='top'/}}
	103	+## index
	104	+#if( !$oneYear )
	105	+(% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $year in $yearList )#if ($velocityCount > 1) | #end[[$year>>||anchor="$year"]]#end)))
	106	+###elseif( $oneUser && !$oneCycle )
	107	+#elseif( !$oneCycle )
	108	+(% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $cycle in $cycles )#if ($velocityCount > 1) | #end [[{{thesisCycle}}$cycle{{/thesisCycle}}>>||anchor="$cycle"]]#end)))
	109	+#end{{id name='index'/}}
	110	+## search theses
	111	+#set( $thesisNo = 0 )
160	160	#foreach( $year in $yearList )
161		- #set( $query = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4, LargeStringProperty as prop5
162		- 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" )
163		-## do query
164		- #set( $itemFound = $xwiki.searchDocuments($query) )
165		-## set counters
166		- #set( $itemYearNo = $itemFound.size() )
167		- #if( $itemYearNo > 0 )
168		- #set( $itemMap[$year] = $itemFound )
169		- #set( $itemNo = $itemNo + $itemYearNo )
	113	+ #set( $thesisYearNo = 0 )
	114	+ #if( !$oneYear )
	115	+(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}[[$year>>$doc.name||queryString='year=$year#if( $oneCycle )&cycle=$selectedCycle#end']]
170	170	#end
171		-#end
172		-##
173		-## output results
174		-## page subtitle
175		-{{id name="top"/}}
176		->(%%)$itemNo #if( $itemNo == 1 )#if( $oneCycle ){{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}#else{{stringEngIta eng="$objectEngSingular.toLowerCase()" ita="$objectItaSingular.toLowerCase()"/}}#end#{else}#if( $oneCycle ){{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}#else{{stringEngIta eng="$objectEngPlural.toLowerCase()" ita="$objectItaPlural.toLowerCase()"/}}#end#{end} / #if( $oneYear )$year#else$firstYear–$lastYear#{end}#if( $oneUser ) / $userFirstName $userLastName#{end}(%%)
177		-
178		-## stop if no thesis is found
179		-#if( $itemNo == 0 || $itemMap.keySet().size() == 0 )
180		-## redundant double check
181		- #stop
182		-#end
183		-## some theses found
184		-## page index
185		-#if( $itemMap.keySet().size() > 1 )
186		-## found more than one year
187		-{{id name="index"/}}
188		-(% 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)))
189		-#end
190		-## theses displayed per year
191		-#foreach( $year in $itemMap.keySet() )
192		-(% 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']]
193		-#foreach( $item in $itemMap[$year] )
194		- #if( $showInline )#if( $foreach.first )
195		-
196		-#end* #else(% style="border-style:hidden hidden hidden hidden; font-style:normal" %)|#end{{thesis inline=$showInline linked='title'}}$item{{/thesis}}
	117	+## some selected year or year list / now $year
	118	+ #foreach( $cycle in $cycles )
	119	+ #set( $thesisYearCycleNo = 0 )
	120	+ #if( !$oneCycle || $selectedCycle == $cycle )
	121	+## some selected cycle or all cycles / now $cycle
	122	+ #if( $oneUser)
	123	+ #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4, LargeStringProperty as prop5
	124	+ where obj.name = doc.fullName and obj.className = 'Theses.ThesisClass' and obj.name <> 'Theses.ThesisTemplate' 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 = 'endDate' and prop2.name = 'status' and prop3.name = 'supervisors' and prop4.name = 'cosupervisors' and prop5.name = 'contacts' and prop0.value = '$cycle' and year(prop1.value) = '$year' and prop2.value = 'Completed' and ( prop3.value like '%$selectedUser%' or prop4.value like '%$selectedUser%' or prop5.value like '%$selectedUser%' ) order by prop1.value desc" )
	125	+ #else
	126	+ #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2
	127	+ where obj.name = doc.fullName and obj.className = 'Theses.ThesisClass' and obj.name <> 'Theses.ThesisTemplate' and prop0.id.id = obj.id and prop1.id.id = obj.id and prop2.id.id = obj.id and prop0.name = 'cycle' and prop1.name = 'endDate' and prop2.name = 'status' and prop0.value = '$cycle' and year(prop1.value) = '$year 'and prop2.value = 'Completed' order by prop1.value desc" )
	128	+ #end
	129	+ #set( $thesisFound = $xwiki.searchDocuments($sql) )
	130	+ #set( $thesisFoundNo = $thesisFound.size() )
	131	+ #set( $thesisYearCycleNo = $thesisYearCycleNo + $thesisFoundNo )
	132	+ #if( $thesisFoundNo > 0 && !$oneCycle )
	133	+(% style="border-style:#if( $oneYear )solid hidden hidden solid#{else}hidden hidden hidden dotted#end; border-color:$theme.borderColor; text-align:left; font-style:oblique; font-size:smaller" %)|#if( $oneYear ){{id name='$cycle'/}}#else{{id name='$year-$cycle'/}}#end[[{{thesisCycle plural='no' uppercase='yes' short='yes'}}$cycle{{/thesisCycle}}>>$doc.name||queryString='cycle=$cycle&year=$year']]
	134	+ #end
	135	+ #foreach( $thesis in $thesisFound )
	136	+* {{thesis}}$thesis{{/thesis}}
	137	+ #end
	138	+ #if( $thesisFoundNo > 0 && !$oneCycle )
	139	+(% style="border-style:#if( $oneYear )hidden solid solid hidden#{else}hidden dotted hidden hidden#end; border-color:$theme.borderColor; text-align:right; font-style:oblique; font-weight:normal; font-size:smaller; color:$theme.textSecondaryColor" %)|#if( $oneYear ){{id name='$cycle-bottom'/}}#else{{id name='$cycle-$year-bottom'/}}#end($thesisYearCycleNo #if( $thesisYearCycleNo == 1 ){{thesisCycle plural='no' uppercase='no' short='no'}}$cycle{{/thesisCycle}}#else{{thesisCycle plural='yes' uppercase='no' short='no'}}$cycle{{/thesisCycle}}#end {{stringEngIta eng='in' ita='nel'/}} $year [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]
	140	+ #end
	141	+ #end
	142	+ #set( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo )
197	197	#end
198		- #set( $itemYearNo = $itemMap[$year].size() )
199		-(% 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 ){{stringEngIta eng=$objectEngSingular.toLowerCase() ita=$objectItaSingular.toLowerCase()/}}#else{{stringEngIta eng=$objectEngPlural.toLowerCase() ita=$objectItaPlural.toLowerCase()/}}#end#end / $year) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]
	144	+ #if( !$oneYear )
	145	+(% style="border-style:hidden solid solid hidden; border-color:$theme.borderColor; text-align:right; font-style:oblique; font-weight:normal; font-size:smaller; color:$theme.textSecondaryColor" %)|($thesisYearNo #if($thesisYearNo == 1){{stringEngIta eng='thesis in' ita='tesi nel'/}}#else{{stringEngIta eng='theses in' ita='tesi nel'/}}#end $year{{id name='$year-bottom'/}}) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]
	146	+ #end
	147	+ #set( $thesisNo = $thesisNo + $thesisYearNo )
200	200	#end
	149	+#if( $thesisNo > 0 )
	150	+(% style="text-align:right; font-style:oblique; font-weight:normal; font-size:smaller; color:$theme.textSecondaryColor; border-color:$theme.borderColor; border-bottom-style:dotted" %)|($thesisNo #if( $oneCycle )#if($thesisNo == 1){{thesisCycle plural='no' short='no' uppercase='no'}}$selectedCycle{{/thesisCycle}}#else{{thesisCycle plural='yes' short='no' uppercase='no'}}$selectedCycle{{/thesisCycle}}#end#else#if($thesisNo == 1){{stringEngIta eng='thesis' ita='tesi'/}}#else{{stringEngIta eng='theses' ita='tesi'/}}#end#end#if( $oneYear ) {{stringEngIta eng='in' ita='nel'/}} $selectedYear#else {{stringEngIta eng='from' ita='dal'/}} $firstYear {{stringEngIta eng='to' ita='al'/}} $lastYear#end)
	151	+#end
	152	+{{id name='bottom'/}}
201	201	{{/velocity}}
202		-{{id name="bottom"/}}