Changes for page Per Year

From version 20.4
edited by Andrea Omicini
on 25/10/2021 17:05
Change comment: There is no comment for this version
To version 17.3
edited by Andrea Omicini
on 25/10/2021 16:19
Change comment: There is no comment for this version

Summary

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,25 +93,6 @@
93 93   #set( $contactFirstName = $contactdoc.display("first_name") )
94 94   #set( $contactLastName = $contactdoc.display("last_name") )
95 95  #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
115 115  ##
116 116  ## $userSelected true and $roleSelected false means one user for all roles
117 117  ## $userSelected true and $roleSelected true for one user with one specific role
... ... @@ -118,60 +118,99 @@
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 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 -
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 // //
127 127   #end
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
131 -
132 - #else
133 ->{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}}
134 -
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) // //
135 135   #end
136 136  #end
137 137  ##
138 -#if( $cosupervisor )
139 - #set( $roleSelectedFieldName = "coSupervisors" )
140 -#elseif( $contact )
141 - #set( $roleSelectedFieldName = "contact" )
114 +#if ( $cosupervisor )
115 + #set ( $roleSelectedFieldName = "coSupervisors" )
116 +#elseif ( $contact )
117 + #set ( $roleSelectedFieldName = "contact" )
142 142  #else
143 - #set( $roleSelectedFieldName = "supervisor" )
119 + #set ( $roleSelectedFieldName = "supervisor" )
144 144  #end
145 145  ##
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")
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")
165 165   #else
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" )
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")
169 169   #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")
170 170  #end
171 -#set( $thesisFound = $xwiki.searchDocuments($sql) )
190 +#set($thesisFound = $xwiki.searchDocuments($sql))
172 172  ##
173 173  #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
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
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 +
176 176  #end
177 177  {{/velocity}}