update timetable dispaly of remote sites
This commit is contained in:
Ross
+16
-26
@@ -55,6 +55,9 @@ class SingleShift(object):
|
||||
|
||||
postclear(2) / preclear(2)
|
||||
|
||||
require_remote_site_presence:
|
||||
options: (site, required_number)
|
||||
|
||||
night
|
||||
|
||||
limit_grade_number:
|
||||
@@ -123,7 +126,7 @@ class SingleShift(object):
|
||||
# self.total_shifts = length * len(days) * len(shift_days)
|
||||
|
||||
def __str__(self):
|
||||
return f"name: {self.name}, site: {self.site}, length: {self.length}, balance weighting: {self.balance_weighting}, balance offset: {self.balance_offset}, hard_constrain: {self.hard_constrain_shift}, workers required : {self.workers_required}, rota on nwds {self.rota_on_nwds}, assign as block: {self.assign_as_block}, force as block: {self.force_as_block}, constraints: {self.constraints}" # , total shifts: {self.total_shifts}"
|
||||
return f"name: {self.name}, site: {self.site}, length: {self.length}, balance weighting: {self.balance_weighting}, balance offset: {self.balance_offset}, hard_constrain: {self.hard_constrain_shift}, workers required : {self.workers_required}, rota on nwds {self.rota_on_nwds}, assign as block: {self.assign_as_block}, force as block: {self.force_as_block}, constraints: {self.constraints}, constraint_options: {self.constraint_options}" # , total shifts: {self.total_shifts}"
|
||||
|
||||
def get_shift_summary(self):
|
||||
"""
|
||||
@@ -181,7 +184,7 @@ class RotaBuilder(object):
|
||||
self.work_requests = set()
|
||||
self.work_requests_map = {}
|
||||
|
||||
self.workers = []
|
||||
self.workers: list[Worker] = []
|
||||
self.worker_pairs = []
|
||||
|
||||
# self.night_blocks = ["weekday", "weekend", "none"]
|
||||
@@ -197,7 +200,6 @@ class RotaBuilder(object):
|
||||
|
||||
self.constraint_options = {
|
||||
"ensure_1_st4_plus_on_nights": True,
|
||||
"ensure_derriford_reg_for_nights": True,
|
||||
"balance_nights": True,
|
||||
"constrain_time_off_after_nights": False,
|
||||
"balance_nights_across_sites": True,
|
||||
@@ -791,25 +793,6 @@ class RotaBuilder(object):
|
||||
),
|
||||
)
|
||||
|
||||
# def nightShiftDerrifordRule(model, week, shift):
|
||||
# derriford_workers = [w for w in self.workers if w.night_at_derriford >= 1]
|
||||
# # if not derriford_workers:
|
||||
# # return Constraint.Skip
|
||||
# return (
|
||||
# sum(
|
||||
# model.shift_week_worker_assigned[shift, week, w.id]
|
||||
# for w in derriford_workers
|
||||
# )
|
||||
# >= 1
|
||||
# )
|
||||
|
||||
# if self.constraint_options["ensure_derriford_reg_for_nights"]:
|
||||
# self.model.night_shifts_derriford_rule = Constraint(
|
||||
# [week for week in self.weeks],
|
||||
# [shift.name for shift in self.get_shifts_with_constraint("night")],
|
||||
# rule=nightShiftDerrifordRule,
|
||||
# )
|
||||
|
||||
def presenceAtRemoteSite(model, week, shift, required_site, required_number):
|
||||
required_site_workers = [
|
||||
w for w in self.workers if required_site == w.remote_site
|
||||
@@ -2465,13 +2448,14 @@ class RotaBuilder(object):
|
||||
a = "-"
|
||||
shift_name = ""
|
||||
|
||||
# Loop through all the days possible shifts and see
|
||||
# if the worker has been assigned
|
||||
for shift in self.get_shift_names_by_week_day(week, day):
|
||||
if model.works[worker.id, week, day, shift].value > 0:
|
||||
shifts.append(shift)
|
||||
a = shift[0]
|
||||
shift_name = shift
|
||||
break
|
||||
# If we haven't run just add the shift
|
||||
title = f"{shift_name} ({d})"
|
||||
css_class = day
|
||||
unavailable_reason = ""
|
||||
@@ -2503,8 +2487,14 @@ class RotaBuilder(object):
|
||||
title = " ".join((title, "[REQUESTED]"))
|
||||
requests = f" data-shift-request='{self.work_requests_map[worker.id, week, day]}'"
|
||||
|
||||
remote_site = ""
|
||||
if shift_name:
|
||||
shift = self.get_shift_by_name(shift_name)
|
||||
if "require_remote_site_presence" in shift.constraints:
|
||||
remote_site = f" data-shift-remote-site='{shift.constraint_options['require_remote_site_presence'][0]}'"
|
||||
|
||||
shift_tds.append(
|
||||
f"<td title='{title}' class='rota-day {css_class}' data-shift='{shift_name}' data-available='{available}' data-unavailable_reason='{unavailable_reason}' data-date='{d}' data-week='{week}' data-day='{day}'{requests}{bank_holiday}>{a}</td>"
|
||||
f"<td title='{title}' class='rota-day {css_class}' data-shift='{shift_name}' data-available='{available}' data-unavailable_reason='{unavailable_reason}' data-date='{d}' data-week='{week}' data-day='{day}'{remote_site}{requests}{bank_holiday}>{a}</td>"
|
||||
)
|
||||
|
||||
shift_count = ""
|
||||
@@ -2524,7 +2514,7 @@ class RotaBuilder(object):
|
||||
data-fte='{fte}' data-fte_adj='{fte_adj}' data-end_date='{end_date}'
|
||||
data-worker-targets='{targets}' data-shift-counts='{worker_shift_counts}'
|
||||
data-weekend-target='{weekend_target}'
|
||||
data-night-at-derriford='{nights_at_derriford}'
|
||||
data-remote-site='{remote_site}'
|
||||
data-pair='{pair}'
|
||||
data-shift-balance-extra='{shift_balance_extra}'
|
||||
data-bank-holiday-extra='{bank_holiday_extra}'
|
||||
@@ -2541,7 +2531,7 @@ class RotaBuilder(object):
|
||||
targets=worker_targets,
|
||||
worker_shift_counts=json.dumps(shift_count_dict),
|
||||
weekend_target=worker.weekend_shift_target_number,
|
||||
nights_at_derriford=worker.night_at_derriford,
|
||||
remote_site=worker.remote_site,
|
||||
grade=worker.grade,
|
||||
pair=worker.pair,
|
||||
shift_balance_extra=json.dumps(worker.shift_balance_extra),
|
||||
|
||||
+1
-6
@@ -52,10 +52,6 @@ class Worker:
|
||||
self.bank_holiday_extra = bank_holiday_extra
|
||||
|
||||
self.remote_site = remote_site
|
||||
if remote_site == "plymouth" or remote_site == "":
|
||||
self.night_at_derriford = 1
|
||||
else:
|
||||
self.night_at_derriford = 0
|
||||
|
||||
self.previous_shifts = previous_shifts
|
||||
|
||||
@@ -181,12 +177,11 @@ class Worker:
|
||||
def __str__(self) -> str:
|
||||
|
||||
nwd = ", ".join([str(i) for i in self.nwd]) if self.nwd is not None else ""
|
||||
return "{} {} [{}] PROC SITE:{} ({})".format(
|
||||
return "{} {} [{}] REMOTE SITE:{}".format(
|
||||
self.name,
|
||||
(self.site, self.grade, self.fte_adj),
|
||||
nwd,
|
||||
self.remote_site,
|
||||
self.night_at_derriford,
|
||||
)
|
||||
|
||||
def get_details(self) -> str:
|
||||
|
||||
Reference in New Issue
Block a user