Changes for page Per Year
From version 27.2
edited by Andrea Omicini
on 25/10/2021 18:29
on 25/10/2021 18:29
Change comment:
There is no comment for this version
To version 24.1
edited by Andrea Omicini
on 25/10/2021 17:51
on 25/10/2021 17:51
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -1,17 +1,16 @@ 1 1 {{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}} 2 2 #set( $thesisMenu = true ) 3 -### STARTSTATUS3 +#### get parameters 4 4 ## hypothesis: $thesisStatus set, default "Completed" 5 5 ## status parameter 6 6 #set( $statusPar = $request.status.trim().toLowerCase() ) 7 -#set( $statusSelected = false ) 8 8 #if( $statusPar != '' && $allThesisStatuses.contains($statusPar) ) 9 - #set( $statusSelected = true ) 10 10 #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 ) 15 15 #set( $selectedStatus = $thesisStatus.trim().toLowerCase() ) 16 16 #end 17 17 ## set ordering field ... ... @@ -20,62 +20,95 @@ 20 20 #elseif( $selectedStatus == "ongoing" ) 21 21 #set( $orderingDateFieldName = "startDate" ) 22 22 #else 23 -## default for no selected status, too 24 24 #set( $orderingDateFieldName = "endDate" ) 25 25 #end 26 -## invariant: $status Selectedset, $selectedStatus & $orderingDateFieldName setaccordingly27 -## #END STATUS28 -# #29 -# ##STARTUSER&ROLE30 -#set( $ userNamePar = $request.user.trim())31 -#set( $ rolePar = $request.role.trim().toLowerCase())32 -## default values 24 +## invariant: $thesisStatus set, $orderingDateFieldName set correspondingly 25 +## who 26 +#set( $userNamePar = $request.user ) 27 +#set( $supervisorNamePar = $request.supervisor ) 28 +#set( $cosupervisorNamePar = $request.cosupervisor ) 29 +#set( $contactNamePar = $request.contact ) 30 +#### set default values 33 33 #set( $userSelected = false ) 32 +#set( $roleSelected = false ) 34 34 #set( $userFirstName = "" ) 35 35 #set( $userLastName = "" ) 36 -#if( $userName || $userNamePar ) 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 ) 37 37 ## a user is specified for all roles 38 - #if( !$userName ) 39 - #set( $selectedUser = "XWiki.$userNamePar" ) 40 - #else 41 - #set( $selectedUser = $userName ) 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") ) 42 42 #end 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 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") ) 51 51 #end 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 ) 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") ) 58 58 #end 59 59 #end 60 -## $userselected and $roleSelected set properly, other related variables set accordingly 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 +## 97 +#if( $cosupervisor ) 98 + #set( $roleSelectedFieldName = "coSupervisors" ) 99 +#elseif( $contact ) 100 + #set( $roleSelectedFieldName = "contact" ) 101 +#else 102 + #set( $roleSelectedFieldName = "supervisor" ) 103 +#end 104 +## 61 61 ## $roleSelected has meaning only if $userSelected 62 62 ## if $userSelected, $roleSelected false means one user for all roles 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 -## 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 - #if( !$statusSelected || $selectedStatus == $status )110 + #if( $selectedStatus == 'all' || $selectedStatus == $status ) 79 79 = $status = 80 80 ## some selected status or all statuses / now $status 81 81 #if( $userSelected ) ... ... @@ -85,7 +85,7 @@ 85 85 ## some specific role selected 86 86 === $roleSelectedFieldName === 87 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 '%$userName%' order by prop2.value desc" )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" ) 89 89 #else 90 90 ## no specific role selected 91 91 #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4 ... ... @@ -94,11 +94,13 @@ 94 94 #else 95 95 ## no user selected, no role selected 96 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" )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" ) 98 98 #end 99 99 #end 132 + $sql 100 100 #set( $thesisFound = $xwiki.searchDocuments($sql) ) 101 101 #set( $thesisFoundNo = $thesisFound.size() ) 135 + $thesisFoundNo 102 102 ## 103 103 #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis)) 104 104 * [[$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