many improvements
This commit is contained in:
+11
-41
@@ -32,25 +32,19 @@ class TestDemoRota:
|
||||
# Add a weekday and weekend shift
|
||||
self.Rota.add_shifts(
|
||||
SingleShift(
|
||||
("group1",),
|
||||
"d",
|
||||
12.5,
|
||||
days[:5],
|
||||
sites=("group1",), name="d", length= 12.5, days=days[:5],
|
||||
# balance_offset=10,
|
||||
workers_required=1,
|
||||
),
|
||||
SingleShift(
|
||||
("group1",),
|
||||
"w",
|
||||
12.5,
|
||||
days[5:],
|
||||
sites=("group1",), name="w", length= 12.5, days=days[5:],
|
||||
workers_required=2,
|
||||
),
|
||||
)
|
||||
|
||||
self.Rota.build_and_solve(options={"ratio": 0.10})
|
||||
|
||||
self.Rota.export_rota_to_html("nwd")
|
||||
self.Rota.export_rota_to_html("nwd1")
|
||||
|
||||
assert self.Rota.results.solver.status == "ok"
|
||||
assert self.Rota.results.solver.termination_condition == "optimal"
|
||||
@@ -86,10 +80,7 @@ class TestDemoRota:
|
||||
# Add a weekday and weekend shift
|
||||
self.Rota.add_shifts(
|
||||
SingleShift(
|
||||
("group1",),
|
||||
"d",
|
||||
12.5,
|
||||
days[:5],
|
||||
sites=("group1",), name="d", length= 12.5, days=days[:5],
|
||||
balance_offset=10,
|
||||
workers_required=1,
|
||||
),
|
||||
@@ -131,10 +122,7 @@ class TestDemoRota:
|
||||
# Add a weekday and weekend shift
|
||||
self.Rota.add_shifts(
|
||||
SingleShift(
|
||||
("group1",),
|
||||
"d",
|
||||
12.5,
|
||||
days[:5],
|
||||
sites=("group1",), name="d", length= 12.5, days=days[:5],
|
||||
balance_offset=10,
|
||||
workers_required=1,
|
||||
),
|
||||
@@ -192,10 +180,7 @@ class TestDemoRota:
|
||||
# Add a weekday and weekend shift
|
||||
self.Rota.add_shifts(
|
||||
SingleShift(
|
||||
("group1",),
|
||||
"d",
|
||||
12.5,
|
||||
days[:5],
|
||||
sites=("group1",), name="d", length= 12.5, days=days[:5],
|
||||
balance_offset=10,
|
||||
workers_required=1,
|
||||
),
|
||||
@@ -234,10 +219,7 @@ class TestDemoRota:
|
||||
# Add a weekday and weekend shift
|
||||
self.Rota.add_shifts(
|
||||
SingleShift(
|
||||
("group1",),
|
||||
"d",
|
||||
12.5,
|
||||
days[:5],
|
||||
sites=("group1",), name="d", length= 12.5, days=days[:5],
|
||||
balance_offset=10,
|
||||
workers_required=2,
|
||||
force_as_block_unless_nwd=True,
|
||||
@@ -290,20 +272,14 @@ class TestDemoRota:
|
||||
# Add a weekday and weekend shift
|
||||
self.Rota.add_shifts(
|
||||
SingleShift(
|
||||
("group1",),
|
||||
"d",
|
||||
12.5,
|
||||
days[:5],
|
||||
sites=("group1",), name="d", length= 12.5, days=days[:5],
|
||||
balance_offset=10,
|
||||
workers_required=2,
|
||||
force_as_block_unless_nwd=True,
|
||||
assign_as_block=True,
|
||||
),
|
||||
SingleShift(
|
||||
("group1",),
|
||||
"w",
|
||||
12.5,
|
||||
days[5:],
|
||||
sites=("group1",), name="w", length= 12.5, days=days[5:],
|
||||
balance_offset=10,
|
||||
workers_required=4,
|
||||
force_as_block_unless_nwd=True,
|
||||
@@ -359,20 +335,14 @@ class TestDemoRota:
|
||||
# Add a weekday and weekend shift
|
||||
self.Rota.add_shifts(
|
||||
SingleShift(
|
||||
("group1",),
|
||||
"d",
|
||||
12.5,
|
||||
days[:5],
|
||||
sites=("group1",), name="d", length= 12.5, days=days[:5],
|
||||
balance_offset=10,
|
||||
workers_required=1,
|
||||
force_as_block_unless_nwd=True,
|
||||
assign_as_block=True,
|
||||
),
|
||||
SingleShift(
|
||||
("group1",),
|
||||
"w",
|
||||
12.5,
|
||||
days[5:],
|
||||
sites=("group1",), name="w", length= 12.5, days=days[5:],
|
||||
balance_offset=10,
|
||||
workers_required=2,
|
||||
force_as_block_unless_nwd=True,
|
||||
|
||||
Reference in New Issue
Block a user