Changes for page Homeopaths

Last modified by Jip-jan Alunkel on March 14, 20:13

From version 8.46
edited by Jip-jan Alunkel
on December 08, 15:49
Change comment: Renamed from xwiki:practices.WebHome
To version 8.42
edited by Jip-jan Alunkel
on December 08, 15:04
Change comment: Renamed from xwiki:practices.WebHome

Summary

Details

Page properties
Content
... ... @@ -11,30 +11,6 @@
11 11  All about homeopaths.
12 12  </p>
13 13  <div id="homeopaths_map"></div>
14 -
15 - #set($query = $services.query.xwql("from doc.object('homeopaths.Code.homeopathsClass') as homeopathObj"))
16 - #set($result = $query.execute())
17 - #set($map = {})
18 - #foreach($item in $result)
19 - #set($result_doc = $xwiki.getDocument("${item}"))
20 - #set($spaceReference = $services.model.resolveDocument('', 'default', $result_doc.documentReference.lastSpaceReference).parent)
21 - #set($spaceName = $spaceReference.getName())
22 - #set($result_obj = $result_doc.getObject("homeopaths.Code.homeopathsClass"))
23 - #set($addressArray = $result_obj.getProperty("address").value.split(","))
24 - #set($address = "")
25 - #foreach($address_item in $addressArray)
26 - ${address_item.trim()}
27 - #set($address = "${address}<li>${address_item.trim()}</li>")
28 - #end
29 - #set($info = "<h4>${result_doc.getName()}</h4><ul>${address}</ul>")
30 - #set($discard = $map.put("${result_doc.getName()}", $result_obj.getProperty("latlong").value))
31 - #end
32 - #if($objecttool.allNull($map))
33 - #set($mapJSON = {})
34 - #else
35 - #set($mapJSON = $jsontool.serialize(${map}))
36 - #end
37 -
38 38  <h2>Add your practice to the map</h2>
39 39  #set($form_start = {
40 40   "id": "homeoworld_form",
XWiki.JavaScriptExtension[0]
Code
... ... @@ -10,15 +10,8 @@
10 10   #set($map = {})
11 11   #foreach($item in $result)
12 12   #set($result_doc = $xwiki.getDocument("${item}"))
13 - #set($spaceReference = $services.model.resolveDocument('', 'default', $result_doc.documentReference.lastSpaceReference).parent)
14 - #set($spaceName = $spaceReference.getName())
13 + #set($result_doc_title = $result_doc.getName())
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 - #set($address = "${address}<li>${address_item.trim()}</li>")
20 - #end
21 - #set($info = "<h4>${result_doc.getName()}</h4><ul>${address}</ul>")
22 22   #set($discard = $map.put("${result_doc.getName()}", $result_obj.getProperty("latlong").value))
23 23   #end
24 24   #if($objecttool.allNull($map))
... ... @@ -30,14 +30,21 @@
30 30   var mapJSON = $jsontool.parse($mapJSON),
31 31   markers = [];
32 32  
26 + console.log(mapJSON);
27 +
33 33   for(const property in mapJSON) {
34 34   let latlong = mapJSON[property].split("/"),
35 35   lat = latlong[0],
36 - long = latlong[1],
31 + long = latlong[1];
37 37   latlongArray = [long, lat, property];
38 38   markers.push(latlongArray)
39 39   }
40 40  
36 + var madrkers = [
37 + [ -0.1244324, 51.5006728, "Big Ben" ],
38 + [ -0.119623, 51.503308, "London Eye" ],
39 + [ -0.1279688, 51.5077286, "Nelson's Column<br><a href=\"https://en.wikipedia.org/wiki/Nelson's_Column\">wp</a>" ]
40 + ];
41 41   for (var i=0; i<markers.length; i++) {
42 42   let lon = markers[i][0],
43 43   lat = markers[i][1],