diff --git a/applications/audit_generator/Master Sero Template - Data Extraction.xlsx b/applications/audit_generator/Master Sero Template - Data Extraction.xlsx index 15bc8d3ab..2416b11f2 100644 Binary files a/applications/audit_generator/Master Sero Template - Data Extraction.xlsx and b/applications/audit_generator/Master Sero Template - Data Extraction.xlsx differ diff --git a/domain/magicplan/ventilation_audit.py b/domain/magicplan/ventilation_audit.py index 74fc66e1f..71dc2f0d9 100644 --- a/domain/magicplan/ventilation_audit.py +++ b/domain/magicplan/ventilation_audit.py @@ -11,7 +11,7 @@ from domain.magicplan.models import Door, Plan, Room, Window _DATA_START_ROW = 6 _MAX_ROWS = 50 -_DOOR_AREA_COL = "U" +_DOOR_AREA_COL = "T" _DOOR_AREA_CF_RANGE = f"{_DOOR_AREA_COL}{_DATA_START_ROW}:{_DOOR_AREA_COL}{_DATA_START_ROW + _MAX_ROWS - 1}" _Y_THRESHOLD = 7600 _DOOR_AREA_HEADER = CellRichText( @@ -87,16 +87,16 @@ def populate_sheet(sheet: Any, plan: Plan) -> None: pct = vent.pct_openable if vent else None _write_cell(sheet, row, "L", (pct / 100) if pct is not None else 0) # M = formula =I*L — do not write - _write_cell(sheet, row, "N", vent.trickle_vent_area_mm2 if vent else 0) - _write_cell(sheet, row, "O", vent.num_trickle_vents if vent else 0) - # P = formula =N*O — do not write + _write_cell(sheet, row, "N", vent.num_trickle_vents if vent else 0) + _write_cell(sheet, row, "O", vent.trickle_vent_area_mm2 if vent else 0) + # P = unused gap — do not write for i, (room_name, door) in enumerate(doors): row = _DATA_START_ROW + i vent = door.ventilation - _write_cell(sheet, row, "R", room_name) - _write_cell(sheet, row, "S", door.width_mm) - _write_cell(sheet, row, "T", vent.undercut_mm if vent else 0) - # U = formula =S*T — do not write + _write_cell(sheet, row, "Q", room_name) + _write_cell(sheet, row, "R", door.width_mm) + _write_cell(sheet, row, "S", vent.undercut_mm if vent else 0) + # T = formula =R*S — do not write _apply_column_y_formatting(sheet)