Changes for page Per Year

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

Summary

Details

Page properties
Content
... ... @@ -90,22 +90,6 @@
90 90  #end
91 91  ## $selectedCycle and $oneCycle set properly
92 92  ### END CYCLE
93 -#if( $oneYear )
94 - $selectedYear
95 -#else
96 - $yearList
97 -#end
98 -#if( $oneUser )
99 - $selectedUser
100 -#else
101 - ALL USERS
102 -#end
103 -#if( $oneCycle )
104 - $selectedCycle
105 -#else
106 - ALL USERS
107 -#end
108 -### END USER & CYCLE
109 109  ##
110 110  ## title
111 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'/}}
... ... @@ -120,9 +120,9 @@
120 120  #set( $thesisNo = 0 )
121 121  #foreach( $year in $yearList )
122 122   #set( $thesisYearNo = 0 )
123 - #if( !$oneYear )
124 -(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}$year
125 - #end
107 +## #if( !$oneYear )
108 +##(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}$year
109 +## #end
126 126  ## some selected year or year list / now $year
127 127   #foreach( $cycle in $allThesisCycles )
128 128   #set( $thesisYearCycleNo = 0 )
... ... @@ -129,16 +129,18 @@
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, LargeStringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4
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" )
116 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4, LargeStringProperty as prop5
117 + 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 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" )
134 134   #else
135 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
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" )
119 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, StringProperty as prop2
120 + 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
140 140   #set( $thesisFoundNo = $thesisFound.size() )
141 141   #set( $thesisYearCycleNo = $thesisYearCycleNo + $thesisFoundNo )
125 + #if( $thesisFoundNo > 0 && !$oneYear )
126 +(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}$year
127 + #end
142 142   #if( $thesisFoundNo > 0 && !$oneCycle )
143 143  (% style="border-style:#if( $oneYear )solid hidden hidden solid#{else}hidden hidden hidden dotted#end; border-color:$theme.borderColor; text-align:left; font-style:oblique; font-size:smaller" %)|#if( $oneYear ){{id name='$cycle'/}}#else{{id name='$year-$cycle'/}}#end{{thesisCycle plural='no' uppercase='yes' short='yes'}}$cycle{{/thesisCycle}}
144 144   #end
... ... @@ -155,7 +155,7 @@
155 155   #set( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo )
156 156   #end
157 157   #if( !$oneYear )
158 -(% style="border-style:hidden solid solid hidden; border-color:$theme.borderColor; text-align:right; font-style:oblique; font-weight:normal; font-size:smaller; color:$theme.textSecondaryColor" %)|($thesisYearNo #if($thesisYearNo == 1){{stringEngIta eng='thesis in' ita='tesi nel'/}}#else{{stringEngIta eng='theses in' ita='tesi nel'/}}#end$year{{id name='$year-bottom'/}}) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]
144 +(% style="border-style:hidden solid solid hidden; border-color:$theme.borderColor; text-align:right; font-style:oblique; font-weight:normal; font-size:smaller; color:$theme.textSecondaryColor" %)|($thesisYearNo #if($thesisYearNo == 1){{stringEngIta eng='thesis in' ita='tesi nel'/}}#else{{stringEngIta eng='theses in' ita='tesi nel'/}}#end $year{{id name='$year-bottom'/}}) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]
159 159   #end
160 160  #end
161 161  {{id name='bottom'/}}