Changes for page Per Year

From version 161.1
edited by Andrea Omicini
on 02/07/2023 13:02
Change comment: There is no comment for this version
To version 159.1
edited by Andrea Omicini
on 30/06/2023 21:48
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -57,7 +57,7 @@
57 57  #set( $itemNo = 0 )
58 58  #foreach( $year in $yearList )
59 59   #set( $query = ", BaseObject as objThesis #if( $oneCycle ), StringProperty as propCycle #end, DateProperty as propEnddate, StringProperty as propStatus, LargeStringProperty as propSupervisor, LargeStringProperty as propCosupervisor, LargeStringProperty as propContact
60 - where objThesis.name = doc.fullName and objThesis.className = '${objectSpace}.Class' and objThesis.name <> '${objectSpace}.${objectTemplate}' and propEnddate.id.id = objThesis.id and propStatus.id.id = objThesis.id and propSupervisor.id.id = objThesis.id and propCosupervisor.id.id = objThesis.id and propContact.id.id = objThesis.id and propEnddate.name = 'end' and propStatus.name = 'status' and propSupervisor.name = 'supervisors' and propCosupervisor.name = 'cosupervisors' and propContact.name = 'contacts' #if( $oneCycle ) and propCycle.id.id = objThesis.id and propCycle.name = 'cycle' and propCycle.value = '$cycle' #end and year(propEnddate.value) = $year and lower(propStatus.value) = 'completed' #if( $oneUser )and ( propSupervisor.value like '%$userString%' or propCosupervisor.value like '%$userString%' or propContact.value like '%$userString%' )#end order by propEnddate.value desc" )
60 + where objThesis.name = doc.fullName and objThesis.className = '${objectSpace}.${objectClass}' and objThesis.name <> '${objectSpace}.${objectTemplate}' and propEnddate.id.id = objThesis.id and propStatus.id.id = objThesis.id and propSupervisor.id.id = objThesis.id and propCosupervisor.id.id = objThesis.id and propContact.id.id = objThesis.id and propEnddate.name = 'end' and propStatus.name = 'status' and propSupervisor.name = 'supervisors' and propCosupervisor.name = 'cosupervisors' and propContact.name = 'contacts' #if( $oneCycle ) and propCycle.id.id = objThesis.id and propCycle.name = 'cycle' and propCycle.value = '$cycle' #end and year(propEnddate.value) = $year and lower(propStatus.value) = 'completed' #if( $oneUser )and ( propSupervisor.value like '%$userString%' or propCosupervisor.value like '%$userString%' or propContact.value like '%$userString%' )#end order by propEnddate.value desc" )
61 61  ## do query
62 62   #set( $itemFound = $xwiki.searchDocuments($query) )
63 63  ## set counters
... ... @@ -130,9 +130,9 @@
130 130  ##
131 131  ## year display / start
132 132  <div style="font-style: normal"><ul>
133 - #foreach( $item in $itemMap[$year] )
133 +#foreach( $item in $itemMap[$year] )
134 134  <li>#thesisyear($item)</li>
135 - #end
135 +#end
136 136  </ul></div>
137 137  ## year display / end
138 138  ##
... ... @@ -139,24 +139,7 @@
139 139  ## year bottom / start
140 140  <div #if( $foreach.last )id="bottom"#end class="mainselectbottom">
141 141   #set( $itemYearNo = $itemMap[$year].size() )
142 - $itemYearNo
143 - #if( $oneCycle )
144 - #if( $itemYearNo == 1 )
145 - {{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}
146 - #else
147 - {{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}
148 - #end
149 - #else
150 - #if( $itemYearNo == 1 )
151 - $services.localization.render('thesis').toLowerCase()
152 - #else
153 - $services.localization.render('theses').toLowerCase()
154 - #end
155 - #end
156 - <span class="textsecondary">&ensp;/&ensp;</span>
157 - $year
158 - &ensp;&bull;&ensp;
159 - #anchorlinks()
142 +$itemYearNo #if( $oneCycle )#if( $itemYearNo == 1 ){{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}#{else}{{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}#end#else#if( $itemYearNo == 1 )$services.localization.render('thesis').toLowerCase()#else$services.localization.render('theses').toLowerCase()#end#end / $year &bull; #anchorlinks()
160 160  </div>
161 161  ## year bottom / end
162 162  #end