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

FHEMWEB: support space in room-name for the sortRoom and column attributes

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@8273 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2015-03-23 08:55:43 +00:00
parent 314f8185db
commit 8f3d97f450
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fhem/FHEM/01_FHEMWEB.pm
View File

@ -897,7 +897,8 @@ FW_updateHashes()
$FW_room = AttrVal($FW_detail, "room", "Unsorted") if($FW_detail); $FW_room = AttrVal($FW_detail, "room", "Unsorted") if($FW_detail);
if(AttrVal($FW_wname, "sortRooms", "")) { # Slow! if(AttrVal($FW_wname, "sortRooms", "")) { # Slow!
my @sortBy = split( " ", AttrVal( $FW_wname, "sortRooms", "" ) ); my @sortBy = map { s/%20/ /g; $_ }
split( " ", AttrVal( $FW_wname, "sortRooms", "" ) );
my %sHash; my %sHash;
map { $sHash{$_} = FW_roomIdx(\@sortBy,$_) } keys %FW_rooms; map { $sHash{$_} = FW_roomIdx(\@sortBy,$_) } keys %FW_rooms;
@FW_roomsArr = sort { $sHash{$a} cmp $sHash{$b} } keys %FW_rooms; @FW_roomsArr = sort { $sHash{$a} cmp $sHash{$b} } keys %FW_rooms;
@ -1469,6 +1470,7 @@ FW_parseColumns()
foreach my $roomgroup (split("[ \t\r\n]+", AttrVal($FW_wname,"column",""))) { foreach my $roomgroup (split("[ \t\r\n]+", AttrVal($FW_wname,"column",""))) {
my ($room, $groupcolumn)=split(":",$roomgroup,2); my ($room, $groupcolumn)=split(":",$roomgroup,2);
$room =~ s/%20/ /g; # Space
next if(!defined($groupcolumn) || $room ne $FW_room); next if(!defined($groupcolumn) || $room ne $FW_room);
$colNo = 1; $colNo = 1;
foreach my $groups (split(/\|/,$groupcolumn)) { foreach my $groups (split(/\|/,$groupcolumn)) {
@ -3077,7 +3079,9 @@ FW_widgetOverride($$)
<a name="sortRooms"></a> <a name="sortRooms"></a>
<li>sortRooms<br> <li>sortRooms<br>
Space separated list of rooms to override the default Space separated list of rooms to override the default
sort order of the room links. Example:<br> sort order of the room links.
Space in room names to be written as %20 for this attribute.
Example:<br>
attr WEB sortRooms DG OG EG Keller attr WEB sortRooms DG OG EG Keller
</li> </li>
<br> <br>
@ -3228,6 +3232,7 @@ FW_widgetOverride($$)
a column if they are part of a <a href="#group">group</a>. a column if they are part of a <a href="#group">group</a>.
This attribute can be used to sort the groups in a room, just specify This attribute can be used to sort the groups in a room, just specify
the groups in one column. the groups in one column.
Space in the room name has to be written as %20 for this attribute.
</li> </li>
<a name="closeConn"></a> <a name="closeConn"></a>
@ -3663,7 +3668,9 @@ FW_widgetOverride($$)
<a name="sortRooms"></a> <a name="sortRooms"></a>
<li>sortRooms<br> <li>sortRooms<br>
Durch Leerzeichen getrennte Liste von R&auml;umen, um deren Reihenfolge Durch Leerzeichen getrennte Liste von R&auml;umen, um deren Reihenfolge
zu definieren. Beispiel:<br> zu definieren. Leerzeichen in Raumnamen muss als %20 spezifiziert
werden fuer dieses Attribut.
Beispiel:<br>
attr WEB sortRooms DG OG EG Keller attr WEB sortRooms DG OG EG Keller
</li><br> </li><br>
@ -3829,6 +3836,8 @@ FW_widgetOverride($$)
k&ouml;nnen nur dann Teil einer Spalte sein wenn sie in <a k&ouml;nnen nur dann Teil einer Spalte sein wenn sie in <a
href="#group">group</a> stehen. Dieses Attribut kann man zum sortieren href="#group">group</a> stehen. Dieses Attribut kann man zum sortieren
der Gruppen auch dann verwenden, wenn man nur eine Spalte hat. der Gruppen auch dann verwenden, wenn man nur eine Spalte hat.
Leerzeichen im Raumnamen sind f&uuml;r dieses Attribut als %20 zu
schreiben.
</li><br> </li><br>
<a name="closeConn"></a> <a name="closeConn"></a>