Changes for page Per Year

Summary

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

Details

Page properties

Content

...	...	@@ -1,17 +1,16 @@
1	1	{{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
2	2	#set( $thesisMenu = true )
3		-### START STATUS
	3	+#### get parameters
4	4	## hypothesis: $thesisStatus set, default "Completed"
5	5	## status parameter
6	6	#set( $statusPar = $request.status.trim().toLowerCase() )
7		-#set( $statusSelected = false )
8	8	#if( $statusPar != '' && $allThesisStatuses.contains($statusPar) )
9		- #set( $statusSelected = true )
10	10	#set( $selectedStatus = $statusPar )
	9	+#else
	10	+ #set( $selectedStatus = 'all' )
11	11	#end
12	12	##check velocity variable, takes precedence
13	13	#if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) )
14		- #set( $statusSelected = true )
15	15	#set( $selectedStatus = $thesisStatus.trim().toLowerCase() )
16	16	#end
17	17	## set ordering field
...	...	@@ -20,92 +20,122 @@
20	20	#elseif( $selectedStatus == "ongoing" )
21	21	#set( $orderingDateFieldName = "startDate" )
22	22	#else
23		-## default for no selected status, too
24	24	#set( $orderingDateFieldName = "endDate" )
25	25	#end
26		-## invariant: $statusSelected set, $selectedStatus & $orderingDateFieldName set accordingly
27		-### END STATUS
28		-##
29		-### START USER & ROLE
30		-#set( $userNamePar = $request.user.trim() )
31		-#set( $rolePar = $request.role.trim().toLowerCase() )
32		-## default values
	24	+## invariant: $thesisStatus set, $orderingDateFieldName set correspondingly
	25	+## who
	26	+#set( $userNamePar = $request.user )
	27	+#set( $supervisorNamePar = $request.supervisor )
	28	+#set( $cosupervisorNamePar = $request.cosupervisor )
	29	+#set( $contactNamePar = $request.contact )
	30	+#### set default values
33	33	#set( $userSelected = false )
	32	+#set( $roleSelected = false )
34	34	#set( $userFirstName = "" )
35	35	#set( $userLastName = "" )
36		-#if( $userName || $userNamePar )
	35	+#set( $supervisorName = "" )
	36	+#set( $supervisorFirstName = "" )
	37	+#set( $supervisorLastName = "" )
	38	+#set( $cosupervisorName = "" )
	39	+#set( $cosupervisorFirstName = "" )
	40	+#set( $cosupervisorLastName = "" )
	41	+#set( $contactName = "" )
	42	+#set( $contactFirstName = "" )
	43	+#set( $contactLastName = "" )
	44	+##
	45	+#### handle who & roles
	46	+##
	47	+#if ( $userName || $userNamePar )
37	37	## a user is specified for all roles
38		- #if( !$userName )
39		- #set( $selectedUser = "XWiki.$userNamePar" )
40		- #else
41		- #set( $selectedUser = $userName )
	49	+ #set( $userSelected = true )
	50	+ #if ( !$userName )#set( $userName = "XWiki.$userNamePar" )#end
	51	+ #set( $userdoc = $xwiki.getDocument($userName) )
	52	+ #set( $userFirstName = $userdoc.display("first_name") )
	53	+ #set( $userLastName = $userdoc.display("last_name") )
	54	+#elseif ( $supervisorNamePar || $cosupervisorNamePar || $contactNamePar )
	55	+ #set( $roleSelected = true )
	56	+ #if ( $supervisorNamePar )
	57	+ #set( $supervisorName = "XWiki.$supervisorNamePar" )
	58	+ #set( $supervisordoc = $xwiki.getDocument($supervisorName) )
	59	+ #set( $supervisorFirstName = $supervisordoc.display("first_name") )
	60	+ #set( $supervisorLastName = $supervisordoc.display("last_name") )
42	42	#end
43		- #if( $xwiki.exists($selectedUser) )
44		- #set( $userSelected = true )
45		- #set( $userdoc = $xwiki.getDocument($selectedUser) )
46		- #set( $userFirstName = $userdoc.display("first_name") )
47		- #set( $userLastName = $userdoc.display("last_name") )
48		- #else
49		-{{warning}} $selectedUser is not an {{apice/}} user{{/warning}}
50		- #stop
	62	+ #if ( $cosupervisorNamePar )
	63	+ #set( $cosupervisorName = "XWiki.$cosupervisorNamePar" )
	64	+ #set( $cosupervisordoc = $xwiki.getDocument($cosupervisorName) )
	65	+ #set( $cosupervisorFirstName = $cosupervisordoc.display("first_name") )
	66	+ #set( $cosupervisorLastName = $cosupervisordoc.display("last_name") )
51	51	#end
52		-##user selected and existing user page
53		- #set( $roleSelected = false )
54		- #set( $selectedRole = '' )
55		- #if( $rolePar != '' && $allThesisRoles.contains($rolePar) )
56		- #set( $roleSelected = true )
57		- #set( $selectedRole = $rolePar )
	68	+ #if ( $contactNamePar )
	69	+ #set( $contactName = "XWiki.$contactNamePar" )
	70	+ #set( $contactdoc = $xwiki.getDocument($contactName) )
	71	+ #set( $contactFirstName = $contactdoc.display("first_name") )
	72	+ #set( $contactLastName = $contactdoc.display("last_name") )
58	58	#end
59	59	#end
60		-## $userselected and $roleSelected set properly, other related variables set accordingly
	75	+#if( $supervisor )
	76	+ #set( $roleSelected = true )
	77	+ #set( $supervisorName = $userName )
	78	+ #set( $supervisordoc = $xwiki.getDocument($supervisorName) )
	79	+ #set( $supervisorFirstName = $supervisordoc.display("first_name") )
	80	+ #set( $supervisorLastName = $supervisordoc.display("last_name") )
	81	+#end
	82	+#if( $cosupervisor )
	83	+ #set( $roleSelected = true )
	84	+ #set( $cosupervisorName = $userName )
	85	+ #set( $cosupervisordoc = $xwiki.getDocument($cosupervisorName) )
	86	+ #set( $cosupervisorFirstName = $cosupervisordoc.display("first_name") )
	87	+ #set( $cosupervisorLastName = $cosupervisordoc.display("last_name") )
	88	+#end
	89	+#if( $contact )
	90	+ #set( $roleSelected = true )
	91	+ #set( $contactName = $userName )
	92	+ #set( $contactdoc = $xwiki.getDocument($contactName) )
	93	+ #set( $contactFirstName = $contactdoc.display("first_name") )
	94	+ #set( $contactLastName = $contactdoc.display("last_name") )
	95	+#end
	96	+##
	97	+#if( $cosupervisor )
	98	+ #set( $roleSelectedFieldName = "coSupervisors" )
	99	+#elseif( $contact )
	100	+ #set( $roleSelectedFieldName = "contact" )
	101	+#else
	102	+ #set( $roleSelectedFieldName = "supervisor" )
	103	+#end
	104	+##
61	61	## $roleSelected has meaning only if $userSelected
62	62	## if $userSelected, $roleSelected false means one user for all roles
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		-##
66	66	#foreach( $status in $allThesisStatuses )
67		- #if( !$statusSelected || $selectedStatus == $status )
	110	+ #if( $selectedStatus == 'all' || $selectedStatus == $status )
68	68	= $status =
69	69	## some selected status or all statuses / now $status
70	70	#if( $userSelected )
71		-== $selectedUser ==
	114	+== $userName ==
72	72	## some user selected
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		- #end
83		-## some selected role or all roles / now $role
84		-=== $role ===
	116	+ #if( $roleSelected )
	117	+## some specific role selected
	118	+=== $roleSelectedFieldName ===
85	85	#set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
86		- 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" )
87		- #end
88		- #set( $thesisFound = $xwiki.searchDocuments($sql) )
89		- #foreach( $thesis in $thesisFound )
90		-* $thesis
91		- #end
	120	+ 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" )
	121	+ #else
	122	+## no specific role selected
	123	+ #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
	124	+ 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" )
92	92	#end
93		-## no user selected, no role selected
94	94	#else
	127	+## no user selected, no role selected
95	95	#set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
96	96	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" )
97		- #set( $thesisFound = $xwiki.searchDocuments($sql) )
98		- #foreach( $thesis in $thesisFound )
99		-* $thesis
100		- #end
101	101	#end
102	102	#end
	132	+ #set( $thesisFound = $xwiki.searchDocuments($sql) )
	133	+ #set( $thesisFoundNo = $thesisFound.size() )
103	103	##
104		-## #set( $thesisFound = $xwiki.searchDocuments($sql) )
105		-## #set( $thesisFoundNo = $thesisFound.size() )
106		-## #set($thesisDoc = $xwiki.getDocument($thesis))
107		-## #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
108		-##* [[$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
109		-## #end
	135	+ #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
	136	+* [[$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
	137	+
	138	+ #end
110	110	#end
111	111	{{/velocity}}