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

reverting detection of devices back to database query

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@4264 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
johannnes 2013-11-22 16:48:11 +00:00
parent db47de6626
commit aa73ac8066
5 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -272,14 +272,14 @@ UPD 2013-03-02_01:53:05 524 www/frontend/app/resources/icons/resultset_last.png
UPD 2013-04-03_07:27:17 733 www/frontend/app/resources/icons/add.png
UPD 2013-04-03_07:27:17 389 www/frontend/app/resources/icons/resultset_previous.png
UPD 2013-06-30_11:47:12 101 www/frontend/app/resources/application.css
UPD 2013-11-15_04:48:20 2568 www/frontend/app/app.js
UPD 2013-11-15_04:48:21 27988 www/frontend/app/view/LineChartPanel.js
UPD 2013-11-22_05:34:28 2151 www/frontenddev/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-11-15_04:00:13 9828 www/frontend/app/view/TableDataGridPanel.js
UPD 2013-11-22_05:34:29 10042 www/frontenddev/app/view/TableDataGridPanel.js
UPD 2013-11-22_05:34:29 28202 www/frontenddev/app/view/LineChartPanel.js
UPD 2013-11-15_04:48:21 87082 www/frontend/app/controller/ChartController.js
UPD 2013-11-15_04:48:21 18373 www/frontend/app/controller/MainController.js
UPD 2013-11-22_05:43:24 18375 www/frontenddev/app/controller/MainController.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

8
fhem/www/frontend/www/frontend/app/app.js
View File

@ -37,20 +37,14 @@ Ext.application({
Ext.getBody().unmask();
FHEM.info = Ext.decode(response.responseText);
FHEM.version = FHEM.info.Results[0].devices[0].ATTR.version;
FHEM.dblogDevices = [];
Ext.each(FHEM.info.Results, function(result) {
//TODO: get more specific here...
if (result.list === "DbLog" && result.devices[0].NAME) {
FHEM.dblogname = result.devices[0].NAME;
Ext.each(result.devices, function(dblogdev) {
FHEM.dblogDevices.push({"DEVICE": dblogdev.REGEXP});
});
return false;
}
});
if (!FHEM.dblogname && Ext.isEmpty(FHEM.dblogname) && FHEM.dblogname != "undefined") {
Ext.Msg.alert("Error", "Could not find a DbLog Configuration. Do you have DbLog already running?");
} else if (FHEM.dblogDevices.length === 0) {
Ext.Msg.alert("Error", "Could not find any DbLog-FHEM-devices, do you have setup DbLog correctly?");
} else {
Ext.create("FHEM.view.Viewport", {
hidden: true

2
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 - 2013-11-15");
sp.setText(FHEM.version + "; Frontend Version: 1.0.1 - 2013-11-22");
}
this.setupTree(false);

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

@ -74,11 +74,15 @@ Ext.define('FHEM.view.LineChartPanel', {
var me = this;
me.devicestore = Ext.create('FHEM.store.DeviceStore', {
data: FHEM.dblogDevices,
proxy: {
type: 'memory',
type: 'ajax',
noCache: false,
method: 'POST',
url: '../../../fhem?cmd=get+' + FHEM.dblogname + '+-+webchart+""+""+""+getdevices&XHR=1',
reader: {
type: 'json'
type: 'json',
root: 'data',
totalProperty: 'totalCount'
}
},
autoLoad: true

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

@ -22,11 +22,15 @@ Ext.define('FHEM.view.TableDataGridPanel', {
me.tablestore = Ext.create('FHEM.store.TableDataStore');
me.devicestore = Ext.create('FHEM.store.DeviceStore', {
data: FHEM.dblogDevices,
proxy: {
type: 'memory',
type: 'ajax',
noCache: false,
method: 'POST',
url: '../../../fhem?cmd=get+' + FHEM.dblogname + '+-+webchart+""+""+""+getdevices&XHR=1',
reader: {
type: 'json'
type: 'json',
root: 'data',
totalProperty: 'totalCount'
}
},
autoLoad: true