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,36 @@
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	+$selectedStatus
	13	+##check velocity variable, takes precedence
	14	+#if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) )
	15	+ #set( $selectedStatus = $thesisStatus.trim().toLowerCase() )
	16	+#end
	17	+## set ordering field
	18	+#if( $selectedStatus == "available" )
	19	+ #set( $orderingDateFieldName = "availabilityDate" )
	20	+#elseif( $selectedStatus == "ongoing" )
	21	+ #set( $orderingDateFieldName = "startDate" )
	22	+#else
	23	+ #set( $orderingDateFieldName = "endDate" )
	24	+#end
	25	+## 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") )
	27	+#set( $userNamePar = $request.user )
	28	+#set( $supervisorNamePar = $request.supervisor )
	29	+#set( $cosupervisorNamePar = $request.cosupervisor )
	30	+#set( $contactNamePar = $request.contact )
7	7	#### set default values
8	8	#set( $userSelected = false )
9		-#set( $roleSelected = false )
	33	+#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 )
	76	+ #set( $roleSelected = true )
53	53	#set( $supervisorName = $userName )
54	54	#set( $supervisordoc = $xwiki.getDocument($supervisorName) )
55	55	#set( $supervisorFirstName = $supervisordoc.display("first_name") )
...	...	@@ -69,131 +69,85 @@
69	69	#set( $contactFirstName = $contactdoc.display("first_name") )
70	70	#set( $contactLastName = $contactdoc.display("last_name") )
71	71	#end
	96	+$selectedStatus
	97	+
	98	+$userSelected
	99	+
	100	+$roleSelected
	101	+
	102	+$supervisor
	103	+
	104	+$cosupervisor
	105	+
	106	+$contact
	107	+
	108	+$userFirstName $userLastName
	109	+
	110	+$supervisorFirstName $supervisorLastName
	111	+
	112	+$cosupervisorFirstName $cosupervisorLastName
	113	+
	114	+$contactFirstName $contactLastName
72	72	##
73		-## $userSelected true means one user for all roles
	116	+## $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
	120	+#if( $userSelected )
	121	+ #if( $roleSelected )
	122	+>{{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 ==
	124	+ #else
	125	+>{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}} / $userFirstName $userLastName
79	79
80		-#if( $roleSelected )
81		- #if( $userSelected )
82		- #if( $supervisor )
	127	+ #end
	128	+#else
	129	+ #if( $roleSelected )
	130	+>{{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
83	83
84		-> {{stringEngIta eng="as a supervisor" ita="come relatore"/}}
85		-
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	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
	133	+>{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}}
	134	+
103	103	#end
104	104	#end
105	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")
	138	+#if( $cosupervisor )
	139	+ #set( $roleSelectedFieldName = "coSupervisors" )
	140	+#elseif( $contact )
	141	+ #set( $roleSelectedFieldName = "contact" )
112	112	#else
113		- #set ($thesisStatus = "Completed")
114		- #set ($orderingDateFieldName = "endDate")
	143	+ #set( $roleSelectedFieldName = "supervisor" )
115	115	#end
116		-##
117		-#if ( $cosupervisor )
118		- #set ( $roleSelectedFieldName = "coSupervisors" )
119		-#elseif ( $contact )
120		- #set ( $roleSelectedFieldName = "contact" )
121		-#else
122		- #set ( $roleSelectedFieldName = "supervisor" )
123		-#end
124	124	##
125		-#if ($userSelected)
126		- #if ( $roleSelected )
127		- #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, DateProperty as prop2
128		- where obj.name=doc.fullName and
129		- obj.className='Theses.ThesisClass' and
130		- obj.name<>'Theses.ThesisClassTemplate' and
131		- prop.id.id=obj.id and
132		- prop1.id.id=obj.id and
133		- prop2.id.id=obj.id and
134		- prop.name='status' and
135		- prop.value='$thesisStatus' and
136		- prop1.name='$roleSelectedFieldName' and
137		- prop2.name='$orderingDateFieldName' and
138		- prop1.value like '%$userName%'
139		- order by prop2.value desc")
	146	+#if( $selectedStatus == 'all' )
	147	+ ALL STATUSES
	148	+#else
	149	+## some selected status
	150	+ #if( $userSelected )
	151	+## some user selected
	152	+ #if( $roleSelected )
	153	+## some specific role selected
	154	+ #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
	155	+ 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" )
	156	+ #else
	157	+## no specific role selected
	158	+ #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
	159	+ 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 prop3.id.id = obj.id and prop4.id.id = obj.id and prop0.name = 'status' and prop1.name = 'supervisor' and prop2.name = 'coSupervisors' and prop3.name = 'contact' and prop4.name = '$orderingDateFieldName' and prop0.value = '$thesisStatus' and ( prop1.value like '%$userName%' or prop2.value like '%$userName%' or prop3.value like '%$userName%' ) order by prop4.value desc" )
	160	+ #end
	161	+ #elseif( $roleSelected )
	162	+## no user selected, some role selected
	163	+ #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
	164	+ 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 prop3.id.id = obj.id and prop4.id.id = obj.id and prop0.name = 'status' and prop1.name = 'supervisor' and prop2.name = 'coSupervisors' and prop3.name = 'contact' and prop4.name = '$orderingDateFieldName' and prop1.value like '%$supervisorName%' and prop2.value like '%$cosupervisorName%' and prop3.value like '%$contactName%' order by prop4.value desc")
140	140	#else
141		- #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
142		- where obj.name=doc.fullName and
143		- obj.className='Theses.ThesisClass' and
144		- obj.name<>'Theses.ThesisClassTemplate' and
145		- prop.id.id=obj.id and
146		- prop1.id.id=obj.id and
147		- prop2.id.id=obj.id and
148		- prop3.id.id=obj.id and
149		- prop4.id.id=obj.id and
150		- prop.name='status' and
151		- prop.value = '$thesisStatus' and
152		- prop1.name='supervisor' and
153		- prop2.name='coSupervisors' and
154		- prop3.name='contact' and
155		- prop4.name='$orderingDateFieldName' and
156		- ( prop1.value like '%$userName%' or
157		- prop2.value like '%$userName%' or
158		- prop3.value like '%$userName%')
159		- order by prop4.value desc")
	166	+## no user selected, some role selected
	167	+ #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
	168	+ 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 prop0.name = 'status' and prop1.name = '$orderingDateFieldName' and prop0.value = '$thesisStatus' order by prop1.value desc" )
160	160	#end
161		-#elseif ( $roleSelected )
162		- #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
163		- where obj.name=doc.fullName and
164		- obj.className='Theses.ThesisClass' and
165		- obj.name<>'Theses.ThesisClassTemplate' and
166		- prop.id.id=obj.id and
167		- prop1.id.id=obj.id and
168		- prop2.id.id=obj.id and
169		- prop3.id.id=obj.id and
170		- prop4.id.id=obj.id and
171		- prop.name='status' and
172		- prop.value = '$thesisStatus' and
173		- prop1.name='supervisor' and
174		- prop2.name='coSupervisors' and
175		- prop3.name='contact' and
176		- prop4.name='$orderingDateFieldName' and
177		- prop1.value like '%$supervisorName%' and
178		- prop2.value like '%$cosupervisorName%' and
179		- prop3.value like '%$contactName%'
180		- order by prop4.value desc")
181		-#else
182		- #set ($sql = ", BaseObject as obj, StringProperty as prop, DateProperty as prop1
183		- where obj.name=doc.fullName and
184		- obj.className='Theses.ThesisClass' and
185		- obj.name<>'Theses.ThesisClassTemplate' and
186		- prop.id.id=obj.id and
187		- prop1.id.id=obj.id and
188		- prop.name='status' and
189		- prop.value = '$thesisStatus' and
190		- prop1.name='$orderingDateFieldName'
191		- order by prop1.value desc")
192	192	#end
193		-#set($thesisFound = $xwiki.searchDocuments($sql))
	171	+#set( $thesisFound = $xwiki.searchDocuments($sql) )
194	194	##
195	195	#foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
196		-* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) //(#thesisAuthorLink($thesis)#if( $thesisDoc.display("endDate") != "" ), #thesisYear($thesis)#end)//#end
197		-
	174	+##* #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
	175	+* $thesis
198	198	#end
199	199	{{/velocity}}