Changes for page Per Year

Summary

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

Details

Page properties

Content

...	...	@@ -1,6 +1,7 @@
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) )
...	...	@@ -12,7 +12,8 @@
12	12	#if( $yearPar > 0 )
13	13	#set( $oneYear = true )
14	14	#set( $firstYear = $yearPar )
15		- #set( $lastYear = $toPar )
	16	+ #set( $lastYear = $yearPar )
	17	+ #set( $selectedYear = $yearPar )
16	16	#set( $yearList = [$yearPar] )
17	17	#else
18	18	#if( $fromPar != '' && ($fromPar > $firstYear) )
...	...	@@ -25,6 +25,7 @@
25	25	#end
26	26	#if( $lastYear <= $firstYear )
27	27	#set( $oneYear = true )
	30	+ #set( $lastYear = $firstYear )
28	28	#set( $selectedYear = $firstYear )
29	29	#set( $yearList = [$firstYear] )
30	30	#else
...	...	@@ -31,8 +31,6 @@
31	31	#set( $yearList = [$lastYear..$firstYear] )
32	32	#end
33	33	#end
34		-$oneYear
35		-$yearList
36	36	### END YEAR
37	37	##
38	38	### START USER & CYCLE
...	...	@@ -67,81 +67,68 @@
67	67	#end
68	68	#end
69	69	## $oneUser and $oneCycle set properly
70		-$oneUser
71		-$oneCycle
	71	+$yearList
	72	+#if( $oneYear )
	73	+ $selectedYear
	74	+#end
	75	+#if( $oneUser )
	76	+ $selectedUser
	77	+#end
	78	+#if( $oneCycle )
	79	+ $selectedCycle
	80	+ {{thesisCycle short='no'}}$selectedCycle{{/thesisCycle}}
	81	+#end
72	72	### END USER & CYCLE
73	73	##
74	74	## title
75		->#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'/}}
	85	+>#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'/}}
76	76	## index
77	77	#if( !$oneYear )
78	78	(% 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)))
79		-#elseif( $oneUser && !$oneCycle )
	89	+###elseif( $oneUser && !$oneCycle )
	90	+#elseif( !$oneCycle )
80	80	(% 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)))
81	81	#end{{id name='index'/}}
82		-
83		-#stop
84		-
85	85	## search theses
86	86	#set( $thesisNo = 0 )
87		-#foreach( $status in $allThesisStatuses )
88		- #if( !$oneStatus || $selectedStatus == $status )
89		- #set( $thesisStatusNo = 0 )
90		- #if( !$oneStatus )
91		-(% 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}}
92		- #end
93		-## some selected status or all statuses / now $status
94		- #if( $oneUser )
95		-## some user selected
96		- #foreach( $role in $allThesisRoles )
97		- #set( $thesisStatusRoleNo = 0 )
98		- #if( !$oneRole || $selectedRole == $role )
99		- #if( $role == "contact" )
100		- #set( $selectedRoleFieldName = "contacts" )
101		- #elseif( $role == "cosupervisor" )
102		- #set( $selectedRoleFieldName = "cosupervisors" )
103		- #else
104		- #set( $selectedRoleFieldName = "supervisors" )
105		- #end
106		-## some selected role or all roles / now $role
107		- #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
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 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" )
109		- #set( $thesisFound = $xwiki.searchDocuments($sql) )
110		- #set( $thesisFoundNo = $thesisFound.size() )
111		- #set( $thesisStatusRoleNo = $thesisStatusRoleNo + $thesisFoundNo )
112		- #if( $thesisFoundNo > 0 && !$oneRole )
113		-(% 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}}
114		- #end
115		- #foreach( $thesis in $thesisFound )
116		- #set($thesisDoc = $xwiki.getDocument($thesis))
117		- #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
118		-* [[$thesisObj.title>>$thesisDoc]]#if( $thesisObj.endDate != "" ) //($thesisObj.endDate)//#end#if( $thesisDoc.getValue('studentUserName') != "" ) [[$xwiki.getUserName($thesisDoc.getValue('studentUserName'), false)>>$thesisDoc.getValue('studentUserName')]]#elseif( $thesisObj.studentFirstName != "" && $thesisObj.studentLastName != "" ) $thesisObj.studentFirstName $thesisObj.studentLastName#end
119		-
120		- #end
121		- #if( $thesisFoundNo > 0 && !$oneRole )
122		-(% 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"]]
123		- #end
124		- #end
125		- #set( $thesisStatusNo = $thesisStatusNo + $thesisStatusRoleNo )
	95	+#foreach( $year in $yearList )
	96	+ #set( $thesisYearNo = 0 )
	97	+ #if( !$oneYear )
	98	+(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}$year
	99	+ #end
	100	+## some selected year or year list / now $year
	101	+ #foreach( $cycle in $allThesisCycles )
	102	+ #set( $thesisYearCycleNo = 0 )
	103	+ #if( !$oneCycle || $selectedCycle == $cycle )
	104	+## some selected cycle or all cycles / now $cycle
	105	+ #if( $oneUser)
	106	+ #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4
	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 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" )
	108	+ #else
	109	+ #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
	110	+ 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" )
126	126	#end
127		-## no user selected, no role selected
128		- #else
129		- #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
130		- 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 = 'status' and prop1.name = '$orderingDateFieldName' and lower(prop0.value) = '$status' order by prop1.value desc" )
131	131	#set( $thesisFound = $xwiki.searchDocuments($sql) )
132	132	#set( $thesisFoundNo = $thesisFound.size() )
133		- #set( $thesisStatusNo = $thesisStatusNo + $thesisFoundNo )
	114	+ #set( $thesisYearCycleNo = $thesisYearCycleNo + $thesisFoundNo )
	115	+ #if( $thesisFoundNo > 0 && !$oneCycle )
	116	+(% 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}}
	117	+ #end
134	134	#foreach( $thesis in $thesisFound )
135		- #set($thesisDoc = $xwiki.getDocument($thesis))
136		- #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
	119	+ #set( $thesisDoc = $xwiki.getDocument($thesis) )
	120	+ #set( $thesisObj = $thesisDoc.getObject('Theses.ThesisClass') )
137	137	* [[$thesisObj.title>>$thesisDoc]]#if( $thesisObj.endDate != "" ) //($thesisObj.endDate)//#end#if( $thesisDoc.getValue('studentUserName') != "" ) [[$xwiki.getUserName($thesisDoc.getValue('studentUserName'), false)>>$thesisDoc.getValue('studentUserName')]]#elseif( $thesisObj.studentFirstName != "" && $thesisObj.studentLastName != "" ) $thesisObj.studentFirstName $thesisObj.studentLastName#end
138	138
139	139	#end
	124	+ #if( $thesisFoundNo > 0 && !$oneCycle )
	125	+(% 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"]]
	126	+ #end
140	140	#end
141		- #if( !$oneStatus )
142		-(% 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" %)|($thesisStatusNo #if($thesisStatusNo == 1){{thesisStatus plural='false' uppercase='false' short='no'}}$status{{/thesisStatus}}#else{{thesisStatus plural='true' uppercase='false' short='no'}}$status{{/thesisStatus}}#end{{id name='$status-bottom'/}}) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]
143		- #end
	128	+ #set( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo )
144	144	#end
	130	+ #if( !$oneYear )
	131	+(% 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"]]
	132	+ #end
145	145	#end
146	146	{{id name='bottom'/}}
147	147	{{/velocity}}