Changes for page Per Year

Summary

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

Details

Page properties

Content

...	...	@@ -1,4 +1,15 @@
1		-{{include document="Main.MacroSheet"/}}{{include document="Theses.MacroSheet"/}}{{velocity filter="none"}}#### get parameters
	1	+{{include document="Main.MacroSheet"/}}{{include document="Theses.MacroSheet"/}}{{velocity filter="none"}}{{html clean="false" wiki="true"}}#### get parameters
	2	+## hypothesis: $thesisStatus set, default "Completed"
	3	+## to do: get from parameter
	4	+#if( $thesisStatus == "Available" )
	5	+ #set( $orderingDateFieldName = "availabilityDate" )
	6	+#elseif( $thesisStatus == "Ongoing" )
	7	+ #set( $orderingDateFieldName = "startDate" )
	8	+#else
	9	+ #set( $thesisStatus = "Completed" )
	10	+ #set( $orderingDateFieldName = "endDate" )
	11	+#end
	12	+## invariant: $thesisStatus set, $orderingDateFieldName set correspondingly
2	2	## who
3	3	#set( $userNamePar = $context.getRequest().getParameter("user") )
4	4	#set( $supervisorNamePar = $context.getRequest().getParameter("supervisor") )
...	...	@@ -70,59 +70,24 @@
70	70	#set( $contactLastName = $contactdoc.display("last_name") )
71	71	#end
72	72	##
73		-## $userSelected true means one user for all roles
	84	+## $userSelected true and $roleSelected false means one user for all roles
74	74	## $userSelected true and $roleSelected true for one user with one specific role
75	75	## if $userSelected false and $roleSelected true mean at least one role with an assigned user
76	76	## both false means all theses
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		-
86		- #end
87		- #if( $cosupervisor )
88		-
89		-> {{stringEngIta eng="as a co-supervisor" ita="come correlatore"/}}
90		-
91		- #end
92		- #if( $contact )
93		-
94		-> {{stringEngIta eng="as a contact" ita="come contatto"/}}
95		- #end
	88	+#if( $userSelected )
	89	+ #if( $roleSelected )
	90	+> #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
96	96	#else
97		- #if( $supervisorLastName != "" )
98		-
99		-> #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
100		-
101		- #end
102		- #if( $cosupervisorLastName != "" )
103		-
104		-> #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
105		-
106		- #end
107		- #if( $contactLastName != "" )
108		-
109		-> #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
110		-
111		- #end
	92	+> #FullThesisStatusesString($thesisStatus) / $userFirstName $userLastName
112	112	#end
113		-#end
114		-##
115		-## hypothesis: $thesisStatus set, default "Completed"
116		-## to do: get from parameter
117		-#if ($thesisStatus == "Available")
118		- #set ($orderingDateFieldName = "availabilityDate")
119		-#elseif ($thesisStatus == "Ongoing")
120		- #set ($orderingDateFieldName = "startDate")
121	121	#else
122		- #set ($thesisStatus = "Completed")
123		- #set ($orderingDateFieldName = "endDate")
	95	+ #if( $roleSelected )
	96	+> #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
	97	+ #else
	98	+> #FullThesisStatusesString($thesisStatus)
	99	+ #end
124	124	#end
125		-##
	101	+##
126	126	#if ( $cosupervisor )
127	127	#set ( $roleSelectedFieldName = "coSupervisors" )
128	128	#elseif ( $contact )
...	...	@@ -205,4 +205,4 @@
205	205	* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) //(#thesisAuthorLink($thesis)#if( $thesisDoc.display("endDate") != "" ), #thesisYear($thesis)#end)//#end
206	206
207	207	#end
208		-{{/velocity}}
	184	+{{/html}}{{/velocity}}