ross/proc-rota
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
Ross
2025-12-08 22:45:10 +00:00
parent cd52d53381
commit 116cc1af64
5 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
output/tests/timetable.css
+1 -1
View File
@@ -1 +1 @@
/home/ross/proc_rota/output/timetable.css /home/ross/proc-rota/output/timetable.css
output/tests/timetable.js
+1 -1
View File
@@ -1 +1 @@
/home/ross/proc_rota/output/timetable.js /home/ross/proc-rota/output/timetable.js
rota/shifts.py
+4 -3
View File
@@ -92,13 +92,13 @@ class NightConstraint(BaseShiftConstraint):
class PreShiftConstraint(BaseShiftConstraint): class PreShiftConstraint(BaseShiftConstraint):
days: Any = None days: Any = None
ignore_shifts: List[str] = [] ignore_shifts: List[str] = []
exclude_days: List[str] = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"] exclude_days: List[str] = []
allow_self: bool = True allow_self: bool = True
class PostShiftConstraint(BaseShiftConstraint): class PostShiftConstraint(BaseShiftConstraint):
days: Any = None days: Any = None
ignore_shifts: List[str] = [] ignore_shifts: List[str] = []
exclude_days: List[str] = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"] exclude_days: List[str] = []
allow_self: bool = True allow_self: bool = True
class BalanceAcrossGroupsConstraint(BaseShiftConstraint): class BalanceAcrossGroupsConstraint(BaseShiftConstraint):
@@ -389,7 +389,8 @@ class RotaBuilder(object):
"max_night_frequency_week_exclusions": [], "max_night_frequency_week_exclusions": [],
"max_shifts_per_week": 7, "max_shifts_per_week": 7,
"max_shifts_per_month": 40, "max_shifts_per_month": 40,
"max_days_per_week_block": [(3, 2)], # (max_days, week_block) "max_days_per_week_block": [],
#"max_days_per_week_block": [(3, 2)], # (max_days, week_block)
# The following will cause an unsolvable problem if a shift # The following will cause an unsolvable problem if a shift
# is forced as a block and spans the time peroid # is forced as a block and spans the time peroid
"prevent_monday_after_full_weekends": [], "prevent_monday_after_full_weekends": [],
test/test_nights2.py
+2 -1
View File
@@ -108,7 +108,7 @@ def test_nights_fail():
length=12.5, length=12.5,
days=days[5:], days=days[5:],
force_as_block=True, force_as_block=True,
constraints=[NightConstraint(), PreShiftConstraint(days=3)], constraints=[NightConstraint(), PreShiftConstraint(days=8), PostShiftConstraint(days=2)],
workers_required=2, workers_required=2,
), ),
SingleShift( SingleShift(
@@ -120,6 +120,7 @@ def test_nights_fail():
), ),
) )
Rota.build_and_solve(options={"ratio": 0.000}) Rota.build_and_solve(options={"ratio": 0.000})
Rota.export_rota_to_html("night fail", folder="tests")
assert Rota.results.solver.status in ("warning", "error") assert Rota.results.solver.status in ("warning", "error")
def test_nights2(): def test_nights2():