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_workers.py
+106 -78
View File
@@ -2,7 +2,6 @@ import pytest
from rota.shifts import NoWorkers, RotaBuilder, SingleShift, days
import datetime
from rota.workers import Worker
@@ -41,10 +40,10 @@ class TestWorkers:
Rota = setup_basic_rota()
workers = []
workers.append(Worker(Rota, "worker1", "group1", 1, fte=100))
workers.append(Worker(Rota, "worker1", "group1", 1, fte=100))
workers.append(Worker(Rota, "worker3", "group2", 1, fte=50))
workers.append(Worker(Rota, "worker4", "group2", 1, fte=50))
workers.append(Worker(name="worker1", site="group1", grade=1, fte=100))
workers.append(Worker(name="worker1", site="group1", grade=1, fte=100))
workers.append(Worker(name="worker3", site="group2", grade=1, fte=50))
workers.append(Worker(name="worker4", site="group2", grade=1, fte=50))
Rota.add_workers(workers)
@@ -81,36 +80,48 @@ class TestWorkers:
workers = []
workers.append(
Worker(Rota, "worker1", "group1", 1, fte=100, end_date=worker1_end_date)
)
workers.append(
Worker(Rota, "worker2", "group1", 1, fte=100, start_date=worker2_start_date)
Worker(
name="worker1",
site="group1",
grade=1,
fte=100,
end_date=worker1_end_date,
)
)
workers.append(
Worker(
Rota,
"worker3",
"group2",
1,
name="worker2",
site="group1",
grade=1,
fte=100,
start_date=worker2_start_date,
)
)
workers.append(
Worker(
name="worker3",
site="group2",
grade=1,
fte=100,
start_date=worker3_start_date,
end_date=worker3_end_date,
)
)
workers.append(Worker(Rota, "worker4", "group2", 1, fte=50))
workers.append(Worker(Rota, "worker5", "group2", 1, fte=50, nwd=["Mon", "Tue"]))
workers.append(Worker(name="worker4", site="group2", grade=1, fte=50))
workers.append(
Worker(name="worker5", site="group2", grade=1, fte=50, nwd=["Mon", "Tue"])
)
workers.append(
Worker(
Rota,
"worker6",
"group3",
1,
name="worker6",
site="group3",
grade=1,
fte=100,
start_date=start_date + datetime.timedelta(weeks=weeks_to_rota),
)
)
workers.append(
Worker(Rota, "worker7", "group3", 1, fte=50, end_date=start_date)
Worker(name="worker7", site="group3", grade=1, fte=50, end_date=start_date)
)
Rota.add_workers(workers)
@@ -131,6 +142,7 @@ class TestWorkers:
# All workers should have an adjusted fte of 50 %
for worker in Rota.get_workers():
# Except those in group3
if worker.site == "group3":
assert worker.fte_adj == 0
assert Rota.get_worker_shift_list(worker).count("d") == 0
@@ -145,13 +157,20 @@ class TestWorkers:
assert Rota.get_worker_shift_list(worker).count("d") == 10
if worker.name == "worker1":
assert Rota.get_worker_shift_list_string(worker).endswith("-"*(Rota.rota_days_length//2))
assert Rota.get_worker_shift_list_string(worker).endswith(
"-" * (Rota.rota_days_length // 2)
)
if worker.name == "worker2":
assert Rota.get_worker_shift_list_string(worker).startswith("-"*(Rota.rota_days_length//2))
assert Rota.get_worker_shift_list_string(worker).startswith(
"-" * (Rota.rota_days_length // 2)
)
if worker.name == "worker3":
assert Rota.get_worker_shift_list_string(worker).startswith("-"*(Rota.rota_days_length//4))
assert Rota.get_worker_shift_list_string(worker).endswith("-"*(Rota.rota_days_length//4))
assert Rota.get_worker_shift_list_string(worker).startswith(
"-" * (Rota.rota_days_length // 4)
)
assert Rota.get_worker_shift_list_string(worker).endswith(
"-" * (Rota.rota_days_length // 4)
)
assert Rota.results.solver.status == "ok"
assert Rota.results.solver.termination_condition == "optimal"
@@ -168,87 +187,96 @@ class TestWorkers:
)
worker1_oop = [
(
start_date,
start_date + datetime.timedelta(weeks=weeks_to_rota / 2),
"First half OOP",
)
{
"start_date": start_date,
"end_date": start_date + datetime.timedelta(weeks=weeks_to_rota / 2),
"reason": "First half OOP",
}
]
worker2_oop = [
(
start_date + datetime.timedelta(weeks=weeks_to_rota / 2),
Rota.rota_end_date,
"First half OOP",
)
{
"start_date": start_date + datetime.timedelta(weeks=weeks_to_rota / 2),
"end_date": Rota.rota_end_date,
"reason": "First half OOP",
}
]
worker3_start_date = start_date + datetime.timedelta(weeks=weeks_to_rota / 4)
worker3_oop = [
(
start_date + datetime.timedelta(weeks=weeks_to_rota / 2),
start_date + datetime.timedelta(weeks=3 * weeks_to_rota / 4),
"Quarter oop",
)
{
"start_date": start_date + datetime.timedelta(weeks=weeks_to_rota / 2),
"end_date": start_date + datetime.timedelta(weeks=3 * weeks_to_rota / 4),
"reason": "Quarter oop",
}
]
worker4_oop = [
(
start_date,
start_date + datetime.timedelta(weeks=weeks_to_rota / 4),
"Quarter oop",
),
(
start_date + datetime.timedelta(weeks=weeks_to_rota / 2),
start_date
{
"start_date": start_date,
"end_date": start_date + datetime.timedelta(weeks=weeks_to_rota / 4),
"reason": "Quarter oop",
},
{
"start_date": start_date + datetime.timedelta(weeks=weeks_to_rota / 2),
"end_date": start_date
+ datetime.timedelta(weeks=weeks_to_rota / 2)
+ datetime.timedelta(weeks=weeks_to_rota / 4),
"Quarter oop 2",
),
"reason": "Quarter oop 2",
},
]
workers = []
workers.append(Worker(Rota, "worker1", "group1", 1, fte=100, oop=worker1_oop))
workers.append(Worker(Rota, "worker2", "group1", 1, fte=100, oop=worker2_oop))
workers.append(
Worker(name="worker1", site="group1", grade=1, fte=100, oop=worker1_oop)
)
workers.append(
Worker(name="worker2", site="group1", grade=1, fte=100, oop=worker2_oop)
)
workers.append(
Worker(
Rota,
"worker3",
"group2",
1,
name="worker3",
site="group2",
grade=1,
fte=100,
start_date=worker3_start_date,
oop=worker3_oop,
)
)
workers.append(Worker(Rota, "worker4", "group2", 1, oop=worker4_oop))
workers.append(Worker(Rota, "worker5", "group2", 1, fte=50, nwd=["Mon", "Tue"]))
workers.append(Worker(name="worker4", site="group2", grade=1, oop=worker4_oop))
workers.append(
Worker(name="worker5", site="group2", grade=1, fte=50, nwd=["Mon", "Tue"])
)
worker6_oop = [
(
start_date,
start_date + datetime.timedelta(weeks=weeks_to_rota / 6),
"oop",
),
(
start_date + datetime.timedelta(weeks=weeks_to_rota / 2),
start_date + datetime.timedelta(weeks=weeks_to_rota / 2)
{
"start_date": start_date,
"end_date": start_date + datetime.timedelta(weeks=weeks_to_rota / 6),
"reason": "oop",
},
{
"start_date": start_date + datetime.timedelta(weeks=weeks_to_rota / 2),
"end_date": start_date
+ datetime.timedelta(weeks=weeks_to_rota / 2)
+ datetime.timedelta(weeks=weeks_to_rota / 3),
" oop 2",
),
"reason": " oop 2",
},
]
worker7_oop = [
(
start_date-datetime.timedelta(weeks=1),
Rota.rota_end_date,
"oop",
),
{
"start_date": start_date - datetime.timedelta(weeks=1),
"end_date": Rota.rota_end_date,
"reason": "oop",
},
]
workers.append(Worker(Rota, "worker6", "group2", 1, fte=100, oop=worker6_oop))
workers.append(Worker(Rota, "worker7", "group3", 1, fte=100, oop=worker7_oop))
workers.append(
Worker(name="worker6", site="group2", grade=1, fte=100, oop=worker6_oop)
)
workers.append(
Worker(name="worker7", site="group3", grade=1, fte=100, oop=worker7_oop)
)
Rota.add_workers(workers)
@@ -274,8 +302,8 @@ class TestWorkers:
assert worker.fte_adj == pytest.approx(50, 2)
if worker.fte == 100:
assert worker.proportion_rota_to_work == pytest.approx(0.5, 0.2)
assert worker.days_to_work == pytest.approx(35, 1)
assert worker.proportion_rota_to_work == pytest.approx(0.5, 0.2)
assert worker.days_to_work == pytest.approx(35, 1)
assert Rota.get_worker_shift_list(worker).count("d") in (8, 9)