From c0ebbed5a833d86958210027eb06cc113ff1e0e4 Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Tue, 12 Mar 2013 19:02:34 +0000 Subject: [PATCH] sortby auf vielfachen Wunsch hinzugefuegt git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@2902 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/01_FHEMWEB.pm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm index dd2add114..2e667fbbc 100755 --- a/fhem/FHEM/01_FHEMWEB.pm +++ b/fhem/FHEM/01_FHEMWEB.pm @@ -127,6 +127,7 @@ FHEMWEB_Initialize($) addToAttrList("webCmd"); addToAttrList("icon"); addToAttrList("devStateIcon"); + addToAttrList("sortby"); InternalTimer(time()+60, "FW_closeOldClients", 0, 0); $FW_dir = "$attr{global}{modpath}/www"; @@ -1044,8 +1045,9 @@ FW_showRoom() FW_pO ""; FW_pO ""; - foreach my $d (sort { lc(AttrVal($a,"alias",$a)) cmp - lc(AttrVal($b,"alias",$b)) } keys %{$group{$g}}) { + foreach my $d (sort { lc(AttrVal($a, "sortby", AttrVal($a,"alias",$a))) cmp + lc(AttrVal($b, "sortby", AttrVal($b,"alias",$b))) } + keys %{$group{$g}}) { my $type = $defs{$d}{TYPE}; FW_pF "\n", ($row&1)?"odd":"even"; @@ -2905,6 +2907,14 @@ FW_htmlEscape($)
+ +
  • sortby
    + Take the value of this attribute when sorting the devices in the room + overview instead of the alias, or if that is missing the devicename + itself. +
  • +
    +
  • devStateIcon
    First form:
    @@ -2919,13 +2929,13 @@ FW_htmlEscape($) attr lamp devStateIcon on:closed off:open
    attr lamp devStateIcon .*:noIcon
    -
  • Second form:
    +