many improvements
This commit is contained in:
+41
-34
@@ -22,14 +22,20 @@ class TestWorkers:
|
||||
|
||||
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:], workers_required=1),
|
||||
SingleShift(
|
||||
sites=("group1",),
|
||||
name="w",
|
||||
length=12.5,
|
||||
days=days[5:],
|
||||
workers_required=1,
|
||||
),
|
||||
)
|
||||
|
||||
with pytest.raises(NoWorkers):
|
||||
@@ -49,10 +55,10 @@ class TestWorkers:
|
||||
|
||||
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,
|
||||
),
|
||||
@@ -128,10 +134,10 @@ class TestWorkers:
|
||||
|
||||
Rota.add_shifts(
|
||||
SingleShift(
|
||||
("group1", "group2"),
|
||||
"d",
|
||||
12.5,
|
||||
days[:5],
|
||||
sites=("group1", "group2"),
|
||||
name="d",
|
||||
length=12.5,
|
||||
days=days[:5],
|
||||
balance_offset=10,
|
||||
workers_required=1,
|
||||
),
|
||||
@@ -187,43 +193,44 @@ class TestWorkers:
|
||||
)
|
||||
|
||||
worker1_oop = [
|
||||
{
|
||||
{
|
||||
"start_date": start_date,
|
||||
"end_date": start_date + datetime.timedelta(weeks=weeks_to_rota / 2),
|
||||
"reason": "First half OOP",
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
worker2_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": start_date + datetime.timedelta(weeks=weeks_to_rota / 2),
|
||||
"end_date": start_date + datetime.timedelta(weeks=3 * weeks_to_rota / 4),
|
||||
"end_date": start_date
|
||||
+ datetime.timedelta(weeks=3 * weeks_to_rota / 4),
|
||||
"reason": "Quarter oop",
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
worker4_oop = [
|
||||
{
|
||||
{
|
||||
"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),
|
||||
"reason": "Quarter oop 2",
|
||||
},
|
||||
},
|
||||
]
|
||||
|
||||
workers = []
|
||||
@@ -249,26 +256,26 @@ class TestWorkers:
|
||||
)
|
||||
|
||||
worker6_oop = [
|
||||
{
|
||||
{
|
||||
"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),
|
||||
"reason": " oop 2",
|
||||
},
|
||||
},
|
||||
]
|
||||
|
||||
worker7_oop = [
|
||||
{
|
||||
{
|
||||
"start_date": start_date - datetime.timedelta(weeks=1),
|
||||
"end_date": Rota.rota_end_date,
|
||||
"reason": "oop",
|
||||
},
|
||||
},
|
||||
]
|
||||
|
||||
workers.append(
|
||||
@@ -282,10 +289,10 @@ class TestWorkers:
|
||||
|
||||
Rota.add_shifts(
|
||||
SingleShift(
|
||||
("group1", "group2"),
|
||||
"d",
|
||||
12.5,
|
||||
days[:5],
|
||||
sites=("group1", "group2"),
|
||||
name="d",
|
||||
length=12.5,
|
||||
days=days[:5],
|
||||
balance_offset=10,
|
||||
workers_required=1,
|
||||
),
|
||||
|
||||
Reference in New Issue
Block a user