Changes for page Per Year
From 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
To version 36.1
edited by Andrea Omicini
on 25/10/2021 19:51
on 25/10/2021 19:51
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -28,7 +28,6 @@ 28 28 ## 29 29 ### START USER & ROLE 30 30 #set( $userNamePar = $request.user.trim() ) 31 -#set( $rolePar = $request.role.trim().toLowerCase() ) 32 32 ## default values 33 33 #set( $userSelected = false ) 34 34 #set( $userFirstName = "" ) ... ... @@ -50,6 +50,7 @@ 50 50 #stop 51 51 #end 52 52 ##user selected and existing user page 52 + #set( $rolePar = $request.role.trim().toLowerCase() ) 53 53 #set( $roleSelected = false ) 54 54 #set( $selectedRole = '' ) 55 55 #if( $rolePar != '' && $allThesisRoles.contains($rolePar) ) ... ... @@ -63,6 +63,10 @@ 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 +## title 67 +>#if( $statusSelected ){{thesisStatus}}$selectedStatus{{/thesisStatus}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end 68 + 69 +## search theses 66 66 #foreach( $status in $allThesisStatuses ) 67 67 #if( !$statusSelected || $selectedStatus == $status ) 68 68 = $status = ... ... @@ -79,15 +79,14 @@ 79 79 #else 80 80 #set( $roleSelectedFieldName = "supervisor" ) 81 81 #end 82 - #end 83 83 ## some selected role or all roles / now $role 84 84 === $role === 85 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2 88 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2 86 86 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" ) 87 - #end 88 - #set( $thesisFound = $xwiki.searchDocuments($sql) ) 89 - #foreach( $thesis in $thesisFound ) 90 + #set( $thesisFound = $xwiki.searchDocuments($sql) ) 91 + #foreach( $thesis in $thesisFound ) 90 90 * $thesis 93 + #end 91 91 #end 92 92 #end 93 93 ## no user selected, no role selected