From 4e6181e413b7f0333aeb765166cbc87f7f758e75 Mon Sep 17 00:00:00 2001 From: Jun-te Kim Date: Wed, 19 Mar 2025 14:51:50 +0000 Subject: [PATCH] sharepoint version --- etl/pdfReader/sitenotes.py | 10 +++++----- etl/scraper/scraper.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/etl/pdfReader/sitenotes.py b/etl/pdfReader/sitenotes.py index 72200e3..fd5efe9 100644 --- a/etl/pdfReader/sitenotes.py +++ b/etl/pdfReader/sitenotes.py @@ -710,8 +710,8 @@ class QuidosSiteNotesExtractor(SiteNotesExtractor): model_name=dict_.get("model_name", ""), model_qualifer=dict_.get("model_qualifier", ""), controls=HeatingSystemControls( - control_type=dict_.get("control_type", ""), - flue_type=dict_.get("flue_type",""), + control_type=dict_.get("control_type", "") if dict_.get("control_type", "") is not None else "", + flue_type=dict_.get("flue_type","") if dict_.get("flue_type", "") is not None else "", fan_assisted_flue=True if dict_.get("fan_assisted_flue", "NO").upper() == "YES" else False, heat_emitter_type=dict_.get("heat_emitter_type", "") if dict_.get("heat_emitter_type") is not None else "", electricity_meter_type=dict_.get("electricity_meter_type", ""), @@ -751,11 +751,11 @@ class QuidosSiteNotesExtractor(SiteNotesExtractor): model_name=dict_.get("model_name", ""), model_qualifer=dict_.get("model_qualifier", ""), controls=HeatingSystemControls( - control_type=dict_.get("control_type", ""), - flue_type=dict_.get("flue_type",""), + control_type=dict_.get("control_type", "") if dict_.get("control_type", "") is not None else "", + flue_type=dict_.get("flue_type","") if dict_.get("flue_type", "") is not None else "", fan_assisted_flue=True if dict_.get("fan_assisted_flue", "NO").upper() == "YES" else False, heat_emitter_type=dict_.get("heat_emitter_type", "") if dict_.get("heat_emitter_type") is not None else "", - electricity_meter_type=dict_.get("electricity_meter_type", ""), + electricity_meter_type=dict_.get("electricity_meter_type", "") if dict_.get("electricity_meter_type", "") is not None else "", mains_gas_available=True if dict_.get("mains_gas_available", "NO").upper() == "YES" else False, ) ) diff --git a/etl/scraper/scraper.py b/etl/scraper/scraper.py index fdbc739..72c4edc 100644 --- a/etl/scraper/scraper.py +++ b/etl/scraper/scraper.py @@ -14,7 +14,7 @@ from datetime import datetime, timedelta def previous_monday(): today = datetime.today() last_monday = today - timedelta(days=today.weekday() + 7) # Go back to last week's Monday - # return "W.C. 03.03.2025" # Quick one off script for nic. Hopefully get 199 Do not merge!!!! + return "W.C. 03.03.2025" # Quick one off script for nic. Hopefully get 199 Do not merge!!!! return f"W.C. {last_monday.strftime('%d.%m.%Y')}" WEEK_COMMENCING = os.getenv("WEEK_COMMENCING", previous_monday())