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 30.2
edited by Andrea Omicini
on 25/10/2021 18:47
on 25/10/2021 18:47
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -63,6 +63,17 @@ 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 +## 66 66 #foreach( $status in $allThesisStatuses ) 67 67 #if( !$statusSelected || $selectedStatus == $status ) 68 68 = $status = ... ... @@ -70,42 +70,29 @@ 70 70 #if( $userSelected ) 71 71 == $selectedUser == 72 72 ## some user selected 73 - #foreach( $role in $allThesisRoles ) 74 - #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 83 -## some selected role or all roles / now $role 84 -=== $role === 84 + #if( $roleSelected ) 85 +## some specific role selected 86 +=== $roleSelected === 85 85 #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 -* $thesis 91 - #end 89 + #else 90 +## no specific role selected 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" ) 92 92 #end 93 -## no user selected, no role selected 94 94 #else 95 +## no user selected, no role selected 95 95 #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1 96 96 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" ) 97 - #set( $thesisFound = $xwiki.searchDocuments($sql) ) 98 - #foreach( $thesis in $thesisFound ) 99 -* $thesis 100 - #end 101 101 #end 102 102 #end 100 + #set( $thesisFound = $xwiki.searchDocuments($sql) ) 101 + #set( $thesisFoundNo = $thesisFound.size() ) 103 103 ## 104 -## #set( $thesisFound = $xwiki.searchDocuments($sql) ) 105 -## #set( $thesisFoundNo = $thesisFound.size() ) 106 -## #set($thesisDoc = $xwiki.getDocument($thesis)) 107 -## #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass')) 108 -##* [[$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 109 -## #end 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 + #end 110 110 #end 111 111 {{/velocity}}