Changes for page Supervisors

From version 105.1
edited by Andrea Omicini
on 30/06/2023 00:56
Change comment: There is no comment for this version
To version 111.1
edited by Andrea Omicini
on 06/07/2023 19:17
Change comment: There is no comment for this version

Summary

Details

Page properties
Title
... ... @@ -1,1 +1,1 @@
1 -#if($request.tag)$services.localization.render('supervisor').toLowerCase() : $xwiki.getUserName($request.tag,false)#else$services.localization.render('supervisors')#end
1 +#if($request.tag)$services.localization.render('supervisor').toLowerCase() : #if($request.tag.contains('XWiki.'))$xwiki.getUserName($request.tag,false)#else$request.tag#end#else$services.localization.render('supervisors')#end
Content
... ... @@ -1,13 +1,14 @@
1 1  {{velocity}}
2 2  {{html clean="false" wiki="true"}}
3 -#template('apice_theses.vm')
4 -##
3 +#template('apice_macros.vm')
4 +#setobjectspace("Theses")
5 +#template('apice_thesis_macros.vm')
5 5  #### tag parameter possibly brings name to be used as tag
6 6  #if( !$request.tag )
7 7  ## no tag parameter --> just the cloud
8 8  ## set query
9 9   #set( $query = ", BaseObject as objThesis, LargeStringProperty as propSupervisors, StringProperty as propStatus, DateProperty as propEnddate
10 - where objThesis.name = doc.fullName and objThesis.className = '${objectSpace}.${objectClass}' and objThesis.name <> '${objectSpace}.${objectTemplate}' and propSupervisors.id.id = objThesis.id and propStatus.id.id = objThesis.id and propEnddate.id.id = objThesis.id and propSupervisors.name = 'supervisors' and propSupervisors.value <> '' and propStatus.name = 'status' and lower(propStatus.value) = 'completed' and propEnddate.name = 'end' order by propEnddate.value desc" )
11 + where objThesis.name = doc.fullName and objThesis.className = '${mainSpace}.Class' and objThesis.name <> '${objectPool}.Template' and propSupervisors.id.id = objThesis.id and propStatus.id.id = objThesis.id and propEnddate.id.id = objThesis.id and propSupervisors.name = 'supervisors' and propSupervisors.value <> '' and propStatus.name = 'status' and lower(propStatus.value) = 'completed' and propEnddate.name = 'end' order by propEnddate.value desc" )
11 11  ## execute query
12 12   #set( $itemFound = $xwiki.searchDocuments($query) )
13 13   #set( $itemFoundNo = $itemFound.size() )
... ... @@ -69,16 +69,20 @@
69 69  ##
70 70  #### TAG PAGE / START
71 71   #set( $query = ", BaseObject as objThesis, LargeStringProperty as propSupervisors, StringProperty as propStatus, DateProperty as propEnddate
72 - where objThesis.name = doc.fullName and objThesis.className = '${objectSpace}.${objectClass}' and objThesis.name <> '${objectSpace}.${objectTemplate}' and propSupervisors.id.id = objThesis.id and propStatus.id.id = objThesis.id and propEnddate.id.id = objThesis.id and propSupervisors.name = 'supervisors' and propSupervisors.value like '%$request.tag%' and propStatus.name = 'status' and lower(propStatus.value) = 'completed' and propEnddate.name = 'end' order by propEnddate.value desc" )
73 + where objThesis.name = doc.fullName and objThesis.className = '${mainSpace}.Class' and objThesis.name <> '${objectPool}.Template' and propSupervisors.id.id = objThesis.id and propStatus.id.id = objThesis.id and propEnddate.id.id = objThesis.id and propSupervisors.name = 'supervisors' and propSupervisors.value like '%$request.tag%' and propStatus.name = 'status' and lower(propStatus.value) = 'completed' and propEnddate.name = 'end' order by propEnddate.value desc" )
73 73  ## execute query
74 74   #set( $itemFound = $xwiki.searchDocuments($query) )
75 75   #set( $itemNo = $itemFound.size() )
76 76  ## subtitle
77 77  <div class="mainheader">
78 -$itemNo #if( $itemNo > 1)$services.localization.render('theses').toLowerCase()#{else}$services.localization.render('thesis').toLowerCase()#{end}
79 + $itemNo
80 + #if( $itemNo > 1)
81 + $services.localization.render('theses').toLowerCase()
82 + #else
83 + $services.localization.render('thesis').toLowerCase()
84 + #end
79 79  </div>
80 80  ## thesis list
81 - #template('apice_thesis_macros.vm')
82 82   #foreach( $item in $itemFound )
83 83  <div>
84 84  [[image:icon:book]] #thesislinked($item)