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( $statusSelected = false )
	7	+#set( $oneStatus = false )
8	8	#if( $statusPar != '' && $allThesisStatuses.contains($statusPar) )
9		- #set( $statusSelected = true )
	9	+ #set( $oneStatus = 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( $statusSelected = true )
	14	+ #set( $oneStatus = 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: $statusSelected set, $selectedStatus & $orderingDateFieldName set accordingly
	26	+## 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		-#set( $rolePar = $request.role.trim().toLowerCase() )
32	32	## default values
33		-#set( $userSelected = false )
	32	+#set( $oneUser = false )
	33	+#set( $oneRole = 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( $userSelected = true )
	44	+ #set( $oneUser = 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,59 +50,70 @@
50	50	#stop
51	51	#end
52	52	##user selected and existing user page
53		- #set( $roleSelected = false )
	53	+ #set( $rolePar = $request.role.trim().toLowerCase() )
54	54	#set( $selectedRole = '' )
55	55	#if( $rolePar != '' && $allThesisRoles.contains($rolePar) )
56		- #set( $roleSelected = true )
	56	+ #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
	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
65	65	##
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
75		-#end
76		-##
	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{{id name='top'/}}
	68	+## index
	69	+#if( !$oneStatus )
	70	+(% 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)))
	71	+#elseif( !$oneRole )
	72	+(% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $role in $allThesisRoles )#if ($velocityCount > 1) | #end [[$role>>||anchor="$role"]]#end)))
	73	+#end{{id name='index'/}}
	74	+## search theses
77	77	#foreach( $status in $allThesisStatuses )
78		- #if( !$statusSelected || $selectedStatus == $status )
79		-= $status =
	76	+ #if( !$oneStatus || $selectedStatus == $status )
	77	+(% 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}}
80	80	## some selected status or all statuses / now $status
81		- #if( $userSelected )
82		-== $userName ==
	79	+ #if( $oneUser )
	80	+== $selectedUser ==
83	83	## some user selected
84		- #if( $roleSelected )
85		-## some specific role selected
86		-=== $roleSelectedFieldName ===
87		- #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
88		- 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 '%$userName%' order by prop2.value desc" )
89		- #else
90		-## no specific role selected
91		- #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
92		- 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 = 'status' and prop1.name = 'supervisor' and prop2.name = 'coSupervisors' and prop3.name = 'contact' and prop4.name = '$orderingDateFieldName' and lower(prop0.value) = '$status' and ( prop1.value like '%$userName%' or prop2.value like '%$userName%' or prop3.value like '%$userName%' ) order by prop4.value desc" )
	82	+ #foreach( $role in $allThesisRoles )
	83	+ #if( !$oneRole || $selectedRole == $role )
	84	+ #if( $role == "contact" )
	85	+ #set( $selectedRoleFieldName = "contact" )
	86	+ #elseif( $role == "cosupervisor" )
	87	+ #set( $selectedRoleFieldName = "coSupervisors" )
	88	+ #else
	89	+ #set( $selectedRoleFieldName = "supervisor" )
	90	+ #end
	91	+## some selected role or all roles / now $role
	92	+=== $role ===
	93	+ #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
	94	+ 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" )
	95	+ #set( $thesisFound = $xwiki.searchDocuments($sql) )
	96	+ #foreach( $thesis in $thesisFound )
	97	+* $thesis
	98	+ #end
	99	+ #end
93	93	#end
94		- #else
95	95	## no user selected, no role selected
	102	+ #else
96	96	#set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
97	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 prop0.name = 'status' and prop1.name = '$orderingDateFieldName' and lower(prop0.value) = '$status' order by prop1.value desc" )
	105	+ #set( $thesisFound = $xwiki.searchDocuments($sql) )
	106	+ #foreach( $thesis in $thesisFound )
	107	+* $thesis
	108	+ #end
98	98	#end
99	99	#end
100		- #set( $thesisFound = $xwiki.searchDocuments($sql) )
101		- #set( $thesisFoundNo = $thesisFound.size() )
102	102	##
103		- #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
104		-* [[$thesisDoc.getValue("title")>>$thesisDoc]]#thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" || ( $thesisDoc.getValue("studentFirstName") != "" && $thesisDoc.getValue("studentLastName") != "" ) ) //(#thesisAuthorLink($thesis)#if( $thesisDoc.display("endDate") != "" ), #thesisYear($thesis)#end)//#end
105		-
106		- #end
	112	+## #set( $thesisFound = $xwiki.searchDocuments($sql) )
	113	+## #set( $thesisFoundNo = $thesisFound.size() )
	114	+## #set($thesisDoc = $xwiki.getDocument($thesis))
	115	+## #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
	116	+##* [[$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
	117	+## #end
107	107	#end
108	108	{{/velocity}}