Changes for page Forthcoming
From version 46.6
edited by Andrea Omicini
on 06/05/2023 16:17
on 06/05/2023 16:17
Change comment:
There is no comment for this version
To version 46.3
edited by Andrea Omicini
on 05/05/2023 22:58
on 05/05/2023 22:58
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -5,7 +5,7 @@ 5 5 #if( !$userName || $userName == "" || !$userSpace || $userSpace == "" || !$userFullname || $userFullname == "" ) 6 6 ## overall forthcoming events 7 7 #set( $query = ", BaseObject obj, DateProperty as prop 8 - where doc.fullName = obj.name and obj.className = '${objectSpace}.${objectClass}' and obj.name <> '${objectPool}.${objectTemplate}' and prop.id.id = obj.id and prop.name = 'start_date' and prop.value > current_date() order by date(prop.value) asc " ) 8 + where doc.fullName = obj.name and obj.className = '${objectSpace}.${objectClass}' and obj.name <> '${objectPool}.${objectTemplate}' and prop.id.id = obj.id and prop.name = 'start_date' and ( ( year(prop.value) > year(current_date()) ) or ( year(prop.value) = year(current_date()) and month(prop.value) > month(current_date()) ) or ( year(prop.value) = year(current_date()) and month(prop.value) = month(current_date()) and day(prop.value) > day(current_date()) ) ) order by date(prop.value) asc " ) 9 9 #else 10 10 #set( $query = ", BaseObject as obj0, BaseObject as obj1, LargeStringProperty as prop1, DateProperty as prop2 11 11 where obj0.name = doc.fullName and obj0.className = '${objectSpace}.${objectClass}' and obj0.name <> '${objectPool}.${objectTemplate}' and prop2.id.id = obj0.id and prop2.name = 'end_date' and ( ( year(prop2.value) > year(current_date()) ) or ( year(prop2.value) = year(current_date()) and month(prop2.value) > month(current_date()) ) or ( year(prop2.value) = year(current_date()) and month(prop2.value) = month(current_date()) and day(prop2.value) > day(current_date()) ) ) and obj1.name = doc.fullName and obj1.className = '${objectSpace}.Roles.${objectClass}' and prop1.id.id = obj1.id and prop1.name = 'who' and prop1.value like '%$userName%' order by date(prop2.value) asc " ) ... ... @@ -18,7 +18,7 @@ 18 18 19 19 #foreach($event in $eventsFound) 20 20 #set( $eventDoc = $xwiki.getDocument($event) ) 21 -#if( !$foreach.first ){{themeTextSecondary}}•{{/themeTextSecondary}} #end #if( $eventDoc.getValue('sort') != 'special issue' ){{event short="true"}}$eventDoc{{/event}}#{else}{{eventshort="title"linked="title"}}$eventDoc{{/event}}#end#end21 +#if( !$foreach.first ){{themeTextSecondary}}•{{/themeTextSecondary}} #end{{event short="true"}}$eventDoc{{/event}} #end 22 22 (%%) 23 23 #end 24 24 {{/velocity}}{{noShortcuts/}}