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	+#set($title="Theses per Status")#if($xcontext.language=='it')#set($title="Tesi per stato")#end$title

Content

...	...	@@ -1,45 +1,36 @@
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) )
7		-#set( $fromPar = $mathtool.toInteger($request.from) )
8		-#set( $toPar = $mathtool.toInteger($request.to) )
9		-#set( $firstYear = $mathtool.toInteger($firstYearTh) )
10		-#set( $lastYear = $mathtool.toInteger($lastYearTh) )
11		-#set( $yearList = [$lastYear..$firstYear] )
12		-#if( $yearPar > 0 )
13		- #set( $oneYear = true )
14		- #set( $firstYear = $yearPar )
15		- #set( $lastYear = $toPar )
16		- #set( $yearList = [$yearPar] )
	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 )
	11	+#end
	12	+##check velocity variable, takes precedence
	13	+#if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) )
	14	+ #set( $oneStatus = true )
	15	+ #set( $selectedStatus = $thesisStatus.trim().toLowerCase() )
	16	+#end
	17	+## set ordering field
	18	+#if( $selectedStatus == "available" )
	19	+ #set( $orderingDateFieldName = "availabilityDate" )
	20	+#elseif( $selectedStatus == "ongoing" )
	21	+ #set( $orderingDateFieldName = "startDate" )
17	17	#else
18		- #if( $fromPar != '' && ($fromPar > $firstYear) )
19		- #set( $firstYear = $fromPar )
20		- #set( $yearList = [$lastYear..$firstYear] )
21		- #end
22		- #if( $toPar != '' && ($toPar < $lastYear) )
23		- #set( $lastYear = $toPar )
24		- #set( $yearList = [$lastYear..$firstYear] )
25		- #end
26		- #if( $lastYear <= $firstYear )
27		- #set( $oneYear = true )
28		- #set( $selectedYear = $firstYear )
29		- #set( $yearList = [$firstYear] )
30		- #else
31		- #set( $yearList = [$lastYear..$firstYear] )
32		- #end
	23	+## default for no selected status, too
	24	+ #set( $orderingDateFieldName = "endDate" )
33	33	#end
34		-$oneYear
35		-$yearList
36		-### END YEAR
	26	+## invariant: $oneStatus set, $selectedStatus & $orderingDateFieldName set accordingly
	27	+### END STATUS
37	37	##
38		-### START USER & CYCLE
	29	+### START USER & ROLE
39	39	#set( $userNamePar = $request.user.trim() )
40	40	## default values
41	41	#set( $oneUser = false )
42		-#set( $oneCycle = false )
	33	+#set( $oneRole = false )
43	43	#set( $userFirstName = "" )
44	44	#set( $userLastName = "" )
45	45	#if( $userName || $userNamePar )
...	...	@@ -59,20 +59,18 @@
59	59	#stop
60	60	#end
61	61	##user selected and existing user page
62		- #set( $cyclePar = $request.cycle.trim().toUpperCase() )
63		- #set( $selectedCycle = '' )
64		- #if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) )
65		- #set( $oneCycle = true )
66		- #set( $selectedCycle = $cyclePar )
	53	+ #set( $rolePar = $request.role.trim().toLowerCase() )
	54	+ #set( $selectedRole = '' )
	55	+ #if( $rolePar != '' && $allThesisRoles.contains($rolePar) )
	56	+ #set( $oneRole = true )
	57	+ #set( $selectedRole = $rolePar )
67	67	#end
68	68	#end
69		-## $oneUser and $oneCycle set properly
70		-$oneUser
71		-$oneCycle
72		-### END USER & CYCLE
73		-#stop
74		-
75		-
	60	+## $oneUser and $oneRole set properly, other related variables set accordingly
	61	+## $oneRole has meaning only if $oneUser
	62	+## if $oneUser, $oneRole false means one user for all roles
	63	+## if $oneUser, $oneRole true means one specific role for one user selected
	64	+## if $oneUser is false, $oneRole means nothing -- so all users, all roles / just status
76	76	##
77	77	## title
78	78	>#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'/}}
...	...	@@ -115,7 +115,7 @@
115	115	#foreach( $thesis in $thesisFound )
116	116	#set($thesisDoc = $xwiki.getDocument($thesis))
117	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
	107	+* [[$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	119
120	120	#end
121	121	#if( $thesisFoundNo > 0 && !$oneRole )
...	...	@@ -134,7 +134,7 @@
134	134	#foreach( $thesis in $thesisFound )
135	135	#set($thesisDoc = $xwiki.getDocument($thesis))
136	136	#set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
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
	126	+* [[$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
138	138
139	139	#end
140	140	#end