Changes for page Per Year

From version 153.1
edited by Andrea Omicini
on 30/06/2023 21:23
Change comment: There is no comment for this version
To version 161.1
edited by Andrea Omicini
on 02/07/2023 13:02
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}.${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" )
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" )
61 61  ## do query
62 62   #set( $itemFound = $xwiki.searchDocuments($query) )
63 63  ## set counters
... ... @@ -120,15 +120,46 @@
120 120  #template('apice_thesis_macros.vm')
121 121  ##
122 122  #foreach( $year in $itemMap.keySet() )
123 -(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}[[$year>>$doc||style="text-decoration:none; color:$theme.textPrimaryColor" queryString='year=$year#if( $oneUser )#if( $apiceUser )&user=$userName#{else}&name=$userFirstName&surname=$userLastName#end#end#if( $oneCycle )&cycle=$cycle#end']]
123 +## year top / start
124 +<div class="mainselectseparator">
125 + <a class="mainselectseparatorlink" id="$year" href=$xwiki.getURL($doc,"view","year=$year#if( $apiceUser )&user=$userName#elseif( $oneUser )&name=$userFirstName&surname=$userLastName#end#if( $oneCycle )&cycle=$cycle#end")>
126 + $year
127 + </a>
128 +</div>
129 +## year top / end
130 +##
131 +## year display / start
124 124  <div style="font-style: normal"><ul>
125 -#foreach( $item in $itemMap[$year] )
126 -<li>#thesislinked($item)</li>
127 -#end
133 + #foreach( $item in $itemMap[$year] )
134 +<li>#thesisyear($item)</li>
135 + #end
128 128  </ul></div>
137 +## year display / end
138 +##
139 +## year bottom / start
140 +<div #if( $foreach.last )id="bottom"#end class="mainselectbottom">
129 129   #set( $itemYearNo = $itemMap[$year].size() )
130 -(% style="border-style:hidden solid solid hidden; border-color:$theme.borderColor; text-align:right; font-style:oblique; font-size:smaller" %)|($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) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]
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()
160 +</div>
161 +## year bottom / end
131 131  #end
163 +## DISPLAY / END
132 132  {{/html}}
133 -{{/velocity}}
134 -{{id name="bottom"/}}
165 +{{/velocity}}{{pageDisplay sort="objectservice"/}}