junte/survey-extraction
1
0
Fork 0
mirror of https://github.com/Hestia-Homes/survey-extraction.git synced 2026-07-12 13:29:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

sharepoint version

Browse source
This commit is contained in:
Jun-te Kim 2025-03-19 14:51:50 +00:00
parent 5a97b05c47
commit 4e6181e413
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
etl/pdfReader/sitenotes.py
View file

@ -710,8 +710,8 @@ class QuidosSiteNotesExtractor(SiteNotesExtractor):
model_name=dict_.get("model_name", ""), model_name=dict_.get("model_name", ""),
model_qualifer=dict_.get("model_qualifier", ""), model_qualifer=dict_.get("model_qualifier", ""),
controls=HeatingSystemControls( controls=HeatingSystemControls(
control_type=dict_.get("control_type", ""), control_type=dict_.get("control_type", "") if dict_.get("control_type", "") is not None else "",
flue_type=dict_.get("flue_type",""), 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, 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 "", 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", ""),
@ -751,11 +751,11 @@ class QuidosSiteNotesExtractor(SiteNotesExtractor):
model_name=dict_.get("model_name", ""), model_name=dict_.get("model_name", ""),
model_qualifer=dict_.get("model_qualifier", ""), model_qualifer=dict_.get("model_qualifier", ""),
controls=HeatingSystemControls( controls=HeatingSystemControls(
control_type=dict_.get("control_type", ""), control_type=dict_.get("control_type", "") if dict_.get("control_type", "") is not None else "",
flue_type=dict_.get("flue_type",""), 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, 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 "", 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, mains_gas_available=True if dict_.get("mains_gas_available", "NO").upper() == "YES" else False,
) )
) )

2
etl/scraper/scraper.py
View file

@ -14,7 +14,7 @@ from datetime import datetime, timedelta
def previous_monday(): def previous_monday():
today = datetime.today() today = datetime.today()
last_monday = today - timedelta(days=today.weekday() + 7) # Go back to last week's Monday 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')}" return f"W.C. {last_monday.strftime('%d.%m.%Y')}"
WEEK_COMMENCING = os.getenv("WEEK_COMMENCING", previous_monday()) WEEK_COMMENCING = os.getenv("WEEK_COMMENCING", previous_monday())