Changes for page Per Year

Summary

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

Details

Page properties

Title

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

Syntax

...	...	@@ -1,1 +1,1 @@
1		-XWiki 2.1
	1	+XWiki 1.0

Content

...	...	@@ -1,32 +1,14 @@
1		-{{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
2		-#set( $thesisMenu = true )
	1	+#includeMacros("Main.MacroSheet")
	2	+#includeMacros("Theses.MacroSheet")
	3	+#includeMacros("Theses.GlobalVars")
	4	+
3	3	#### get parameters
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" )
18		- #set( $orderingDateFieldName = "availabilityDate" )
19		-#elseif( $selectedStatus == "ongoing" )
20		- #set( $orderingDateFieldName = "startDate" )
21		-#else
22		- #set( $orderingDateFieldName = "endDate" )
23		-#end
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 )
	7	+#set( $userNamePar = $context.getRequest().getParameter("user") )
	8	+#set( $supervisorNamePar = $context.getRequest().getParameter("supervisor") )
	9	+#set( $cosupervisorNamePar = $context.getRequest().getParameter("cosupervisor") )
	10	+#set( $contactNamePar = $context.getRequest().getParameter("contact") )
	11	+
30	30	#### set default values
31	31	#set( $userSelected = false )
32	32	#set( $roleSelected = false )
...	...	@@ -41,7 +41,7 @@
41	41	#set( $contactName = "" )
42	42	#set( $contactFirstName = "" )
43	43	#set( $contactLastName = "" )
44		-##
	26	+
45	45	#### handle who & roles
46	46	##
47	47	#if ( $userName || $userNamePar ) ## a user is specified for all roles
...	...	@@ -92,25 +92,30 @@
92	92	#set( $contactFirstName = $contactdoc.display("first_name") )
93	93	#set( $contactLastName = $contactdoc.display("last_name") )
94	94	#end
95		-##
96		-## $userSelected true and $roleSelected false means one user for all roles
	77	+
	78	+## $userSelected true means one user for all roles
97	97	## $userSelected true and $roleSelected true for one user with one specific role
98	98	## if $userSelected false and $roleSelected true mean at least one role with an assigned user
99	99	## both false means all theses
100		-#if( $userSelected )
101		- #if( $roleSelected ) // //
102		-> #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 // //
103		- #else // //
104		-> #FullThesisStatusesString($thesisStatus) / $userFirstName $userLastName // //
105		- #end
	82	+#if ($userSelected)
	83	+1 #stringEnIt("Theses with ","Tesi con") $userFirstName $userLastName #if($supervisor)#stringEnIt("as a supervisor","come relatore")#end#if($cosupervisor)#stringEnIt("as a co-supervisor","come correlatore")#end#if($contact)#stringEnIt("as a contact","come contatto")#end #stringEnIt("in the #apice() space","nello spazio #apice()")
	84	+#elseif ( $roleSelected )
	85	+1 #stringEnIt("Theses","Tesi") #if($supervisorLastName != "") #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName#if($cosupervisorLastName != "" || $contactLastName != ""), #end#end#if($cosupervisorLastName != "") #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName#if($contactLastName != ""), #end#end #if($contactLastName != "") #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName#end #stringEnIt("in the #apice() space","nello spazio #apice()")
106	106	#else
107		- #if( $roleSelected ) // //
108		-> #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 // //
109		- #else // //
110		-## > #FullThesisStatusesString($thesisStatus) // //
111		- #end
	87	+ 1 #stringEnIt("Theses","Tesi") #stringEnIt("in the #apice() space","nello spazio #apice()")
112	112	#end
113		-##
	89	+
	90	+## hypothesis: $thesisStatus set, default "Completed"
	91	+## to do: get from parameter
	92	+#if ($thesisStatus == "Available")
	93	+ #set ($orderingDateFieldName = "availabilityDate")
	94	+#elseif ($thesisStatus == "Ongoing")
	95	+ #set ($orderingDateFieldName = "startDate")
	96	+#else
	97	+ #set ($thesisStatus = "Completed")
	98	+ #set ($orderingDateFieldName = "endDate")
	99	+#end
	100	+##
114	114	#if ( $cosupervisor )
115	115	#set ( $roleSelectedFieldName = "coSupervisors" )
116	116	#elseif ( $contact )
...	...	@@ -118,7 +118,9 @@
118	118	#else
119	119	#set ( $roleSelectedFieldName = "supervisor" )
120	120	#end
121		-##
	108	+
	109	+1.1 #ThesisStatusesString($thesisStatus)
	110	+
122	122	#if ($userSelected)
123	123	#if ( $roleSelected )
124	124	#set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, DateProperty as prop2
...	...	@@ -188,9 +188,8 @@
188	188	order by prop1.value desc")
189	189	#end
190	190	#set($thesisFound = $xwiki.searchDocuments($sql))
191		-##
192		-#foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
193		-* #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
194	194
	181	+#foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
	182	+* [$thesisDoc.getValue('title') | $thesis] #if ($thesisDoc.getValue('studentUserName') != "" )(#thesisStudentUser($thesisDoc))#end
195	195	#end
196		-{{/velocity}}
	184	+