Changes for page Per Year
From version 118.1
edited by Andrea Omicini
on 30/10/2021 18:14
on 30/10/2021 18:14
Change comment:
There is no comment for this version
To version 117.2
edited by Andrea Omicini
on 30/10/2021 18:08
on 30/10/2021 18:08
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -128,7 +128,7 @@ 128 128 #set( $thesisYearCycleNo = 0 ) 129 129 #if( !$oneCycle || $selectedCycle == $cycle ) 130 130 ## some selected cycle or all cycles / now $cycle 131 - #if( $oneUser) 131 + #if( $oneUser)$selectedUser% 132 132 #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4, LargeStringProperty as prop5 133 133 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 prop4.id.id = obj.id and prop0.name = 'cycle' and prop1.name = 'endDate' and prop2.name = 'status' and prop3.name = 'supervisors' and prop4.name = 'cosupervisors' and prop5.name = 'contacts' and prop0.value = '$cycle' and year(prop1.value) = '$year' and prop2.value = 'Completed' and ( prop3.value like '%$selectedUser%' or prop4.value like '%$selectedUser%' or prop5.value like '%$selectedUser%' ) order by prop1.value desc" ) 134 134 #else ... ... @@ -135,7 +135,6 @@ 135 135 #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2 136 136 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 = 'cycle' and prop1.name = 'endDate' and prop2.name = 'status' and prop0.value = '$cycle' and year(prop1.value) = '$year 'and prop2.value = 'Completed' order by prop1.value desc" ) 137 137 #end 138 - $sql 139 139 #set( $thesisFound = $xwiki.searchDocuments($sql) ) 140 140 #set( $thesisFoundNo = $thesisFound.size() ) 141 141 #set( $thesisYearCycleNo = $thesisYearCycleNo + $thesisFoundNo )