Changes for page Per Year
From version 20.1
edited by Andrea Omicini
on 25/10/2021 16:52
on 25/10/2021 16:52
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,32 +86,55 @@ 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") ) 93 93 #set( $contactLastName = $contactdoc.display("last_name") ) 94 94 #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 95 95 ## 96 96 ## $userSelected true and $roleSelected false means one user for all roles 97 97 ## $userSelected true and $roleSelected true for one user with one specific role 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 -#if( $userSelected ) 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 - 107 - #end 120 +#if( $selectedStatus == 'all' ) 121 +ALLL 108 108 #else 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 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 111 111 127 + #else 128 +>{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/thesisStatus}} / $userFirstName $userLastName 129 + 130 + #end 112 112 #else 113 ->{{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 114 114 135 + #else 136 +>{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/thesisStatus}} 137 + 138 + #end 115 115 #end 116 116 #end 117 117 ## ... ... @@ -132,11 +132,11 @@ 132 132 #if( $roleSelected ) 133 133 ## some specific role selected 134 134 #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2 135 - 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" ) 136 136 #else 137 137 ## no specific role selected 138 138 #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4 139 - 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" ) 140 140 #end 141 141 #elseif( $roleSelected ) 142 142 ## no user selected, some role selected ... ... @@ -145,7 +145,7 @@ 145 145 #else 146 146 ## no user selected, some role selected 147 147 #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1 148 - 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" ) 149 149 #end 150 150 #end 151 151 #set( $thesisFound = $xwiki.searchDocuments($sql) )