Changes for page Per Year
From version 31.1
edited by Andrea Omicini
on 25/10/2021 19:00
on 25/10/2021 19:00
Change comment:
There is no comment for this version
To version 29.1
edited by Andrea Omicini
on 25/10/2021 18:40
on 25/10/2021 18:40
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -81,34 +81,30 @@ 81 81 #if( $userSelected ) 82 82 == $selectedUser == 83 83 ## some user selected 84 - #foreach( $role in $allThesisRoles ) 85 - #if( !$roleSelected || $selectedRole == $role ) 86 -## some selected role or all roles / now $role 87 -=== $role === 88 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2 84 + #if( $roleSelected ) 85 +## some specific role selected 86 +=== $roleSelected === 87 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2 89 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" ) 90 - #end 91 - #set( $thesisFound = $xwiki.searchDocuments($sql) ) 92 - #foreach( $thesis in $thesisFound ) 93 -* $thesis 94 - #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" ) 95 95 #end 96 -## no user selected, no role selected 97 97 #else 95 +## no user selected, no role selected 98 98 #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1 99 99 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" ) 100 - #set( $thesisFound = $xwiki.searchDocuments($sql) ) 101 - #foreach( $thesis in $thesisFound ) 102 -* $thesis 103 - #end 104 104 #end 105 105 #end 100 + #set( $thesisFound = $xwiki.searchDocuments($sql) ) 101 + #set( $thesisFoundNo = $thesisFound.size() ) 106 106 ## 107 - ##set($thesisFound=$xwiki.searchDocuments($sql))108 - ###set(FoundNo= $thesisFound.size()109 - ###set($thesisDoc= $xwiki.getDocument($thesis))110 -# ##set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))111 - ##* [[$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)#end112 - ###end103 + #foreach ($thesis in $thesisFound) 104 + #set($thesisDoc = $xwiki.getDocument($thesis)) 105 + #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass')) 106 +* [[$thesisObj.title>>$thesisDoc]]#if( $thesisObj.studentUserName != "" )//$thesisObj.studentUserName//#elseif( $thesisObj.studentFirstName != "" && $thesisObj.studentLastName != "" )//$thesisObj.studentFirstName $thesisObj.studentLastName//#end#if( $thesisObj.endDate != "" ) ($thesisObj.endDate)#end 107 + 108 + #end 113 113 #end 114 114 {{/velocity}}