Commit ·
87d20ce
1
Parent(s): 9c7400b
朝食/ディナーで習熟度を別々に設定できるよう対応 (#9)
Browse fileshall_skill/kitchen_skill を完全廃止し、hall_skill_breakfast/hall_skill_dinner/
kitchen_skill_breakfast/kitchen_skill_dinner の4フィールドに置き換え。
DBマイグレーションで旧フィールドの値を新フィールド(朝食・ディナー両方)に
コピーし、移行直後に自動生成が infeasible になることを防止。
- models/employee.py: skill_for/is_skilled/is_leader に time_slot 引数を追加
- db/database.py: 新フィールドのスキーマ追加 + 旧→新の値コピーマイグレーション
- db/repositories.py, routes/employees.py: INSERT/UPDATE/SELECT・フォーム処理を更新
(ついでに routes/employees.py の "novice" → "beginner" の潜在バグも修正)
- optimizer/solver.py, routes/schedule.py, export/excel_exporter.py: 全7箇所の
is_leader/is_skilled 呼び出しに time_slot を渡すよう修正
- templates/employees/form.html, ui/employee_view.py, ui/schedule_view.py:
朝食/ディナー別の習熟度入力欄(4項目)・表示に対応
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
- db/database.py +27 -4
- db/repositories.py +12 -8
- export/excel_exporter.py +1 -1
- models/employee.py +14 -10
- optimizer/solver.py +7 -7
- routes/employees.py +4 -2
- routes/schedule.py +1 -1
- scripts/seed_test_data.py +4 -2
- templates/employees/form.html +34 -10
- ui/employee_view.py +37 -19
- ui/schedule_view.py +6 -6
db/database.py
CHANGED
|
@@ -157,10 +157,14 @@ _CREATE_TABLES = [
|
|
| 157 |
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
| 158 |
name TEXT NOT NULL,
|
| 159 |
employment_type TEXT NOT NULL CHECK(employment_type IN ('full_time','part_time')),
|
| 160 |
-
|
| 161 |
-
CHECK(
|
| 162 |
-
|
| 163 |
-
CHECK(
|
|
|
|
|
|
|
|
|
|
|
|
|
| 164 |
is_active INTEGER NOT NULL DEFAULT 1
|
| 165 |
)""",
|
| 166 |
"""CREATE TABLE IF NOT EXISTS fixed_patterns (
|
|
@@ -281,6 +285,10 @@ _MIGRATIONS = [
|
|
| 281 |
("employees", "output_position", "TEXT"),
|
| 282 |
("employees", "hourly_wage", "INTEGER NOT NULL DEFAULT 0"),
|
| 283 |
("employees", "has_social_insurance", "INTEGER NOT NULL DEFAULT 0"),
|
|
|
|
|
|
|
|
|
|
|
|
|
| 284 |
]
|
| 285 |
|
| 286 |
_INDEXES = [
|
|
@@ -308,15 +316,30 @@ def initialize_db():
|
|
| 308 |
for idx in _INDEXES:
|
| 309 |
conn.execute(idx)
|
| 310 |
|
|
|
|
| 311 |
for table, col, definition in _MIGRATIONS:
|
| 312 |
try:
|
| 313 |
conn.execute(f"ALTER TABLE {table} ADD COLUMN {col} {definition}")
|
|
|
|
| 314 |
except Exception:
|
| 315 |
pass
|
| 316 |
|
| 317 |
if conn.backend == "postgres":
|
| 318 |
conn._conn.autocommit = False
|
| 319 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 320 |
# 既存データの output_position 不整合を修正:
|
| 321 |
# primary_position が設定されているのに output_position が異なる or NULL の従業員を修正
|
| 322 |
try:
|
|
|
|
| 157 |
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
| 158 |
name TEXT NOT NULL,
|
| 159 |
employment_type TEXT NOT NULL CHECK(employment_type IN ('full_time','part_time')),
|
| 160 |
+
hall_skill_breakfast TEXT NOT NULL DEFAULT 'beginner'
|
| 161 |
+
CHECK(hall_skill_breakfast IN ('leader','veteran','general','beginner')),
|
| 162 |
+
hall_skill_dinner TEXT NOT NULL DEFAULT 'beginner'
|
| 163 |
+
CHECK(hall_skill_dinner IN ('leader','veteran','general','beginner')),
|
| 164 |
+
kitchen_skill_breakfast TEXT NOT NULL DEFAULT 'beginner'
|
| 165 |
+
CHECK(kitchen_skill_breakfast IN ('leader','veteran','general','beginner')),
|
| 166 |
+
kitchen_skill_dinner TEXT NOT NULL DEFAULT 'beginner'
|
| 167 |
+
CHECK(kitchen_skill_dinner IN ('leader','veteran','general','beginner')),
|
| 168 |
is_active INTEGER NOT NULL DEFAULT 1
|
| 169 |
)""",
|
| 170 |
"""CREATE TABLE IF NOT EXISTS fixed_patterns (
|
|
|
|
| 285 |
("employees", "output_position", "TEXT"),
|
| 286 |
("employees", "hourly_wage", "INTEGER NOT NULL DEFAULT 0"),
|
| 287 |
("employees", "has_social_insurance", "INTEGER NOT NULL DEFAULT 0"),
|
| 288 |
+
("employees", "hall_skill_breakfast", "TEXT NOT NULL DEFAULT 'beginner'"),
|
| 289 |
+
("employees", "hall_skill_dinner", "TEXT NOT NULL DEFAULT 'beginner'"),
|
| 290 |
+
("employees", "kitchen_skill_breakfast", "TEXT NOT NULL DEFAULT 'beginner'"),
|
| 291 |
+
("employees", "kitchen_skill_dinner", "TEXT NOT NULL DEFAULT 'beginner'"),
|
| 292 |
]
|
| 293 |
|
| 294 |
_INDEXES = [
|
|
|
|
| 316 |
for idx in _INDEXES:
|
| 317 |
conn.execute(idx)
|
| 318 |
|
| 319 |
+
added_cols = set()
|
| 320 |
for table, col, definition in _MIGRATIONS:
|
| 321 |
try:
|
| 322 |
conn.execute(f"ALTER TABLE {table} ADD COLUMN {col} {definition}")
|
| 323 |
+
added_cols.add((table, col))
|
| 324 |
except Exception:
|
| 325 |
pass
|
| 326 |
|
| 327 |
if conn.backend == "postgres":
|
| 328 |
conn._conn.autocommit = False
|
| 329 |
|
| 330 |
+
# 朝食/ディナー別習熟度フィールド新設時、旧 hall_skill/kitchen_skill の値を初期値としてコピー
|
| 331 |
+
# (未設定のままだと自動生成が直後に infeasible になるため)
|
| 332 |
+
if ("employees", "hall_skill_breakfast") in added_cols:
|
| 333 |
+
try:
|
| 334 |
+
conn.execute(
|
| 335 |
+
"UPDATE employees SET hall_skill_breakfast = hall_skill,"
|
| 336 |
+
" hall_skill_dinner = hall_skill,"
|
| 337 |
+
" kitchen_skill_breakfast = kitchen_skill,"
|
| 338 |
+
" kitchen_skill_dinner = kitchen_skill"
|
| 339 |
+
)
|
| 340 |
+
except Exception:
|
| 341 |
+
pass
|
| 342 |
+
|
| 343 |
# 既存データの output_position 不整合を修正:
|
| 344 |
# primary_position が設定されているのに output_position が異なる or NULL の従業員を修正
|
| 345 |
try:
|
db/repositories.py
CHANGED
|
@@ -73,13 +73,13 @@ def save_employee(emp: Employee) -> Employee:
|
|
| 73 |
row = conn.execute("SELECT COALESCE(MAX(display_order), -1) AS max_order FROM employees").fetchone()
|
| 74 |
next_order = (row["max_order"] if row else -1) + 1
|
| 75 |
emp.id = conn.execute_insert(
|
| 76 |
-
"INSERT INTO employees (name, employment_type,
|
| 77 |
-
(emp.name, emp.employment_type.value, emp.
|
| 78 |
)
|
| 79 |
else:
|
| 80 |
conn.execute(
|
| 81 |
-
"UPDATE employees SET name=?, employment_type=?,
|
| 82 |
-
(emp.name, emp.employment_type.value, emp.
|
| 83 |
)
|
| 84 |
_save_fixed_patterns(conn, emp)
|
| 85 |
_save_fixed_unavailable_dates(conn, emp)
|
|
@@ -157,8 +157,10 @@ def _row_to_employee_preloaded(row, pat_map: dict, unavail_map: dict) -> Employe
|
|
| 157 |
return Employee(
|
| 158 |
id=eid, name=row["name"],
|
| 159 |
employment_type=EmploymentType(row["employment_type"]),
|
| 160 |
-
|
| 161 |
-
|
|
|
|
|
|
|
| 162 |
primary_position=PrimaryPosition(pp_val) if pp_val else None,
|
| 163 |
output_position=PrimaryPosition(op_val) if op_val else None,
|
| 164 |
primary_timeslot=TimeSlot(pt_val) if pt_val else None,
|
|
@@ -202,8 +204,10 @@ def _row_to_employee(row, conn) -> Employee:
|
|
| 202 |
id=row["id"],
|
| 203 |
name=row["name"],
|
| 204 |
employment_type=EmploymentType(row["employment_type"]),
|
| 205 |
-
|
| 206 |
-
|
|
|
|
|
|
|
| 207 |
primary_position=PrimaryPosition(pp_val) if pp_val else None,
|
| 208 |
output_position=PrimaryPosition(op_val) if op_val else None,
|
| 209 |
can_work_both_positions=both_val,
|
|
|
|
| 73 |
row = conn.execute("SELECT COALESCE(MAX(display_order), -1) AS max_order FROM employees").fetchone()
|
| 74 |
next_order = (row["max_order"] if row else -1) + 1
|
| 75 |
emp.id = conn.execute_insert(
|
| 76 |
+
"INSERT INTO employees (name, employment_type, hall_skill_breakfast, hall_skill_dinner, kitchen_skill_breakfast, kitchen_skill_dinner, primary_position, output_position, primary_timeslot, can_work_both_positions, can_open, can_cleanup, always_available_breakfast, always_available_dinner, hourly_wage, has_social_insurance, is_active, display_order) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",
|
| 77 |
+
(emp.name, emp.employment_type.value, emp.hall_skill_breakfast.value, emp.hall_skill_dinner.value, emp.kitchen_skill_breakfast.value, emp.kitchen_skill_dinner.value, pp, op, pt, both, opn, cln, avail_b, avail_d, emp.hourly_wage, si, 1, next_order)
|
| 78 |
)
|
| 79 |
else:
|
| 80 |
conn.execute(
|
| 81 |
+
"UPDATE employees SET name=?, employment_type=?, hall_skill_breakfast=?, hall_skill_dinner=?, kitchen_skill_breakfast=?, kitchen_skill_dinner=?, primary_position=?, output_position=?, primary_timeslot=?, can_work_both_positions=?, can_open=?, can_cleanup=?, always_available_breakfast=?, always_available_dinner=?, hourly_wage=?, has_social_insurance=?, is_active=? WHERE id=?",
|
| 82 |
+
(emp.name, emp.employment_type.value, emp.hall_skill_breakfast.value, emp.hall_skill_dinner.value, emp.kitchen_skill_breakfast.value, emp.kitchen_skill_dinner.value, pp, op, pt, both, opn, cln, avail_b, avail_d, emp.hourly_wage, si, int(emp.is_active), emp.id)
|
| 83 |
)
|
| 84 |
_save_fixed_patterns(conn, emp)
|
| 85 |
_save_fixed_unavailable_dates(conn, emp)
|
|
|
|
| 157 |
return Employee(
|
| 158 |
id=eid, name=row["name"],
|
| 159 |
employment_type=EmploymentType(row["employment_type"]),
|
| 160 |
+
hall_skill_breakfast=SkillLevel(row["hall_skill_breakfast"]),
|
| 161 |
+
hall_skill_dinner=SkillLevel(row["hall_skill_dinner"]),
|
| 162 |
+
kitchen_skill_breakfast=SkillLevel(row["kitchen_skill_breakfast"]),
|
| 163 |
+
kitchen_skill_dinner=SkillLevel(row["kitchen_skill_dinner"]),
|
| 164 |
primary_position=PrimaryPosition(pp_val) if pp_val else None,
|
| 165 |
output_position=PrimaryPosition(op_val) if op_val else None,
|
| 166 |
primary_timeslot=TimeSlot(pt_val) if pt_val else None,
|
|
|
|
| 204 |
id=row["id"],
|
| 205 |
name=row["name"],
|
| 206 |
employment_type=EmploymentType(row["employment_type"]),
|
| 207 |
+
hall_skill_breakfast=SkillLevel(row["hall_skill_breakfast"]),
|
| 208 |
+
hall_skill_dinner=SkillLevel(row["hall_skill_dinner"]),
|
| 209 |
+
kitchen_skill_breakfast=SkillLevel(row["kitchen_skill_breakfast"]),
|
| 210 |
+
kitchen_skill_dinner=SkillLevel(row["kitchen_skill_dinner"]),
|
| 211 |
primary_position=PrimaryPosition(pp_val) if pp_val else None,
|
| 212 |
output_position=PrimaryPosition(op_val) if op_val else None,
|
| 213 |
can_work_both_positions=both_val,
|
export/excel_exporter.py
CHANGED
|
@@ -317,7 +317,7 @@ def export_excel(
|
|
| 317 |
pos_v = asgn_val[0] if isinstance(asgn_val, tuple) else asgn_val
|
| 318 |
count_map[(ds, slot_v, pos_v)] += 1
|
| 319 |
emp = next((e for e in employees if e.id == emp_id), None)
|
| 320 |
-
if emp and emp.is_skilled(pos_v):
|
| 321 |
skilled_map[(ds, slot_v, pos_v)] += 1
|
| 322 |
|
| 323 |
SLOT_ROWS = [
|
|
|
|
| 317 |
pos_v = asgn_val[0] if isinstance(asgn_val, tuple) else asgn_val
|
| 318 |
count_map[(ds, slot_v, pos_v)] += 1
|
| 319 |
emp = next((e for e in employees if e.id == emp_id), None)
|
| 320 |
+
if emp and emp.is_skilled(pos_v, slot_v):
|
| 321 |
skilled_map[(ds, slot_v, pos_v)] += 1
|
| 322 |
|
| 323 |
SLOT_ROWS = [
|
models/employee.py
CHANGED
|
@@ -15,8 +15,10 @@ class Employee:
|
|
| 15 |
id: Optional[int]
|
| 16 |
name: str
|
| 17 |
employment_type: EmploymentType
|
| 18 |
-
|
| 19 |
-
|
|
|
|
|
|
|
| 20 |
primary_position: Optional[PrimaryPosition] = None # None = 両方対応
|
| 21 |
output_position: Optional[PrimaryPosition] = None # PDF/Excel出力時の所属欄(None→primary_positionで代替)
|
| 22 |
can_work_both_positions: bool = False # True = 兼務可
|
|
@@ -31,19 +33,21 @@ class Employee:
|
|
| 31 |
fixed_unavailable_dates: list[str] = field(default_factory=list) # YYYY-MM-DD
|
| 32 |
is_active: bool = True
|
| 33 |
|
| 34 |
-
def skill_for(self, position: str) -> SkillLevel:
|
| 35 |
from utils.constants import Position
|
| 36 |
-
|
| 37 |
-
|
| 38 |
-
|
|
|
|
|
|
|
| 39 |
|
| 40 |
-
def is_skilled(self, position: str) -> bool:
|
| 41 |
"""ベテラン以上かどうか"""
|
| 42 |
-
return self.skill_for(position).rank() >= SkillLevel.VETERAN.rank()
|
| 43 |
|
| 44 |
-
def is_leader(self, position: str) -> bool:
|
| 45 |
"""リーダーかどうか"""
|
| 46 |
-
return self.skill_for(position) == SkillLevel.LEADER
|
| 47 |
|
| 48 |
def has_fixed_pattern(self) -> bool:
|
| 49 |
return any(p.breakfast or p.dinner for p in self.fixed_patterns)
|
|
|
|
| 15 |
id: Optional[int]
|
| 16 |
name: str
|
| 17 |
employment_type: EmploymentType
|
| 18 |
+
hall_skill_breakfast: SkillLevel = SkillLevel.BEGINNER
|
| 19 |
+
hall_skill_dinner: SkillLevel = SkillLevel.BEGINNER
|
| 20 |
+
kitchen_skill_breakfast: SkillLevel = SkillLevel.BEGINNER
|
| 21 |
+
kitchen_skill_dinner: SkillLevel = SkillLevel.BEGINNER
|
| 22 |
primary_position: Optional[PrimaryPosition] = None # None = 両方対応
|
| 23 |
output_position: Optional[PrimaryPosition] = None # PDF/Excel出力時の所属欄(None→primary_positionで代替)
|
| 24 |
can_work_both_positions: bool = False # True = 兼務可
|
|
|
|
| 33 |
fixed_unavailable_dates: list[str] = field(default_factory=list) # YYYY-MM-DD
|
| 34 |
is_active: bool = True
|
| 35 |
|
| 36 |
+
def skill_for(self, position: str, time_slot: TimeSlot) -> SkillLevel:
|
| 37 |
from utils.constants import Position
|
| 38 |
+
is_hall = position == Position.HALL or position == "hall"
|
| 39 |
+
is_breakfast = time_slot == TimeSlot.BREAKFAST or time_slot == "breakfast"
|
| 40 |
+
if is_hall:
|
| 41 |
+
return self.hall_skill_breakfast if is_breakfast else self.hall_skill_dinner
|
| 42 |
+
return self.kitchen_skill_breakfast if is_breakfast else self.kitchen_skill_dinner
|
| 43 |
|
| 44 |
+
def is_skilled(self, position: str, time_slot: TimeSlot) -> bool:
|
| 45 |
"""ベテラン以上かどうか"""
|
| 46 |
+
return self.skill_for(position, time_slot).rank() >= SkillLevel.VETERAN.rank()
|
| 47 |
|
| 48 |
+
def is_leader(self, position: str, time_slot: TimeSlot) -> bool:
|
| 49 |
"""リーダーかどうか"""
|
| 50 |
+
return self.skill_for(position, time_slot) == SkillLevel.LEADER
|
| 51 |
|
| 52 |
def has_fixed_pattern(self) -> bool:
|
| 53 |
return any(p.breakfast or p.dinner for p in self.fixed_patterns)
|
optimizer/solver.py
CHANGED
|
@@ -215,7 +215,7 @@ def solve(
|
|
| 215 |
if e.primary_position.value != pos.value:
|
| 216 |
continue
|
| 217 |
avail.append(e)
|
| 218 |
-
leaders = [e for e in avail if e.is_leader(pos.value)]
|
| 219 |
min_ldr = c.get("min_leader", 0)
|
| 220 |
ok_staff = len(avail) >= base_min
|
| 221 |
ok_leader = len(leaders) >= min_ldr
|
|
@@ -333,7 +333,7 @@ def solve(
|
|
| 333 |
leader_vars = [
|
| 334 |
assign[emp.id][ds][slot.value][pos.value]
|
| 335 |
for emp in active_employees
|
| 336 |
-
if emp.is_leader(pos.value)
|
| 337 |
]
|
| 338 |
model.add(sum(leader_vars) >= min_leader)
|
| 339 |
|
|
@@ -367,7 +367,7 @@ def solve(
|
|
| 367 |
# FIX⑥: FT社員もリーダーチェックに含める(can_open_req は FT 含む)
|
| 368 |
ldr_open_vars = [
|
| 369 |
assign[emp.id][ds][TimeSlot.BREAKFAST.value][pos.value]
|
| 370 |
-
for emp in can_open_req if emp.is_leader(pos.value)
|
| 371 |
]
|
| 372 |
if ldr_open_vars:
|
| 373 |
model.add(sum(ldr_open_vars) >= min(min_open_ldr, len(ldr_open_vars)))
|
|
@@ -404,7 +404,7 @@ def solve(
|
|
| 404 |
# FIX②: FT社員のリーダーも含める(cln_vars と同じ可用性条件を適用)
|
| 405 |
ldr_cln_vars = [
|
| 406 |
assign[emp.id][ds][TimeSlot.BREAKFAST.value][pos.value]
|
| 407 |
-
for emp in cleanup_pool if emp.is_leader(pos.value)
|
| 408 |
if req_map.get((emp.id, ds, TimeSlot.BREAKFAST.value))
|
| 409 |
or emp.always_available_breakfast
|
| 410 |
or (emp.employment_type == EmploymentType.FULL_TIME
|
|
@@ -421,7 +421,7 @@ def solve(
|
|
| 421 |
if min_cln_ldr > 0:
|
| 422 |
ldr_b_vars = [
|
| 423 |
assign[emp.id][ds][TimeSlot.BREAKFAST.value][pos.value]
|
| 424 |
-
for emp in active_employees if emp.is_leader(pos.value)
|
| 425 |
]
|
| 426 |
if ldr_b_vars:
|
| 427 |
model.add(sum(ldr_b_vars) >= min(min_cln_ldr, len(ldr_b_vars)))
|
|
@@ -837,7 +837,7 @@ def _solve_best_effort(
|
|
| 837 |
if min_leader > 0:
|
| 838 |
leader_vars = [
|
| 839 |
assign[emp.id][ds][slot.value][pos.value]
|
| 840 |
-
for emp in active_employees if emp.is_leader(pos.value)
|
| 841 |
]
|
| 842 |
lshortfall = model.new_int_var(0, min_leader, f"lsf_{ds}_{slot.value}_{pos.value}")
|
| 843 |
model.add(sum(leader_vars) + lshortfall >= min_leader)
|
|
@@ -971,7 +971,7 @@ def _diagnose_infeasible(
|
|
| 971 |
if req_map.get((e.id, ds, slot.value), False)
|
| 972 |
and (e.can_work_both_positions or e.primary_position is None or e.primary_position.value == pos.value)
|
| 973 |
]
|
| 974 |
-
leaders = [e for e in available if e.is_leader(pos.value)]
|
| 975 |
min_req = constraint["min"]
|
| 976 |
min_leader = constraint.get("min_leader", 0)
|
| 977 |
|
|
|
|
| 215 |
if e.primary_position.value != pos.value:
|
| 216 |
continue
|
| 217 |
avail.append(e)
|
| 218 |
+
leaders = [e for e in avail if e.is_leader(pos.value, slot)]
|
| 219 |
min_ldr = c.get("min_leader", 0)
|
| 220 |
ok_staff = len(avail) >= base_min
|
| 221 |
ok_leader = len(leaders) >= min_ldr
|
|
|
|
| 333 |
leader_vars = [
|
| 334 |
assign[emp.id][ds][slot.value][pos.value]
|
| 335 |
for emp in active_employees
|
| 336 |
+
if emp.is_leader(pos.value, slot)
|
| 337 |
]
|
| 338 |
model.add(sum(leader_vars) >= min_leader)
|
| 339 |
|
|
|
|
| 367 |
# FIX⑥: FT社員もリーダーチェックに含める(can_open_req は FT 含む)
|
| 368 |
ldr_open_vars = [
|
| 369 |
assign[emp.id][ds][TimeSlot.BREAKFAST.value][pos.value]
|
| 370 |
+
for emp in can_open_req if emp.is_leader(pos.value, TimeSlot.BREAKFAST)
|
| 371 |
]
|
| 372 |
if ldr_open_vars:
|
| 373 |
model.add(sum(ldr_open_vars) >= min(min_open_ldr, len(ldr_open_vars)))
|
|
|
|
| 404 |
# FIX②: FT社員のリーダーも含める(cln_vars と同じ可用性条件を適用)
|
| 405 |
ldr_cln_vars = [
|
| 406 |
assign[emp.id][ds][TimeSlot.BREAKFAST.value][pos.value]
|
| 407 |
+
for emp in cleanup_pool if emp.is_leader(pos.value, TimeSlot.BREAKFAST)
|
| 408 |
if req_map.get((emp.id, ds, TimeSlot.BREAKFAST.value))
|
| 409 |
or emp.always_available_breakfast
|
| 410 |
or (emp.employment_type == EmploymentType.FULL_TIME
|
|
|
|
| 421 |
if min_cln_ldr > 0:
|
| 422 |
ldr_b_vars = [
|
| 423 |
assign[emp.id][ds][TimeSlot.BREAKFAST.value][pos.value]
|
| 424 |
+
for emp in active_employees if emp.is_leader(pos.value, TimeSlot.BREAKFAST)
|
| 425 |
]
|
| 426 |
if ldr_b_vars:
|
| 427 |
model.add(sum(ldr_b_vars) >= min(min_cln_ldr, len(ldr_b_vars)))
|
|
|
|
| 837 |
if min_leader > 0:
|
| 838 |
leader_vars = [
|
| 839 |
assign[emp.id][ds][slot.value][pos.value]
|
| 840 |
+
for emp in active_employees if emp.is_leader(pos.value, slot)
|
| 841 |
]
|
| 842 |
lshortfall = model.new_int_var(0, min_leader, f"lsf_{ds}_{slot.value}_{pos.value}")
|
| 843 |
model.add(sum(leader_vars) + lshortfall >= min_leader)
|
|
|
|
| 971 |
if req_map.get((e.id, ds, slot.value), False)
|
| 972 |
and (e.can_work_both_positions or e.primary_position is None or e.primary_position.value == pos.value)
|
| 973 |
]
|
| 974 |
+
leaders = [e for e in available if e.is_leader(pos.value, slot)]
|
| 975 |
min_req = constraint["min"]
|
| 976 |
min_leader = constraint.get("min_leader", 0)
|
| 977 |
|
routes/employees.py
CHANGED
|
@@ -125,8 +125,10 @@ def _form_to_employee(emp_id):
|
|
| 125 |
employment_type=EmploymentType(f["employment_type"]),
|
| 126 |
hourly_wage=int(f.get("hourly_wage") or 0),
|
| 127 |
has_social_insurance=bool(f.get("has_social_insurance")),
|
| 128 |
-
|
| 129 |
-
|
|
|
|
|
|
|
| 130 |
primary_position=PrimaryPosition(pp_val) if pp_val else None,
|
| 131 |
output_position=PrimaryPosition(op_val) if op_val else None,
|
| 132 |
primary_timeslot=TimeSlot(pt_val) if pt_val else None,
|
|
|
|
| 125 |
employment_type=EmploymentType(f["employment_type"]),
|
| 126 |
hourly_wage=int(f.get("hourly_wage") or 0),
|
| 127 |
has_social_insurance=bool(f.get("has_social_insurance")),
|
| 128 |
+
hall_skill_breakfast=SkillLevel(f.get("hall_skill_breakfast") or "beginner"),
|
| 129 |
+
hall_skill_dinner=SkillLevel(f.get("hall_skill_dinner") or "beginner"),
|
| 130 |
+
kitchen_skill_breakfast=SkillLevel(f.get("kitchen_skill_breakfast") or "beginner"),
|
| 131 |
+
kitchen_skill_dinner=SkillLevel(f.get("kitchen_skill_dinner") or "beginner"),
|
| 132 |
primary_position=PrimaryPosition(pp_val) if pp_val else None,
|
| 133 |
output_position=PrimaryPosition(op_val) if op_val else None,
|
| 134 |
primary_timeslot=TimeSlot(pt_val) if pt_val else None,
|
routes/schedule.py
CHANGED
|
@@ -26,7 +26,7 @@ def _compute_staffing(assignments, employees, dates, constraints,
|
|
| 26 |
key = (a.date, a.time_slot.value, a.position.value)
|
| 27 |
count_map[key] += 1
|
| 28 |
e = emp_map.get(a.employee_id)
|
| 29 |
-
if e and e.is_leader(a.position.value):
|
| 30 |
leader_map[key] += 1
|
| 31 |
|
| 32 |
rc_map = reservation_counts or {}
|
|
|
|
| 26 |
key = (a.date, a.time_slot.value, a.position.value)
|
| 27 |
count_map[key] += 1
|
| 28 |
e = emp_map.get(a.employee_id)
|
| 29 |
+
if e and e.is_leader(a.position.value, a.time_slot):
|
| 30 |
leader_map[key] += 1
|
| 31 |
|
| 32 |
rc_map = reservation_counts or {}
|
scripts/seed_test_data.py
CHANGED
|
@@ -537,8 +537,10 @@ def main():
|
|
| 537 |
id=None,
|
| 538 |
name=name,
|
| 539 |
employment_type=EmploymentType(emp_type),
|
| 540 |
-
|
| 541 |
-
|
|
|
|
|
|
|
| 542 |
)
|
| 543 |
saved = repo.save_employee(emp)
|
| 544 |
emp_map[name] = saved
|
|
|
|
| 537 |
id=None,
|
| 538 |
name=name,
|
| 539 |
employment_type=EmploymentType(emp_type),
|
| 540 |
+
hall_skill_breakfast=SkillLevel(hall_sk),
|
| 541 |
+
hall_skill_dinner=SkillLevel(hall_sk),
|
| 542 |
+
kitchen_skill_breakfast=SkillLevel(kit_sk),
|
| 543 |
+
kitchen_skill_dinner=SkillLevel(kit_sk),
|
| 544 |
)
|
| 545 |
saved = repo.save_employee(emp)
|
| 546 |
emp_map[name] = saved
|
templates/employees/form.html
CHANGED
|
@@ -150,27 +150,47 @@
|
|
| 150 |
</div>
|
| 151 |
</div>
|
| 152 |
|
| 153 |
-
<!-- 習熟度(ポジションに
|
| 154 |
<div class="row g-3" id="skill-row">
|
| 155 |
<div class="col-12 col-md-6" id="hall-skill-block">
|
| 156 |
-
<label class="form-label fw-semibold">ホール習熟度
|
| 157 |
<span class="help-btn" data-bs-toggle="popover" data-bs-trigger="click" data-bs-placement="top"
|
| 158 |
data-bs-title="習熟度"
|
| 159 |
-
data-bs-content="「リーダー」に設定したスタッフが、設定画面の「リーダー最少」制約の対象になります。ベテラン以下は人員数のカウントのみに使用されます。">?</span>
|
| 160 |
</label>
|
| 161 |
-
<select name="
|
| 162 |
{% for sl in skill_levels %}
|
| 163 |
-
<option value="{{ sl.value }}" {{ 'selected' if emp and emp.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 164 |
{{ sl.label() }}
|
| 165 |
</option>
|
| 166 |
{% endfor %}
|
| 167 |
</select>
|
| 168 |
</div>
|
| 169 |
<div class="col-12 col-md-6" id="kitchen-skill-block">
|
| 170 |
-
<label class="form-label fw-semibold">キッチン習熟度</label>
|
| 171 |
-
<select name="
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 172 |
{% for sl in skill_levels %}
|
| 173 |
-
<option value="{{ sl.value }}" {{ 'selected' if emp and emp.
|
| 174 |
{{ sl.label() }}
|
| 175 |
</option>
|
| 176 |
{% endfor %}
|
|
@@ -325,8 +345,12 @@ function onPositionChange() {
|
|
| 325 |
const pos = checked ? checked.value : '';
|
| 326 |
|
| 327 |
// 習熟度表示切替
|
| 328 |
-
|
| 329 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
| 330 |
|
| 331 |
// 出力ポジションブロック:両方の時のみ表示
|
| 332 |
document.getElementById('output-pos-block').style.display = (pos === '') ? '' : 'none';
|
|
|
|
| 150 |
</div>
|
| 151 |
</div>
|
| 152 |
|
| 153 |
+
<!-- 習熟度(ポジション・時間帯ごとに設定) -->
|
| 154 |
<div class="row g-3" id="skill-row">
|
| 155 |
<div class="col-12 col-md-6" id="hall-skill-block">
|
| 156 |
+
<label class="form-label fw-semibold">ホール習熟度(朝食)
|
| 157 |
<span class="help-btn" data-bs-toggle="popover" data-bs-trigger="click" data-bs-placement="top"
|
| 158 |
data-bs-title="習熟度"
|
| 159 |
+
data-bs-content="「リーダー」に設定したスタッフが、設定画面の「リーダー最少」制約の対象になります。ベテラン以下は人員数のカウントのみに使用されます。朝食・ディナーで別々に設定できます。">?</span>
|
| 160 |
</label>
|
| 161 |
+
<select name="hall_skill_breakfast" class="form-select">
|
| 162 |
{% for sl in skill_levels %}
|
| 163 |
+
<option value="{{ sl.value }}" {{ 'selected' if emp and emp.hall_skill_breakfast == sl else '' }}>
|
| 164 |
+
{{ sl.label() }}
|
| 165 |
+
</option>
|
| 166 |
+
{% endfor %}
|
| 167 |
+
</select>
|
| 168 |
+
</div>
|
| 169 |
+
<div class="col-12 col-md-6" id="hall-skill-dinner-block">
|
| 170 |
+
<label class="form-label fw-semibold">ホール習熟度(ディナー)</label>
|
| 171 |
+
<select name="hall_skill_dinner" class="form-select">
|
| 172 |
+
{% for sl in skill_levels %}
|
| 173 |
+
<option value="{{ sl.value }}" {{ 'selected' if emp and emp.hall_skill_dinner == sl else '' }}>
|
| 174 |
{{ sl.label() }}
|
| 175 |
</option>
|
| 176 |
{% endfor %}
|
| 177 |
</select>
|
| 178 |
</div>
|
| 179 |
<div class="col-12 col-md-6" id="kitchen-skill-block">
|
| 180 |
+
<label class="form-label fw-semibold">キッチン習熟度(朝食)</label>
|
| 181 |
+
<select name="kitchen_skill_breakfast" class="form-select">
|
| 182 |
+
{% for sl in skill_levels %}
|
| 183 |
+
<option value="{{ sl.value }}" {{ 'selected' if emp and emp.kitchen_skill_breakfast == sl else '' }}>
|
| 184 |
+
{{ sl.label() }}
|
| 185 |
+
</option>
|
| 186 |
+
{% endfor %}
|
| 187 |
+
</select>
|
| 188 |
+
</div>
|
| 189 |
+
<div class="col-12 col-md-6" id="kitchen-skill-dinner-block">
|
| 190 |
+
<label class="form-label fw-semibold">キッチン習熟度(ディナー)</label>
|
| 191 |
+
<select name="kitchen_skill_dinner" class="form-select">
|
| 192 |
{% for sl in skill_levels %}
|
| 193 |
+
<option value="{{ sl.value }}" {{ 'selected' if emp and emp.kitchen_skill_dinner == sl else '' }}>
|
| 194 |
{{ sl.label() }}
|
| 195 |
</option>
|
| 196 |
{% endfor %}
|
|
|
|
| 345 |
const pos = checked ? checked.value : '';
|
| 346 |
|
| 347 |
// 習熟度表示切替
|
| 348 |
+
const hallDisplay = (pos === 'kitchen') ? 'none' : '';
|
| 349 |
+
const kitchenDisplay = (pos === 'hall') ? 'none' : '';
|
| 350 |
+
document.getElementById('hall-skill-block').style.display = hallDisplay;
|
| 351 |
+
document.getElementById('hall-skill-dinner-block').style.display = hallDisplay;
|
| 352 |
+
document.getElementById('kitchen-skill-block').style.display = kitchenDisplay;
|
| 353 |
+
document.getElementById('kitchen-skill-dinner-block').style.display = kitchenDisplay;
|
| 354 |
|
| 355 |
// 出力ポジションブロック:両方の時のみ表示
|
| 356 |
document.getElementById('output-pos-block').style.display = (pos === '') ? '' : 'none';
|
ui/employee_view.py
CHANGED
|
@@ -122,7 +122,10 @@ class EmployeeView(QWidget):
|
|
| 122 |
pp_label = emp.primary_position.label() if emp.primary_position else "未設定"
|
| 123 |
pp_text = f"{pp_label}(兼務可)" if emp.can_work_both_positions else pp_label
|
| 124 |
pt_text = emp.primary_timeslot.short_label() + "専任" if emp.primary_timeslot else "どちらでも"
|
| 125 |
-
skill_text =
|
|
|
|
|
|
|
|
|
|
| 126 |
name_text = emp.name if emp.is_active else f"{emp.name}(アーカイブ)"
|
| 127 |
self.table.setItem(row, 0, QTableWidgetItem(str(emp.id)))
|
| 128 |
self.table.setItem(row, 1, QTableWidgetItem(name_text))
|
|
@@ -288,21 +291,28 @@ class EmployeeDialog(QDialog):
|
|
| 288 |
avail_layout.addWidget(self.always_avail_d_check)
|
| 289 |
layout.addWidget(avail_group)
|
| 290 |
|
| 291 |
-
# 習熟度
|
| 292 |
-
skill_group = QGroupBox("習熟度(ポジション別)")
|
| 293 |
skill_layout = QFormLayout(skill_group)
|
| 294 |
skill_layout.setSpacing(10)
|
| 295 |
|
| 296 |
-
self.
|
| 297 |
-
self.
|
|
|
|
|
|
|
| 298 |
for label, val in [("リーダー", SkillLevel.LEADER), ("ベテラン", SkillLevel.VETERAN),
|
| 299 |
("メンバー", SkillLevel.GENERAL), ("ビギナー", SkillLevel.BEGINNER)]:
|
| 300 |
-
self.
|
| 301 |
-
self.
|
| 302 |
-
|
| 303 |
-
|
| 304 |
-
|
| 305 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 306 |
layout.addWidget(skill_group)
|
| 307 |
|
| 308 |
# アルバイト専用設定
|
|
@@ -413,10 +423,14 @@ class EmployeeDialog(QDialog):
|
|
| 413 |
idx_pt = self.primary_ts_combo.findData(emp.primary_timeslot)
|
| 414 |
self.primary_ts_combo.setCurrentIndex(idx_pt if idx_pt >= 0 else 0)
|
| 415 |
|
| 416 |
-
|
| 417 |
-
self.
|
| 418 |
-
|
| 419 |
-
self.
|
|
|
|
|
|
|
|
|
|
|
|
|
| 420 |
|
| 421 |
for i, (cb_b, cb_d) in enumerate(self.pattern_checks):
|
| 422 |
p = emp.get_pattern(i)
|
|
@@ -441,8 +455,10 @@ class EmployeeDialog(QDialog):
|
|
| 441 |
always_avail_b = self.always_avail_b_check.isChecked()
|
| 442 |
always_avail_d = self.always_avail_d_check.isChecked()
|
| 443 |
primary_timeslot = self.primary_ts_combo.currentData()
|
| 444 |
-
|
| 445 |
-
|
|
|
|
|
|
|
| 446 |
|
| 447 |
patterns = []
|
| 448 |
if emp_type == EmploymentType.PART_TIME:
|
|
@@ -460,8 +476,10 @@ class EmployeeDialog(QDialog):
|
|
| 460 |
id=existing_id,
|
| 461 |
name=name,
|
| 462 |
employment_type=emp_type,
|
| 463 |
-
|
| 464 |
-
|
|
|
|
|
|
|
| 465 |
primary_position=primary_position,
|
| 466 |
can_work_both_positions=can_work_both,
|
| 467 |
can_open=can_open,
|
|
|
|
| 122 |
pp_label = emp.primary_position.label() if emp.primary_position else "未設定"
|
| 123 |
pp_text = f"{pp_label}(兼務可)" if emp.can_work_both_positions else pp_label
|
| 124 |
pt_text = emp.primary_timeslot.short_label() + "専任" if emp.primary_timeslot else "どちらでも"
|
| 125 |
+
skill_text = (
|
| 126 |
+
f"H朝:{emp.hall_skill_breakfast.label()} / H夜:{emp.hall_skill_dinner.label()} / "
|
| 127 |
+
f"K朝:{emp.kitchen_skill_breakfast.label()} / K夜:{emp.kitchen_skill_dinner.label()}"
|
| 128 |
+
)
|
| 129 |
name_text = emp.name if emp.is_active else f"{emp.name}(アーカイブ)"
|
| 130 |
self.table.setItem(row, 0, QTableWidgetItem(str(emp.id)))
|
| 131 |
self.table.setItem(row, 1, QTableWidgetItem(name_text))
|
|
|
|
| 291 |
avail_layout.addWidget(self.always_avail_d_check)
|
| 292 |
layout.addWidget(avail_group)
|
| 293 |
|
| 294 |
+
# 習熟度(朝食/ディナー別)
|
| 295 |
+
skill_group = QGroupBox("習熟度(ポジション・時間帯別)")
|
| 296 |
skill_layout = QFormLayout(skill_group)
|
| 297 |
skill_layout.setSpacing(10)
|
| 298 |
|
| 299 |
+
self.hall_skill_breakfast_combo = QComboBox()
|
| 300 |
+
self.hall_skill_dinner_combo = QComboBox()
|
| 301 |
+
self.kitchen_skill_breakfast_combo = QComboBox()
|
| 302 |
+
self.kitchen_skill_dinner_combo = QComboBox()
|
| 303 |
for label, val in [("リーダー", SkillLevel.LEADER), ("ベテラン", SkillLevel.VETERAN),
|
| 304 |
("メンバー", SkillLevel.GENERAL), ("ビギナー", SkillLevel.BEGINNER)]:
|
| 305 |
+
self.hall_skill_breakfast_combo.addItem(label, val)
|
| 306 |
+
self.hall_skill_dinner_combo.addItem(label, val)
|
| 307 |
+
self.kitchen_skill_breakfast_combo.addItem(label, val)
|
| 308 |
+
self.kitchen_skill_dinner_combo.addItem(label, val)
|
| 309 |
+
for combo in (self.hall_skill_breakfast_combo, self.hall_skill_dinner_combo,
|
| 310 |
+
self.kitchen_skill_breakfast_combo, self.kitchen_skill_dinner_combo):
|
| 311 |
+
combo.setCurrentIndex(3)
|
| 312 |
+
skill_layout.addRow("ホール習熟度(朝食)", self.hall_skill_breakfast_combo)
|
| 313 |
+
skill_layout.addRow("ホール習熟度(ディナー)", self.hall_skill_dinner_combo)
|
| 314 |
+
skill_layout.addRow("キッチン習熟度(朝食)", self.kitchen_skill_breakfast_combo)
|
| 315 |
+
skill_layout.addRow("キッチン習熟度(ディナー)", self.kitchen_skill_dinner_combo)
|
| 316 |
layout.addWidget(skill_group)
|
| 317 |
|
| 318 |
# アルバイト専用設定
|
|
|
|
| 423 |
idx_pt = self.primary_ts_combo.findData(emp.primary_timeslot)
|
| 424 |
self.primary_ts_combo.setCurrentIndex(idx_pt if idx_pt >= 0 else 0)
|
| 425 |
|
| 426 |
+
idx_hb = self.hall_skill_breakfast_combo.findData(emp.hall_skill_breakfast)
|
| 427 |
+
self.hall_skill_breakfast_combo.setCurrentIndex(idx_hb)
|
| 428 |
+
idx_hd = self.hall_skill_dinner_combo.findData(emp.hall_skill_dinner)
|
| 429 |
+
self.hall_skill_dinner_combo.setCurrentIndex(idx_hd)
|
| 430 |
+
idx_kb = self.kitchen_skill_breakfast_combo.findData(emp.kitchen_skill_breakfast)
|
| 431 |
+
self.kitchen_skill_breakfast_combo.setCurrentIndex(idx_kb)
|
| 432 |
+
idx_kd = self.kitchen_skill_dinner_combo.findData(emp.kitchen_skill_dinner)
|
| 433 |
+
self.kitchen_skill_dinner_combo.setCurrentIndex(idx_kd)
|
| 434 |
|
| 435 |
for i, (cb_b, cb_d) in enumerate(self.pattern_checks):
|
| 436 |
p = emp.get_pattern(i)
|
|
|
|
| 455 |
always_avail_b = self.always_avail_b_check.isChecked()
|
| 456 |
always_avail_d = self.always_avail_d_check.isChecked()
|
| 457 |
primary_timeslot = self.primary_ts_combo.currentData()
|
| 458 |
+
hall_skill_breakfast = self.hall_skill_breakfast_combo.currentData()
|
| 459 |
+
hall_skill_dinner = self.hall_skill_dinner_combo.currentData()
|
| 460 |
+
kitchen_skill_breakfast = self.kitchen_skill_breakfast_combo.currentData()
|
| 461 |
+
kitchen_skill_dinner = self.kitchen_skill_dinner_combo.currentData()
|
| 462 |
|
| 463 |
patterns = []
|
| 464 |
if emp_type == EmploymentType.PART_TIME:
|
|
|
|
| 476 |
id=existing_id,
|
| 477 |
name=name,
|
| 478 |
employment_type=emp_type,
|
| 479 |
+
hall_skill_breakfast=hall_skill_breakfast,
|
| 480 |
+
hall_skill_dinner=hall_skill_dinner,
|
| 481 |
+
kitchen_skill_breakfast=kitchen_skill_breakfast,
|
| 482 |
+
kitchen_skill_dinner=kitchen_skill_dinner,
|
| 483 |
primary_position=primary_position,
|
| 484 |
can_work_both_positions=can_work_both,
|
| 485 |
can_open=can_open,
|
ui/schedule_view.py
CHANGED
|
@@ -466,7 +466,7 @@ class ScheduleView(QWidget):
|
|
| 466 |
continue
|
| 467 |
count_map[(ds, pos_v)] += 1
|
| 468 |
emp = next((e for e in self._employees if e.id == emp_id), None)
|
| 469 |
-
if emp and emp.is_leader(pos_v):
|
| 470 |
leader_map[(ds, pos_v)] += 1
|
| 471 |
|
| 472 |
n_cols = len(col_headers)
|
|
@@ -535,8 +535,8 @@ class ScheduleView(QWidget):
|
|
| 535 |
def _fill_emp_row(self, table: QTableWidget, row: int, emp: Employee,
|
| 536 |
slot: TimeSlot, col_date_strs: list, other_ids: set,
|
| 537 |
reinf_emp_ids: set | None = None):
|
| 538 |
-
skill_b = SKILL_BADGE.get(emp.
|
| 539 |
-
skill_k = SKILL_BADGE.get(emp.
|
| 540 |
pp_base = f"[{emp.primary_position.label()[:1]}]" if emp.primary_position else ""
|
| 541 |
pp = f"{pp_base}[兼]" if emp.can_work_both_positions else pp_base
|
| 542 |
if slot == TimeSlot.BREAKFAST:
|
|
@@ -583,7 +583,7 @@ class ScheduleView(QWidget):
|
|
| 583 |
can_work = (req[0] if slot == TimeSlot.BREAKFAST else req[1]) if req else False
|
| 584 |
|
| 585 |
if pos_v:
|
| 586 |
-
skill = emp.
|
| 587 |
badge = SKILL_BADGE.get(skill, "")
|
| 588 |
pos_label = "H" if pos_v == "hall" else "K"
|
| 589 |
prefix = "+" if is_reinf else ""
|
|
@@ -1261,9 +1261,9 @@ class PositionSelectDialog(QDialog):
|
|
| 1261 |
leaders = sum(
|
| 1262 |
1 for (eid, d2, s2), val in assignments.items()
|
| 1263 |
if d2 == ds and s2 == slot.value and val[0] == pos.value
|
| 1264 |
-
and any(x.id == eid and x.is_leader(pos.value) for x in all_employees)
|
| 1265 |
)
|
| 1266 |
-
emp_skill = emp.skill_for(pos.value)
|
| 1267 |
badge = SKILL_BADGE.get(emp_skill, "")
|
| 1268 |
btn = QPushButton(
|
| 1269 |
f"{pos.label()} [{current}/{constraint.get('max',3)}名] "
|
|
|
|
| 466 |
continue
|
| 467 |
count_map[(ds, pos_v)] += 1
|
| 468 |
emp = next((e for e in self._employees if e.id == emp_id), None)
|
| 469 |
+
if emp and emp.is_leader(pos_v, slot):
|
| 470 |
leader_map[(ds, pos_v)] += 1
|
| 471 |
|
| 472 |
n_cols = len(col_headers)
|
|
|
|
| 535 |
def _fill_emp_row(self, table: QTableWidget, row: int, emp: Employee,
|
| 536 |
slot: TimeSlot, col_date_strs: list, other_ids: set,
|
| 537 |
reinf_emp_ids: set | None = None):
|
| 538 |
+
skill_b = SKILL_BADGE.get(emp.skill_for("hall", slot), "")
|
| 539 |
+
skill_k = SKILL_BADGE.get(emp.skill_for("kitchen", slot), "")
|
| 540 |
pp_base = f"[{emp.primary_position.label()[:1]}]" if emp.primary_position else ""
|
| 541 |
pp = f"{pp_base}[兼]" if emp.can_work_both_positions else pp_base
|
| 542 |
if slot == TimeSlot.BREAKFAST:
|
|
|
|
| 583 |
can_work = (req[0] if slot == TimeSlot.BREAKFAST else req[1]) if req else False
|
| 584 |
|
| 585 |
if pos_v:
|
| 586 |
+
skill = emp.skill_for(pos_v, slot)
|
| 587 |
badge = SKILL_BADGE.get(skill, "")
|
| 588 |
pos_label = "H" if pos_v == "hall" else "K"
|
| 589 |
prefix = "+" if is_reinf else ""
|
|
|
|
| 1261 |
leaders = sum(
|
| 1262 |
1 for (eid, d2, s2), val in assignments.items()
|
| 1263 |
if d2 == ds and s2 == slot.value and val[0] == pos.value
|
| 1264 |
+
and any(x.id == eid and x.is_leader(pos.value, slot) for x in all_employees)
|
| 1265 |
)
|
| 1266 |
+
emp_skill = emp.skill_for(pos.value, slot)
|
| 1267 |
badge = SKILL_BADGE.get(emp_skill, "")
|
| 1268 |
btn = QPushButton(
|
| 1269 |
f"{pos.label()} [{current}/{constraint.get('max',3)}名] "
|