From fb66b94ca27a12aed5d91d57bff7e4891e83eca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric?= Date: Thu, 16 May 2019 16:36:37 -0400 Subject: [PATCH] Correction SINSTI #102 --- core/php/jeeTeleinfo.php | 2 +- desktop/js/panel.js | 2 +- desktop/js/teleinfo.js | 2 +- docs/fr_FR/changelog.md | 6 +++++- plugin_info/info.json | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/core/php/jeeTeleinfo.php b/core/php/jeeTeleinfo.php index 3439dfd..e80d525 100755 --- a/core/php/jeeTeleinfo.php +++ b/core/php/jeeTeleinfo.php @@ -103,7 +103,7 @@ 'NJOURF+1' => FILTER_SANITIZE_STRING, 'PJOURF+1' => FILTER_SANITIZE_STRING, 'PPOINTE' => FILTER_SANITIZE_STRING, - 'SINSTI' => FILTER_SANITIZE_STRING, + 'SINST1' => FILTER_SANITIZE_STRING, 'IRMS1' => FILTER_SANITIZE_STRING, 'URMS1' => FILTER_SANITIZE_STRING ); diff --git a/desktop/js/panel.js b/desktop/js/panel.js index b33a395..873b8d3 100644 --- a/desktop/js/panel.js +++ b/desktop/js/panel.js @@ -162,7 +162,7 @@ $.ajax({ getDailyHistory('div_graphGlobalJournalier',data.result[globalEqLogic].cmd[cmd]); } break; - case "SINSTI": + case "SINST1": if(compteurProd){ commandesPuissance.push({"id":data.result[globalEqLogic].cmd[cmd].id,"name":data.result[globalEqLogic].cmd[cmd].name}); console.log("[loadData][PAPP] " + data.result[globalEqLogic].cmd[cmd].id); diff --git a/desktop/js/teleinfo.js b/desktop/js/teleinfo.js index ecb6654..02fde1e 100644 --- a/desktop/js/teleinfo.js +++ b/desktop/js/teleinfo.js @@ -94,7 +94,7 @@ {etiquette:"SMAXSN1-1",name:"Puissance app max. soutirée n-1 phase 1",unite:"VA"}, {etiquette:"SMAXSN2-1",name:"Puissance app max. soutirée n-1 phase 2",unite:"VA"}, {etiquette:"SMAXSN3-1",name:"Puissance app max. soutirée n-1 phase 3",unite:"VA"}, -{etiquette:"SINSTI",name:"Puissance app. Instantanée injectée",unite:"VA"}, +{etiquette:"SINST1",name:"Puissance app. Instantanée injectée",unite:"VA"}, {etiquette:"SMAXIN",name:"Puissance app. max. injectée n",unite:"VA"}, {etiquette:"SMAXIN-1",name:"Puissance app max. injectée n-1",unite:"VA"}, {etiquette:"CCASN",name:"Point n de la courbe de charge active soutirée",unite:"W"}, diff --git a/docs/fr_FR/changelog.md b/docs/fr_FR/changelog.md index 49d1b6c..222d05b 100644 --- a/docs/fr_FR/changelog.md +++ b/docs/fr_FR/changelog.md @@ -2,7 +2,11 @@ Pour toutes demandes : [https://github.com/NextDom/plugin-teleinfo/issues](https://github.com/NextDom/plugin-teleinfo/issues) -### 4.6.0 (**-05-2019) +### 4.6.1 (16-05-2019) + +* Correction SINSTI par SINST1 + +### 4.6.0 (08-05-2019) * Ajout coût sur le panel diff --git a/plugin_info/info.json b/plugin_info/info.json index 4fc9094..c1d0677 100644 --- a/plugin_info/info.json +++ b/plugin_info/info.json @@ -15,5 +15,5 @@ }, "changelog" : "https://NextDom.github.io/plugin-teleinfo/#language#/changelog", "documentation" : "https://NextDom.github.io/plugin-teleinfo/#language#/", - "pluginVersion" : "4.6.0" + "pluginVersion" : "4.6.1" }