Merge remote-tracking branch 'refs/remotes/origin/master'

[weathermon.git] / openwrt-web / meteo / archive.js

diff --git a/openwrt-web/meteo/archive.js b/openwrt-web/meteo/archive.js
index 20aa7aa6bd25d735fad2cff4821110796b769796..a0850e46780c4eac639f4aeb65cb128892b086f9 100644 (file)
--- a/openwrt-web/meteo/archive.js
+++ b/openwrt-web/meteo/archive.js
@@ -146,7 +146,7 @@ function drawGraph(graphData) {
           yAxes: [{
             scaleLabel: {
               display: true,
-              labelString: properties["names"][sensor+"."+param],
+              labelString: properties["names"][devid+"."+sensor+"."+param] + ", " + properties["units"][devid+"."+sensor+"."+param],
               fontColor: properties["fonts"]["axes"]["color"],
               fontSize: properties["fonts"]["axes"]["size"],
               fontStyle: properties["fonts"]["axes"]["style"],