|
- {{ b.code }}
+ {{ b.code }}
+ {% if b.room_number %}
+ {{ b.room_number }}
+ {% endif %}
{{ b.get_name }}
|
diff --git a/loko/assets/templates/assets/buildings/publicbuilding_location_tree.html b/loko/assets/templates/assets/buildings/publicbuilding_location_tree.html
index 56ddceb..42f11d1 100644
--- a/loko/assets/templates/assets/buildings/publicbuilding_location_tree.html
+++ b/loko/assets/templates/assets/buildings/publicbuilding_location_tree.html
@@ -18,20 +18,15 @@
{% endif %}
- {% if child_node.loc.location_type == 'building' or child_node.loc.location_type == 'site' %}
-
- {% elif child_node.loc.location_type == 'level' %}
-
- {% elif child_node.loc.location_type == 'room' %}
-
- {% else %}
-
- {% endif %}
+
{{ child_node.loc.code }}
+ {% if child_node.loc.room_number %}
+ {{ child_node.loc.room_number }}
+ {% endif %}
- {{ child_node.loc.get_name }}
{{ child_node.loc.get_location_type_display }}
diff --git a/loko/assets/tests.py b/loko/assets/tests.py
index 7016db8..b867ad5 100644
--- a/loko/assets/tests.py
+++ b/loko/assets/tests.py
@@ -4043,6 +4043,119 @@ class PublicBuildingTestCase(TestCase):
self.assertIn(facade_asset, civil_asset.get_child_assets())
self.assertIn(hvac_asset, civil_asset.get_child_assets())
+ def test_extended_building_locations(self):
+ # Cage d'escalier
+ stairwell = PublicBuilding.objects.create(
+ code="ESC-01",
+ name_fr="Cage d'escalier Nord",
+ parent_location=self.bloc_a,
+ location_type="stairwell",
+ level_number=0
+ )
+ # Chaufferie / Local technique
+ boiler_room = PublicBuilding.objects.create(
+ code="CHAUFF-01",
+ name_fr="Chaufferie Centrale",
+ parent_location=self.bloc_a,
+ location_type="boiler_room",
+ level_number=-1,
+ floor_type="concrete",
+ fire_compartment="Zone-CF-01",
+ is_heated=True
+ )
+ # Bureau avec numéro de porte et hauteur
+ office = PublicBuilding.objects.create(
+ code="BUR-101",
+ name_fr="Bureau Directeur",
+ parent_location=self.etage_0,
+ location_type="office",
+ room_number="B-101",
+ ceiling_height_m=2.85,
+ surface_m2=24.5,
+ floor_type="parquet",
+ is_heated=True
+ )
+
+ self.assertEqual(stairwell.location_type, "stairwell")
+ self.assertEqual(stairwell.get_icon_class(), "bi-stairs")
+ self.assertEqual(boiler_room.location_type, "boiler_room")
+ self.assertEqual(boiler_room.get_icon_class(), "bi-fire")
+ self.assertEqual(boiler_room.floor_type, "concrete")
+ self.assertEqual(office.room_number, "B-101")
+ self.assertEqual(office.ceiling_height_m, 2.85)
+ self.assertEqual(office.get_icon_class(), "bi-briefcase")
+
+ def test_extended_building_assets_envelope_and_technical(self):
+ # Toiture
+ roof = BuildingAsset.objects.create(
+ building=self.complex,
+ location=self.bloc_a,
+ code="TOIT-01",
+ name_fr="Toiture bac acier et zinc",
+ asset_type="roof",
+ surface_m2=450.0,
+ material="Zinc & Bac acier"
+ )
+ # Fenêtre
+ window = BuildingAsset.objects.create(
+ building=self.complex,
+ location=self.etage_0,
+ parent_asset=roof,
+ code="FEN-101",
+ name_fr="Châssis double vitrage",
+ asset_type="window",
+ dimensions="120x140 cm",
+ material="Aluminium",
+ glazing_type="double_low_e",
+ opening_type="tilt_and_turn"
+ )
+ # Chaudière
+ boiler = BuildingAsset.objects.create(
+ building=self.complex,
+ location=self.etage_0,
+ code="CHAUD-01",
+ name_fr="Chaudière à condensation",
+ asset_type="boiler",
+ power_kw=65.0,
+ energy_source="natural_gas",
+ contractor_name="Maintenance Thermique SA",
+ maintenance_contract_ref="CTR-2026-CHAUD",
+ regulatory_periodicity_months=12
+ )
+ # Pompe à chaleur
+ heat_pump = BuildingAsset.objects.create(
+ building=self.complex,
+ location=self.etage_0,
+ code="PAC-01",
+ name_fr="Pompe à chaleur réversible",
+ asset_type="heat_pump",
+ power_kw=22.0,
+ energy_source="heat_pump_air",
+ refrigerant_type="R32",
+ refrigerant_charge_kg=4.5
+ )
+ # Ascenseur
+ elevator = BuildingAsset.objects.create(
+ building=self.complex,
+ location=self.bloc_a,
+ code="ASC-01",
+ name_fr="Ascenseur 8 personnes PMR",
+ asset_type="elevator",
+ contractor_name="Otis",
+ regulatory_periodicity_months=6
+ )
+
+ # Vérifications macro-lots et icônes
+ self.assertEqual(roof.get_macro_lot(), "Clos & Couvert")
+ self.assertEqual(roof.get_icon_class(), "bi-house-gear")
+ self.assertEqual(window.get_macro_lot(), "Clos & Couvert")
+ self.assertEqual(window.get_icon_class(), "bi-window")
+ self.assertEqual(boiler.get_macro_lot(), "Génie climatique & CVC")
+ self.assertEqual(boiler.get_icon_class(), "bi-fire")
+ self.assertEqual(heat_pump.refrigerant_type, "R32")
+ self.assertEqual(elevator.get_macro_lot(), "Ascenseurs & Élévateurs")
+ self.assertEqual(elevator.get_icon_class(), "bi-arrow-down-up")
+
class PublicBuildingEditViewTest(TestCase):
def setUp(self):
|