kevinowino869/mitrobill
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix map url

Browse Source
This commit is contained in:
Ibnu Maksum 2024-03-19 10:22:54 +07:00
parent 393a1195a5
commit 8f595af9a1
No known key found for this signature in database
GPG Key ID: 7FC82848810579E5
2 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
system/controllers/map.php
View File

@ -22,6 +22,7 @@ switch ($action) {
$customerData = []; $customerData = [];
foreach ($c as $customer) { foreach ($c as $customer) {
if (!empty($customer->coordinates)) {
$customerData[] = [ $customerData[] = [
'id' => $customer->id, 'id' => $customer->id,
'name' => $customer->fullname, 'name' => $customer->fullname,
@ -31,6 +32,7 @@ switch ($action) {
'coordinates' => '[' . $customer->coordinates . ']', 'coordinates' => '[' . $customer->coordinates . ']',
]; ];
} }
}
$ui->assign('customers', $customerData); $ui->assign('customers', $customerData);
$ui->assign('xheader', '<link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.3/dist/leaflet.css">'); $ui->assign('xheader', '<link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.3/dist/leaflet.css">');

7
ui/ui/map-customer.tpl
View File

@ -1,7 +1,7 @@
{include file="sections/header.tpl"} {include file="sections/header.tpl"}
<!-- Map container div --> <!-- Map container div -->
<div id="map" style="width: 800px; height: 600px; margin: 20px auto"></div> <div id="map" style="width: '100%'; height: 600px; margin: 20px auto"></div>
{literal} {literal}
<script> <script>
@ -12,7 +12,8 @@
var customers = {/literal}{$customers|json_encode}{literal}; var customers = {/literal}{$customers|json_encode}{literal};
L.tileLayer('https://{s}.basemaps.cartocdn.com/rastertiles/light_all/{z}/{x}/{y}.png', { L.tileLayer('https://{s}.basemaps.cartocdn.com/rastertiles/light_all/{z}/{x}/{y}.png', {
attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors &copy; <a href="https://carto.com/attributions">CARTO</a>', attribution:
'&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors &copy; <a href="https://carto.com/attributions">CARTO</a>',
subdomains: 'abcd', subdomains: 'abcd',
maxZoom: 20 maxZoom: 20
}).addTo(map); }).addTo(map);
@ -31,7 +32,7 @@
"<strong>Customer Balance</strong>: " + balance + "<br>" + "<strong>Customer Balance</strong>: " + balance + "<br>" +
"<strong>Address</strong>: " + address + "<br>" + "<strong>Address</strong>: " + address + "<br>" +
"<strong>Coordinates</strong>: " + coordinates + "<br>" + "<strong>Coordinates</strong>: " + coordinates + "<br>" +
"<a href='{$_url}customers/view/"+ customer.id +"'>More Info</a><br>"; "<a href='{/literal}{$_url}{literal}customers/view/"+ customer.id +"'>More Info</a><br>";
// Add marker to map // Add marker to map
var marker = L.marker(JSON.parse(coordinates)).addTo(group); var marker = L.marker(JSON.parse(coordinates)).addTo(group);