This commit is contained in:
Ross
2023-06-19 14:26:13 +01:00
parent b9edf36103
commit 01f0ba6da6
3 changed files with 29 additions and 19 deletions
+18 -9
View File
@@ -21,7 +21,7 @@ def load_leave(Rota):
"Pragma": "no-cache"
}
download = s.get("https://docs.google.com/spreadsheets/d/e/2PACX-1vR18crGluN4wrL9n1sBdZ2u-JsvaLtQ6hr-R5CPUBOaKpL7_hBbhemyPSrFOhDuWxKlrjh-QUM0HrcD/pub?gid=0&single=true&output=csv", headers=headers)
download = s.get("https://docs.google.com/spreadsheets/d/e/2PACX-1vTQBxt0mHoVS1D5EkQcrekqGveWyTG2MCMyV1NnrSWkptqWbdI6_myaeLT1vpbkbujXJqU6Z5nrzTh9/pub?gid=0&single=true&output=csv", headers=headers)
decoded_content = download.content.decode('utf-8')
reader = csv.reader(decoded_content.splitlines(), delimiter=',')
@@ -125,17 +125,26 @@ def load_leave(Rota):
elif re.match(date_re, row_title) is not None:
if lower_item != "":
date = datetime.strptime(row[0], "%d/%m/%y").date()
# This may be easier to do as a dict
if lower_item in shifts:
worker["requests"].append(WorkRequests(date=date, shift=lower_item))
try:
try:
date = datetime.strptime(row[0], "%d/%m/%y").date()
except ValueError:
date = datetime.strptime(row[0], "%d/%m/%Y").date()
# This may be easier to do as a dict
if lower_item in shifts:
worker["requests"].append(WorkRequests(date=date, shift=lower_item))
elif lower_item in ("work_request", "happy to work"):
worker["requests"].append(WorkRequests(date=date, shift="*"))
elif lower_item in ("work_request", "happy to work"):
worker["requests"].append(WorkRequests(date=date, shift="*"))
else:
worker["leave"].append(NotAvailableToWork(date=date, reason=lower_item))
else:
worker["leave"].append(NotAvailableToWork(date=date, reason=lower_item))
except ValueError as e:
print(f"Error with: {lower_item}")
print(f"{row=}")
raise e
n = n + 1