Commit ·
1cfd144
1
Parent(s): 0cd6759
FT社員別勤務日数ログを追加(_log_employee_analysis)
Browse files[FT社員別勤務日数] セクションを新設し、各FT社員の希望休日数・
出勤可能日数・実勤務日数・上限値・休日数・目標達成フラグをログ出力する。
勤務日数ルールが社員に正しく適用されているか本番ログで検証可能にする。
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
- optimizer/solver.py +29 -3
optimizer/solver.py
CHANGED
|
@@ -1092,7 +1092,8 @@ def solve(
|
|
| 1092 |
pass
|
| 1093 |
result_assignments = _extract_assignments(solver, assign, active_employees, date_strs, slots, positions)
|
| 1094 |
_log_employee_analysis(result_assignments, active_employees, date_strs, slots, positions,
|
| 1095 |
-
req_map, req_hours, shift_constraints
|
|
|
|
| 1096 |
_log_assignment_summary(result_assignments, date_strs)
|
| 1097 |
_check_warnings(result_assignments, date_strs, warnings,
|
| 1098 |
reservation_counts=reservation_counts,
|
|
@@ -1138,7 +1139,8 @@ def solve(
|
|
| 1138 |
breakfast_end_hour=breakfast_end_hour,
|
| 1139 |
)
|
| 1140 |
_log_employee_analysis(best_assignments, active_employees, date_strs, slots, positions,
|
| 1141 |
-
req_map, req_hours, shift_constraints
|
|
|
|
| 1142 |
_check_warnings(best_assignments, date_strs, best_warnings,
|
| 1143 |
reservation_counts=reservation_counts,
|
| 1144 |
reserv_tiers_b=reserv_tiers_b, reserv_tiers_d=reserv_tiers_d)
|
|
@@ -1159,12 +1161,15 @@ def solve(
|
|
| 1159 |
|
| 1160 |
|
| 1161 |
def _log_employee_analysis(assignments, active_employees, date_strs, slots, positions,
|
| 1162 |
-
req_map, req_hours, shift_constraints
|
|
|
|
| 1163 |
"""スタッフ別の割当状況・ペナルティ根拠・リーダー/SI診断を詳細ログ出力"""
|
| 1164 |
from collections import defaultdict
|
| 1165 |
SOCIAL_INSURANCE_MIN_HOURS = 9.0 # 実働8h + 休憩1h(duration_hours は休憩考慮なし総拘束時間)
|
| 1166 |
SI_PREF_PENALTY = 50_000
|
| 1167 |
DEFAULT_SLOT_HOURS = {TimeSlot.BREAKFAST: 5.0, TimeSlot.DINNER: 6.0}
|
|
|
|
|
|
|
| 1168 |
|
| 1169 |
assigned_b = defaultdict(int)
|
| 1170 |
assigned_d = defaultdict(int)
|
|
@@ -1195,6 +1200,27 @@ def _log_employee_analysis(assignments, active_employees, date_strs, slots, posi
|
|
| 1195 |
logger.warning(" ⚠️ リーダースキル設定済スタッフが1名もいません。"
|
| 1196 |
"スタッフ編集画面でスキルレベルを「リーダー」に設定してください。")
|
| 1197 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1198 |
# ── PT スタッフ別詳細 ───────────────────────────────────────────────
|
| 1199 |
pt_emps = [e for e in active_employees if e.employment_type != EmploymentType.FULL_TIME]
|
| 1200 |
if not pt_emps:
|
|
|
|
| 1092 |
pass
|
| 1093 |
result_assignments = _extract_assignments(solver, assign, active_employees, date_strs, slots, positions)
|
| 1094 |
_log_employee_analysis(result_assignments, active_employees, date_strs, slots, positions,
|
| 1095 |
+
req_map, req_hours, shift_constraints,
|
| 1096 |
+
off_map=off_map, min_days_off=min_days_off)
|
| 1097 |
_log_assignment_summary(result_assignments, date_strs)
|
| 1098 |
_check_warnings(result_assignments, date_strs, warnings,
|
| 1099 |
reservation_counts=reservation_counts,
|
|
|
|
| 1139 |
breakfast_end_hour=breakfast_end_hour,
|
| 1140 |
)
|
| 1141 |
_log_employee_analysis(best_assignments, active_employees, date_strs, slots, positions,
|
| 1142 |
+
req_map, req_hours, shift_constraints,
|
| 1143 |
+
off_map=off_map, min_days_off=min_days_off)
|
| 1144 |
_check_warnings(best_assignments, date_strs, best_warnings,
|
| 1145 |
reservation_counts=reservation_counts,
|
| 1146 |
reserv_tiers_b=reserv_tiers_b, reserv_tiers_d=reserv_tiers_d)
|
|
|
|
| 1161 |
|
| 1162 |
|
| 1163 |
def _log_employee_analysis(assignments, active_employees, date_strs, slots, positions,
|
| 1164 |
+
req_map, req_hours, shift_constraints,
|
| 1165 |
+
off_map: dict | None = None, min_days_off: int = 5):
|
| 1166 |
"""スタッフ別の割当状況・ペナルティ根拠・リーダー/SI診断を詳細ログ出力"""
|
| 1167 |
from collections import defaultdict
|
| 1168 |
SOCIAL_INSURANCE_MIN_HOURS = 9.0 # 実働8h + 休憩1h(duration_hours は休憩考慮なし総拘束時間)
|
| 1169 |
SI_PREF_PENALTY = 50_000
|
| 1170 |
DEFAULT_SLOT_HOURS = {TimeSlot.BREAKFAST: 5.0, TimeSlot.DINNER: 6.0}
|
| 1171 |
+
if off_map is None:
|
| 1172 |
+
off_map = {}
|
| 1173 |
|
| 1174 |
assigned_b = defaultdict(int)
|
| 1175 |
assigned_d = defaultdict(int)
|
|
|
|
| 1200 |
logger.warning(" ⚠️ リーダースキル設定済スタッフが1名もいません。"
|
| 1201 |
"スタッフ編集画面でスキルレベルを「リーダー」に設定してください。")
|
| 1202 |
|
| 1203 |
+
# ── FT社員別勤務日数 ────────────────────────────────────────────────
|
| 1204 |
+
ft_emps = [e for e in active_employees if e.employment_type == EmploymentType.FULL_TIME]
|
| 1205 |
+
if ft_emps:
|
| 1206 |
+
max_work_days = len(date_strs) - min_days_off if len(date_strs) > min_days_off else len(date_strs)
|
| 1207 |
+
logger.info(" [FT社員別勤務日数]")
|
| 1208 |
+
logger.info(f" {'名前':<12} {'希望休':>4} {'出勤可':>4} {'勤務日':>4} {'上限':>4} {'休日':>4} {'目標達成':>6} 注記")
|
| 1209 |
+
for emp in sorted(ft_emps, key=lambda e: e.name):
|
| 1210 |
+
off_days = sum(1 for ds in date_strs if off_map.get((emp.id, ds), False))
|
| 1211 |
+
avail_days = len(date_strs) - off_days
|
| 1212 |
+
worked_dates = {a.date for a in assignments if a.employee_id == emp.id}
|
| 1213 |
+
work_days = len(worked_dates)
|
| 1214 |
+
rest_days = len(date_strs) - work_days
|
| 1215 |
+
ok = "✓" if work_days >= max_work_days or avail_days <= max_work_days else "❌"
|
| 1216 |
+
note = ""
|
| 1217 |
+
if avail_days < max_work_days:
|
| 1218 |
+
note = f"出勤可能日({avail_days})が上限({max_work_days})未満"
|
| 1219 |
+
elif work_days < max_work_days:
|
| 1220 |
+
short = max_work_days - work_days
|
| 1221 |
+
note = f"未達({short}日不足)"
|
| 1222 |
+
logger.info(f" {emp.name:<12} {off_days:>4} {avail_days:>4} {work_days:>4} {max_work_days:>4} {rest_days:>4} {ok:>6} {note}")
|
| 1223 |
+
|
| 1224 |
# ── PT スタッフ別詳細 ───────────────────────────────────────────────
|
| 1225 |
pt_emps = [e for e in active_employees if e.employment_type != EmploymentType.FULL_TIME]
|
| 1226 |
if not pt_emps:
|