Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-01 20:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

chartingfrontend: fixed unclear selection of filelog values; small layout changes

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@4535 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
johannnes 2014-01-02 20:51:50 +00:00
parent d57a7c63c0
commit 7a14b3fc81
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/frontend/controls_frontend.txt
View File

@ -276,10 +276,10 @@ UPD 2013-12-07_12:24:10 2270 www/frontend/app/app.js
UPD 2013-04-28_02:00:20 1205 www/frontend/app/view/ChartGridPanel.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-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 2013-12-26_08:39:37 10257 www/frontend/app/view/TableDataGridPanel.js
UPD 2013-12-29_01:56:25 64890 www/frontend/app/view/LineChartPanel.js UPD 2014-01-02_09:38:25 64890 www/frontend/app/view/LineChartPanel.js
UPD 2013-12-27_01:39:11 9980 www/frontend/app/view/Viewport.js UPD 2013-12-27_01:39:11 9980 www/frontend/app/view/Viewport.js
UPD 2014-01-02_02:26:30 19171 www/frontend/app/controller/MainController.js UPD 2014-01-02_02:26:30 19171 www/frontend/app/controller/MainController.js
UPD 2014-01-02_06:54:06 113093 www/frontend/app/controller/ChartController.js UPD 2014-01-02_09:34:38 113012 www/frontend/app/controller/ChartController.js
UPD 2013-06-30_11:46:54 5415 www/frontend/app/controller/TableDataController.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:35 202 www/frontend/app/model/ReadingsModel.js
UPD 2013-04-01_07:04:36 338 www/frontend/app/model/SavedChartsModel.js UPD 2013-04-01_07:04:36 338 www/frontend/app/model/SavedChartsModel.js

40
www/frontend/www/frontend/app/controller/ChartController.js
View File

@ -833,7 +833,8 @@ Ext.define('FHEM.controller.ChartController', {
yseries = me.createSeries('VALUE', device + " - " + yaxis, styleConfig, axisside); yseries = me.createSeries('VALUE', device + " - " + yaxis, styleConfig, axisside);
} }
var url; var url = '../../../fhem?',
cmd;
if (logtype && logtype === "filelog") { if (logtype && logtype === "filelog") {
Ext.each(FHEM.filelogs, function(log) { Ext.each(FHEM.filelogs, function(log) {
if (log.NAME === device) { if (log.NAME === device) {
@ -849,42 +850,41 @@ Ext.define('FHEM.controller.ChartController', {
// as the get command wont support absolute pathes by default... // as the get command wont support absolute pathes by default...
currentlogfile = "../../../../../../../../" + currentlogfile; currentlogfile = "../../../../../../../../" + currentlogfile;
} }
url = '../../../fhem?cmd='; cmd = 'get Logfile ' +
url += encodeURIComponent('get Logfile ' +
currentlogfile + ' - ' + dbstarttime + currentlogfile + ' - ' + dbstarttime +
' ' + dbendtime + ' ' + yaxisindex + ':' + yaxis + ' ' + dbendtime + ' ' + yaxisindex + ':' + yaxis +
'.*::$fld[' + (yaxisindex - 1) + '\\x3a::$fld[' + (yaxisindex - 1) +
']=~"ok|on|open|active|true"?1:($fld[' + ']=~"ok|on|open|active|true"?1:($fld[' +
(yaxisindex - 1) + (yaxisindex - 1) +
']=~"low|off|closed|inactive|false"?0:$fld[' + ']=~"low|off|closed|inactive|false"?0:$fld[' +
(yaxisindex - 1) + ']*1)') + '&XHR=1'; (yaxisindex - 1) + ']*1)';
} else if (!Ext.isDefined(yaxisstatistics) || yaxisstatistics === "none" || Ext.isEmpty(yaxisstatistics)) { } else if (!Ext.isDefined(yaxisstatistics) || yaxisstatistics === "none" || Ext.isEmpty(yaxisstatistics)) {
url += '../../../fhem?cmd=get+' + FHEM.dblogname + '+-+webchart+' + dbstarttime + '+' + dbendtime + '+'; cmd = 'get ' + FHEM.dblogname + ' - webchart ' + dbstarttime + ' ' + dbendtime + ' ';
url +=device + '+timerange+' + "TIMESTAMP" + '+' + yaxis; cmd +=device + ' timerange ' + "TIMESTAMP" + ' ' + yaxis;
url += '&XHR=1';
} else { //setup url to get statistics } else { //setup url to get statistics
url += '../../../fhem?cmd=get+' + FHEM.dblogname + '+-+webchart+' + dbstarttime + '+' + dbendtime + '+'; cmd = 'get ' + FHEM.dblogname + ' - webchart ' + dbstarttime + ' ' + dbendtime + ' ';
url +=device; cmd += device;
if (yaxisstatistics.indexOf("hour") === 0) { if (yaxisstatistics.indexOf("hour") === 0) {
url += '+hourstats+'; cmd += ' hourstats ';
} else if (yaxisstatistics.indexOf("day") === 0) { } else if (yaxisstatistics.indexOf("day") === 0) {
url += '+daystats+'; cmd += ' daystats ';
} else if (yaxisstatistics.indexOf("week") === 0) { } else if (yaxisstatistics.indexOf("week") === 0) {
url += '+weekstats+'; cmd += ' weekstats ';
} else if (yaxisstatistics.indexOf("month") === 0) { } else if (yaxisstatistics.indexOf("month") === 0) {
url += '+monthstats+'; cmd += ' monthstats ';
} else if (yaxisstatistics.indexOf("year") === 0) { } else if (yaxisstatistics.indexOf("year") === 0) {
url += '+yearstats+'; cmd += ' yearstats ';
} }
cmd += 'TIMESTAMP' + ' ' + yaxis;
url += 'TIMESTAMP' + '+' + yaxis;
url += '&XHR=1';
} }
Ext.Ajax.request({ Ext.Ajax.request({
method: 'GET', method: 'POST',
params: {
cmd: cmd,
XHR: 1
},
async: false, async: false,
disableCaching: false, disableCaching: false,
url: url, url: url,

4
www/frontend/www/frontend/app/view/LineChartPanel.js
View File

@ -189,7 +189,7 @@ Ext.define('FHEM.view.LineChartPanel', {
{ fieldLabel: 'weekly', name: 'rb', inputValue: 'week', labelWidth: 40 }, { fieldLabel: 'weekly', name: 'rb', inputValue: 'week', labelWidth: 40 },
{ fieldLabel: 'daily', name: 'rb', inputValue: 'day', checked: true, labelWidth: 31 }, { fieldLabel: 'daily', name: 'rb', inputValue: 'day', checked: true, labelWidth: 31 },
{ fieldLabel: 'hourly', name: 'rb', inputValue: 'hour', labelWidth: 38 }, { fieldLabel: 'hourly', name: 'rb', inputValue: 'hour', labelWidth: 38 },
{ fieldLabel: 'last hour', name: 'rb', inputValue: 'lasthour', labelWidth: 50 }, { fieldLabel: 'last hour', name: 'rb', inputValue: 'lasthour', labelWidth: 60 },
{ fieldLabel: 'last 24h', name: 'rb', inputValue: 'last24h', labelWidth: 48 }, { fieldLabel: 'last 24h', name: 'rb', inputValue: 'last24h', labelWidth: 48 },
{ fieldLabel: 'last 7 days', name: 'rb', inputValue: 'last7days', labelWidth: 65 }, { fieldLabel: 'last 7 days', name: 'rb', inputValue: 'last7days', labelWidth: 65 },
{ fieldLabel: 'last month', name: 'rb', inputValue: 'lastmonth', labelWidth: 65 } { fieldLabel: 'last month', name: 'rb', inputValue: 'lastmonth', labelWidth: 65 }
@ -897,7 +897,7 @@ Ext.define('FHEM.view.LineChartPanel', {
checked: false checked: false
}, },
items: [ items: [
{ labelWidth: 50, fieldLabel: 'Left Axis', name: 'rbc' + me.getAxiscounter(), inputValue: 'left', checked: true }, { labelWidth: 60, fieldLabel: 'Left Axis', name: 'rbc' + me.getAxiscounter(), inputValue: 'left', checked: true },
{ labelWidth: 60, fieldLabel: 'Right Axis', name: 'rbc' + me.getAxiscounter(), inputValue: 'right' } { labelWidth: 60, fieldLabel: 'Right Axis', name: 'rbc' + me.getAxiscounter(), inputValue: 'right' }
] ]
}, },