Changes for page Per Year

Summary

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

Details

Page properties

Content

...	...	@@ -34,8 +34,6 @@
34	34	#set( $yearList = [$lastYear..$firstYear] )
35	35	#end
36	36	#end
37		-$oneYear
38		-$yearList
39	39	### END YEAR
40	40	##
41	41	### START USER & CYCLE
...	...	@@ -70,8 +70,9 @@
70	70	#end
71	71	#end
72	72	## $oneUser and $oneCycle set properly
73		-$oneUser
74		-$oneCycle
	71	+#if( $oneYear )$selectedYear#end
	72	+#if( $oneUser )$selectedUser#end
	73	+#if( $oneCycle )$selectedCycle#end
75	75	### END USER & CYCLE
76	76	##
77	77	## title
...	...	@@ -83,69 +83,48 @@
83	83	#elseif( !$oneCycle )
84	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)))
85	85	#end{{id name='index'/}}
86		-
87		-#stop
88		-
89	89	## search theses
90	90	#set( $thesisNo = 0 )
91	91	#foreach( $year in $yearList )
92		- #if( !$oneStatus || $selectedStatus == $status )
93		- #set( $thesisStatusNo = 0 )
94		- #if( !$oneStatus )
95		-(% 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}}
	88	+ #if( !$oneYear || $selectedYear == $year )
	89	+ #set( $thesisYearNo = 0 )
	90	+ #if( !$oneYear )
	91	+(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}$year
96	96	#end
97		-## some selected status or all statuses / now $status
98		- #if( $oneUser )
99		-## some user selected
100		- #foreach( $role in $allThesisRoles )
101		- #set( $thesisStatusRoleNo = 0 )
102		- #if( !$oneRole || $selectedRole == $role )
103		- #if( $role == "contact" )
104		- #set( $selectedRoleFieldName = "contacts" )
105		- #elseif( $role == "cosupervisor" )
106		- #set( $selectedRoleFieldName = "cosupervisors" )
107		- #else
108		- #set( $selectedRoleFieldName = "supervisors" )
109		- #end
110		-## some selected role or all roles / now $role
111		- #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
112		- 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" )
113		- #set( $thesisFound = $xwiki.searchDocuments($sql) )
114		- #set( $thesisFoundNo = $thesisFound.size() )
115		- #set( $thesisStatusRoleNo = $thesisStatusRoleNo + $thesisFoundNo )
116		- #if( $thesisFoundNo > 0 && !$oneRole )
117		-(% 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}}
118		- #end
119		- #foreach( $thesis in $thesisFound )
120		- #set($thesisDoc = $xwiki.getDocument($thesis))
121		- #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
	93	+## some selected year or year list / now $year
	94	+ #foreach( $cycle in $allThesisCycles )
	95	+ #set( $thesisYearCycleNo = 0 )
	96	+ #if( !$oneCycle || $selectedCycle == $cycle )
	97	+## some selected cycle or all cycles / now $cycle
	98	+ #if( $oneUser)
	99	+ #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4
	100	+ 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%' or prop3.value like '%$selectedUser%' or prop4.value like '%$selectedUser%' ) order by prop1.value desc" )
	101	+ #else
	102	+ #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
	103	+ 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 prop1.value desc" )
	104	+ #end
	105	+ #set( $thesisFound = $xwiki.searchDocuments($sql) )
	106	+ #set( $thesisFoundNo = $thesisFound.size() )
	107	+ #set( $thesisYearCycleNo = $thesisYearCycleNo + $thesisFoundNo )
	108	+ #if( $thesisFoundNo > 0 && !$oneCycle )
	109	+(% 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}}
	110	+ #end
	111	+ #foreach( $thesis in $thesisFound )
	112	+ #set( $thesisDoc = $xwiki.getDocument($thesis) )
	113	+ #set( $thesisObj = $thesisDoc.getObject('Theses.ThesisClass') )
122	122	* [[$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
123	123
124	124	#end
125		- #if( $thesisFoundNo > 0 && !$oneRole )
126		-(% 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"]]
	117	+ #if( $thesisFoundNo > 0 && !$oneCycle )
	118	+(% 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"]]
127	127	#end
128	128	#end
129		- #set( $thesisStatusNo = $thesisStatusNo + $thesisStatusRoleNo )
	121	+ #set( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo )
130	130	#end
131		-## no user selected, no role selected
132		- #else
133		- #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
134		- 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" )
135		- #set( $thesisFound = $xwiki.searchDocuments($sql) )
136		- #set( $thesisFoundNo = $thesisFound.size() )
137		- #set( $thesisStatusNo = $thesisStatusNo + $thesisFoundNo )
138		- #foreach( $thesis in $thesisFound )
139		- #set($thesisDoc = $xwiki.getDocument($thesis))
140		- #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
141		-* [[$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
142		-
143		- #end
144	144	#end
145		- #if( !$oneStatus )
146		-(% 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"]]
	124	+ #if( !$oneYear )
	125	+(% 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"]]
147	147	#end
148	148	#end
149		-#end
150	150	{{id name='bottom'/}}
151	151	{{/velocity}}