Changes for page Per Year

Summary

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

Details

Page properties

Title

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

Content

...	...	@@ -1,13 +1,32 @@
1		-{{include document="Main.MacroSheet"/}}{{include document="Theses.MacroSheet"/}}
2		-
3		-{{velocity filter="none"}}
4		-{{html clean="false" wiki="true"}}
	1	+{{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
	2	+#set( $thesisMenu = true )
5	5	#### 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
6	6	## who
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") )
	26	+#set( $userNamePar = $request.user )
	27	+#set( $supervisorNamePar = $request.supervisor )
	28	+#set( $cosupervisorNamePar = $request.cosupervisor )
	29	+#set( $contactNamePar = $request.contact )
11	11	#### set default values
12	12	#set( $userSelected = false )
13	13	#set( $roleSelected = false )
...	...	@@ -74,50 +74,24 @@
74	74	#set( $contactLastName = $contactdoc.display("last_name") )
75	75	#end
76	76	##
77		-## $userSelected true means one user for all roles
	96	+## $userSelected true and $roleSelected false means one user for all roles
78	78	## $userSelected true and $roleSelected true for one user with one specific role
79	79	## if $userSelected false and $roleSelected true mean at least one role with an assigned user
80	80	## both false means all theses
81		-
82		-
83		-== #if( $userSelected )$userFirstName $userLastName / #end#stringEnIt("Theses ","Tesi") / #ThesisStatusesString($thesisStatus) ==
84		-
85		-#if( $roleSelected )
86		- #if( $userSelected )
87		- #if( $supervisor )
88		-* #stringEnIt("as a supervisor","come relatore")
89		- #end
90		- #if( $cosupervisor )
91		-* #stringEnIt("as a co-supervisor","come correlatore")
92		- #end
93		- #if( $contact )
94		-* #stringEnIt("as a contact","come contatto")
95		- #end
96		- #else
97		- #if( $supervisorLastName != "" )
98		-* #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
99		- #end
100		- #if( $cosupervisorLastName != "" )
101		-* #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
102		- #end
103		- #if( $contactLastName != "" )
104		-* #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
105		-<p/>
106		- #end
	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 // //
107	107	#end
108		-#end
109		-##
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	116	#else
117		- #set ($thesisStatus = "Completed")
118		- #set ($orderingDateFieldName = "endDate")
	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
119	119	#end
120		-##
	113	+##
121	121	#if ( $cosupervisor )
122	122	#set ( $roleSelectedFieldName = "coSupervisors" )
123	123	#elseif ( $contact )
...	...	@@ -195,11 +195,9 @@
195	195	order by prop1.value desc")
196	196	#end
197	197	#set($thesisFound = $xwiki.searchDocuments($sql))
198		-
	191	+##
199	199	#foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
200		-* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) //(#thesisAuthorLink($thesis))// #end
	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
201	201
202	202	#end
203		-
204		-{{/html}}
205	205	{{/velocity}}