Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion core/api/mobile.api.php
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ function saveMenuFromAppV2($menu, $mobile)
$mobile = eqLogic::byLogicalId($params['Iq'], 'mobile');
}
if (!is_object($mobile)) {
$mobile = createMobile($params, 3);
$mobile = createMobile($params,3);
}
$mobile->setConfiguration('type_mobile', $notification['platform']);
if (isset($notification['token'])) {
Expand Down
18 changes: 11 additions & 7 deletions core/class/mobile.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -425,10 +425,10 @@ public static function createCmdGeoLocV2($Iq, $geolocs)
*/
public static function getMenuDefaultV2($nbIcones = 3)
{
$namesMenus = ['home', 'overview', 'health', 'home'];
$renamesIcons = ['Accueil', 'Synthese', 'Santé', 'Accueil'];
$spanIcons = ['icon jeedomapp-in', 'fab fa-hubspot', 'fas fa-medkit', 'icon jeedomapp-in'];
$urlUsers = ['none', 'none', 'none', 'none'];
$namesMenus = ['home', 'overview', 'health', 'home', 'home', 'home', 'home', 'home'];
$renamesIcons = ['Accueil', 'Synthese', 'Santé', 'Accueil', 'Accueil', 'Accueil', 'Accueil', 'Accueil'];
$spanIcons = ['icon jeedomapp-in', 'fab fa-hubspot', 'fas fa-medkit', 'icon jeedomapp-in', 'icon jeedomapp-in', 'icon jeedomapp-in', 'icon jeedomapp-in', 'icon jeedomapp-in'];
$urlUsers = ['none', 'none', 'none', 'none', 'none', 'none', 'none', 'none'];
$j = 0;
$menuCustomArray = [];
for ($i = 1; $i <= $nbIcones; $i++) {
Expand All @@ -450,7 +450,11 @@ public static function getMenuDefaultTab()
$defaultMenuJson = '{"tab0":{"active":true,"icon":{"name":"in","type":"jeedomapp"},"name":"Accueil","options":{"uri":"\/index.php?v=m&p=home"},"type":"WebviewApp"},
"tab1":{"active":true,"icon":{"name":"hubspot","type":"fa"},"name":"Synthese","options":{"uri":"\/index.php?v=m&p=overview"},"type":"WebviewApp"},
"tab2":{"active":true"icon":{"name":"medkit","type":"fa"},"name":"Sant\u00e9","options":{"uri":"\/index.php?v=m&p=health"},"type":"WebviewApp"},
"tab3":{"active":false,"icon":{"name":"in","type":"jeedomapp"},"name":"Accueil","options":{"uri":"\/index.php?v=m&app_mode=1"},"type":"WebviewApp"}}';
"tab3":{"active":false,"icon":{"name":"in","type":"jeedomapp"},"name":"Accueil","options":{"uri":"\/index.php?v=m&app_mode=1"},"type":"WebviewApp"}},
"tab4":{"active":false,"icon":{"name":"in","type":"jeedomapp"},"name":"Accueil","options":{"uri":"\/index.php?v=m&app_mode=1"},"type":"WebviewApp"}},
"tab5":{"active":false,"icon":{"name":"in","type":"jeedomapp"},"name":"Accueil","options":{"uri":"\/index.php?v=m&app_mode=1"},"type":"WebviewApp"}},
"tab6":{"active":false,"icon":{"name":"in","type":"jeedomapp"},"name":"Accueil","options":{"uri":"\/index.php?v=m&app_mode=1"},"type":"WebviewApp"}},
"tab7":{"active":false,"icon":{"name":"in","type":"jeedomapp"},"name":"Accueil","options":{"uri":"\/index.php?v=m&app_mode=1"},"type":"WebviewApp"}}';
return json_encode($defaultMenuJson);
}

Expand Down Expand Up @@ -546,7 +550,7 @@ public static function generateTypeObject($pluginPanelMobile, $menuCustomArray)
$tabUrl = "/index.php?v={$webviewUrl}&p=dashboard&object_id={$objectId}";
break;
case 'plan':
$tabUrl = "/index.php?v={$webviewUrl}&p=plan&plan_id={$objectId}";
$tabUrl = "/index.php?v={$webviewUrl}&p=plan&fullscreen=1&plan_id={$objectId}";
break;
case 'panel':
$tabUrl = (isset($pluginPanelMobile[$objectId]) && $pluginPanelMobile[$objectId] == $objectId) ? "/index.php?v=m&p={$objectId}" : "/index.php?v=m&p={$objectId}&app_mode=1";
Expand Down Expand Up @@ -676,7 +680,7 @@ public function configMenuCustom()
$arrayElements = array();
$j = 0;
$count = 1;
for ($i = 1; $i < 5; $i++) {
for ($i = 1; $i < 9; $i++) {

// GENERATE TAB ICON LIBRARY AND RENAME BY USER
$resultTabIcon = self::generateTabIcon($menuCustomArray, $i);
Expand Down
5 changes: 5 additions & 0 deletions docs/fr_FR/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
> Pour rappel s'il n'y a pas d'information sur la mise à jour, c'est que celle-ci concerne uniquement de la mise à jour de documentation, de traduction ou de texte


# 25/04/2025

- Ajout pour Max 8 Icones sur le menuCustom


# 24/04/2025

- Ajout Commande Notifications Silencieuses pour Builds : IOS 491 et Android 875
Expand Down