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 33.1
edited by Andrea Omicini
on 25/10/2021 19:36
on 25/10/2021 19:36
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -63,46 +63,48 @@ 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 -## 77 77 #foreach( $status in $allThesisStatuses ) 78 78 #if( !$statusSelected || $selectedStatus == $status ) 79 79 = $status = 80 80 ## some selected status or all statuses / now $status 81 81 #if( $userSelected ) 82 -== $ userName ==71 +== $selectedUser == 83 83 ## some user selected 84 - #if( $roleSelected ) 85 -## some specific role selected 86 -=== $roleSelectedFieldName === 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 === 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" )89 - #e lse90 - ##nospecificroleselected91 - #set ($sql = ", BaseObjectas obj, StringProperty asprop0, LargeStringProperty asprop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop492 - 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 '%$userName%' or prop2.value like '%$userName%' or prop3.value like '%$userName%' ) order by prop4.value desc" )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 + #set( $thesisFound = $xwiki.searchDocuments($sql) ) 88 + #foreach( $thesis in $thesisFound ) 89 +* $thesis 90 + #end 93 93 #end 94 - #else 95 95 ## no user selected, no role selected 93 + #else 96 96 #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1 97 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" ) 96 + #set( $thesisFound = $xwiki.searchDocuments($sql) ) 97 + #foreach( $thesis in $thesisFound ) 98 +* $thesis 99 + #end 98 98 #end 99 99 #end 100 - #set( $thesisFound = $xwiki.searchDocuments($sql) ) 101 - #set( $thesisFoundNo = $thesisFound.size() ) 102 102 ## 103 - #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis)) 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 105 - 106 - #end 103 +## #set( $thesisFound = $xwiki.searchDocuments($sql) ) 104 +## #set( $thesisFoundNo = $thesisFound.size() ) 105 +## #set($thesisDoc = $xwiki.getDocument($thesis)) 106 +## #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass')) 107 +##* [[$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 108 +## #end 107 107 #end 108 108 {{/velocity}}