Changes for page Per Year

Summary

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

Details

Page properties

Content

...	...	@@ -1,62 +1,48 @@
1	1	{{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
2	2	#set( $thesisMenu = true )
3	3	#set( $oneYear = false )
	4	+#set( $selectedYear = '' )
4	4	### START YEAR
5	5	## year parameter
6	6	#set( $yearPar = $mathtool.toInteger($request.year) )
7	7	#set( $fromPar = $mathtool.toInteger($request.from) )
8	8	#set( $toPar = $mathtool.toInteger($request.to) )
9		-#set( $firstYear = $mathtool.toInteger($firstYearTh) )$firstYear
10		-#set( $lastYear = $mathtool.toInteger($lastYearTh) )$lastYear
	10	+#set( $firstYear = $mathtool.toInteger($firstYearTh) )
	11	+#set( $lastYear = $mathtool.toInteger($lastYearTh) )
11	11	#set( $yearList = [$lastYear..$firstYear] )
12		-#if( $yearPar > 0 )??
	13	+#if( $yearPar > 0 )
13	13	#set( $oneYear = true )
14	14	#set( $firstYear = $yearPar )
15		- #set( $lastYear = $toPar )
16		- #set( $yearList = [$lastYear..$firstYear] )
	16	+ #set( $lastYear = $yearPar )
	17	+ #set( $selectedYear = $yearPar )
	18	+ #set( $yearList = [$yearPar] )
17	17	#else
18		- #if( $fromPar != '' && $fromPar > $firstYear )
	20	+ #if( $fromPar != '' && ($fromPar > $firstYear) )
19	19	#set( $firstYear = $fromPar )
20	20	#set( $yearList = [$lastYear..$firstYear] )
21	21	#end
22		- #if( $toPar != '' && $toPar > $lastYear)
	24	+ #if( $toPar != '' && ($toPar < $lastYear) )
23	23	#set( $lastYear = $toPar )
24	24	#set( $yearList = [$lastYear..$firstYear] )
25	25	#end
26	26	#if( $lastYear <= $firstYear )
27	27	#set( $oneYear = true )
	30	+ #set( $lastYear = $firstYear )
28	28	#set( $selectedYear = $firstYear )
	32	+ #set( $yearList = [$firstYear] )
29	29	#else
30	30	#set( $yearList = [$lastYear..$firstYear] )
31	31	#end
32	32	#end
33	33	$oneYear
34		-$firstYear
35		-$lastYear
36	36	$yearList
37		-#stop
38		-##check velocity variable, takes precedence
39		-#if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) )
40		- #set( $oneStatus = true )
41		- #set( $selectedStatus = $thesisStatus.trim().toLowerCase() )
42		-#end
43		-## set ordering field
44		-#if( $selectedStatus == "available" )
45		- #set( $orderingDateFieldName = "availabilityDate" )
46		-#elseif( $selectedStatus == "ongoing" )
47		- #set( $orderingDateFieldName = "startDate" )
48		-#else
49		-## default for no selected status, too
50		- #set( $orderingDateFieldName = "endDate" )
51		-#end
52		-## invariant: $oneStatus set, $selectedStatus & $orderingDateFieldName set accordingly
53		-### END STATUS
	39	+### END YEAR
54	54	##
55		-### START USER & ROLE
	41	+### START USER & CYCLE
56	56	#set( $userNamePar = $request.user.trim() )
57	57	## default values
58	58	#set( $oneUser = false )
59		-#set( $oneRole = false )
	45	+#set( $oneCycle = false )
60	60	#set( $userFirstName = "" )
61	61	#set( $userLastName = "" )
62	62	#if( $userName || $userNamePar )
...	...	@@ -76,57 +76,56 @@
76	76	#stop
77	77	#end
78	78	##user selected and existing user page
79		- #set( $rolePar = $request.role.trim().toLowerCase() )
80		- #set( $selectedRole = '' )
81		- #if( $rolePar != '' && $allThesisRoles.contains($rolePar) )
82		- #set( $oneRole = true )
83		- #set( $selectedRole = $rolePar )
	65	+ #set( $cyclePar = $request.cycle.trim().toUpperCase() )
	66	+ #set( $selectedCycle = '' )
	67	+ #if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) )
	68	+ #set( $oneCycle = true )
	69	+ #set( $selectedCycle = $cyclePar )
84	84	#end
85	85	#end
86		-## $oneUser and $oneRole set properly, other related variables set accordingly
87		-## $oneRole has meaning only if $oneUser
88		-## if $oneUser, $oneRole false means one user for all roles
89		-## if $oneUser, $oneRole true means one specific role for one user selected
90		-## if $oneUser is false, $oneRole means nothing -- so all users, all roles / just status
	72	+## $oneUser and $oneCycle set properly
	73	+$oneUser
	74	+$oneCycle
	75	+### END USER & CYCLE
91	91	##
92	92	## title
93		->#if( $oneStatus ){{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/thesisStatus}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end#if( $oneUser ) / $userFirstName **$userLastName**#end#if( $oneRole ) / {{thesisRole short='yes'}}$selectedRole{{/thesisRole}}#end{{id name='top'/}}
	78	+>#if( $oneRole ){{thesisCycle short='no'}}$selecteCycle{{/thesisCycle}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end / #if( $oneYear )$selectedYear#else$firstYear–$lastYear#end#if( $oneUser ) / $userFirstName **$userLastName**#end{{id name='top'/}}
94	94	## index
95		-#if( !$oneStatus )
96		-(% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $status in $allThesisStatuses )#if ($velocityCount > 1) | #end[[{{thesisStatus plural="true" uppercase="false"}}$status{{/thesisStatus}}>>||anchor="$status"]]#end)))
97		-#elseif( $oneUser && !$oneRole )
98		-(% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $role in $allThesisRoles )#if ($velocityCount > 1) | #end [[{{thesisRole}}$role{{/thesisRole}}>>||anchor="$role"]]#end)))
	80	+#if( !$oneYear )
	81	+(% 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)))
	82	+###elseif( $oneUser && !$oneCycle )
	83	+#elseif( !$oneCycle )
	84	+(% 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)))
99	99	#end{{id name='index'/}}
	86	+
	87	+#stop
	88	+
100	100	## search theses
101	101	#set( $thesisNo = 0 )
102		-#foreach( $status in $allThesisStatuses )
103		- #if( !$oneStatus || $selectedStatus == $status )
104		- #set( $thesisStatusNo = 0 )
105		- #if( !$oneStatus )
106		-(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$status'/}}{{thesisStatus plural='true' uppercase='true' short='true'}}$status{{/thesisStatus}}
	91	+#foreach( $year in $yearList )
	92	+ #if( !$oneYear || $selectedYear == $year )
	93	+ #set( $thesisYearNo = 0 )
	94	+ #if( !$oneYear )
	95	+(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}$year
107	107	#end
108		-## some selected status or all statuses / now $status
109		- #if( $oneUser )
110		-## some user selected
111		- #foreach( $role in $allThesisRoles )
112		- #set( $thesisStatusRoleNo = 0 )
113		- #if( !$oneRole || $selectedRole == $role )
114		- #if( $role == "contact" )
115		- #set( $selectedRoleFieldName = "contacts" )
116		- #elseif( $role == "cosupervisor" )
117		- #set( $selectedRoleFieldName = "cosupervisors" )
118		- #else
119		- #set( $selectedRoleFieldName = "supervisors" )
120		- #end
121		-## some selected role or all roles / now $role
122		- #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
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 prop2.id.id = obj.id and prop0.name = 'status' and prop1.name = '$selectedRoleFieldName' and prop2.name = '$orderingDateFieldName' and lower(prop0.value) = '$status' and prop1.value like '%$selectedUser%' order by prop2.value desc" )
124		- #set( $thesisFound = $xwiki.searchDocuments($sql) )
125		- #set( $thesisFoundNo = $thesisFound.size() )
126		- #set( $thesisStatusRoleNo = $thesisStatusRoleNo + $thesisFoundNo )
127		- #if( $thesisFoundNo > 0 && !$oneRole )
128		-(% style="border-style:#if( $oneStatus )solid hidden hidden solid#{else}hidden hidden hidden dotted#end; border-color:$theme.borderColor; text-align:left; font-style:oblique; font-size:smaller" %)|#if( $oneStatus ){{id name='$role'/}}#else{{id name='$status-$role'/}}#end{{thesisRole plural='no' uppercase='yes' short='yes'}}$role{{/thesisRole}}
129		- #end
	97	+## some selected year or year list / now $year
	98	+ #foreach( $cycle in $allThesisCycles )
	99	+ #set( $thesisYearCycleNo = 0 )
	100	+ #if( !$oneCycle || $selectedCycle == $cycle )
	101	+## some selected cycle or all cycles / now $cycle
	102	+ #if( $oneUser)
	103	+ #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4
	104	+ 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 prop1.value = '$year' and ( prop2.value like '%$selectedUser%' || prop3.value like '%$selectedUser%' || prop4.value like '%$selectedUser%' ) order by prop2.value desc" )
	105	+ #else
	106	+ #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
	107	+ 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 prop1.value = '$year' order by prop2.value desc" )
	108	+ #end
	109	+ #set( $thesisFound = $xwiki.searchDocuments($sql) )
	110	+ #set( $thesisFoundNo = $thesisFound.size() )
	111	+ #set( $thesisYearCycleNo = $thesisYearCycleNo + $thesisFoundNo )
	112	+ #if( $thesisFoundNo > 0 && !$oneCycle )
	113	+(% 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}}
	114	+ #end
130	130	#foreach( $thesis in $thesisFound )
131	131	#set($thesisDoc = $xwiki.getDocument($thesis))
132	132	#set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
...	...	@@ -137,7 +137,7 @@
137	137	(% style="border-style:#if( $oneStatus )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( $oneStatus ){{id name='$role-bottom'/}}#else{{id name='$role-$status-bottom'/}}#end($thesisStatusRoleNo #if( $thesisStatusRoleNo == 1 ){{thesisStatus plural='no' uppercase='no' short='no'}}$status{{/thesisStatus}}#else{{thesisStatus plural='yes' uppercase='no' short='no'}}$status{{/thesisStatus}}#end {{stringEngIta eng='as' ita='come'/}} {{thesisRole short='yes'}}$role{{/thesisRole}}) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]
138	138	#end
139	139	#end
140		- #set( $thesisStatusNo = $thesisStatusNo + $thesisStatusRoleNo )
	125	+ #set( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo )
141	141	#end
142	142	## no user selected, no role selected
143	143	#else