Changes for page Per Year
From version 31.1
edited by Andrea Omicini
on 25/10/2021 19:00
on 25/10/2021 19:00
Change comment:
There is no comment for this version
To version 32.1
edited by Andrea Omicini
on 25/10/2021 19:32
on 25/10/2021 19:32
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -63,17 +63,6 @@ 63 63 ## if $userSelected, $roleSelected true means one specific role for one user selected 64 64 ## if $userSelected is false, $roleSelected means nothing -- so all users, all roles / just status 65 65 ## 66 -#set( $roleSelectedFieldName = "" ) 67 -#if( $roleSelected ) 68 - #if( $selectedRole == "contact" ) 69 - #set( $roleSelectedFieldName = "contact" ) 70 - #elseif( $selectedRole == "cosupervisor" ) 71 - #set( $roleSelectedFieldName = "coSupervisors" ) 72 - #else 73 - #set( $roleSelectedFieldName = "supervisor" ) 74 - #end 75 -#end 76 -## 77 77 #foreach( $status in $allThesisStatuses ) 78 78 #if( !$statusSelected || $selectedStatus == $status ) 79 79 = $status = ... ... @@ -83,9 +83,17 @@ 83 83 ## some user selected 84 84 #foreach( $role in $allThesisRoles ) 85 85 #if( !$roleSelected || $selectedRole == $role ) 75 + #if( $role == "contact" ) 76 + #set( $roleSelectedFieldName = "contact" ) 77 + #elseif( $role == "cosupervisor" ) 78 + #set( $roleSelectedFieldName = "coSupervisors" ) 79 + #else 80 + #set( $roleSelectedFieldName = "supervisor" ) 81 + #end 82 + #end 86 86 ## some selected role or all roles / now $role 87 87 === $role === 88 - 85 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2 89 89 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 lower(prop0.value) = '$status' and prop1.value like '%$selectedUser%' order by prop2.value desc" ) 90 90 #end 91 91 #set( $thesisFound = $xwiki.searchDocuments($sql) )