Changes for page Per Year
From version 127.1
edited by Andrea Omicini
on 11/03/2022 15:56
on 11/03/2022 15:56
Change comment:
There is no comment for this version
To version 128.1
edited by Andrea Omicini
on 21/07/2022 18:51
on 21/07/2022 18:51
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -6,6 +6,9 @@ 6 6 #set( $firstYear = $mathtool.toInteger($firstYearThesis) ) 7 7 #set( $lastYear = $mathtool.toInteger($lastYearThesis) ) 8 8 #set( $yearList = [$lastYear..$firstYear] ) 9 +#set( $yearPar = 0 ) 10 +#set( $fromPar = 0 ) 11 +#set( $toPar = 0 ) 9 9 ### START YEAR 10 10 ## defaults 11 11 #set( $oneYear = false ) ... ... @@ -28,11 +28,11 @@ 28 28 #set( $selectedYear = $yearPar ) 29 29 #set( $yearList = [$yearPar] ) 30 30 #else 31 - #if( $fromPar != '' && ($fromPar > $firstYear) ) 34 + #if( $fromPar != '' && $fromPar > 0 && ($fromPar > $firstYear) ) 32 32 #set( $firstYear = $fromPar ) 33 33 #set( $yearList = [$lastYear..$firstYear] ) 34 34 #end 35 - #if( $toPar != '' && ($toPar < $lastYear) ) 38 + #if( $toPar != '' && $toPar > 0 && ($toPar < $lastYear) ) 36 36 #set( $lastYear = $toPar ) 37 37 #set( $yearList = [$lastYear..$firstYear] ) 38 38 #end ... ... @@ -121,10 +121,10 @@ 121 121 ## some selected cycle or all cycles / now $cycle 122 122 #if( $oneUser) 123 123 #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4, LargeStringProperty as prop5 124 - where obj.name = doc.fullName and obj.className = ' Theses.ThesisClass' 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 prop5.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" )127 + where obj.name = doc.fullName and obj.className = '${objectSpace}.${objectClass}' and obj.name <> '${objectSpace}.${objectTemplate}' 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 prop5.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" ) 125 125 #else 126 126 #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2 127 - where obj.name = doc.fullName and obj.className = ' Theses.ThesisClass' 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" )130 + where obj.name = doc.fullName and obj.className = '${objectSpace}.${objectClass}' and obj.name <> '${objectSpace}.${objectTemplate}' 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" ) 128 128 #end 129 129 #set( $thesisFound = $xwiki.searchDocuments($sql) ) 130 130 #set( $thesisFoundNo = $thesisFound.size() )