';
if ($name && defined($defs{$name})) {
- my $showfullsize = AttrVal($defs{$name}{NAME}, "dashboard_showfullsize", 0);
+ my $showfullsize = AttrVal($name, "dashboard_showfullsize", 0);
if ($showfullsize) {
if ($FW_RET =~ m/]*class="([^"]+)"[^>]*>/) {
@@ -346,7 +351,7 @@ sub Dashboard_CGI($) {
}
$ret .= Dashboard_SummaryFN($FW_wname,$name,$FW_room,undef);
} else {
- $ret .= 'Dashboard "' . $name . '" not found';
+ $ret .= 'Dashboard "'.$name.'" not found';
}
$ret .= '
';
@@ -367,7 +372,8 @@ sub DashboardAsHtml($) {
}
#############################################################################################
-# SummaryFn
+# zentrale Dashboard Generierung
+# (beachte $data{FWEXT} bzw. $data{FWEXT}{CONTENTFUNC} in 01_FHEMWEB.pm)
#############################################################################################
sub Dashboard_SummaryFN ($$$$) {
my ($FW_wname, $d, $room, $pageHash) = @_;
@@ -413,11 +419,11 @@ sub Dashboard_SummaryFN ($$$$) {
return "";
}
- if ($debug == 1) { $debugfield = "edit"; }
+ if ($debug == 1) { $debugfield = "edit"; }
if ($showtabs eq "tabs-and-buttonbar-at-the-top") { $showbuttonbar = "top"; }
if ($showtabs eq "tabs-and-buttonbar-on-the-bottom") { $showbuttonbar = "bottom"; }
- if ($showbuttonbar eq "hidden") { $lockstate = "lock"; }
- if ($activetab > $tabcount) { $activetab = $tabcount; }
+ if ($showbuttonbar eq "hidden") { $lockstate = "lock"; }
+ if ($activetab > $tabcount) { $activetab = $tabcount; }
$colwidth =~ tr/,/:/;
if (not ($colheight =~ /^\d+$/)) { $colheight = 400; }
@@ -434,29 +440,29 @@ sub Dashboard_SummaryFN ($$$$) {
if ($room ne "all") {
############################ Set FHEM url to avoid hardcoding it in javascript ############################
- $ret .= "";
+ $ret .= "";
$ret .= "\n";
+ $ret .= " \n";
########################### Dashboard Tab-Liste ##############################################
$ret .= " \n";
@@ -503,21 +509,22 @@ return $ret;
# Dashboard Tabs erstellen
#############################################################################################
sub Dashboard_BuildDashboardTab ($$) {
- my ($t, $d) = @_;
+ my ($t, $name) = @_;
+ my $hash = $defs{$name};
- my $id = $defs{$d}{NR};
- my $colcount = AttrVal($defs{$d}{NAME}, 'dashboard_tab' . ($t + 1) . 'colcount', AttrVal($defs{$d}{NAME}, "dashboard_colcount", 1));
- my $colwidths = AttrVal($defs{$d}{NAME}, 'dashboard_tab' . ($t + 1) . 'rowcentercolwidth', AttrVal($defs{$d}{NAME}, "dashboard_rowcentercolwidth", 100));
+ my $id = $hash->{NR};
+ my $colcount = AttrVal($name, 'dashboard_tab'.($t + 1).'colcount', AttrVal($name, "dashboard_colcount", 1));
+ my $colwidths = AttrVal($name, 'dashboard_tab'.($t + 1).'rowcentercolwidth', AttrVal($name, "dashboard_rowcentercolwidth", 100));
$colwidths =~ tr/,/:/;
- my $backgroundimage = AttrVal($defs{$d}{NAME}, 'dashboard_tab' . ($t + 1) . 'backgroundimage', "");
- my $row = AttrVal($defs{$d}{NAME}, "dashboard_row", "center");
- my $tabcount = Dashboard_GetTabCount($defs{$d}, 1);
- my $tabgroups = AttrVal($defs{$d}{NAME}, "dashboard_tab" . ($t + 1) . "groups", "");
- my $tabsortings = AttrVal($defs{$d}{NAME}, "dashboard_tab" . ($t + 1) . "sorting", "");
- my $tabdevicegroups = AttrVal($defs{$d}{NAME}, "dashboard_tab" . ($t + 1) . "devices", "");
+ my $backgroundimage = AttrVal($name, 'dashboard_tab'.($t + 1).'backgroundimage', "");
+ my $row = AttrVal($name, "dashboard_row", "center");
+ my $tabgroups = AttrVal($name, "dashboard_tab".($t + 1)."groups", "");
+ my $tabsortings = AttrVal($name, "dashboard_tab".($t + 1)."sorting", "");
+ my $tabdevicegroups = AttrVal($name, "dashboard_tab".($t + 1)."devices", "");
+ my $tabcount = Dashboard_GetTabCount($hash, 1);
unless ($tabgroups || $tabdevicegroups) {
- readingsSingleUpdate( $defs{$d}, "state", "No Groups or devices set", 0 );
+ readingsSingleUpdate($hash, "state", "No Groups or devices set", 0);
return "";
}
@@ -547,16 +554,16 @@ sub Dashboard_BuildDashboardTab ($$) {
my @index = grep { $groups[$_] eq $stabgroup[0] } (0 .. @groups-1);
if (@index == 0) {
- my $matchGroup = '^' . $stabgroup[0] . '$';
+ my $matchGroup = '^'.$stabgroup[0] . '$';
@index = grep { $groups[$_] =~ m/$matchGroup/ } (0 .. @groups-1);
}
if (@index > 0) {
for (my $j=0; $j<@index;$j++) {
my $groupname = @groups[$index[$j]];
- $groupname .= '$$$' . 'a:group=' . $groupname;
+ $groupname .= '$$$'.'a:group='.$groupname;
if (@stabgroup > 1) {
- $groupname .= '$$$' . $stabgroup[1];
+ $groupname .= '$$$'.$stabgroup[1];
}
push(@tabdevicegroups,$groupname);
}
@@ -568,7 +575,7 @@ sub Dashboard_BuildDashboardTab ($$) {
# add sortings for groups not already having a defined sorting
for (my $i=0;$i<@tabdevicegroups;$i++) {
my @stabgroup = split(/\$\$\$/, trim($tabdevicegroups[$i]));
- my $matchGroup = "," . quotemeta(trim($stabgroup[0])) . ",";
+ my $matchGroup = ",".quotemeta(trim($stabgroup[0])).",";
if ($tabsortings !~ m/$matchGroup/) {
$tabsortings = $tabsortings."t".$t."c".Dashboard_GetMaxColumnId($row,$colcount).",".trim($stabgroup[0]).",true,0,0:";
@@ -576,21 +583,22 @@ sub Dashboard_BuildDashboardTab ($$) {
}
my $ret = " \n";
- $ret .= " \n";
- $ret .= " \n";
+ $ret .= " \n";
+ $ret .= " \n";
+
##################### Top Row (only one Column) #############################################
if ($row eq "top-center-bottom" || $row eq "top-center" || $row eq "top"){
- $ret .= Dashboard_BuildDashboardTopRow($t,$id,$tabgroups,$tabsortings);
+ $ret .= Dashboard_BuildDashboardTopRow($name,$t,$id,$tabgroups,$tabsortings);
}
##################### Center Row (max. 5 Column) ############################################
if ($row eq "top-center-bottom" || $row eq "top-center" || $row eq "center-bottom" || $row eq "center") {
- $ret .= Dashboard_BuildDashboardCenterRow($t,$id,$tabgroups,$tabsortings,$colcount);
+ $ret .= Dashboard_BuildDashboardCenterRow($name,$t,$id,$tabgroups,$tabsortings,$colcount);
}
############################# Bottom Row (only one Column) ############################################
if ($row eq "top-center-bottom" || $row eq "center-bottom" || $row eq "bottom"){
- $ret .= Dashboard_BuildDashboardBottomRow($t,$id,$tabgroups,$tabsortings);
+ $ret .= Dashboard_BuildDashboardBottomRow($name,$t,$id,$tabgroups,$tabsortings);
}
- #############################################################################################
+
$ret .= " \n";
$ret .= " \n";
$ret .= " \n";
@@ -601,14 +609,14 @@ return $ret;
#############################################################################################
# Oberste Zeile erstellen
#############################################################################################
-sub Dashboard_BuildDashboardTopRow ($$$$) {
- my ($t,$id, $devicegroups, $groupsorting) = @_;
+sub Dashboard_BuildDashboardTopRow ($$$$$) {
+ my ($name,$t,$id, $devicegroups, $groupsorting) = @_;
my $ret;
$ret .= "\n";
$ret .= "\n";
$ret .= " \n";
- $ret .= Dashboard_BuildGroupWidgets($t,"100",$id,$devicegroups,$groupsorting);
+ $ret .= Dashboard_BuildGroupWidgets($name,$t,"100",$id,$devicegroups,$groupsorting);
$ret .= " \n";
$ret .= " | \n";
@@ -619,8 +627,8 @@ return $ret;
#############################################################################################
#
#############################################################################################
-sub Dashboard_BuildDashboardCenterRow ($$$$$) {
- my ($t,$id, $devicegroups, $groupsorting, $colcount) = @_;
+sub Dashboard_BuildDashboardCenterRow ($$$$$$) {
+ my ($name,$t,$id, $devicegroups, $groupsorting, $colcount) = @_;
my $ret = "\n";
$ret .= "\n";
@@ -639,7 +647,7 @@ sub Dashboard_BuildDashboardCenterRow ($$$$$) {
for (my $i=0;$i<$colcount;$i++){
$ret .= " \n";
- $ret .= Dashboard_BuildGroupWidgets($t,$i,$id,$devicegroups,$groupsorting);
+ $ret .= Dashboard_BuildGroupWidgets($name,$t,$i,$id,$devicegroups,$groupsorting);
$ret .= " \n";
}
$ret .= " | \n";
$ret .= "\n";
$ret .= " \n";
- $ret .= Dashboard_BuildGroupWidgets($t,"200",$id,$devicegroups,$groupsorting);
+ $ret .= Dashboard_BuildGroupWidgets($name,$t,"200",$id,$devicegroups,$groupsorting);
$ret .= " \n";
$ret .= " | \n";
@@ -668,13 +676,13 @@ return $ret;
#############################################################################################
#
#############################################################################################
-sub Dashboard_BuildGroupWidgets ($$$$$) {
- my ($tab,$column,$id,$devicegroups, $groupsorting) = @_;
+sub Dashboard_BuildGroupWidgets ($$$$$$) {
+ my ($name,$tab,$column,$id,$devicegroups,$groupsorting) = @_;
my $ret = "";
- my $counter = 0;
- my %sorting = ();
- my %groups = ();
+ my $counter = 0;
+ my %sorting = ();
+ my %groups = ();
my @groupnames = ();
foreach (split(":", $groupsorting)) {
@@ -707,7 +715,7 @@ sub Dashboard_BuildGroupWidgets ($$$$$) {
next if (index($sorting{$groupname}, 't'.$tab.'c'.$column) < 0);
my $groupId = $id."t".$tab."c".$column."w".$counter;
- $ret .= BuildGroup( ($groupname,$groupdevices,$sorting{$groupname},$groupId,$groupicon) );
+ $ret .= Dashboard_BuildGroup($name,$groupname,$groupdevices,$sorting{$groupname},$groupId,$groupicon);
$counter++;
}
@@ -752,33 +760,33 @@ return $ret;
#############################################################################################
#
#############################################################################################
-sub BuildGroup {
- my ($groupname,$devices,$sorting,$groupId,$icon) = @_;
- my $ret = "";
- my $row = 1;
- my %extPage = ();
+sub Dashboard_BuildGroup ($$$$$$) {
+ my ($name,$groupname,$devices,$sorting,$groupId,$icon) = @_;
+ my $row = 1;
+ my %extPage = ();
my $foundDevices = 0;
my $replaceGroup = "";
+ my $ret = "";
- my $rf = ($FW_room ? "&room=$FW_room" : ""); # stay in the room
-
- $ret .= " | |