Changes for page Homeopaths

Last modified by Jip-jan Alunkel on March 14, 20:13
From version 8.28
edited by Jip-jan Alunkel
on December 08, 13:45
Change comment: Renamed from xwiki:practices.WebHome
To version 8.44
edited by Jip-jan Alunkel
on December 08, 15:47
Change comment: Renamed from xwiki:practices.WebHome

Summary

Details

Page properties
Content
... ... @@ -1,7 +1,7 @@
1 1  {{include reference="assets.pagemaker.macros"/}}
2 2  
3 3  {{velocity}}
4 -#set($discard = $services.localization.use('document', 'cases.Code.translations'))
4 +#set($discard = $services.localization.use('document', 'homeopaths.Code.translations'))
5 5  #set($discard = $services.localization.use('document', 'assets.pagemaker.translations'))
6 6  #set($discard = $xwiki.ssx.use('assets.pagemaker.WebHome', {'minify': false}))
7 7  #set($discard = $xwiki.jsx.use('assets.pagemaker.WebHome', {'minify': false}))
... ... @@ -12,28 +12,28 @@
12 12  </p>
13 13  <div id="homeopaths_map"></div>
14 14  
15 -<script>
16 - var map = L.map('homeopaths_map').setView([18, 10], 2);
17 - L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
18 - maxZoom: 19,
19 - attribution: ''
20 - }).addTo(map);
21 - map.attributionControl.setPrefix('');
22 - var markers = [
23 - [ -0.1244324, 51.5006728, "Big Ben" ],
24 - [ -0.119623, 51.503308, "London Eye" ],
25 - [ -0.1279688, 51.5077286, "Nelson's Column<br><a href=\"https://en.wikipedia.org/wiki/Nelson's_Column\">wp</a>" ]
26 - ];
27 - for (var i=0; i<markers.length; i++) {
28 - let lon = markers[i][0],
29 - lat = markers[i][1],
30 - popupText = markers[i][2],
31 - markerLocation = new L.LatLng(lat, lon),
32 - marker = new L.Marker(markerLocation);
33 - map.addLayer(marker);
34 - marker.bindPopup(popupText);
35 - }
36 -</script>
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 + #set($address = "${address}<li>${address_item.trim()}</li>")
27 + #end
28 + #set($info = "<h4>${result_doc.getName()}</h4><ul>${address}</ul>")
29 + #set($discard = $map.put("${result_doc.getName()}", $result_obj.getProperty("latlong").value))
30 + #end
31 + #if($objecttool.allNull($map))
32 + #set($mapJSON = {})
33 + #else
34 + #set($mapJSON = $jsontool.serialize(${map}))
35 + #end
36 +$mapJSON
37 37  <h2>Add your practice to the map</h2>
38 38  #set($form_start = {
39 39   "id": "homeoworld_form",
XWiki.JavaScriptExtension[0]
Code
... ... @@ -5,25 +5,39 @@
5 5   }).addTo(map);
6 6   map.attributionControl.setPrefix('');
7 7  
8 - #set($query = $services.query.xwql("from doc.object('homeopaths.Code.homeopathsClass') as caseObj"))
8 + #set($query = $services.query.xwql("from doc.object('homeopaths.Code.homeopathsClass') as homeopathObj"))
9 9   #set($result = $query.execute())
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 13   #set($result_obj = $result_doc.getObject("homeopaths.Code.homeopathsClass"))
14 - #set($discard = $map.put("${item}", $result_obj.getProperty("latlong").value))
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))
15 15   #end
16 16   #if($objecttool.allNull($map))
17 - {}
25 + #set($mapJSON = {})
18 18   #else
19 - $jsontool.serialize(${map})
27 + #set($mapJSON = $jsontool.serialize(${map}))
20 20   #end
21 21  
22 - var markers = [
23 - [ -0.1244324, 51.5006728, "Big Ben" ],
24 - [ -0.119623, 51.503308, "London Eye" ],
25 - [ -0.1279688, 51.5077286, "Nelson's Column<br><a href=\"https://en.wikipedia.org/wiki/Nelson's_Column\">wp</a>" ]
26 - ];
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 +
27 27   for (var i=0; i<markers.length; i++) {
28 28   let lon = markers[i][0],
29 29   lat = markers[i][1],