Changes for page Per Year
From version 41.1
edited by Andrea Omicini
on 25/10/2021 20:43
on 25/10/2021 20:43
Change comment:
There is no comment for this version
To version 38.1
edited by Andrea Omicini
on 25/10/2021 19:55
on 25/10/2021 19:55
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -4,14 +4,14 @@ 4 4 ## hypothesis: $thesisStatus set, default "Completed" 5 5 ## status parameter 6 6 #set( $statusPar = $request.status.trim().toLowerCase() ) 7 -#set( $ oneStatus = false )7 +#set( $statusSelected = false ) 8 8 #if( $statusPar != '' && $allThesisStatuses.contains($statusPar) ) 9 - #set( $ oneStatus = true )9 + #set( $statusSelected = true ) 10 10 #set( $selectedStatus = $statusPar ) 11 11 #end 12 12 ##check velocity variable, takes precedence 13 13 #if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) ) 14 - #set( $ oneStatus = true )14 + #set( $statusSelected = true ) 15 15 #set( $selectedStatus = $thesisStatus.trim().toLowerCase() ) 16 16 #end 17 17 ## set ordering field ... ... @@ -23,14 +23,13 @@ 23 23 ## default for no selected status, too 24 24 #set( $orderingDateFieldName = "endDate" ) 25 25 #end 26 -## invariant: $ oneStatus set, $selectedStatus & $orderingDateFieldName set accordingly26 +## invariant: $statusSelected set, $selectedStatus & $orderingDateFieldName set accordingly 27 27 ### END STATUS 28 28 ## 29 29 ### START USER & ROLE 30 30 #set( $userNamePar = $request.user.trim() ) 31 31 ## default values 32 -#set( $oneUser = false ) 33 -#set( $oneRole = false ) 32 +#set( $userSelected = false ) 34 34 #set( $userFirstName = "" ) 35 35 #set( $userLastName = "" ) 36 36 #if( $userName || $userNamePar ) ... ... @@ -41,7 +41,7 @@ 41 41 #set( $selectedUser = $userName ) 42 42 #end 43 43 #if( $xwiki.exists($selectedUser) ) 44 - #set( $ oneUser = true )43 + #set( $userSelected = true ) 45 45 #set( $userdoc = $xwiki.getDocument($selectedUser) ) 46 46 #set( $userFirstName = $userdoc.display("first_name") ) 47 47 #set( $userLastName = $userdoc.display("last_name") ) ... ... @@ -51,47 +51,43 @@ 51 51 #end 52 52 ##user selected and existing user page 53 53 #set( $rolePar = $request.role.trim().toLowerCase() ) 53 + #set( $roleSelected = false ) 54 54 #set( $selectedRole = '' ) 55 55 #if( $rolePar != '' && $allThesisRoles.contains($rolePar) ) 56 - #set( $o neRole = true )56 + #set( $roleSelected = true ) 57 57 #set( $selectedRole = $rolePar ) 58 58 #end 59 59 #end 60 -## $ oneUser and $oneRole set properly, other related variables set accordingly61 -## $o neRole has meaning only if $oneUser62 -## if $ oneUser, $oneRole false means one user for all roles63 -## if $ oneUser, $oneRole true means one specific role for one user selected64 -## if $ oneUser is false, $oneRole means nothing -- so all users, all roles / just status60 +## $userselected and $roleSelected set properly, other related variables set accordingly 61 +## $roleSelected has meaning only if $userSelected 62 +## if $userSelected, $roleSelected false means one user for all roles 63 +## if $userSelected, $roleSelected true means one specific role for one user selected 64 +## if $userSelected is false, $roleSelected means nothing -- so all users, all roles / just status 65 65 ## 66 66 ## title 67 ->#if( $oneStatus ){{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/thesisStatus}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end#if( $oneUser ) / $userFirstName **$userLastName**#end#if( $oneRole ) / $selectedRole#end{{id name='top'/}} 68 -## index 69 -#if( !$oneStatus ) 70 -(% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $status in $allThesisStatuses )#if ($velocityCount > 1) | #end[[{{thesisStatus plural="true" uppercase="false"}}$status{{/thesisStatus}}>>||anchor="$status"]]#end))) 71 -#elseif( !$oneRole ) 72 -(% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $role in $allThesisRoles )#if ($velocityCount > 1) | #end [[$role>>||anchor="$role"]]#end))) 73 -#end{{id name='index'/}} 67 +>#if( $statusSelected ){{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/thesisStatus}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end#if( $userSelected ) / $userFirstName **$userLastName**#end 68 + 74 74 ## search theses 75 75 #foreach( $status in $allThesisStatuses ) 76 - #if( !$ oneStatus || $selectedStatus == $status )71 + #if( !$statusSelected || $selectedStatus == $status ) 77 77 = $status = 78 78 ## some selected status or all statuses / now $status 79 - #if( $ oneUser )74 + #if( $userSelected ) 80 80 == $selectedUser == 81 81 ## some user selected 82 82 #foreach( $role in $allThesisRoles ) 83 - #if( !$o neRole || $selectedRole == $role )78 + #if( !$roleSelected || $selectedRole == $role ) 84 84 #if( $role == "contact" ) 85 - #set( $ selectedRoleFieldName = "contact" )80 + #set( $roleSelectedFieldName = "contact" ) 86 86 #elseif( $role == "cosupervisor" ) 87 - #set( $ selectedRoleFieldName = "coSupervisors" )82 + #set( $roleSelectedFieldName = "coSupervisors" ) 88 88 #else 89 - #set( $ selectedRoleFieldName = "supervisor" )84 + #set( $roleSelectedFieldName = "supervisor" ) 90 90 #end 91 91 ## some selected role or all roles / now $role 92 92 === $role === 93 93 #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2 94 - 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 = '$ selectedRoleFieldName' and prop2.name = '$orderingDateFieldName' and lower(prop0.value) = '$status' and prop1.value like '%$selectedUser%' order by prop2.value desc" )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" ) 95 95 #set( $thesisFound = $xwiki.searchDocuments($sql) ) 96 96 #foreach( $thesis in $thesisFound ) 97 97 * $thesis