Changes for page Per Year

Summary

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

Details

Page properties

Title

...	...	@@ -1,0 +1,1 @@
	1	+Theses per Status

Content

...	...	@@ -1,186 +1,121 @@
1		-{{include reference="Main.MacroSheet"/}}{{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
	1	+{{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
2	2	#set( $thesisMenu = true )
3		-#### get parameters
	3	+### START STATUS
4	4	## hypothesis: $thesisStatus set, default "Completed"
5		-## to do: get from parameter
6		-#if( $thesisStatus == "Available" )
	5	+## status parameter
	6	+#set( $statusPar = $request.status.trim().toLowerCase() )
	7	+#set( $oneStatus = false )
	8	+#if( $statusPar != '' && $allThesisStatuses.contains($statusPar) )
	9	+ #set( $oneStatus = true )
	10	+ #set( $selectedStatus = $statusPar )
	11	+#end
	12	+##check velocity variable, takes precedence
	13	+#if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) )
	14	+ #set( $oneStatus = true )
	15	+ #set( $selectedStatus = $thesisStatus.trim().toLowerCase() )
	16	+#end
	17	+## set ordering field
	18	+#if( $selectedStatus == "available" )
7	7	#set( $orderingDateFieldName = "availabilityDate" )
8		-#elseif( $thesisStatus == "Ongoing" )
	20	+#elseif( $selectedStatus == "ongoing" )
9	9	#set( $orderingDateFieldName = "startDate" )
10	10	#else
11		- #set( $thesisStatus = "Completed" )
	23	+## default for no selected status, too
12	12	#set( $orderingDateFieldName = "endDate" )
13	13	#end
14		-## invariant: $thesisStatus set, $orderingDateFieldName set correspondingly
15		-## who
16		-#set( $userNamePar = $context.getRequest().getParameter("user") )
17		-#set( $supervisorNamePar = $context.getRequest().getParameter("supervisor") )
18		-#set( $cosupervisorNamePar = $context.getRequest().getParameter("cosupervisor") )
19		-#set( $contactNamePar = $context.getRequest().getParameter("contact") )
20		-#### set default values
21		-#set( $userSelected = false )
22		-#set( $roleSelected = false )
	26	+## invariant: $oneStatus set, $selectedStatus & $orderingDateFieldName set accordingly
	27	+### END STATUS
	28	+##
	29	+### START USER & ROLE
	30	+#set( $userNamePar = $request.user.trim() )
	31	+## default values
	32	+#set( $oneUser = false )
23	23	#set( $userFirstName = "" )
24	24	#set( $userLastName = "" )
25		-#set( $supervisorName = "" )
26		-#set( $supervisorFirstName = "" )
27		-#set( $supervisorLastName = "" )
28		-#set( $cosupervisorName = "" )
29		-#set( $cosupervisorFirstName = "" )
30		-#set( $cosupervisorLastName = "" )
31		-#set( $contactName = "" )
32		-#set( $contactFirstName = "" )
33		-#set( $contactLastName = "" )
34		-##
35		-#### handle who & roles
36		-##
37		-#if ( $userName || $userNamePar ) ## a user is specified for all roles
38		- #set( $userSelected = true )
39		- #if ( !$userName )#set( $userName = "XWiki.$userNamePar" )#end
40		- #set( $userdoc = $xwiki.getDocument($userName) )
41		- #set( $userFirstName = $userdoc.display("first_name") )
42		- #set( $userLastName = $userdoc.display("last_name") )
43		-#elseif ( $supervisorNamePar || $cosupervisorNamePar || $contactNamePar )
44		- #set( $roleSelected = true )
45		- #if ( $supervisorNamePar )
46		- #set( $supervisorName = "XWiki.$supervisorNamePar" )
47		- #set( $supervisordoc = $xwiki.getDocument($supervisorName) )
48		- #set( $supervisorFirstName = $supervisordoc.display("first_name") )
49		- #set( $supervisorLastName = $supervisordoc.display("last_name") )
	35	+#if( $userName || $userNamePar )
	36	+## a user is specified for all roles
	37	+ #if( !$userName )
	38	+ #set( $selectedUser = "XWiki.$userNamePar" )
	39	+ #else
	40	+ #set( $selectedUser = $userName )
50	50	#end
51		- #if ( $cosupervisorNamePar )
52		- #set( $cosupervisorName = "XWiki.$cosupervisorNamePar" )
53		- #set( $cosupervisordoc = $xwiki.getDocument($cosupervisorName) )
54		- #set( $cosupervisorFirstName = $cosupervisordoc.display("first_name") )
55		- #set( $cosupervisorLastName = $cosupervisordoc.display("last_name") )
	42	+ #if( $xwiki.exists($selectedUser) )
	43	+ #set( $oneUser = true )
	44	+ #set( $userdoc = $xwiki.getDocument($selectedUser) )
	45	+ #set( $userFirstName = $userdoc.display("first_name") )
	46	+ #set( $userLastName = $userdoc.display("last_name") )
	47	+ #else
	48	+{{warning}} $selectedUser is not an {{apice/}} user{{/warning}}
	49	+ #stop
56	56	#end
57		- #if ( $contactNamePar )
58		- #set( $contactName = "XWiki.$contactNamePar" )
59		- #set( $contactdoc = $xwiki.getDocument($contactName) )
60		- #set( $contactFirstName = $contactdoc.display("first_name") )
61		- #set( $contactLastName = $contactdoc.display("last_name") )
	51	+##user selected and existing user page
	52	+ #set( $rolePar = $request.role.trim().toLowerCase() )
	53	+ #set( $oneRole = false )
	54	+ #set( $selectedRole = '' )
	55	+ #if( $rolePar != '' && $allThesisRoles.contains($rolePar) )
	56	+ #set( $oneRole = true )
	57	+ #set( $selectedRole = $rolePar )
62	62	#end
63	63	#end
64		-#if( $supervisor )
65		- #set( $roleSelected = true )
66		- #set( $supervisorName = $userName )
67		- #set( $supervisordoc = $xwiki.getDocument($supervisorName) )
68		- #set( $supervisorFirstName = $supervisordoc.display("first_name") )
69		- #set( $supervisorLastName = $supervisordoc.display("last_name") )
70		-#end
71		-#if( $cosupervisor )
72		- #set( $roleSelected = true )
73		- #set( $cosupervisorName = $userName )
74		- #set( $cosupervisordoc = $xwiki.getDocument($cosupervisorName) )
75		- #set( $cosupervisorFirstName = $cosupervisordoc.display("first_name") )
76		- #set( $cosupervisorLastName = $cosupervisordoc.display("last_name") )
77		-#end
78		-#if( $contact )
79		- #set( $roleSelected = true )
80		- #set( $contactName = $userName )
81		- #set( $contactdoc = $xwiki.getDocument($contactName) )
82		- #set( $contactFirstName = $contactdoc.display("first_name") )
83		- #set( $contactLastName = $contactdoc.display("last_name") )
84		-#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
85	85	##
86		-## $userSelected true and $roleSelected false means one user for all roles
87		-## $userSelected true and $roleSelected true for one user with one specific role
88		-## if $userSelected false and $roleSelected true mean at least one role with an assigned user
89		-## both false means all theses
90		-#if( $userSelected )
91		- #if( $roleSelected ) // //
92		-> #FullThesisStatusesString($thesisStatus) / $userFirstName $userLastName / #if( $supervisor ){{stringEngIta eng="Supervisor" ita="Relatore"/}}#end#if( $cosupervisor ){{stringEngIta eng="Co-supervisor" ita="Correlatore"/}}#end#if( $contact ){{stringEngIta eng="Contact" ita="Contatto"/}}#end // //
93		- #else // //
94		-> #FullThesisStatusesString($thesisStatus) / $userFirstName $userLastName // //
95		- #end
96		-#else
97		- #if( $roleSelected ) // //
98		-> #FullThesisStatusesString($thesisStatus)#if( $supervisorLastName != "" ) / $supervisorFirstName $supervisorLastName //({{stringEngIta eng="supervisor" ita="relatore"/}})//#end#if( $cosupervisorLastName != "" ) / $cosupervisorFirstName $cosupervisorLastName //({{stringEngIta eng="co-supervisor" ita="correlatore"/}})//#end#if( $contactLastName != "" ) / $contactFirstName $contactLastName //({{stringEngIta eng="Contact" ita="Contatto"/}})//#end // //
99		- #else // //
100		-## > #FullThesisStatusesString($thesisStatus) // //
101		- #end
	66	+## title
	67	+>#if( $oneStatus ){{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/thesisStatus}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end#if( $oneUser ) / $userFirstName **$userLastName**#if( $oneRole ) / $selectedRole#end#end
	68	+
	69	+## search theses
	70	+#foreach( $status in $allThesisStatuses )
	71	+ #if( !$oneStatus || $selectedStatus == $status )
	72	+#if( !$oneSort )
	73	+(% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $sort in $sortList )#if ($velocityCount > 1) | #end [[{{pubSort plural="true" uppercase="false"}}$sort{{/pubSort}}>>||anchor="$sort"]]#end)))
	74	+#elseif( !$oneYear )
	75	+(% 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)))
102	102	#end
103		-##
104		-#if ( $cosupervisor )
105		- #set ( $roleSelectedFieldName = "coSupervisors" )
106		-#elseif ( $contact )
107		- #set ( $roleSelectedFieldName = "contact" )
108		-#else
109		- #set ( $roleSelectedFieldName = "supervisor" )
110		-#end
111		-##
112		-#if ($userSelected)
113		- #if ( $roleSelected )
114		- #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, DateProperty as prop2
115		- where obj.name=doc.fullName and
116		- obj.className='Theses.ThesisClass' and
117		- obj.name<>'Theses.ThesisClassTemplate' and
118		- prop.id.id=obj.id and
119		- prop1.id.id=obj.id and
120		- prop2.id.id=obj.id and
121		- prop.name='status' and
122		- prop.value='$thesisStatus' and
123		- prop1.name='$roleSelectedFieldName' and
124		- prop2.name='$orderingDateFieldName' and
125		- prop1.value like '%$userName%'
126		- order by prop2.value desc")
127		- #else
128		- #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
129		- where obj.name=doc.fullName and
130		- obj.className='Theses.ThesisClass' and
131		- obj.name<>'Theses.ThesisClassTemplate' and
132		- prop.id.id=obj.id and
133		- prop1.id.id=obj.id and
134		- prop2.id.id=obj.id and
135		- prop3.id.id=obj.id and
136		- prop4.id.id=obj.id and
137		- prop.name='status' and
138		- prop.value = '$thesisStatus' and
139		- prop1.name='supervisor' and
140		- prop2.name='coSupervisors' and
141		- prop3.name='contact' and
142		- prop4.name='$orderingDateFieldName' and
143		- ( prop1.value like '%$userName%' or
144		- prop2.value like '%$userName%' or
145		- prop3.value like '%$userName%')
146		- order by prop4.value desc")
	77	+
	78	+
	79	+= $status =
	80	+## some selected status or all statuses / now $status
	81	+ #if( $oneUser )
	82	+== $selectedUser ==
	83	+## some user selected
	84	+ #foreach( $role in $allThesisRoles )
	85	+ #if( !$oneRole || $selectedRole == $role )
	86	+ #if( $role == "contact" )
	87	+ #set( $selectedRoleFieldName = "contact" )
	88	+ #elseif( $role == "cosupervisor" )
	89	+ #set( $selectedRoleFieldName = "coSupervisors" )
	90	+ #else
	91	+ #set( $selectedRoleFieldName = "supervisor" )
	92	+ #end
	93	+## some selected role or all roles / now $role
	94	+=== $role ===
	95	+ #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
	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 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" )
	97	+ #set( $thesisFound = $xwiki.searchDocuments($sql) )
	98	+ #foreach( $thesis in $thesisFound )
	99	+* $thesis
	100	+ #end
	101	+ #end
	102	+ #end
	103	+## no user selected, no role selected
	104	+ #else
	105	+ #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
	106	+ 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" )
	107	+ #set( $thesisFound = $xwiki.searchDocuments($sql) )
	108	+ #foreach( $thesis in $thesisFound )
	109	+* $thesis
	110	+ #end
	111	+ #end
147	147	#end
148		-#elseif ( $roleSelected )
149		- #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
150		- where obj.name=doc.fullName and
151		- obj.className='Theses.ThesisClass' and
152		- obj.name<>'Theses.ThesisClassTemplate' and
153		- prop.id.id=obj.id and
154		- prop1.id.id=obj.id and
155		- prop2.id.id=obj.id and
156		- prop3.id.id=obj.id and
157		- prop4.id.id=obj.id and
158		- prop.name='status' and
159		- prop.value = '$thesisStatus' and
160		- prop1.name='supervisor' and
161		- prop2.name='coSupervisors' and
162		- prop3.name='contact' and
163		- prop4.name='$orderingDateFieldName' and
164		- prop1.value like '%$supervisorName%' and
165		- prop2.value like '%$cosupervisorName%' and
166		- prop3.value like '%$contactName%'
167		- order by prop4.value desc")
168		-#else
169		- #set ($sql = ", BaseObject as obj, StringProperty as prop, DateProperty as prop1
170		- where obj.name=doc.fullName and
171		- obj.className='Theses.ThesisClass' and
172		- obj.name<>'Theses.ThesisClassTemplate' and
173		- prop.id.id=obj.id and
174		- prop1.id.id=obj.id and
175		- prop.name='status' and
176		- prop.value = '$thesisStatus' and
177		- prop1.name='$orderingDateFieldName'
178		- order by prop1.value desc")
179		-#end
180		-#set($thesisFound = $xwiki.searchDocuments($sql))
181	181	##
182		-#foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
183		-* #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
184		-
	114	+## #set( $thesisFound = $xwiki.searchDocuments($sql) )
	115	+## #set( $thesisFoundNo = $thesisFound.size() )
	116	+## #set($thesisDoc = $xwiki.getDocument($thesis))
	117	+## #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
	118	+##* [[$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
	119	+## #end
185	185	#end
186	186	{{/velocity}}