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

fix for devices ini multiple rooms

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@4301 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
johannnes 2013-11-30 15:38:28 +00:00
parent fbadfd8ca6
commit 8ef5ea1006
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -279,7 +279,7 @@ UPD 2013-11-15_03:17:04 9893 www/frontend/app/view/Viewport.js
UPD 2013-11-22_05:34:29 10042 www/frontend/app/view/TableDataGridPanel.js
UPD 2013-11-22_05:34:29 28202 www/frontend/app/view/LineChartPanel.js
UPD 2013-11-15_04:48:21 87082 www/frontend/app/controller/ChartController.js
UPD 2013-11-22_05:43:24 18375 www/frontend/app/controller/MainController.js
UPD 2013-11-30_04:29:42 18670 www/frontend/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

34
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.1 - 2013-11-22");
sp.setText(FHEM.version + "; Frontend Version: 1.0.2 - 2013-11-30");
}
this.setupTree(false);
@ -145,21 +145,25 @@ Ext.define('FHEM.controller.MainController', {
if (result.devices && result.devices.length > 0) {
Ext.each(result.devices, function(device) {
if (device.ATTR && device.ATTR.room) {
//check if room exists
var resultnode = root.findChild("text", device.ATTR.room, true),
subnode = {text: device.NAME, leaf: true, data: device};
if (!resultnode) {
//create roomfolder
var roomfolder;
if (device.ATTR.room !== "hidden") {
roomfolder = {text: device.ATTR.room, leaf: false, expanded: true, children: []};
roomfolder.children.push(subnode);
root.appendChild(roomfolder);
//first we check if we have comma separated multiple rooms
var roomArray = device.ATTR.room.split(",");
Ext.each(roomArray, function(room) {
//check if room exists
var resultnode = root.findChild("text", room, true),
subnode = {text: device.NAME, leaf: true, data: device};
if (!resultnode) {
//create roomfolder
var roomfolder;
if (room !== "hidden") {
roomfolder = {text: room, leaf: false, expanded: true, children: []};
roomfolder.children.push(subnode);
root.appendChild(roomfolder);
}
} else {
resultnode.appendChild(subnode);
root.appendChild(resultnode);
}
} else {
resultnode.appendChild(subnode);
root.appendChild(resultnode);
}
});
}
}, this);
} else {