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.38
edited by Jip-jan Alunkel
on December 08, 14:17
Change comment: Renamed from xwiki:practices.WebHome

Summary

Details

Page properties
Content
... ... @@ -9,32 +9,45 @@
9 9  {{html wiki="false" clean="false"}}
10 10  <p>
11 11  All about homeopaths.
12 -</p>
13 -<div id="homeopaths_map"></div>
14 -
15 - #set($query = $services.query.xwql("from doc.object('homeopaths.Code.homeopathsClass') as homeopathObj"))
12 + #set($query = $services.query.xwql("from doc.object('homeopaths.Code.homeopathsClass') as caseObj"))
16 16   #set($result = $query.execute())
17 17   #set($map = {})
18 18   #foreach($item in $result)
19 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 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))
18 + #set($discard = $map.put("${item}", $result_obj.getProperty("latlong").value))
31 31   #end
32 32   #if($objecttool.allNull($map))
33 - #set($mapJSON = {})
21 + #set($output = {})
34 34   #else
35 - #set($mapJSON = $jsontool.serialize(${map}))
23 + #set($output = $jsontool.serialize(${map}))
36 36   #end
25 +$jsontool.parse($output)
26 +</p>
27 +<div id="homeopaths_map"></div>
37 37  
29 +<script>/*
30 + var map = L.map('homeopaths_map').setView([18, 10], 2);
31 + L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
32 + maxZoom: 19,
33 + attribution: ''
34 + }).addTo(map);
35 + map.attributionControl.setPrefix('');
36 + var markers = [
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 + for (var i=0; i<markers.length; i++) {
42 + let lon = markers[i][0],
43 + lat = markers[i][1],
44 + popupText = markers[i][2],
45 + markerLocation = new L.LatLng(lat, lon),
46 + marker = new L.Marker(markerLocation);
47 + map.addLayer(marker);
48 + marker.bindPopup(popupText);
49 + }
50 +*/</script>
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,16 +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())
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 - #set($discard = $map.put("${result_doc.getName()}", $result_obj.getProperty("latlong").value))
14 + #set($discard = $map.put("${item}", $result_obj.getProperty("latlong").value))
23 23   #end
24 24   #if($objecttool.allNull($map))
25 25   #set($mapJSON = {})
... ... @@ -26,18 +26,19 @@
26 26   #else
27 27   #set($mapJSON = $jsontool.serialize(${map}))
28 28   #end
21 + #foreach($entry in $mymap.entrySet() )
22 + $set($entry_doc = $xwiki.getDocument("${entry.key}"))
23 +## $set()
24 + $entry.value
25 + #end
26 +$jsontool.parse($mapJSON)
27 + console.log($doc.getName());
29 29  
30 - var mapJSON = $jsontool.parse($mapJSON),
31 - markers = [];
32 -
33 - for(const property in mapJSON) {
34 - let latlong = mapJSON[property].split("/"),
35 - lat = latlong[0],
36 - long = latlong[1],
37 - latlongArray = [long, lat, property];
38 - markers.push(latlongArray)
39 - }
40 -
29 + var markers = [
30 + [ -0.1244324, 51.5006728, "Big Ben" ],
31 + [ -0.119623, 51.503308, "London Eye" ],
32 + [ -0.1279688, 51.5077286, "Nelson's Column<br><a href=\"https://en.wikipedia.org/wiki/Nelson's_Column\">wp</a>" ]
33 + ];
41 41   for (var i=0; i<markers.length; i++) {
42 42   let lon = markers[i][0],
43 43   lat = markers[i][1],