Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-01 20:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

95_Dashboard: V3.10.1, added FW_hideDisplayName, Forum #88727

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@16920 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2018-06-29 12:01:56 +00:00
parent 66698bd508
commit 2b20713e2b
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it. # Do not insert empty lines here, update check depends on it.
- change: 95_Dashboard: V3.10.1, added FW_hideDisplayName, Forum #88727
- change: 98_feels_like.pm: Improved algorithms - change: 98_feels_like.pm: Improved algorithms
New attribute "sensorType" New attribute "sensorType"
minor bugfixes minor bugfixes

24
FHEM/95_Dashboard.pm
View File

@ -62,6 +62,10 @@
# Minor improvements in javascript and css. # Minor improvements in javascript and css.
# 3.10: added attribute dashboard_tabXdevices, which can contain devspec definitions and thus allow to also shown not grouped devices # 3.10: added attribute dashboard_tabXdevices, which can contain devspec definitions and thus allow to also shown not grouped devices
# #
# ---- Changes by DS_Starter ----
# 3.10.1 29.06.2018 added FW_hideDisplayName, Forum #88727
#
#
# Known Bugs/Todos: # Known Bugs/Todos:
# BUG: Nicht alle Inhalte aller Tabs laden, bei Plots dauert die bedienung des Dashboards zu lange. -> elemente hidden? -> widgets aus js über XHR nachladen und dann anzeigen (jquery xml nachladen...) # BUG: Nicht alle Inhalte aller Tabs laden, bei Plots dauert die bedienung des Dashboards zu lange. -> elemente hidden? -> widgets aus js über XHR nachladen und dann anzeigen (jquery xml nachladen...)
# BUG: Variabler abstand wird nicht gesichert # BUG: Variabler abstand wird nicht gesichert
@ -97,13 +101,13 @@ package main;
use strict; use strict;
use warnings; use warnings;
use vars qw(%FW_icons); # List of icons use vars qw(%FW_icons); # List of icons
use vars qw($FW_dir); # base directory for web server use vars qw($FW_dir); # base directory for web server
use vars qw($FW_icondir); # icon base directory use vars qw($FW_icondir); # icon base directory
use vars qw($FW_room); # currently selected room use vars qw($FW_room); # currently selected room
use vars qw(%defs); # FHEM device/button definitions use vars qw(%defs); # FHEM device/button definitions
#use vars qw(%FW_groups); # List of Groups #use vars qw(%FW_groups); # List of Groups
use vars qw($FW_wname); # Web instance use vars qw($FW_wname); # Web instance
use vars qw(%FW_types); # device types use vars qw(%FW_types); # device types
use vars qw($FW_ss); # is smallscreen, needed by 97_GROUP/95_VIEW use vars qw($FW_ss); # is smallscreen, needed by 97_GROUP/95_VIEW
######################### #########################
@ -116,7 +120,7 @@ my %group;
my $dashboard_groupListfhem; my $dashboard_groupListfhem;
my $fwjquery = "jquery.min.js"; my $fwjquery = "jquery.min.js";
my $fwjqueryui = "jquery-ui.min.js"; my $fwjqueryui = "jquery-ui.min.js";
my $dashboardversion = "3.10"; my $dashboardversion = "3.10.1";
############################################################################################# #############################################################################################
sub Dashboard_Initialize ($) { sub Dashboard_Initialize ($) {
@ -289,9 +293,10 @@ sub Dashboard_define ($$) {
my @args = split (" ", $def); my @args = split (" ", $def);
my $now = time(); my $now = time();
my $name = $hash->{NAME}; my $name = $hash->{NAME};
$hash->{VERSION} = $dashboardversion; $hash->{VERSION} = $dashboardversion;
readingsSingleUpdate( $hash, "state", "Initialized", 0 ); readingsSingleUpdate( $hash, "state", "Initialized", 0 );
RemoveInternalTimer($hash); RemoveInternalTimer($hash);
@ -803,8 +808,8 @@ sub BuildGroup
} @devices; } @devices;
foreach my $d (@devices) { foreach my $d (@devices) {
next if (!defined($defs{$d})); next if (!defined($defs{$d}));
$foundDevices++; $foundDevices++;
$ret .= sprintf("<tr class=\"%s\">", ($row&1)?"odd":"even"); $ret .= sprintf("<tr class=\"%s\">", ($row&1)?"odd":"even");
@ -814,6 +819,7 @@ sub BuildGroup
$icon = FW_makeImage($icon,$icon,"icon dashboard_groupicon") . "&nbsp;" if($icon); $icon = FW_makeImage($icon,$icon,"icon dashboard_groupicon") . "&nbsp;" if($icon);
$devName="" if($modules{$defs{$d}{TYPE}}{FW_hideDisplayName}); # Forum 88667
if (!$modules{$defs{$d}{TYPE}}{FW_atPageEnd}) { # Don't show Link for "atEnd"-devices if (!$modules{$defs{$d}{TYPE}}{FW_atPageEnd}) { # Don't show Link for "atEnd"-devices
$ret .= FW_pH "detail=$d", "$icon$devName", 1, "col1", 1; $ret .= FW_pH "detail=$d", "$icon$devName", 1, "col1", 1;
} }

2
MAINTAINER.txt
View File

@ -402,7 +402,7 @@ FHEM/95_Astro.pm pahenning Unterstützende Dienste
FHEM/95_Babble.pm pahenning Unterstützende Dienste FHEM/95_Babble.pm pahenning Unterstützende Dienste
FHEM/95_PostMe.pm pahenning Unterstützende Dienste FHEM/95_PostMe.pm pahenning Unterstützende Dienste
FHEM/95_YAAHM.pm pahenning Unterstützende Dienste FHEM/95_YAAHM.pm pahenning Unterstützende Dienste
FHEM/95_Dashboard.pm svenson08 Frontends FHEM/95_Dashboard.pm DS_Starter/orphan Frontends
FHEM/95_PachLog.pm rudolfkoenig/orphan Sonstiges FHEM/95_PachLog.pm rudolfkoenig/orphan Sonstiges
FHEM/95_holiday.pm rudolfkoenig Sonstiges FHEM/95_holiday.pm rudolfkoenig Sonstiges
FHEM/95_remotecontrol.pm ulimaass Frontends FHEM/95_remotecontrol.pm ulimaass Frontends