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() )
...	...	@@ -45,7 +45,8 @@
45	45	##
46	46	#### handle who & roles
47	47	##
48		-#if ( $userName || $userNamePar ) ## a user is specified for all roles
	47	+#if ( $userName || $userNamePar )
	48	+## a user is specified for all roles
49	49	#set( $userSelected = true )
50	50	#if ( !$userName )#set( $userName = "XWiki.$userNamePar" )#end
51	51	#set( $userdoc = $xwiki.getDocument($userName) )
...	...	@@ -87,7 +87,7 @@
87	87	#set( $cosupervisorLastName = $cosupervisordoc.display("last_name") )
88	88	#end
89	89	#if( $contact )
90		- #set( $roleSelected = true )
	90	+ #set( $roleSelected = true )
91	91	#set( $contactName = $userName )
92	92	#set( $contactdoc = $xwiki.getDocument($contactName) )
93	93	#set( $contactFirstName = $contactdoc.display("first_name") )
...	...	@@ -117,21 +117,25 @@
117	117	## $userSelected true and $roleSelected true for one user with one specific role
118	118	## if $userSelected false and $roleSelected true mean at least one role with an assigned user
119	119	## 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
123		-
124		- #else
125		->{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}} / $userFirstName $userLastName
126		-
127		- #end
	120	+#if( $selectedStatus == 'all' )
	121	+ALLL
128	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
	123	+ #if( $userSelected )
	124	+ #if( $roleSelected )
	125	+>{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/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
131	131
	127	+ #else
	128	+>{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/thesisStatus}} / $userFirstName $userLastName
	129	+
	130	+ #end
132	132	#else
133		->{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}}
	132	+ #if( $roleSelected )
	133	+>{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/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
134	134
	135	+ #else
	136	+>{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/thesisStatus}}
	137	+
	138	+ #end
135	135	#end
136	136	#end
137	137	##
...	...	@@ -152,11 +152,11 @@
152	152	#if( $roleSelected )
153	153	## some specific role selected
154	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" )
	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 prop0.name = 'status' and prop1.name = '$roleSelectedFieldName' and prop2.name = '$orderingDateFieldName' and prop0.value = '$selectedStatus' and prop1.value like '%$userName%' order by prop2.value desc" )
156	156	#else
157	157	## no specific role selected
158	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" )
	163	+ 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 lower(prop0.value) = '$selectedStatus' and ( prop1.value like '%$userName%' or prop2.value like '%$userName%' or prop3.value like '%$userName%' ) order by prop4.value desc" )
160	160	#end
161	161	#elseif( $roleSelected )
162	162	## no user selected, some role selected
...	...	@@ -165,10 +165,12 @@
165	165	#else
166	166	## no user selected, some role selected
167	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" )
	172	+ 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 = '$selectedStatus' order by prop1.value desc" )
169	169	#end
170	170	#end
	175	+$sql
171	171	#set( $thesisFound = $xwiki.searchDocuments($sql) )
	177	+$thesisFound.size()
172	172	##
173	173	#foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
174	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