FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-21 07:56:03 +00:00
Code Issues Releases Wiki Activity

FHEMWEB: sortRooms by andre

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@4472 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2013-12-27 14:12:04 +00:00
parent 7cc55da014
commit 836252fef1
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
fhem/FHEM/01_FHEMWEB.pm
View File

@ -138,6 +138,7 @@ FHEMWEB_Initialize($)
refresh refresh
reverseLogs:0,1 reverseLogs:0,1
roomIcons roomIcons
sortRooms
smallscreen:unused smallscreen:unused
stylesheetPrefix stylesheetPrefix
touchpad:unused touchpad:unused
@ -923,6 +924,18 @@ FW_makeTableFromArray($$@) {
} }
} }
sub
FW_roomIdx(\@$)
{
my ($arr,$v) = @_;
my ($index) = grep { $arr->[$_] =~ /^$v$/ } 0..$#$arr;
return "9999-$v" if( !defined($index) );
return $index;
}
############## ##############
# Header, Zoom-Icons & list of rooms at the left. # Header, Zoom-Icons & list of rooms at the left.
sub sub
@ -982,9 +995,13 @@ FW_roomOverview($)
} }
$FW_room = "" if(!$FW_room); $FW_room = "" if(!$FW_room);
my @sortBy = split( " ", AttrVal( $FW_wname, "sortRooms", "" ) );
@sortBy = sort keys %FW_rooms if( scalar @sortBy == 0 );
########################## ##########################
# Rooms and other links # Rooms and other links
foreach my $r (sort keys %FW_rooms) { foreach my $r ( sort { FW_roomIdx(@sortBy,$a) cmp
FW_roomIdx(@sortBy,$b) } keys %FW_rooms ) {
next if($r eq "hidden" || $FW_hiddenroom{$r}); next if($r eq "hidden" || $FW_hiddenroom{$r});
$FW_room = $r if(!$FW_room && $FW_ss); $FW_room = $r if(!$FW_room && $FW_ss);
$r =~ s/</&lt;/g; $r =~ s/</&lt;/g;
@ -2648,6 +2665,14 @@ FW_ActivateInform()
</li> </li>
<br> <br>
<a name="sortRooms"></a>
<li>sortRooms<br>
Space separated list of rooms to override the default
sort order of the room links. Example:<br>
attr WEB sortRooms DG OG EG Keller
</li>
<br>
<a name="sortby"></a> <a name="sortby"></a>
<li>sortby<br> <li>sortby<br>
Take the value of this attribute when sorting the devices in the room Take the value of this attribute when sorting the devices in the room