Changes for page Per Year

Summary

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

Details

Page properties

Title

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

Content

...	...	@@ -1,12 +1,35 @@
1		-{{include document="Main.MacroSheet"/}}{{include document="Theses.MacroSheet"/}}{{velocity filter="none"}}#### get parameters
	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
2	2	## who
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") )
	26	+#set( $userNamePar = $request.user )
	27	+#set( $supervisorNamePar = $request.supervisor )
	28	+#set( $cosupervisorNamePar = $request.cosupervisor )
	29	+#set( $contactNamePar = $request.contact )
7	7	#### set default values
8	8	#set( $userSelected = false )
9		-#set( $roleSelected = false )
	32	+#set( $roleSelected = false )
10	10	#set( $userFirstName = "" )
11	11	#set( $userLastName = "" )
12	12	#set( $supervisorName = "" )
...	...	@@ -49,7 +49,7 @@
49	49	#end
50	50	#end
51	51	#if( $supervisor )
52		- #set( $roleSelected = true )
	75	+ #set( $roleSelected = true )
53	53	#set( $supervisorName = $userName )
54	54	#set( $supervisordoc = $xwiki.getDocument($supervisorName) )
55	55	#set( $supervisorFirstName = $supervisordoc.display("first_name") )
...	...	@@ -70,81 +70,47 @@
70	70	#set( $contactLastName = $contactdoc.display("last_name") )
71	71	#end
72	72	##
73		-## $userSelected true means one user for all roles
	96	+## $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
	100	+#if( $userSelected )
	101	+ #if( $roleSelected )
	102	+>{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{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
77	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 )
	104	+ #else
	105	+>{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}} / $userFirstName $userLastName
83	83
84		-> {{stringEngIta eng="as a supervisor" ita="come relatore"/}}
85		- #end
86		- #if( $cosupervisor )
	107	+ #end
	108	+#else
	109	+ #if( $roleSelected )
	110	+>{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{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
87	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	94	#else
95		- #if( $supervisorLastName != "" )
	113	+>{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}}
96	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
107	107	#end
108	108	#end
109	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")
	118	+#if( $cosupervisor )
	119	+ #set( $roleSelectedFieldName = "coSupervisors" )
	120	+#elseif( $contact )
	121	+ #set( $roleSelectedFieldName = "contact" )
116	116	#else
117		- #set ($thesisStatus = "Completed")
118		- #set ($orderingDateFieldName = "endDate")
	123	+ #set( $roleSelectedFieldName = "supervisor" )
119	119	#end
120		-##
121		-#if ( $cosupervisor )
122		- #set ( $roleSelectedFieldName = "coSupervisors" )
123		-#elseif ( $contact )
124		- #set ( $roleSelectedFieldName = "contact" )
125		-#else
126		- #set ( $roleSelectedFieldName = "supervisor" )
127		-#end
128	128	##
129		-#if ($userSelected)
130		- #if ( $roleSelected )
131		- #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, DateProperty as prop2
132		- where obj.name=doc.fullName and
133		- obj.className='Theses.ThesisClass' and
134		- obj.name<>'Theses.ThesisClassTemplate' and
135		- prop.id.id=obj.id and
136		- prop1.id.id=obj.id and
137		- prop2.id.id=obj.id and
138		- prop.name='status' and
139		- prop.value='$thesisStatus' and
140		- prop1.name='$roleSelectedFieldName' and
141		- prop2.name='$orderingDateFieldName' and
142		- prop1.value like '%$userName%'
143		- order by prop2.value desc")
	126	+#if( $selectedStatus == 'all' )
	127	+ ALL STATUSES
	128	+#else
	129	+ #if( $userSelected )
	130	+ #if( $roleSelected )
	131	+ #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
	132	+ where obj.name = doc.fullName and obj.className='Theses.ThesisClass' and obj.name<>'Theses.ThesisClassTemplate' and obj.name <> 'Theses.ThesisTemplate' and prop0.id.id = obj.id and prop1.id.id = obj.id and prop2.id.id = obj.id and prop0.name = 'status' and prop1.name = '$roleSelectedFieldName' and prop2.name = '$orderingDateFieldName' and prop0.value = '$thesisStatus' and prop1.value like '%$userName%' order by prop2.value desc" )
144	144	#else
145	145	#set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
146	146	where obj.name=doc.fullName and
147		- obj.className='Theses.ThesisClass' and
	136	+ obj.className='Theses.ThesisClass' and
148	148	obj.name<>'Theses.ThesisClassTemplate' and
149	149	prop.id.id=obj.id and
150	150	prop1.id.id=obj.id and
...	...	@@ -197,7 +197,7 @@
197	197	#set($thesisFound = $xwiki.searchDocuments($sql))
198	198	##
199	199	#foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
200		-* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) //(#thesisAuthorLink($thesis)#if( $thesisDoc.display("endDate") != "" ), #thesisYear($thesis)#end)//#end
	189	+* #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	203	{{/velocity}}