Changes for page Per Year
From version 20.10
edited by Andrea Omicini
on 25/10/2021 17:12
on 25/10/2021 17:12
Change comment:
There is no comment for this version
To version 30.1
edited by Andrea Omicini
on 25/10/2021 18:43
on 25/10/2021 18:43
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -1,16 +1,17 @@ 1 1 {{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}} 2 2 #set( $thesisMenu = true ) 3 -### #getparameters3 +### START STATUS 4 4 ## hypothesis: $thesisStatus set, default "Completed" 5 5 ## status parameter 6 6 #set( $statusPar = $request.status.trim().toLowerCase() ) 7 +#set( $statusSelected = false ) 7 7 #if( $statusPar != '' && $allThesisStatuses.contains($statusPar) ) 9 + #set( $statusSelected = true ) 8 8 #set( $selectedStatus = $statusPar ) 9 -#else 10 - #set( $selectedStatus = 'all' ) 11 11 #end 12 12 ##check velocity variable, takes precedence 13 13 #if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) ) 14 + #set( $statusSelected = true ) 14 14 #set( $selectedStatus = $thesisStatus.trim().toLowerCase() ) 15 15 #end 16 16 ## set ordering field ... ... @@ -19,163 +19,91 @@ 19 19 #elseif( $selectedStatus == "ongoing" ) 20 20 #set( $orderingDateFieldName = "startDate" ) 21 21 #else 23 +## default for no selected status, too 22 22 #set( $orderingDateFieldName = "endDate" ) 23 23 #end 24 -## invariant: $ thesisStatus set, $orderingDateFieldName set correspondingly25 -## who26 -# set( $userNamePar = $request.user )27 -# set($supervisorNamePar=$request.supervisor)28 -#set( $ cosupervisorNamePar = $request.cosupervisor )29 -#set( $ contactNamePar = $request.contact )30 -## ##setdefault values26 +## invariant: $statusSelected set, $selectedStatus & $orderingDateFieldName set accordingly 27 +### END STATUS 28 +## 29 +### START USER & ROLE 30 +#set( $userNamePar = $request.user.trim() ) 31 +#set( $rolePar = $request.role.trim().toLowerCase() ) 32 +## default values 31 31 #set( $userSelected = false ) 32 -#set( $roleSelected = false ) 33 33 #set( $userFirstName = "" ) 34 34 #set( $userLastName = "" ) 35 -#set( $supervisorName = "" ) 36 -#set( $supervisorFirstName = "" ) 37 -#set( $supervisorLastName = "" ) 38 -#set( $cosupervisorName = "" ) 39 -#set( $cosupervisorFirstName = "" ) 40 -#set( $cosupervisorLastName = "" ) 41 -#set( $contactName = "" ) 42 -#set( $contactFirstName = "" ) 43 -#set( $contactLastName = "" ) 44 -## 45 -#### handle who & roles 46 -## 47 -#if ( $userName || $userNamePar ) 36 +#if( $userName || $userNamePar ) 48 48 ## a user is specified for all roles 49 - #set( $userSelected = true ) 50 - #if ( !$userName )#set( $userName = "XWiki.$userNamePar" )#end 51 - #set( $userdoc = $xwiki.getDocument($userName) ) 52 - #set( $userFirstName = $userdoc.display("first_name") ) 53 - #set( $userLastName = $userdoc.display("last_name") ) 54 -#elseif ( $supervisorNamePar || $cosupervisorNamePar || $contactNamePar ) 55 - #set( $roleSelected = true ) 56 - #if ( $supervisorNamePar ) 57 - #set( $supervisorName = "XWiki.$supervisorNamePar" ) 58 - #set( $supervisordoc = $xwiki.getDocument($supervisorName) ) 59 - #set( $supervisorFirstName = $supervisordoc.display("first_name") ) 60 - #set( $supervisorLastName = $supervisordoc.display("last_name") ) 38 + #if( !$userName ) 39 + #set( $selectedUser = "XWiki.$userNamePar" ) 40 + #else 41 + #set( $selectedUser = $userName ) 61 61 #end 62 - #if ( $cosupervisorNamePar ) 63 - #set( $cosupervisorName = "XWiki.$cosupervisorNamePar" ) 64 - #set( $cosupervisordoc = $xwiki.getDocument($cosupervisorName) ) 65 - #set( $cosupervisorFirstName = $cosupervisordoc.display("first_name") ) 66 - #set( $cosupervisorLastName = $cosupervisordoc.display("last_name") ) 43 + #if( $xwiki.exists($selectedUser) ) 44 + #set( $userSelected = true ) 45 + #set( $userdoc = $xwiki.getDocument($selectedUser) ) 46 + #set( $userFirstName = $userdoc.display("first_name") ) 47 + #set( $userLastName = $userdoc.display("last_name") ) 48 + #else 49 +{{warning}} $selectedUser is not an {{apice/}} user{{/warning}} 50 + #stop 67 67 #end 68 - #if ( $contactNamePar ) 69 - #set( $contactName = "XWiki.$contactNamePar" ) 70 - #set( $contactdoc = $xwiki.getDocument($contactName) ) 71 - #set( $contactFirstName = $contactdoc.display("first_name") ) 72 - #set( $contactLastName = $contactdoc.display("last_name") ) 52 +##user selected and existing user page 53 + #set( $roleSelected = false ) 54 + #set( $selectedRole = '' ) 55 + #if( $rolePar != '' && $allThesisRoles.contains($rolePar) ) 56 + #set( $roleSelected = true ) 57 + #set( $selectedRole = $rolePar ) 73 73 #end 74 74 #end 75 -#if( $supervisor ) 76 - #set( $roleSelected = true ) 77 - #set( $supervisorName = $userName ) 78 - #set( $supervisordoc = $xwiki.getDocument($supervisorName) ) 79 - #set( $supervisorFirstName = $supervisordoc.display("first_name") ) 80 - #set( $supervisorLastName = $supervisordoc.display("last_name") ) 81 -#end 82 -#if( $cosupervisor ) 83 - #set( $roleSelected = true ) 84 - #set( $cosupervisorName = $userName ) 85 - #set( $cosupervisordoc = $xwiki.getDocument($cosupervisorName) ) 86 - #set( $cosupervisorFirstName = $cosupervisordoc.display("first_name") ) 87 - #set( $cosupervisorLastName = $cosupervisordoc.display("last_name") ) 88 -#end 89 -#if( $contact ) 90 - #set( $roleSelected = true ) 91 - #set( $contactName = $userName ) 92 - #set( $contactdoc = $xwiki.getDocument($contactName) ) 93 - #set( $contactFirstName = $contactdoc.display("first_name") ) 94 - #set( $contactLastName = $contactdoc.display("last_name") ) 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 60 +## $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 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( $selectedStatus == 'all' ) 121 -ALLL 122 -#else 123 - #if( $userSelected ) user sel 124 - #if( $roleSelected ) role sel 125 ->{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/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 126 - 127 - #else no role sel 128 ->{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/thesisStatus}} / $userFirstName $userLastName 129 - 130 - #end 66 +#set( $roleSelectedFieldName = "" ) 67 +#if( $roleSelected ) 68 + #if( $selectedRole == "contact" ) 69 + #set( $roleSelectedFieldName = "contact" ) 70 + #elseif( $selectedRole == "cosupervisor" ) 71 + #set( $roleSelectedFieldName = "coSupervisors" ) 131 131 #else 132 - #if( $roleSelected ) 133 ->{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/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 134 - 135 - #else 136 ->{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/thesisStatus}} 137 - 138 - #end 73 + #set( $roleSelectedFieldName = "supervisor" ) 139 139 #end 140 140 #end 141 141 ## 142 -#if( $cosupervisor ) 143 - #set( $roleSelectedFieldName = "coSupervisors" ) 144 -#elseif( $contact ) 145 - #set( $roleSelectedFieldName = "contact" ) 146 -#else 147 - #set( $roleSelectedFieldName = "supervisor" ) 148 -#end 149 -## 150 -#if( $selectedStatus == 'all' ) 151 - ALL STATUSES 152 -#else 153 -## some selected status 154 - #if( $userSelected ) 77 +#foreach( $status in $allThesisStatuses ) 78 + #if( !$statusSelected || $selectedStatus == $status ) 79 += $status = 80 +## some selected status or all statuses / now $status 81 + #if( $userSelected ) 82 +== $selectedUser == 155 155 ## some user selected 156 - #if( $roleSelected ) 84 + #if( $roleSelected ) 157 157 ## some specific role selected 158 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2 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 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" ) 160 - #else 86 +=== $roleSelected === 87 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2 88 + 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" ) 89 + #else 161 161 ## no specific 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 prop0.value = '$thesisStatus' and ( prop1.value like '%$userName%' or prop2.value like '%$userName%' or prop3.value like '%$userName%' ) order by prop4.value desc" ) 91 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4 92 + 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 '%$selectedUser%' or prop2.value like '%$selectedUser%' or prop3.value like '%$selectedUser%' ) order by prop4.value desc" ) 93 + #end 94 + #else 95 +## no user selected, no role selected 96 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1 97 + 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 lower(prop0.value) = '$status' order by prop1.value desc" ) 164 164 #end 165 - #elseif( $roleSelected ) 166 -## no user selected, some role selected 167 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4 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 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") 169 - #else 170 -## no user selected, some role selected 171 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1 172 - 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" ) 173 173 #end 174 -#end 175 -#set( $thesisFound = $ xwiki.searchDocuments($sql) )100 + #set( $thesisFound = $xwiki.searchDocuments($sql) ) 101 + #set( $thesisFoundNo = $thesisFound.size() ) 176 176 ## 177 -#foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis)) 178 -##* #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 179 -* $thesis 103 + #foreach ($thesis in $thesisFound) 104 + #set($thesisDoc = $xwiki.getDocument($thesis)) 105 + #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass')) 106 +* [[$thesisObj.title>>$thesisDoc]]#if( $thesisDoc.getValue('studentUserName') != "" )//$thesisDoc.getValue('studentUserName')//#elseif( $thesisObj.studentFirstName != "" && $thesisObj.studentLastName != "" )//$thesisObj.studentFirstName $thesisObj.studentLastName//#end#if( $thesisObj.endDate != "" ) ($thesisObj.endDate)#end 107 + 108 + #end 180 180 #end 181 181 {{/velocity}}