many improvements

rota/runfixnights.py

@@ -78,10 +78,7 @@ Rota.constraint_options["require_presence_at_site_overnight"] = ["plymouth"]
 
 Rota.add_shifts(
     SingleShift(
-        ("exeter",),
-        "exeter_twilight",
-        12.5,
-        days[:4],
+        sites=("exeter",), name="exeter_twilight", length= 12.5, days=days[:4],
         balance_offset=3,
         constraints=["max_2_shifts_per_week"],
     ),
@@ -89,76 +86,52 @@ Rota.add_shifts(
         ("truro", "truro no proc"), "truro_twilight", 12.5, days[:4], balance_offset=3
     ),
     SingleShift(
-        ("torbay", "torbay twilights"),
-        "torbay_twilight",
-        12.5,
-        days[:4],
+        sites=("torbay", "torbay twilights"), name="torbay_twilight", length= 12.5, days=days[:4],
         balance_offset=3,
         assign_as_block=True,
     ),
     SingleShift(
-        ("plymouth", "plymouth_twilights"),
-        "plymouth_twilight",
-        12.5,
-        days[:5],
+        sites=("plymouth", "plymouth_twilights"), name="plymouth_twilight", length= 12.5, days=days[:5],
         balance_offset=3,
         workers_required=1,
         constraints=["max_2_shifts_per_week"],
     ),
     SingleShift(
-        ("exeter",),
-        "weekend_exeter",
-        12.5,
-        days[4:],
+        sites=("exeter",), name="weekend_exeter", length= 12.5, days=days[4:],
         balance_offset=4,
         rota_on_nwds=True,
         force_as_block=True,
     ),
     SingleShift(
-        ("truro", "truro no proc"),
-        "weekend_truro",
-        12.5,
-        days[4:],
+        sites=("truro", "truro no proc"), name="weekend_truro", length= 12.5, days=days[4:],
         balance_offset=4,
         rota_on_nwds=True,
         force_as_block=True,
         # force_as_block_unless_nwd=True
     ),
     SingleShift(
-        ("torbay",),
-        "weekend_torbay",
-        12.5,
-        days[4:],
+        sites=("torbay",), name="weekend_torbay", length= 12.5, days=days[4:],
         balance_offset=4,
         rota_on_nwds=True,
         force_as_block=True,
         # force_as_block_unless_nwd=True
     ),
     SingleShift(
-        ("plymouth",),
-        "weekend_plymouth1",
-        8,
-        days[5:],
+        sites=("plymouth",), name="weekend_plymouth1", length= 8, days=days[5:],
         balance_offset=4,
         workers_required=1,
         rota_on_nwds=True,
         force_as_block=True,
     ),
     SingleShift(
-        ("plymouth",),
-        "weekend_plymouth2",
-        8,
-        days[5:],
+        sites=("plymouth",), name="weekend_plymouth2", length= 8, days=days[5:],
         balance_offset=4,
         workers_required=1,
         rota_on_nwds=True,
         force_as_block=True,
     ),
     SingleShift(
-        ("plymouth", "plymouth_twilights"),
-        "plymouth_bank_holidays",
-        8,
-        days[5:],
+        sites=("plymouth", "plymouth_twilights"), name="plymouth_bank_holidays", length= 8, days=days[5:],
         balance_offset=2,
         workers_required=1,
         rota_on_nwds=True,
@@ -166,10 +139,7 @@ Rota.add_shifts(
         bank_holidays_only=True,
     ),
     SingleShift(
-        (sites[:-1]),
-        "night_weekday",
-        12.25,
-        days[:4],
+        sites=(sites[:-1]), name="night_weekday", length= 12.25, days=days[:4],
         balance_offset=4,
         balance_weighting=1,
         # hard_constrain_shift=False,
@@ -179,10 +149,7 @@ Rota.add_shifts(
         constraints=["night"],
     ),
     SingleShift(
-        (sites[:-1]),
-        "night_weekend",
-        12.25,
-        days[4:],
+        sites=(sites[:-1]), name="night_weekend", length= 12.25, days=days[4:],
         balance_offset=3,
         balance_weighting=1,
         # hard_constrain_shift=False,