Changes for page Per Year

Summary

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

Details

Page properties

Title

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

Content

...	...	@@ -1,17 +1,42 @@
1	1	{{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
2	2	#set( $thesisMenu = true )
3		-### START STATUS
4		-## hypothesis: $thesisStatus set, default "Completed"
5		-## status parameter
6		-#set( $statusPar = $request.status.trim().toLowerCase() )
7		-#set( $statusSelected = false )
8		-#if( $statusPar != '' && $allThesisStatuses.contains($statusPar) )
9		- #set( $statusSelected = true )
10		- #set( $selectedStatus = $statusPar )
	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 = $firstYearTh )
	10	+#set( $lastYear = $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
11	11	#end
	31	+$oneYear
	32	+$selectedYear
	33	+$firstYear
	34	+$lastYear
	35	+$yearList
	36	+#stop
12	12	##check velocity variable, takes precedence
13	13	#if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) )
14		- #set( $statusSelected = true )
	39	+ #set( $oneStatus = true )
15	15	#set( $selectedStatus = $thesisStatus.trim().toLowerCase() )
16	16	#end
17	17	## set ordering field
...	...	@@ -23,13 +23,14 @@
23	23	## default for no selected status, too
24	24	#set( $orderingDateFieldName = "endDate" )
25	25	#end
26		-## invariant: $statusSelected set, $selectedStatus & $orderingDateFieldName set accordingly
	51	+## invariant: $oneStatus set, $selectedStatus & $orderingDateFieldName set accordingly
27	27	### END STATUS
28	28	##
29	29	### START USER & ROLE
30	30	#set( $userNamePar = $request.user.trim() )
31	31	## default values
32		-#set( $userSelected = false )
	57	+#set( $oneUser = false )
	58	+#set( $oneRole = false )
33	33	#set( $userFirstName = "" )
34	34	#set( $userLastName = "" )
35	35	#if( $userName || $userNamePar )
...	...	@@ -40,7 +40,7 @@
40	40	#set( $selectedUser = $userName )
41	41	#end
42	42	#if( $xwiki.exists($selectedUser) )
43		- #set( $userSelected = true )
	69	+ #set( $oneUser = true )
44	44	#set( $userdoc = $xwiki.getDocument($selectedUser) )
45	45	#set( $userFirstName = $userdoc.display("first_name") )
46	46	#set( $userLastName = $userdoc.display("last_name") )
...	...	@@ -50,48 +50,67 @@
50	50	#end
51	51	##user selected and existing user page
52	52	#set( $rolePar = $request.role.trim().toLowerCase() )
53		- #set( $roleSelected = false )
54	54	#set( $selectedRole = '' )
55	55	#if( $rolePar != '' && $allThesisRoles.contains($rolePar) )
56		- #set( $roleSelected = true )
	81	+ #set( $oneRole = true )
57	57	#set( $selectedRole = $rolePar )
58	58	#end
59	59	#end
60		-## $userselected and $roleSelected set properly, other related variables set accordingly
61		-## $roleSelected has meaning only if $userSelected
62		-## if $userSelected, $roleSelected false means one user for all roles
63		-## if $userSelected, $roleSelected true means one specific role for one user selected
64		-## if $userSelected is false, $roleSelected means nothing -- so all users, all roles / just status
	85	+## $oneUser and $oneRole set properly, other related variables set accordingly
	86	+## $oneRole has meaning only if $oneUser
	87	+## if $oneUser, $oneRole false means one user for all roles
	88	+## if $oneUser, $oneRole true means one specific role for one user selected
	89	+## if $oneUser is false, $oneRole means nothing -- so all users, all roles / just status
65	65	##
66	66	## title
67		->#if( $statusSelected ){{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/thesisStatus}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end#if( $userSelected ) / $userFirstName **$userLastName**#if( $roleSelected ) / $selectedRole#end#end
68		-
	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'/}}
	93	+## index
	94	+#if( !$oneStatus )
	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)))
	96	+#elseif( $oneUser && !$oneRole )
	97	+(% 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)))
	98	+#end{{id name='index'/}}
69	69	## search theses
	100	+#set( $thesisNo = 0 )
70	70	#foreach( $status in $allThesisStatuses )
71		- #if( !$statusSelected || $selectedStatus == $status )
72		-= $status =
	102	+ #if( !$oneStatus || $selectedStatus == $status )
	103	+ #set( $thesisStatusNo = 0 )
	104	+ #if( !$oneStatus )
	105	+(% 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}}
	106	+ #end
73	73	## some selected status or all statuses / now $status
74		- #if( $userSelected )
75		-== $selectedUser ==
	108	+ #if( $oneUser )
76	76	## some user selected
77	77	#foreach( $role in $allThesisRoles )
78		- #if( !$roleSelected || $selectedRole == $role )
	111	+ #set( $thesisStatusRoleNo = 0 )
	112	+ #if( !$oneRole || $selectedRole == $role )
79	79	#if( $role == "contact" )
80		- #set( $roleSelectedFieldName = "contact" )
	114	+ #set( $selectedRoleFieldName = "contacts" )
81	81	#elseif( $role == "cosupervisor" )
82		- #set( $roleSelectedFieldName = "coSupervisors" )
	116	+ #set( $selectedRoleFieldName = "cosupervisors" )
83	83	#else
84		- #set( $roleSelectedFieldName = "supervisor" )
	118	+ #set( $selectedRoleFieldName = "supervisors" )
85	85	#end
86	86	## some selected role or all roles / now $role
87		-=== $role ===
88	88	#set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
89		- 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 = '$roleSelectedFieldName' and prop2.name = '$orderingDateFieldName' and lower(prop0.value) = '$status' and prop1.value like '%$selectedUser%' order by prop2.value desc" )
	122	+ 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" )
90	90	#set( $thesisFound = $xwiki.searchDocuments($sql) )
	124	+ #set( $thesisFoundNo = $thesisFound.size() )
	125	+ #set( $thesisStatusRoleNo = $thesisStatusRoleNo + $thesisFoundNo )
	126	+ #if( $thesisFoundNo > 0 && !$oneRole )
	127	+(% 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}}
	128	+ #end
91	91	#foreach( $thesis in $thesisFound )
92		-* $thesis
	130	+ #set($thesisDoc = $xwiki.getDocument($thesis))
	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
	133	+
93	93	#end
	135	+ #if( $thesisFoundNo > 0 && !$oneRole )
	136	+(% 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"]]
	137	+ #end
94	94	#end
	139	+ #set( $thesisStatusNo = $thesisStatusNo + $thesisStatusRoleNo )
95	95	#end
96	96	## no user selected, no role selected
97	97	#else
...	...	@@ -98,17 +98,19 @@
98	98	#set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
99	99	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" )
100	100	#set( $thesisFound = $xwiki.searchDocuments($sql) )
	146	+ #set( $thesisFoundNo = $thesisFound.size() )
	147	+ #set( $thesisStatusNo = $thesisStatusNo + $thesisFoundNo )
101	101	#foreach( $thesis in $thesisFound )
102		-* $thesis
	149	+ #set($thesisDoc = $xwiki.getDocument($thesis))
	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
	152	+
103	103	#end
104	104	#end
	155	+ #if( !$oneStatus )
	156	+(% 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"]]
	157	+ #end
105	105	#end
106		-##
107		-## #set( $thesisFound = $xwiki.searchDocuments($sql) )
108		-## #set( $thesisFoundNo = $thesisFound.size() )
109		-## #set($thesisDoc = $xwiki.getDocument($thesis))
110		-## #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
111		-##* [[$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
112		-## #end
113	113	#end
	160	+{{id name='bottom'/}}
114	114	{{/velocity}}