From 0e80eba347c3244dbe4e54f4c18a4fd1a33dd104 Mon Sep 17 00:00:00 2001 From: Jun-te Kim Date: Tue, 11 Mar 2025 19:26:51 +0000 Subject: [PATCH] fomatted sitenotes --- etl/pdfReader/sitenotes.py | 49 +++++++++----------------------------- 1 file changed, 11 insertions(+), 38 deletions(-) diff --git a/etl/pdfReader/sitenotes.py b/etl/pdfReader/sitenotes.py index d10f20a..3d86774 100644 --- a/etl/pdfReader/sitenotes.py +++ b/etl/pdfReader/sitenotes.py @@ -161,26 +161,13 @@ class QuidosSiteNotes(SiteNotes): self.main_property_age_band = get_value("Main Property") else: self.main_property_age_band = None + + for i in range(1,4): + if getattr(self, f"extension_{i}") and f"Extension {i}" in data: + setattr(self, f"extension_{i}_age_band", get_value(f"Extension {i}")) + else: + setattr(self, f"extension_{i}_age_band", None) - if self.extension_1 and "Extension 1" in data: - self.extension_1_age_band = get_value("Extension 1") - else: - self.extension_1_age_band = None - - if self.extension_2 and "Extension 2" in data: - self.extension_2_age_band = get_value("Extension 2") - else: - self.extension_2_age_band = None - - if self.extension_3 and "Extension 3" in data: - self.extension_3_age_band = get_value("Extension 3") - else: - self.extension_3_age_band = None - - if self.extension_4 and "Extension 4 " in data: - self.extension_4_age_band = get_value("Extension 4") - else: - self.extension_4_age_band = None def get_section_4(self): data = self.raw_data[self.raw_data.index('4.0 Dimensions'): self.raw_data.index('5.0 Conservatory')] @@ -221,26 +208,12 @@ class QuidosSiteNotes(SiteNotes): else: self.main_property_dimensions = None - if self.extension_1 and "Extension 1 Property" in data: - self.extension_1_dimensions = create_dimensions_array("Extension 1 Property", int(self.extension_1)) - else: - self.extensions_1_dimensions = None + for i in range(1,5): + if self.extension_1 and f"Extension {i} Property" in data: + setattr(self, f"extension_{i}_dimensions)", create_dimensions_array(f"Extension {i} Property", int(getattr(self, f"extension_{i}")))) + else: + setattr(self, f"extensions_{i}_dimensions",None) - if self.extension_2 and "Extension 2 Property" in data: - self.extension_2_dimensions = create_dimensions_array("Extension 2 Property", int(self.extension_2)) - else: - self.extension_2_dimensions = None - - if self.extension_3 and "Extension 3 Property" in data: - self.extension_3_dimensions = create_dimensions_array("Extension 3 Property", int(self.extension_3)) - else: - self.extension_3_dimensions = None - - if self.extension_4 and "Extension 4 Property" in data: - self.extension_4_dimensions = create_dimensions_array("Extension 4 Property", int(self.extension_4)) - else: - self.extension_4_dimensions = None -