Changes for page Per Year

From version 156.1
edited by Andrea Omicini
on 30/06/2023 21:36
Change comment: There is no comment for this version
To version 161.3
edited by Andrea Omicini
on 02/07/2023 13:03
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,7 +5,3 @@
1 -
2 -1. List item
3 -1. List item
4 -1. List item
5 5  {{velocity}}
6 6  {{html wiki="true" clean="false"}}
7 7  #template('apice_boolean.vm')
... ... @@ -11,7 +11,7 @@
11 11  ## years / personal
12 12  #if( $isUserSpace )
13 13   #set( $query = ", BaseObject as objPersonalThesis, LargeStringProperty as propUser
14 - where objPersonalThesis.name = doc.fullName and objPersonalThesis.className = '${objectSpace}.Personal.${objectClass}' and propUser.id.id = objPersonalThesis.id and propUser.name = 'user' and propUser.value = '$userName' " )
10 + where objPersonalThesis.name = doc.fullName and objPersonalThesis.className = '${objectSpace}.Personal.Class' and propUser.id.id = objPersonalThesis.id and propUser.name = 'user' and propUser.value = '$userName' " )
15 15   #set( $personalThesisDocs = $xwiki.searchDocuments($query) )
16 16   #if( $personalThesisDocs.size() > 0 )
17 17   #set( $personalThesisDoc = $xwiki.getDocument($personalThesisDocs[0]) )
... ... @@ -61,7 +61,7 @@
61 61  #set( $itemNo = 0 )
62 62  #foreach( $year in $yearList )
63 63   #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
64 - 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}.Template' 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" )
65 65  ## do query
66 66   #set( $itemFound = $xwiki.searchDocuments($query) )
67 67  ## set counters
... ... @@ -134,9 +134,9 @@
134 134  ##
135 135  ## year display / start
136 136  <div style="font-style: normal"><ul>
137 -#foreach( $item in $itemMap[$year] )
138 -<li>#thesislinked($item)</li>
139 -#end
133 + #foreach( $item in $itemMap[$year] )
134 +<li>#thesisyear($item)</li>
135 + #end
140 140  </ul></div>
141 141  ## year display / end
142 142  ##
... ... @@ -143,9 +143,26 @@
143 143  ## year bottom / start
144 144  <div #if( $foreach.last )id="bottom"#end class="mainselectbottom">
145 145   #set( $itemYearNo = $itemMap[$year].size() )
146 -$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()
147 -## year bottom / end
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()
148 148  </div>
161 +## year bottom / end
149 149  #end
150 150  ## DISPLAY / END
151 151  {{/html}}