Changes for page Per Year

Summary

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

Details

Page properties

Content

...	...	@@ -1,15 +1,24 @@
1	1	{{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
2	2	#set( $thesisMenu = true )
3		-#set( $oneYear = false )
4		-#set( $selectedYear = '' )
5		-### START YEAR
6		-## year parameter
7		-#set( $yearPar = $mathtool.toInteger($request.year) )
8		-#set( $fromPar = $mathtool.toInteger($request.from) )
9		-#set( $toPar = $mathtool.toInteger($request.to) )
	3	+## get environment variables & derived
10	10	#set( $firstYear = $mathtool.toInteger($firstYearTh) )
11	11	#set( $lastYear = $mathtool.toInteger($lastYearTh) )
12	12	#set( $yearList = [$lastYear..$firstYear] )
	7	+### START YEAR
	8	+## defaults
	9	+#set( $oneYear = false )
	10	+#set( $selectedYear = '' )
	11	+## year parameters
	12	+#if( $request.year )
	13	+ #set( $yearPar = $mathtool.toInteger($request.year) )
	14	+#end
	15	+#if( $request.from )
	16	+ #set( $fromPar = $mathtool.toInteger($request.from) )
	17	+#end
	18	+#if( $request.to )
	19	+ #set( $toPar = $mathtool.toInteger($request.to) )
	20	+#end
	21	+##set years
13	13	#if( $yearPar > 0 )
14	14	#set( $oneYear = true )
15	15	#set( $firstYear = $yearPar )
...	...	@@ -34,17 +34,21 @@
34	34	#set( $yearList = [$lastYear..$firstYear] )
35	35	#end
36	36	#end
	46	+## $selectedYear, $yearList and $oneYear set properly
37	37	### END YEAR
38	38	##
39		-### START USER & CYCLE
40		-#set( $userNamePar = $request.user.trim() )
	49	+### START USER
41	41	## default values
42	42	#set( $oneUser = false )
43	43	#set( $selectedUser = '' )
44	44	#set( $userFirstName = "" )
45	45	#set( $userLastName = "" )
46		-#if( $userName || $userNamePar || $userNamePar != '' )
47		-## a user is specified for all roles
	55	+## user parameter
	56	+#if( $request.user )
	57	+ #set( $userNamePar = $request.user.trim() )
	58	+#end
	59	+#if( $userName || $userNamePar )
	60	+## try to specify a user
48	48	#if( !$userName )
49	49	#set( $selectedUser = "XWiki.$userNamePar" )
50	50	#else
...	...	@@ -60,30 +60,42 @@
60	60	#stop
61	61	#end
62	62	#end
63		-##if user selected, existing user page
	76	+## $selectedUser and $oneUser set properly
	77	+### END USER
	78	+##
	79	+### START CYCLE
64	64	#set( $oneCycle = false )
65	65	#set( $selectedCycle = '' )
66		-#set( $cyclePar = $request.cycle.trim().toUpperCase() )
	82	+## cycle parameter
	83	+#if( $request.cycle )
	84	+ #set( $cyclePar = $request.cycle.trim().toUpperCase() )
	85	+#end
	86	+## set cycle
67	67	#if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) )
68	68	#set( $oneCycle = true )
69	69	#set( $selectedCycle = $cyclePar )
70	70	#end
71		-## $oneUser and $oneCycle set properly
72		-$yearList
	91	+## $selectedCycle and $oneCycle set properly
	92	+### END CYCLE
73	73	#if( $oneYear )
74	74	$selectedYear
	95	+#else
	96	+ $yearList
75	75	#end
76	76	#if( $oneUser )
77	77	$selectedUser
	100	+#else
	101	+ ALL USERS
78	78	#end
79	79	#if( $oneCycle )
80	80	$selectedCycle
81		- {{thesisCycle short='no'}}$selectedCycle{{/thesisCycle}}
	105	+#else
	106	+ ALL USERS
82	82	#end
83	83	### END USER & CYCLE
84	84	##
85	85	## title
86		->#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'/}}
	111	+>#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'/}}
87	87	## index
88	88	#if( !$oneYear )
89	89	(% 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)))
...	...	@@ -105,12 +105,13 @@
105	105	## some selected cycle or all cycles / now $cycle
106	106	#if( $oneUser)
107	107	#set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4
108		- 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" )
	133	+ 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" )
109	109	#else
110	110	#set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
111		- 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" )
	136	+ 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" )
112	112	#end
113	113	#set( $thesisFound = $xwiki.searchDocuments($sql) )
	139	+$sql
114	114	#set( $thesisFoundNo = $thesisFound.size() )
115	115	#set( $thesisYearCycleNo = $thesisYearCycleNo + $thesisFoundNo )
116	116	#if( $thesisFoundNo > 0 && !$oneCycle )