Changes for page Per Year

Summary

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

Details

Page properties

Title

...	...	@@ -1,0 +1,1 @@
	1	+SelectPerStatus

Syntax

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

Content

...	...	@@ -1,22 +1,13 @@
1		-{{include reference="Main.MacroSheet"/}}{{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
2		-#set( $thesisMenu = true )
	1	+#includeMacros("Main.MacroSheet")
	2	+#includeMacros("Theses.MacroSheet")
	3	+
3	3	#### get parameters
4		-## hypothesis: $thesisStatus set, default "Completed"
5		-## to do: get from parameter
6		-#if( $thesisStatus == "Available" )
7		- #set( $orderingDateFieldName = "availabilityDate" )
8		-#elseif( $thesisStatus == "Ongoing" )
9		- #set( $orderingDateFieldName = "startDate" )
10		-#else
11		- #set( $thesisStatus = "Completed" )
12		- #set( $orderingDateFieldName = "endDate" )
13		-#end
14		-## invariant: $thesisStatus set, $orderingDateFieldName set correspondingly
15	15	## who
16	16	#set( $userNamePar = $context.getRequest().getParameter("user") )
17	17	#set( $supervisorNamePar = $context.getRequest().getParameter("supervisor") )
18	18	#set( $cosupervisorNamePar = $context.getRequest().getParameter("cosupervisor") )
19	19	#set( $contactNamePar = $context.getRequest().getParameter("contact") )
	10	+
20	20	#### set default values
21	21	#set( $userSelected = false )
22	22	#set( $roleSelected = false )
...	...	@@ -31,7 +31,7 @@
31	31	#set( $contactName = "" )
32	32	#set( $contactFirstName = "" )
33	33	#set( $contactLastName = "" )
34		-##
	25	+
35	35	#### handle who & roles
36	36	##
37	37	#if ( $userName || $userNamePar ) ## a user is specified for all roles
...	...	@@ -82,25 +82,47 @@
82	82	#set( $contactFirstName = $contactdoc.display("first_name") )
83	83	#set( $contactLastName = $contactdoc.display("last_name") )
84	84	#end
85		-##
86		-## $userSelected true and $roleSelected false means one user for all roles
	76	+
	77	+## $userSelected true means one user for all roles
87	87	## $userSelected true and $roleSelected true for one user with one specific role
88	88	## if $userSelected false and $roleSelected true mean at least one role with an assigned user
89	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 // //
	81	+1 #if( $userSelected )$userFirstName $userLastName / #end#stringEnIt("Theses ","Tesi") / #ThesisStatusesString($thesisStatus)
	82	+#if( $roleSelected )
	83	+ #if( $userSelected )
	84	+ #if( $supervisor )
	85	+* #stringEnIt("as a supervisor","come relatore")
	86	+ #end
	87	+ #if( $cosupervisor )
	88	+* #stringEnIt("as a co-supervisor","come correlatore")
	89	+ #end
	90	+ #if( $contact )
	91	+* #stringEnIt("as a contact","come contatto")
	92	+ #end
	93	+ #else
	94	+ #if( $supervisorLastName != "" )
	95	+* #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
	96	+ #end
	97	+ #if( $cosupervisorLastName != "" )
	98	+* #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
	99	+ #end
	100	+ #if( $contactLastName != "" )
	101	+* #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
	102	+ #end
95	95	#end
	104	+#end
	105	+
	106	+## hypothesis: $thesisStatus set, default "Completed"
	107	+## to do: get from parameter
	108	+#if ($thesisStatus == "Available")
	109	+ #set ($orderingDateFieldName = "availabilityDate")
	110	+#elseif ($thesisStatus == "Ongoing")
	111	+ #set ($orderingDateFieldName = "startDate")
96	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
	113	+ #set ($thesisStatus = "Completed")
	114	+ #set ($orderingDateFieldName = "endDate")
102	102	#end
103		-##
	116	+##
104	104	#if ( $cosupervisor )
105	105	#set ( $roleSelectedFieldName = "coSupervisors" )
106	106	#elseif ( $contact )
...	...	@@ -108,7 +108,9 @@
108	108	#else
109	109	#set ( $roleSelectedFieldName = "supervisor" )
110	110	#end
111		-##
	124	+
	125	+1.1 #ThesisStatusesString($thesisStatus)
	126	+
112	112	#if ($userSelected)
113	113	#if ( $roleSelected )
114	114	#set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, DateProperty as prop2
...	...	@@ -178,9 +178,9 @@
178	178	order by prop1.value desc")
179	179	#end
180	180	#set($thesisFound = $xwiki.searchDocuments($sql))
181		-##
	196	+
182	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
	198	+* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) ~~(#thesisAuthorLink($thesis))~~ #end
184	184
185	185	#end
186		-{{/velocity}}
	201	+