Changes for page Per Year

Summary

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

Details

Page properties

Title

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

Content

...	...	@@ -1,163 +1,148 @@
1		-{{velocity}}
2		-{{html wiki="true" clean="false"}}
3		-#template('apice_macros.vm')
4		-#setobjectspace("Theses")
5		-#template('apice_thesis_macros.vm')
6		-#### SET PARAMETERS / START
7		-#template('apice_user_param.vm')
8		-## years / personal
9		-#if( $isUserSpace )
10		- #set( $query = ", BaseObject as objPersonalThesis, LargeStringProperty as propUser
11		- where objPersonalThesis.name = doc.fullName and objPersonalThesis.className = '${mainSpace}.Personal.Class' and propUser.id.id = objPersonalThesis.id and propUser.name = 'user' and propUser.value = '$userName' " )
12		- #set( $personalThesisDocs = $xwiki.searchDocuments($query) )
13		- #if( $personalThesisDocs.size() > 0 )
14		- #set( $personalThesisDoc = $xwiki.getDocument($personalThesisDocs[0]) )
15		- #else
16		- #stop
	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($firstYearTh) )
	7	+#set( $lastYear = $mathtool.toInteger($lastYearTh) )
	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] )
17	17	#end
18		- #if( $personalThesisDoc.firstYear && $personalThesisDoc.firstYear != "" )
19		- #set( $firstYearThesis = $personalThesisDoc.display('firstYear','view') )
	35	+ #if( $toPar != '' && ($toPar < $lastYear) )
	36	+ #set( $lastYear = $toPar )
	37	+ #set( $yearList = [$lastYear..$firstYear] )
20	20	#end
21		- #if( $personalThesisDoc.lastYear && $personalThesisDoc.lastYear != "" )
22		- #set( $lastYearThesis = $personalThesisDoc.display('lastYear','view') )
23		- #end
24		-#end
25		-## years / parameters takes precedence
26		-#set( $firstYear = $firstYearThesis )
27		-#set( $lastYear = $lastYearThesis )
28		-#template('apice_year_param.vm')
29		-##
30		-## CYCLES / START
31		-## $cycleList gets the list of cycles to be shown
32		-## $oneCycle true if just one cycle to be shown
33		-#if( $request.cycle && $request.cycle.trim() != "" )
34		- #set( $cyclePar = $request.cycle.trim().toUpperCase() )
35		- #if( $thesisCycles.contains($cyclePar) )
36		-## 'cycle' parameter is an admissible thesis cycle value
37		- #set( $cycleList = [$cyclePar])
38		- #set( $oneCycle = true )
39		- #set( $cycle = $cyclePar )
	39	+ #if( $lastYear <= $firstYear )
	40	+ #set( $oneYear = true )
	41	+ #set( $lastYear = $firstYear )
	42	+ #set( $selectedYear = $firstYear )
	43	+ #set( $yearList = [$firstYear] )
40	40	#else
41		-## 'cycle' parameter is not an admissible thesis cycle value
42		-{{warning}}$cyclePar is not an admissible cycle for APICe theses{{/warning}}
43		- #stop
	45	+ #set( $yearList = [$lastYear..$firstYear] )
44	44	#end
45		-#else
46		-## default: all cycles
47		- #set( $cycleList = $showcaseThesisCycles )
48		- #set( $oneCycle = false )
49		- #set( $cycle = "" )
50	50	#end
51		-## INVARIANT: $oneCycle and $cycleList are correctly and coherently initialised
52		-## CYCLES / END
	48	+## $selectedYear, $yearList and $oneYear set properly
	49	+### END YEAR
53	53	##
54		-#### SET PARAMETERS / END
55		-##
56		-## DATA STRUCTURES / START
57		-#set( $itemMap = {} )
58		-#set( $itemNo = 0 )
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 = '${mainSpace}.Class' and objThesis.name <> '${objectPool}.Template' 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" )
62		-## do query
63		- #set( $itemFound = $xwiki.searchDocuments($query) )
64		-## set counters
65		- #set( $itemYearNo = $itemFound.size() )
66		- #if( $itemYearNo > 0 )
67		- #set( $itemMap[$year] = $itemFound )
68		- #set( $itemNo = $itemNo + $itemYearNo )
69		- #end
	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() )
70	70	#end
71		-## DATA STRUCTURES / END
72		-##
73		-## DISPLAY / START
74		-## page subtitle
75		-<div class="mainheader">
76		-$itemNo
77		-#if( $itemNo == 1 )
78		- #if( $oneCycle )
79		- {{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}
	61	+#if( $userName || $userNamePar )
	62	+## try to specify a user
	63	+ #if( !$userName )
	64	+ #set( $selectedUser = "XWiki.$userNamePar" )
80	80	#else
81		- $services.localization.render('thesis').toLowerCase()
	66	+ #set( $selectedUser = $userName )
82	82	#end
83		-#{else}
84		- #if( $oneCycle )
85		- {{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}
	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") )
86	86	#else
87		- $services.localization.render('theses').toLowerCase()
	74	+{{warning}} $selectedUser is not an {{apice/}} user{{/warning}}
	75	+ #stop
88	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	99	#end
100		-</div>
101		-## stop if no thesis is found
102		-#if( $itemNo == 0 || $itemMap.keySet().size() == 0 )
103		-## redundant double check
104		- #stop
	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() )
105	105	#end
106		-## some theses found
107		-## page index
108		-#if( $itemMap.keySet().size() > 1 )
109		-## found more than one year
110		-<div class="mainselectbar" id="index">
111		- #foreach( $year in $itemMap.keySet() )
112		- #if( !$foreach.first )
113		- &ensp;&bull;&ensp;
114		- #end
115		- [[$year>>||anchor="$year"]]
116		- #end
117		-</div>
	88	+## set cycle
	89	+#if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) )
	90	+ #set( $oneCycle = true )
	91	+ #set( $selectedCycle = $cyclePar )
118	118	#end
119		-## theses displayed per year
120		-#foreach( $year in $itemMap.keySet() )
121		-## year top / start
122		-<div class="mainselectseparator">
123		- <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")>
124		- $year
125		- </a>
126		-</div>
127		-## year top / end
	93	+## $selectedCycle and $oneCycle set properly
	94	+### END CYCLE
128	128	##
129		-## year display / start
130		-<div style="font-style: normal"><ul>
131		- #foreach( $item in $itemMap[$year] )
132		-<li>#thesisyear($item)</li>
	96	+## title
	97	+>#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'/}}
	98	+## index
	99	+#if( !$oneYear )
	100	+(% 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)))
	101	+###elseif( $oneUser && !$oneCycle )
	102	+#elseif( !$oneCycle )
	103	+(% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $cycle in $allThesisCycles )#if ($velocityCount > 1) | #end [[{{thesisCycle}}$cycle{{/thesisCycle}}>>||anchor="$cycle"]]#end)))
	104	+#end{{id name='index'/}}
	105	+## search theses
	106	+#set( $thesisNo = 0 )
	107	+#foreach( $year in $yearList )
	108	+ #set( $thesisYearNo = 0 )
	109	+ #if( !$oneYear )
	110	+(% 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']]
133	133	#end
134		-</ul></div>
135		-## year display / end
136		-##
137		-## year bottom / start
138		-<div #if( $foreach.last )id="bottom"#end class="mainselectbottom">
139		- #set( $itemYearNo = $itemMap[$year].size() )
140		- $itemYearNo
141		- #if( $oneCycle )
142		- #if( $itemYearNo == 1 )
143		- {{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}
144		- #else
145		- {{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}
	112	+## some selected year or year list / now $year
	113	+ #foreach( $cycle in $allThesisCycles )
	114	+ #set( $thesisYearCycleNo = 0 )
	115	+ #if( !$oneCycle || $selectedCycle == $cycle )
	116	+## some selected cycle or all cycles / now $cycle
	117	+ #if( $oneUser)
	118	+ #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4, LargeStringProperty as prop5
	119	+ 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" )
	120	+ #else
	121	+ #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2
	122	+ 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" )
	123	+ #end
	124	+ #set( $thesisFound = $xwiki.searchDocuments($sql) )
	125	+ #set( $thesisFoundNo = $thesisFound.size() )
	126	+ #set( $thesisYearCycleNo = $thesisYearCycleNo + $thesisFoundNo )
	127	+ #if( $thesisFoundNo > 0 && !$oneCycle )
	128	+(% 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']]
	129	+ #end
	130	+ #foreach( $thesis in $thesisFound )
	131	+* {{thesis}}$thesis{{/thesis}}
	132	+ #end
	133	+ #if( $thesisFoundNo > 0 && !$oneCycle )
	134	+(% 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"]]
	135	+ #end
146	146	#end
147		- #else
148		- #if( $itemYearNo == 1 )
149		- $services.localization.render('thesis').toLowerCase()
150		- #else
151		- $services.localization.render('theses').toLowerCase()
152		- #end
	137	+ #set( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo )
153	153	#end
154		- <span class="textsecondary">&ensp;/&ensp;</span>
155		- $year
156		- &ensp;&bull;&ensp;
157		- #anchorlinks()
158		-</div>
159		-## year bottom / end
	139	+ #if( !$oneYear )
	140	+(% 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"]]
	141	+ #end
	142	+ #set( $thesisNo = $thesisNo + $thesisYearNo )
160	160	#end
161		-## DISPLAY / END
162		-{{/html}}
163		-{{/velocity}}{{pageDisplay sort="objectservice"/}}
	144	+#if( $thesisNo > 0 )
	145	+(% 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)
	146	+#end
	147	+{{id name='bottom'/}}
	148	+{{/velocity}}