Commit ·
c91deb8
1
Parent(s): 4a49137
Fix Internal Blockwork: disable CV internal wall override to use accurate mathematical length; separate 10cm and 20cm blocks in UI and BOQ
Browse files
api/routers/extraction.py
CHANGED
|
@@ -111,9 +111,8 @@ async def run_extraction(req: RunExtractionReq, current_user: dict = Depends(get
|
|
| 111 |
cv_perim_px = cv_data.get("cv_perimeter_px", 0)
|
| 112 |
if perim_m and cv_perim_px > 0:
|
| 113 |
scale = perim_m / cv_perim_px
|
| 114 |
-
|
| 115 |
-
|
| 116 |
-
cv_data["int_walls_length"] = round(int_walls_m, 2)
|
| 117 |
|
| 118 |
extracted.update(cv_data)
|
| 119 |
|
|
|
|
| 111 |
cv_perim_px = cv_data.get("cv_perimeter_px", 0)
|
| 112 |
if perim_m and cv_perim_px > 0:
|
| 113 |
scale = perim_m / cv_perim_px
|
| 114 |
+
# Do not overwrite int_walls_length with the highly inflated cv_data value.
|
| 115 |
+
# The AI mathematically calculates it much more accurately from room dimensions.
|
|
|
|
| 116 |
|
| 117 |
extracted.update(cv_data)
|
| 118 |
|
engine/boq_builder.py
CHANGED
|
@@ -91,8 +91,9 @@ def build_boq_dataframe(
|
|
| 91 |
# 7. Ground Floor Plan | مسقط الدور الأرضي
|
| 92 |
add_section("Ground Floor Plan | مسقط الدور الأرضي")
|
| 93 |
gf_res = finish_results.get("gf", {})
|
| 94 |
-
add_item("Thermal Block External (GF)", "بلوك حراري خارجي أرضي", "m²", gf_res.get("thermal_block", 0.0))
|
| 95 |
-
add_item("Internal Block Work (GF)", "بلوك داخلي أرضي", "m²", gf_res.get("int_block", 0.0))
|
|
|
|
| 96 |
add_item("Dry Area Flooring (GF)", "بلاط الأرضي الجاف", "m²", gf_res.get("dry_floor", 0.0))
|
| 97 |
add_item("Wet Area Flooring (GF)", "بلاط الأرضي الرطب", "m²", gf_res.get("wet_floor", 0.0))
|
| 98 |
add_item("Wall Tiles (GF Wet Areas)", "بلاط جدران رطب أرضي", "m²", gf_res.get("wall_tiles", 0.0))
|
|
@@ -106,8 +107,9 @@ def build_boq_dataframe(
|
|
| 106 |
# 8. 1st Floor Plan | مسقط الدور الأول
|
| 107 |
add_section("1st Floor Plan | مسقط الدور الأول")
|
| 108 |
f1_res = finish_results.get("f1", {})
|
| 109 |
-
add_item("Thermal Block External (1F)", "بلوك حراري خارجي أول", "m²", f1_res.get("thermal_block", 0.0))
|
| 110 |
-
add_item("Internal Block Work (1F)", "بلوك داخلي أول", "m²", f1_res.get("int_block", 0.0))
|
|
|
|
| 111 |
add_item("Dry Area Flooring (1F)", "بلاط الأول الجاف", "m²", f1_res.get("dry_floor", 0.0))
|
| 112 |
add_item("Wet Area Flooring (1F)", "بلاط الأول الرطب", "m²", f1_res.get("wet_floor", 0.0))
|
| 113 |
add_item("Wall Tiles (1F Wet Areas)", "بلاط جدران رطب أول", "m²", f1_res.get("wall_tiles", 0.0))
|
|
@@ -119,8 +121,9 @@ def build_boq_dataframe(
|
|
| 119 |
# 9. 2nd Floor Plan | مسقط الدور الثاني
|
| 120 |
add_section("2nd Floor Plan | مسقط الدور الثاني")
|
| 121 |
f2_res = finish_results.get("f2", {})
|
| 122 |
-
add_item("Thermal Block External (2F)", "بلوك حراري خارجي ثاني", "m²", f2_res.get("thermal_block", 0.0))
|
| 123 |
-
add_item("Internal Block Work (2F)", "بلوك داخلي ثاني", "m²", f2_res.get("int_block", 0.0))
|
|
|
|
| 124 |
add_item("Dry Area Flooring (2F)", "بلاط الثاني الجاف", "m²", f2_res.get("dry_floor", 0.0))
|
| 125 |
add_item("Wet Area Flooring (2F)", "بلاط الثاني الرطب", "m²", f2_res.get("wet_floor", 0.0))
|
| 126 |
add_item("Wet Area Waterproofing (2F)", "عزل رطب ثاني", "m²", finish_results.get("wet_waterproofing", 0.0) if num_floors >= 3 else 0.0)
|
|
|
|
| 91 |
# 7. Ground Floor Plan | مسقط الدور الأرضي
|
| 92 |
add_section("Ground Floor Plan | مسقط الدور الأرضي")
|
| 93 |
gf_res = finish_results.get("gf", {})
|
| 94 |
+
add_item("Thermal Block External (GF) (200mm Thickness)", "بلوك حراري خارجي أرضي (سماكة 200mm)", "m²", gf_res.get("thermal_block", 0.0))
|
| 95 |
+
add_item("Internal Block Work (GF) (200mm Thickness)", "بلوك داخلي أرضي (سماكة 200mm)", "m²", gf_res.get("int_block", 0.0))
|
| 96 |
+
add_item("Internal Block Work (GF) (100mm Thickness)", "بلوك داخلي أرضي (سماكة 100mm)", "m²", gf_res.get("int_block_10", 0.0))
|
| 97 |
add_item("Dry Area Flooring (GF)", "بلاط الأرضي الجاف", "m²", gf_res.get("dry_floor", 0.0))
|
| 98 |
add_item("Wet Area Flooring (GF)", "بلاط الأرضي الرطب", "m²", gf_res.get("wet_floor", 0.0))
|
| 99 |
add_item("Wall Tiles (GF Wet Areas)", "بلاط جدران رطب أرضي", "m²", gf_res.get("wall_tiles", 0.0))
|
|
|
|
| 107 |
# 8. 1st Floor Plan | مسقط الدور الأول
|
| 108 |
add_section("1st Floor Plan | مسقط الدور الأول")
|
| 109 |
f1_res = finish_results.get("f1", {})
|
| 110 |
+
add_item("Thermal Block External (1F) (200mm Thickness)", "بلوك حراري خارجي أول (سماكة 200mm)", "m²", f1_res.get("thermal_block", 0.0))
|
| 111 |
+
add_item("Internal Block Work (1F) (200mm Thickness)", "بلوك داخلي أول (سماكة 200mm)", "m²", f1_res.get("int_block", 0.0))
|
| 112 |
+
add_item("Internal Block Work (1F) (100mm Thickness)", "بلوك داخلي أول (سماكة 100mm)", "m²", f1_res.get("int_block_10", 0.0))
|
| 113 |
add_item("Dry Area Flooring (1F)", "بلاط الأول الجاف", "m²", f1_res.get("dry_floor", 0.0))
|
| 114 |
add_item("Wet Area Flooring (1F)", "بلاط الأول الرطب", "m²", f1_res.get("wet_floor", 0.0))
|
| 115 |
add_item("Wall Tiles (1F Wet Areas)", "بلاط جدران رطب أول", "m²", f1_res.get("wall_tiles", 0.0))
|
|
|
|
| 121 |
# 9. 2nd Floor Plan | مسقط الدور الثاني
|
| 122 |
add_section("2nd Floor Plan | مسقط الدور الثاني")
|
| 123 |
f2_res = finish_results.get("f2", {})
|
| 124 |
+
add_item("Thermal Block External (2F) (200mm Thickness)", "بلوك حراري خارجي ثاني (سماكة 200mm)", "m²", f2_res.get("thermal_block", 0.0))
|
| 125 |
+
add_item("Internal Block Work (2F) (200mm Thickness)", "بلوك داخلي ثاني (سماكة 200mm)", "m²", f2_res.get("int_block", 0.0))
|
| 126 |
+
add_item("Internal Block Work (2F) (100mm Thickness)", "بلوك داخلي ثاني (سماكة 100mm)", "m²", f2_res.get("int_block_10", 0.0))
|
| 127 |
add_item("Dry Area Flooring (2F)", "بلاط الثاني الجاف", "m²", f2_res.get("dry_floor", 0.0))
|
| 128 |
add_item("Wet Area Flooring (2F)", "بلاط الثاني الرطب", "m²", f2_res.get("wet_floor", 0.0))
|
| 129 |
add_item("Wet Area Waterproofing (2F)", "عزل رطب ثاني", "m²", finish_results.get("wet_waterproofing", 0.0) if num_floors >= 3 else 0.0)
|
engine/item_detection_map.py
CHANGED
|
@@ -336,8 +336,9 @@ DRAWING_ITEMS_MAP = {
|
|
| 336 |
"label_ar": "مسقط الدور الأرضي",
|
| 337 |
"pdf_type": "architectural",
|
| 338 |
"items": [
|
| 339 |
-
{"key": "thermal_block_gf", "name_en": "Thermal Block External (GF)", "name_ar": "بلوك حراري خارجي أرضي", "unit": "m²", "formula_str": "ext_perimeter × floor_height", "inputs_needed": ["ext_perimeter", "gf_height"], "ai_question": "What is the external perimeter (m) and floor-to-ceiling height (m) of the ground floor?"},
|
| 340 |
-
{"key": "internal_block_gf","name_en": "Internal Block Work (GF)", "name_ar": "بلوك داخلي أرضي", "unit": "m²", "formula_str": "int_walls_length × floor_height", "inputs_needed": ["int_walls_length_gf", "gf_height"], "ai_question": "What is the total internal walls length (m) for the ground floor? Include all partition walls."},
|
|
|
|
| 341 |
{"key": "dry_floor_gf", "name_en": "Dry Area Flooring (GF)", "name_ar": "بلاط الأرضي الجاف", "unit": "m²", "formula_str": "total_area - wet_area", "inputs_needed": ["gf_total_area", "gf_wet_area"], "ai_question": "What is the total ground floor area (m²) and total wet area (bathrooms + kitchen + laundry) (m²)?"},
|
| 342 |
{"key": "wet_floor_gf", "name_en": "Wet Area Flooring (GF)", "name_ar": "بلاط الأرضي الرطب", "unit": "m²", "formula_str": "sum of toilets + bathrooms + kitchens", "inputs_needed": ["gf_wet_area"], "ai_question": "List all wet rooms (bathrooms, toilets, kitchen, laundry) with their individual areas (m²)."},
|
| 343 |
{"key": "wall_tiles_gf", "name_en": "Wall Tiles (GF Wet Areas)", "name_ar": "بلاط جدران رطب أرضي", "unit": "m²", "formula_str": "wet_perimeter × (height - 0.50)", "inputs_needed": ["gf_wet_perimeter", "gf_height"], "ai_question": "What is the total perimeter of all wet rooms (m) and floor height (m)?"},
|
|
@@ -355,8 +356,9 @@ DRAWING_ITEMS_MAP = {
|
|
| 355 |
"label_ar": "مسقط الدور الأول",
|
| 356 |
"pdf_type": "architectural",
|
| 357 |
"items": [
|
| 358 |
-
{"key": "thermal_block_1f", "name_en": "Thermal Block External (1F)", "name_ar": "بلوك حراري خارجي أول", "unit": "m²", "formula_str": "ext_perimeter × floor_height", "inputs_needed": ["ext_perimeter", "f1_height"], "ai_question": "External perimeter (m) and floor height (m) of 1st floor?"},
|
| 359 |
-
{"key": "internal_block_1f", "name_en": "Internal Block Work (1F)", "name_ar": "بلوك داخلي أول", "unit": "m²", "formula_str": "int_walls_length × floor_height", "inputs_needed": ["int_walls_length_1f", "f1_height"], "ai_question": "Total internal walls length (m) for 1st floor?"},
|
|
|
|
| 360 |
{"key": "dry_floor_1f", "name_en": "Dry Area Flooring (1F)", "name_ar": "بلاط الأول الجاف", "unit": "m²", "formula_str": "total_area - wet_area", "inputs_needed": ["f1_total_area", "f1_wet_area"], "ai_question": "Total 1st floor area (m²) and wet area (m²)?"},
|
| 361 |
{"key": "wet_floor_1f", "name_en": "Wet Area Flooring (1F)", "name_ar": "بلاط الأول الرطب", "unit": "m²", "formula_str": "sum of wet rooms", "inputs_needed": ["f1_wet_area"], "ai_question": "List wet rooms on 1st floor with areas (m²)."},
|
| 362 |
{"key": "wall_tiles_1f", "name_en": "Wall Tiles (1F Wet Areas)", "name_ar": "بلاط جدران رطب أول", "unit": "m²", "formula_str": "wet_perimeter × (height - 0.50)", "inputs_needed": ["f1_wet_perimeter", "f1_height"], "ai_question": "Total wet rooms perimeter (m) and floor height (m) for 1st floor?"},
|
|
@@ -372,8 +374,9 @@ DRAWING_ITEMS_MAP = {
|
|
| 372 |
"label_ar": "مسقط الدور الثاني",
|
| 373 |
"pdf_type": "architectural",
|
| 374 |
"items": [
|
| 375 |
-
{"key": "thermal_block_2f", "name_en": "Thermal Block External (2F)", "name_ar": "بلوك حراري خارجي ثاني", "unit": "m²", "formula_str": "ext_perimeter × floor_height", "inputs_needed": ["ext_perimeter", "f2_height"], "ai_question": "External perimeter (m) and floor height (m) of 2nd floor?"},
|
| 376 |
-
{"key": "internal_block_2f", "name_en": "Internal Block Work (2F)", "name_ar": "بلوك داخلي ثاني", "unit": "m²", "formula_str": "int_walls_length × floor_height", "inputs_needed": ["int_walls_length_2f", "f2_height"], "ai_question": "Total internal walls length (m) for 2nd floor?"},
|
|
|
|
| 377 |
{"key": "dry_floor_2f", "name_en": "Dry Area Flooring (2F)", "name_ar": "بلاط الثاني الجاف", "unit": "m²", "formula_str": "total_area - wet_area", "inputs_needed": ["f2_total_area", "f2_wet_area"], "ai_question": "Total 2nd floor area (m²) and wet area (m²)?"},
|
| 378 |
{"key": "wet_floor_2f", "name_en": "Wet Area Flooring (2F)", "name_ar": "بلاط الثاني الرطب", "unit": "m²", "formula_str": "sum of wet rooms", "inputs_needed": ["f2_wet_area"], "ai_question": "List wet rooms on 2nd floor with areas (m²)."},
|
| 379 |
{"key": "wet_wp_2f", "name_en": "Wet Area Waterproofing (2F)", "name_ar": "عزل رطب ثاني", "unit": "m²", "formula_str": "wet_area (upper floors)", "inputs_needed": ["f2_wet_area"], "ai_question": "Total wet area (m²) on 2nd floor?"},
|
|
|
|
| 336 |
"label_ar": "مسقط الدور الأرضي",
|
| 337 |
"pdf_type": "architectural",
|
| 338 |
"items": [
|
| 339 |
+
{"key": "thermal_block_gf", "name_en": "Thermal Block External (GF) (200mm Thickness)", "name_ar": "بلوك حراري خارجي أرضي (سماكة 200mm)", "unit": "m²", "formula_str": "ext_perimeter × floor_height", "inputs_needed": ["ext_perimeter", "gf_height"], "ai_question": "What is the external perimeter (m) and floor-to-ceiling height (m) of the ground floor?"},
|
| 340 |
+
{"key": "internal_block_gf","name_en": "Internal Block Work (GF) (200mm Thickness)", "name_ar": "بلوك داخلي أرضي (سماكة 200mm)", "unit": "m²", "formula_str": "int_walls_length × floor_height", "inputs_needed": ["int_walls_length_gf", "gf_height"], "ai_question": "What is the total internal walls length (m) for the ground floor? Include all partition walls."},
|
| 341 |
+
{"key": "internal_block_10_gf","name_en": "Internal Block Work (GF) (100mm Thickness)", "name_ar": "بلوك داخلي أرضي (سماكة 100mm)", "unit": "m²", "formula_str": "int_walls_10cm × floor_height", "inputs_needed": ["int_walls_length_gf", "gf_height"], "ai_question": "What is the total internal walls length (m) for the ground floor? Include all partition walls."},
|
| 342 |
{"key": "dry_floor_gf", "name_en": "Dry Area Flooring (GF)", "name_ar": "بلاط الأرضي الجاف", "unit": "m²", "formula_str": "total_area - wet_area", "inputs_needed": ["gf_total_area", "gf_wet_area"], "ai_question": "What is the total ground floor area (m²) and total wet area (bathrooms + kitchen + laundry) (m²)?"},
|
| 343 |
{"key": "wet_floor_gf", "name_en": "Wet Area Flooring (GF)", "name_ar": "بلاط الأرضي الرطب", "unit": "m²", "formula_str": "sum of toilets + bathrooms + kitchens", "inputs_needed": ["gf_wet_area"], "ai_question": "List all wet rooms (bathrooms, toilets, kitchen, laundry) with their individual areas (m²)."},
|
| 344 |
{"key": "wall_tiles_gf", "name_en": "Wall Tiles (GF Wet Areas)", "name_ar": "بلاط جدران رطب أرضي", "unit": "m²", "formula_str": "wet_perimeter × (height - 0.50)", "inputs_needed": ["gf_wet_perimeter", "gf_height"], "ai_question": "What is the total perimeter of all wet rooms (m) and floor height (m)?"},
|
|
|
|
| 356 |
"label_ar": "مسقط الدور الأول",
|
| 357 |
"pdf_type": "architectural",
|
| 358 |
"items": [
|
| 359 |
+
{"key": "thermal_block_1f", "name_en": "Thermal Block External (1F) (200mm Thickness)", "name_ar": "بلوك حراري خارجي أول (سماكة 200mm)", "unit": "m²", "formula_str": "ext_perimeter × floor_height", "inputs_needed": ["ext_perimeter", "f1_height"], "ai_question": "External perimeter (m) and floor height (m) of 1st floor?"},
|
| 360 |
+
{"key": "internal_block_1f", "name_en": "Internal Block Work (1F) (200mm Thickness)", "name_ar": "بلوك داخلي أول (سماكة 200mm)", "unit": "m²", "formula_str": "int_walls_length × floor_height", "inputs_needed": ["int_walls_length_1f", "f1_height"], "ai_question": "Total internal walls length (m) for 1st floor?"},
|
| 361 |
+
{"key": "internal_block_10_1f", "name_en": "Internal Block Work (1F) (100mm Thickness)", "name_ar": "بلوك داخلي أول (سماكة 100mm)", "unit": "m²", "formula_str": "int_walls_10cm × floor_height", "inputs_needed": ["int_walls_length_1f", "f1_height"], "ai_question": "Total internal walls length (m) for 1st floor?"},
|
| 362 |
{"key": "dry_floor_1f", "name_en": "Dry Area Flooring (1F)", "name_ar": "بلاط الأول الجاف", "unit": "m²", "formula_str": "total_area - wet_area", "inputs_needed": ["f1_total_area", "f1_wet_area"], "ai_question": "Total 1st floor area (m²) and wet area (m²)?"},
|
| 363 |
{"key": "wet_floor_1f", "name_en": "Wet Area Flooring (1F)", "name_ar": "بلاط الأول الرطب", "unit": "m²", "formula_str": "sum of wet rooms", "inputs_needed": ["f1_wet_area"], "ai_question": "List wet rooms on 1st floor with areas (m²)."},
|
| 364 |
{"key": "wall_tiles_1f", "name_en": "Wall Tiles (1F Wet Areas)", "name_ar": "بلاط جدران رطب أول", "unit": "m²", "formula_str": "wet_perimeter × (height - 0.50)", "inputs_needed": ["f1_wet_perimeter", "f1_height"], "ai_question": "Total wet rooms perimeter (m) and floor height (m) for 1st floor?"},
|
|
|
|
| 374 |
"label_ar": "مسقط الدور الثاني",
|
| 375 |
"pdf_type": "architectural",
|
| 376 |
"items": [
|
| 377 |
+
{"key": "thermal_block_2f", "name_en": "Thermal Block External (2F) (200mm Thickness)", "name_ar": "بلوك حراري خارجي ثاني (سماكة 200mm)", "unit": "m²", "formula_str": "ext_perimeter × floor_height", "inputs_needed": ["ext_perimeter", "f2_height"], "ai_question": "External perimeter (m) and floor height (m) of 2nd floor?"},
|
| 378 |
+
{"key": "internal_block_2f", "name_en": "Internal Block Work (2F) (200mm Thickness)", "name_ar": "بلوك داخلي ثاني (سماكة 200mm)", "unit": "m²", "formula_str": "int_walls_length × floor_height", "inputs_needed": ["int_walls_length_2f", "f2_height"], "ai_question": "Total internal walls length (m) for 2nd floor?"},
|
| 379 |
+
{"key": "internal_block_10_2f", "name_en": "Internal Block Work (2F) (100mm Thickness)", "name_ar": "بلوك داخلي ثاني (سماكة 100mm)", "unit": "m²", "formula_str": "int_walls_10cm × floor_height", "inputs_needed": ["int_walls_length_2f", "f2_height"], "ai_question": "Total internal walls length (m) for 2nd floor?"},
|
| 380 |
{"key": "dry_floor_2f", "name_en": "Dry Area Flooring (2F)", "name_ar": "بلاط الثاني الجاف", "unit": "m²", "formula_str": "total_area - wet_area", "inputs_needed": ["f2_total_area", "f2_wet_area"], "ai_question": "Total 2nd floor area (m²) and wet area (m²)?"},
|
| 381 |
{"key": "wet_floor_2f", "name_en": "Wet Area Flooring (2F)", "name_ar": "بلاط الثاني الرطب", "unit": "m²", "formula_str": "sum of wet rooms", "inputs_needed": ["f2_wet_area"], "ai_question": "List wet rooms on 2nd floor with areas (m²)."},
|
| 382 |
{"key": "wet_wp_2f", "name_en": "Wet Area Waterproofing (2F)", "name_ar": "عزل رطب ثاني", "unit": "m²", "formula_str": "wet_area (upper floors)", "inputs_needed": ["f2_wet_area"], "ai_question": "Total wet area (m²) on 2nd floor?"},
|
engine/project_boq_bridge.py
CHANGED
|
@@ -424,9 +424,9 @@ def build_inputs(project: dict) -> tuple[dict, dict, dict]:
|
|
| 424 |
"floor_height": project.get(heights.get(fk, ""), 0.0) or f.get("height") or 4.0,
|
| 425 |
"ext_perimeter": f.get("ext_perimeter") or ext_perim,
|
| 426 |
"external_perimeter": f.get("ext_perimeter") or ext_perim,
|
| 427 |
-
"int_walls_length": w.get("internal_total_m") or f.get("int_walls_length") or 0.0,
|
| 428 |
-
"int_walls_10cm": w.get("internal_10cm_m") or 0.0,
|
| 429 |
-
"int_walls_20cm": w.get("internal_20cm_m") or 0.0,
|
| 430 |
"wet_area": f.get("wet_area") or 0.0,
|
| 431 |
"wet_perimeter": f.get("wet_perimeter") or 0.0,
|
| 432 |
"dry_perimeter": f.get("dry_perimeter") or 0.0,
|
|
|
|
| 424 |
"floor_height": project.get(heights.get(fk, ""), 0.0) or f.get("height") or 4.0,
|
| 425 |
"ext_perimeter": f.get("ext_perimeter") or ext_perim,
|
| 426 |
"external_perimeter": f.get("ext_perimeter") or ext_perim,
|
| 427 |
+
"int_walls_length": project.get("int_walls_length") if fk == "gf" and project.get("int_walls_length") is not None else (w.get("internal_total_m") or f.get("int_walls_length") or 0.0),
|
| 428 |
+
"int_walls_10cm": project.get("int_walls_10cm_m") if fk == "gf" and project.get("int_walls_10cm_m") is not None else (w.get("internal_10cm_m") or 0.0),
|
| 429 |
+
"int_walls_20cm": project.get("int_walls_20cm_m") if fk == "gf" and project.get("int_walls_20cm_m") is not None else (w.get("internal_20cm_m") or 0.0),
|
| 430 |
"wet_area": f.get("wet_area") or 0.0,
|
| 431 |
"wet_perimeter": f.get("wet_perimeter") or 0.0,
|
| 432 |
"dry_perimeter": f.get("dry_perimeter") or 0.0,
|
frontend/src/components/Workflow.jsx
CHANGED
|
@@ -412,6 +412,8 @@ export default function Workflow({ token, project, isArabic, onNavigate }) {
|
|
| 412 |
if (page.total_floor_area) confirmedObj.gf_area = page.total_floor_area;
|
| 413 |
if (page.ext_perimeter) confirmedObj.ext_perimeter = page.ext_perimeter;
|
| 414 |
if (page.int_walls_length) confirmedObj.int_walls_length = page.int_walls_length;
|
|
|
|
|
|
|
| 415 |
}
|
| 416 |
|
| 417 |
if (["ground_floor_plan", "first_floor_plan", "second_floor_plan", "roof_floor_plan"].includes(dtype)) {
|
|
@@ -441,7 +443,9 @@ export default function Workflow({ token, project, isArabic, onNavigate }) {
|
|
| 441 |
};
|
| 442 |
|
| 443 |
confirmedObj.walls[fk] = {
|
| 444 |
-
internal_total_m: page.int_walls_length || 0.0
|
|
|
|
|
|
|
| 445 |
};
|
| 446 |
}
|
| 447 |
|
|
|
|
| 412 |
if (page.total_floor_area) confirmedObj.gf_area = page.total_floor_area;
|
| 413 |
if (page.ext_perimeter) confirmedObj.ext_perimeter = page.ext_perimeter;
|
| 414 |
if (page.int_walls_length) confirmedObj.int_walls_length = page.int_walls_length;
|
| 415 |
+
if (page.int_walls_10cm_m !== undefined) confirmedObj.int_walls_10cm_m = page.int_walls_10cm_m;
|
| 416 |
+
if (page.int_walls_20cm_m !== undefined) confirmedObj.int_walls_20cm_m = page.int_walls_20cm_m;
|
| 417 |
}
|
| 418 |
|
| 419 |
if (["ground_floor_plan", "first_floor_plan", "second_floor_plan", "roof_floor_plan"].includes(dtype)) {
|
|
|
|
| 443 |
};
|
| 444 |
|
| 445 |
confirmedObj.walls[fk] = {
|
| 446 |
+
internal_total_m: page.int_walls_length || 0.0,
|
| 447 |
+
internal_10cm_m: page.int_walls_10cm_m || 0.0,
|
| 448 |
+
internal_20cm_m: page.int_walls_20cm_m || 0.0
|
| 449 |
};
|
| 450 |
}
|
| 451 |
|
frontend/src/components/workflow/VerifyStep.jsx
CHANGED
|
@@ -141,14 +141,24 @@ export default function VerifyStep({
|
|
| 141 |
</div>
|
| 142 |
<div>
|
| 143 |
<label style={{ display: 'block', marginBottom: '6px', fontSize: '0.85rem', fontWeight: 600 }}>
|
| 144 |
-
{isArabic ? 'الجدران الداخلية (متر)' : 'Internal Walls Length (m)'}
|
| 145 |
-
{renderSourceBadge('
|
| 146 |
-
{/* Find markup url if available from state.extraction_results in parent? We don't have full state here, so let's just trigger a generic fetch or rely on parent */}
|
| 147 |
</label>
|
| 148 |
<input
|
| 149 |
type="number" step="0.01" className="form-input" required
|
| 150 |
-
value={confirmedData.
|
| 151 |
-
onChange={(e) => updateConfirmedField('
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 152 |
/>
|
| 153 |
</div>
|
| 154 |
<div>
|
|
|
|
| 141 |
</div>
|
| 142 |
<div>
|
| 143 |
<label style={{ display: 'block', marginBottom: '6px', fontSize: '0.85rem', fontWeight: 600 }}>
|
| 144 |
+
{isArabic ? 'الجدران الداخلية 20 سم (متر)' : 'Internal Walls 20cm Length (m)'}
|
| 145 |
+
{renderSourceBadge('int_walls_20cm_m')}
|
|
|
|
| 146 |
</label>
|
| 147 |
<input
|
| 148 |
type="number" step="0.01" className="form-input" required
|
| 149 |
+
value={confirmedData.int_walls_20cm_m ?? ''}
|
| 150 |
+
onChange={(e) => updateConfirmedField('int_walls_20cm_m', parseFloat(e.target.value) || 0)}
|
| 151 |
+
/>
|
| 152 |
+
</div>
|
| 153 |
+
<div>
|
| 154 |
+
<label style={{ display: 'block', marginBottom: '6px', fontSize: '0.85rem', fontWeight: 600 }}>
|
| 155 |
+
{isArabic ? 'الجدران الداخلية 10 سم (متر)' : 'Internal Walls 10cm Length (m)'}
|
| 156 |
+
{renderSourceBadge('int_walls_10cm_m')}
|
| 157 |
+
</label>
|
| 158 |
+
<input
|
| 159 |
+
type="number" step="0.01" className="form-input" required
|
| 160 |
+
value={confirmedData.int_walls_10cm_m ?? ''}
|
| 161 |
+
onChange={(e) => updateConfirmedField('int_walls_10cm_m', parseFloat(e.target.value) || 0)}
|
| 162 |
/>
|
| 163 |
</div>
|
| 164 |
<div>
|