many improvements

This commit is contained in:
Ross
2022-07-11 19:46:40 +01:00
parent 0cebbfddf6
commit dc975b991c
25 changed files with 1949 additions and 863 deletions
+18 -72
View File
@@ -33,18 +33,12 @@ class TestDemoRota:
# Add a weekday and weekend shift
self.Rota.add_shifts(
SingleShift(
("group1",),
"a",
12.5,
days,
sites=("group1",), name="a", length= 12.5, days=days,
balance_offset=1,
workers_required=1,
),
SingleShift(
("group1",),
"b",
12.5,
days[5:],
sites=("group1",), name="b", length= 12.5, days=days[5:],
balance_offset=0,
workers_required=1
),
@@ -97,19 +91,13 @@ class TestDemoRota:
# Add a weekday and weekend shift
self.Rota.add_shifts(
SingleShift(
("group1",),
"a",
12.5,
days,
sites=("group1",), name="a", length= 12.5, days=days,
balance_offset=5,
workers_required=1,
force_as_block=True
),
SingleShift(
("group1",),
"b",
12.5,
days[5:],
sites=("group1",), name="b", length= 12.5, days=days[5:],
balance_offset=0,
workers_required=2
),
@@ -159,18 +147,12 @@ 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=1
),
)
@@ -211,26 +193,17 @@ 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",),
"c",
12.5,
days[1],
sites=("group1",), name="c", length= 12.5, days=days[1],
balance_offset=1,
workers_required=1,
),
SingleShift(
("group1",),
"w",
12.5,
days[5:],
sites=("group1",), name="w", length= 12.5, days=days[5:],
workers_required=1
),
)
@@ -259,26 +232,17 @@ 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=1,
workers_required=1,
),
SingleShift(
("group1",),
"c",
12.5,
days[1],
sites=("group1",), name="c", length= 12.5, days=days[1],
balance_offset=1,
workers_required=1,
),
SingleShift(
("group1",),
"w",
12.5,
days[5:],
sites=("group1",), name="w", length= 12.5, days=days[5:],
workers_required=1
),
)
@@ -318,26 +282,17 @@ 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=1,
workers_required=1,
),
SingleShift(
("group1",),
"c",
12.5,
days[0],
sites=("group1",), name="c", length= 12.5, days=days[0],
balance_offset=1,
workers_required=1,
),
SingleShift(
("group1",),
"w",
12.5,
days[5:],
sites=("group1",), name="w", length= 12.5, days=days[5:],
workers_required=1
),
)
@@ -368,26 +323,17 @@ 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=1,
workers_required=1,
),
SingleShift(
("group1",),
"c",
12.5,
days[0],
sites=("group1",), name="c", length= 12.5, days=days[0],
balance_offset=1,
workers_required=1,
),
SingleShift(
("group1",),
"w",
12.5,
days[5:],
sites=("group1",), name="w", length= 12.5, days=days[5:],
workers_required=1,
force_as_block=True
),