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

trial switching to generic night site

Browse Source
This commit is contained in:
Ross
2021-09-06 12:25:18 +01:00
parent 161d37cd87
commit bd3b9b9afc
3 changed files with 918 additions and 563 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shifts.py
+876 -525
View File
File diff suppressed because it is too large Load Diff
test.py
+2 -1
View File
@@ -63,6 +63,7 @@ Rota.constraint_options["prevent_thursdays_before_full_weekends"] = [
"exeter",
"truro no proc",
]
Rota.constraint_options["require_presence_at_site_overnight"] = ["plymouth"]
Rota.add_shifts(
SingleShift(
@@ -327,7 +328,7 @@ else:
oop,
not_available_to_work=leave_requests,
work_requests=work_requests,
proc_site=site_pref,
night_site=site_pref,
previous_shifts=previous_shifts,
pair=pair,
)
workers.py
+40 -37
View File
@@ -1,7 +1,7 @@
import datetime
from collections import defaultdict
#from shifts import RotaBuilder, days, sites
# from shifts import RotaBuilder, days, sites
class Worker:
@@ -19,9 +19,9 @@ class Worker:
not_available_to_work=None,
pref_not_to_work=None,
work_requests=None,
proc_site="plymouth",
night_site="plymouth", # We set a default night_site
previous_shifts={},
pair=0
pair=0,
):
self.id = id
self.name = name
@@ -33,12 +33,8 @@ class Worker:
self.nwd = nwd
self.proportion_rota_to_work = 1
self.pair = pair
self.proc_site = proc_site
if proc_site == "plymouth" or proc_site == "":
self.night_at_derriford = 1
else:
self.night_at_derriford = 0
self.night_site = night_site
self.previous_shifts = previous_shifts
@@ -49,8 +45,7 @@ class Worker:
if end_date is None:
self.end_date = None
else:
self.end_date = datetime.datetime.strptime(end_date,
"%d/%m/%y").date()
self.end_date = datetime.datetime.strptime(end_date, "%d/%m/%y").date()
if self.end_date > Rota.rota_end_date:
self.end_date = Rota.rota_end_date
@@ -58,21 +53,19 @@ class Worker:
if self.end_date > Rota.start_date:
days_to_work = (self.end_date - Rota.start_date).days
# add unavalabilities
for weeks_days in Rota.weeks_days_product[days_to_work:]:
week, day = weeks_days
Rota.unavailable_to_work.add((self.id, week, day))
Rota.unavailable_to_work_reason[(self.id, week, day)] = "END DATE"
Rota.unavailable_to_work_reason[
(self.id, week, day)
] = "END DATE"
if oop is not None:
start_oop, end_oop = oop
start_oop_date = datetime.datetime.strptime(start_oop,
"%d/%m/%y").date()
end_oop_date = datetime.datetime.strptime(end_oop,
"%d/%m/%y").date()
start_oop_date = datetime.datetime.strptime(start_oop, "%d/%m/%y").date()
end_oop_date = datetime.datetime.strptime(end_oop, "%d/%m/%y").date()
# ignore oops if they finish before the rota start date
print(end_oop_date, Rota.start_date)
if end_oop_date > Rota.start_date:
@@ -85,62 +78,67 @@ class Worker:
if start_oop_date < Rota.start_date:
start_oop_date = Rota.start_date
oop_length = (end_oop_date - start_oop_date).days
days_to_work = days_to_work - oop_length
days_until_oop = (start_oop_date - Rota.start_date).days
for weeks_days in Rota.weeks_days_product[
days_until_oop:days_until_oop + oop_length]:
days_until_oop : days_until_oop + oop_length
]:
week, day = weeks_days
Rota.unavailable_to_work.add((self.id, week, day))
Rota.unavailable_to_work_reason[(self.id, week, day)] = "OOP ()".format(oop)
Rota.unavailable_to_work_reason[
(self.id, week, day)
] = "OOP ()".format(oop)
if pref_not_to_work is not None:
# loop throught dates converting to week / day combination
for date in pref_not_to_work:
days_from_start = (
datetime.datetime.strptime(date, "%d/%m/%y").date() -
Rota.start_date).days
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)]
# Weight the value to take into account the number of preferences
# 1 is added to the total number of requests to ensure they do not outweight
# a single (or fewer) request(s)
Rota.pref_not_to_work[(self.id, week,
day)] = 1 / (len(pref_not_to_work) + 1)
Rota.pref_not_to_work[(self.id, week, day)] = 1 / (
len(pref_not_to_work) + 1
)
if not_available_to_work is not None:
#print(not_available_to_work)
# print(not_available_to_work)
# loop throught dates converting to week / day combination
for date, reason in not_available_to_work:
days_from_start = (
datetime.datetime.strptime(date, "%d/%m/%y").date() -
Rota.start_date).days
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() -
Rota.start_date).days
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.work_requests.add((self.id, week, day, shift))
print(days_to_work, Rota.rota_days_length)
# Calculate the proportion of the rota that is being worked
self.proportion_rota_to_work = days_to_work / Rota.rota_days_length
# We had to adjust the full time equivalent for people who CCT / leave the rota early
# We have to adjust the full time equivalent for people who CCT / leave the rota early
self.fte_adj = self.fte * self.proportion_rota_to_work
if self.fte_adj > 100:
raise ValueError("{} : fte_ajd = {}".format(self.name, self.fte_adj))
raise ValueError("{} : fte_ajd = {}".format(self.name, self.fte_adj))
# print(self.name, self.nwd)
@@ -151,11 +149,16 @@ class Worker:
other.fte_adj,
other.name,
)
def __str__(self):
nwd = ", ".join([str(i) for i in self.nwd]) if self.nwd is not None else ""
return "{} {} [{}] PROC SITE:{} ({})".format(self.name, (self.site, self.grade, self.fte_adj), nwd, self.proc_site, self.night_at_derriford)
return "{} {} [{}] PROC SITE:{} ({})".format(
self.name,
(self.site, self.grade, self.fte_adj),
nwd,
self.night_site,
)
def get_details(self):
return "{} {} {}".format(self.id, self.site[0], self.grade)