Changes for page Deadlines

From version 84.1
edited by Andrea Omicini
on 16/06/2023 14:23
Change comment: There is no comment for this version
To version 85.1
edited by Andrea Omicini
on 25/06/2023 10:47
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,34 +1,26 @@
1 1  {{velocity}}
2 -{{html wiki="true" clean="false"}}
2 +{{html clean="false" wiki="true"}}
3 3  #template('apice_events.vm')
4 -#template('apice_macros.vm')
5 -#isuserspace()
6 -##
7 -#if( $isUserSpace )
8 - #userspace()
9 - #set( $oneUser = true )
10 - #set( $userString = "%$userName%" )
11 -#else
12 - #set( $oneUser = false )
13 -#end
4 +#template('apice_user_param.vm')
5 +## user forthcoming events
14 14  ## incoming deadlines
15 15  #set( $query = ", BaseObject objEvent, DateProperty as propDate #if( $oneUser), BaseObject as objRole, LargeStringProperty as propWho #end
16 16   where doc.fullName = objEvent.name and objEvent.className = '${objectSpace}.${objectClass}' and objEvent.name <> '${objectPool}.${objectTemplate}' and propDate.id.id = objEvent.id and propDate.name = 'paper_submission' and date(propDate.value) > current_date() #if( $oneUser) and objRole.name = doc.fullName and objRole.className = '${objectSpace}.Roles.${objectClass}' and propWho.id.id = objRole.id and propWho.name = 'who' and propWho.value like '$userString' #end order by date(propDate.value) asc ")
17 17  ## execute query
18 -#set( $eventsFound = $xwiki.searchDocuments($query) )
10 +#set( $itemFound = $xwiki.searchDocuments($query) )
19 19  ##
20 -#if( $eventsFound.size() > 0 )
12 +#if( $itemFound.size() > 0 )
21 21  <div class="mainheader">
22 22  $services.localization.render('incomingdeadlines').toLowerCase()
23 23  </div>
24 24  #template('apice_event_macros.vm')
25 25  <div>
26 - #foreach( $event in $eventsFound )
27 - #set( $eventDoc = $xwiki.getDocument($event) )
18 + #foreach( $item in $itemFound )
19 + #set( $itemDoc = $xwiki.getDocument($item) )
28 28   #if( !$foreach.first )
29 29   <span class="textsecondary">&ensp;&bull;&ensp;</span>
30 30   #end
31 - #eventlinked($event)<span class="textprimary">#if( $eventDoc.display("paper_submission") != "" )<span class="textsecondary"> &mdash; </span>#if( $eventDoc.display("abstract_submission") != "" )$eventDoc.display("abstract_submission") <em>(abstract)</em><span class="textsecondary"> / </span>#end$eventDoc.display("paper_submission") <em>(submission)</em>#end</span>
23 + #eventlinked($item)<span class="textprimary">#if( $itemDoc.display("paper_submission") != "" )<span class="textsecondary"> &mdash; </span>#if( $itemDoc.display("abstract_submission") != "" )$itemDoc.display("abstract_submission") <em>(abstract)</em><span class="textsecondary"> / </span>#end$itemDoc.display("paper_submission") <em>(submission)</em>#end</span>
32 32   #end
33 33  </div>
34 34  #end