Wijzigen voor document GetAnnouncements

Samenvatting

• Paginaeigenschappen (1 gewijzigd, 0 toegevoegd, 0 verwijderd)

Details

Paginaeigenschappen

Inhoud

...	...	@@ -7,7 +7,10 @@
7	7	#else
8	8	#set($changedSince=$datetool.toDate('yyyyMMddHHmmssSSS', "19700101000000000"))
9	9	#end
	10	+## Get date
	11	+#set($now = $datetool.format("dd-MM-yyyy HH:mm:ss:SSS", $datetool.getDate())
10	10	## Get the appropriate announcements
	13	+#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		- #set($language = "nl")
	27	+ #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		-
	29	+#set($announcementMessage = {})
	30	+#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")
	31	+#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())
	32	+#set($discard = $announcementMessage.put('numberOfAnnouncements', $annDocResults.size()))
	33	+#if($annDocResults.size())
	34	+ #set($announcements = [])
	35	+ #foreach($annResult in $annDocResults)
	36	+ #set($announcement = {})
	37	+ #set($annDoc = $xwiki.getDocument($annResult))
	38	+ #foreach($annObj in $annDoc.getObjects($annClass))
	39	+ #if($annObj.getProperty('language').getValue == $language)
	40	+ #set($discard = $announcement.put('shortHeader' = $annObj.shortHeader))
	41	+ #set($discard = $announcement.put('fullAnnouncement' $annObj.fullAnnouncement))
	42	+ #set($discard = $announcements.add($announcement))
	43	+ #end
	44	+ #end
	45	+ #end
35	35	#end
36	36	{{/velocity}}