Skip to content

Home Information - Your home, your data, organized.

Python

Improvement to EntityType icons (#185)

Tony Ccf8a02c9c8ba
diff --git a/docs/dev/frontend/entity-visual-configuration.md b/docs/dev/frontend/entity-visual-configuration.md
index a42427ea..177e38c3 100644
--- a/docs/dev/frontend/entity-visual-configuration.md
+++ b/docs/dev/frontend/entity-visual-configuration.md
@@ -57,6 +57,9 @@ New Entity Type
```
2. **Create Custom SVG Icon** ([Create SVG Icon Asset](#create-svg-icon-asset))
+
+Note: Do **not** use the `<g>` tag inside these SVGs!
+
```xml
<!-- File: hi/apps/entity/templates/entity/svg/type.smart_door_lock.svg -->
<rect class="hi-entity-bg" x="0" y="0" width="64" height="64" fill="none"/>
@@ -2146,4 +2149,4 @@ SimEntityType = Enum('SimEntityType', [
- Status display implementation: [Entity Status Display](entity-status-display.md)
- Style guidelines: [Style Guidelines](style-guidelines.md)
- Icon system: [Icon System](icon-system.md)
-- Frontend guidelines: [Frontend Guidelines](frontend-guidelines.md)
\ No newline at end of file
+- Frontend guidelines: [Frontend Guidelines](frontend-guidelines.md)
diff --git a/src/hi/apps/entity/enums.py b/src/hi/apps/entity/enums.py
index 3abc0a9d..ef66c73f 100644
--- a/src/hi/apps/entity/enums.py
+++ b/src/hi/apps/entity/enums.py
@@ -14,15 +14,19 @@ class EntityType(LabeledEnum):
ACCESS_POINT = ( 'Access Point', '' )
ANTENNA = ( 'Antenna', '' )
APPLIANCE = ( 'Appliance', '' )
+ LARGE_APPLIANCE = ( 'Large Appliance', '' )
AREA = ( 'Area', '' )
ATTIC_STAIRS = ( 'Attic Stairs', '' )
AUTOMOBILE = ( 'Automobile', '' )
AV_RECEIVER = ( 'A/V Receiver', '' ) # Controls Speakers/TV
BAROMETER = ( 'Barometer', '' )
+ BATHTUB = ( 'Bathtub', '' )
CAMERA = ( 'Camera', '' )
+ CARBON_MONOXIDE_DETECTOR = ( 'Carbon Monoxide Detector', '' )
CEILING_FAN = ( 'Ceiling Fan', '' )
CLOTHES_DRYER = ( 'Clothes Dryer', '' )
CLOTHES_WASHER = ( 'Clothes Washer', '' )
+ COFFEE_MAKER = ( 'Coffee Maker', '' )
COMPUTER = ( 'Computer', '' )
CONSUMABLE = ( 'Consumable', '' )
CONTROLLER = ( 'Controller', '' )
@@ -30,24 +34,33 @@ class EntityType(LabeledEnum):
COOKTOP = ( 'Cooktop', '' )
DISHWASHER = ( 'Dishwasher', '' )
DISK = ( 'Disk', '' )
- DOOR = ( 'Door', '' )
+ DOOR = ( 'Door', '' )
+ DOORBELL = ( 'Doorbell', '' )
DOOR_LOCK = ( 'Door Lock', '' ) # Controls doors
+ DRAINAGE_PIPE = ( 'Drainage Pipe', '' )
ELECTRICAL_OUTLET = ( 'Electrical Outlet', '' )
ELECTRICITY_METER = ( 'Electricity Meter', '' )
ELECTRIC_PANEL = ( 'Electric Panel', '' )
ELECTRIC_WIRE = ( 'Electric Wire', '' )
EXHAUST_FAN = ( 'Exhaust Fan', '' )
FENCE = ( 'Fence', '' )
+ FIRE_EXTINGUISHER = ( 'Fire Extinguisher', '' )
FIREPLACE = ( 'Fireplace', '' )
FURNITURE = ( 'Furniture', '' )
+ GARBAGE_DISPOSAL = ( 'Garbage Disposal', '' )
+ GENERATOR = ( 'Generator', '' )
GREENHOUSE = ( 'Greenhouse', '' )
+ GRILL = ( 'Grill', '' ) # BBQ
HEALTHCHECK = ( 'Healthcheck', '' )
+ HEDGE_TRIMMER = ( 'Hedge Trimmer', '' )
HUMIDIFIER = ( 'Humidifier', '' ) # Controls area
HVAC_AIR_HANDLER = ( 'HVAC Air Handler', '' ) # Controls area
HVAC_CONDENSER = ( 'HVAC Condenser', '' ) # Controls area
HVAC_FURNACE = ( 'HVAC Furnace', '' ) # Controls area
HVAC_MINI_SPLIT = ( 'HVAC Mini-split', '' ) # Controls area
HYGROMETER = ( 'Hygrometer', '' )
+ LAWN_MOWER = ( 'Lawn Mower', '' )
+ LEAF_BLOWER = ( 'Leaf Blower', '' )
LIGHT = ( 'Light', '' )
LIGHT_SENSOR = ( 'Light Sensor', '' )
MICROWAVE_OVEN = ( 'Microwave Oven', '' )
@@ -62,18 +75,21 @@ class EntityType(LabeledEnum):
PIPE = ( 'Pipe', '' )
PLANT = ( 'Plant', '' )
POOL_FILTER = ( 'Pool Filter', '' )
+ POWER_WASHER = ( 'Power Washer', '' )
PRESENCE_SENSOR = ( 'Presence Sensor', '' )
PRINTER = ( 'Printer', '' )
PUMP = ( 'Pump', '' )
+ RANGE_HOOD = ( 'Range Hood', '' )
REFRIGERATOR = ( 'Refrigerator', '' )
SATELLITE_DISH = ( 'Satellite Dish' , '' )
SERVER = ( 'Server' , '' )
SERVICE = ( 'Service' , '' )
SEWER_LINE = ( 'Sewer Line', '' )
- SHOWER = ( 'Shower', '' )
- SHED = ( 'Shed', '' )
+ SHOWER = ( 'Shower', '' )
SINK = ( 'Sink', '' )
- SKYLIGHT = ( 'Skylight', '' )
+ SKYLIGHT = ( 'Skylight', '' )
+ SMOKE_DETECTOR = ( 'Smoke Detector', '' )
+ SOLAR_PANEL = ( 'Solar Panel', '' )
SPEAKER = ( 'Speaker', '' )
SPEAKER_WIRE = ( 'Speaker Wire', '' )
SPRINKLER_HEAD = ( 'Sprinkler Head', '' )
@@ -85,9 +101,12 @@ class EntityType(LabeledEnum):
THERMOMETER = ( 'Thermometer', '' )
THERMOSTAT = ( 'Thermostat', '' )
TIME_SOURCE = ( 'Time Source', '' )
- TOILET = ( 'Toilet', '' )
+ TOILET = ( 'Toilet', '' )
TOOL = ( 'Tool', '' )
TREE = ( 'Tree', '' )
+ TRIMMER = ( 'Trimmer', '' )
+ UPS = ( 'UPS', '' ) # Uninterruptible Power Supply
+ VANITY = ( 'Vanity', '' )
WALL = ( 'Wall', '' )
WALL_SWITCH = ( 'Wall Switch', '' )
WATER_HEATER = ( 'Water Heater', '' )
@@ -106,7 +125,7 @@ class EntityType(LabeledEnum):
def get_closed_path_types(cls) -> Set['EntityType']:
"""EntityTypes that require closed paths (areas/regions)"""
return {
- cls.APPLIANCE,
+ cls.LARGE_APPLIANCE,
cls.AREA,
cls.DOOR,
cls.FURNITURE,
@@ -115,11 +134,12 @@ class EntityType(LabeledEnum):
cls.WINDOW,
}
- @classmethod
+ @classmethod
def get_open_path_types(cls) -> Set['EntityType']:
"""EntityTypes that require open paths (lines/routes)"""
return {
cls.CONTROL_WIRE,
+ cls.DRAINAGE_PIPE,
cls.ELECTRIC_WIRE,
cls.FENCE,
cls.PIPE,
@@ -294,12 +314,17 @@ class EntityGroupType(LabeledEnum):
APPLIANCES = ( 'Appliances', '', {
EntityType.APPLIANCE,
+ EntityType.LARGE_APPLIANCE,
EntityType.CLOTHES_DRYER,
EntityType.CLOTHES_WASHER,
+ EntityType.COFFEE_MAKER,
EntityType.COOKTOP,
EntityType.DISHWASHER,
+ EntityType.GARBAGE_DISPOSAL,
+ EntityType.GRILL,
EntityType.MICROWAVE_OVEN,
EntityType.OVEN,
+ EntityType.RANGE_HOOD,
EntityType.REFRIGERATOR,
EntityType.WATER_HEATER,
})
@@ -344,11 +369,13 @@ class EntityGroupType(LabeledEnum):
})
FIXTURES = ( 'Fixtures', '', {
EntityType.ATTIC_STAIRS,
+ EntityType.BATHTUB,
EntityType.CEILING_FAN,
EntityType.FURNITURE,
EntityType.SHOWER,
EntityType.SINK,
EntityType.TOILET,
+ EntityType.VANITY,
})
LIGHTS_SWITCHES = ( 'Lights, Switches, Outlets', '', {
EntityType.ELECTRICAL_OUTLET,
@@ -363,24 +390,32 @@ class EntityGroupType(LabeledEnum):
EntityType.FENCE,
EntityType.CONTROLLER,
EntityType.GREENHOUSE,
+ EntityType.HEDGE_TRIMMER,
+ EntityType.LAWN_MOWER,
+ EntityType.LEAF_BLOWER,
EntityType.MOTOR,
EntityType.PIPE,
EntityType.PLANT,
EntityType.POOL_FILTER,
+ EntityType.POWER_WASHER,
EntityType.PUMP,
- EntityType.SHED,
EntityType.SPRINKLER_HEAD,
EntityType.SPRINKLER_VALVE,
EntityType.SPRINKLER_WIRE,
EntityType.TREE,
+ EntityType.TRIMMER,
})
SECURITY = ( 'Security', '', {
EntityType.CAMERA,
+ EntityType.CARBON_MONOXIDE_DETECTOR,
+ EntityType.DOORBELL,
EntityType.DOOR_LOCK,
+ EntityType.FIRE_EXTINGUISHER,
EntityType.LIGHT_SENSOR,
EntityType.MOTION_SENSOR,
EntityType.OPEN_CLOSE_SENSOR,
EntityType.PRESENCE_SENSOR,
+ EntityType.SMOKE_DETECTOR,
})
STRUCTURAL = ( 'Structural', '', {
EntityType.DOOR,
@@ -398,13 +433,17 @@ class EntityGroupType(LabeledEnum):
})
UTILITIES = ( 'Utilities', '', {
EntityType.ANTENNA,
+ EntityType.DRAINAGE_PIPE,
EntityType.ELECTRICITY_METER,
EntityType.ELECTRIC_PANEL,
EntityType.ELECTRIC_WIRE,
+ EntityType.GENERATOR,
EntityType.SATELLITE_DISH,
EntityType.SEWER_LINE,
+ EntityType.SOLAR_PANEL,
EntityType.TELECOM_BOX,
EntityType.TELECOM_WIRE,
+ EntityType.UPS,
EntityType.WATER_LINE,
EntityType.WATER_METER,
EntityType.WATER_SHUTOFF_VALVE,
diff --git a/src/hi/apps/entity/templates/entity/panes/entity_state_status_card.html b/src/hi/apps/entity/templates/entity/panes/entity_state_status_card.html
index 14774794..383b421b 100644
--- a/src/hi/apps/entity/templates/entity/panes/entity_state_status_card.html
+++ b/src/hi/apps/entity/templates/entity/panes/entity_state_status_card.html
@@ -38,8 +38,5 @@
{% endwith %}
</div>
</div>
-
- {% empty %}
- <div><em>No status data available.</em></div>
{% endfor %}
</div>
diff --git a/src/hi/apps/entity/templates/entity/svg/type.appliance.svg b/src/hi/apps/entity/templates/entity/svg/type.appliance.svg
new file mode 100644
index 00000000..65fb204f
--- /dev/null
+++ b/src/hi/apps/entity/templates/entity/svg/type.appliance.svg
@@ -0,0 +1,28 @@
+<rect class="hi-entity-bg" x="0" y="0" width="64" height="64" fill="none" stroke="none"/>
+
+<!-- Generic small appliance icon - rounded rectangle with control elements -->
+<!-- Main appliance body -->
+<rect x="12" y="16" width="40" height="32" rx="4" fill="#f5f5f5" stroke="#2c3e50" stroke-width="2"/>
+
+<!-- Control panel area -->
+<rect x="16" y="20" width="32" height="8" rx="2" fill="#e8e8e8" stroke="#bdc3c7" stroke-width="1"/>
+
+<!-- Power indicator -->
+<circle cx="20" cy="24" r="1.5" fill="#27ae60"/>
+
+<!-- Control buttons -->
+<circle cx="28" cy="24" r="1.5" fill="#95a5a6" stroke="#7f8c8d" stroke-width="0.5"/>
+<circle cx="32" cy="24" r="1.5" fill="#95a5a6" stroke="#7f8c8d" stroke-width="0.5"/>
+<circle cx="36" cy="24" r="1.5" fill="#95a5a6" stroke="#7f8c8d" stroke-width="0.5"/>
+
+<!-- Small display/timer area -->
+<rect x="40" y="21" width="6" height="6" rx="1" fill="#34495e"/>
+<rect x="41" y="22" width="4" height="4" rx="0.5" fill="#2ecc71" opacity="0.7"/>
+
+<!-- Subtle appliance details -->
+<rect x="14" y="32" width="36" height="2" rx="1" fill="#ecf0f1"/>
+<rect x="18" y="36" width="28" height="2" rx="1" fill="#ecf0f1"/>
+
+<!-- Base/feet indicators -->
+<rect x="16" y="46" width="4" height="2" rx="1" fill="#95a5a6"/>
+<rect x="44" y="46" width="4" height="2" rx="1" fill="#95a5a6"/>
\ No newline at end of file
diff --git a/src/hi/apps/entity/templates/entity/svg/type.bathtub.svg b/src/hi/apps/entity/templates/entity/svg/type.bathtub.svg
new file mode 100644
index 00000000..b932e173
--- /dev/null
+++ b/src/hi/apps/entity/templates/entity/svg/type.bathtub.svg
@@ -0,0 +1,5 @@
+<rect class="hi-entity-bg" x="0" y="0" width="64" height="64" fill="none"/>
+<path d="M8,24 C8,20 12,16 16,16 L48,16 C52,16 56,20 56,24 L56,40 C56,44 52,48 48,48 L16,48 C12,48 8,44 8,40 Z" fill="#e0e0ff" stroke="#333333" stroke-width="2"/>
+<ellipse cx="32" cy="32" rx="20" ry="12" fill="#c0c0ff" opacity="0.5"/>
+<circle cx="48" cy="20" r="3" fill="#808080" stroke="#333333" stroke-width="1"/>
+<path d="M48,20 L48,12" stroke="#333333" stroke-width="2" stroke-linecap="round"/>
\ No newline at end of file
diff --git a/src/hi/apps/entity/templates/entity/svg/type.carbon_monoxide_detector.svg b/src/hi/apps/entity/templates/entity/svg/type.carbon_monoxide_detector.svg
new file mode 100644
index 00000000..f5cd5a2c
--- /dev/null
+++ b/src/hi/apps/entity/templates/entity/svg/type.carbon_monoxide_detector.svg
@@ -0,0 +1,5 @@
+<rect class="hi-entity-bg" x="0" y="0" width="64" height="64" fill="none"/>
+<rect x="12" y="12" width="40" height="40" rx="4" fill="#f0f0f0" stroke="#333333" stroke-width="2"/>
+<rect x="16" y="16" width="32" height="32" rx="2" fill="#e0e0e0" stroke="#333333" stroke-width="1"/>
+<text x="32" y="30" text-anchor="middle" font-family="monospace" font-size="12" font-weight="bold" fill="#333333">CO</text>
+<circle cx="32" cy="40" r="3" fill="#ff8800" stroke="#cc6600" stroke-width="1"/>
\ No newline at end of file
diff --git a/src/hi/apps/entity/templates/entity/svg/type.clothes_dryer.svg b/src/hi/apps/entity/templates/entity/svg/type.clothes_dryer.svg
index e213c8f5..8d2f66fa 100644
--- a/src/hi/apps/entity/templates/entity/svg/type.clothes_dryer.svg
+++ b/src/hi/apps/entity/templates/entity/svg/type.clothes_dryer.svg
@@ -1,5 +1,6 @@
<rect class="hi-entity-bg" x="0" y="0" width="64" height="64" fill="none"/>
- <path fill="#fcfcfc" stroke="black" stroke-width="1"
+ <!-- Main dryer body with warm light gray tint -->
+ <path fill="#f8f5f0" stroke="black" stroke-width="1"
d="M 6.96,0.01
C 6.96,0.01 11.60,0.01 11.60,0.01
11.60,0.01 20.56,0.01 20.56,0.01
@@ -153,3 +154,12 @@
38.56,36.00 38.56,36.88 38.56,36.88
38.56,36.88 46.88,36.88 46.88,36.88
46.88,36.88 46.88,36.00 46.88,36.00 Z" />
+
+ <!-- Add subtle color accents -->
+ <!-- Warm orange tint for drum/heat area -->
+ <circle cx="32" cy="36.5" r="15" fill="#fff3e0" opacity="0.4"/>
+
+ <!-- Colored indicator button and controls -->
+ <circle cx="10.5" cy="6.5" r="1.8" fill="#ff9800" opacity="0.8"/>
+ <rect x="17" y="5" width="12" height="1.5" rx="0.5" fill="#ffa726" opacity="0.6"/>
+ <rect x="25" y="7.5" width="8" height="1.5" rx="0.5" fill="#ffb74d" opacity="0.6"/>
diff --git a/src/hi/apps/entity/templates/entity/svg/type.clothes_washer.svg b/src/hi/apps/entity/templates/entity/svg/type.clothes_washer.svg
index 3cf7ea33..dc04cec5 100644
--- a/src/hi/apps/entity/templates/entity/svg/type.clothes_washer.svg
+++ b/src/hi/apps/entity/templates/entity/svg/type.clothes_washer.svg
@@ -1,5 +1,6 @@
<rect class="hi-entity-bg" x="0" y="0" width="64" height="64" fill="none"/>
- <path fill="#fcfcfc" stroke="black" stroke-width="1"
+ <!-- Main washer body with light blue-gray tint -->
+ <path fill="#f0f4f8" stroke="black" stroke-width="1"
d="M 11.36,1.61
C 11.36,1.61 16.00,1.61 16.00,1.61
16.00,1.61 24.96,1.61 24.96,1.61
@@ -116,3 +117,11 @@
27.38,54.63 36.99,54.60 43.04,48.71
44.41,47.38 45.63,45.52 46.39,43.76
46.99,42.36 47.57,40.24 47.60,38.72 Z" />
+
+ <!-- Add subtle color accents -->
+ <!-- Blue tint for drum/water area -->
+ <circle cx="32" cy="37.5" r="16" fill="#e3f2fd" opacity="0.3"/>
+
+ <!-- Colored indicator buttons -->
+ <circle cx="14.5" cy="8.5" r="2" fill="#4fc3f7" opacity="0.7"/>
+ <circle cx="21" cy="8.5" r="2" fill="#66bb6a" opacity="0.7"/>
diff --git a/src/hi/apps/entity/templates/entity/svg/type.coffee_maker.svg b/src/hi/apps/entity/templates/entity/svg/type.coffee_maker.svg
new file mode 100644
index 00000000..8b7b813f
--- /dev/null
+++ b/src/hi/apps/entity/templates/entity/svg/type.coffee_maker.svg
@@ -0,0 +1,6 @@
+<rect class="hi-entity-bg" x="0" y="0" width="64" height="64" fill="none"/>
+<rect x="20" y="16" width="24" height="32" rx="2" fill="#333333" stroke="#333333" stroke-width="2"/>
+<rect x="24" y="20" width="16" height="20" rx="2" fill="#8B4513" opacity="0.8"/>
+<rect x="22" y="44" width="20" height="2" fill="#606060"/>
+<path d="M44,24 C48,24 52,28 52,32 C52,36 48,40 44,40" stroke="#333333" stroke-width="2" fill="none"/>
+<circle cx="32" cy="30" r="2" fill="#00ff00"/>
\ No newline at end of file
diff --git a/src/hi/apps/entity/templates/entity/svg/type.doorbell.svg b/src/hi/apps/entity/templates/entity/svg/type.doorbell.svg
new file mode 100644
index 00000000..1e3ef8c3
--- /dev/null
+++ b/src/hi/apps/entity/templates/entity/svg/type.doorbell.svg
@@ -0,0 +1,6 @@
+<rect class="hi-entity-bg" x="0" y="0" width="64" height="64" fill="none"/>
+<rect x="22" y="16" width="20" height="32" rx="4" fill="#e0e0e0" stroke="#333333" stroke-width="2"/>
+<circle cx="32" cy="32" r="6" fill="#4444ff" stroke="#333333" stroke-width="1"/>
+<circle cx="32" cy="32" r="3" fill="#ffffff" opacity="0.8"/>
+<path d="M26,42 L38,42" stroke="#333333" stroke-width="1" stroke-linecap="round"/>
+<circle cx="32" cy="22" r="2" fill="#333333"/>
\ No newline at end of file
diff --git a/src/hi/apps/entity/templates/entity/svg/type.fire_extinguisher.svg b/src/hi/apps/entity/templates/entity/svg/type.fire_extinguisher.svg
new file mode 100644
index 00000000..16c97466
--- /dev/null
+++ b/src/hi/apps/entity/templates/entity/svg/type.fire_extinguisher.svg
@@ -0,0 +1,6 @@
+<rect class="hi-entity-bg" x="0" y="0" width="64" height="64" fill="none"/>
+<rect x="24" y="20" width="16" height="36" rx="4" fill="#cc0000" stroke="#333333" stroke-width="2"/>
+<rect x="28" y="12" width="8" height="10" rx="2" fill="#333333"/>
+<path d="M32,12 L32,8 L36,8 L36,6 L28,6 L28,8 L32,8" stroke="#333333" stroke-width="2" fill="none"/>
+<rect x="30" y="24" width="4" height="8" fill="#ffffff" opacity="0.8"/>
+<circle cx="40" cy="14" r="2" fill="#333333"/>
\ No newline at end of file
diff --git a/src/hi/apps/entity/templates/entity/svg/type.garbage_disposal.svg b/src/hi/apps/entity/templates/entity/svg/type.garbage_disposal.svg
new file mode 100644
index 00000000..5f124953
--- /dev/null
+++ b/src/hi/apps/entity/templates/entity/svg/type.garbage_disposal.svg
@@ -0,0 +1,6 @@
+<rect class="hi-entity-bg" x="0" y="0" width="64" height="64" fill="none"/>
+<circle cx="32" cy="32" r="20" fill="#808080" stroke="#333333" stroke-width="2"/>
+<circle cx="32" cy="32" r="16" fill="#606060" stroke="#333333" stroke-width="1"/>
+<circle cx="32" cy="32" r="8" fill="#333333"/>
+<path d="M32,24 L38,32 L32,40 L26,32 Z" fill="#a0a0a0" stroke="#333333" stroke-width="1"/>
+<circle cx="32" cy="32" r="3" fill="#333333"/>
\ No newline at end of file
diff --git a/src/hi/apps/entity/templates/entity/svg/type.generator.svg b/src/hi/apps/entity/templates/entity/svg/type.generator.svg
new file mode 100644
index 00000000..d4422d4d
--- /dev/null
+++ b/src/hi/apps/entity/templates/entity/svg/type.generator.svg
@@ -0,0 +1,8 @@
+<rect class="hi-entity-bg" x="0" y="0" width="64" height="64" fill="none"/>
+<rect x="16" y="20" width="32" height="28" rx="2" fill="#606060" stroke="#333333" stroke-width="2"/>
+<rect x="20" y="24" width="24" height="8" fill="#ff8800" stroke="#333333" stroke-width="1"/>
+<rect x="20" y="36" width="8" height="8" rx="1" fill="#333333"/>
+<rect x="32" y="36" width="8" height="8" rx="1" fill="#333333"/>
+<path d="M24,28 L28,28" stroke="#ffffff" stroke-width="2"/>
+<path d="M36,28 L40,28" stroke="#ffffff" stroke-width="2"/>
+<circle cx="52" cy="24" r="2" fill="#00ff00"/>
\ No newline at end of file
diff --git a/src/hi/apps/entity/templates/entity/svg/type.grill.svg b/src/hi/apps/entity/templates/entity/svg/type.grill.svg
new file mode 100644
index 00000000..05a15a2f
--- /dev/null
+++ b/src/hi/apps/entity/templates/entity/svg/type.grill.svg
@@ -0,0 +1,9 @@
+<rect class="hi-entity-bg" x="0" y="0" width="64" height="64" fill="none"/>
+<rect x="12" y="20" width="40" height="24" rx="2" fill="#333333" stroke="#333333" stroke-width="2"/>
+<rect x="16" y="24" width="32" height="16" fill="#606060" stroke="#333333" stroke-width="1"/>
+<path d="M20,28 L44,28" stroke="#808080" stroke-width="2"/>
+<path d="M20,32 L44,32" stroke="#808080" stroke-width="2"/>
+<path d="M20,36 L44,36" stroke="#808080" stroke-width="2"/>
+<rect x="18" y="44" width="4" height="12" fill="#333333"/>
+<rect x="42" y="44" width="4" height="12" fill="#333333"/>
+<circle cx="48" cy="16" r="3" fill="#ff4444" stroke="#cc0000" stroke-width="1"/>
\ No newline at end of file
diff --git a/src/hi/apps/entity/templates/entity/svg/type.hedge_trimmer.svg b/src/hi/apps/entity/templates/entity/svg/type.hedge_trimmer.svg
new file mode 100644
index 00000000..81e5b825
--- /dev/null
+++ b/src/hi/apps/entity/templates/entity/svg/type.hedge_trimmer.svg
@@ -0,0 +1,8 @@
+<rect class="hi-entity-bg" x="0" y="0" width="64" height="64" fill="none"/>
+<rect x="16" y="26" width="32" height="12" rx="2" fill="#ff8800" stroke="#333333" stroke-width="2"/>
+<path d="M48,26 L52,26 L52,38 L48,38" stroke="#333333" stroke-width="2" fill="none"/>
+<path d="M14,28 L14,36" stroke="#606060" stroke-width="2" stroke-linecap="round"/>
+<path d="M18,30 L18,34" stroke="#606060" stroke-width="2" stroke-linecap="round"/>
+<path d="M22,28 L22,36" stroke="#606060" stroke-width="2" stroke-linecap="round"/>
+<path d="M26,30 L26,34" stroke="#606060" stroke-width="2" stroke-linecap="round"/>
+<circle cx="44" cy="32" r="2" fill="#333333"/>
\ No newline at end of file
diff --git a/src/hi/apps/entity/templates/entity/svg/type.lawn_mower.svg b/src/hi/apps/entity/templates/entity/svg/type.lawn_mower.svg
new file mode 100644
index 00000000..3195e644
--- /dev/null
+++ b/src/hi/apps/entity/templates/entity/svg/type.lawn_mower.svg
@@ -0,0 +1,7 @@
+<rect class="hi-entity-bg" x="0" y="0" width="64" height="64" fill="none"/>
+<rect x="16" y="20" width="32" height="24" rx="6" fill="#00aa00" stroke="#333333" stroke-width="2"/>
+<circle cx="24" cy="40" r="6" fill="#333333" stroke="#333333" stroke-width="2"/>
+<circle cx="40" cy="40" r="6" fill="#333333" stroke="#333333" stroke-width="2"/>
+<rect x="24" y="14" width="16" height="8" rx="2" fill="#606060" stroke="#333333" stroke-width="1"/>
+<path d="M32,14 L32,8" stroke="#333333" stroke-width="2" stroke-linecap="round"/>
+<circle cx="32" cy="32" r="8" fill="#606060" opacity="0.5"/>
\ No newline at end of file
diff --git a/src/hi/apps/entity/templates/entity/svg/type.leaf_blower.svg b/src/hi/apps/entity/templates/entity/svg/type.leaf_blower.svg
new file mode 100644
index 00000000..3786914d
--- /dev/null
+++ b/src/hi/apps/entity/templates/entity/svg/type.leaf_blower.svg
@@ -0,0 +1,6 @@
+<rect class="hi-entity-bg" x="0" y="0" width="64" height="64" fill="none"/>
+<path d="M12,32 C12,26 16,22 22,22 L42,22 C48,22 52,26 52,32 C52,38 48,42 42,42 L22,42 C16,42 12,38 12,32 Z" fill="#ff8800" stroke="#333333" stroke-width="2"/>
+<path d="M52,32 L58,32" stroke="#333333" stroke-width="2" stroke-linecap="round"/>
+<circle cx="20" cy="32" r="3" fill="#333333"/>
+<path d="M56,24 C58,26 58,38 56,40" stroke="#333333" stroke-width="1" fill="none"/>
+<circle cx="30" cy="28" r="2" fill="#333333"/>
\ No newline at end of file
diff --git a/src/hi/apps/entity/templates/entity/svg/type.other.svg b/src/hi/apps/entity/templates/entity/svg/type.other.svg
index 292f047e..cd9e2446 100644
--- a/src/hi/apps/entity/templates/entity/svg/type.other.svg
+++ b/src/hi/apps/entity/templates/entity/svg/type.other.svg
@@ -1,93 +1,81 @@
<rect class="hi-entity-bg" x="0" y="0" width="64" height="64" fill="none"/>
- <path class="hi-entity-other-background"
- fill="#020204" stroke="black" stroke-width="0"
- d="M 31.85,2.00
- C 32.43,1.89 32.75,2.11 33.28,2.32
- 33.28,2.32 35.46,3.18 35.46,3.18
- 35.46,3.18 43.97,6.54 43.97,6.54
- 43.97,6.54 57.37,11.81 57.37,11.81
- 57.37,11.81 60.24,12.94 60.24,12.94
- 61.03,13.25 61.44,13.22 61.44,14.16
- 61.44,14.16 61.44,50.30 61.44,50.30
- 61.44,50.48 61.45,50.73 61.36,50.89
- 61.17,51.24 60.17,51.54 59.78,51.68
- 59.78,51.68 54.74,53.67 54.74,53.67
- 54.74,53.67 46.83,56.79 46.83,56.79
- 46.83,56.79 39.53,59.66 39.53,59.66
- 39.53,59.66 34.79,61.53 34.79,61.53
- 34.79,61.53 32.45,62.45 32.45,62.45
- 31.97,62.57 31.60,62.37 31.17,62.19
- 31.17,62.19 29.06,61.36 29.06,61.36
- 29.06,61.36 19.95,57.77 19.95,57.77
- 19.95,57.77 11.82,54.57 11.82,54.57
- 11.82,54.57 6.85,52.61 6.85,52.61
- 6.85,52.61 4.37,51.63 4.37,51.63
- 4.06,51.51 3.24,51.23 3.04,51.02
- 2.83,50.81 2.86,50.56 2.86,50.30
- 2.86,50.30 2.86,14.16 2.86,14.16
- 2.86,13.97 2.85,13.73 2.94,13.56
- 3.13,13.21 4.13,12.92 4.52,12.77
- 4.52,12.77 9.56,10.78 9.56,10.78
- 9.56,10.78 14.46,8.85 14.46,8.85
- 14.46,8.85 22.81,5.56 22.81,5.56
- 22.81,5.56 29.36,2.98 29.36,2.98
- 29.36,2.98 31.85,2.00 31.85,2.00 Z" />
- <path class="hi-entity-other-top"
- fill="#27bfc3" stroke="black" stroke-width="0"
- d="M 4.67,13.70
- C 4.67,13.70 10.47,11.43 10.47,11.43
- 10.47,11.43 23.87,6.16 23.87,6.16
- 23.87,6.16 29.36,3.99 29.36,3.99
- 29.36,3.99 31.17,3.28 31.17,3.28
- 31.17,3.28 32.08,2.97 32.08,2.97
- 32.08,2.97 32.90,3.19 32.90,3.19
- 32.90,3.19 34.33,3.75 34.33,3.75
- 34.33,3.75 39.45,5.77 39.45,5.77
- 39.45,5.77 53.23,11.20 53.23,11.20
- 53.23,11.20 57.60,12.92 57.60,12.92
- 57.60,12.92 59.63,13.78 59.63,13.78
- 59.63,13.78 40.66,21.25 40.66,21.25
- 40.66,21.25 35.01,23.48 35.01,23.48
- 35.01,23.48 33.20,24.18 33.20,24.18
- 33.20,24.18 32.23,24.53 32.23,24.53
- 32.23,24.53 31.40,24.30 31.40,24.30
- 31.40,24.30 30.04,23.78 30.04,23.78
- 30.04,23.78 25.00,21.79 25.00,21.79
- 25.00,21.79 11.14,16.32 11.14,16.32
- 11.14,16.32 6.78,14.61 6.78,14.61
- 6.78,14.61 4.67,13.70 4.67,13.70 Z" />
- <path class="hi-entity-other-left"
- fill="#177072" stroke="black" stroke-width="0"
- d="M 3.84,14.46
- C 3.84,14.46 6.10,15.34 6.10,15.34
- 6.10,15.34 10.77,17.18 10.77,17.18
- 10.77,17.18 25.22,22.87 25.22,22.87
- 25.22,22.87 30.12,24.80 30.12,24.80
- 30.12,24.80 31.62,25.48 31.62,25.48
- 31.62,25.48 31.70,26.05 31.70,26.05
- 31.70,26.05 31.70,61.36 31.70,61.36
- 31.70,61.36 28.84,60.25 28.84,60.25
- 28.84,60.25 24.24,58.44 24.24,58.44
- 24.24,58.44 10.47,53.02 10.47,53.02
- 10.47,53.02 5.95,51.24 5.95,51.24
- 5.95,51.24 3.84,50.45 3.84,50.45
- 3.84,50.45 3.84,14.46 3.84,14.46 Z" />
- <path class="hi-entity-other-right"
- fill="#1f9698" stroke="black" stroke-width="0"
- d="M 60.39,14.46
- C 60.39,14.46 60.46,15.59 60.46,15.59
- 60.46,15.59 60.46,17.69 60.46,17.69
- 60.46,17.69 60.46,25.07 60.46,25.07
- 60.46,25.07 60.46,50.45 60.46,50.45
- 60.46,50.45 57.22,51.68 57.22,51.68
- 57.22,51.68 51.80,53.82 51.80,53.82
- 51.80,53.82 40.43,58.29 40.43,58.29
- 40.43,58.29 35.84,60.10 35.84,60.10
- 35.84,60.10 32.60,61.36 32.60,61.36
- 32.60,61.36 32.60,26.05 32.60,26.05
- 32.60,26.05 32.68,25.48 32.68,25.48
- 32.68,25.48 34.18,24.80 34.18,24.80
- 34.18,24.80 39.15,22.84 39.15,22.84
- 39.15,22.84 53.01,17.38 53.01,17.38
- 53.01,17.38 57.52,15.60 57.52,15.60
- 57.52,15.60 60.39,14.46 60.39,14.46 Z" />
+
+<!-- Puzzle piece using actual geometry from puzzle.svg, scaled to fit 64x64 viewbox -->
+<path fill="#e8f4f8" stroke="#2c3e50" stroke-width="1.5" stroke-linejoin="round"
+ d="M 16.03,11.715
+ C 18.17,11.385 22.825,11.345 25.00,11.715
+ 25.855,11.76 27.455,12.005 27.96,12.79
+ 28.975,14.37 26.475,15.805 25.88,17.52
+ 24.58,21.245 29.555,23.20 32.50,22.945
+ 35.065,22.725 38.665,20.55 37.675,17.52
+ 37.23,16.155 34.965,14.31 36.035,12.795
+ 36.675,11.885 38.495,12.02 39.50,11.915
+ 41.78,11.685 47.98,10.645 49.495,12.755
+ 50.465,14.12 49.505,19.93 49.495,22.00
+ 49.50,23.13 49.25,26.405 50.30,27.045
+ 51.58,27.825 52.835,25.68 55.00,25.155
+ 59.53,24.06 62.175,27.875 61.945,32.00
+ 61.74,35.705 59.16,39.42 55.00,38.245
+ 53.17,37.725 51.915,36.105 50.655,36.59
+ 49.225,37.145 49.50,40.255 49.495,41.50
+ 49.50,43.54 50.51,49.91 49.495,51.20
+ 48.495,52.455 42.24,52.005 40.50,52.00
+ 39.37,52.00 36.725,52.18 36.025,51.13
+ 34.75,49.23 38.96,47.26 38.17,44.43
+ 36.795,39.685 28.28,39.32 26.24,44.43
+ 25.265,46.76 29.02,48.615 28.185,50.785
+ 27.785,51.83 26.445,51.92 25.50,51.99
+ 25.50,51.99 18.50,51.99 18.50,51.99
+ 17.465,52.00 15.585,52.11 14.615,51.49
+ 13.125,50.315 14.475,44.545 14.615,42.50
+ 14.515,41.17 14.79,37.245 13.555,36.50
+ 12.395,35.80 10.98,37.685 9.00,38.245
+ 4.63,39.47 2.035,35.345 2.04,31.50
+ 2.045,27.45 5.195,23.76 9.50,25.30
+ 11.23,25.92 12.51,27.77 13.70,27.045
+ 14.80,26.375 14.515,22.24 14.50,21.00
+ 14.46,17.89 12.595,13.365 16.03,11.715 Z" />
+
+<!-- Subtle gradient overlay for depth -->
+<path fill="url(#puzzleGradient)" opacity="0.3"
+ d="M 16.03,11.715
+ C 18.17,11.385 22.825,11.345 25.00,11.715
+ 25.855,11.76 27.455,12.005 27.96,12.79
+ 28.975,14.37 26.475,15.805 25.88,17.52
+ 24.58,21.245 29.555,23.20 32.50,22.945
+ 35.065,22.725 38.665,20.55 37.675,17.52
+ 37.23,16.155 34.965,14.31 36.035,12.795
+ 36.675,11.885 38.495,12.02 39.50,11.915
+ 41.78,11.685 47.98,10.645 49.495,12.755
+ 50.465,14.12 49.505,19.93 49.495,22.00
+ 49.50,23.13 49.25,26.405 50.30,27.045
+ 51.58,27.825 52.835,25.68 55.00,25.155
+ 59.53,24.06 62.175,27.875 61.945,32.00
+ 61.74,35.705 59.16,39.42 55.00,38.245
+ 53.17,37.725 51.915,36.105 50.655,36.59
+ 49.225,37.145 49.50,40.255 49.495,41.50
+ 49.50,43.54 50.51,49.91 49.495,51.20
+ 48.495,52.455 42.24,52.005 40.50,52.00
+ 39.37,52.00 36.725,52.18 36.025,51.13
+ 34.75,49.23 38.96,47.26 38.17,44.43
+ 36.795,39.685 28.28,39.32 26.24,44.43
+ 25.265,46.76 29.02,48.615 28.185,50.785
+ 27.785,51.83 26.445,51.92 25.50,51.99
+ 25.50,51.99 18.50,51.99 18.50,51.99
+ 17.465,52.00 15.585,52.11 14.615,51.49
+ 13.125,50.315 14.475,44.545 14.615,42.50
+ 14.515,41.17 14.79,37.245 13.555,36.50
+ 12.395,35.80 10.98,37.685 9.00,38.245
+ 4.63,39.47 2.035,35.345 2.04,31.50
+ 2.045,27.45 5.195,23.76 9.50,25.30
+ 11.23,25.92 12.51,27.77 13.70,27.045
+ 14.80,26.375 14.515,22.24 14.50,21.00
+ 14.46,17.89 12.595,13.365 16.03,11.715 Z" />
+
+<!-- Gradient definition -->
+<defs>
+ <linearGradient id="puzzleGradient" x1="0%" y1="0%" x2="100%" y2="100%">
+ <stop offset="0%" stop-color="#3498db"/>
+ <stop offset="100%" stop-color="#2980b9"/>
+ </linearGradient>
+</defs>
diff --git a/src/hi/apps/entity/templates/entity/svg/type.power_washer.svg b/src/hi/apps/entity/templates/entity/svg/type.power_washer.svg
new file mode 100644
index 00000000..b8b27a0c
--- /dev/null
+++ b/src/hi/apps/entity/templates/entity/svg/type.power_washer.svg
@@ -0,0 +1,8 @@
+<rect class="hi-entity-bg" x="0" y="0" width="64" height="64" fill="none"/>
+<rect x="20" y="20" width="24" height="28" rx="4" fill="#4444ff" stroke="#333333" stroke-width="2"/>
+<circle cx="28" cy="52" r="4" fill="#333333"/>
+<circle cx="36" cy="52" r="4" fill="#333333"/>
+<rect x="26" y="12" width="12" height="10" rx="2" fill="#606060" stroke="#333333" stroke-width="1"/>
+<path d="M32,12 L32,6" stroke="#333333" stroke-width="2" stroke-linecap="round"/>
+<path d="M32,6 L48,6" stroke="#333333" stroke-width="2" stroke-linecap="round"/>
+<circle cx="32" cy="30" r="3" fill="#ffffff" opacity="0.8"/>
\ No newline at end of file
diff --git a/src/hi/apps/entity/templates/entity/svg/type.range_hood.svg b/src/hi/apps/entity/templates/entity/svg/type.range_hood.svg
new file mode 100644
index 00000000..188bd198
--- /dev/null
+++ b/src/hi/apps/entity/templates/entity/svg/type.range_hood.svg
@@ -0,0 +1,7 @@
+<rect class="hi-entity-bg" x="0" y="0" width="64" height="64" fill="none"/>
+<path d="M12,28 L20,20 L44,20 L52,28 L52,44 L12,44 Z" fill="#d0d0d0" stroke="#333333" stroke-width="2"/>
+<rect x="20" y="36" width="6" height="6" rx="1" fill="#606060"/>
+<rect x="29" y="36" width="6" height="6" rx="1" fill="#606060"/>
+<rect x="38" y="36" width="6" height="6" rx="1" fill="#606060"/>
+<path d="M24,24 L24,30 L40,30 L40,24" stroke="#333333" stroke-width="1" fill="none"/>
+<circle cx="32" cy="27" r="2" fill="#333333"/>
\ No newline at end of file
diff --git a/src/hi/apps/entity/templates/entity/svg/type.refrigerator.svg b/src/hi/apps/entity/templates/entity/svg/type.refrigerator.svg
index 4bfb3b21..775c6d3b 100644
--- a/src/hi/apps/entity/templates/entity/svg/type.refrigerator.svg
+++ b/src/hi/apps/entity/templates/entity/svg/type.refrigerator.svg
@@ -1,67 +1,25 @@
<rect class="hi-entity-bg" x="0" y="0" width="48" height="64" fill="none"/>
- <path class="hi-entity-refrigerator-background"
- fill="#fcfcfc" stroke="black" stroke-width="0"
- d="M 10.98,2.66
- C 10.98,2.66 13.95,2.66 13.95,2.66
- 13.95,2.66 19.44,2.66 19.44,2.66
- 19.44,2.66 35.91,2.66 35.91,2.66
- 40.44,2.65 44.55,6.68 44.56,11.14
- 44.56,11.14 44.56,53.14 44.56,53.14
- 44.55,57.58 40.44,61.62 35.91,61.63
- 35.91,61.63 11.72,61.63 11.72,61.63
- 7.19,61.62 3.08,57.58 3.07,53.14
- 3.07,53.14 3.07,26.02 3.07,26.02
- 3.07,26.02 3.07,10.96 3.07,10.96
- 3.08,10.10 3.39,8.92 3.72,8.13
- 5.05,4.99 7.63,3.22 10.98,2.66 Z" />
- <path class="hi-entity-refrigerator-lines"
- fill="#020204" stroke="black" stroke-width="0"
- d="M 10.79,2.47
- C 10.79,2.47 13.86,2.47 13.86,2.47
- 13.86,2.47 19.35,2.47 19.35,2.47
- 19.35,2.47 36.09,2.47 36.09,2.47
- 40.56,2.47 44.74,6.57 44.74,10.96
- 44.74,10.96 44.74,53.32 44.74,53.32
- 44.74,57.70 40.56,61.80 36.09,61.81
- 36.09,61.81 11.53,61.81 11.53,61.81
- 7.06,61.80 2.89,57.70 2.88,53.32
- 2.88,53.32 2.88,25.93 2.88,25.93
- 2.88,25.93 2.88,10.77 2.88,10.77
- 2.89,10.01 3.10,9.21 3.35,8.49
- 4.51,5.15 7.29,3.07 10.79,2.47 Z
- M 40.09,23.01
- C 40.09,23.01 40.09,14.52 40.09,14.52
- 40.09,13.03 40.25,11.15 39.68,9.77
- 38.82,7.70 36.90,7.03 34.79,7.03
- 34.79,7.03 12.84,7.03 12.84,7.03
- 12.43,7.03 11.34,7.11 10.98,7.22
- 8.44,7.93 7.54,9.81 7.53,12.23
- 7.53,12.23 7.53,23.01 7.53,23.01
- 7.53,23.01 40.09,23.01 40.09,23.01 Z
- M 27.81,16.21
- C 27.81,16.21 30.51,16.16 30.51,16.16
- 30.51,16.16 35.35,16.16 35.35,16.16
- 35.88,16.16 36.17,16.16 36.65,16.42
- 37.93,17.12 38.17,19.03 37.18,20.07
- 36.65,20.62 36.08,20.72 35.35,20.72
- 35.35,20.72 28.56,20.72 28.56,20.72
- 27.86,20.72 27.34,20.64 26.81,20.15
- 25.69,19.12 25.83,16.79 27.81,16.21 Z
- M 40.09,27.57
- C 40.09,27.57 7.53,27.57 7.53,27.57
- 7.53,27.57 7.53,52.04 7.53,52.04
- 7.54,54.46 8.45,56.35 10.98,57.06
- 11.34,57.16 12.43,57.24 12.84,57.24
- 12.84,57.24 34.79,57.24 34.79,57.24
- 35.19,57.24 36.29,57.16 36.65,57.06
- 39.17,56.35 40.09,54.45 40.09,52.04
- 40.09,52.04 40.09,27.57 40.09,27.57 Z
- M 27.81,29.90
- C 27.81,29.90 30.51,29.85 30.51,29.85
- 30.51,29.85 35.35,29.85 35.35,29.85
- 36.08,29.86 36.65,29.96 37.18,30.51
- 38.17,31.55 37.93,33.46 36.65,34.15
- 36.17,34.42 35.88,34.42 35.35,34.42
- 35.35,34.42 28.56,34.42 28.56,34.42
- 27.86,34.42 27.34,34.34 26.81,33.84
- 25.69,32.81 25.83,30.48 27.81,29.90 Z" />
+
+<!-- Main refrigerator body -->
+<rect x="8" y="4" width="32" height="56" rx="3" fill="#f8f9fa" stroke="#2c3e50" stroke-width="2"/>
+
+<!-- Freezer section (top) -->
+<rect x="10" y="6" width="28" height="22" rx="2" fill="#ffffff" stroke="#bdc3c7" stroke-width="1"/>
+
+<!-- Main fridge section (bottom) -->
+<rect x="10" y="30" width="28" height="28" rx="2" fill="#ffffff" stroke="#bdc3c7" stroke-width="1"/>
+
+<!-- Freezer door handle -->
+<rect x="34" y="12" width="2" height="8" rx="1" fill="#34495e"/>
+
+<!-- Main door handle -->
+<rect x="34" y="38" width="2" height="12" rx="1" fill="#34495e"/>
+
+<!-- Door separator line -->
+<line x1="10" y1="28" x2="38" y2="28" stroke="#bdc3c7" stroke-width="1"/>
+
+<!-- Simple control indicator -->
+<circle cx="32" cy="16" r="1.5" fill="#3498db"/>
+
+<!-- Subtle brand logo area -->
+<rect x="12" y="8" width="8" height="3" rx="1" fill="#ecf0f1" opacity="0.8"/>
diff --git a/src/hi/apps/entity/templates/entity/svg/type.shed.svg b/src/hi/apps/entity/templates/entity/svg/type.shed.svg
deleted file mode 100644
index 6b42900f..00000000
--- a/src/hi/apps/entity/templates/entity/svg/type.shed.svg
+++ /dev/null
@@ -1,33 +0,0 @@
-<rect class="hi-entity-bg" x="0" y="0" width="64" height="64" fill="none"/>
- <path class="hi-entity-shed-frame"
- fill="#a17d4d" stroke="#d0d0d0" stroke-width="2"
- d="M 6.40,18.60
- C 6.40,18.60 32.32,5.88 32.32,5.88
- 32.32,5.88 58.16,18.68 58.16,18.68
- 58.16,18.68 58.24,55.56 58.24,55.56
- 58.24,55.56 6.24,55.68 6.24,55.68
- 6.24,55.68 6.40,18.60 6.40,18.60 Z" />
- <path class="hi-entity-shed-doors"
- fill="#a17d4d" stroke="#d0d0d0" stroke-width="2"
- d="M 13.20,21.00
- C 13.20,21.00 32.04,20.84 32.04,20.84
- 32.04,20.84 32.00,55.40 32.00,55.40
- 32.00,55.40 13.16,55.44 13.16,55.44
- 13.16,55.44 13.20,21.00 13.20,21.00 Z
- M 32.56,20.80
- C 32.56,20.80 51.32,20.88 51.32,20.88
- 51.32,20.88 51.56,55.52 51.56,55.52
- 51.56,55.52 32.64,55.48 32.64,55.48
- 32.64,55.48 32.56,20.80 32.56,20.80 Z" />
- <path class="hi-entity-shed-windows"
- fill="#87CEEB" stroke="black" stroke-width="2"
- d="M 17.80,25.64
- C 17.80,25.64 27.52,25.56 27.52,25.56
- 27.52,25.56 27.60,30.16 27.60,30.16
- 27.60,30.16 17.76,30.20 17.76,30.20
- 17.76,30.20 17.80,25.64 17.80,25.64 Z
- M 37.12,25.56
- C 37.12,25.56 46.60,25.52 46.60,25.52
- 46.60,25.52 46.68,30.08 46.68,30.08
- 46.68,30.08 37.12,30.08 37.12,30.08
- 37.12,30.08 37.12,25.56 37.12,25.56 Z" />
diff --git a/src/hi/apps/entity/templates/entity/svg/type.smoke_detector.svg b/src/hi/apps/entity/templates/entity/svg/type.smoke_detector.svg
new file mode 100644
index 00000000..855f1373
--- /dev/null
+++ b/src/hi/apps/entity/templates/entity/svg/type.smoke_detector.svg
@@ -0,0 +1,8 @@
+<rect class="hi-entity-bg" x="0" y="0" width="64" height="64" fill="none"/>
+<circle cx="32" cy="32" r="24" fill="#f0f0f0" stroke="#333333" stroke-width="2"/>
+<circle cx="32" cy="32" r="20" fill="#e0e0e0" stroke="#333333" stroke-width="1"/>
+<circle cx="32" cy="32" r="8" fill="#ff4444" stroke="#cc0000" stroke-width="1"/>
+<circle cx="32" cy="20" r="3" fill="#333333"/>
+<circle cx="44" cy="32" r="3" fill="#333333"/>
+<circle cx="32" cy="44" r="3" fill="#333333"/>
+<circle cx="20" cy="32" r="3" fill="#333333"/>
\ No newline at end of file
diff --git a/src/hi/apps/entity/templates/entity/svg/type.solar_panel.svg b/src/hi/apps/entity/templates/entity/svg/type.solar_panel.svg
new file mode 100644
index 00000000..0d23826d
--- /dev/null
+++ b/src/hi/apps/entity/templates/entity/svg/type.solar_panel.svg
@@ -0,0 +1,27 @@
+<rect class="hi-entity-bg" x="0" y="0" width="64" height="64" fill="none"/>
+
+<!-- Sun -->
+<circle cx="16" cy="16" r="6" fill="#ffd700" stroke="#f39c12" stroke-width="1"/>
+<path d="M16,6 L16,2" stroke="#ffd700" stroke-width="2" stroke-linecap="round"/>
+<path d="M26,16 L30,16" stroke="#ffd700" stroke-width="2" stroke-linecap="round"/>
+<path d="M21.2,10.8 L24.4,7.6" stroke="#ffd700" stroke-width="2" stroke-linecap="round"/>
+<path d="M21.2,21.2 L24.4,24.4" stroke="#ffd700" stroke-width="2" stroke-linecap="round"/>
+
+<!-- Solar Panel Frame -->
+<rect x="14" y="28" width="36" height="28" rx="2" fill="#2c3e50" stroke="#34495e" stroke-width="2"/>
+
+<!-- Solar Panel Cells (3x2 grid) -->
+<rect x="16" y="30" width="10" height="8" fill="#3498db" stroke="#2980b9" stroke-width="1"/>
+<rect x="28" y="30" width="10" height="8" fill="#3498db" stroke="#2980b9" stroke-width="1"/>
+<rect x="40" y="30" width="8" height="8" fill="#3498db" stroke="#2980b9" stroke-width="1"/>
+<rect x="16" y="40" width="10" height="8" fill="#3498db" stroke="#2980b9" stroke-width="1"/>
+<rect x="28" y="40" width="10" height="8" fill="#3498db" stroke="#2980b9" stroke-width="1"/>
+<rect x="40" y="40" width="8" height="8" fill="#3498db" stroke="#2980b9" stroke-width="1"/>
+<rect x="16" y="50" width="10" height="4" fill="#3498db" stroke="#2980b9" stroke-width="1"/>
+<rect x="28" y="50" width="10" height="4" fill="#3498db" stroke="#2980b9" stroke-width="1"/>
+<rect x="40" y="50" width="8" height="4" fill="#3498db" stroke="#2980b9" stroke-width="1"/>
+
+<!-- Shine effect on cells -->
+<rect x="17" y="31" width="2" height="6" fill="#5dade2" opacity="0.6"/>
+<rect x="29" y="31" width="2" height="6" fill="#5dade2" opacity="0.6"/>
+<rect x="41" y="31" width="2" height="6" fill="#5dade2" opacity="0.6"/>
\ No newline at end of file
diff --git a/src/hi/apps/entity/templates/entity/svg/type.trimmer.svg b/src/hi/apps/entity/templates/entity/svg/type.trimmer.svg
new file mode 100644
index 00000000..324dfffb
--- /dev/null
+++ b/src/hi/apps/entity/templates/entity/svg/type.trimmer.svg
@@ -0,0 +1,7 @@
+<rect class="hi-entity-bg" x="0" y="0" width="64" height="64" fill="none"/>
+<path d="M16,16 L48,48" stroke="#ff8800" stroke-width="4" stroke-linecap="round"/>
+<circle cx="20" cy="20" r="4" fill="#333333" stroke="#333333" stroke-width="2"/>
+<circle cx="44" cy="44" r="6" fill="#606060" stroke="#333333" stroke-width="2"/>
+<path d="M44,38 L44,50" stroke="#333333" stroke-width="2" stroke-linecap="round"/>
+<path d="M38,44 L50,44" stroke="#333333" stroke-width="2" stroke-linecap="round"/>
+<circle cx="16" cy="16" r="2" fill="#00ff00"/>
\ No newline at end of file
diff --git a/src/hi/apps/entity/templates/entity/svg/type.ups.svg b/src/hi/apps/entity/templates/entity/svg/type.ups.svg
new file mode 100644
index 00000000..dcd2bada
--- /dev/null
+++ b/src/hi/apps/entity/templates/entity/svg/type.ups.svg
@@ -0,0 +1,7 @@
+<rect class="hi-entity-bg" x="0" y="0" width="64" height="64" fill="none"/>
+<rect x="16" y="22" width="32" height="20" rx="2" fill="#333333" stroke="#333333" stroke-width="2"/>
+<rect x="20" y="26" width="24" height="12" fill="#00ff00" opacity="0.8" stroke="#333333" stroke-width="1"/>
+<text x="32" y="35" text-anchor="middle" font-family="monospace" font-size="8" font-weight="bold" fill="#ffffff">UPS</text>
+<rect x="14" y="30" width="4" height="4" fill="#808080"/>
+<rect x="46" y="30" width="4" height="4" fill="#808080"/>
+<circle cx="32" cy="18" r="2" fill="#00ff00"/>
\ No newline at end of file
diff --git a/src/hi/apps/entity/templates/entity/svg/type.vanity.svg b/src/hi/apps/entity/templates/entity/svg/type.vanity.svg
new file mode 100644
index 00000000..ff401f11
--- /dev/null
+++ b/src/hi/apps/entity/templates/entity/svg/type.vanity.svg
@@ -0,0 +1,7 @@
+<rect class="hi-entity-bg" x="0" y="0" width="64" height="64" fill="none"/>
+<rect x="12" y="20" width="40" height="32" rx="2" fill="#8B4513" stroke="#333333" stroke-width="2"/>
+<rect x="16" y="24" width="14" height="12" rx="1" fill="#6B3410" stroke="#333333" stroke-width="1"/>
+<rect x="34" y="24" width="14" height="12" rx="1" fill="#6B3410" stroke="#333333" stroke-width="1"/>
+<rect x="16" y="40" width="32" height="8" rx="1" fill="#f0f0f0" stroke="#333333" stroke-width="1"/>
+<circle cx="32" cy="44" r="2" fill="#808080"/>
+<rect x="20" y="12" width="24" height="10" rx="2" fill="#d0d0d0" stroke="#333333" stroke-width="1"/>
\ No newline at end of file
diff --git a/src/hi/apps/entity/templates/entity/tests/ui/entity_type_visual_browser.html b/src/hi/apps/entity/templates/entity/tests/ui/entity_type_visual_browser.html
new file mode 100644
index 00000000..13904990
--- /dev/null
+++ b/src/hi/apps/entity/templates/entity/tests/ui/entity_type_visual_browser.html
@@ -0,0 +1,253 @@
+{% extends "pages/base.html" %}
+{% block head_title %}HI: EntityType Visual Browser{% endblock %}
+
+{% block content %}
+<div class="container-fluid m-4">
+
+ <h2 class="text-info">EntityType Visual Browser</h2>
+ <p class="text-muted">{{ total_entity_types }} EntityTypes: Icons, Closed Paths, and Open Paths</p>
+
+ <!-- Sticky Controls Header -->
+ <div class="sticky-controls bg-white border-bottom shadow-sm">
+ <div class="container-fluid">
+ <div class="row py-3">
+ <div class="col-md-6">
+ <h5 class="text-primary mb-2">Size Controls</h5>
+ <div class="btn-group" role="group">
+ <button type="button" class="btn btn-outline-secondary btn-sm" onclick="setSize('sm')">Small</button>
+ <button type="button" class="btn btn-outline-secondary btn-sm active" onclick="setSize('md')">Medium</button>
+ <button type="button" class="btn btn-outline-secondary btn-sm" onclick="setSize('lg')">Large</button>
+ </div>
+ </div>
+ <div class="col-md-6 text-md-right">
+ <h5 class="text-primary mb-2">Status Preview</h5>
+ <div class="btn-group" role="group">
+ <button type="button" class="btn btn-outline-secondary btn-sm active" onclick="setStatus('none')">None</button>
+ <button type="button" class="btn btn-outline-secondary btn-sm" onclick="setStatus('active')">Active</button>
+ <button type="button" class="btn btn-outline-secondary btn-sm" onclick="setStatus('on')">On</button>
+ <button type="button" class="btn btn-outline-secondary btn-sm" onclick="setStatus('off')">Off</button>
+ <button type="button" class="btn btn-outline-secondary btn-sm" onclick="setStatus('open')">Open</button>
+ <button type="button" class="btn btn-outline-secondary btn-sm" onclick="setStatus('connected')">Connected</button>
+ <button type="button" class="btn btn-outline-secondary btn-sm" onclick="setStatus('disconnected')">Disconnected</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <!-- Main EntityType Grid -->
+ <div class="row mb-4">
+ <div class="col-12">
+ <h3 class="text-primary">All EntityTypes (Alphabetical)</h3>
+
+ <div class="row" id="entity-types-grid">
+ {% for data in entity_type_data %}
+ <div class="col-xl-2 col-lg-3 col-md-4 col-sm-6 col-12 mb-3">
+ <div class="card entity-type-card" onclick="showEnlarged('{{ data.entity_type.name }}', '{{ data.label }}', '{{ data.visual_type }}')">
+ <div class="card-body text-center">
+
+ <!-- Visual Representation -->
+ <div class="mb-2 d-flex align-items-center justify-content-center" style="height: 80px;">
+ {% if data.visual_type == "Icon" %}
+ {% if data.svg_item %}
+ <svg class="entity-visual img-fluid"
+ xmlns="http://www.w3.org/2000/svg"
+ viewBox="{{ data.svg_item.bounding_box }}"
+ style="max-width: 64px; max-height: 64px;">
+ <g class="status-target">
+ {% include data.svg_item.template_name %}
+ </g>
+ </svg>
+ {% else %}
+ <div class="text-muted text-center">
+ <i class="fas fa-question-circle"></i><br>
+ <small>No Icon</small>
+ </div>
+ {% endif %}
+
+ {% elif data.visual_type == "Closed Path" %}
+ <svg class="entity-visual img-fluid"
+ xmlns="http://www.w3.org/2000/svg"
+ viewBox="0 0 60 60"
+ style="max-width: 60px; max-height: 60px;">
+ <g class="status-target">
+ <path d="{{ data.sample_path_data.svg_path }}"
+ fill="{{ data.sample_path_data.fill_color }}"
+ fill-opacity="{{ data.sample_path_data.fill_opacity }}"
+ stroke="{{ data.sample_path_data.stroke_color }}"
+ stroke-width="{{ data.sample_path_data.stroke_width }}"
+ {% if data.sample_path_data.stroke_dasharray %}stroke-dasharray="{{ data.sample_path_data.stroke_dasharray }}"{% endif %}/>
+ </g>
+ </svg>
+
+ {% elif data.visual_type == "Open Path" %}
+ <svg class="entity-visual img-fluid"
+ xmlns="http://www.w3.org/2000/svg"
+ viewBox="0 0 60 60"
+ style="max-width: 60px; max-height: 60px;">
+ <g class="status-target">
+ <path d="{{ data.sample_path_data.svg_path }}"
+ fill="{{ data.sample_path_data.fill_color }}"
+ fill-opacity="{{ data.sample_path_data.fill_opacity }}"
+ stroke="{{ data.sample_path_data.stroke_color }}"
+ stroke-width="{{ data.sample_path_data.stroke_width }}"
+ {% if data.sample_path_data.stroke_dasharray %}stroke-dasharray="{{ data.sample_path_data.stroke_dasharray }}"{% endif %}
+ stroke-linecap="round"/>
+ </g>
+ </svg>
+ {% endif %}
+ </div>
+
+ <!-- EntityType Info -->
+ <small class="text-muted d-block">{{ data.name }}</small>
+ <small class="text-primary d-block">{{ data.label }}</small>
+ <span class="badge badge-{% if data.visual_type == 'Icon' %}primary{% elif data.visual_type == 'Closed Path' %}success{% else %}warning{% endif %} badge-sm">
+ {{ data.visual_type }}
+ </span>
+
+ {% if data.visual_type == "Icon" and not data.is_registered %}
+ <br><span class="badge badge-danger badge-sm mt-1">Not Registered</span>
+ {% endif %}
+
+ </div>
+ </div>
+ </div>
+ {% endfor %}
+ </div>
+ </div>
+ </div>
+
+
+</div>
+
+<!-- Enlarged View Modal -->
+<div class="modal fade" id="enlargedModal" tabindex="-1" role="dialog">
+ <div class="modal-dialog modal-dialog-centered" role="document">
+ <div class="modal-content">
+ <div class="modal-header">
+ <h5 class="modal-title" id="enlargedModalTitle">EntityType Details</h5>
+ <button type="button" class="close" data-dismiss="modal">
+ <span>&times;</span>
+ </button>
+ </div>
+ <div class="modal-body text-center">
+ <div id="enlargedContent" style="height: 200px; display: flex; align-items: center; justify-content: center;">
+ <!-- Content will be populated by JavaScript -->
+ </div>
+ <div class="mt-3">
+ <strong id="enlargedName"></strong><br>
+ <span class="badge" id="enlargedType"></span>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+<style>
+/* Sticky controls header */
+.sticky-controls {
+ position: sticky;
+ top: 0;
+ z-index: 1020;
+ margin-left: -1.5rem;
+ margin-right: -1.5rem;
+ margin-bottom: 1.5rem;
+}
+
+.entity-type-card {
+ cursor: pointer;
+ transition: transform 0.2s;
+}
+
+.entity-type-card:hover {
+ transform: scale(1.05);
+}
+
+/* Size controls using existing Bootstrap responsive principles */
+.size-sm .entity-visual {
+ max-width: 32px !important;
+ max-height: 32px !important;
+}
+
+.size-lg .entity-visual {
+ max-width: 96px !important;
+ max-height: 96px !important;
+}
+
+/* Status styling handled by existing CSS rules in main.css:
+ g[status="active"], g[status="on"], g[status="off"], g[status="open"],
+ g[status="connected"], g[status="disconnected"], etc. */
+</style>
+
+<script>
+function setSize(size) {
+ const container = document.querySelector('.container-fluid');
+
+ // Remove existing size classes
+ container.classList.remove('size-sm', 'size-md', 'size-lg');
+
+ // Add new size class (md is default, no class needed)
+ if (size !== 'md') {
+ container.classList.add('size-' + size);
+ }
+
+ // Update button states for size controls
+ document.querySelectorAll('.btn-group .btn').forEach(btn => {
+ if (btn.onclick && btn.onclick.toString().includes('setSize')) {
+ btn.classList.remove('active');
+ }
+ });
+ event.target.classList.add('active');
+}
+
+function setStatus(status) {
+ // Find all status target elements (g elements with class status-target)
+ const statusTargets = document.querySelectorAll('.status-target');
+
+ // Remove any existing status attributes
+ statusTargets.forEach(target => {
+ target.removeAttribute('status');
+
+ // Add new status attribute if not 'none'
+ if (status !== 'none') {
+ target.setAttribute('status', status);
+ }
+ });
+
+ // Update button states for status controls
+ document.querySelectorAll('.btn-group .btn').forEach(btn => {
+ if (btn.onclick && btn.onclick.toString().includes('setStatus')) {
+ btn.classList.remove('active');
+ }
+ });
+ event.target.classList.add('active');
+}
+
+function showEnlarged(entityTypeName, label, visualType) {
+ // Find the original card element
+ const originalCard = event.currentTarget;
+ const originalVisual = originalCard.querySelector('.entity-visual').cloneNode(true);
+
+ // Make it larger by removing size restrictions and adding Bootstrap classes
+ originalVisual.style.maxWidth = '128px';
+ originalVisual.style.maxHeight = '128px';
+ originalVisual.classList.add('img-fluid');
+
+ // Update modal content
+ document.getElementById('enlargedModalTitle').textContent = label;
+ document.getElementById('enlargedContent').innerHTML = '';
+ document.getElementById('enlargedContent').appendChild(originalVisual);
+ document.getElementById('enlargedName').textContent = entityTypeName;
+
+ const typeBadge = document.getElementById('enlargedType');
+ typeBadge.textContent = visualType;
+ typeBadge.className = 'badge badge-' +
+ (visualType === 'Icon' ? 'primary' :
+ visualType === 'Closed Path' ? 'success' : 'warning');
+
+ // Show modal
+ $('#enlargedModal').modal('show');
+}
+</script>
+
+{% endblock %}
\ No newline at end of file
diff --git a/src/hi/apps/entity/templates/entity/tests/ui/home.html b/src/hi/apps/entity/templates/entity/tests/ui/home.html
new file mode 100644
index 00000000..ddb7bb7e
--- /dev/null
+++ b/src/hi/apps/entity/templates/entity/tests/ui/home.html
@@ -0,0 +1,40 @@
+{% extends "pages/base.html" %}
+{% block head_title %}HI: {{ app_name|title }} UI Tests{% endblock %}
+
+{% block content %}
+<div class="container-fluid m-4">
+ <h2 class="text-info">{{ app_name|title }} UI Tests</h2>
+
+ <div class="row">
+ <div class="col-md-8">
+ <h3>Visual Testing Tools</h3>
+ <ul class="list-group">
+ <li class="list-group-item">
+ <a href="{% url 'test_entity_type_visual_browser' %}">
+ <strong>EntityType Visual Browser</strong>
+ </a>
+ <p class="text-muted mb-0 mt-1">
+ View all EntityType visual representations (icons, closed paths, open paths) with zoom controls and status variations.
+ </p>
+ </li>
+ </ul>
+ </div>
+
+ <div class="col-md-4">
+ <h3>About Entity Visual Testing</h3>
+ <div class="card">
+ <div class="card-body">
+ <p class="card-text">
+ Entity visual testing tools help developers verify how EntityTypes render without manually creating entities in the app.
+ </p>
+ <ul class="small text-muted">
+ <li><strong>Icons:</strong> SVG icons for point-like entities</li>
+ <li><strong>Closed Paths:</strong> Filled areas for rooms/zones</li>
+ <li><strong>Open Paths:</strong> Lines for wires/pipes</li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/src/hi/apps/entity/tests/ui/__init__.py b/src/hi/apps/entity/tests/ui/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/src/hi/apps/entity/tests/ui/urls.py b/src/hi/apps/entity/tests/ui/urls.py
new file mode 100644
index 00000000..36124ca3
--- /dev/null
+++ b/src/hi/apps/entity/tests/ui/urls.py
@@ -0,0 +1,12 @@
+from django.urls import re_path
+from . import views
+
+urlpatterns = [
+ re_path(r'^$',
+ views.TestUiEntityHomeView.as_view(),
+ name='entity_tests_ui'),
+
+ re_path(r'^visual-browser/$',
+ views.TestUiEntityTypeVisualBrowserView.as_view(),
+ name='test_entity_type_visual_browser'),
+]
diff --git a/src/hi/apps/entity/tests/ui/views.py b/src/hi/apps/entity/tests/ui/views.py
new file mode 100644
index 00000000..2b4c52eb
--- /dev/null
+++ b/src/hi/apps/entity/tests/ui/views.py
@@ -0,0 +1,116 @@
+from django.shortcuts import render
+from django.views.generic import View
+
+from hi.apps.entity.enums import EntityType
+from hi.apps.entity.models import Entity
+from hi.apps.location.svg_item_factory import SvgItemFactory
+from hi.hi_styles import EntityStyle
+
+
+class TestUiEntityHomeView(View):
+ """Home view for entity app UI testing."""
+
+ def get(self, request, *args, **kwargs):
+ context = {
+ 'app_name': 'entity',
+ }
+ return render(request, "entity/tests/ui/home.html", context)
+
+
+class TestUiEntityTypeVisualBrowserView(View):
+ """
+ Visual browser for all EntityType representations.
+ Shows icons, closed paths, and open paths for all EntityTypes.
+ """
+
+ def get(self, request, *args, **kwargs):
+ # Get all EntityTypes sorted alphabetically
+ all_entity_types = sorted(EntityType, key=lambda et: et.name)
+
+ # Process each EntityType to determine its visual representation
+ entity_type_data = []
+ for entity_type in all_entity_types:
+ data = self.get_entity_type_visual_data(entity_type)
+ entity_type_data.append(data)
+
+ context = {
+ 'entity_type_data': entity_type_data,
+ 'total_entity_types': len(all_entity_types),
+ }
+ return render(request, "entity/tests/ui/entity_type_visual_browser.html", context)
+
+ def get_entity_type_visual_data(self, entity_type):
+ """Get visual representation data for an EntityType."""
+ data = {
+ 'entity_type': entity_type,
+ 'name': entity_type.name,
+ 'label': entity_type.label,
+ 'visual_type': self.get_visual_type(entity_type),
+ 'is_registered': entity_type in EntityStyle.EntityTypesWithIcons,
+ 'svg_item': None,
+ 'sample_path_data': None,
+ }
+
+ if entity_type.requires_position():
+ # Icon-based entity
+ data['svg_item'] = self.create_svg_icon_item(entity_type)
+ elif entity_type.requires_closed_path():
+ # Closed path entity
+ data['sample_path_data'] = self.create_sample_path_with_real_styling(entity_type, 'closed')
+ elif entity_type.requires_open_path():
+ # Open path entity
+ data['sample_path_data'] = self.create_sample_path_with_real_styling(entity_type, 'open')
+
+ return data
+
+ def get_visual_type(self, entity_type):
+ """Determine the visual representation type for an EntityType."""
+ if entity_type.requires_open_path():
+ return 'Open Path'
+ elif entity_type.requires_closed_path():
+ return 'Closed Path'
+ else:
+ return 'Icon'
+
+ def create_svg_icon_item(self, entity_type):
+ """Create an SVG icon item for display-only rendering."""
+ try:
+ # Create a synthetic entity for rendering context
+ synthetic_entity = Entity(
+ name=f"Test {entity_type.label}",
+ entity_type=entity_type,
+ integration_id=f'test.{entity_type.name.lower()}',
+ integration_name='test_integration'
+ )
+
+ # Use SvgItemFactory to create proper display item
+ svg_factory = SvgItemFactory()
+ svg_item = svg_factory.get_display_only_svg_icon_item(synthetic_entity)
+ return svg_item
+
+ except Exception:
+ # Return None if there's an issue creating the icon
+ return None
+
+ def create_sample_path_with_real_styling(self, entity_type, path_type):
+ """Create sample path data using real EntityStyle.get_svg_path_status_style()."""
+ # Get the real styling for this entity type
+ svg_status_style = EntityStyle.get_svg_path_status_style(entity_type)
+
+ # Create appropriate sample path based on type
+ if path_type == 'closed':
+ # Closed path (rectangle for demonstration)
+ sample_path = 'M 10,10 L 50,10 L 50,50 L 10,50 Z'
+ else:
+ # Open path (line for demonstration)
+ sample_path = 'M 10,30 L 20,25 L 30,35 L 40,30 L 50,30'
+
+ return {
+ 'svg_path': sample_path,
+ 'fill_color': svg_status_style.fill_color,
+ 'stroke_color': svg_status_style.stroke_color,
+ 'stroke_width': str(svg_status_style.stroke_width),
+ 'stroke_dasharray': ','.join(map(str, svg_status_style.stroke_dasharray)) if svg_status_style.stroke_dasharray else '',
+ 'fill_opacity': svg_status_style.fill_opacity,
+ }
+
diff --git a/src/hi/apps/profiles/assets/profiles/apartment.json b/src/hi/apps/profiles/assets/profiles/apartment.json
index 7072496e..72691f5e 100644
--- a/src/hi/apps/profiles/assets/profiles/apartment.json
+++ b/src/hi/apps/profiles/assets/profiles/apartment.json
@@ -48,6 +48,26 @@
"visible_in_views": [
"All"
]
+ },
+ {
+ "name": "Electronics",
+ "collection_type_str": "electronics",
+ "collection_view_type_str": "grid",
+ "order_id": 4,
+ "entities": [
+ "Laptop",
+ "Mobile Phone",
+ "Gaming System"
+ ],
+ "paths": [
+ {
+ "location_name": "My Home",
+ "svg_path": "M 823.3533790955232,985.8875988155462 L 1178.4192381842113,985.8875988155462 L 1178.4192381842113,1254.3023930466932 L 823.3533790955232,1254.3023930466932 Z"
+ }
+ ],
+ "visible_in_views": [
+ "All"
+ ]
}
],
"entities": [
@@ -58,8 +78,8 @@
"positions": [
{
"location_name": "My Home",
- "svg_x": 243.805206,
- "svg_y": 953.147949,
+ "svg_x": 278.080048,
+ "svg_y": 961.716675,
"svg_scale": 1.673368
}
],
@@ -88,15 +108,30 @@
"Exterior"
]
},
+ {
+ "name": "Coffee Machine",
+ "entity_type_str": "coffee_maker",
+ "positions": [
+ {
+ "location_name": "My Home",
+ "svg_x": 1747.110962,
+ "svg_y": 711.662842,
+ "svg_scale": 2.99799
+ }
+ ],
+ "visible_in_views": [
+ "All"
+ ]
+ },
{
"name": "Dryer",
"entity_type_str": "clothes_dryer",
"positions": [
{
"location_name": "My Home",
- "svg_x": 1777.978882,
- "svg_y": 1361.411255,
- "svg_scale": 1.712929
+ "svg_x": 1766.678955,
+ "svg_y": 1381.208496,
+ "svg_scale": 2.397479
}
],
"visible_in_views": [
@@ -107,30 +142,42 @@
"name": "Food Processor",
"entity_type_str": "appliance"
},
+ {
+ "name": "Gaming System",
+ "entity_type_str": "other"
+ },
+ {
+ "name": "Laptop",
+ "entity_type_str": "computer"
+ },
{
"name": "Microwave",
"entity_type_str": "microwave_oven",
"positions": [
{
"location_name": "My Home",
- "svg_x": 1722.6073,
- "svg_y": 666.888,
- "svg_scale": 1.326768
+ "svg_x": 1582.65979,
+ "svg_y": 703.361755,
+ "svg_scale": 2.208718
}
],
"visible_in_views": [
"All"
]
},
+ {
+ "name": "Mobile Phone",
+ "entity_type_str": "other"
+ },
{
"name": "Refrigerator",
"entity_type_str": "refrigerator",
"positions": [
{
"location_name": "My Home",
- "svg_x": 1794.635742,
- "svg_y": 777.043701,
- "svg_scale": 1.471845
+ "svg_x": 1759.571411,
+ "svg_y": 913.085083,
+ "svg_scale": 3.580818
}
],
"visible_in_views": [
@@ -147,9 +194,9 @@
"positions": [
{
"location_name": "My Home",
- "svg_x": 244.450958,
- "svg_y": 830.973022,
- "svg_scale": 1.761753
+ "svg_x": 284.881439,
+ "svg_y": 820.065247,
+ "svg_scale": 3.494066
}
],
"visible_in_views": [
@@ -162,9 +209,9 @@
"positions": [
{
"location_name": "My Home",
- "svg_x": 1779.282104,
- "svg_y": 1226.346924,
- "svg_scale": 1.683932
+ "svg_x": 1771.391724,
+ "svg_y": 1208.834717,
+ "svg_scale": 2.375069
}
],
"visible_in_views": [
@@ -192,9 +239,9 @@
"positions": [
{
"location_name": "My Home",
- "svg_x": 246.357956,
- "svg_y": 700.745972,
- "svg_scale": 1.351972
+ "svg_x": 788.435913,
+ "svg_y": 705.137451,
+ "svg_scale": 1.95791
}
],
"visible_in_views": [
diff --git a/src/hi/apps/profiles/assets/profiles/single_story.json b/src/hi/apps/profiles/assets/profiles/single_story.json
index 496905b5..9ae15272 100644
--- a/src/hi/apps/profiles/assets/profiles/single_story.json
+++ b/src/hi/apps/profiles/assets/profiles/single_story.json
@@ -19,7 +19,7 @@
{
"name": "Exterior",
"location_view_type_str": "default",
- "svg_view_box_str": "0 638.7247498505448 2265.4049914169536 1712.5505002989098",
+ "svg_view_box_str": "0 318.06855973518157 2415 2569.8468517796878",
"svg_style_name_str": "color",
"svg_rotate": 0.0,
"order_id": 4
@@ -125,14 +125,28 @@
"Interior"
]
},
+ {
+ "name": "Cable/Internet Service",
+ "entity_type_str": "telecom_wire",
+ "comment": "Path entity (EntityPath) - represented by SVG paths",
+ "paths": [
+ {
+ "location_name": "My Home",
+ "svg_path": " M 2179.982431137094,196.57792663574173 L 1657.2027116470472,1139.6352539062495"
+ }
+ ],
+ "visible_in_views": [
+ "Exterior"
+ ]
+ },
{
"name": "Car",
"entity_type_str": "automobile",
"positions": [
{
"location_name": "My Home",
- "svg_x": 1496.240479,
- "svg_y": 1881.578247,
+ "svg_x": 1493.880981,
+ "svg_y": 1879.286499,
"svg_rotate": 267.210213
}
],
@@ -140,6 +154,21 @@
"Exterior"
]
},
+ {
+ "name": "Coffee Machine",
+ "entity_type_str": "coffee_maker",
+ "positions": [
+ {
+ "location_name": "My Home",
+ "svg_x": 1619.84021,
+ "svg_y": 1196.970825,
+ "svg_rotate": 357.022144
+ }
+ ],
+ "visible_in_views": [
+ "Kitchen"
+ ]
+ },
{
"name": "Dishwasher",
"entity_type_str": "dishwasher",
@@ -187,10 +216,53 @@
"Exterior"
]
},
+ {
+ "name": "Electric Service",
+ "entity_type_str": "electric_wire",
+ "paths": [
+ {
+ "location_name": "My Home",
+ "svg_path": " M 2215.5436493988127,196.55610656738236 L 1690.0055680923597,1183.372436523437"
+ }
+ ],
+ "visible_in_views": [
+ "Exterior"
+ ]
+ },
+ {
+ "name": "Elm",
+ "entity_type_str": "tree",
+ "positions": [
+ {
+ "location_name": "My Home",
+ "svg_x": 317.453674,
+ "svg_y": 356.626373,
+ "svg_scale": 3.87844
+ }
+ ],
+ "visible_in_views": [
+ "Exterior"
+ ]
+ },
{
"name": "Food Processor",
"entity_type_str": "appliance"
},
+ {
+ "name": "Garbage Disposal",
+ "entity_type_str": "garbage_disposal",
+ "positions": [
+ {
+ "location_name": "My Home",
+ "svg_x": 1477.062256,
+ "svg_y": 1171.971313,
+ "svg_scale": 0.558648
+ }
+ ],
+ "visible_in_views": [
+ "Kitchen"
+ ]
+ },
{
"name": "HVAC",
"entity_type_str": "hvac_air_handler",
@@ -208,7 +280,7 @@
},
{
"name": "Hedge Trimmer",
- "entity_type_str": "other"
+ "entity_type_str": "hedge_trimmer"
},
{
"name": "Kitchen Sink",
@@ -228,11 +300,11 @@
},
{
"name": "Lawn Mower",
- "entity_type_str": "other"
+ "entity_type_str": "lawn_mower"
},
{
"name": "Leaf Blower",
- "entity_type_str": "other"
+ "entity_type_str": "leaf_blower"
},
{
"name": "Microwave",
@@ -269,7 +341,6 @@
{
"name": "Pool",
"entity_type_str": "area",
- "comment": "Path entity (EntityPath) - represented by SVG paths",
"paths": [
{
"location_name": "My Home",
@@ -302,7 +373,7 @@
},
{
"name": "String Trimmer",
- "entity_type_str": "other"
+ "entity_type_str": "trimmer"
},
{
"name": "Television",
@@ -382,6 +453,19 @@
"Exterior"
]
},
+ {
+ "name": "Water Service",
+ "entity_type_str": "water_line",
+ "paths": [
+ {
+ "location_name": "My Home",
+ "svg_path": " M 1693.4159028167815,1650.810668945312 L 2212.1012712173597,2785.221557617187"
+ }
+ ],
+ "visible_in_views": [
+ "Exterior"
+ ]
+ },
{
"name": "WiFi Router",
"entity_type_str": "access_point",
@@ -398,4 +482,4 @@
]
}
]
-}
+}
\ No newline at end of file
diff --git a/src/hi/apps/profiles/assets/profiles/two_story.json b/src/hi/apps/profiles/assets/profiles/two_story.json
index 08d04925..b6d9c8f7 100644
--- a/src/hi/apps/profiles/assets/profiles/two_story.json
+++ b/src/hi/apps/profiles/assets/profiles/two_story.json
@@ -140,6 +140,21 @@
"Exterior"
]
},
+ {
+ "name": "Coffee Machine",
+ "entity_type_str": "coffee_maker",
+ "positions": [
+ {
+ "location_name": "My Home",
+ "svg_x": 1651.280273,
+ "svg_y": 665.384888,
+ "svg_scale": 1.526897
+ }
+ ],
+ "visible_in_views": [
+ "Kitchen"
+ ]
+ },
{
"name": "Dishwasher",
"entity_type_str": "dishwasher",
@@ -213,7 +228,7 @@
},
{
"name": "Hedge Trimmer",
- "entity_type_str": "other"
+ "entity_type_str": "hedge_trimmer"
},
{
"name": "Kitchen Sink",
@@ -233,11 +248,26 @@
},
{
"name": "Lawn Mower",
- "entity_type_str": "other"
+ "entity_type_str": "lawn_mower"
},
{
"name": "Leaf Blower",
- "entity_type_str": "other"
+ "entity_type_str": "leaf_blower"
+ },
+ {
+ "name": "Live Oak",
+ "entity_type_str": "tree",
+ "positions": [
+ {
+ "location_name": "My Home",
+ "svg_x": 238.043137,
+ "svg_y": 242.832367,
+ "svg_scale": 4.283128
+ }
+ ],
+ "visible_in_views": [
+ "Exterior"
+ ]
},
{
"name": "Microwave",
@@ -245,8 +275,8 @@
"positions": [
{
"location_name": "My Home",
- "svg_x": 1722.6073,
- "svg_y": 666.888,
+ "svg_x": 1761.850586,
+ "svg_y": 671.72168,
"svg_scale": 1.326768
}
],
@@ -293,7 +323,7 @@
},
{
"name": "String Trimmer",
- "entity_type_str": "other"
+ "entity_type_str": "trimmer"
},
{
"name": "Television",
@@ -386,4 +416,4 @@
]
}
]
-}
+}
\ No newline at end of file
diff --git a/src/hi/hi_styles.py b/src/hi/hi_styles.py
index 22fb870e..270a9a89 100644
--- a/src/hi/hi_styles.py
+++ b/src/hi/hi_styles.py
@@ -126,7 +126,7 @@ class EntityStyle:
stroke_color = '#040406',
stroke_width = 2,
stroke_dasharray = [],
- fill_color = '#e6f0fa',
+ fill_color = '#f8f8f0',
fill_opacity = 1,
)
Area = SvgStatusStyle(
@@ -246,33 +246,45 @@ class EntityStyle:
# Default icon used if not in this map
EntityType.ACCESS_POINT,
EntityType.ANTENNA,
+ EntityType.APPLIANCE,
EntityType.ATTIC_STAIRS,
EntityType.AUTOMOBILE,
EntityType.AV_RECEIVER,
EntityType.BAROMETER,
+ EntityType.BATHTUB,
EntityType.CAMERA,
+ EntityType.CARBON_MONOXIDE_DETECTOR,
EntityType.CEILING_FAN,
EntityType.CLOTHES_DRYER,
EntityType.CLOTHES_WASHER,
+ EntityType.COFFEE_MAKER,
EntityType.COMPUTER,
EntityType.CONSUMABLE,
EntityType.CONTROLLER,
EntityType.COOKTOP,
EntityType.DISHWASHER,
EntityType.DISK,
+ EntityType.DOORBELL,
EntityType.DOOR_LOCK,
EntityType.ELECTRICAL_OUTLET,
EntityType.ELECTRICITY_METER,
EntityType.ELECTRIC_PANEL,
EntityType.EXHAUST_FAN,
+ EntityType.FIRE_EXTINGUISHER,
EntityType.FIREPLACE,
+ EntityType.GARBAGE_DISPOSAL,
+ EntityType.GENERATOR,
+ EntityType.GRILL,
EntityType.HEALTHCHECK,
+ EntityType.HEDGE_TRIMMER,
EntityType.HUMIDIFIER,
EntityType.HVAC_AIR_HANDLER,
EntityType.HVAC_CONDENSER,
EntityType.HVAC_FURNACE,
EntityType.HVAC_MINI_SPLIT,
EntityType.HYGROMETER,
+ EntityType.LAWN_MOWER,
+ EntityType.LEAF_BLOWER,
EntityType.LIGHT,
EntityType.LIGHT_SENSOR,
EntityType.MICROWAVE_OVEN,
@@ -285,17 +297,20 @@ class EntityStyle:
EntityType.OVEN,
EntityType.PLANT,
EntityType.POOL_FILTER,
+ EntityType.POWER_WASHER,
EntityType.PRESENCE_SENSOR,
EntityType.PRINTER,
EntityType.PUMP,
+ EntityType.RANGE_HOOD,
EntityType.REFRIGERATOR,
EntityType.SATELLITE_DISH,
EntityType.SERVER,
EntityType.SERVICE,
- EntityType.SHED,
EntityType.SHOWER,
EntityType.SINK,
EntityType.SKYLIGHT,
+ EntityType.SMOKE_DETECTOR,
+ EntityType.SOLAR_PANEL,
EntityType.SPEAKER,
EntityType.SPRINKLER_HEAD,
EntityType.SPRINKLER_VALVE,
@@ -307,6 +322,9 @@ class EntityStyle:
EntityType.TOILET,
EntityType.TOOL,
EntityType.TREE,
+ EntityType.TRIMMER,
+ EntityType.UPS,
+ EntityType.VANITY,
EntityType.WALL_SWITCH,
EntityType.WATER_HEATER,
EntityType.WATER_METER,
@@ -346,10 +364,11 @@ class EntityStyle:
EntityType.WATER_METER: SvgViewBox( x = 0, y = 0, width = 64, height = 43 ),
}
PathEntityTypeToSvgStatusStyle = {
- EntityType.APPLIANCE: Appliance,
+ EntityType.LARGE_APPLIANCE: Appliance,
EntityType.AREA: Area,
EntityType.CONTROL_WIRE: ControlWire,
EntityType.DOOR: Door,
+ EntityType.DRAINAGE_PIPE: Pipe,
EntityType.ELECTRIC_WIRE: ElectricWire,
EntityType.FENCE: Fence,
EntityType.FURNITURE: Furniture,
diff --git a/src/hi/static/css/main.css b/src/hi/static/css/main.css
index 298eb394..fd060e25 100644
--- a/src/hi/static/css/main.css
+++ b/src/hi/static/css/main.css
@@ -622,6 +622,15 @@ svg .highlighted {
g.hi-icon {
pointer-events: all;
}
+
+/* Hide background rectangles used for click targets */
+.hi-entity-bg {
+ fill: none !important;
+ stroke: none !important;
+ opacity: 0;
+ pointer-events: all;
+}
+
path.hi-path-closed[hover] {
}
path.hover-target {
diff --git a/src/hi/templates/panes/top_buttons.html b/src/hi/templates/panes/top_buttons.html
index a4eb087d..85c5bf51 100644
--- a/src/hi/templates/panes/top_buttons.html
+++ b/src/hi/templates/panes/top_buttons.html
@@ -6,10 +6,14 @@
<img src="{% static 'img/hi-logo-149x64.png' %}" alt="Home Information Logo">
</div>
<div class="d-flex justify-content-end">
- {% if request.view_parameters.location and not request.view_parameters.is_editing %}
+ {% if request.view_parameters.location %}
<div class="px-1">
- <a href="{% url 'location_edit_location_edit' location_id=request.view_parameters.location.id %}"
- class="btn btn-primary btn-control" role="button"
+ <a class="btn btn-primary btn-control" role="button"
+ {% if request.view_parameters.is_editing %}
+ href="{% url 'location_edit_mode' location_id=request.view_parameters.location.id %}"
+ {% else %}
+ href="{% url 'location_edit_location_edit' location_id=request.view_parameters.location.id %}"
+ {% endif %}
data-async="true" >
{{ request.view_parameters.location.name }}
</a>