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,32 +1,9 @@
1		-{{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
2		-#set( $thesisMenu = true )
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
	1	+{{include document="Main.MacroSheet"/}}{{include document="Theses.MacroSheet"/}}{{velocity filter="none"}}{{html clean="false" wiki="true"}}#### get parameters
25	25	## who
26		-#set( $userNamePar = $request.user )
27		-#set( $supervisorNamePar = $request.supervisor )
28		-#set( $cosupervisorNamePar = $request.cosupervisor )
29		-#set( $contactNamePar = $request.contact )
	3	+#set( $userNamePar = $context.getRequest().getParameter("user") )
	4	+#set( $supervisorNamePar = $context.getRequest().getParameter("supervisor") )
	5	+#set( $cosupervisorNamePar = $context.getRequest().getParameter("cosupervisor") )
	6	+#set( $contactNamePar = $context.getRequest().getParameter("contact") )
30	30	#### set default values
31	31	#set( $userSelected = false )
32	32	#set( $roleSelected = false )
...	...	@@ -93,24 +93,54 @@
93	93	#set( $contactLastName = $contactdoc.display("last_name") )
94	94	#end
95	95	##
96		-## $userSelected true and $roleSelected false means one user for all roles
	73	+## $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 // //
	77	+##
	78	+== #if( $userSelected )$userFirstName $userLastName / #end#stringEnIt("Theses ","Tesi")#if( $thesisStatus ) / #ThesisStatusesString($thesisStatus)#end ==
	79	+##
	80	+#if( $roleSelected )
	81	+ #if( $userSelected )
	82	+ #if( $supervisor )
	83	+
	84	+> {{stringEngIta eng="as a supervisor" ita="come relatore"/}}
	85	+ #end
	86	+ #if( $cosupervisor )
	87	+
	88	+> {{stringEngIta eng="as a co-supervisor" ita="come correlatore"/}}
	89	+ #end
	90	+ #if( $contact )
	91	+
	92	+> {{stringEngIta eng="as a contact" ita="come contatto"/}}
	93	+ #end
	94	+ #else
	95	+ #if( $supervisorLastName != "" )
	96	+
	97	+> #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
	98	+ #end
	99	+ #if( $cosupervisorLastName != "" )
	100	+
	101	+> #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
	102	+ #end
	103	+ #if( $contactLastName != "" )
	104	+
	105	+> #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
	106	+ #end
105	105	#end
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
112	112	#end
113	113	##
	110	+## hypothesis: $thesisStatus set, default "Completed"
	111	+## to do: get from parameter
	112	+#if ($thesisStatus == "Available")
	113	+ #set ($orderingDateFieldName = "availabilityDate")
	114	+#elseif ($thesisStatus == "Ongoing")
	115	+ #set ($orderingDateFieldName = "startDate")
	116	+#else
	117	+ #set ($thesisStatus = "Completed")
	118	+ #set ($orderingDateFieldName = "endDate")
	119	+#end
	120	+##
114	114	#if ( $cosupervisor )
115	115	#set ( $roleSelectedFieldName = "coSupervisors" )
116	116	#elseif ( $contact )
...	...	@@ -190,7 +190,7 @@
190	190	#set($thesisFound = $xwiki.searchDocuments($sql))
191	191	##
192	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
	200	+* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) //(#thesisAuthorLink($thesis)#if( $thesisDoc.display("endDate") != "" ), #thesisYear($thesis)#end)//#end
194	194
195	195	#end
196		-{{/velocity}}
	203	+{{/html}}{{/velocity}}