Commit ·
f9ee8d9
1
Parent(s): 9814978
予約客数による増員設定に第2段階の閾値ラインを追加 (#15)
Browse files- 朝食/ディナーそれぞれに段階2(閾値・増員数)を追加し、多段階の増員設定に対応
- utils/reservation.tiered_extra() を新設し、満たした閾値段階のうち最大の増員数を採用する階段関数として実装(ソルバー・スケジュール画面で共用)
- optimizer/solver.py / routes/schedule.py の各増員判定箇所を tiered_extra ベースに統一
- 設定画面を「朝食」「ディナー」ごとに段階1/段階2をまとめた構成に整理
- optimizer/solver.py +48 -30
- routes/schedule.py +21 -14
- routes/settings_routes.py +2 -0
- templates/settings/index.html +20 -10
- utils/reservation.py +18 -0
optimizer/solver.py
CHANGED
|
@@ -10,6 +10,7 @@ from utils.constants import (
|
|
| 10 |
LATE_NIGHT_START
|
| 11 |
)
|
| 12 |
from utils.solver_logger import logger
|
|
|
|
| 13 |
|
| 14 |
|
| 15 |
@dataclass
|
|
@@ -175,13 +176,19 @@ def solve(
|
|
| 175 |
band_constraints = repo.get_breakfast_band_constraints()
|
| 176 |
reservation_counts = repo.get_reservation_counts(period.id)
|
| 177 |
try:
|
| 178 |
-
reserv_thresh_b
|
| 179 |
-
reserv_extra_b
|
| 180 |
-
|
| 181 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
| 182 |
except Exception:
|
| 183 |
-
reserv_thresh_b = 100; reserv_extra_b = 1
|
| 184 |
-
reserv_thresh_d = 25; reserv_extra_d = 1
|
|
|
|
|
|
|
| 185 |
|
| 186 |
# ── ログ: 制約設定 & 充足前チェック ──────────────────────────────────
|
| 187 |
logger.info(" [制約設定]")
|
|
@@ -200,10 +207,10 @@ def solve(
|
|
| 200 |
if not c:
|
| 201 |
continue
|
| 202 |
base_min = c["min"]
|
| 203 |
-
if slot == TimeSlot.BREAKFAST
|
| 204 |
-
base_min +=
|
| 205 |
-
elif slot == TimeSlot.DINNER
|
| 206 |
-
base_min +=
|
| 207 |
avail = []
|
| 208 |
for e in active_employees:
|
| 209 |
# FIX①: FT社員を正しくカウント(実際の可用性チェックと統一)
|
|
@@ -314,12 +321,16 @@ def solve(
|
|
| 314 |
base_min = constraint["min"]
|
| 315 |
base_max = constraint["max"]
|
| 316 |
# 予約超過時の増員
|
| 317 |
-
if slot == TimeSlot.BREAKFAST
|
| 318 |
-
|
| 319 |
-
|
| 320 |
-
|
| 321 |
-
|
| 322 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
| 323 |
staff_vars = [
|
| 324 |
assign[emp.id][ds][slot.value][pos.value]
|
| 325 |
for emp in active_employees
|
|
@@ -540,10 +551,10 @@ def solve(
|
|
| 540 |
for pos in positions:
|
| 541 |
c = shift_constraints.get((slot, pos), {})
|
| 542 |
base_min = c.get("min", 0)
|
| 543 |
-
if slot == TimeSlot.BREAKFAST
|
| 544 |
-
base_min +=
|
| 545 |
-
elif slot == TimeSlot.DINNER
|
| 546 |
-
base_min +=
|
| 547 |
|
| 548 |
# FIX③④: 両ポジション対応の従業員を二重計上しないよう、
|
| 549 |
# 専任(primary_position が設定されている)のみをカウント。
|
|
@@ -672,8 +683,7 @@ def solve(
|
|
| 672 |
slot_block_map=slot_block_map,
|
| 673 |
shift_constraints=shift_constraints,
|
| 674 |
reservation_counts=reservation_counts,
|
| 675 |
-
|
| 676 |
-
reserv_thresh_d=reserv_thresh_d, reserv_extra_d=reserv_extra_d,
|
| 677 |
period_id=period_id or (progress_callback._period_id if progress_callback else None),
|
| 678 |
)
|
| 679 |
_check_warnings(best_assignments, date_strs, best_warnings)
|
|
@@ -742,8 +752,8 @@ def _solve_best_effort(
|
|
| 742 |
slot_block_map: dict | None = None,
|
| 743 |
shift_constraints: dict | None = None,
|
| 744 |
reservation_counts: dict | None = None,
|
| 745 |
-
|
| 746 |
-
|
| 747 |
period_id: int | None = None,
|
| 748 |
) -> tuple[list[ShiftAssignment], list[str]]:
|
| 749 |
"""人数・リーダー制約をソフト化してベストエフォートのシフトを生成する"""
|
|
@@ -755,6 +765,10 @@ def _solve_best_effort(
|
|
| 755 |
shift_constraints = repo.get_shift_constraints()
|
| 756 |
if slot_block_map is None:
|
| 757 |
slot_block_map = {}
|
|
|
|
|
|
|
|
|
|
|
|
|
| 758 |
model = cp_model.CpModel()
|
| 759 |
|
| 760 |
assign: dict = {}
|
|
@@ -835,12 +849,16 @@ def _solve_best_effort(
|
|
| 835 |
continue
|
| 836 |
min_req = constraint["min"]
|
| 837 |
max_req = constraint["max"]
|
| 838 |
-
if slot == TimeSlot.BREAKFAST
|
| 839 |
-
|
| 840 |
-
|
| 841 |
-
|
| 842 |
-
|
| 843 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
| 844 |
staff_vars = [assign[emp.id][ds][slot.value][pos.value] for emp in active_employees]
|
| 845 |
|
| 846 |
# 最大は引き続き絶対制約
|
|
|
|
| 10 |
LATE_NIGHT_START
|
| 11 |
)
|
| 12 |
from utils.solver_logger import logger
|
| 13 |
+
from utils.reservation import tiered_extra
|
| 14 |
|
| 15 |
|
| 16 |
@dataclass
|
|
|
|
| 176 |
band_constraints = repo.get_breakfast_band_constraints()
|
| 177 |
reservation_counts = repo.get_reservation_counts(period.id)
|
| 178 |
try:
|
| 179 |
+
reserv_thresh_b = int(repo.get_app_setting("reserv_threshold_breakfast", "100"))
|
| 180 |
+
reserv_extra_b = int(repo.get_app_setting("reserv_extra_breakfast", "1"))
|
| 181 |
+
reserv_thresh_b2 = int(repo.get_app_setting("reserv_threshold_breakfast2", "0"))
|
| 182 |
+
reserv_extra_b2 = int(repo.get_app_setting("reserv_extra_breakfast2", "0"))
|
| 183 |
+
reserv_thresh_d = int(repo.get_app_setting("reserv_threshold_dinner", "25"))
|
| 184 |
+
reserv_extra_d = int(repo.get_app_setting("reserv_extra_dinner", "1"))
|
| 185 |
+
reserv_thresh_d2 = int(repo.get_app_setting("reserv_threshold_dinner2", "0"))
|
| 186 |
+
reserv_extra_d2 = int(repo.get_app_setting("reserv_extra_dinner2", "0"))
|
| 187 |
except Exception:
|
| 188 |
+
reserv_thresh_b = 100; reserv_extra_b = 1; reserv_thresh_b2 = 0; reserv_extra_b2 = 0
|
| 189 |
+
reserv_thresh_d = 25; reserv_extra_d = 1; reserv_thresh_d2 = 0; reserv_extra_d2 = 0
|
| 190 |
+
reserv_tiers_b = [(reserv_thresh_b, reserv_extra_b), (reserv_thresh_b2, reserv_extra_b2)]
|
| 191 |
+
reserv_tiers_d = [(reserv_thresh_d, reserv_extra_d), (reserv_thresh_d2, reserv_extra_d2)]
|
| 192 |
|
| 193 |
# ── ログ: 制約設定 & 充足前チェック ──────────────────────────────────
|
| 194 |
logger.info(" [制約設定]")
|
|
|
|
| 207 |
if not c:
|
| 208 |
continue
|
| 209 |
base_min = c["min"]
|
| 210 |
+
if slot == TimeSlot.BREAKFAST:
|
| 211 |
+
base_min += tiered_extra(rc.get("breakfast", 0), reserv_tiers_b)
|
| 212 |
+
elif slot == TimeSlot.DINNER:
|
| 213 |
+
base_min += tiered_extra(rc.get("dinner", 0), reserv_tiers_d)
|
| 214 |
avail = []
|
| 215 |
for e in active_employees:
|
| 216 |
# FIX①: FT社員を正しくカウント(実際の可用性チェックと統一)
|
|
|
|
| 321 |
base_min = constraint["min"]
|
| 322 |
base_max = constraint["max"]
|
| 323 |
# 予約超過時の増員
|
| 324 |
+
if slot == TimeSlot.BREAKFAST:
|
| 325 |
+
extra = tiered_extra(b_count, reserv_tiers_b)
|
| 326 |
+
if extra:
|
| 327 |
+
base_min += extra
|
| 328 |
+
base_max = max(base_max, base_min)
|
| 329 |
+
elif slot == TimeSlot.DINNER:
|
| 330 |
+
extra = tiered_extra(d_count, reserv_tiers_d)
|
| 331 |
+
if extra:
|
| 332 |
+
base_min += extra
|
| 333 |
+
base_max = max(base_max, base_min)
|
| 334 |
staff_vars = [
|
| 335 |
assign[emp.id][ds][slot.value][pos.value]
|
| 336 |
for emp in active_employees
|
|
|
|
| 551 |
for pos in positions:
|
| 552 |
c = shift_constraints.get((slot, pos), {})
|
| 553 |
base_min = c.get("min", 0)
|
| 554 |
+
if slot == TimeSlot.BREAKFAST:
|
| 555 |
+
base_min += tiered_extra(rc.get("breakfast", 0), reserv_tiers_b)
|
| 556 |
+
elif slot == TimeSlot.DINNER:
|
| 557 |
+
base_min += tiered_extra(rc.get("dinner", 0), reserv_tiers_d)
|
| 558 |
|
| 559 |
# FIX③④: 両ポジション対応の従業員を二重計上しないよう、
|
| 560 |
# 専任(primary_position が設定されている)のみをカウント。
|
|
|
|
| 683 |
slot_block_map=slot_block_map,
|
| 684 |
shift_constraints=shift_constraints,
|
| 685 |
reservation_counts=reservation_counts,
|
| 686 |
+
reserv_tiers_b=reserv_tiers_b, reserv_tiers_d=reserv_tiers_d,
|
|
|
|
| 687 |
period_id=period_id or (progress_callback._period_id if progress_callback else None),
|
| 688 |
)
|
| 689 |
_check_warnings(best_assignments, date_strs, best_warnings)
|
|
|
|
| 752 |
slot_block_map: dict | None = None,
|
| 753 |
shift_constraints: dict | None = None,
|
| 754 |
reservation_counts: dict | None = None,
|
| 755 |
+
reserv_tiers_b: list[tuple[int, int]] | None = None,
|
| 756 |
+
reserv_tiers_d: list[tuple[int, int]] | None = None,
|
| 757 |
period_id: int | None = None,
|
| 758 |
) -> tuple[list[ShiftAssignment], list[str]]:
|
| 759 |
"""人数・リーダー制約をソフト化してベストエフォートのシフトを生成する"""
|
|
|
|
| 765 |
shift_constraints = repo.get_shift_constraints()
|
| 766 |
if slot_block_map is None:
|
| 767 |
slot_block_map = {}
|
| 768 |
+
if reserv_tiers_b is None:
|
| 769 |
+
reserv_tiers_b = []
|
| 770 |
+
if reserv_tiers_d is None:
|
| 771 |
+
reserv_tiers_d = []
|
| 772 |
model = cp_model.CpModel()
|
| 773 |
|
| 774 |
assign: dict = {}
|
|
|
|
| 849 |
continue
|
| 850 |
min_req = constraint["min"]
|
| 851 |
max_req = constraint["max"]
|
| 852 |
+
if slot == TimeSlot.BREAKFAST:
|
| 853 |
+
extra = tiered_extra(b_count, reserv_tiers_b)
|
| 854 |
+
if extra:
|
| 855 |
+
min_req += extra
|
| 856 |
+
max_req = max(max_req, min_req)
|
| 857 |
+
elif slot == TimeSlot.DINNER:
|
| 858 |
+
extra = tiered_extra(d_count, reserv_tiers_d)
|
| 859 |
+
if extra:
|
| 860 |
+
min_req += extra
|
| 861 |
+
max_req = max(max_req, min_req)
|
| 862 |
staff_vars = [assign[emp.id][ds][slot.value][pos.value] for emp in active_employees]
|
| 863 |
|
| 864 |
# 最大は引き続き絶対制約
|
routes/schedule.py
CHANGED
|
@@ -5,12 +5,12 @@ from models.schedule import ShiftAssignment
|
|
| 5 |
from utils.constants import TimeSlot, Position
|
| 6 |
|
| 7 |
from utils.holidays import holiday_set
|
|
|
|
| 8 |
|
| 9 |
|
| 10 |
def _compute_staffing(assignments, employees, dates, constraints,
|
| 11 |
reservation_counts=None,
|
| 12 |
-
|
| 13 |
-
reserv_thresh_d=0, reserv_extra_d=0) -> dict:
|
| 14 |
"""
|
| 15 |
各日×スロット×ポジションの人員充足状況を計算して返す。
|
| 16 |
予約客数が閾値を超える日は最小人員を動的に加算する(ソルバーと同じロジック)。
|
|
@@ -30,6 +30,8 @@ def _compute_staffing(assignments, employees, dates, constraints,
|
|
| 30 |
leader_map[key] += 1
|
| 31 |
|
| 32 |
rc_map = reservation_counts or {}
|
|
|
|
|
|
|
| 33 |
result = {}
|
| 34 |
for d in dates:
|
| 35 |
ds = d.isoformat()
|
|
@@ -42,10 +44,10 @@ def _compute_staffing(assignments, employees, dates, constraints,
|
|
| 42 |
min_s = c.get("min", 0)
|
| 43 |
min_l = c.get("min_leader", 0)
|
| 44 |
# 予約客数による動的増員(ソルバーと同じ判定)
|
| 45 |
-
if slot == TimeSlot.BREAKFAST
|
| 46 |
-
min_s +=
|
| 47 |
-
elif slot == TimeSlot.DINNER
|
| 48 |
-
min_s +=
|
| 49 |
cnt = count_map[(ds, slot.value, pos.value)]
|
| 50 |
ldrs = leader_map[(ds, slot.value, pos.value)]
|
| 51 |
result[(ds, slot.value, pos.value)] = {
|
|
@@ -129,18 +131,23 @@ def index(period_id):
|
|
| 129 |
constraints = repo.get_shift_constraints()
|
| 130 |
reservation_counts = repo.get_reservation_counts(period_id)
|
| 131 |
try:
|
| 132 |
-
reserv_thresh_b
|
| 133 |
-
reserv_extra_b
|
| 134 |
-
|
| 135 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
| 136 |
except Exception:
|
| 137 |
-
reserv_thresh_b = 100; reserv_extra_b = 1
|
| 138 |
-
reserv_thresh_d = 25; reserv_extra_d = 1
|
|
|
|
|
|
|
| 139 |
staffing = _compute_staffing(
|
| 140 |
assignments, all_employees, dates, constraints,
|
| 141 |
reservation_counts=reservation_counts,
|
| 142 |
-
|
| 143 |
-
reserv_thresh_d=reserv_thresh_d, reserv_extra_d=reserv_extra_d,
|
| 144 |
)
|
| 145 |
|
| 146 |
# 人員不足を 4区分(朝食/ディナー × ホール/キッチン)ごとに集計
|
|
|
|
| 5 |
from utils.constants import TimeSlot, Position
|
| 6 |
|
| 7 |
from utils.holidays import holiday_set
|
| 8 |
+
from utils.reservation import tiered_extra
|
| 9 |
|
| 10 |
|
| 11 |
def _compute_staffing(assignments, employees, dates, constraints,
|
| 12 |
reservation_counts=None,
|
| 13 |
+
reserv_tiers_b=None, reserv_tiers_d=None) -> dict:
|
|
|
|
| 14 |
"""
|
| 15 |
各日×スロット×ポジションの人員充足状況を計算して返す。
|
| 16 |
予約客数が閾値を超える日は最小人員を動的に加算する(ソルバーと同じロジック)。
|
|
|
|
| 30 |
leader_map[key] += 1
|
| 31 |
|
| 32 |
rc_map = reservation_counts or {}
|
| 33 |
+
tiers_b = reserv_tiers_b or []
|
| 34 |
+
tiers_d = reserv_tiers_d or []
|
| 35 |
result = {}
|
| 36 |
for d in dates:
|
| 37 |
ds = d.isoformat()
|
|
|
|
| 44 |
min_s = c.get("min", 0)
|
| 45 |
min_l = c.get("min_leader", 0)
|
| 46 |
# 予約客数による動的増員(ソルバーと同じ判定)
|
| 47 |
+
if slot == TimeSlot.BREAKFAST:
|
| 48 |
+
min_s += tiered_extra(b_count, tiers_b)
|
| 49 |
+
elif slot == TimeSlot.DINNER:
|
| 50 |
+
min_s += tiered_extra(d_count, tiers_d)
|
| 51 |
cnt = count_map[(ds, slot.value, pos.value)]
|
| 52 |
ldrs = leader_map[(ds, slot.value, pos.value)]
|
| 53 |
result[(ds, slot.value, pos.value)] = {
|
|
|
|
| 131 |
constraints = repo.get_shift_constraints()
|
| 132 |
reservation_counts = repo.get_reservation_counts(period_id)
|
| 133 |
try:
|
| 134 |
+
reserv_thresh_b = int(repo.get_app_setting("reserv_threshold_breakfast", "100"))
|
| 135 |
+
reserv_extra_b = int(repo.get_app_setting("reserv_extra_breakfast", "1"))
|
| 136 |
+
reserv_thresh_b2 = int(repo.get_app_setting("reserv_threshold_breakfast2", "0"))
|
| 137 |
+
reserv_extra_b2 = int(repo.get_app_setting("reserv_extra_breakfast2", "0"))
|
| 138 |
+
reserv_thresh_d = int(repo.get_app_setting("reserv_threshold_dinner", "25"))
|
| 139 |
+
reserv_extra_d = int(repo.get_app_setting("reserv_extra_dinner", "1"))
|
| 140 |
+
reserv_thresh_d2 = int(repo.get_app_setting("reserv_threshold_dinner2", "0"))
|
| 141 |
+
reserv_extra_d2 = int(repo.get_app_setting("reserv_extra_dinner2", "0"))
|
| 142 |
except Exception:
|
| 143 |
+
reserv_thresh_b = 100; reserv_extra_b = 1; reserv_thresh_b2 = 0; reserv_extra_b2 = 0
|
| 144 |
+
reserv_thresh_d = 25; reserv_extra_d = 1; reserv_thresh_d2 = 0; reserv_extra_d2 = 0
|
| 145 |
+
reserv_tiers_b = [(reserv_thresh_b, reserv_extra_b), (reserv_thresh_b2, reserv_extra_b2)]
|
| 146 |
+
reserv_tiers_d = [(reserv_thresh_d, reserv_extra_d), (reserv_thresh_d2, reserv_extra_d2)]
|
| 147 |
staffing = _compute_staffing(
|
| 148 |
assignments, all_employees, dates, constraints,
|
| 149 |
reservation_counts=reservation_counts,
|
| 150 |
+
reserv_tiers_b=reserv_tiers_b, reserv_tiers_d=reserv_tiers_d,
|
|
|
|
| 151 |
)
|
| 152 |
|
| 153 |
# 人員不足を 4区分(朝食/ディナー × ホール/キッチン)ごとに集計
|
routes/settings_routes.py
CHANGED
|
@@ -41,7 +41,9 @@ def save():
|
|
| 41 |
|
| 42 |
settings_keys = [
|
| 43 |
"reserv_threshold_breakfast", "reserv_extra_breakfast",
|
|
|
|
| 44 |
"reserv_threshold_dinner", "reserv_extra_dinner",
|
|
|
|
| 45 |
"ft_hall_breakfast_start", "ft_hall_breakfast_end",
|
| 46 |
"ft_kitchen_breakfast_start", "ft_kitchen_breakfast_end",
|
| 47 |
"ft_hall_dinner_start", "ft_hall_dinner_end",
|
|
|
|
| 41 |
|
| 42 |
settings_keys = [
|
| 43 |
"reserv_threshold_breakfast", "reserv_extra_breakfast",
|
| 44 |
+
"reserv_threshold_breakfast2", "reserv_extra_breakfast2",
|
| 45 |
"reserv_threshold_dinner", "reserv_extra_dinner",
|
| 46 |
+
"reserv_threshold_dinner2", "reserv_extra_dinner2",
|
| 47 |
"ft_hall_breakfast_start", "ft_hall_breakfast_end",
|
| 48 |
"ft_kitchen_breakfast_start", "ft_kitchen_breakfast_end",
|
| 49 |
"ft_hall_dinner_start", "ft_hall_dinner_end",
|
templates/settings/index.html
CHANGED
|
@@ -130,18 +130,28 @@
|
|
| 130 |
<h6 class="card-title text-muted mb-3">予約客数による増員設定
|
| 131 |
<span class="help-btn" data-bs-toggle="popover" data-bs-trigger="click" data-bs-placement="bottom"
|
| 132 |
data-bs-title="予約客数による増員"
|
| 133 |
-
data-bs-content="閾値を超えた日は自動生成・シフト表の必要人数が「最少+増員数」に増えます。例:閾値100名・増員1名の場合、予約
|
| 134 |
</h6>
|
| 135 |
-
{% for
|
| 136 |
-
('reserv_threshold_breakfast', '
|
| 137 |
-
('
|
| 138 |
-
('reserv_threshold_dinner', 'ディナー:閾値(人)'),
|
| 139 |
-
('reserv_extra_dinner', 'ディナー:増員数(人)'),
|
| 140 |
] %}
|
| 141 |
-
<div class="mb-
|
| 142 |
-
<
|
| 143 |
-
|
| 144 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 145 |
</div>
|
| 146 |
{% endfor %}
|
| 147 |
</div>
|
|
|
|
| 130 |
<h6 class="card-title text-muted mb-3">予約客数による増員設定
|
| 131 |
<span class="help-btn" data-bs-toggle="popover" data-bs-trigger="click" data-bs-placement="bottom"
|
| 132 |
data-bs-title="予約客数による増員"
|
| 133 |
+
data-bs-content="閾値を超えた日は自動生成・シフト表の必要人数が「最少+増員数」に増えます。段階2は任意(閾値0で無効)。両方の閾値を満たす場合は、より高い段階の増員数が採用されます。例:段階1=閾値100名・増員1名、段階2=閾値150名・増員2名の場合、予約150名以上の日は最少人数が2名加算されます。">?</span>
|
| 134 |
</h6>
|
| 135 |
+
{% for slot_label, th1, ex1, th2, ex2 in [
|
| 136 |
+
('朝食', 'reserv_threshold_breakfast', 'reserv_extra_breakfast', 'reserv_threshold_breakfast2', 'reserv_extra_breakfast2'),
|
| 137 |
+
('ディナー', 'reserv_threshold_dinner', 'reserv_extra_dinner', 'reserv_threshold_dinner2', 'reserv_extra_dinner2'),
|
|
|
|
|
|
|
| 138 |
] %}
|
| 139 |
+
<div class="mb-3">
|
| 140 |
+
<div class="small fw-semibold text-muted mb-1">{{ slot_label }}</div>
|
| 141 |
+
{% for stage_label, th_key, ex_key in [('段階1', th1, ex1), ('段階2(任意)', th2, ex2)] %}
|
| 142 |
+
<div class="mb-2 d-flex align-items-center justify-content-between gap-2">
|
| 143 |
+
<label class="form-label mb-0 small" style="min-width:90px">{{ stage_label }}</label>
|
| 144 |
+
<div class="d-flex align-items-center gap-1">
|
| 145 |
+
<span class="text-muted small">閾値</span>
|
| 146 |
+
<input type="number" name="{{ th_key }}" value="{{ settings.get(th_key, '') }}"
|
| 147 |
+
class="form-control form-control-sm" style="max-width:80px" min="0">
|
| 148 |
+
<span class="text-muted small">人 → 増員</span>
|
| 149 |
+
<input type="number" name="{{ ex_key }}" value="{{ settings.get(ex_key, '') }}"
|
| 150 |
+
class="form-control form-control-sm" style="max-width:70px" min="0">
|
| 151 |
+
<span class="text-muted small">人</span>
|
| 152 |
+
</div>
|
| 153 |
+
</div>
|
| 154 |
+
{% endfor %}
|
| 155 |
</div>
|
| 156 |
{% endfor %}
|
| 157 |
</div>
|
utils/reservation.py
ADDED
|
@@ -0,0 +1,18 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
"""予約客数に応じた増員数の計算ヘルパー(ソルバー・スケジュール表示で共用)"""
|
| 2 |
+
|
| 3 |
+
|
| 4 |
+
def tiered_extra(count: int, tiers: list[tuple[int, int]]) -> int:
|
| 5 |
+
"""
|
| 6 |
+
予約客数 count に対して、満たされた閾値段階のうち最大の増員数を返す。
|
| 7 |
+
|
| 8 |
+
tiers: [(閾値1, 増員数1), (閾値2, 増員数2), ...]
|
| 9 |
+
閾値が0以下の段階は無効として無視する。
|
| 10 |
+
例: tiers=[(100, 1), (150, 2)] のとき
|
| 11 |
+
count=120 → 1(閾値1のみ満たす)
|
| 12 |
+
count=160 → 2(閾値1・2を満たすが、より上位の段階を採用)
|
| 13 |
+
"""
|
| 14 |
+
extra = 0
|
| 15 |
+
for threshold, amount in tiers:
|
| 16 |
+
if threshold > 0 and count >= threshold:
|
| 17 |
+
extra = max(extra, amount)
|
| 18 |
+
return extra
|