FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-19 00:26:03 +00:00
Code Issues Releases Wiki Activity

see http://forum.fhem.de/index.php/topic,10439.0.html for details

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@4473 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
johannnes 2013-12-27 14:27:42 +00:00
parent 836252fef1
commit 3304fc5f4d
8 changed files with 501 additions and 241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fhem/www/frontend/controls_frontend.txt
View File

@ -29,7 +29,7 @@ DIR www/frontend/lib/ext-4.2.0.663/images/window
DIR www/frontend/lib/ext-4.2.0.663/images/grid
DIR www/frontend/lib/ext-4.2.0.663/images/util
DIR www/frontend/lib/ext-4.2.0.663/images/util/splitter
UPD 2013-06-30_11:59:26 982 www/frontend/index.html
UPD 2013-12-26_09:59:17 1060 www/frontend/index.html
UPD 2013-04-01_07:03:30 260475 www/frontend/lib/ext-4.2.0.663/ext-theme-gray-all.css
UPD 2013-12-07_02:00:26 1497654 www/frontend/lib/ext-4.2.0.663/ext-all.js
UPD 2013-04-01_07:03:33 1981 www/frontend/lib/ext-4.2.0.663/images/tools/tools-sprites-trans.gif
@ -258,6 +258,7 @@ UPD 2013-04-01_07:03:33 856 www/frontend/lib/ext-4.2.0.663/images/util/splitter/
UPD 2013-04-01_07:51:34 1482 www/frontend/lib/ext-4.2.0.663/license.txt
UPD 2013-04-26_05:06:43 440 www/frontend/README.txt
UPD 2013-04-01_07:05:33 613 www/frontend/app/userconfig.js
UPD 2013-12-27_02:57:42 468 www/frontend/app/filelogcharts.js
UPD 2013-04-01_08:00:32 2104 www/frontend/app/resources/loading.png
UPD 2013-04-03_07:27:17 781 www/frontend/app/resources/icons/accept.png
UPD 2013-03-02_01:53:05 626 www/frontend/app/resources/icons/readme.txt
@ -275,11 +276,11 @@ UPD 2013-06-30_11:47:12 101 www/frontend/app/resources/application.css
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-07-07_12:12:08 16201 www/frontend/app/view/DevicePanel.js
UPD 2013-11-15_03:17:04 9893 www/frontend/app/view/Viewport.js
UPD 2013-12-07_01:40:04 10257 www/frontend/app/view/TableDataGridPanel.js
UPD 2013-12-07_12:47:24 29654 www/frontend/app/view/LineChartPanel.js
UPD 2013-12-07_01:59:34 95479 www/frontend/app/controller/ChartController.js
UPD 2013-12-07_02:17:55 18670 www/frontend/app/controller/MainController.js
UPD 2013-12-26_08:39:37 10257 www/frontend/app/view/TableDataGridPanel.js
UPD 2013-12-26_08:39:37 31894 www/frontend/app/view/LineChartPanel.js
UPD 2013-12-27_01:39:11 9980 www/frontend/app/view/Viewport.js
UPD 2013-12-27_03:20:41 19171 www/frontend/app/controller/MainController.js
UPD 2013-12-27_03:21:01 106581 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

348
fhem/www/frontend/www/frontend/app/controller/ChartController.js
View File

@ -133,15 +133,19 @@ Ext.define('FHEM.controller.ChartController', {
*/
dataSourceChanged: function(radio, newval, oldval) {
var selection;
if (radio.getChecked()[0]) {
selection = radio.getChecked()[0].inputValue;
} else {
selection = "dblog";
}
var me = this,
devicecombo = radio.up().down('combobox[name=devicecombo]'),
readingscombo = radio.up().down("combobox[name=yaxiscombo]"),
selection = radio.getChecked()[0].inputValue;
readingscombo = radio.up().down("combobox[name=yaxiscombo]");
if (selection === "filelog") {
// disable save button and statistics for the moment
this.getSavechartdatabtn().setDisabled(true);
// disable statistics for the moment
radio.up().down("combobox[name=yaxisstatisticscombo]").setDisabled(true);
// Getting the FileLog Names to show them in Device-Combo
@ -156,39 +160,26 @@ Ext.define('FHEM.controller.ChartController', {
devicecombo.setValue("");
devicecombo.getStore().removeAll();
var localstore = Ext.create('Ext.data.Store', {
model: 'FHEM.model.DeviceModel',
data: fileLogNames
});
devicecombo.getStore().add(fileLogNames);
devicecombo.queryMode = 'local';
// bind the new one
devicecombo.bindStore(localstore);
devicecombo.on("select", me.fileLogSelected);
readingscombo.setValue();
readingscombo.getStore().removeAll();
} else {
// enable save button and statistics
this.getSavechartdatabtn().setDisabled(false);
// enable statistics
radio.up().down("combobox[name=yaxisstatisticscombo]").setDisabled(false);
devicecombo.setValue();
devicecombo.getStore().removeAll();
var lcp = Ext.ComponentQuery.query("linechartpanel")[0];
// bind the new one
devicecombo.bindStore(lcp.devicestore);
// unregister listener
devicecombo.un("select", me.fileLogSelected);
devicecombo.queryMode = 'remote';
devicecombo.getStore().load();
readingscombo.setValue();
readingscombo.getStore().removeAll();
// bind the new one
readingscombo.bindStore(readingscombo.ajaxStore);
readingscombo.queryMode = 'remote';
}
},
@ -218,6 +209,13 @@ Ext.define('FHEM.controller.ChartController', {
starttime = Ext.Date.add(date, Ext.Date.HOUR, -24);
starttime = Ext.Date.format(starttime, 'Y-m-d_H:i:s');
// logfiles can have absolute or relative pathes...
if (Ext.String.startsWith(currentlogfile, "/") === true) {
// we need to get out of the relative fhem directory,
// as the get command wont support absolute pathes by default...
currentlogfile = "../../../../../../../../" + currentlogfile;
}
Ext.Ajax.request({
method: 'GET',
disableCaching: false,
@ -229,17 +227,15 @@ Ext.define('FHEM.controller.ChartController', {
keyArray = [];
Ext.each(responseArr, function(row) {
// the first column is always the timestamp, followed by device and key:value
var keyindex = row.split(": ")[0].split(" ").length - 1,
key = row.split(": ")[0].split(" ")[keyindex];
if (key) {
// filling keyarray for combo
if (!Ext.Array.contains(keyArray, key)) {
keyArray.push(key);
}
// the first column is always the timestamp, followed by device and multiple key:value
var splitArr = row.split(" ");
Ext.each(splitArr, function(key) {
if (key.lastIndexOf(":") + 1 === key.length &&
!Ext.Array.contains(keyArray, key.replace(":", ""))) {
keyArray.push(key.replace(":", ""));
}
});
});
Ext.Array.sort(keyArray);
Ext.each(keyArray, function(key) {
@ -249,24 +245,32 @@ Ext.define('FHEM.controller.ChartController', {
//reconfigure readings store
if (keyObjArray.length > 0) {
var localstore = Ext.create('Ext.data.Store', {
model: 'FHEM.model.ReadingsModel',
data: keyObjArray,
autoLoad: true
});
readingscombo.ajaxStore = readingscombo.getStore();
// bind the new one
readingscombo.bindStore(localstore);
readingscombo.getStore().add(keyObjArray);
readingscombo.queryMode = 'local';
} else {
Ext.Msg.alert("Error", "No Readings found in the last 24 hours for this Logfile!");
Ext.create('Ext.window.Window', {
width: 400,
height: 400,
autoScroll: true,
title: 'Error',
html: "No Readings found in the last 24 hours for this Logfile! The used Command was: <br>" +
"get Logfile " + currentlogfile + " - " + starttime + " " + endtime + "<br>" +
"The Response was: <br><div>" + response.responseText + "</div>"
}).show();
}
readingscombo.setLoading(false);
} else {
readingscombo.setLoading(false);
Ext.Msg.alert("Error", "No Readings found in the last 24 hours for this Logfile!");
Ext.create('Ext.window.Window', {
width: 400,
height: 400,
autoScroll: true,
title: 'Error',
html: "Could get no data for the requested Logfile! The used Command was: <br>" +
"get Logfile " + currentlogfile + " - " + starttime + " " + endtime + "<br>" +
"The Response was: <br><div>" + response.responseText + "</div>"
}).show();
}
}
});
@ -398,6 +402,26 @@ Ext.define('FHEM.controller.ChartController', {
dbstarttime = Ext.Date.format(starttime, 'Y-m-d_H:i:s');
endtime = Ext.Date.add(date, Ext.Date.HOUR, 1);
dbendtime = Ext.Date.format(endtime, 'Y-m-d_H:i:s');
} else if (box.inputValue === "lasthour") {
endtime = date;
starttime = Ext.Date.add(date, Ext.Date.HOUR, -1);
dbstarttime = Ext.Date.format(starttime, 'Y-m-d_H:i:s');
dbendtime = Ext.Date.format(endtime, 'Y-m-d_H:i:s');
} else if (box.inputValue === "last24h") {
endtime = date;
starttime = Ext.Date.add(date, Ext.Date.HOUR, -24);
dbstarttime = Ext.Date.format(starttime, 'Y-m-d_H:i:s');
dbendtime = Ext.Date.format(endtime, 'Y-m-d_H:i:s');
} else if (box.inputValue === "last7days") {
endtime = date;
starttime = Ext.Date.add(date, Ext.Date.DAY, -7);
dbstarttime = Ext.Date.format(starttime, 'Y-m-d_H:i:s');
dbendtime = Ext.Date.format(endtime, 'Y-m-d_H:i:s');
} else if (box.inputValue === "lastmonth") {
endtime = date;
starttime = Ext.Date.add(date, Ext.Date.DAY, -30);
dbstarttime = Ext.Date.format(starttime, 'Y-m-d_H:i:s');
dbendtime = Ext.Date.format(endtime, 'Y-m-d_H:i:s');
} else {
Ext.Msg.alert("Error", "Could not setup the dynamic time.");
}
@ -553,14 +577,7 @@ Ext.define('FHEM.controller.ChartController', {
position : 'left',
fields : [],
title : '',
grid : {
odd : {
opacity : 1,
fill : '#ddd',
stroke : '#bbb',
'stroke-width' : 0.5
}
}
grid : true
},
{
type : 'Numeric',
@ -575,7 +592,8 @@ Ext.define('FHEM.controller.ChartController', {
position : 'bottom',
fields : [ 'TIMESTAMP' ],
dateFormat : "Y-m-d H:i:s",
title : 'Time'
title : 'Time',
grid: true
}
],
animate: false,
@ -583,6 +601,35 @@ Ext.define('FHEM.controller.ChartController', {
store: store,
enableMask: true,
mask: true,//'vertical',//true, //'horizontal',
gradients: [{
id: 'gradientId',
angle: 90,
stops: {
0: {
color: '#FF0000'
},
50: {
color: '#FFFF00'
},
100: {
color: '#079400'
}
}
}, {
id: 'gradientId2',
angle: 0,
stops: {
0: {
color: '#590'
},
20: {
color: '#599'
},
100: {
color: '#ddd'
}
}
}],
listeners: {
mousedown: function(evt) {
// fix for firefox, not dragging images
@ -792,9 +839,17 @@ Ext.define('FHEM.controller.ChartController', {
return false;
}
});
// logfiles can have absolute or relative pathes...
if (Ext.String.startsWith(currentlogfile, "/") === true) {
// we need to get out of the relative fhem directory,
// as the get command wont support absolute pathes by default...
currentlogfile = "../../../../../../../../" + currentlogfile;
}
url += '../../../fhem?cmd=get%20Logfile%20' +
currentlogfile + '%20-%20' + dbstarttime +
'%20' + dbendtime + '%201:' + yaxis + '.*::$fld[3]&XHR=1';
'%20' + dbendtime + '%204:' + yaxis + '.*::&XHR=1';
} else if (!Ext.isDefined(yaxisstatistics) || yaxisstatistics === "none" || Ext.isEmpty(yaxisstatistics)) {
url += '../../../fhem?cmd=get+' + FHEM.dblogname + '+-+webchart+' + dbstarttime + '+' + dbendtime + '+';
url +=device + '+timerange+' + "TIMESTAMP" + '+' + yaxis;
@ -1120,7 +1175,8 @@ Ext.define('FHEM.controller.ChartController', {
chart.axes.get(2).fromDate = starttime;
chart.axes.get(2).toDate = endtime;
chart.axes.get(2).setTitle(Ext.Date.format(starttime, 'Y-m-d H:i:s') + ' - ' + Ext.Date.format(endtime, 'Y-m-d H:i:s'));
chart.axes.get(2).displaySprite.attr.font = "14px Arial, Helvetica, sans-serif";
var timediffhrs = Ext.Date.getElapsed(chart.axes.get(2).fromDate, chart.axes.get(2).toDate) / 1000 / 3600;
@ -1211,19 +1267,26 @@ Ext.define('FHEM.controller.ChartController', {
title: title,
showInLegend: true,
smooth: 0,
highlight: true,
highlight: {
size: 5,
radius: 5
},
fill: fill,
style: {
fill: color,
// fill: 'url(#gradientId)',
opacity: 0.7,
stroke: '#808080',
'stroke-width': 2
},
markerConfig: {
type: 'circle',
size: 3,
radius: 3,
stroke: color
radius: 2,
stroke: color,
fill: color
},
showMarkers: true,
selectionTolerance: 5,
tips : {
trackMouse : true,
mouseOffset: [1,1],
@ -1306,6 +1369,7 @@ Ext.define('FHEM.controller.ChartController', {
*/
resetFormFields: function() {
this.getLinechartpanel().axiscounter = 0;
var fieldset = this.getChartformpanel().down('fieldset[name=axesfieldset]');
fieldset.removeAll();
this.getLinechartpanel().createNewYAxis();
@ -1386,6 +1450,7 @@ Ext.define('FHEM.controller.ChartController', {
savename = savename.replace(/\+/g, "_");
//getting the necessary values
var logtypes = Ext.ComponentQuery.query('radiogroup[name=datasourceradio]');
var devices = Ext.ComponentQuery.query('combobox[name=devicecombo]');
var yaxes = Ext.ComponentQuery.query('combobox[name=yaxiscombo]');
var yaxescolorcombos = Ext.ComponentQuery.query('combobox[name=yaxiscolorcombo]');
@ -1425,7 +1490,8 @@ Ext.define('FHEM.controller.ChartController', {
var i = 0;
Ext.each(devices, function(dev) {
var device = dev.getValue(),
var logtype = logtypes[i].getChecked()[0].inputValue,
device = dev.getValue(),
yaxis = yaxes[i].getValue(),
yaxiscolorcombo = yaxescolorcombos[i].getDisplayValue(),
yaxisfillcheck = yaxesfillchecks[i].checked,
@ -1443,6 +1509,7 @@ Ext.define('FHEM.controller.ChartController', {
if (i === 0) {
jsonConfig += '"y":"' + yaxis + '","device":"' + device + '",';
jsonConfig += '"logtype":"' + logtype + '",';
jsonConfig += '"yaxiscolorcombo":"' + yaxiscolorcombo + '","yaxisfillcheck":"' + yaxisfillcheck + '",';
jsonConfig += '"yaxisstepcheck":"' + yaxisstepcheck + '",';
jsonConfig += '"yaxisside":"' + axisside + '",';
@ -1453,7 +1520,8 @@ Ext.define('FHEM.controller.ChartController', {
jsonConfig += '"yaxisstatistics":"' + yaxisstatistics + '",';
}
} else {
var axisname = "y" + (i + 1) + "axis",
var logtypename = "y" + (i + 1) + "logtype",
axisname = "y" + (i + 1) + "axis",
devicename = "y" + (i + 1) + "device",
colorname = "y" + (i + 1) + "axiscolorcombo",
fillname = "y" + (i + 1) + "axisfillcheck",
@ -1462,6 +1530,7 @@ Ext.define('FHEM.controller.ChartController', {
statsname = "y" + (i + 1) + "axisstatistics";
jsonConfig += '"' + axisname + '":"' + yaxis + '","' + devicename + '":"' + device + '",';
jsonConfig += '"' + logtypename + '":"' + logtype + '",';
jsonConfig += '"' + colorname + '":"' + yaxiscolorcombo + '","' + fillname + '":"' + yaxisfillcheck + '",';
jsonConfig += '"' + stepname + '":"' + yaxisstepcheck + '",';
jsonConfig += '"' + sidename + '":"' + axisside + '",';
@ -1515,11 +1584,50 @@ Ext.define('FHEM.controller.ChartController', {
jsonConfig += '"starttime":"' + dbstarttime + '","endtime":"' + dbendtime + '"}';
var url = '../../../fhem?cmd=get+' + FHEM.dblogname + '+-+webchart+' + dbstarttime + '+' + dbendtime + '+';
url +=devices[0].getValue() + '+savechart+""+""+' + savename + '+' + jsonConfig + '&XHR=1';
chart.setLoading(true);
//decide if we save to db or to file
var filelogbool = false,
dblogbool = false;
Ext.each(logtypes, function(typeradio) {
if (typeradio.getChecked()[0].inputValue === "filelog") {
filelogbool = true;
} else {
dblogbool = true;
}
});
if (filelogbool === true && dblogbool === false) {
// create the current chart object
var chartobject = {},
hash = 0,
k,
char;
// generate hash from savename
for (k = 0, l = savename.length; k < l; k++) {
char = savename.charCodeAt(k);
hash = ((hash<<5)-hash)+char;
hash |= 0; // Convert to 32bit integer
}
chartobject.ID = hash;
chartobject.NAME = savename;
chartobject.TIMESTAMP = Ext.Date.format(new Date(), 'Y-m-d H:i:s');
chartobject.TYPE = "savedfilelogchart";
chartobject.VALUE = Ext.decode(jsonConfig);
// append the chartobject to the global FHEM.filelogcharts
FHEM.filelogcharts.push(chartobject);
me.updateFileLogCharts(true);
} else {
var url = '../../../fhem?cmd=get+' + FHEM.dblogname + '+-+webchart+' + dbstarttime + '+' + dbendtime + '+';
url +=devices[0].getValue() + '+savechart+""+""+' + savename + '+' + jsonConfig + '&XHR=1';
Ext.Ajax.request({
method: 'POST',
disableCaching: false,
@ -1546,10 +1654,63 @@ Ext.define('FHEM.controller.ChartController', {
}
});
}
}
}, this);
},
/**
* function used to update the filelogcharts by given cmd
*/
updateFileLogCharts: function(treeupdate) {
var me = this,
chart = me.getChart();
// preapre the string for the file
var finalstring = "FHEM.filelogcharts = " + Ext.encode(FHEM.filelogcharts) + ";;";
var cmd = "{ `echo '" + finalstring + "' > www/frontend/www/frontend/app/filelogcharts.js`}";
// var cmd = "{ `echo '" + finalstring + "' > www/frontenddev/app/filelogcharts.js`}";
Ext.Ajax.request({
method: 'POST',
disableCaching: false,
url: '../../../fhem?',
params: {
cmd: cmd,
XHR: 1
},
success: function(response){
if (chart) {
chart.setLoading(false);
}
if (treeupdate) {
me.getMaintreepanel().fireEvent("treeupdated");
}
if (response.status === 200) {
Ext.Msg.alert("Success", "Changes successfully saved!");
} else if (response.statusText) {
Ext.Msg.alert("Error", "The Changes could not be saved, error Message is:<br><br>" + response.statusText);
} else {
Ext.Msg.alert("Error", "The Changes could not be saved!");
}
},
failure: function(response) {
if (chart) {
chart.setLoading(false);
}
me.getMaintreepanel().setLoading(false);
if (response.statusText) {
Ext.Msg.alert("Error", "The Changes could not be saved, error Message is:<br><br>" + response.statusText);
} else {
Ext.Msg.alert("Error", "The Changes could not be saved!");
}
}
});
},
/**
* loading saved chart data and trigger the load of the chart
*/
@ -1558,7 +1719,8 @@ Ext.define('FHEM.controller.ChartController', {
record.raw.data = record.raw;
}
var me = this;
if (record.raw.data && record.raw.data.TYPE && record.raw.data.TYPE === "savedchart") {
if (record.raw.data && record.raw.data.TYPE &&
(record.raw.data.TYPE === "savedchart" || record.raw.data.TYPE === "savedfilelogchart" )) {
var name = record.raw.data.NAME,
chartdata = record.raw.data.VALUE;
@ -1598,6 +1760,7 @@ Ext.define('FHEM.controller.ChartController', {
yaxeslength++;
}
var logtypes = Ext.ComponentQuery.query('radiogroup[name=datasourceradio]');
var devices = Ext.ComponentQuery.query('combobox[name=devicecombo]');
var yaxes = Ext.ComponentQuery.query('combobox[name=yaxiscombo]');
var yaxescolorcombos = Ext.ComponentQuery.query('combobox[name=yaxiscolorcombo]');
@ -1605,10 +1768,14 @@ Ext.define('FHEM.controller.ChartController', {
var yaxesstepchecks = Ext.ComponentQuery.query('checkbox[name=yaxisstepcheck]');
var axissideradio = Ext.ComponentQuery.query('radiogroup[name=axisside]');
var yaxesstatistics = Ext.ComponentQuery.query('combobox[name=yaxisstatisticscombo]');
var logtypename;
var i = 0;
Ext.each(yaxes, function(yaxis) {
if (i === 0) {
logtypename = logtypes[i].getChecked()[0].name;
eval('logtypes[i].setValue({' + logtypename + ': "' + chartdata.logtype + '"})');
devices[i].setValue(chartdata.device);
yaxes[i].getStore().getProxy().url = url = '../../../fhem?cmd=get+' + FHEM.dblogname + '+-+webchart+""+""+' + chartdata.device + '+getreadings&XHR=1';
yaxes[i].setDisabled(false);
@ -1625,14 +1792,16 @@ Ext.define('FHEM.controller.ChartController', {
}
i++;
} else {
var axisdevice = "y" + (i + 1) + "device",
logtypename = logtypes[i].getChecked()[0].name,
logtype = "y" + (i + 1) + "logtype",
axisdevice = "y" + (i + 1) + "device",
axisname = "y" + (i + 1) + "axis",
axiscolorcombo = axisname + "colorcombo",
axisfillcheck = axisname + "fillcheck",
axisstepcheck = axisname + "stepcheck",
axisside = axisname + "side",
axisstatistics = axisname + "statistics";
eval('logtypes[i].setValue({' + logtypename + ' : chartdata.' + logtype + '})');
eval('devices[i].setValue(chartdata.' + axisdevice + ')');
yaxes[i].getStore().getProxy().url = '../../../fhem?cmd=get+' + FHEM.dblogname + '+-+webchart+""+""+' + eval('chartdata.' + axisdevice) + '+getreadings&XHR=1';
yaxes[i].setDisabled(false);
@ -1689,7 +1858,8 @@ Ext.define('FHEM.controller.ChartController', {
//convert time
var dynamicradio = Ext.ComponentQuery.query('radiogroup[name=dynamictime]')[0],
st = chartdata.starttime;
if (st === "year" || st === "month" || st === "week" || st === "day" || st === "hour") {
if (st === "year" || st === "month" || st === "week" || st === "day" || st === "hour" ||
st === "lasthour" || st === "last24h" || st === "last7days" || st === "lastmonth") {
dynamicradio.eachBox(function(box, idx) {
if (box.inputValue === st) {
box.setValue(true);
@ -1771,6 +1941,17 @@ Ext.define('FHEM.controller.ChartController', {
var url = '../../../fhem?cmd=get+' + FHEM.dblogname + '+-+webchart+""+""+""+renamechart+""+""+' + savename + '+' + chartid + '&XHR=1';
if (menu.record.raw.data.TYPE === "savedfilelogchart") {
if (Ext.Array.contains(FHEM.filelogcharts, menu.record.raw.data) === true) {
Ext.Array.remove(FHEM.filelogcharts, menu.record.raw.data);
var newRec = menu.record.raw.data;
newRec.NAME = savename;
FHEM.filelogcharts.push(newRec);
me.updateFileLogCharts(true);
}
} else {
Ext.Ajax.request({
method: 'GET',
disableCaching: false,
@ -1794,7 +1975,7 @@ Ext.define('FHEM.controller.ChartController', {
}
}
});
}
}
});
},
@ -1825,6 +2006,14 @@ Ext.define('FHEM.controller.ChartController', {
var url = '../../../fhem?cmd=get+' + FHEM.dblogname + '+-+webchart+""+""+""+deletechart+""+""+' + chartid + '&XHR=1';
if (menu.record.raw.data.TYPE === "savedfilelogchart") {
if (Ext.Array.contains(FHEM.filelogcharts, menu.record.raw.data) === true) {
Ext.Array.remove(FHEM.filelogcharts, menu.record.raw.data);
me.updateFileLogCharts(true);
btn.up().up().destroy();
}
} else {
Ext.Ajax.request({
method: 'GET',
disableCaching: false,
@ -1860,6 +2049,8 @@ Ext.define('FHEM.controller.ChartController', {
}
});
}
}
},
{
text: "Cancel",
@ -1999,14 +2190,19 @@ Ext.define('FHEM.controller.ChartController', {
* handling the moving of nodes in tree, saving new position of saved charts in db
*/
movenodeintree: function(treeview, action, collidatingrecord) {
var unsorted = Ext.ComponentQuery.query('treepanel button[name=unsortedtree]')[0].pressed;
var me = this,
unsorted = Ext.ComponentQuery.query('treepanel button[name=unsortedtree]')[0].pressed;
//only save orders when in sorted mode
if (!unsorted) {
Ext.ComponentQuery.query('treepanel')[0].setLoading(true);
var rec = action.records[0],
id = rec.raw.data.ID;
if (rec.raw.data && rec.raw.data.ID && rec.raw.data.TYPE === "savedchart" && !rec.raw.data.template) {
if (rec.raw.data && rec.raw.data.ID &&
(rec.raw.data.TYPE === "savedchart" || rec.raw.data.TYPE === "savedfilelogchart") &&
!rec.raw.data.template) {
var rootNode = this.getMaintreepanel().getRootNode();
rootNode.cascadeBy(function(node) {
if (node.raw && node.raw.data && node.raw.data.ID && node.raw.data.ID === id) {
@ -2024,11 +2220,26 @@ Ext.define('FHEM.controller.ChartController', {
var encodedchartconfig = Ext.encode(chartconfig),
url = '../../../fhem?cmd=get+' + FHEM.dblogname + '+-+webchart+""+""+""+updatechart+""+""+' + chartid + '+' + encodedchartconfig + '&XHR=1';
// check for filelog or dblog
if (node.raw.data.TYPE === "savedfilelogchart") {
if (Ext.Array.contains(FHEM.filelogcharts, rec.raw.data) === true) {
Ext.Array.remove(FHEM.filelogcharts, rec.raw.data);
var newRec = rec.raw.data;
newRec.parentFolder = ownerfolder;
newRec.treeIndex = index;
FHEM.filelogcharts.push(newRec);
//
me.updateFileLogCharts();
}
} else {
Ext.Ajax.request({
method: 'GET',
disableCaching: false,
url: url,
success: function(response){
Ext.ComponentQuery.query('treepanel')[0].setLoading(false);
var json = Ext.decode(response.responseText);
if (json && json.success === "true" || json.data && json.data.length === 0) {
//be quiet
@ -2039,6 +2250,7 @@ Ext.define('FHEM.controller.ChartController', {
}
},
failure: function() {
Ext.ComponentQuery.query('treepanel')[0].setLoading(false);
if (json && json.msg) {
Ext.Msg.alert("Error", "The new position could not be saved, error Message is:<br><br>" + json.msg);
} else {
@ -2047,12 +2259,12 @@ Ext.define('FHEM.controller.ChartController', {
}
});
}
}
});
}
});
}
}
Ext.ComponentQuery.query('treepanel')[0].setLoading(false);
}
});

13
fhem/www/frontend/www/frontend/app/controller/MainController.js
View File

@ -95,7 +95,7 @@ Ext.define('FHEM.controller.MainController', {
if (Ext.isDefined(FHEM.version)) {
var sp = this.getStatustextfield();
sp.setText(FHEM.version + "; Frontend Version: 1.0.3 - 2013-12-07");
sp.setText(FHEM.version + "; Frontend Version: 1.0.4 - 2013-12-27");
}
this.setupTree(false);
@ -155,7 +155,11 @@ Ext.define('FHEM.controller.MainController', {
//create roomfolder
var roomfolder;
if (room !== "hidden") {
if (room === "Unsorted") {
roomfolder = {text: room, leaf: false, expanded: false, children: []};
} else {
roomfolder = {text: room, leaf: false, expanded: true, children: []};
}
roomfolder.children.push(subnode);
root.appendChild(roomfolder);
}
@ -192,6 +196,11 @@ Ext.define('FHEM.controller.MainController', {
rootNode.appendChild(chartfolder);
var chartfoldernode = rootNode.findChild("text", "Charts", true);
//add the filelogcharts to the store
if (FHEM.filelogcharts) {
store.add(FHEM.filelogcharts);
}
store.each(function(rec) {
var chartchild,
unsortedMode = Ext.ComponentQuery.query('button[name=unsortedtree]')[0].pressed;
@ -439,7 +448,7 @@ Ext.define('FHEM.controller.MainController', {
if (rec.raw.data.template === true || rec.get('leaf') === true &&
rec.raw.data &&
rec.raw.data.TYPE &&
rec.raw.data.TYPE === "savedchart") {
(rec.raw.data.TYPE === "savedchart" || rec.raw.data.TYPE === "savedfilelogchart")) {
this.showLineChartPanel();
} else {
this.showDevicePanel(treeview, rec);

1
fhem/www/frontend/www/frontend/app/filelogcharts.js Executable file
View File

@ -0,0 +1 @@
FHEM.filelogcharts = [];

73
fhem/www/frontend/www/frontend/app/view/LineChartPanel.js
View File

@ -91,7 +91,7 @@ Ext.define('FHEM.view.LineChartPanel', {
var chartSettingPanel = Ext.create('Ext.form.Panel', {
title: 'Chart Settings - Click me to edit',
name: 'chartformpanel',
maxHeight: 325,
maxHeight: 345,
autoScroll: true,
collapsible: true,
titleCollapse: true,
@ -99,7 +99,6 @@ Ext.define('FHEM.view.LineChartPanel', {
items: [
{
xtype: 'fieldset',
layout: 'column',
title: 'Select data',
name: 'axesfieldset',
defaults: {
@ -109,18 +108,29 @@ Ext.define('FHEM.view.LineChartPanel', {
},
{
xtype: 'fieldset',
layout: 'column',
layout: 'vbox',
autoScroll: true,
title: 'Select Timerange',
defaults: {
margin: '0 0 0 10'
},
items: [
{
xtype: 'fieldset',
layout: 'hbox',
autoScroll: true,
border: false,
defaults: {
margin: '0 0 0 10'
},
items: [
{
xtype: 'radiofield',
fieldLabel: 'Timerange',
labelWidth: 60,
name: 'rb',
checked: true,
checked: false,
allowBlank: true,
inputValue: 'timerange',
listeners: {
change: function(rb, newval, oldval) {
@ -140,7 +150,8 @@ Ext.define('FHEM.view.LineChartPanel', {
format: 'Y-m-d H:i:s',
fieldLabel: 'Starttime',
allowBlank: false,
labelWidth: 70
labelWidth: 70,
value: Ext.Date.add(new Date(), Ext.Date.DAY, -1)
},
{
xtype: 'datefield',
@ -148,25 +159,42 @@ Ext.define('FHEM.view.LineChartPanel', {
format: 'Y-m-d H:i:s',
fieldLabel: 'Endtime',
allowBlank: false,
labelWidth: 70
labelWidth: 70,
value: new Date()
}
]
},
{
xtype: 'fieldset',
layout: 'hbox',
autoScroll: true,
border: false,
defaults: {
margin: '0 0 0 10'
},
items: [
{
xtype: 'radiogroup',
name: 'dynamictime',
fieldLabel: 'or select a dynamic time',
labelWidth: 140,
width: 900,
allowBlank: true,
defaults: {
labelWidth: 42,
padding: "0 25px 0 0",
checked: false
padding: "0px 0px 0px 18px"
},
items: [
{ fieldLabel: 'yearly', name: 'rb', inputValue: 'year' },
{ fieldLabel: 'monthly', name: 'rb', inputValue: 'month' },
{ fieldLabel: 'weekly', name: 'rb', inputValue: 'week' },
{ fieldLabel: 'daily', name: 'rb', inputValue: 'day' },
{ fieldLabel: 'hourly', name: 'rb', inputValue: 'hour' }
{ fieldLabel: 'yearly', name: 'rb', inputValue: 'year', labelWidth: 38 },
{ fieldLabel: 'monthly', name: 'rb', inputValue: 'month', labelWidth: 44 },
{ fieldLabel: 'weekly', name: 'rb', inputValue: 'week', labelWidth: 40 },
{ fieldLabel: 'daily', name: 'rb', inputValue: 'day', checked: true, labelWidth: 31 },
{ fieldLabel: 'hourly', name: 'rb', inputValue: 'hour', labelWidth: 38 },
{ fieldLabel: 'last hour', name: 'rb', inputValue: 'lasthour', labelWidth: 50 },
{ fieldLabel: 'last 24h', name: 'rb', inputValue: 'last24h', labelWidth: 48 },
{ fieldLabel: 'last 7 days', name: 'rb', inputValue: 'last7days', labelWidth: 65 },
{ fieldLabel: 'last month', name: 'rb', inputValue: 'lastmonth', labelWidth: 65 }
]
}
]
}
]
@ -174,7 +202,8 @@ Ext.define('FHEM.view.LineChartPanel', {
{
xtype: 'fieldset',
layout: 'column',
layout: 'hbox',
autoScroll: true,
title: 'Axis Configuration',
defaults: {
margin: '0 0 0 10'
@ -186,6 +215,7 @@ Ext.define('FHEM.view.LineChartPanel', {
fieldLabel: 'Left Axis Scalerange',
labelWidth: 120,
allowBlank: true,
width: 310,
defaults: {
labelWidth: 55,
padding: "0 25px 0 0",
@ -230,6 +260,7 @@ Ext.define('FHEM.view.LineChartPanel', {
name: 'rightaxisconfiguration',
fieldLabel: 'Right Axis Scalerange',
labelWidth: 130,
width: 310,
allowBlank: true,
defaults: {
labelWidth: 55,
@ -274,7 +305,8 @@ Ext.define('FHEM.view.LineChartPanel', {
},
{
xtype: 'fieldset',
layout: 'column',
layout: 'hbox',
autoScroll: true,
title: 'Axis Title Configuration',
defaults: {
margin: '0 0 5 10'
@ -300,7 +332,8 @@ Ext.define('FHEM.view.LineChartPanel', {
},
{
xtype: 'fieldset',
layout: 'column',
layout: 'hbox',
autoScroll: true,
defaults: {
margin: '10 10 10 10'
},
@ -421,7 +454,8 @@ Ext.define('FHEM.view.LineChartPanel', {
{
xtype: 'fieldset',
name: 'singlerowfieldset',
layout: 'column',
layout: 'hbox',
autoScroll: true,
defaults: {
margin: '5 5 5 0'
},
@ -616,7 +650,8 @@ Ext.define('FHEM.view.LineChartPanel', {
{
xtype: 'fieldset',
name: 'baselineowfieldset',
layout: 'column',
layout: 'hbox',
autoScroll: true,
defaults: {
margin: '5 5 5 0'
},

2
fhem/www/frontend/www/frontend/app/view/TableDataGridPanel.js
View File

@ -48,7 +48,7 @@ Ext.define('FHEM.view.TableDataGridPanel', {
{
xtype: 'fieldset',
title: 'Configure Database Query',
maxHeight: 150,
maxHeight: 165,
items: [
{
xtype: 'fieldset',

3
fhem/www/frontend/www/frontend/app/view/Viewport.js
View File

@ -151,7 +151,8 @@ Ext.define('FHEM.view.Viewport', {
'itemcontextmenu': function(scope, rec, item, index, e, eOpts) {
e.preventDefault();
if (rec.raw.data.TYPE && rec.raw.data.TYPE === "savedchart") {
if (rec.raw.data.TYPE &&
(rec.raw.data.TYPE === "savedchart" || rec.raw.data.TYPE === "savedfilelogchart")) {
var menu = Ext.ComponentQuery.query('menu[id=treecontextmenu]')[0];
if (menu) {
menu.destroy();

1
fhem/www/frontend/www/frontend/index.html
View File

@ -23,6 +23,7 @@
<link rel="stylesheet" type="text/css" href="app/resources/application.css" />
<script type="text/javascript" src="lib/ext-4.2.0.663/ext-all.js"></script>
<script type="text/javascript" src="app/userconfig.js"></script>
<script type="text/javascript" src="app/filelogcharts.js"></script>
<script type="text/javascript" src="app/app.js"></script>
</head>