ross/proc-rota
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade

Browse Source
This commit is contained in:
Ross
2021-06-07 23:23:12 +01:00
parent 2847e1c987
commit 5c54257065
6 changed files with 717 additions and 561 deletions
Download Patch File Download Diff File Expand all files Collapse all files
workers.py
+22 -9
View File
@@ -19,7 +19,7 @@ class Worker:
not_available_to_work=None,
pref_not_to_work=None,
work_requests=None,
night_at_derriford=0,
proc_site="plymouth",
previous_shifts={}
):
self.id = id
@@ -31,7 +31,12 @@ class Worker:
self.fte = fte
self.nwd = nwd
self.proportion_rota_to_work = 1
self.night_at_derriford = night_at_derriford
self.proc_site = proc_site
if proc_site == "plymouth" or proc_site == "":
self.night_at_derriford = 1
else:
self.night_at_derriford = 0
self.previous_shifts = previous_shifts
@@ -43,7 +48,7 @@ class Worker:
self.end_date = None
else:
self.end_date = datetime.datetime.strptime(end_date,
"%Y/%m/%d").date()
"%d/%m/%y").date()
if self.end_date > Rota.rota_end_date:
self.end_date = Rota.rota_end_date
@@ -60,9 +65,9 @@ class Worker:
if oop is not None:
start_oop, end_oop = oop
start_oop_date = datetime.datetime.strptime(start_oop,
"%Y/%m/%d").date()
"%d/%m/%y").date()
end_oop_date = datetime.datetime.strptime(end_oop,
"%Y/%m/%d").date()
"%d/%m/%y").date()
# ignore oops if they finish before the rota start date
@@ -88,7 +93,7 @@ class Worker:
# loop throught dates converting to week / day combination
for date in pref_not_to_work:
days_from_start = (
datetime.datetime.strptime(date, "%Y/%m/%d").date() -
datetime.datetime.strptime(date, "%d/%m/%y").date() -
Rota.start_date).days
week = days_from_start // 7 + 1
day = Rota.days[(days_from_start % 7)]
@@ -99,19 +104,22 @@ class Worker:
day)] = 1 / (len(pref_not_to_work) + 1)
if not_available_to_work is not None:
print(not_available_to_work)
# loop throught dates converting to week / day combination
for date in not_available_to_work:
for date, reason in not_available_to_work:
days_from_start = (
datetime.datetime.strptime(date, "%d/%m/%Y").date() -
datetime.datetime.strptime(date, "%d/%m/%y").date() -
Rota.start_date).days
week = days_from_start // 7 + 1
day = Rota.days[(days_from_start % 7)]
Rota.unavailable_to_work.add((self.id, week, day))
Rota.unavailable_to_work_reason[(self.id, week, day)] = reason
if work_requests is not None:
for date, shift in work_requests:
days_from_start = (
datetime.datetime.strptime(date, "%d/%m/%Y").date() -
datetime.datetime.strptime(date, "%d/%m/%y").date() -
Rota.start_date).days
week = days_from_start // 7 + 1
day = Rota.days[(days_from_start % 7)]
@@ -131,6 +139,11 @@ class Worker:
other.fte_adj,
other.name,
)
def __str__(self):
nwd = ", ".join(self.nwd) if self.nwd != None else ""
return "{} {} [{}] PROC SITE:{} ({})".format(self.name, (self.site, self.grade, self.fte_adj), nwd, self.proc_site, self.night_at_derriford)
def get_details(self):
return "{} {} {}".format(self.id, self.site[0], self.grade)