diff --git a/fhem/www/frontend/controls_frontend.txt b/fhem/www/frontend/controls_frontend.txt index 9f123927e..a13119d66 100644 --- a/fhem/www/frontend/controls_frontend.txt +++ b/fhem/www/frontend/controls_frontend.txt @@ -277,12 +277,12 @@ UPD 2014-01-12_11:31:30 3028 www/frontend/app/app.js UPD 2013-04-28_02:00:20 1205 www/frontend/app/view/ChartGridPanel.js UPD 2013-07-07_12:12:08 16201 www/frontend/app/view/DevicePanel.js UPD 2013-12-26_08:39:37 10257 www/frontend/app/view/TableDataGridPanel.js -UPD 2014-01-03_01:24:06 65039 www/frontend/app/view/LineChartPanel.js +UPD 2014-04-23_05:47:51 65039 www/frontend/app/view/LineChartPanel.js UPD 2014-01-12_12:09:17 5144 www/frontend/app/view/StatusPanel.js UPD 2014-01-12_12:55:22 10486 www/frontend/app/view/Viewport.js UPD 2014-01-12_04:44:35 22438 www/frontend/app/controller/MainController.js UPD 2014-01-12_02:49:58 16562 www/frontend/app/controller/StatusController.js -UPD 2014-03-14_05:50:19 111937 www/frontend/app/controller/ChartController.js +UPD 2014-04-22_07:46:36 111977 www/frontend/app/controller/ChartController.js UPD 2013-06-30_11:46:54 5415 www/frontend/app/controller/TableDataController.js UPD 2013-04-01_07:04:35 202 www/frontend/app/model/ReadingsModel.js UPD 2013-04-01_07:04:36 338 www/frontend/app/model/SavedChartsModel.js diff --git a/fhem/www/frontend/www/frontend/app/controller/ChartController.js b/fhem/www/frontend/www/frontend/app/controller/ChartController.js index 05e48c1a1..7d5b2a235 100644 --- a/fhem/www/frontend/www/frontend/app/controller/ChartController.js +++ b/fhem/www/frontend/www/frontend/app/controller/ChartController.js @@ -244,8 +244,8 @@ Ext.define('FHEM.controller.ChartController', { // in that case, we will skip the entry if (key !== "" && key.lastIndexOf(":") + 1 === key.length && - !Ext.Array.contains(keyArray, key.replace(":", ""))) { - keyArray.push(key.replace(":", "")); + !Ext.Array.contains(keyArray, splitArr[1] + "." + key.replace(":", ""))) { + keyArray.push(splitArr[1] + "." + key.replace(":", "")); keyIndexArray.push(i); } diff --git a/fhem/www/frontend/www/frontend/app/view/LineChartPanel.js b/fhem/www/frontend/www/frontend/app/view/LineChartPanel.js index bdf62b3fa..6e52ea078 100644 --- a/fhem/www/frontend/www/frontend/app/view/LineChartPanel.js +++ b/fhem/www/frontend/www/frontend/app/view/LineChartPanel.js @@ -527,7 +527,7 @@ Ext.define('FHEM.view.LineChartPanel', { allowBlank: false, disabled: true, labelWidth: 90, - inputWidth: 110, + inputWidth: 190, store: Ext.create('FHEM.store.ReadingsStore', { queryMode: 'remote', proxy: {