Changes for page Per Year

From version 111.1
edited by Andrea Omicini
on 30/10/2021 17:31
Change comment: There is no comment for this version
To version 114.1
edited by Andrea Omicini
on 30/10/2021 17:36
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -90,7 +90,6 @@
90 90  #end
91 91  ## $selectedCycle and $oneCycle set properly
92 92  ### END CYCLE
93 -$yearList
94 94  #if( $oneYear )
95 95   $selectedYear
96 96  #else
... ... @@ -109,7 +109,7 @@
109 109  ### END USER & CYCLE
110 110  ##
111 111  ## title
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'/}}
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'/}}
113 113  ## index
114 114  #if( !$oneYear )
115 115  (% 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)))
... ... @@ -131,12 +131,13 @@
131 131  ## some selected cycle or all cycles / now $cycle
132 132   #if( $oneUser)
133 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" )
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 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" )
135 135   #else
136 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" )
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 prop0.name = 'cycle' and prop1.name = 'year' and prop0.value = '$cycle' and year(prop1.value) = $year order by prop1.value desc" )
138 138   #end
139 139   #set( $thesisFound = $xwiki.searchDocuments($sql) )
139 +$sql
140 140   #set( $thesisFoundNo = $thesisFound.size() )
141 141   #set( $thesisYearCycleNo = $thesisYearCycleNo + $thesisFoundNo )
142 142   #if( $thesisFoundNo > 0 && !$oneCycle )