Changes for page Per Year

From version 20.11
edited by Andrea Omicini
on 25/10/2021 17:15
Change comment: There is no comment for this version
To version 20.5
edited by Andrea Omicini
on 25/10/2021 17:05
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -44,8 +44,7 @@
44 44  ##
45 45  #### handle who & roles
46 46  ##
47 -#if ( $userName || $userNamePar )
48 -## a user is specified for all roles
47 +#if ( $userName || $userNamePar ) ## 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 )
89 + #set( $roleSelected = true )
91 91   #set( $contactName = $userName )
92 92   #set( $contactdoc = $xwiki.getDocument($contactName) )
93 93   #set( $contactFirstName = $contactdoc.display("first_name") )
... ... @@ -117,25 +117,21 @@
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( $selectedStatus == 'all' )
121 -ALLL
122 -#else
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
119 +#if( $userSelected )
120 + #if( $roleSelected )
121 +>{{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
126 126  
127 - #else
128 ->{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/thesisStatus}} / $userFirstName $userLastName
129 -
130 - #end
131 131   #else
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
124 +>{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}} / $userFirstName $userLastName
134 134  
135 - #else
136 ->{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/thesisStatus}}
126 + #end
127 +#else
128 + #if( $roleSelected )
129 +>{{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
137 137  
138 - #end
131 + #else
132 +>{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}}
133 +
139 139   #end
140 140  #end
141 141  ##
... ... @@ -156,11 +156,11 @@
156 156   #if( $roleSelected )
157 157  ## some specific role selected
158 158   #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
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" )
154 + 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" )
160 160   #else
161 161  ## no specific role selected
162 162   #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
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 prop0.value = '$selectedStatus' and ( prop1.value like '%$userName%' or prop2.value like '%$userName%' or prop3.value like '%$userName%' ) order by prop4.value desc" )
158 + 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" )
164 164   #end
165 165   #elseif( $roleSelected )
166 166  ## no user selected, some role selected
... ... @@ -169,7 +169,7 @@
169 169   #else
170 170  ## no user selected, some role selected
171 171   #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
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" )
167 + 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" )
173 173   #end
174 174  #end
175 175  #set( $thesisFound = $xwiki.searchDocuments($sql) )