Skip to content

Update #45

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
Odolc merged 9 commits into from
Dec 28, 2024
Merged

Update #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
18b1a47
typo
JEALG Nov 1, 2024
f2c9397
typo
JEALG Nov 1, 2024
275543e
typo
JEALG Nov 2, 2024
681443b
typo
JEALG Nov 2, 2024
58e671b
Auto update translation done by Mips2648/plugins-translations workflow
JEALG Nov 2, 2024
b8a31c5
Merge pull request #12 from JEALG/translations
JEALG Nov 2, 2024
c44e0e7
amélioration log
JEALG Dec 28, 2024
aeaab02
amélioration
JEALG Dec 28, 2024
daa6f41
Merge pull request #44 from JEALG/beta
Odolc Dec 28, 2024
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
41 changes: 19 additions & 22 deletions core/class/temperature.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,16 +136,16 @@ public function AddCommand($Name, $_logicalId, $Type = 'info', $SubType = 'binar
$Command->setIsHistorized($IsHistorized);

if ($icon != 'default') {
$Command->setdisplay('icon', '<i class="' . $icon . '"></i>');
$Command->setDisplay('icon', '<i class="' . $icon . '"></i>');
}
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) {
Expand Down Expand Up @@ -209,9 +209,7 @@ public function preSave() {}

public function postSave()
{

$order = 0;
$templatecore_V4 = 'core::';
$calcul = 'temperature';

/* spécifique à température */
Expand All @@ -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;
Expand All @@ -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 *************************** */
Expand All @@ -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();
}
Expand Down Expand Up @@ -300,8 +298,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';
Expand Down Expand Up @@ -389,7 +386,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];
Expand All @@ -401,7 +398,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()) {
Expand All @@ -412,7 +409,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());
}
}
}
Expand Down Expand Up @@ -442,14 +439,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));
Expand Down Expand Up @@ -553,7 +550,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());
Expand Down
2 changes: 1 addition & 1 deletion core/i18n/de_DE.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion core/i18n/en_US.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion core/i18n/es_ES.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion core/i18n/it_IT.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion core/i18n/pt_PT.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 5 additions & 0 deletions docs/fr_FR/changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ pluginId: temperature

## 2024

### 28/12/2024

- Typo
- Amélioration log

### 27/09/2024

- Correction bug installation depuis Market
Expand Down
Loading