Changes for page Per Year

Summary

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

Details

Page properties

Content

...	...	@@ -4,14 +4,14 @@
4	4	## hypothesis: $thesisStatus set, default "Completed"
5	5	## status parameter
6	6	#set( $statusPar = $request.status.trim().toLowerCase() )
7		-#set( $oneStatus = false )
	7	+#set( $statusSelected = false )
8	8	#if( $statusPar != '' && $allThesisStatuses.contains($statusPar) )
9		- #set( $oneStatus = true )
	9	+ #set( $statusSelected = true )
10	10	#set( $selectedStatus = $statusPar )
11	11	#end
12	12	##check velocity variable, takes precedence
13	13	#if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) )
14		- #set( $oneStatus = true )
	14	+ #set( $statusSelected = true )
15	15	#set( $selectedStatus = $thesisStatus.trim().toLowerCase() )
16	16	#end
17	17	## set ordering field
...	...	@@ -23,14 +23,14 @@
23	23	## default for no selected status, too
24	24	#set( $orderingDateFieldName = "endDate" )
25	25	#end
26		-## invariant: $oneStatus set, $selectedStatus & $orderingDateFieldName set accordingly
	26	+## invariant: $statusSelected set, $selectedStatus & $orderingDateFieldName set accordingly
27	27	### END STATUS
28	28	##
29	29	### START USER & ROLE
30	30	#set( $userNamePar = $request.user.trim() )
	31	+#set( $rolePar = $request.role.trim().toLowerCase() )
31	31	## default values
32		-#set( $oneUser = false )
33		-#set( $oneRole = false )
	33	+#set( $userSelected = false )
34	34	#set( $userFirstName = "" )
35	35	#set( $userLastName = "" )
36	36	#if( $userName || $userNamePar )
...	...	@@ -41,7 +41,7 @@
41	41	#set( $selectedUser = $userName )
42	42	#end
43	43	#if( $xwiki.exists($selectedUser) )
44		- #set( $oneUser = true )
	44	+ #set( $userSelected = true )
45	45	#set( $userdoc = $xwiki.getDocument($selectedUser) )
46	46	#set( $userFirstName = $userdoc.display("first_name") )
47	47	#set( $userLastName = $userdoc.display("last_name") )
...	...	@@ -50,55 +50,47 @@
50	50	#stop
51	51	#end
52	52	##user selected and existing user page
53		- #set( $rolePar = $request.role.trim().toLowerCase() )
	53	+ #set( $roleSelected = false )
54	54	#set( $selectedRole = '' )
55	55	#if( $rolePar != '' && $allThesisRoles.contains($rolePar) )
56		- #set( $oneRole = true )
	56	+ #set( $roleSelected = true )
57	57	#set( $selectedRole = $rolePar )
58	58	#end
59	59	#end
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
	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
65	65	##
66		-## title
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
68		-
69		-## index
70		-#if( !$oneStatus )
71		-(% 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="$sort"]]#end)))
72		-#elseif( !$oneYear )
73		-(% 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)))
	66	+#set( $roleSelectedFieldName = "" )
	67	+#if( $roleSelected )
	68	+ #if( $selectedRole == "contact" )
	69	+ #set( $roleSelectedFieldName = "contact" )
	70	+ #elseif( $selectedRole == "cosupervisor" )
	71	+ #set( $roleSelectedFieldName = "coSupervisors" )
	72	+ #else
	73	+ #set( $roleSelectedFieldName = "supervisor" )
	74	+ #end
74	74	#end
75		-
76		-
77		-## search theses
	76	+##
78	78	#foreach( $status in $allThesisStatuses )
79		- #if( !$oneStatus || $selectedStatus == $status )
	78	+ #if( !$statusSelected || $selectedStatus == $status )
80	80	= $status =
81	81	## some selected status or all statuses / now $status
82		- #if( $oneUser )
	81	+ #if( $userSelected )
83	83	== $selectedUser ==
84	84	## some user selected
85	85	#foreach( $role in $allThesisRoles )
86		- #if( !$oneRole || $selectedRole == $role )
87		- #if( $role == "contact" )
88		- #set( $selectedRoleFieldName = "contact" )
89		- #elseif( $role == "cosupervisor" )
90		- #set( $selectedRoleFieldName = "coSupervisors" )
91		- #else
92		- #set( $selectedRoleFieldName = "supervisor" )
93		- #end
	85	+ #if( !$roleSelected || $selectedRole == $role )
94	94	## some selected role or all roles / now $role
95	95	=== $role ===
96	96	#set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
97		- 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" )
98		- #set( $thesisFound = $xwiki.searchDocuments($sql) )
99		- #foreach( $thesis in $thesisFound )
	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" )
	90	+ #end
	91	+ #set( $thesisFound = $xwiki.searchDocuments($sql) )
	92	+ #foreach( $thesis in $thesisFound )
100	100	* $thesis
101		- #end
102	102	#end
103	103	#end
104	104	## no user selected, no role selected