Changes for page Per Year

Summary

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

Details

Page properties

Title

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

Content

...	...	@@ -1,35 +1,23 @@
1		-{{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
2		-#set( $thesisMenu = true )
3		-#### get parameters
	1	+{{include document="Main.MacroSheet"/}}{{include document="Theses.MacroSheet"/}}{{velocity filter="none"}}{{html clean="false" wiki="true"}}#### get parameters
4	4	## hypothesis: $thesisStatus set, default "Completed"
5		-## status parameter
6		-#set( $statusPar = $request.status.trim().toLowerCase() )
7		-#if( $statusPar != '' && $allThesisStatuses.contains($statusPar) )
8		- #set( $selectedStatus = $statusPar )
9		-#else
10		- #set( $selectedStatus = 'all' )
11		-#end
12		-##check velocity variable, takes precedence
13		-#if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) )
14		- #set( $selectedStatus = $thesisStatus.trim().toLowerCase() )
15		-#end
16		-## set ordering field
17		-#if( $selectedStatus == "available" )
	3	+## to do: get from parameter
	4	+#if( $thesisStatus == "Available" )
18	18	#set( $orderingDateFieldName = "availabilityDate" )
19		-#elseif( $selectedStatus == "ongoing" )
	6	+#elseif( $thesisStatus == "Ongoing" )
20	20	#set( $orderingDateFieldName = "startDate" )
21	21	#else
	9	+ #set( $thesisStatus = "Completed" )
22	22	#set( $orderingDateFieldName = "endDate" )
23	23	#end
24	24	## invariant: $thesisStatus set, $orderingDateFieldName set correspondingly
25	25	## who
26		-#set( $userNamePar = $request.user )
27		-#set( $supervisorNamePar = $request.supervisor )
28		-#set( $cosupervisorNamePar = $request.cosupervisor )
29		-#set( $contactNamePar = $request.contact )
	14	+#set( $userNamePar = $context.getRequest().getParameter("user") )
	15	+#set( $supervisorNamePar = $context.getRequest().getParameter("supervisor") )
	16	+#set( $cosupervisorNamePar = $context.getRequest().getParameter("cosupervisor") )
	17	+#set( $contactNamePar = $context.getRequest().getParameter("contact") )
30	30	#### set default values
31	31	#set( $userSelected = false )
32		-#set( $roleSelected = false )
	20	+#set( $roleSelected = false )
33	33	#set( $userFirstName = "" )
34	34	#set( $userLastName = "" )
35	35	#set( $supervisorName = "" )
...	...	@@ -44,8 +44,7 @@
44	44	##
45	45	#### handle who & roles
46	46	##
47		-#if ( $userName || $userNamePar )
48		-## a user is specified for all roles
	35	+#if ( $userName || $userNamePar ) ## a user is specified for all roles
49	49	#set( $userSelected = true )
50	50	#if ( !$userName )#set( $userName = "XWiki.$userNamePar" )#end
51	51	#set( $userdoc = $xwiki.getDocument($userName) )
...	...	@@ -73,7 +73,7 @@
73	73	#end
74	74	#end
75	75	#if( $supervisor )
76		- #set( $roleSelected = true )
	63	+ #set( $roleSelected = true )
77	77	#set( $supervisorName = $userName )
78	78	#set( $supervisordoc = $xwiki.getDocument($supervisorName) )
79	79	#set( $supervisorFirstName = $supervisordoc.display("first_name") )
...	...	@@ -87,95 +87,129 @@
87	87	#set( $cosupervisorLastName = $cosupervisordoc.display("last_name") )
88	88	#end
89	89	#if( $contact )
90		- #set( $roleSelected = true )
	77	+ #set( $roleSelected = true )
91	91	#set( $contactName = $userName )
92	92	#set( $contactdoc = $xwiki.getDocument($contactName) )
93	93	#set( $contactFirstName = $contactdoc.display("first_name") )
94	94	#set( $contactLastName = $contactdoc.display("last_name") )
95	95	#end
96		-$selectedStatus
97		-
98		-$userSelected
99		-
100		-$roleSelected
101		-
102		-$supervisor
103		-
104		-$cosupervisor
105		-
106		-$contact
107		-
108		-$userFirstName $userLastName
109		-
110		-$supervisorFirstName $supervisorLastName
111		-
112		-$cosupervisorFirstName $cosupervisorLastName
113		-
114		-$contactFirstName $contactLastName
115	115	##
116		-## $userSelected true and $roleSelected false means one user for all roles
	84	+## $userSelected true means one user for all roles
117	117	## $userSelected true and $roleSelected true for one user with one specific role
118	118	## if $userSelected false and $roleSelected true mean at least one role with an assigned user
119	119	## both false means all theses
120		-#if( $selectedStatus == 'all' )
121		-ALLL
122		-#else
	88	+
	89	+> #FullThesisStatusesString($thesisStatus) #if( $userSelected ) / $userFirstName $userLastName#end // //
	90	+#if( $roleSelected )
123	123	#if( $userSelected )
124		- #if( $roleSelected )
125		->{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/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
	92	+ #if( $supervisor )
126	126
127		- #else
128		->{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/thesisStatus}} / $userFirstName $userLastName
	94	+>> {{stringEngIta eng="as a supervisor" ita="come relatore"/}}
	95	+ #end
	96	+ #if( $cosupervisor )
129	129
	98	+>> {{stringEngIta eng="as a co-supervisor" ita="come correlatore"/}}
130	130	#end
	100	+ #if( $contact )
	101	+
	102	+>> {{stringEngIta eng="as a contact" ita="come contatto"/}}
	103	+ #end
131	131	#else
132		- #if( $roleSelected )
133		->{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/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
	105	+ #if( $supervisorLastName != "" )
134	134
135		- #else
136		->{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/thesisStatus}}
	107	+>> #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
	108	+ #end
	109	+ #if( $cosupervisorLastName != "" )
137	137
	111	+>> #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
138	138	#end
	113	+ #if( $contactLastName != "" )
	114	+
	115	+>> #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
	116	+ #end
139	139	#end
140	140	#end
141	141	##
142		-#if( $cosupervisor )
143		- #set( $roleSelectedFieldName = "coSupervisors" )
144		-#elseif( $contact )
145		- #set( $roleSelectedFieldName = "contact" )
	120	+#if ( $cosupervisor )
	121	+ #set ( $roleSelectedFieldName = "coSupervisors" )
	122	+#elseif ( $contact )
	123	+ #set ( $roleSelectedFieldName = "contact" )
146	146	#else
147		- #set( $roleSelectedFieldName = "supervisor" )
	125	+ #set ( $roleSelectedFieldName = "supervisor" )
148	148	#end
149	149	##
150		-#if( $selectedStatus == 'all' )
151		- ALL STATUSES
152		-#else
153		-## some selected status
154		- #if( $userSelected )
155		-## some user selected
156		- #if( $roleSelected )
157		-## some specific role selected
158		- #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
159		- 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 prop0.value = '$selectedStatus' and prop1.value like '%$userName%' order by prop2.value desc" )
160		- #else
161		-## no specific role selected
162		- #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
163		- 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 prop0.value = '$selectedStatus' and ( prop1.value like '%$userName%' or prop2.value like '%$userName%' or prop3.value like '%$userName%' ) order by prop4.value desc" )
164		- #end
165		- #elseif( $roleSelected )
166		-## no user selected, some role selected
167		- #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
168		- 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 prop1.value like '%$supervisorName%' and prop2.value like '%$cosupervisorName%' and prop3.value like '%$contactName%' order by prop4.value desc")
	128	+#if ($userSelected)
	129	+ #if ( $roleSelected )
	130	+ #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, DateProperty as prop2
	131	+ where obj.name=doc.fullName and
	132	+ obj.className='Theses.ThesisClass' and
	133	+ obj.name<>'Theses.ThesisClassTemplate' and
	134	+ prop.id.id=obj.id and
	135	+ prop1.id.id=obj.id and
	136	+ prop2.id.id=obj.id and
	137	+ prop.name='status' and
	138	+ prop.value='$thesisStatus' and
	139	+ prop1.name='$roleSelectedFieldName' and
	140	+ prop2.name='$orderingDateFieldName' and
	141	+ prop1.value like '%$userName%'
	142	+ order by prop2.value desc")
169	169	#else
170		-## no user selected, some role selected
171		- #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
172		- 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 prop0.value = '$selectedStatus' order by prop1.value desc" )
	144	+ #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
	145	+ where obj.name=doc.fullName and
	146	+ obj.className='Theses.ThesisClass' and
	147	+ obj.name<>'Theses.ThesisClassTemplate' and
	148	+ prop.id.id=obj.id and
	149	+ prop1.id.id=obj.id and
	150	+ prop2.id.id=obj.id and
	151	+ prop3.id.id=obj.id and
	152	+ prop4.id.id=obj.id and
	153	+ prop.name='status' and
	154	+ prop.value = '$thesisStatus' and
	155	+ prop1.name='supervisor' and
	156	+ prop2.name='coSupervisors' and
	157	+ prop3.name='contact' and
	158	+ prop4.name='$orderingDateFieldName' and
	159	+ ( prop1.value like '%$userName%' or
	160	+ prop2.value like '%$userName%' or
	161	+ prop3.value like '%$userName%')
	162	+ order by prop4.value desc")
173	173	#end
	164	+#elseif ( $roleSelected )
	165	+ #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
	166	+ where obj.name=doc.fullName and
	167	+ obj.className='Theses.ThesisClass' and
	168	+ obj.name<>'Theses.ThesisClassTemplate' and
	169	+ prop.id.id=obj.id and
	170	+ prop1.id.id=obj.id and
	171	+ prop2.id.id=obj.id and
	172	+ prop3.id.id=obj.id and
	173	+ prop4.id.id=obj.id and
	174	+ prop.name='status' and
	175	+ prop.value = '$thesisStatus' and
	176	+ prop1.name='supervisor' and
	177	+ prop2.name='coSupervisors' and
	178	+ prop3.name='contact' and
	179	+ prop4.name='$orderingDateFieldName' and
	180	+ prop1.value like '%$supervisorName%' and
	181	+ prop2.value like '%$cosupervisorName%' and
	182	+ prop3.value like '%$contactName%'
	183	+ order by prop4.value desc")
	184	+#else
	185	+ #set ($sql = ", BaseObject as obj, StringProperty as prop, DateProperty as prop1
	186	+ where obj.name=doc.fullName and
	187	+ obj.className='Theses.ThesisClass' and
	188	+ obj.name<>'Theses.ThesisClassTemplate' and
	189	+ prop.id.id=obj.id and
	190	+ prop1.id.id=obj.id and
	191	+ prop.name='status' and
	192	+ prop.value = '$thesisStatus' and
	193	+ prop1.name='$orderingDateFieldName'
	194	+ order by prop1.value desc")
174	174	#end
175		-#set( $thesisFound = $xwiki.searchDocuments($sql) )
	196	+#set($thesisFound = $xwiki.searchDocuments($sql))
176	176	##
177	177	#foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
178		-##* #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
179		-* $thesis
	199	+* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) //(#thesisAuthorLink($thesis)#if( $thesisDoc.display("endDate") != "" ), #thesisYear($thesis)#end)//#end
	200	+
180	180	#end
181		-{{/velocity}}
	202	+{{/html}}{{/velocity}}