Changes for page Per Year
From version 20.5
edited by Andrea Omicini
on 25/10/2021 17:05
on 25/10/2021 17:05
Change comment:
There is no comment for this version
To version 20.11
edited by Andrea Omicini
on 25/10/2021 17:15
on 25/10/2021 17:15
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -44,7 +44,8 @@ 44 44 ## 45 45 #### handle who & roles 46 46 ## 47 -#if ( $userName || $userNamePar ) ## a user is specified for all roles 47 +#if ( $userName || $userNamePar ) 48 +## a user is specified for all roles 48 48 #set( $userSelected = true ) 49 49 #if ( !$userName )#set( $userName = "XWiki.$userNamePar" )#end 50 50 #set( $userdoc = $xwiki.getDocument($userName) ) ... ... @@ -86,7 +86,7 @@ 86 86 #set( $cosupervisorLastName = $cosupervisordoc.display("last_name") ) 87 87 #end 88 88 #if( $contact ) 89 - #set( $roleSelected = true ) 90 + #set( $roleSelected = true ) 90 90 #set( $contactName = $userName ) 91 91 #set( $contactdoc = $xwiki.getDocument($contactName) ) 92 92 #set( $contactFirstName = $contactdoc.display("first_name") ) ... ... @@ -116,21 +116,25 @@ 116 116 ## $userSelected true and $roleSelected true for one user with one specific role 117 117 ## if $userSelected false and $roleSelected true mean at least one role with an assigned user 118 118 ## both false means all theses 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 122 - 123 - #else 124 ->{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}} / $userFirstName $userLastName 125 - 126 - #end 120 +#if( $selectedStatus == 'all' ) 121 +ALLL 127 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 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 130 130 127 + #else 128 +>{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/thesisStatus}} / $userFirstName $userLastName 129 + 130 + #end 131 131 #else 132 ->{{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 133 133 135 + #else 136 +>{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/thesisStatus}} 137 + 138 + #end 134 134 #end 135 135 #end 136 136 ## ... ... @@ -151,11 +151,11 @@ 151 151 #if( $roleSelected ) 152 152 ## some specific role selected 153 153 #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2 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 = '$t hesisStatus' 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" ) 155 155 #else 156 156 ## no specific role selected 157 157 #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4 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 = '$t hesisStatus' 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 prop0.value = '$selectedStatus' and ( prop1.value like '%$userName%' or prop2.value like '%$userName%' or prop3.value like '%$userName%' ) order by prop4.value desc" ) 159 159 #end 160 160 #elseif( $roleSelected ) 161 161 ## no user selected, some role selected ... ... @@ -164,7 +164,7 @@ 164 164 #else 165 165 ## no user selected, some role selected 166 166 #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1 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 = '$t hesisStatus' 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" ) 168 168 #end 169 169 #end 170 170 #set( $thesisFound = $xwiki.searchDocuments($sql) )