Merge pull request #481 from cengel74/web_floorplan_fixes_v4

Fixes for web floorplan view
hollie · Mar 2, 2015 · 6612f9a · 6612f9a
2 parents 166950b + 6b0518c
commit 6612f9a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/lib/Generic_Item.pm b/lib/Generic_Item.pm
@@ -901,7 +901,7 @@ TODO
 
 sub get_fp_location {
     my ($self) = @_;
-    if (! @{$$self{location}} ) { return }
+    if (! defined @{$$self{location}} ) { return }
     return @{$$self{location}};
 }
 

diff --git a/web/bin/floorplan.pl b/web/bin/floorplan.pl
@@ -169,13 +169,14 @@ sub web_fp_item #render all items based on type
 		 $p_obj->isa('Weeder_Light')   or
 		 $p_obj->isa('UPB_Device')     or
 		 $p_obj->isa('Insteon_Device') or
+		 $p_obj->isa('Insteon::DeviceController') or
+		 $p_obj->isa('Insteon::BaseLight') or
 		 $p_obj->isa('UPB_Link')       or
 		 $p_obj->isa('EIB_Item')       or
 		 $p_obj->isa('EIB1GItem')      or
 		 $p_obj->isa('EIB2_Item')      or
 		 $p_obj->isa('EIO_Item')       or
 		 $p_obj->isa('UIO_Item')       or
-		 $p_obj->isa('Generic_Item')   or
 		 $p_obj->isa('X10_Item')
 		 ) {
 		if ($p_obj->state eq 'off') {
@@ -252,6 +253,14 @@ sub web_fp_item #render all items based on type
 	} elsif ($p_obj->isa('iButton')) {
 		$l_text=web_fp_filter_name($p_obj->{object_name});
 		$l_text.=':' . $p_obj->read_temp();
+	} elsif ($p_obj->isa('Generic_Item') ) {
+		if ($p_obj->state eq 'off') {
+			$l_image='fp-light-off.gif';
+			$l_state='on';
+		} else {
+			$l_image='fp-light-on.gif';
+			$l_state='off';
+		}
 	} else { #Unknown object
 		$l_text=web_fp_filter_name($p_obj->{object_name});
 		$l_text.=':' . $p_obj->state();