Changes for page Per Year

Summary

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

Details

Page properties

Content

...	...	@@ -9,7 +9,6 @@
9	9	#else
10	10	#set( $selectedStatus = 'all' )
11	11	#end
12		-$selectedStatus
13	13	##check velocity variable, takes precedence
14	14	#if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) )
15	15	#set( $selectedStatus = $thesisStatus.trim().toLowerCase() )
...	...	@@ -30,7 +30,7 @@
30	30	#set( $contactNamePar = $request.contact )
31	31	#### set default values
32	32	#set( $userSelected = false )
33		-#set( $roleSelected = false )
	32	+#set( $roleSelected = false )
34	34	#set( $userFirstName = "" )
35	35	#set( $userLastName = "" )
36	36	#set( $supervisorName = "" )
...	...	@@ -73,7 +73,7 @@
73	73	#end
74	74	#end
75	75	#if( $supervisor )
76		- #set( $roleSelected = true )
	75	+ #set( $roleSelected = true )
77	77	#set( $supervisorName = $userName )
78	78	#set( $supervisordoc = $xwiki.getDocument($supervisorName) )
79	79	#set( $supervisorFirstName = $supervisordoc.display("first_name") )
...	...	@@ -93,13 +93,6 @@
93	93	#set( $contactFirstName = $contactdoc.display("first_name") )
94	94	#set( $contactLastName = $contactdoc.display("last_name") )
95	95	#end
96		-$supervisor
97		-$cosupervisor
98		-$contact
99		-$userFirstName $userLastName
100		-$supervisorFirstName $supervisorLastName
101		-$cosupervisorFirstName $cosupervisorLastName
102		-$contactFirstName $contactLastName
103	103	##
104	104	## $userSelected true and $roleSelected false means one user for all roles
105	105	## $userSelected true and $roleSelected true for one user with one specific role
...	...	@@ -106,60 +106,99 @@
106	106	## if $userSelected false and $roleSelected true mean at least one role with an assigned user
107	107	## both false means all theses
108	108	#if( $userSelected )
109		- #if( $roleSelected )
110		->{{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
111		-
112		- #else
113		->{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}} / $userFirstName $userLastName
114		-
	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 // //
115	115	#end
116	116	#else
117		- #if( $roleSelected )
118		->{{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
119		-
120		- #else
121		->{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}}
122		-
	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) // //
123	123	#end
124	124	#end
125	125	##
126		-#if( $cosupervisor )
127		- #set( $roleSelectedFieldName = "coSupervisors" )
128		-#elseif( $contact )
129		- #set( $roleSelectedFieldName = "contact" )
	114	+#if ( $cosupervisor )
	115	+ #set ( $roleSelectedFieldName = "coSupervisors" )
	116	+#elseif ( $contact )
	117	+ #set ( $roleSelectedFieldName = "contact" )
130	130	#else
131		- #set( $roleSelectedFieldName = "supervisor" )
	119	+ #set ( $roleSelectedFieldName = "supervisor" )
132	132	#end
133	133	##
134		-#if( $selectedStatus == 'all' )
135		- ALL STATUSES
136		-#else
137		-## some selected status
138		- #if( $userSelected )
139		-## some user selected
140		- #if( $roleSelected )
141		-## some specific role selected
142		- #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
143		- 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		- #else
145		-## no specific role selected
146		- #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
147		- 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" )
148		- #end
149		- #elseif( $roleSelected )
150		-## no user selected, some role selected
151		- #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
152		- 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")
	122	+#if ($userSelected)
	123	+ #if ( $roleSelected )
	124	+ #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, DateProperty as prop2
	125	+ where obj.name=doc.fullName and
	126	+ obj.className='Theses.ThesisClass' and
	127	+ obj.name<>'Theses.ThesisClassTemplate' and
	128	+ prop.id.id=obj.id and
	129	+ prop1.id.id=obj.id and
	130	+ prop2.id.id=obj.id and
	131	+ prop.name='status' and
	132	+ prop.value='$thesisStatus' and
	133	+ prop1.name='$roleSelectedFieldName' and
	134	+ prop2.name='$orderingDateFieldName' and
	135	+ prop1.value like '%$userName%'
	136	+ order by prop2.value desc")
153	153	#else
154		-## no user selected, some role selected
155		- #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
156		- 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" )
	138	+ #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
	139	+ where obj.name=doc.fullName and
	140	+ obj.className='Theses.ThesisClass' and
	141	+ obj.name<>'Theses.ThesisClassTemplate' and
	142	+ prop.id.id=obj.id and
	143	+ prop1.id.id=obj.id and
	144	+ prop2.id.id=obj.id and
	145	+ prop3.id.id=obj.id and
	146	+ prop4.id.id=obj.id and
	147	+ prop.name='status' and
	148	+ prop.value = '$thesisStatus' and
	149	+ prop1.name='supervisor' and
	150	+ prop2.name='coSupervisors' and
	151	+ prop3.name='contact' and
	152	+ prop4.name='$orderingDateFieldName' and
	153	+ ( prop1.value like '%$userName%' or
	154	+ prop2.value like '%$userName%' or
	155	+ prop3.value like '%$userName%')
	156	+ order by prop4.value desc")
157	157	#end
	158	+#elseif ( $roleSelected )
	159	+ #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
	160	+ where obj.name=doc.fullName and
	161	+ obj.className='Theses.ThesisClass' and
	162	+ obj.name<>'Theses.ThesisClassTemplate' and
	163	+ prop.id.id=obj.id and
	164	+ prop1.id.id=obj.id and
	165	+ prop2.id.id=obj.id and
	166	+ prop3.id.id=obj.id and
	167	+ prop4.id.id=obj.id and
	168	+ prop.name='status' and
	169	+ prop.value = '$thesisStatus' and
	170	+ prop1.name='supervisor' and
	171	+ prop2.name='coSupervisors' and
	172	+ prop3.name='contact' and
	173	+ prop4.name='$orderingDateFieldName' and
	174	+ prop1.value like '%$supervisorName%' and
	175	+ prop2.value like '%$cosupervisorName%' and
	176	+ prop3.value like '%$contactName%'
	177	+ order by prop4.value desc")
	178	+#else
	179	+ #set ($sql = ", BaseObject as obj, StringProperty as prop, DateProperty as prop1
	180	+ where obj.name=doc.fullName and
	181	+ obj.className='Theses.ThesisClass' and
	182	+ obj.name<>'Theses.ThesisClassTemplate' and
	183	+ prop.id.id=obj.id and
	184	+ prop1.id.id=obj.id and
	185	+ prop.name='status' and
	186	+ prop.value = '$thesisStatus' and
	187	+ prop1.name='$orderingDateFieldName'
	188	+ order by prop1.value desc")
158	158	#end
159		-#set( $thesisFound = $xwiki.searchDocuments($sql) )
	190	+#set($thesisFound = $xwiki.searchDocuments($sql))
160	160	##
161	161	#foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
162		-##* #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
163		-* $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
	194	+
164	164	#end
165	165	{{/velocity}}