From 18b1a472136b64cd34062e4c602373f886b7a38b Mon Sep 17 00:00:00 2001 From: JEALG Date: Fri, 1 Nov 2024 10:11:22 +0100 Subject: [PATCH 1/7] typo --- core/class/temperature.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/class/temperature.class.php b/core/class/temperature.class.php index 40efec0..cae2499 100644 --- a/core/class/temperature.class.php +++ b/core/class/temperature.class.php @@ -136,16 +136,16 @@ public function AddCommand($Name, $_logicalId, $Type = 'info', $SubType = 'binar $Command->setIsHistorized($IsHistorized); if ($icon != 'default') { - $Command->setdisplay('icon', ''); + $Command->setDisplay('icon', ''); } if ($forceLineB != 'default') { - $Command->setdisplay('forceReturnLineBefore', 1); + $Command->setDisplay('forceReturnLineBefore', 1); } if ($_iconname != 'default') { - $Command->setdisplay('showIconAndNamedashboard', 1); + $Command->setDisplay('showIconAndNamedashboard', 1); } if ($_noiconname != null) { - $Command->setdisplay('showNameOndashboard', 0); + $Command->setDisplay('showNameOndashboard', 0); } if ($_calculValueOffset != null) { From f2c9397f701dbca2adc9768b17935593da96321b Mon Sep 17 00:00:00 2001 From: JEALG Date: Fri, 1 Nov 2024 10:33:45 +0100 Subject: [PATCH 2/7] typo --- core/class/temperature.class.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/core/class/temperature.class.php b/core/class/temperature.class.php index cae2499..6f48148 100644 --- a/core/class/temperature.class.php +++ b/core/class/temperature.class.php @@ -300,8 +300,7 @@ public function postUpdate() {} public function getInformations() { if (!$this->getIsEnable()) return; - $_eqName = $this->getName(); - log::add('temperature', 'debug', '┌── :fg-success:' . __('Mise à jour', __FILE__) . ' ::/fg: ' . $_eqName . ' ──'); + log::add('temperature', 'debug', '┌── :fg-success:' . __('Mise à jour', __FILE__) . ' ::/fg: ' . $this->getName() . ' (' . $this->getHumanName() . ') ──'); /* ********************** Calcul *************************** */ $calcul = 'temperature'; @@ -389,7 +388,7 @@ public function getInformations() /* ********************** Calcul de la température ressentie *************************** => VALABLE AUSSI POUR LE PLUGIN TEMPERATURE/ROSEE*/ if ($calcul == 'temperature') { - log::add('temperature', 'debug', '┌── :fg-warning:' . __('Calcul de la température ressentie', __FILE__) . ' ::/fg: ' . $_eqName . ' ──'); + log::add('temperature', 'debug', '┌── :fg-warning:' . __('Calcul de la température ressentie', __FILE__) . ' ::/fg: ' . $this->getName() . ' ──'); $result_T = temperature::getTemperature($wind, $temperature, $humidity, $pre_seuil, $seuil); $windchill = $result_T[0]; $td = $result_T[1]; @@ -401,7 +400,7 @@ public function getInformations() } /* ********************** Mise à Jour des équipements *************************** */ - log::add('temperature', 'debug', '┌── :fg-info:' . __('Mise à jour', __FILE__) . ' ::/fg: ' . $_eqName . ' ──'); + log::add('temperature', 'debug', '┌── :fg-info:' . __('Mise à jour', __FILE__) . ' ::/fg: ' . $this->getName() . ' ──'); $Equipement = eqlogic::byId($this->getId()); if (is_object($Equipement) && $Equipement->getIsEnable()) { From 275543e3d300a104c09dcf7e1c1e30c65402c9a7 Mon Sep 17 00:00:00 2001 From: JEALG Date: Sat, 2 Nov 2024 16:17:27 +0100 Subject: [PATCH 3/7] typo --- core/class/temperature.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/class/temperature.class.php b/core/class/temperature.class.php index 6f48148..c22a13e 100644 --- a/core/class/temperature.class.php +++ b/core/class/temperature.class.php @@ -441,14 +441,14 @@ public static function getTemperature($wind, $temperature, $humidity, $pre_seuil $windchill = $temperature + $Rc3 * $wind; } } - log::add('temperature', 'debug', 'debug', '| ───▶︎ ' . __('Température ressentie', __FILE__) . ' (Windchill) : ' . $windchill . '°C'); + log::add('temperature', 'debug', '| ───▶︎ ' . __('Température ressentie', __FILE__) . ' (Windchill) : ' . $windchill . '°C'); /* ********************** Calcul de l'indice de chaleur *************************** => VALABLE AUSSI POUR LE PLUGIN TEMPERATURE/ROSEE*/ // sources : http://www.meteo-mussidan.fr/hum.php $var1 = null; // Calcul pression vapeur eau $temperature_k = $temperature + 273.15; - log::add('temperature', 'debug', '| ───▶︎ ' . __('Temperature', __FILE__) . 'Kelvin : ' . $temperature_k . ' K'); + log::add('temperature', 'debug', '| ───▶︎ ' . __('Temperature', __FILE__) . ' ' . 'Kelvin : ' . $temperature_k . ' K'); // Partage calcul $var1 = (-2937.4 / $temperature_k); $eTs = pow(10, ($var1 - 4.9283 * log($temperature_k) / 2.302585092994046 + 23.5471)); From 681443bafb88cdf3870e4a6eebe2955fe2feece9 Mon Sep 17 00:00:00 2001 From: JEALG Date: Sat, 2 Nov 2024 23:24:01 +0100 Subject: [PATCH 4/7] typo --- core/class/temperature.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/class/temperature.class.php b/core/class/temperature.class.php index c22a13e..a275c94 100644 --- a/core/class/temperature.class.php +++ b/core/class/temperature.class.php @@ -552,7 +552,7 @@ public function execute($_options = null) if ($this->getLogicalId() == 'refresh') { log::add('baro', 'debug', ' ─────────▶︎ ' . (__('Début de l\'actualisation manuelle', __FILE__))); $this->getEqLogic()->getInformations(); - log::add('baro', 'debug', ' ─────────▶︎ ' . (__("Fin De l\'actualisation manuelle", __FILE__))); + log::add('baro', 'debug', ' ─────────▶︎ ' . (__("Fin de l\'actualisation manuelle", __FILE__))); return; } else { log::add('baro', 'debug', '│ [WARNING] ' . __("Pas d'action pour la commande execute", __FILE__) . ' : ' . $this->getLogicalId()); From 58e671b10e9e3145940ccf671f437e1a7b03663c Mon Sep 17 00:00:00 2001 From: JEALG <48254791+JEALG@users.noreply.github.com> Date: Sat, 2 Nov 2024 22:24:22 +0000 Subject: [PATCH 5/7] Auto update translation done by Mips2648/plugins-translations workflow --- core/i18n/de_DE.json | 2 +- core/i18n/en_US.json | 2 +- core/i18n/es_ES.json | 2 +- core/i18n/it_IT.json | 2 +- core/i18n/pt_PT.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/i18n/de_DE.json b/core/i18n/de_DE.json index 4e2b656..31c11d3 100644 --- a/core/i18n/de_DE.json +++ b/core/i18n/de_DE.json @@ -24,7 +24,7 @@ "FIN CRON OU SAUVEGARDE": "CRON-ENDE ODER SICHERUNG", "Faible risque de gelures": "Geringes Risiko von Erfrierungen", "Faible risque de gelures et d’hypothermie": "Geringes Risiko von Erfrierungen und Unterkühlung", - "Fin De l\\'actualisation manuelle": "Ende der manuellen Aktualisierung", + "Fin de l\\'actualisation manuelle": "Ende der manuellen Aktualisierung", "Humidité Relative": "Relative Luftfeuchtigkeit", "Icône": "Symbol", "Indice de Chaleur": "Wärmeindex", diff --git a/core/i18n/en_US.json b/core/i18n/en_US.json index c5e51f6..5cd2cb9 100755 --- a/core/i18n/en_US.json +++ b/core/i18n/en_US.json @@ -24,7 +24,7 @@ "FIN CRON OU SAUVEGARDE": "END CRON OR BACKUP", "Faible risque de gelures": "Low risk of frostbite", "Faible risque de gelures et d’hypothermie": "Low risk of frostbite and hypothermia", - "Fin De l\\'actualisation manuelle": "End of manual update", + "Fin de l\\'actualisation manuelle": "End of manual update", "Humidité Relative": "Relative humidity", "Icône": "Icon", "Indice de Chaleur": "Heat Index", diff --git a/core/i18n/es_ES.json b/core/i18n/es_ES.json index eb4da92..e61f516 100644 --- a/core/i18n/es_ES.json +++ b/core/i18n/es_ES.json @@ -24,7 +24,7 @@ "FIN CRON OU SAUVEGARDE": "FINALIZAR CRON O BACKUP", "Faible risque de gelures": "Bajo riesgo de congelación", "Faible risque de gelures et d’hypothermie": "Bajo riesgo de congelación e hipotermia", - "Fin De l\\'actualisation manuelle": "Fin de la actualización manual", + "Fin de l\\'actualisation manuelle": "Fin de la actualización manual", "Humidité Relative": "Humedad relativa", "Icône": "Icono", "Indice de Chaleur": "Índice de calor", diff --git a/core/i18n/it_IT.json b/core/i18n/it_IT.json index c2fe4c5..4b058b8 100644 --- a/core/i18n/it_IT.json +++ b/core/i18n/it_IT.json @@ -24,7 +24,7 @@ "FIN CRON OU SAUVEGARDE": "FINE CRON O BACKUP", "Faible risque de gelures": "Basso rischio di congelamento", "Faible risque de gelures et d’hypothermie": "Basso rischio di congelamento e ipotermia", - "Fin De l\\'actualisation manuelle": "Fine dell'aggiornamento manuale", + "Fin de l\\'actualisation manuelle": "Fine dell'aggiornamento manuale", "Humidité Relative": "Umidità relativa", "Icône": "Icona", "Indice de Chaleur": "Indice di calore", diff --git a/core/i18n/pt_PT.json b/core/i18n/pt_PT.json index 93e4087..386fd19 100644 --- a/core/i18n/pt_PT.json +++ b/core/i18n/pt_PT.json @@ -24,7 +24,7 @@ "FIN CRON OU SAUVEGARDE": "TERMINAR CRON OU BACKUP", "Faible risque de gelures": "Baixo risco de queimaduras pelo frio", "Faible risque de gelures et d’hypothermie": "Baixo risco de queimaduras pelo frio e hipotermia", - "Fin De l\\'actualisation manuelle": "Fim da atualização manual", + "Fin de l\\'actualisation manuelle": "Fim da atualização manual", "Humidité Relative": "Humidade relativa", "Icône": "Ícone", "Indice de Chaleur": "Índice de calor", From c44e0e7d641fa4ee0b92d6898c4fa611591b25aa Mon Sep 17 00:00:00 2001 From: JEALG Date: Sat, 28 Dec 2024 10:09:43 +0100 Subject: [PATCH 6/7] =?UTF-8?q?am=C3=A9lioration=20log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/class/temperature.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/class/temperature.class.php b/core/class/temperature.class.php index a275c94..25b5d8b 100644 --- a/core/class/temperature.class.php +++ b/core/class/temperature.class.php @@ -411,7 +411,7 @@ public function getInformations() foreach ($fields as $fieldname) { if ($cmd->getLogicalId('data') == $fieldname) { $this->checkAndUpdateCmd($fieldname, $Value_calcul[$fieldname]); - log::add('temperature', 'debug', '| :fg-info:───▶︎ ' . $cmd->getName() . ' ::/fg: ' . $Value_calcul[$fieldname]); + log::add('temperature', 'debug', '| :fg-info:───▶︎ ' . $cmd->getName() . ' ::/fg: ' . $Value_calcul[$fieldname] . ' ' . $cmd->getUnite()); } } } From aeaab027594fd7ab9ca335588afa9808b773e4ad Mon Sep 17 00:00:00 2001 From: JEALG Date: Sat, 28 Dec 2024 11:11:20 +0100 Subject: [PATCH 7/7] =?UTF-8?q?am=C3=A9lioration?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/class/temperature.class.php | 18 ++++++++---------- docs/fr_FR/changelog.md | 5 +++++ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/core/class/temperature.class.php b/core/class/temperature.class.php index 25b5d8b..1526ddb 100644 --- a/core/class/temperature.class.php +++ b/core/class/temperature.class.php @@ -209,9 +209,7 @@ public function preSave() {} public function postSave() { - $order = 0; - $templatecore_V4 = 'core::'; $calcul = 'temperature'; /* spécifique à température */ @@ -220,7 +218,7 @@ public function postSave() $td_num_visible = 0; $td_num = 1; $template_td = 'default'; - $template_td_num = $templatecore_V4 . 'line'; + $template_td_num = 'core::line'; $name_td = (__('Message', __FILE__)); $name_td_num = (__('Message numérique', __FILE__)); $_iconname_td = 1; @@ -235,14 +233,14 @@ public function postSave() $humidity_relative_name = (__('Humidité Relative', __FILE__)); $vent_name = (__('Vitesse du Vent', __FILE__)); - $this->AddCommand($alert1, 'alert_1', 'info', 'binary', $templatecore_V4 . 'line', null, 'SIREN_STATE', 1, 'default', 'default', 'default', 'default', $order++, '0', true, 'default', null, null, null); - $this->AddCommand($alert2, 'alert_2', 'info', 'binary', $templatecore_V4 . 'line', null, 'SIREN_STATE', 1, 'default', 'default', 'default', 'default', $order++, '0', true, 'default', null, null, null); - $this->AddCommand($temp_ressentiename, 'windchill', 'info', 'numeric', $templatecore_V4 . 'line', '', 'GENERIC_INFO', '0', 'default', 'default', 'default', 'default', $order++, '0', true, 'default', null, 1, null); - $this->AddCommand($indice_chaleur_name, 'humidex', 'info', 'numeric', $templatecore_V4 . 'line', null, 'GENERIC_INFO', '0', 'default', 'default', 'default', 'default', $order++, '0', true, 'default', null, 1, null); + $this->AddCommand($alert1, 'alert_1', 'info', 'binary', 'core::line', null, 'SIREN_STATE', 1, 'default', 'default', 'default', 'default', $order++, '0', true, 'default', null, null, null); + $this->AddCommand($alert2, 'alert_2', 'info', 'binary', 'core::line', null, 'SIREN_STATE', 1, 'default', 'default', 'default', 'default', $order++, '0', true, 'default', null, null, null); + $this->AddCommand($temp_ressentiename, 'windchill', 'info', 'numeric', 'core::line', '°C', 'GENERIC_INFO', '0', 'default', 'default', 'default', 'default', $order++, '0', true, 'default', null, 1, null); + $this->AddCommand($indice_chaleur_name, 'humidex', 'info', 'numeric', 'core::line', null, 'GENERIC_INFO', '0', 'default', 'default', 'default', 'default', $order++, '0', true, 'default', null, 1, null); $this->AddCommand($name_td, 'td', 'info', 'string', $template_td, null, 'WEATHER_CONDITION', $td_num, 'default', 'default', 'default', 'default', $order++, '0', true, $_iconname_td, null, null, null); $this->AddCommand($name_td_num, 'td_num', 'info', 'numeric', $template_td_num, null, 'GENERIC_INFO', $td_num_visible, 'default', 'default', $td_num_min, $td_num_max, $order++, '0', true, $_iconname_td_num, null, null, null); - $this->AddCommand($temp_name, 'temperature', 'info', 'numeric', $templatecore_V4 . 'line', '°C', 'WEATHER_TEMPERATURE', 0, 'default', 'default', 'default', 'default', $order++, '0', true, 'default', null, 2, null); - $this->AddCommand($humidity_relative_name, 'humidityrel', 'info', 'numeric', $templatecore_V4 . 'line', '%', 'WEATHER_HUMIDITY', 0, 'default', 'default', 'default', 'default', $order++, '0', true, 'default', null, 2, null); + $this->AddCommand($temp_name, 'temperature', 'info', 'numeric', 'core::line', '°C', 'WEATHER_TEMPERATURE', 0, 'default', 'default', 'default', 'default', $order++, '0', true, 'default', null, 2, null); + $this->AddCommand($humidity_relative_name, 'humidityrel', 'info', 'numeric', 'core::line', '%', 'WEATHER_HUMIDITY', 0, 'default', 'default', 'default', 'default', $order++, '0', true, 'default', null, 2, null); /* ********************** Vitesse vent *************************** */ @@ -262,7 +260,7 @@ public function postSave() $wind_unite = 'km/h'; } } - $this->AddCommand($vent_name, 'wind', 'info', 'numeric', $templatecore_V4 . 'line', $wind_unite, 'WEATHER_WIND_SPEED', 0, 'default', 'default', 'default', 'default', $order++, '0', true, 'default', null, 2, null); + $this->AddCommand($vent_name, 'wind', 'info', 'numeric', 'core::line', $wind_unite, 'WEATHER_WIND_SPEED', 0, 'default', 'default', 'default', 'default', $order++, '0', true, 'default', null, 2, null); if (!$this->getIsEnable()) return; $this->getInformations(); } diff --git a/docs/fr_FR/changelog.md b/docs/fr_FR/changelog.md index 646fd5d..0d952af 100644 --- a/docs/fr_FR/changelog.md +++ b/docs/fr_FR/changelog.md @@ -11,6 +11,11 @@ pluginId: temperature ## 2024 +### 28/12/2024 + +- Typo +- Amélioration log + ### 27/09/2024 - Correction bug installation depuis Market