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 110.1
edited by Andrea Omicini
on 30/10/2021 17:31
on 30/10/2021 17:31
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -90,10 +90,11 @@ 90 90 #end 91 91 ## $selectedCycle and $oneCycle set properly 92 92 ### END CYCLE 93 +$yearList 93 93 #if( $oneYear ) 94 94 $selectedYear 95 95 #else 96 - $yearList97 + ALL YEARS 97 97 #end 98 98 #if( $oneUser ) 99 99 $selectedUser ... ... @@ -108,7 +108,7 @@ 108 108 ### END USER & CYCLE 109 109 ## 110 110 ## title 111 ->#if( $oneCycle ){{thesisCycle uppercase='yes' short='no'}}$selectedCycle{{/thesisCycle}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end / #if( $oneYear )$selectedYear#else$firstYear–$lastYear#end#if( $oneUser ) / $userFirstName **$userLastName**#end{{id name='top'/}}112 +>#if( $oneCycle ){{thesisCycle short='no'}}$selectedCycle{{/thesisCycle}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end / #if( $oneYear )$selectedYear#else$firstYear–$lastYear#end#if( $oneUser ) / $userFirstName **$userLastName**#end{{id name='top'/}} 112 112 ## index 113 113 #if( !$oneYear ) 114 114 (% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $year in $yearList )#if ($velocityCount > 1) | #end[[$year>>||anchor="$year"]]#end))) ... ... @@ -129,13 +129,12 @@ 129 129 #if( !$oneCycle || $selectedCycle == $cycle ) 130 130 ## some selected cycle or all cycles / now $cycle 131 131 #if( $oneUser) 132 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2,LargeStringProperty as prop3, LargeStringProperty as prop4, LargeStringProperty as prop5133 - 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 prop 4.id.id = obj.id and prop0.name = 'cycle' and prop1.name = 'endDate' and prop2.name = 'status' andprop3.name= 'supervisors' and prop4.name = 'cosupervisors' and prop5.name = 'contacts' and prop0.value = '$cycle' and year(prop1.value) = '$year' andprop2.value = 'Completed' and( prop3.value like '%$selectedUser%' or prop4.value like '%$selectedUser%' or prop5.value like '%$selectedUser%' ) order by prop1.value desc" )133 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4 134 + 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 = 'cycle' and prop1.name = 'year' and prop2.name = 'supervisors' and prop3.name = 'cosupervisors' and prop4.name = 'contacts' and prop0.value = '$cycle' and year(prop1.value) = '$year' and ( prop2.value like '%$selectedUser%' or prop3.value like '%$selectedUser%' or prop4.value like '%$selectedUser%' ) order by prop1.value desc" ) 134 134 #else 135 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1 , StringProperty as prop2136 - 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 prop 2.id.id = obj.id and prop0.name = 'cycle' and prop1.name = 'endDate' and prop2.name ='status'and prop0.value = '$cycle' and year(prop1.value) = '$yearandprop2.value = 'Completed' order by prop1.value desc" )136 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1 137 + 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 = 'cycle' and prop1.name = 'year' and prop0.value = '$cycle' and year(prop1.value) = '$year' 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 )