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

CIM37 - Performance update

Browse Source
This commit is contained in:
“VeLiTi”
2024-04-03 22:24:55 +02:00
parent 2cb07cfd47
commit e9d34d0017
2 changed files with 48 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
api/v1/get/application.php
View File

@@ -142,7 +142,12 @@ switch ($action) {
case 'geolocation': case 'geolocation':
$sql = 'SELECT e.* FROM equipment e '.$whereclause.''; if ($whereclause == ''){
$whereclause = 'WHERE geolocation is not null';
} else {
$whereclause .= ' AND geolocation is not null';
}
$sql = 'SELECT distinct(geolocation) FROM equipment e '.$whereclause.'';
break; break;

20
assets/functions.php
View File

@@ -1858,10 +1858,11 @@ function createPartner($user_salesid,$user_soldto,$p_name,$p_type, $token){
// +++++++++++++++++++++++++++++++++++++++++++++++++++++++ // +++++++++++++++++++++++++++++++++++++++++++++++++++++++
// Update GEOlOCATION // Update GEOlOCATION
// +++++++++++++++++++++++++++++++++++++++++++++++++++++++ // +++++++++++++++++++++++++++++++++++++++++++++++++++++++
function geolocationUpdate($token){ function geolocationUpdate($token){
include dirname(__FILE__,2).'/settings/settings.php'; include dirname(__FILE__,2).'/settings/settings.php';
//GET ALL WARRANTY REGISTRATIONS WHERE NO GEOLOCATION SET //GET ALL WARRANTY REGISTRATIONS WHERE NO GEOLOCATION SET
$sql = 'SELECT e.*, h.* FROM equipment e join history h on e.rowID = h.equipmentid where h.type = "Warranty" AND e.geolocation is Null'; $sql = 'SELECT h.equipmentid, h.description FROM equipment e join history h on e.rowID = h.equipmentid where h.type = "Warranty" AND e.geolocation is Null';
$pdo = dbConnect($dbname); $pdo = dbConnect($dbname);
$stmt = $pdo->prepare($sql); $stmt = $pdo->prepare($sql);
$stmt->execute(); $stmt->execute();
@@ -1873,6 +1874,7 @@ function createPartner($user_salesid,$user_soldto,$p_name,$p_type, $token){
//API URL OSM //API URL OSM
$api_url = 'https://nominatim.openstreetmap.org/search?format=json&city='.$warranty->city.'&country='.$warranty->country; $api_url = 'https://nominatim.openstreetmap.org/search?format=json&city='.$warranty->city.'&country='.$warranty->country;
$api_url = str_replace(' ','%20',$api_url);
//BUILD UP FILESTREAM //BUILD UP FILESTREAM
$httpOptions = [ $httpOptions = [
@@ -1884,12 +1886,11 @@ function createPartner($user_salesid,$user_soldto,$p_name,$p_type, $token){
$streamContext = stream_context_create($httpOptions); $streamContext = stream_context_create($httpOptions);
$geo_feedback = file_get_contents($api_url, false, $streamContext); $geo_feedback = file_get_contents($api_url, false, $streamContext);
$geo_feedback = json_decode($geo_feedback, true) ?? ''; $geo_feedback = json_decode($geo_feedback, true);
$lat = (isset($geo_feedback[0]["lat"]) && ($geo_feedback[0]["lat"] !='' || $geo_feedback[0]["lat"] != null))?$geo_feedback[0]["lat"]:0;
$long = (isset($geo_feedback[0]["lon"]) && ($geo_feedback[0]["lon"] !='' || $geo_feedback[0]["lon"] != null))?$geo_feedback[0]["lon"]:0;
//CHECK IF RESULTS ARE FOUND if ($lat !=0){
if (!empty($geo_feedback) || $geo_feedback !=''){
$lat = $geo_feedback[0]["lat"] ?? '';
$long = $geo_feedback[0]["lon"] ?? '';
$geo_feedback = array($lat,$long); $geo_feedback = array($lat,$long);
//JSON ENCODE GEOLOCATION RECEIVED AND SENT TO EQUIPMENT API //JSON ENCODE GEOLOCATION RECEIVED AND SENT TO EQUIPMENT API
$geo_feedback = json_encode($geo_feedback); $geo_feedback = json_encode($geo_feedback);
@@ -1898,7 +1899,8 @@ function createPartner($user_salesid,$user_soldto,$p_name,$p_type, $token){
//Secure data //Secure data
$payload = generate_payload($data); $payload = generate_payload($data);
//API call //API call
ioAPI('/v1/equipments', $payload, $token); $responses = ioAPI('/v1/equipments', $payload, $token);
}
} }
} }
}