Changes for page Per Year
From version 20.4
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 21.1
edited by Andrea Omicini
on 25/10/2021 17:47
on 25/10/2021 17:47
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
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() ) ... ... @@ -45,7 +45,8 @@ 45 45 ## 46 46 #### handle who & roles 47 47 ## 48 -#if ( $userName || $userNamePar ) ## a user is specified for all roles 47 +#if ( $userName || $userNamePar ) 48 +## 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,54 +87,13 @@ 87 87 #set( $cosupervisorLastName = $cosupervisordoc.display("last_name") ) 88 88 #end 89 89 #if( $contact ) 90 - #set( $roleSelected = true ) 90 + #set( $roleSelected = true ) 91 91 #set( $contactName = $userName ) 92 92 #set( $contactdoc = $xwiki.getDocument($contactName) ) 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 -## $userSelected true and $roleSelected false means one user for all roles 117 -## $userSelected true and $roleSelected true for one user with one specific role 118 -## if $userSelected false and $roleSelected true mean at least one role with an assigned user 119 -## both false means all theses 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 - 127 - #end 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 - 135 - #end 136 -#end 137 -## 138 138 #if( $cosupervisor ) 139 139 #set( $roleSelectedFieldName = "coSupervisors" ) 140 140 #elseif( $contact ) ... ... @@ -143,35 +143,38 @@ 143 143 #set( $roleSelectedFieldName = "supervisor" ) 144 144 #end 145 145 ## 146 -#if( $selectedStatus == 'all' ) 147 - ALL STATUSES 148 -#else 149 -## some selected status 105 +## $roleSelected has meaning only if $userSelected 106 +## if $userSelected, $roleSelected false means one user for all roles 107 +## if $userSelected, $roleSelected true means one specific role for one user selected 108 +## if $userSelected is false, $roleSelected means nothing -- so all users, all roles / just status 109 +#foreach( $status in $allThesisStatuses ) 110 + #if( $selectedStatus == 'all' || $selectedStatus == $status ) 111 += $status = 112 +## some selected status or all statuses / now $status 150 150 #if( $userSelected ) 114 +== $userName == 151 151 ## some user selected 152 152 #if( $roleSelected ) 153 153 ## some specific role selected 118 +=== $roleSelectedFieldName === 154 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 = '$t hesisStatus' and prop1.value like '%$userName%' order by prop2.value desc" )120 + 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" ) 156 156 #else 157 157 ## no specific role selected 158 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 = '$t hesisStatus' and ( prop1.value like '%$userName%' or prop2.value like '%$userName%' or prop3.value like '%$userName%' ) order by prop4.value desc" )124 + 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 lower(prop0.value) = '$selectedStatus' and ( prop1.value like '%$userName%' or prop2.value like '%$userName%' or prop3.value like '%$userName%' ) order by prop4.value desc" ) 160 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") 165 165 #else 166 -## no user selected, somerole selected127 +## no user selected, no role selected 167 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 = '$t hesisStatus' order by prop1.value desc" )129 + 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" ) 169 169 #end 170 170 #end 171 171 #set( $thesisFound = $xwiki.searchDocuments($sql) ) 133 +#set( $thesisFoundNo = $thesisFound.size() ) 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)//#end175 - * $thesis136 +* [[$thesisDoc.getValue("title")>>$thesisDoc]]#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 137 + 176 176 #end 177 177 {{/velocity}}