Wijzigen voor document GetAnnouncements
Laatst gewijzigd door Afgeschermd op 03-04-2017 01:41:55
gewijzigd door Mark van den Broek (Admin)
op 30-12-2016 18:01:26
op 30-12-2016 18:01:26
gewijzigd door Mark van den Broek (Admin)
op 30-12-2016 18:40:02
op 30-12-2016 18:40:02
Opmerking bij wijziging:
Er is geen opmerking bij deze versie
Samenvatting
-
Paginaeigenschappen (1 gewijzigd, 0 toegevoegd, 0 verwijderd)
Details
- Paginaeigenschappen
-
- Inhoud
-
... ... @@ -2,12 +2,10 @@ 2 2 #if("$!{request.xpage}" == 'plain') 3 3 $response.setContentType('application/json') 4 4 #end 5 -#if("$!{request.changedSince}" != "") 6 - #set($changedSince=$datetool.toDate('yyyyMMddHHmmssSSS', ${request.changedSince})) 7 -#else 8 - #set($changedSince=$datetool.toDate('yyyyMMddHHmmssSSS', "19700101000000000")) 9 -#end 5 +## Get date 6 +#set($now = $datetool.format("dd-MM-yyyy HH:mm:ss:SSS", $datetool.getDate()) 10 10 ## Get the appropriate announcements 8 +#set($annClass = "360AnnouncementCode.AnnouncementClass") 11 11 #if("$!{request.wikiId}" != "") 12 12 #set($wikiid = "%${request.wikiId}%") 13 13 #else ... ... @@ -21,16 +21,24 @@ 21 21 #if("$!{request.language}" != "") 22 22 #set($language = ${request.language}) 23 23 #else 24 - 22 + #set($language = "nl") 25 25 #end 26 -#set($announcements = {}) 27 -#set($xwq = "from doc.object('360AnnouncementCode.AnnouncementClass') as announcement where announcement.publishOnWikis LIKE :wikis and announcement.publicallyVisible = :forGuests and announcement.language = :lang") 28 -#set($annDocResults = $services.query.xwql($xwq).bindValue("wikis", $wikiid).bindValue("forGuests", $publicallyVisible).bindValue("lang", $language).execute()) 29 -#set($discard = $announcements.put('numberOfAnnouncements', $annDocResults.size())) 30 -#foreach($annResult in $annDocResults) 31 - #set($announcement = {}) 32 - #set($annDoc = $xwiki.getDocument($annResult)) 33 - #set() 34 - 24 +#set($announcementMessage = {}) 25 +#set($xwq = "from doc.object('360AnnouncementCode.AnnouncementClass') as announcement where announcement.publishOnWikis LIKE :wikis and announcement.publicallyVisible = :forGuests and announcement.language = :lang and announcement.startDate >= :startdate and announcement.enddate <= :enddate") 26 +#set($annDocResults = $services.query.xwql($xwq).bindValue("wikis", $wikiid).bindValue("forGuests", $publicallyVisible).bindValue("lang", $language).bindValue("startdate", $datetool.toDate('yyyy-MM-dd HH:mm:ss:SSS', $now)).bindValue("enddate", $datetool.toDate('yyyy-MM-dd HH:mm:ss:SSS', $now)).execute()) 27 +#set($discard = $announcementMessage.put('numberOfAnnouncements', $annDocResults.size())) 28 +#if($annDocResults.size()) 29 + #set($announcements = []) 30 + #foreach($annResult in $annDocResults) 31 + #set($announcement = {}) 32 + #set($annDoc = $xwiki.getDocument($annResult)) 33 + #foreach($annObj in $annDoc.getObjects($annClass)) 34 + #if($annObj.getProperty('language').getValue == $language) 35 + #set($discard = $announcement.put('shortHeader' = $annObj.shortHeader)) 36 + #set($discard = $announcement.put('fullAnnouncement' $annObj.fullAnnouncement)) 37 + #set($discard = $announcements.add($announcement)) 38 + #end 39 + #end 40 + #end 35 35 #end 36 36 {{/velocity}}