diff --git a/embed.php b/embed.php
index 91a3cac..7ef219b 100644
--- a/embed.php
+++ b/embed.php
@@ -135,6 +135,8 @@
floatingtime = result.floatingtime,
yaxismin = result.yaxismin;
yaxismax = result.yaxismax;
+ yaxismin2 = result.yaxismin2;
+ yaxismax2 = result.yaxismax2;
feedlist = result.feedlist;
// show settings
diff --git a/group_graph.js b/group_graph.js
index 060df4b..3419690 100644
--- a/group_graph.js
+++ b/group_graph.js
@@ -846,8 +846,8 @@ function graph_draw()
out += "
"+feedlist[z].id+":"+feedlist[z].tag+": "+feedlist[z].name+" | ";
var quality = Math.round(100 * (1-(feedlist[z].stats.npointsnull/feedlist[z].stats.npoints)));
out += ""+quality+"% ("+(feedlist[z].stats.npoints-feedlist[z].stats.npointsnull)+"/"+feedlist[z].stats.npoints+") | ";
- out += ""+feedlist[z].stats.minval.toFixed(dp)+" | ";
- out += ""+feedlist[z].stats.maxval.toFixed(dp)+" | ";
+ if(!isNaN(Number(feedlist[z].stats.minval))) out += ""+feedlist[z].stats.minval.toFixed(dp)+" | ";
+ if(!isNaN(Number(feedlist[z].stats.maxval))) out += ""+feedlist[z].stats.maxval.toFixed(dp)+" | ";
out += ""+feedlist[z].stats.diff.toFixed(dp)+" | ";
out += ""+feedlist[z].stats.mean.toFixed(dp)+" | ";
out += ""+feedlist[z].stats.stdev.toFixed(dp)+" | ";
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index c4e2d6b..c9f7f3b 100644
Binary files a/locale/fr_FR/LC_MESSAGES/messages.mo and b/locale/fr_FR/LC_MESSAGES/messages.mo differ
diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 41e9dd1..ac07f77 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -1,15 +1,15 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2019-10-20 15:11+0200\n"
-"PO-Revision-Date: 2019-10-20 15:23+0200\n"
+"POT-Creation-Date: 2020-08-28 12:32+0200\n"
+"PO-Revision-Date: 2020-08-28 12:32+0200\n"
"Last-Translator: Aymeric THIBAUT\n"
"Language-Team: Aymeric THIBAUT\n"
"Language: fr_FR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.4\n"
+"X-Generator: Poedit 2.4.1\n"
"X-Poedit-Basepath: ../../..\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Poedit-SearchPath-0: .\n"
@@ -38,16 +38,108 @@ msgstr "Supprimer"
msgid "Save"
msgstr "Enregistrer"
-#: graph.js:691 view.php:421
+#: embed.php:59 view.php:59
+msgid "Refresh"
+msgstr "Rafraîchir"
+
+#: embed.php:61 view.php:61
+msgid "1 hour"
+msgstr "1 heure"
+
+#: embed.php:62 view.php:62
+msgid "6 hours"
+msgstr "6 heures"
+
+#: embed.php:63 view.php:63
+msgid "12 hours"
+msgstr "12 heures"
+
+#: embed.php:64 view.php:64
+msgid "24 hours"
+msgstr "24 heures"
+
+#: embed.php:65 view.php:65
+msgid "1 Week"
+msgstr "1 semaine"
+
+#: embed.php:66 view.php:66
+msgid "2 Weeks"
+msgstr "2 semaines"
+
+#: embed.php:67 view.php:67 view.php:74
+msgid "Month"
+msgstr "Mois"
+
+#: embed.php:68 view.php:68 view.php:75
+msgid "Year"
+msgstr "Année"
+
+#: embed.php:104 view.php:280
+msgid "Select a feed"
+msgstr "Sélectionner un flux"
+
+#: embed.php:105 view.php:281
+msgid "Please select a feed from the Feeds List"
+msgstr "Sélectionner SVP un flux à partir de la liste Flux"
+
+#: embed.php:106 view.php:282
+msgid "Select graph"
+msgstr "Sélectionner graphique"
+
+#: embed.php:107 view.php:218 view.php:283
+msgid "Show CSV Output"
+msgstr "Afficher sortie CSV"
+
+#: embed.php:108 view.php:284
+msgid "Hide CSV Output"
+msgstr "Masquer sortie CSV"
+
+#: embed.php:109 view.php:285
+msgid "Lines"
+msgstr "Lignes"
+
+#: embed.php:110 view.php:286
+msgid "Bars"
+msgstr "Barres"
+
+#: embed.php:111 view.php:287
+msgid "Points"
+msgstr "Points"
+
+#: embed.php:112 view.php:95 view.php:288
+msgid "Histogram"
+msgstr "Histogramme"
+
+#: embed.php:113 view.php:289
+msgid "Move up"
+msgstr "Monter"
+
+#: embed.php:114 view.php:290
+msgid "Move down"
+msgstr "Descendre"
+
+#: embed.php:115 view.php:291
+msgid "Window"
+msgstr "Fenêtre"
+
+#: embed.php:116 view.php:292
+msgid "Length"
+msgstr "Longueur"
+
+#: graph.js:632 view.php:392
msgid "Received data not in correct format. Check the logs for more details"
msgstr ""
"Les données reçues ne sont pas de format correct. Vérifier les journaux pour "
"plus de détails"
-#: graph.js:692 graph.js:714 view.php:422
+#: graph.js:633 graph.js:659 view.php:393
msgid "Request error"
msgstr "Erreur de requête"
+#: graph.js:661
+msgid "Remove missing"
+msgstr "Retirer les manquants"
+
#: graph_menu.php:4
msgid "Graphs"
msgstr "Graphiques"
@@ -56,357 +148,298 @@ msgstr "Graphiques"
msgid "Data viewer"
msgstr "Visualiseur de données"
-#: view.php:57
+#: view.php:72
msgid "Day"
msgstr "Jour"
-#: view.php:57
+#: view.php:72
msgid "D"
msgstr ""
-#: view.php:58
+#: view.php:73
msgid "Week"
msgstr "Semaine"
-#: view.php:58
+#: view.php:73
msgid "W"
msgstr ""
-#: view.php:59
-msgid "Month"
-msgstr "Mois"
-
-#: view.php:59
+#: view.php:74
msgid "M"
msgstr ""
-#: view.php:60
-msgid "Year"
-msgstr "Année"
-
-#: view.php:60
+#: view.php:75
msgid "Y"
msgstr ""
-#: view.php:61
+#: view.php:78
msgid "Zoom In"
msgstr "Zoom avant"
-#: view.php:62
+#: view.php:79
msgid "Zoom Out"
msgstr "Zoom arrière"
-#: view.php:63
+#: view.php:80
msgid "Earlier"
msgstr "Avant"
-#: view.php:64
+#: view.php:81
msgid "Later"
msgstr "Après"
-#: view.php:67 view.php:221
+#: view.php:84 view.php:227
msgid "Show"
msgstr "Afficher"
-#: view.php:68
+#: view.php:85
msgid "missing data"
msgstr "données manquantes"
-#: view.php:69
+#: view.php:86
msgid "legend"
msgstr "légende"
-#: view.php:70
+#: view.php:87
msgid "feed tag"
msgstr "étiquette flux"
-#: view.php:78 view.php:318
-msgid "Histogram"
-msgstr "Histogramme"
-
-#: view.php:79 view.php:114 view.php:181
+#: view.php:96 view.php:131 view.php:186
msgid "Type"
msgstr "Type"
-#: view.php:81
+#: view.php:98
msgid "Time at value"
msgstr "Temps à la valeur"
-#: view.php:82
+#: view.php:99
msgid "kWh at Power"
msgstr "kWh à la Puissance"
-#: view.php:84
+#: view.php:101
msgid "Resolution"
msgstr "Résolution"
-#: view.php:88
+#: view.php:105
msgid "Back to main view"
msgstr "Retour à la vue principale"
-#: view.php:98
+#: view.php:115
msgid "Start"
msgstr "Début"
-#: view.php:106
+#: view.php:123
msgid "End"
msgstr "Fin"
-#: view.php:116
+#: view.php:133
msgid "Fixed Interval"
msgstr "Intervalle fixe"
-#: view.php:117
+#: view.php:134
msgid "Daily"
msgstr "Quotiden"
-#: view.php:118
+#: view.php:135
msgid "Weekly"
msgstr "Hebdomadaire"
-#: view.php:119
+#: view.php:136
msgid "Monthly"
msgstr "Mensuel"
-#: view.php:120
+#: view.php:137
msgid "Annual"
msgstr "Annuel"
-#: view.php:128
+#: view.php:145
msgid "Fix"
msgstr "Réparer"
-#: view.php:129
+#: view.php:146
msgid "Limit to data interval"
msgstr "Limiter à l'intervalle de données"
-#: view.php:133
-msgid "Timezone"
-msgstr "Fuseau horaire"
-
-#: view.php:136
-msgid "System"
-msgstr "Système"
-
-#: view.php:140
-msgid "World Timezones"
-msgstr "Fuseau horaire Monde"
-
-#: view.php:146 view.php:154
+#: view.php:151 view.php:159
msgid "Y-axis"
msgstr "Axe-Y"
-#: view.php:146
+#: view.php:151
msgid "Left"
msgstr "Gauche"
-#: view.php:147 view.php:155
+#: view.php:152 view.php:160
msgid "min"
msgstr "min"
-#: view.php:149 view.php:157
+#: view.php:154 view.php:162
msgid "max"
msgstr "max"
-#: view.php:151 view.php:159
+#: view.php:156 view.php:164
msgid "Reset"
msgstr "Réinitialiser"
-#: view.php:154
+#: view.php:159
msgid "Right"
msgstr "Droite"
-#: view.php:162
+#: view.php:166
msgid "Reload"
msgstr "Recharger"
-#: view.php:168
+#: view.php:173
msgid "Show options"
msgstr "Afficher options"
-#: view.php:169
+#: view.php:174
msgid "Show statistics"
msgstr "Afficher statistiques"
-#: view.php:172
+#: view.php:177
msgid "Feeds in view"
msgstr "Flux dans la vue"
-#: view.php:180 view.php:196
+#: view.php:185 view.php:202
msgid "Feed"
msgstr "Flux"
-#: view.php:182
+#: view.php:187
msgid "Color"
msgstr "Couleur"
-#: view.php:183
+#: view.php:188
msgid "Fill"
msgstr "Remplissage"
-#: view.php:184
+#: view.php:189
msgid "Stack"
msgstr "Empilement"
-#: view.php:185
+#: view.php:190
msgid "Scale"
msgstr "Échelle"
-#: view.php:186
+#: view.php:191
+msgid "Offset"
+msgstr "Décalage"
+
+#: view.php:192
msgid "Delta"
msgstr "Delta"
-#: view.php:187
+#: view.php:193
msgid "Average"
msgstr "Moyenne"
-#: view.php:188
+#: view.php:194
msgid "DP"
msgstr ""
-#: view.php:197
+#: view.php:203
msgid "Quality"
msgstr "Qualité"
-#: view.php:198
+#: view.php:204
msgid "Min"
msgstr "Min"
-#: view.php:199
+#: view.php:205
msgid "Max"
msgstr "Max"
-#: view.php:200
+#: view.php:206
msgid "Diff"
msgstr "Différence"
-#: view.php:201
+#: view.php:207
msgid "Mean"
msgstr "Médiane"
-#: view.php:202
+#: view.php:208
msgid "Stdev"
msgstr "Écart-type"
-#: view.php:203
+#: view.php:209
msgid "Wh"
msgstr "Wh"
-#: view.php:212 view.php:313
-msgid "Show CSV Output"
-msgstr "Afficher sortie CSV"
-
-#: view.php:213
+#: view.php:219
msgid "Time format"
msgstr "Format temps"
-#: view.php:215
+#: view.php:221
msgid "Unix timestamp"
msgstr "Horodatage Unix"
-#: view.php:216
+#: view.php:222
msgid "Seconds since start"
msgstr "Secondes depuis le départ"
-#: view.php:217
+#: view.php:223
msgid "Date-time string"
msgstr "Chaîne Date-temps"
-#: view.php:219
+#: view.php:225
msgid "Null values"
msgstr "Valeurs nulles"
-#: view.php:222
+#: view.php:228
msgid "Replace with last value"
msgstr "Remplacer avec la dernière valeur"
-#: view.php:223
+#: view.php:229
msgid "Remove whole line"
msgstr "Retirer la ligne entière"
-#: view.php:225
+#: view.php:231
msgid "Headers"
msgstr "En-têtes"
-#: view.php:227
+#: view.php:233
msgid "Show name and tag"
msgstr "Afficher nom et étiquette"
-#: view.php:228
+#: view.php:234
msgid "Show name"
msgstr "Afficher nom"
-#: view.php:229
+#: view.php:235
msgid "Hide"
msgstr "Masquer"
-#: view.php:235
+#: view.php:240
msgid "Download"
msgstr "Télécharger"
-#: view.php:273
+#: view.php:243
msgid "Copied"
msgstr "Copié"
-#: view.php:273
+#: view.php:243
msgid "Copy"
msgstr "Copier"
-#: view.php:310
-msgid "Select a feed"
-msgstr "Sélectionner un flux"
-
-#: view.php:311
-msgid "Please select a feed from the Feeds List"
-msgstr "Sélectionner SVP un flux à partir de la liste Flux"
-
-#: view.php:312
-msgid "Select graph"
-msgstr "Sélectionner graphique"
-
-#: view.php:314
-msgid "Hide CSV Output"
-msgstr "Masquer sortie CSV"
-
-#: view.php:315
-msgid "Lines"
-msgstr "Lignes"
-
-#: view.php:316
-msgid "Bars"
-msgstr "Barres"
-
-#: view.php:317
-msgid "Points"
-msgstr "Points"
-
-#: view.php:319
-msgid "Move up"
-msgstr "Monter"
-
-#: view.php:320
-msgid "Move down"
-msgstr "Descendre"
-
-#: view.php:321
-msgid "Window"
-msgstr "Fenêtre"
-
-#: view.php:322
-msgid "Length"
-msgstr "Longueur"
-
-#: view.php:423
+#: view.php:394
msgid "User"
msgstr "Utilisateur"
-#: view.php:424
+#: view.php:395
msgid "Browser"
msgstr "Navigateur"
-#: view.php:425
+#: view.php:396
msgid "Authentication Required"
msgstr "Authentification requise"
+#~ msgid "Timezone"
+#~ msgstr "Fuseau horaire"
+
+#~ msgid "System"
+#~ msgstr "Système"
+
+#~ msgid "World Timezones"
+#~ msgstr "Fuseau horaire Monde"
+
#~ msgid "Feeds"
#~ msgstr "Flux"
diff --git a/view.php b/view.php
index 660dabf..28cb24d 100644
--- a/view.php
+++ b/view.php
@@ -57,7 +57,7 @@
-