Modifiche per il documento Per anno

Summary

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

Details

Page properties

Content

...	...	@@ -29,7 +29,7 @@
29	29	#set( $contactNamePar = $request.contact )
30	30	#### set default values
31	31	#set( $userSelected = false )
32		-#set( $roleSelected = false )
	32	+#set( $roleSelected = false )
33	33	#set( $userFirstName = "" )
34	34	#set( $userLastName = "" )
35	35	#set( $supervisorName = "" )
...	...	@@ -72,7 +72,7 @@
72	72	#end
73	73	#end
74	74	#if( $supervisor )
75		- #set( $roleSelected = true )
	75	+ #set( $roleSelected = true )
76	76	#set( $supervisorName = $userName )
77	77	#set( $supervisordoc = $xwiki.getDocument($supervisorName) )
78	78	#set( $supervisorFirstName = $supervisordoc.display("first_name") )
...	...	@@ -98,46 +98,42 @@
98	98	## if $userSelected false and $roleSelected true mean at least one role with an assigned user
99	99	## both false means all theses
100	100	#if( $userSelected )
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 // //
	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
	103	+
	104	+ #else
	105	+>{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}} / $userFirstName $userLastName
	106	+
105	105	#end
106	106	#else
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) // //
	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
	111	+
	112	+ #else
	113	+>{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}}
	114	+
111	111	#end
112	112	#end
113	113	##
114		-#if ( $cosupervisor )
115		- #set ( $roleSelectedFieldName = "coSupervisors" )
116		-#elseif ( $contact )
117		- #set ( $roleSelectedFieldName = "contact" )
	118	+#if( $cosupervisor )
	119	+ #set( $roleSelectedFieldName = "coSupervisors" )
	120	+#elseif( $contact )
	121	+ #set( $roleSelectedFieldName = "contact" )
118	118	#else
119		- #set ( $roleSelectedFieldName = "supervisor" )
	123	+ #set( $roleSelectedFieldName = "supervisor" )
120	120	#end
121	121	##
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")
	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" )
137	137	#else
138	138	#set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
139	139	where obj.name=doc.fullName and
140		- obj.className='Theses.ThesisClass' and
	136	+ obj.className='Theses.ThesisClass' and
141	141	obj.name<>'Theses.ThesisClassTemplate' and
142	142	prop.id.id=obj.id and
143	143	prop1.id.id=obj.id and