Changes for page Per Year

From version 30.1
edited by Andrea Omicini
on 25/10/2021 18:43
Change comment: There is no comment for this version
To version 32.1
edited by Andrea Omicini
on 25/10/2021 19:32
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -63,17 +63,6 @@
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 =
... ... @@ -81,30 +81,42 @@
81 81   #if( $userSelected )
82 82  == $selectedUser ==
83 83  ## some user selected
84 - #if( $roleSelected )
85 -## some specific role selected
86 -=== $roleSelected ===
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 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
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" )
87 + #end
88 + #set( $thesisFound = $xwiki.searchDocuments($sql) )
89 + #foreach( $thesis in $thesisFound )
90 +* $thesis
91 + #end
93 93   #end
94 - #else
95 95  ## no user selected, no role selected
94 + #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" )
97 + #set( $thesisFound = $xwiki.searchDocuments($sql) )
98 + #foreach( $thesis in $thesisFound )
99 +* $thesis
100 + #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)
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
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
109 109  #end
110 110  {{/velocity}}