Changes for page Per Year

Summary

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

Details

Page properties

Content

...	...	@@ -28,7 +28,6 @@
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	33	#set( $userSelected = false )
34	34	#set( $userFirstName = "" )
...	...	@@ -50,6 +50,7 @@
50	50	#stop
51	51	#end
52	52	##user selected and existing user page
	52	+ #set( $rolePar = $request.role.trim().toLowerCase() )
53	53	#set( $roleSelected = false )
54	54	#set( $selectedRole = '' )
55	55	#if( $rolePar != '' && $allThesisRoles.contains($rolePar) )
...	...	@@ -63,17 +63,6 @@
63	63	## if $userSelected, $roleSelected true means one specific role for one user selected
64	64	## if $userSelected is false, $roleSelected 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		-##
77	77	#foreach( $status in $allThesisStatuses )
78	78	#if( !$statusSelected || $selectedStatus == $status )
79	79	= $status =
...	...	@@ -81,30 +81,41 @@
81	81	#if( $userSelected )
82	82	== $selectedUser ==
83	83	## some user selected
84		- #if( $roleSelected )
85		-## some specific role selected
86		-=== $roleSelected ===
87		- #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
	73	+ #foreach( $role in $allThesisRoles )
	74	+ #if( !$roleSelected || $selectedRole == $role )
	75	+ #if( $role == "contact" )
	76	+ #set( $roleSelectedFieldName = "contact" )
	77	+ #elseif( $role == "cosupervisor" )
	78	+ #set( $roleSelectedFieldName = "coSupervisors" )
	79	+ #else
	80	+ #set( $roleSelectedFieldName = "supervisor" )
	81	+ #end
	82	+## some selected role or all roles / now $role
	83	+=== $role ===
	84	+ #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
88	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 '%$selectedUser%' 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 '%$selectedUser%' or prop2.value like '%$selectedUser%' or prop3.value like '%$selectedUser%' ) order by prop4.value desc" )
	86	+ #set( $thesisFound = $xwiki.searchDocuments($sql) )
	87	+ #foreach( $thesis in $thesisFound )
	88	+* $thesis
	89	+ #end
	90	+ #end
93	93	#end
94		- #else
95	95	## no user selected, no role selected
	93	+ #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" )
	96	+ #set( $thesisFound = $xwiki.searchDocuments($sql) )
	97	+ #foreach( $thesis in $thesisFound )
	98	+* $thesis
	99	+ #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)
104		- #set($thesisDoc = $xwiki.getDocument($thesis))
105		- #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
106		-* [[$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
107		-
108		- #end
	103	+## #set( $thesisFound = $xwiki.searchDocuments($sql) )
	104	+## #set( $thesisFoundNo = $thesisFound.size() )
	105	+## #set($thesisDoc = $xwiki.getDocument($thesis))
	106	+## #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
	107	+##* [[$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
	108	+## #end
109	109	#end
110	110	{{/velocity}}