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

start pydanitification

Browse Source
This commit is contained in:
Ross
2022-05-26 15:38:35 +01:00
parent a8cf3e3460
commit c9ba2a098c
14 changed files with 767 additions and 459 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/test_nwds.py
+62 -61
View File
@@ -24,8 +24,8 @@ class TestDemoRota:
)
# Add a few workers
worker1 = Worker(self.Rota, "worker1", "group1", 1, nwd=["Mon"])
worker2 = Worker(self.Rota, "worker2", "group1", 1, nwd=["Fri"])
worker1 = Worker(name="worker1", site="group1", grade=1, nwds=[{"day": "Mon"}])
worker2 = Worker(name="worker2", site="group1", grade=1, nwds=[{"day": "Fri"}])
self.Rota.add_workers((worker1, worker2))
@@ -36,7 +36,7 @@ class TestDemoRota:
"d",
12.5,
days[:5],
balance_offset=10,
# balance_offset=10,
workers_required=1,
),
SingleShift(
@@ -48,7 +48,7 @@ class TestDemoRota:
),
)
self.Rota.build_and_solve(options={"ratio": 0.00})
self.Rota.build_and_solve(options={"ratio": 0.10})
self.Rota.export_rota_to_html("nwd")
@@ -78,8 +78,8 @@ class TestDemoRota:
)
# Add a few workers
worker1 = Worker(self.Rota, "worker1", "group1", 1, nwd=["Mon"])
worker2 = Worker(self.Rota, "worker2", "group1", 1, nwd=["Mon"])
worker1 = Worker(name="worker1", site="group1", grade=1, nwds=[{"day": "Mon"}])
worker2 = Worker(name="worker2", site="group1", grade=1, nwds=[{"day": "Mon"}])
self.Rota.add_workers((worker1, worker2))
@@ -114,10 +114,16 @@ class TestDemoRota:
d = start_date + datetime.timedelta(weeks=5)
# Add a few workers
worker1 = Worker(
self.Rota, "worker1", "group1", 1, nwd=[("Mon", start_date, d)]
name="worker1",
site="group1",
grade=1,
nwds=[{"day": "Mon", "start_date": start_date, "end_date": d}],
)
worker2 = Worker(
self.Rota, "worker2", "group1", 1, nwd=[("Mon", d, self.Rota.rota_end_date)]
name="worker2",
site="group1",
grade=1,
nwds=[{"day": "Mon", "start_date": d, "end_date": self.Rota.rota_end_date}],
)
self.Rota.add_workers((worker1, worker2))
@@ -140,6 +146,21 @@ class TestDemoRota:
assert self.Rota.results.solver.status == "ok"
for worker in self.Rota.workers:
shifts = self.Rota.get_worker_shift_list(worker)
# Convert shift to a string representation
shifts_string = "".join([i if i != "" else "-" for i in shifts])
if worker.name == "worker1":
for n in range(0,4):
assert shifts_string[0 + 7*n] == "-"
if worker.name == "worker2":
for n in range(5,9):
assert shifts_string[0 + 7*n] == "-"
def test_nwd_partial_overlay(self):
# Set up rota
weeks_to_rota = 10
@@ -154,10 +175,16 @@ class TestDemoRota:
d2 = start_date + datetime.timedelta(weeks=6)
# Add a few workers
worker1 = Worker(
self.Rota, "worker1", "group1", 1, nwd=[("Mon", start_date, d2)]
name="worker1",
site="group1",
grade=1,
nwds=[{"day":"Mon", "start_date":start_date, "end_date":d2}],
)
worker2 = Worker(
self.Rota, "worker2", "group1", 1, nwd=[("Mon", d, self.Rota.rota_end_date)]
name="worker2",
site="group1",
grade=1,
nwds=[{"day":"Mon", "start_date":d, "end_date":self.Rota.rota_end_date}],
)
self.Rota.add_workers((worker1, worker2))
@@ -190,25 +217,16 @@ class TestDemoRota:
d = start_date + datetime.timedelta(weeks=4)
worker1 = Worker(
self.Rota, "worker1", "group1", 1, nwd=[("Mon", start_date, d)]
name="worker1",
site="group1",
grade=1,
nwds=[{"day": "Mon", "start_date":start_date, "end_date":d}],
)
worker2 = Worker(
self.Rota,
"worker2",
"group1",
1,
worker2 = Worker(name="worker2", site="group1", grade=1,
)
worker3 = Worker(
self.Rota,
"worker3",
"group1",
1,
worker3 = Worker(name="worker3", site="group1", grade=1,
)
worker4 = Worker(
self.Rota,
"worker4",
"group1",
1,
worker4 = Worker(name="worker4", site="group1", grade=1,
)
self.Rota.add_workers((worker1, worker2, worker3, worker4))
@@ -255,25 +273,16 @@ class TestDemoRota:
d = start_date + datetime.timedelta(weeks=5)
worker1 = Worker(
self.Rota, "worker1", "group1", 1, nwd=[("Mon", start_date, d)]
name="worker1",
site="group1",
grade=1,
nwds=[{"day": "Mon", "start_date":start_date, "end_date":d}],
)
worker2 = Worker(
self.Rota,
"worker2",
"group1",
1,
worker2 = Worker(name="worker2", site="group1", grade=1,
)
worker3 = Worker(
self.Rota,
"worker3",
"group1",
1,
worker3 = Worker(name="worker3", site="group1", grade=1,
)
worker4 = Worker(
self.Rota,
"worker4",
"group1",
1,
worker4 = Worker(name="worker4", site="group1", grade=1,
)
self.Rota.add_workers((worker1, worker2, worker3, worker4))
@@ -303,7 +312,7 @@ class TestDemoRota:
)
self.Rota.build_and_solve(options={"ratio": 0.00})
self.Rota.export_rota_to_html("nwd")
self.Rota.export_rota_to_html("nwd_block_force_split")
assert self.Rota.results.solver.status == "ok"
@@ -333,24 +342,16 @@ class TestDemoRota:
)
d = start_date + datetime.timedelta(weeks=5)
worker1 = Worker(
self.Rota,
"worker1",
"group1",
1,
nwd=[
("Mon", d, self.Rota.rota_end_date),
("Tue", d, self.Rota.rota_end_date),
("Wed", d, self.Rota.rota_end_date),
("Thu", d, self.Rota.rota_end_date),
("Fri", d, self.Rota.rota_end_date),
worker1 = Worker(name="worker1", site="group1", grade=1,
nwds=[
{"day": "Mon", "start_date":d, "end_date":self.Rota.rota_end_date},
{"day": "Tue", "start_date":d, "end_date":self.Rota.rota_end_date},
{"day": "Wed", "start_date":d, "end_date":self.Rota.rota_end_date},
{"day": "Thu", "start_date":d, "end_date":self.Rota.rota_end_date},
{"day": "Fri", "start_date":d, "end_date":self.Rota.rota_end_date},
],
)
worker2 = Worker(
self.Rota,
"worker2",
"group1",
1,
worker2 = Worker(name="worker2", site="group1", grade=1,
)
self.Rota.add_workers((worker1, worker2))
@@ -396,8 +397,8 @@ class TestDemoRota:
else:
assert week == "dddddww"
for week in weeks_from_list(shifts_string[:7 * 5 ]):
for week in weeks_from_list(shifts_string[: 7 * 5]):
if worker.name == "worker1":
assert week == "dddddww"
else:
assert week == "-----ww"
assert week == "-----ww"