Skip to content

modification création commande Geolo V1 #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Phpvarious merged 3 commits into from
May 17, 2026
Merged

modification création commande Geolo V1 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0debf6e
modification création commande Geolo V1
JEALG May 17, 2026
bdeab9d
correction log
JEALG May 17, 2026
b3f73aa
correction
JEALG May 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions core/api/mobile.api.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ function saveMenuFromAppV2($menu, $mobile)
} else {
log::add('mobile', 'debug', '| [WARNING] A required parameter Iq does not exist !');
}
}
}
log::add('mobile', 'debug', '└───────────────────────────────────────────');
$jsonrpc->makeSuccess('ok');
}
Expand Down Expand Up @@ -693,8 +693,7 @@ function saveMenuFromAppV2($menu, $mobile)
log::add('mobile', 'debug', '| [WARNING] Suppression de la commande "' . $cmd->getName() . '"');
$cmd->remove();
}
}
else if (isset($params['Iq'])) log::add('mobile', 'debug', '| [ERROR] EqLogic unknown ─▶︎ ' . $params['Iq']);
} else if (isset($params['Iq'])) log::add('mobile', 'debug', '| [ERROR] EqLogic unknown ─▶︎ ' . $params['Iq']);
else log::add('mobile', 'debug', '[WARNING] Parameter Iq does not exist !');
log::add('mobile', 'debug', '└───────────────────────────────────────────────');
$jsonrpc->makeSuccess('ok');
Expand Down Expand Up @@ -919,8 +918,13 @@ function saveMenuFromAppV2($menu, $mobile)
if (isset($params['Iq'])) {
$mobile = eqLogic::byLogicalId($params['Iq'], 'mobile');
if (is_object($mobile)) {
if (isset($params['id']) && $params['id'] != '' && isset($params['name']) && $params['name'] != '') {
if (isset($params['id']) && $params['id'] != '') {
$cmdgeoloc = cmd::byEqLogicIdAndLogicalId($mobile->getId(), 'geoId_' . $params['id']);
if ($params['name'] == "") {
$name = $params['id'];
} else {
$name = $params['name'];
}
if (!is_object($cmdgeoloc)) {
$cmdgeoloc = new mobileCmd();
$cmdgeoloc->setLogicalId('geoId_' . $params['id']);
Expand All @@ -929,22 +933,22 @@ function saveMenuFromAppV2($menu, $mobile)
$cmdgeoloc->setSubType('binary');
$cmdgeoloc->setGeneric_type('PRESENCE');
$cmdgeoloc->setIsVisible(1);
$cmdgeoloc->setName(__($params['id'] . '-' . $params['name'], __FILE__));
$cmdgeoloc->setName($name);
}
$cmdgeoloc->setConfiguration('latitude', $params['latitude']);
$cmdgeoloc->setConfiguration('longitude', $params['longitude']);
$cmdgeoloc->setConfiguration('subtitle', $params['subtitle']);
$cmdgeoloc->setConfiguration('radius', $params['radius']);
$cmdgeoloc->save();
log::add('mobile', 'debug', '| geoId_' . $params['id'] . ' ─▶︎ ' . $params['name'] . ' ─▶︎ ' . $params['value']);
log::add('mobile', 'debug', '| geoId_' . $params['id'] . ' ─▶︎ ' . $name . ' ─▶︎ ' . $params['value']);
if ($mobile->checkAndUpdateCmd('geoId_' . $params['id'], $params['value'])) {
log::add('mobile', 'debug', '| ↳ Update geofence point ─▶︎ ' . $params['value']);
}
} else log::add('mobile', 'debug', '| [WARNING] A required parameter does not exist or is empty !');
} else log::add('mobile', 'debug', '| [ERROR] EqLogic unknown ─▶︎ ' . $params['Iq']);
}
log::add('mobile', 'debug', '└───────────────────────────────────────────');
$jsonrpc->makeSuccess();
$jsonrpc->makeSuccess();
// mobile::SaveGeoloc($params);
//throw new Exception(__('pas d\'id : ', __FILE__) . $params['name']);
}
Expand All @@ -955,7 +959,7 @@ function saveMenuFromAppV2($menu, $mobile)
$mobile = eqLogic::byLogicalId($params['Iq'], 'mobile');
if (is_object($mobile)) {
if (isset($params['id']) && $params['id'] != '') {
$cmdgeoloc = cmd::byEqLogicIdAndLogicalId($mobile->getId(), 'geoId_' . $params['id']);
$cmdgeoloc = cmd::byEqLogicIdAndLogicalId($mobile->getId(), 'geoId_' . $params['id']);
if (is_object($cmdgeoloc)) {
$cmdgeoloc->remove();
log::add('mobile', 'debug', '| geoId_' . $params['id'] . ' (' . $params['name'] . ') is deleted with success.');
Expand Down
20 changes: 10 additions & 10 deletions core/class/mobile.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ public static function backupExclude()
{
return ['data/images'];
}
/**
* cron callback
* clean notification V2
* makeTemplate V1
*/

/**
* cron callback
* clean notification V2
* makeTemplate V1
*/
public static function cronDaily()
{
// APP V2
Expand All @@ -59,11 +59,11 @@ public static function cronDaily()
mobile::makeTemplateJson();
}

/**
* wizard AppV2
* Call by wizard.php
/**
* wizard AppV2
* Call by wizard.php
* @return array
*/
*/
public static function getWizardSteps(): array
{
$wizard['doc1'] = __('Accueil', __FILE__);
Expand Down