pcwvanbeers/assetmgt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CIM37 - Improved error handling geolocation

Browse Source
This commit is contained in:
“VeLiTi”
2024-04-04 11:08:50 +02:00
parent a657daa1de
commit d483c41832
2 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
equipment.php
View File

@@ -221,6 +221,7 @@ $view .= '<div class="content-block">
if (!empty($responses->geolocation) || $responses->geolocation != ''){ if (!empty($responses->geolocation) || $responses->geolocation != ''){
$geolocation = json_decode($responses->geolocation,true); $geolocation = json_decode($responses->geolocation,true);
if ($geolocation[1] != ''){
$view .= '<div class="content-block"> $view .= '<div class="content-block">
<div id="map" style="height:300px;z-index: 0;"> <div id="map" style="height:300px;z-index: 0;">
</div> </div>
@@ -247,6 +248,7 @@ if (!empty($responses->geolocation) || $responses->geolocation != ''){
</div> </div>
'; ';
} }
}
//Get all related service events //Get all related service events
if (isAllowed('servicereports',$_SESSION['profile'],$_SESSION['permission'],'R') === 1){ if (isAllowed('servicereports',$_SESSION['profile'],$_SESSION['permission'],'R') === 1){

8
equipment_manage.php
View File

@@ -30,7 +30,7 @@ $equipment = [
'service_date' => $date, 'service_date' => $date,
'warranty_date' => $date, 'warranty_date' => $date,
'order_ref' => '', 'order_ref' => '',
'geolocation' => '' 'geolocation' => []
]; ];
$equipment_ID = $_GET['equipmentID'] ?? ''; $equipment_ID = $_GET['equipmentID'] ?? '';
@@ -65,6 +65,8 @@ if (isset($_GET['equipmentID'])) {
if ($update_allowed === 1 || $equipment_owner === 1 || $update_allowed_special === 1){ if ($update_allowed === 1 || $equipment_owner === 1 || $update_allowed_special === 1){
if (isset($_POST['submit'])) { if (isset($_POST['submit'])) {
//GEOLOCATION ARRAY convert to JSON
$_POST['geolocation'] = json_encode($_POST['geolocation'],JSON_UNESCAPED_UNICODE);
//GET ALL POST DATA //GET ALL POST DATA
$data = json_encode($_POST, JSON_UNESCAPED_UNICODE); $data = json_encode($_POST, JSON_UNESCAPED_UNICODE);
//Secure data //Secure data
@@ -101,6 +103,8 @@ if (isset($_GET['equipmentID'])) {
} else { } else {
// Create a new equipment // Create a new equipment
if (isset($_POST['submit']) && $create_allowed === 1) { if (isset($_POST['submit']) && $create_allowed === 1) {
//GEOLOCATION ARRAY convert to JSON
$_POST['geolocation'] = json_encode($_POST['geolocation'],JSON_UNESCAPED_UNICODE);
//GET ALL POST DATA //GET ALL POST DATA
$data = json_encode($_POST, JSON_UNESCAPED_UNICODE); $data = json_encode($_POST, JSON_UNESCAPED_UNICODE);
//Secure data //Secure data
@@ -217,7 +221,7 @@ $view .= '
$changelog = showlog('equipment',$equipment_ID)?? ''; $changelog = showlog('equipment',$equipment_ID)?? '';
//GEOLOCATION //GEOLOCATION
$geo_details = $equipment['geolocation'] ?? ''; $geo_details = json_decode($equipment['geolocation']) ?? '';
if (is_array($geo_details)) { if (is_array($geo_details)) {
$geodetails_lat = $geo_details[0]; $geodetails_lat = $geo_details[0];
$geodetails_lon = $geo_details[1]; $geodetails_lon = $geo_details[1];