Changes for page Per Year

Summary

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

Details

Page properties

Title

...	...	@@ -1,0 +1,1 @@
	1	+$services.localization.render('peryear')

Content

...	...	@@ -1,153 +1,141 @@
1		-= {{italiano}}Per anno e livello{{/italiano}}{{english}}Per Year & Cycle{{/english}} =
2		-
3		-{{include reference="Theses.Environment" excludeFirstHeading="true"/}}{{velocity}}
4		-#set( $thesisMenu = true )
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] )
	1	+{{velocity}}
	2	+#template('apice_boolean.vm')
	3	+#### HANDLE PARAMETERS / START
	4	+#template('apice_publications.vm')
	5	+#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() )
	10	+## years / personal
	11	+#if( $isUserSpace )
	12	+ #set( $query = ", BaseObject as objPersonalThesis, LargeStringProperty as propUser
	13	+ where objPersonalThesis.name = doc.fullName and objPersonalThesis.className = '${objectSpace}.Personal.${objectClass}' and propUser.id.id = objPersonalThesis.id and propUser.name = 'user' and propUser.value = '$userName' " )
	14	+ #set( $personalThesisDocs = $xwiki.searchDocuments($query) )
	15	+ #if( $personalThesisDocs.size() > 0 )
	16	+ #set( $personalThesisDoc = $xwiki.getDocument($personalThesisDocs[0]) )
	17	+ #else
	18	+ #stop
34	34	#end
35		- #if( $toPar != '' && ($toPar < $lastYear) )
36		- #set( $lastYear = $toPar )
37		- #set( $yearList = [$lastYear..$firstYear] )
	20	+ #if( $personalThesisDoc.firstYear && $personalThesisDoc.firstYear != "" )
	21	+ #set( $firstYearThesis = $personalThesisDoc.display('firstYear','view') )
38	38	#end
39		- #if( $lastYear <= $firstYear )
40		- #set( $oneYear = true )
41		- #set( $lastYear = $firstYear )
42		- #set( $selectedYear = $firstYear )
43		- #set( $yearList = [$firstYear] )
44		- #else
45		- #set( $yearList = [$lastYear..$firstYear] )
	23	+ #if( $personalThesisDoc.lastYear && $personalThesisDoc.lastYear != "" )
	24	+ #set( $lastYearThesis = $personalThesisDoc.display('lastYear','view') )
46	46	#end
47	47	#end
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() )
	27	+## years / parameters takes precedence
	28	+#set( $firstYear = $firstYearThesis )
	29	+#set( $lastYear = $lastYearThesis )
	30	+#if( $yearPar )
	31	+ #set( $yearInt = $numbertool.toNumber($yearPar) )
	32	+ #if( $yearInt > 0 )
	33	+ #set( $firstYear = $yearInt )
	34	+ #set( $lastYear = $yearInt )
	35	+ #end
60	60	#end
61		-#if( $userName || $userNamePar )
62		-## try to specify a user
63		- #if( !$userName )
64		- #set( $selectedUser = "XWiki.$userNamePar" )
65		- #else
66		- #set( $selectedUser = $userName )
	37	+#if( $firstYearPar )
	38	+ #set( $yearInt = $numbertool.toNumber($firstYearPar) )
	39	+ #if( $yearInt > 0 )
	40	+ #set( $firstYear = $yearInt )
67	67	#end
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") )
73		- #else
74		-{{warning}} $selectedUser is not an {{apice/}} user{{/warning}}
75		- #stop
	42	+#end
	43	+#if( $lastYearPar )
	44	+ #set( $yearInt = $numbertool.toNumber($lastYearPar) )
	45	+ #if( $yearInt > 0 )
	46	+ #set( $lastYear = $yearInt )
76	76	#end
77	77	#end
78		-## $selectedUser and $oneUser set properly
79		-### END USER
80		-##
81		-### START CYCLE
82		-#set( $oneCycle = false )
83		-#set( $selectedCycle = '' )
84		-## cycle parameter
85		-#if( $request.cycle )
86		- #set( $cyclePar = $request.cycle.trim().toUpperCase() )
	49	+#if( $lastYear < $firstYear )
	50	+## swap
	51	+ #set( $yearTemp = $lastYear )
	52	+ #set( $lastYear = $firstYear )
	53	+ #set( $firstYear = $yearTemp )
87	87	#end
88		-## set cycle
89		-#if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) )
90		- #set( $oneCycle = true )
91		- #set( $selectedCycle = $cyclePar )
	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 )
92	92	#end
93		-## $selectedCycle and $oneCycle set properly
94		-#if( $showPhDTheses )
95		- #set( $cycles = $allThesisCycles )
	66	+## YEARS / END
	67	+#### handle cycle
	68	+## $cycleList gets the list of cycles to be shown
	69	+## $oneCycle true if just one cycle to be shown
	70	+#if( $request.cycle && $request.cycle.trim() != "" )
	71	+ #set( $cyclePar = $request.cycle.trim().toUpperCase() )
	72	+ #if( $thesisCycles.contains($cyclePar) )
	73	+## 'cycle' parameter is an admissible thesis cycle value
	74	+ #set( $cycleList = [$cyclePar])
	75	+ #set( $oneCycle = true )
	76	+ #set( $cycle = $cyclePar )
	77	+ #else
	78	+## 'cycle' parameter is not an admissible thesis cycle value
	79	+{{warning}}$cyclePar is not an admissible cycle for APICe theses{{/warning}}
	80	+ #stop
	81	+ #end
96	96	#else
97		- #set( $cycles = $lowThesisCycles )
	83	+## default: all cycles
	84	+ #set( $cycleList = $showcaseThesisCycles )
	85	+ #set( $oneCycle = false )
	86	+ #set( $cycle = "" )
98	98	#end
99		-### END CYCLE
	88	+## INVARIANT: $oneCycle and $cycleList are correctly and coherently initialised
	89	+#### HANDLE PARAMETERS / END
100	100	##
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 )
	91	+## query to structures
	92	+#set( $itemMap = {} )
	93	+#set( $itemNo = 0 )
112	112	#foreach( $year in $yearList )
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']]
	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" )
	97	+## do query
	98	+ #set( $itemFound = $xwiki.searchDocuments($query) )
	99	+## set counters
	100	+ #set( $itemYearNo = $itemFound.size() )
	101	+ #if( $itemYearNo > 0 )
	102	+ #set( $itemMap[$year] = $itemFound )
	103	+ #set( $itemNo = $itemNo + $itemYearNo )
116	116	#end
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 )
143		- #end
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 )
148	148	#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)
	106	+##
	107	+## output results
	108	+## page subtitle
	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	+
	112	+## stop if no thesis is found
	113	+#if( $itemNo == 0 || $itemMap.keySet().size() == 0 )
	114	+## redundant double check
	115	+ #stop
151	151	#end
152		-{{id name='bottom'/}}
	117	+## some theses found
	118	+## page index
	119	+#if( $itemMap.keySet().size() > 1 )
	120	+## found more than one year
	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)))
	123	+#end
	124	+## theses displayed per year
	125	+##
	126	+#template('apice_thesis_macros.vm')
	127	+##
	128	+#foreach( $year in $itemMap.keySet() )
	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"}}
	131	+<div style="font-style: normal"><ul>
	132	+#foreach( $item in $itemMap[$year] )
	133	+<li>#thesislinked($item)</li>
	134	+#end
	135	+</ul></div>
	136	+{{/html}}
	137	+ #set( $itemYearNo = $itemMap[$year].size() )
	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	+#end
153	153	{{/velocity}}
	141	+{{id name="bottom"/}}