Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

FHEMWEB: FW_groupList added (from svenson08), forum #20564

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@5838 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2014-05-12 21:40:48 +00:00
parent eff11992ac
commit d9db272c23
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
FHEM/01_FHEMWEB.pm
View File

@ -93,6 +93,7 @@ my %FW_icons; # List of icons
my @FW_iconDirs; # Directory search order for icons my @FW_iconDirs; # Directory search order for icons
my $FW_RETTYPE; # image/png or the like my $FW_RETTYPE; # image/png or the like
my %FW_rooms; # hash of all rooms my %FW_rooms; # hash of all rooms
my %FW_groups; # hash of all groups
my %FW_types; # device types, for sorting my %FW_types; # device types, for sorting
my %FW_hiddengroup;# hash of hidden groups my %FW_hiddengroup;# hash of hidden groups
my $FW_inform; my $FW_inform;
@ -778,6 +779,16 @@ FW_updateHashes()
} }
} }
#################
# Make a group hash
%FW_groups = ();
foreach my $d (keys %defs ) {
next if(IsIgnored($d));
foreach my $r (split(",", AttrVal($d, "group", ""))) {
$FW_groups{$r}{$d} = 1;
}
}
############### ###############
# Needed for type sorting # Needed for type sorting
%FW_types = (); %FW_types = ();
@ -953,7 +964,10 @@ FW_doDetail($)
my $attrList = getAllAttr($d); my $attrList = getAllAttr($d);
my $roomList = "multiple,".join(",", my $roomList = "multiple,".join(",",
sort map { $_ =~ s/ /#/g ;$_} keys %FW_rooms); sort map { $_ =~ s/ /#/g ;$_} keys %FW_rooms);
my $groupList = "multiple,".join(",",
sort map { $_ =~ s/ /#/g ;$_} keys %FW_groups);
$attrList =~ s/room /room:$roomList /; $attrList =~ s/room /room:$roomList /;
$attrList =~ s/group /group:$groupList /;
$attrList = FW_widgetOverride($d, $attrList); $attrList = FW_widgetOverride($d, $attrList);
FW_makeSelect($d, "attr", $attrList,"attr"); FW_makeSelect($d, "attr", $attrList,"attr");