Changes for page Per Year

Summary

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

Details

Page properties

Content

...	...	@@ -43,10 +43,9 @@
43	43	#set( $yearList = [$lastYear..$firstYear] )
44	44	#end
45	45	#end
46		-## $selectedYear, $yearList and $oneYear set properly
47	47	### END YEAR
48	48	##
49		-### START USER
	48	+### START USER & CYCLE
50	50	## default values
51	51	#set( $oneUser = false )
52	52	#set( $selectedUser = '' )
...	...	@@ -57,7 +57,7 @@
57	57	#set( $userNamePar = $request.user.trim() )
58	58	#end
59	59	#if( $userName || $userNamePar )
60		-## try to specify a user
	59	+## a user is specified for all roles
61	61	#if( !$userName )
62	62	#set( $selectedUser = "XWiki.$userNamePar" )
63	63	#else
...	...	@@ -73,26 +73,30 @@
73	73	#stop
74	74	#end
75	75	#end
76		-## $selectedUser and $oneUser set properly
77		-### END USER
78		-##
79		-### START CYCLE
	75	+##if user selected, existing user page
80	80	#set( $oneCycle = false )
81	81	#set( $selectedCycle = '' )
82		-## cycle parameter
83		-#if( $request.cycle )
84		- #set( $cyclePar = $request.cycle.trim().toUpperCase() )
85		-#end
86		-## set cycle
	78	+#set( $cyclePar = $request.cycle.trim().toUpperCase() )
87	87	#if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) )
88	88	#set( $oneCycle = true )
89	89	#set( $selectedCycle = $cyclePar )
90	90	#end
91		-## $selectedCycle and $oneCycle set properly
92		-### END CYCLE
	83	+## $oneUser and $oneCycle set properly
	84	+$yearList
	85	+#if( $oneYear )
	86	+ $selectedYear
	87	+#end
	88	+#if( $oneUser )
	89	+ $selectedUser
	90	+#end
	91	+#if( $oneCycle )
	92	+ $selectedCycle
	93	+ {{thesisCycle short='no'}}$selectedCycle{{/thesisCycle}}
	94	+#end
	95	+### END USER & CYCLE
93	93	##
94	94	## title
95		->#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	+>#if( $oneCycle ){{thesisCycle 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'/}}
96	96	## index
97	97	#if( !$oneYear )
98	98	(% 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)))
...	...	@@ -113,11 +113,11 @@
113	113	#if( !$oneCycle || $selectedCycle == $cycle )
114	114	## some selected cycle or all cycles / now $cycle
115	115	#if( $oneUser)
116		- #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4, LargeStringProperty as prop5
117		- where obj.name = doc.fullName and obj.className = 'Theses.ThesisClass' and obj.name <> 'Theses.ThesisClassTemplate' 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" )
	119	+ #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4
	120	+ where obj.name = doc.fullName and obj.className = 'Theses.ThesisClass' and obj.name <> 'Theses.ThesisClassTemplate' 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 prop0.name = 'cycle' and prop1.name = 'year' and prop2.name = 'supervisors' and prop3.name = 'cosupervisors' and prop4.name = 'contacts' and prop0.value = '$cycle' and year(prop1.value) = '$year' and ( prop2.value like '%$selectedUser%' or prop3.value like '%$selectedUser%' or prop4.value like '%$selectedUser%' ) order by prop1.value desc" )
118	118	#else
119		- #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2
120		- where obj.name = doc.fullName and obj.className = 'Theses.ThesisClass' and obj.name <> 'Theses.ThesisClassTemplate' 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" )
	122	+ #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
	123	+ where obj.name = doc.fullName and obj.className = 'Theses.ThesisClass' and obj.name <> 'Theses.ThesisClassTemplate' and obj.name <> 'Theses.ThesisTemplate' and prop0.id.id = obj.id and prop1.id.id = obj.id and prop0.name = 'cycle' and prop1.name = 'year' and prop0.value = '$cycle' and year(prop1.value) = '$year' order by prop1.value desc" )
121	121	#end
122	122	#set( $thesisFound = $xwiki.searchDocuments($sql) )
123	123	#set( $thesisFoundNo = $thesisFound.size() )
...	...	@@ -138,7 +138,7 @@
138	138	#set( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo )
139	139	#end
140	140	#if( !$oneYear )
141		-(% 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"]]
	144	+(% 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"]]
142	142	#end
143	143	#end
144	144	{{id name='bottom'/}}