Changes for page Per Year

From version 157.1
edited by Andrea Omicini
on 30/06/2023 21:38
Change comment: There is no comment for this version
To version 165.1
edited by Andrea Omicini
on 06/07/2023 19:27
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,17 +5,14 @@
1 -
2 -1. List item
3 -1. List item
4 -1. List item
5 5  {{velocity}}
6 6  {{html wiki="true" clean="false"}}
7 -#template('apice_boolean.vm')
3 +#template('apice_macros.vm')
4 +#setobjectspace("Theses")
5 +#template('apice_thesis_macros.vm')
8 8  #### SET PARAMETERS / START
9 -#template('apice_theses.vm')
10 10  #template('apice_user_param.vm')
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' " )
11 + where objPersonalThesis.name = doc.fullName and objPersonalThesis.className = '${mainSpace}.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" )
61 + where objThesis.name = doc.fullName and objThesis.className = '${mainSpace}.Class' and objThesis.name <> '${objectPool}.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
... ... @@ -120,9 +120,6 @@
120 120  </div>
121 121  #end
122 122  ## theses displayed per year
123 -##
124 -#template('apice_thesis_macros.vm')
125 -##
126 126  #foreach( $year in $itemMap.keySet() )
127 127  ## year top / start
128 128  <div class="mainselectseparator">
... ... @@ -134,12 +134,35 @@
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
131 + #foreach( $item in $itemMap[$year] )
132 +<li>#thesisyear($item)</li>
133 + #end
140 140  </ul></div>
141 141  ## year display / end
142 142  ##
137 +## year bottom / start
138 +<div #if( $foreach.last )id="bottom"#end class="mainselectbottom">
139 + #set( $itemYearNo = $itemMap[$year].size() )
140 + $itemYearNo
141 + #if( $oneCycle )
142 + #if( $itemYearNo == 1 )
143 + {{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}
144 + #else
145 + {{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}
146 + #end
147 + #else
148 + #if( $itemYearNo == 1 )
149 + $services.localization.render('thesis').toLowerCase()
150 + #else
151 + $services.localization.render('theses').toLowerCase()
152 + #end
153 + #end
154 + <span class="textsecondary">&ensp;/&ensp;</span>
155 + $year
156 + &ensp;&bull;&ensp;
157 + #anchorlinks()
158 +</div>
159 +## year bottom / end
143 143  #end
144 144  ## DISPLAY / END
145 145  {{/html}}