Changes for page Homeopaths

Summary

• Page properties (1 modified, 0 added, 0 removed)
• Objects (1 modified, 0 added, 0 removed)
  • XWiki.JavaScriptExtension[0]

Details

Page properties

Content

...	...	@@ -9,22 +9,14 @@
9	9	{{html wiki="false" clean="false"}}
10	10	<p>
11	11	All about the page "homeopaths". Where is it for?
12		- #set($aq = $services.query.xwql("from doc.object(homeopaths.Code.homeopathsClass) as homepath where homepath.doc_owner like :usr"))
13		- #set($usrName = $xwiki.getDocument($xcontext.getUserReference()).getFullName())
14		-## #set ($spaceLike = $usrName.replaceAll('([%_!])', '!$1').concat('.%'))
15		- #set($ar = $aq.bindValue('usr',"${usrName}").execute())
16		-
17		-##.anyChars()
18		-$usrName
19		-$ar
20		-
21	21	</p>
22	22	<div id="homeopaths_map"></div>
23	23	#if(!$isGuest)
24	24	#set($hasPractice = $xwiki.getDocument($xcontext.getUserReference()).getObject('XWiki.XWikiUsers').getProperty('practice').value)
25	25	#if($hasPractice)
26		- #set($q = $services.query.xwql("from doc.object(homeopaths.Code.homeopathsClass) as homepath where homepath.doc_owner like :usr escape '!'"))
27		- #set($r = $q.bindValue('usr').literal("${xcontext}.getUserReference().getName()").query().execute())
	17	+ #set($q = $services.query.xwql("from doc.object(homeopaths.Code.homeopathsClass) as homepath where homepath.doc_owner like :usr"))
	18	+ #set($usrName = $xwiki.getDocument($xcontext.getUserReference()).getFullName())
	19	+ #set($r = $q.bindValue('usr',"${usrName}").execute())
28	28	#set($practiceExists = $r.size() > 0)
29	29	#if(!$practiceExists)
30	30	<h2 id="add_practice">Add your practice to the map</h2>

XWiki.JavaScriptExtension[0]

Code

...	...	@@ -13,16 +13,19 @@
13	13	#foreach($item in $result)
14	14	#set($result_doc = $xwiki.getDocument("${item}"))
15	15	#set($result_obj = $result_doc.getObject("homeopaths.Code.homeopathsClass"))
16		- #set($addressArray = $result_obj.getProperty("address").value.split(","))
17		- #set($address = "")
18		- #foreach($address_item in $addressArray)
19		- #if($foreach.hasNext)
20		- #set($linebreak = "<br />")
21		- #else
22		- #set($linebreak = "")
	16	+
	17	+ #set($addressArray = ['pmStreet','pmHousenumber','pmPostcode','pmCity','pmState','pmCounty','pmCountry'])
	18	+ #set($x = {})
	19	+ #foreach($datapart in $addressArray)
	20	+ #if($result_obj.getProperty($datapart))
	21	+ #set($datapart4Publish = $result_obj.getProperty($datapart).value)
	22	+ #if($datapart == 'pmCountry')
	23	+ #set($datapart4Publish = $datapart4Publish.toUpperCase())
	24	+ #end
	25	+ #set($discard = $x.put("$datapart", $datapart4Publish))
23	23	#end
24		- #set($address = "${address}${address_item.trim()}${linebreak}")
25	25	#end
	28	+ #set($address = "$doc.getTitle()<br />$x['pmStreet'] $x['pmHousenumber']<br />$x['pmPostcode'] $x['pmCity']<br />$x['pmCounty'] $x['pmState']<br />$x['pmCountry']")
26	26	#set($info = "<h4><a href='$xwiki.getURL($result_doc.documentReference)'>${stringtool.capitalize($result_doc.getDisplayTitle())}</a></h4><address>${address}</address>")
27	27	#set($discard = $map.put($info, $result_obj.getProperty("latlong").value))
28	28	#end
...	...	@@ -32,6 +32,8 @@
32	32	#set($mapJSON = $jsontool.serialize(${map}))
33	33	#end
34	34
	38	+ console.log($mapJSON);
	39	+
35	35	var mapJSON = $jsontool.parse($mapJSON),
36	36	markers = [];
37	37	for(const property in mapJSON) {