Changes for page Per Year

Summary

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

Details

Page properties

Title

...	...	@@ -1,1 +1,1 @@
1		-#if($xcontext.language=='it')Tesi per anno#{else}Theses per Year#end
	1	+Theses per Status

Content

...	...	@@ -1,39 +1,14 @@
1	1	{{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
2	2	#set( $thesisMenu = true )
3		-#set( $oneYear = false )
4		-### START YEAR
5		-## year parameter
6		-#set( $yearPar = $mathtool.toInteger($request.year) )$yearPar
7		-#set( $fromPar = $mathtool.toInteger($request.from) )$fromPar
8		-#set( $toPar = $mathtool.toInteger($request.to) )$toPar
9		-#set( $firstYear = $mathtool.toInteger($firstYearTh) )
10		-#set( $lastYear = $mathtool.toInteger($lastYearTh) )
11		-#set( $yearList = [$lastYear..$firstYear] )
12		-#if( $yearPar != '' )
13		- #set( $oneYear = true )
14		- #set( $selectedYear = $yearPar )
15		-#else
16		- #if( $fromPar != '' && $yearList.contains($fromPar) )
17		- #set( $firstYear = $fromPar )
18		- #set( $yearList = [$lastYear..$firstYear] )
19		- #end
20		- #if( $toPar != '' && $yearList.contains($toPar) )
21		- #set( $lastYear = $toPar )
22		- #set( $yearList = [$lastYear..$firstYear] )
23		- #end
24		- #if( $lastYear <= $firstYear )
25		- #set( $oneYear = true )
26		- #set( $selectedYear = $firstYear )
27		- #else
28		- #set( $yearList = [$lastYear..$firstYear] )
29		- #end
	3	+### START STATUS
	4	+## hypothesis: $thesisStatus set, default "Completed"
	5	+## status parameter
	6	+#set( $statusPar = $request.status.trim().toLowerCase() )
	7	+#set( $oneStatus = false )
	8	+#if( $statusPar != '' && $allThesisStatuses.contains($statusPar) )
	9	+ #set( $oneStatus = true )
	10	+ #set( $selectedStatus = $statusPar )
30	30	#end
31		-$oneYear
32		-$selectedYear
33		-$firstYear
34		-$lastYear
35		-$yearList
36		-#stop
37	37	##check velocity variable, takes precedence
38	38	#if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) )
39	39	#set( $oneStatus = true )
...	...	@@ -89,7 +89,7 @@
89	89	## if $oneUser is false, $oneRole means nothing -- so all users, all roles / just status
90	90	##
91	91	## title
92		->#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'/}}
	67	+>#if( $oneStatus ){{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/thesisStatus}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end#if( $oneUser ) / $userFirstName **$userLastName**#end#if( $oneRole ) / $selectedRole#end{{id name='top'/}}
93	93	## index
94	94	#if( !$oneStatus )
95	95	(% 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)))
...	...	@@ -111,11 +111,11 @@
111	111	#set( $thesisStatusRoleNo = 0 )
112	112	#if( !$oneRole || $selectedRole == $role )
113	113	#if( $role == "contact" )
114		- #set( $selectedRoleFieldName = "contacts" )
	89	+ #set( $selectedRoleFieldName = "contact" )
115	115	#elseif( $role == "cosupervisor" )
116		- #set( $selectedRoleFieldName = "cosupervisors" )
	91	+ #set( $selectedRoleFieldName = "coSupervisors" )
117	117	#else
118		- #set( $selectedRoleFieldName = "supervisors" )
	93	+ #set( $selectedRoleFieldName = "supervisor" )
119	119	#end
120	120	## some selected role or all roles / now $role
121	121	#set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
...	...	@@ -129,7 +129,7 @@
129	129	#foreach( $thesis in $thesisFound )
130	130	#set($thesisDoc = $xwiki.getDocument($thesis))
131	131	#set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
132		-* [[$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
	107	+* [[$thesisObj.title>>$thesisDoc]]#if( $thesisObj.endDate != "" ) ($thesisObj.endDate)#end#if( $thesisDoc.getValue('studentUserName') != "" ) $thesisDoc.getValue('studentUserName')#elseif( $thesisObj.studentFirstName != "" && $thesisObj.studentLastName != "" ) $thesisObj.studentFirstName $thesisObj.studentLastName#end
133	133
134	134	#end
135	135	#if( $thesisFoundNo > 0 && !$oneRole )
...	...	@@ -148,7 +148,7 @@
148	148	#foreach( $thesis in $thesisFound )
149	149	#set($thesisDoc = $xwiki.getDocument($thesis))
150	150	#set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
151		-* [[$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
	126	+* [[$thesisObj.title>>$thesisDoc]] #if( $thesisDoc.getValue('studentUserName') != "" )//$thesisDoc.getValue('studentUserName')//#elseif( $thesisObj.studentFirstName != "" && $thesisObj.studentLastName != "" )//$thesisObj.studentFirstName $thesisObj.studentLastName//#end#if( $thesisObj.endDate != "" ) ($thesisObj.endDate)#end
152	152
153	153	#end
154	154	#end