Changes for page Per Year

From version 117.2
edited by Andrea Omicini
on 30/10/2021 18:08
Change comment: There is no comment for this version
To version 116.1
edited by Andrea Omicini
on 30/10/2021 17:42
Change comment: There is no comment for this version

Summary

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)$selectedUser%
131 + #if( $oneUser)
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
... ... @@ -136,6 +136,7 @@
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 138   #set( $thesisFound = $xwiki.searchDocuments($sql) )
139 +$sql
139 139   #set( $thesisFoundNo = $thesisFound.size() )
140 140   #set( $thesisYearCycleNo = $thesisYearCycleNo + $thesisFoundNo )
141 141   #if( $thesisFoundNo > 0 && !$oneCycle )