Changes for page Per Year

From version 159.1
edited by Andrea Omicini
on 30/06/2023 21:48
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,13 +1,14 @@
1 1  {{velocity}}
2 2  {{html wiki="true" clean="false"}}
3 -#template('apice_boolean.vm')
3 +#template('apice_macros.vm')
4 +#setobjectspace("Theses")
5 +#template('apice_thesis_macros.vm')
4 4  #### SET PARAMETERS / START
5 -#template('apice_theses.vm')
6 6  #template('apice_user_param.vm')
7 7  ## years / personal
8 8  #if( $isUserSpace )
9 9   #set( $query = ", BaseObject as objPersonalThesis, LargeStringProperty as propUser
10 - 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' " )
11 11   #set( $personalThesisDocs = $xwiki.searchDocuments($query) )
12 12   #if( $personalThesisDocs.size() > 0 )
13 13   #set( $personalThesisDoc = $xwiki.getDocument($personalThesisDocs[0]) )
... ... @@ -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" )
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" )
61 61  ## do query
62 62   #set( $itemFound = $xwiki.searchDocuments($query) )
63 63  ## set counters
... ... @@ -116,9 +116,6 @@
116 116  </div>
117 117  #end
118 118  ## theses displayed per year
119 -##
120 -#template('apice_thesis_macros.vm')
121 -##
122 122  #foreach( $year in $itemMap.keySet() )
123 123  ## year top / start
124 124  <div class="mainselectseparator">
... ... @@ -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] )
131 + #foreach( $item in $itemMap[$year] )
134 134  <li>#thesisyear($item)</li>
135 -#end
133 + #end
136 136  </ul></div>
137 137  ## year display / end
138 138  ##
... ... @@ -139,7 +139,24 @@
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 #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()
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()
143 143  </div>
144 144  ## year bottom / end
145 145  #end