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 23.1
edited by Andrea Omicini
on 25/10/2021 17:49
on 25/10/2021 17:49
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,54 +86,13 @@ 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 95 -$selectedStatus 96 - 97 -$userSelected 98 - 99 -$roleSelected 100 - 101 -$supervisor 102 - 103 -$cosupervisor 104 - 105 -$contact 106 - 107 -$userFirstName $userLastName 108 - 109 -$supervisorFirstName $supervisorLastName 110 - 111 -$cosupervisorFirstName $cosupervisorLastName 112 - 113 -$contactFirstName $contactLastName 114 114 ## 115 -## $userSelected true and $roleSelected false means one user for all roles 116 -## $userSelected true and $roleSelected true for one user with one specific role 117 -## if $userSelected false and $roleSelected true mean at least one role with an assigned user 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 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 130 - 131 - #else 132 ->{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}} 133 - 134 - #end 135 -#end 136 -## 137 137 #if( $cosupervisor ) 138 138 #set( $roleSelectedFieldName = "coSupervisors" ) 139 139 #elseif( $contact ) ... ... @@ -142,35 +142,39 @@ 142 142 #set( $roleSelectedFieldName = "supervisor" ) 143 143 #end 144 144 ## 145 -#if( $selectedStatus == 'all' ) 146 - ALL STATUSES 147 -#else 148 -## some selected status 149 - #if( $userSelected ) 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 113 + #if( $userSelected ) 114 +== $userName == 150 150 ## some user selected 151 - #if( $roleSelected ) 116 + #if( $roleSelected ) 152 152 ## some specific role selected 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 = '$thesisStatus' and prop1.value like '%$userName%' order by prop2.value desc" ) 155 - #else 118 +=== $roleSelectedFieldName === 119 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2 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 = '$status' and prop1.value like '%$userName%' order by prop2.value desc" ) 121 + #else 156 156 ## no specific role selected 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 = '$thesisStatus' and ( prop1.value like '%$userName%' or prop2.value like '%$userName%' or prop3.value like '%$userName%' ) order by prop4.value desc" ) 123 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4 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) = '$status' and ( prop1.value like '%$userName%' or prop2.value like '%$userName%' or prop3.value like '%$userName%' ) order by prop4.value desc" ) 125 + #end 126 + #else 127 +## no user selected, no role selected 128 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1 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 = '$status' order by prop1.value desc" ) 159 159 #end 160 - #elseif( $roleSelected ) 161 -## no user selected, some role selected 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 prop1.value like '%$supervisorName%' and prop2.value like '%$cosupervisorName%' and prop3.value like '%$contactName%' order by prop4.value desc") 164 - #else 165 -## no user selected, some role selected 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 = '$thesisStatus' order by prop1.value desc" ) 168 168 #end 169 -#end 170 -#set( $thesisFound = $ xwiki.searchDocuments($sql) )132 + #set( $thesisFound = $xwiki.searchDocuments($sql) ) 133 + #set( $thesisFoundNo = $thesisFound.size() ) 171 171 ## 172 -#foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis)) 173 -##* #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 174 -* $thesis 135 + #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis)) 136 +* [[$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 + 138 + #end 175 175 #end 176 176 {{/velocity}}