Commit ·
956694f
1
Parent(s): 0a7879e
feat: 所属ポジション・ショートカットキー・タブ表示・制約強化
Browse files[所属ポジション]
- PrimaryPosition enum (HALL/KITCHEN) を追加
- Employee に primary_position フィールド追加、DB マイグレーション対応
- EmployeeDialog に「所属ポジション」セレクタ追加(どちらでも / ホール専任 / キッチン専任)
- ソルバー: 専任ポジション外へのアサインを絶対制約で禁止(手動編集による例外は引き続き可)
- シフト表: 氏名セルに [H] / [K] バッジ表示
[シフト制約強化]
- SHIFT_CONSTRAINTS を実際の要件に更新:
朝食ホール min3/max4 リーダー1名必須, 朝食キッチン 3名固定 リーダー1名必須
ディナーホール min2/max3 リーダー1名必須, ディナーキッチン 3名固定 リーダー2名必須
- min_skilled → min_leader(リーダー限定)に変更、Employee.is_leader() 追加
[ショートカットキー(希望シフト入力)]
- ← / → : 前の従業員 / 次の従業員
- 0〜9キー: 選択行のシフトパターンをコンボインデックスで即時設定
[タブ表示(シフト表示・編集)]
- 朝食・ディナーを別タブに分離、日付列がすっきりして視認性向上
- 集計行: リーダー数 (★N) を表示して制約クリア状況を色分け
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
- db/database.py +9 -7
- db/repositories.py +9 -5
- models/employee.py +6 -1
- optimizer/solver.py +25 -16
- ui/employee_view.py +24 -11
- ui/schedule_view.py +96 -117
- ui/shift_input_view.py +28 -1
- utils/constants.py +13 -4
db/database.py
CHANGED
|
@@ -104,14 +104,16 @@ def initialize_db():
|
|
| 104 |
);
|
| 105 |
""")
|
| 106 |
|
| 107 |
-
#
|
| 108 |
-
|
| 109 |
-
("pattern_id",
|
| 110 |
-
("
|
| 111 |
-
("custom_end",
|
| 112 |
-
|
|
|
|
|
|
|
| 113 |
try:
|
| 114 |
-
cur.execute(f"ALTER TABLE
|
| 115 |
except Exception:
|
| 116 |
pass # 既に存在する場合は無視
|
| 117 |
|
|
|
|
| 104 |
);
|
| 105 |
""")
|
| 106 |
|
| 107 |
+
# マイグレーション: 新カラムを既存テーブルへ追加
|
| 108 |
+
migrations = [
|
| 109 |
+
("shift_requests", "pattern_id", "TEXT"),
|
| 110 |
+
("shift_requests", "custom_start", "TEXT"),
|
| 111 |
+
("shift_requests", "custom_end", "TEXT"),
|
| 112 |
+
("employees", "primary_position", "TEXT DEFAULT NULL"),
|
| 113 |
+
]
|
| 114 |
+
for table, col, definition in migrations:
|
| 115 |
try:
|
| 116 |
+
cur.execute(f"ALTER TABLE {table} ADD COLUMN {col} {definition}")
|
| 117 |
except Exception:
|
| 118 |
pass # 既に存在する場合は無視
|
| 119 |
|
db/repositories.py
CHANGED
|
@@ -4,7 +4,7 @@ from typing import Optional
|
|
| 4 |
from db.database import get_connection
|
| 5 |
from models.employee import Employee, FixedPattern
|
| 6 |
from models.schedule import ShiftRequest, ShiftAssignment, SchedulePeriod
|
| 7 |
-
from utils.constants import EmploymentType, SkillLevel, TimeSlot, Position
|
| 8 |
|
| 9 |
|
| 10 |
# ── 従業員 ──────────────────────────────────────────────────────────────
|
|
@@ -32,16 +32,17 @@ def get_employee(employee_id: int) -> Optional[Employee]:
|
|
| 32 |
|
| 33 |
def save_employee(emp: Employee) -> Employee:
|
| 34 |
conn = get_connection()
|
|
|
|
| 35 |
if emp.id is None:
|
| 36 |
cur = conn.execute(
|
| 37 |
-
"INSERT INTO employees (name, employment_type, hall_skill, kitchen_skill, is_active) VALUES (?,?,?,?,?)",
|
| 38 |
-
(emp.name, emp.employment_type.value, emp.hall_skill.value, emp.kitchen_skill.value, 1)
|
| 39 |
)
|
| 40 |
emp.id = cur.lastrowid
|
| 41 |
else:
|
| 42 |
conn.execute(
|
| 43 |
-
"UPDATE employees SET name=?, employment_type=?, hall_skill=?, kitchen_skill=?, is_active=? WHERE id=?",
|
| 44 |
-
(emp.name, emp.employment_type.value, emp.hall_skill.value, emp.kitchen_skill.value, int(emp.is_active), emp.id)
|
| 45 |
)
|
| 46 |
_save_fixed_patterns(conn, emp)
|
| 47 |
_save_fixed_unavailable_dates(conn, emp)
|
|
@@ -66,12 +67,15 @@ def _row_to_employee(row, conn) -> Employee:
|
|
| 66 |
"SELECT date FROM fixed_unavailable_dates WHERE employee_id=? ORDER BY date",
|
| 67 |
(row["id"],)
|
| 68 |
).fetchall()
|
|
|
|
|
|
|
| 69 |
return Employee(
|
| 70 |
id=row["id"],
|
| 71 |
name=row["name"],
|
| 72 |
employment_type=EmploymentType(row["employment_type"]),
|
| 73 |
hall_skill=SkillLevel(row["hall_skill"]),
|
| 74 |
kitchen_skill=SkillLevel(row["kitchen_skill"]),
|
|
|
|
| 75 |
is_active=bool(row["is_active"]),
|
| 76 |
fixed_patterns=[
|
| 77 |
FixedPattern(p["day_of_week"], bool(p["breakfast"]), bool(p["dinner"]))
|
|
|
|
| 4 |
from db.database import get_connection
|
| 5 |
from models.employee import Employee, FixedPattern
|
| 6 |
from models.schedule import ShiftRequest, ShiftAssignment, SchedulePeriod
|
| 7 |
+
from utils.constants import EmploymentType, SkillLevel, TimeSlot, Position, PrimaryPosition
|
| 8 |
|
| 9 |
|
| 10 |
# ── 従業員 ──────────────────────────────────────────────────────────────
|
|
|
|
| 32 |
|
| 33 |
def save_employee(emp: Employee) -> Employee:
|
| 34 |
conn = get_connection()
|
| 35 |
+
pp = emp.primary_position.value if emp.primary_position else None
|
| 36 |
if emp.id is None:
|
| 37 |
cur = conn.execute(
|
| 38 |
+
"INSERT INTO employees (name, employment_type, hall_skill, kitchen_skill, primary_position, is_active) VALUES (?,?,?,?,?,?)",
|
| 39 |
+
(emp.name, emp.employment_type.value, emp.hall_skill.value, emp.kitchen_skill.value, pp, 1)
|
| 40 |
)
|
| 41 |
emp.id = cur.lastrowid
|
| 42 |
else:
|
| 43 |
conn.execute(
|
| 44 |
+
"UPDATE employees SET name=?, employment_type=?, hall_skill=?, kitchen_skill=?, primary_position=?, is_active=? WHERE id=?",
|
| 45 |
+
(emp.name, emp.employment_type.value, emp.hall_skill.value, emp.kitchen_skill.value, pp, int(emp.is_active), emp.id)
|
| 46 |
)
|
| 47 |
_save_fixed_patterns(conn, emp)
|
| 48 |
_save_fixed_unavailable_dates(conn, emp)
|
|
|
|
| 67 |
"SELECT date FROM fixed_unavailable_dates WHERE employee_id=? ORDER BY date",
|
| 68 |
(row["id"],)
|
| 69 |
).fetchall()
|
| 70 |
+
keys = row.keys()
|
| 71 |
+
pp_val = row["primary_position"] if "primary_position" in keys and row["primary_position"] else None
|
| 72 |
return Employee(
|
| 73 |
id=row["id"],
|
| 74 |
name=row["name"],
|
| 75 |
employment_type=EmploymentType(row["employment_type"]),
|
| 76 |
hall_skill=SkillLevel(row["hall_skill"]),
|
| 77 |
kitchen_skill=SkillLevel(row["kitchen_skill"]),
|
| 78 |
+
primary_position=PrimaryPosition(pp_val) if pp_val else None,
|
| 79 |
is_active=bool(row["is_active"]),
|
| 80 |
fixed_patterns=[
|
| 81 |
FixedPattern(p["day_of_week"], bool(p["breakfast"]), bool(p["dinner"]))
|
models/employee.py
CHANGED
|
@@ -1,6 +1,6 @@
|
|
| 1 |
from dataclasses import dataclass, field
|
| 2 |
from typing import Optional
|
| 3 |
-
from utils.constants import EmploymentType, SkillLevel
|
| 4 |
|
| 5 |
|
| 6 |
@dataclass
|
|
@@ -17,6 +17,7 @@ class Employee:
|
|
| 17 |
employment_type: EmploymentType
|
| 18 |
hall_skill: SkillLevel = SkillLevel.BEGINNER
|
| 19 |
kitchen_skill: SkillLevel = SkillLevel.BEGINNER
|
|
|
|
| 20 |
fixed_patterns: list[FixedPattern] = field(default_factory=list)
|
| 21 |
fixed_unavailable_dates: list[str] = field(default_factory=list) # YYYY-MM-DD
|
| 22 |
is_active: bool = True
|
|
@@ -31,6 +32,10 @@ class Employee:
|
|
| 31 |
"""ベテラン以上かどうか"""
|
| 32 |
return self.skill_for(position).rank() >= SkillLevel.VETERAN.rank()
|
| 33 |
|
|
|
|
|
|
|
|
|
|
|
|
|
| 34 |
def has_fixed_pattern(self) -> bool:
|
| 35 |
return any(p.breakfast or p.dinner for p in self.fixed_patterns)
|
| 36 |
|
|
|
|
| 1 |
from dataclasses import dataclass, field
|
| 2 |
from typing import Optional
|
| 3 |
+
from utils.constants import EmploymentType, SkillLevel, PrimaryPosition
|
| 4 |
|
| 5 |
|
| 6 |
@dataclass
|
|
|
|
| 17 |
employment_type: EmploymentType
|
| 18 |
hall_skill: SkillLevel = SkillLevel.BEGINNER
|
| 19 |
kitchen_skill: SkillLevel = SkillLevel.BEGINNER
|
| 20 |
+
primary_position: Optional[PrimaryPosition] = None # None = どちらでも可
|
| 21 |
fixed_patterns: list[FixedPattern] = field(default_factory=list)
|
| 22 |
fixed_unavailable_dates: list[str] = field(default_factory=list) # YYYY-MM-DD
|
| 23 |
is_active: bool = True
|
|
|
|
| 32 |
"""ベテラン以上かどうか"""
|
| 33 |
return self.skill_for(position).rank() >= SkillLevel.VETERAN.rank()
|
| 34 |
|
| 35 |
+
def is_leader(self, position: str) -> bool:
|
| 36 |
+
"""リーダーかどうか"""
|
| 37 |
+
return self.skill_for(position) == SkillLevel.LEADER
|
| 38 |
+
|
| 39 |
def has_fixed_pattern(self) -> bool:
|
| 40 |
return any(p.breakfast or p.dinner for p in self.fixed_patterns)
|
| 41 |
|
optimizer/solver.py
CHANGED
|
@@ -6,7 +6,7 @@ from ortools.sat.python import cp_model
|
|
| 6 |
from models.employee import Employee
|
| 7 |
from models.schedule import ShiftRequest, ShiftAssignment, SchedulePeriod
|
| 8 |
from utils.constants import (
|
| 9 |
-
TimeSlot, Position, SkillLevel, EmploymentType,
|
| 10 |
SHIFT_CONSTRAINTS, LATE_NIGHT_START
|
| 11 |
)
|
| 12 |
|
|
@@ -74,6 +74,16 @@ def solve(
|
|
| 74 |
|
| 75 |
# ── 絶対制約 ─────────────────────────────────────────────────────────
|
| 76 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 77 |
# 1. 従業員は希望していない時間帯には入れない
|
| 78 |
for emp in active_employees:
|
| 79 |
for ds in date_strs:
|
|
@@ -118,7 +128,7 @@ def solve(
|
|
| 118 |
model.add(sum(staff_vars) >= constraint["min"])
|
| 119 |
model.add(sum(staff_vars) <= constraint["max"])
|
| 120 |
|
| 121 |
-
# 5.
|
| 122 |
for ds in date_strs:
|
| 123 |
for slot in slots:
|
| 124 |
for pos in positions:
|
|
@@ -126,15 +136,15 @@ def solve(
|
|
| 126 |
constraint = SHIFT_CONSTRAINTS.get(key)
|
| 127 |
if not constraint:
|
| 128 |
continue
|
| 129 |
-
|
| 130 |
-
if
|
| 131 |
continue
|
| 132 |
-
|
| 133 |
assign[emp.id][ds][slot.value][pos.value]
|
| 134 |
for emp in active_employees
|
| 135 |
-
if emp.
|
| 136 |
]
|
| 137 |
-
model.add(sum(
|
| 138 |
|
| 139 |
# 6. 正社員の両時間帯掛け持ちは最小化(ソフト制約で対応)
|
| 140 |
# 両時間帯掛け持ち変数
|
|
@@ -328,26 +338,25 @@ def _diagnose_infeasible(
|
|
| 328 |
if not constraint:
|
| 329 |
continue
|
| 330 |
|
| 331 |
-
# 希望者数
|
| 332 |
available = [
|
| 333 |
e for e in employees
|
| 334 |
if req_map.get((e.id, ds, slot.value), False)
|
|
|
|
| 335 |
]
|
| 336 |
-
|
| 337 |
-
|
| 338 |
-
skilled = [e for e in available_for_pos if e.is_skilled(pos.value)]
|
| 339 |
min_req = constraint["min"]
|
| 340 |
-
|
| 341 |
|
| 342 |
-
if len(
|
| 343 |
errors.append(
|
| 344 |
f"❌ {label} {slot.short_label()} {pos.label()}: "
|
| 345 |
-
f"希望者が{len(
|
| 346 |
)
|
| 347 |
-
elif len(
|
| 348 |
errors.append(
|
| 349 |
f"❌ {label} {slot.short_label()} {pos.label()}: "
|
| 350 |
-
f"
|
| 351 |
)
|
| 352 |
|
| 353 |
if not errors:
|
|
|
|
| 6 |
from models.employee import Employee
|
| 7 |
from models.schedule import ShiftRequest, ShiftAssignment, SchedulePeriod
|
| 8 |
from utils.constants import (
|
| 9 |
+
TimeSlot, Position, SkillLevel, EmploymentType, PrimaryPosition,
|
| 10 |
SHIFT_CONSTRAINTS, LATE_NIGHT_START
|
| 11 |
)
|
| 12 |
|
|
|
|
| 74 |
|
| 75 |
# ── 絶対制約 ─────────────────────────────────────────────────────────
|
| 76 |
|
| 77 |
+
# 0. 所属ポジション制約: primary_position が設定されている場合は担当外のポジションに入れない
|
| 78 |
+
for emp in active_employees:
|
| 79 |
+
if emp.primary_position is None:
|
| 80 |
+
continue
|
| 81 |
+
restricted = [p for p in positions if p.value != emp.primary_position.value]
|
| 82 |
+
for ds in date_strs:
|
| 83 |
+
for slot in slots:
|
| 84 |
+
for pos in restricted:
|
| 85 |
+
model.add(assign[emp.id][ds][slot.value][pos.value] == 0)
|
| 86 |
+
|
| 87 |
# 1. 従業員は希望していない時間帯には入れない
|
| 88 |
for emp in active_employees:
|
| 89 |
for ds in date_strs:
|
|
|
|
| 128 |
model.add(sum(staff_vars) >= constraint["min"])
|
| 129 |
model.add(sum(staff_vars) <= constraint["max"])
|
| 130 |
|
| 131 |
+
# 5. リーダー配置制約(絶対制約:リーダーの最低配置数)
|
| 132 |
for ds in date_strs:
|
| 133 |
for slot in slots:
|
| 134 |
for pos in positions:
|
|
|
|
| 136 |
constraint = SHIFT_CONSTRAINTS.get(key)
|
| 137 |
if not constraint:
|
| 138 |
continue
|
| 139 |
+
min_leader = constraint.get("min_leader", 0)
|
| 140 |
+
if min_leader <= 0:
|
| 141 |
continue
|
| 142 |
+
leader_vars = [
|
| 143 |
assign[emp.id][ds][slot.value][pos.value]
|
| 144 |
for emp in active_employees
|
| 145 |
+
if emp.is_leader(pos.value)
|
| 146 |
]
|
| 147 |
+
model.add(sum(leader_vars) >= min_leader)
|
| 148 |
|
| 149 |
# 6. 正社員の両時間帯掛け持ちは最小化(ソフト制約で対応)
|
| 150 |
# 両時間帯掛け持ち変数
|
|
|
|
| 338 |
if not constraint:
|
| 339 |
continue
|
| 340 |
|
| 341 |
+
# 所属ポジションを考慮した希望者数
|
| 342 |
available = [
|
| 343 |
e for e in employees
|
| 344 |
if req_map.get((e.id, ds, slot.value), False)
|
| 345 |
+
and (e.primary_position is None or e.primary_position.value == pos.value)
|
| 346 |
]
|
| 347 |
+
leaders = [e for e in available if e.is_leader(pos.value)]
|
|
|
|
|
|
|
| 348 |
min_req = constraint["min"]
|
| 349 |
+
min_leader = constraint.get("min_leader", 0)
|
| 350 |
|
| 351 |
+
if len(available) < min_req:
|
| 352 |
errors.append(
|
| 353 |
f"❌ {label} {slot.short_label()} {pos.label()}: "
|
| 354 |
+
f"希望者が{len(available)}名(必要: {min_req}名以上)"
|
| 355 |
)
|
| 356 |
+
elif len(leaders) < min_leader:
|
| 357 |
errors.append(
|
| 358 |
f"❌ {label} {slot.short_label()} {pos.label()}: "
|
| 359 |
+
f"リーダーが{len(leaders)}名(必要: {min_leader}名以上)"
|
| 360 |
)
|
| 361 |
|
| 362 |
if not errors:
|
ui/employee_view.py
CHANGED
|
@@ -11,7 +11,7 @@ from PyQt6.QtCore import Qt, QDate
|
|
| 11 |
from PyQt6.QtGui import QFont, QColor
|
| 12 |
from db import repositories as repo
|
| 13 |
from models.employee import Employee, FixedPattern
|
| 14 |
-
from utils.constants import EmploymentType, SkillLevel, DAY_OF_WEEK_LABELS
|
| 15 |
from utils.theme import theme
|
| 16 |
|
| 17 |
|
|
@@ -41,13 +41,14 @@ class EmployeeView(QWidget):
|
|
| 41 |
|
| 42 |
# テーブル
|
| 43 |
self.table = QTableWidget()
|
| 44 |
-
self.table.setColumnCount(
|
| 45 |
-
self.table.setHorizontalHeaderLabels(["ID", "氏名", "ポジション習熟度", "雇用形態", "操作"])
|
| 46 |
-
self.table.horizontalHeader().setSectionResizeMode(
|
| 47 |
self.table.horizontalHeader().setSectionResizeMode(1, QHeaderView.ResizeMode.ResizeToContents)
|
| 48 |
-
self.table.setColumnWidth(0,
|
| 49 |
-
self.table.setColumnWidth(
|
| 50 |
-
self.table.setColumnWidth(4,
|
|
|
|
| 51 |
self.table.setEditTriggers(QTableWidget.EditTrigger.NoEditTriggers)
|
| 52 |
self.table.setSelectionBehavior(QTableWidget.SelectionBehavior.SelectRows)
|
| 53 |
self.table.setAlternatingRowColors(True)
|
|
@@ -71,11 +72,13 @@ class EmployeeView(QWidget):
|
|
| 71 |
self.employees = repo.get_all_employees()
|
| 72 |
self.table.setRowCount(len(self.employees))
|
| 73 |
for row, emp in enumerate(self.employees):
|
| 74 |
-
|
|
|
|
| 75 |
self.table.setItem(row, 0, QTableWidgetItem(str(emp.id)))
|
| 76 |
self.table.setItem(row, 1, QTableWidgetItem(emp.name))
|
| 77 |
-
self.table.setItem(row, 2, QTableWidgetItem(
|
| 78 |
-
self.table.setItem(row, 3, QTableWidgetItem(
|
|
|
|
| 79 |
|
| 80 |
# 操作ボタン
|
| 81 |
btn_widget = QWidget()
|
|
@@ -104,7 +107,7 @@ class EmployeeView(QWidget):
|
|
| 104 |
|
| 105 |
btn_layout.addWidget(btn_edit)
|
| 106 |
btn_layout.addWidget(btn_del)
|
| 107 |
-
self.table.setCellWidget(row,
|
| 108 |
self.table.setRowHeight(row, 40)
|
| 109 |
|
| 110 |
def _on_new(self):
|
|
@@ -158,6 +161,12 @@ class EmployeeDialog(QDialog):
|
|
| 158 |
self.emp_type_combo.addItem("アルバイト", EmploymentType.PART_TIME)
|
| 159 |
self.emp_type_combo.currentIndexChanged.connect(self._on_type_changed)
|
| 160 |
form.addRow("雇用形態 *", self.emp_type_combo)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 161 |
layout.addWidget(basic_group)
|
| 162 |
|
| 163 |
# 習熟度
|
|
@@ -229,6 +238,8 @@ class EmployeeDialog(QDialog):
|
|
| 229 |
self.name_edit.setText(emp.name)
|
| 230 |
idx = self.emp_type_combo.findData(emp.employment_type)
|
| 231 |
self.emp_type_combo.setCurrentIndex(idx)
|
|
|
|
|
|
|
| 232 |
|
| 233 |
idx_h = self.hall_skill_combo.findData(emp.hall_skill)
|
| 234 |
self.hall_skill_combo.setCurrentIndex(idx_h)
|
|
@@ -247,6 +258,7 @@ class EmployeeDialog(QDialog):
|
|
| 247 |
return
|
| 248 |
|
| 249 |
emp_type = self.emp_type_combo.currentData()
|
|
|
|
| 250 |
hall_skill = self.hall_skill_combo.currentData()
|
| 251 |
kitchen_skill = self.kitchen_skill_combo.currentData()
|
| 252 |
|
|
@@ -265,6 +277,7 @@ class EmployeeDialog(QDialog):
|
|
| 265 |
employment_type=emp_type,
|
| 266 |
hall_skill=hall_skill,
|
| 267 |
kitchen_skill=kitchen_skill,
|
|
|
|
| 268 |
fixed_patterns=patterns,
|
| 269 |
fixed_unavailable_dates=existing_unavail,
|
| 270 |
)
|
|
|
|
| 11 |
from PyQt6.QtGui import QFont, QColor
|
| 12 |
from db import repositories as repo
|
| 13 |
from models.employee import Employee, FixedPattern
|
| 14 |
+
from utils.constants import EmploymentType, SkillLevel, PrimaryPosition, DAY_OF_WEEK_LABELS
|
| 15 |
from utils.theme import theme
|
| 16 |
|
| 17 |
|
|
|
|
| 41 |
|
| 42 |
# テーブル
|
| 43 |
self.table = QTableWidget()
|
| 44 |
+
self.table.setColumnCount(6)
|
| 45 |
+
self.table.setHorizontalHeaderLabels(["ID", "氏名", "所属ポジション", "習熟度", "雇用形態", "操作"])
|
| 46 |
+
self.table.horizontalHeader().setSectionResizeMode(3, QHeaderView.ResizeMode.Stretch)
|
| 47 |
self.table.horizontalHeader().setSectionResizeMode(1, QHeaderView.ResizeMode.ResizeToContents)
|
| 48 |
+
self.table.setColumnWidth(0, 40)
|
| 49 |
+
self.table.setColumnWidth(2, 110)
|
| 50 |
+
self.table.setColumnWidth(4, 90)
|
| 51 |
+
self.table.setColumnWidth(5, 130)
|
| 52 |
self.table.setEditTriggers(QTableWidget.EditTrigger.NoEditTriggers)
|
| 53 |
self.table.setSelectionBehavior(QTableWidget.SelectionBehavior.SelectRows)
|
| 54 |
self.table.setAlternatingRowColors(True)
|
|
|
|
| 72 |
self.employees = repo.get_all_employees()
|
| 73 |
self.table.setRowCount(len(self.employees))
|
| 74 |
for row, emp in enumerate(self.employees):
|
| 75 |
+
pp_text = emp.primary_position.label() if emp.primary_position else "どちらでも"
|
| 76 |
+
skill_text = f"H:{emp.hall_skill.label()} / K:{emp.kitchen_skill.label()}"
|
| 77 |
self.table.setItem(row, 0, QTableWidgetItem(str(emp.id)))
|
| 78 |
self.table.setItem(row, 1, QTableWidgetItem(emp.name))
|
| 79 |
+
self.table.setItem(row, 2, QTableWidgetItem(pp_text))
|
| 80 |
+
self.table.setItem(row, 3, QTableWidgetItem(skill_text))
|
| 81 |
+
self.table.setItem(row, 4, QTableWidgetItem(emp.employment_type.label()))
|
| 82 |
|
| 83 |
# 操作ボタン
|
| 84 |
btn_widget = QWidget()
|
|
|
|
| 107 |
|
| 108 |
btn_layout.addWidget(btn_edit)
|
| 109 |
btn_layout.addWidget(btn_del)
|
| 110 |
+
self.table.setCellWidget(row, 5, btn_widget)
|
| 111 |
self.table.setRowHeight(row, 40)
|
| 112 |
|
| 113 |
def _on_new(self):
|
|
|
|
| 161 |
self.emp_type_combo.addItem("アルバイト", EmploymentType.PART_TIME)
|
| 162 |
self.emp_type_combo.currentIndexChanged.connect(self._on_type_changed)
|
| 163 |
form.addRow("雇用形態 *", self.emp_type_combo)
|
| 164 |
+
|
| 165 |
+
self.primary_pos_combo = QComboBox()
|
| 166 |
+
self.primary_pos_combo.addItem("どちらでも(制限なし)", None)
|
| 167 |
+
self.primary_pos_combo.addItem("ホール専任", PrimaryPosition.HALL)
|
| 168 |
+
self.primary_pos_combo.addItem("キッチン専任", PrimaryPosition.KITCHEN)
|
| 169 |
+
form.addRow("所属ポジション", self.primary_pos_combo)
|
| 170 |
layout.addWidget(basic_group)
|
| 171 |
|
| 172 |
# 習熟度
|
|
|
|
| 238 |
self.name_edit.setText(emp.name)
|
| 239 |
idx = self.emp_type_combo.findData(emp.employment_type)
|
| 240 |
self.emp_type_combo.setCurrentIndex(idx)
|
| 241 |
+
idx_pp = self.primary_pos_combo.findData(emp.primary_position)
|
| 242 |
+
self.primary_pos_combo.setCurrentIndex(idx_pp if idx_pp >= 0 else 0)
|
| 243 |
|
| 244 |
idx_h = self.hall_skill_combo.findData(emp.hall_skill)
|
| 245 |
self.hall_skill_combo.setCurrentIndex(idx_h)
|
|
|
|
| 258 |
return
|
| 259 |
|
| 260 |
emp_type = self.emp_type_combo.currentData()
|
| 261 |
+
primary_position = self.primary_pos_combo.currentData()
|
| 262 |
hall_skill = self.hall_skill_combo.currentData()
|
| 263 |
kitchen_skill = self.kitchen_skill_combo.currentData()
|
| 264 |
|
|
|
|
| 277 |
employment_type=emp_type,
|
| 278 |
hall_skill=hall_skill,
|
| 279 |
kitchen_skill=kitchen_skill,
|
| 280 |
+
primary_position=primary_position,
|
| 281 |
fixed_patterns=patterns,
|
| 282 |
fixed_unavailable_dates=existing_unavail,
|
| 283 |
)
|
ui/schedule_view.py
CHANGED
|
@@ -7,7 +7,7 @@ from PyQt6.QtWidgets import (
|
|
| 7 |
QComboBox, QTableWidget, QTableWidgetItem, QHeaderView,
|
| 8 |
QGroupBox, QDialog, QListWidget, QListWidgetItem,
|
| 9 |
QDialogButtonBox, QScrollArea, QSizePolicy, QFrame,
|
| 10 |
-
QMessageBox, QAbstractItemView
|
| 11 |
)
|
| 12 |
from PyQt6.QtCore import Qt, pyqtSignal
|
| 13 |
from PyQt6.QtGui import QFont, QColor, QBrush
|
|
@@ -82,22 +82,32 @@ class ScheduleView(QWidget):
|
|
| 82 |
legend.addWidget(QLabel("習熟度: ★★リーダー ★ベテラン ▼新人"))
|
| 83 |
layout.addLayout(legend)
|
| 84 |
|
| 85 |
-
#
|
| 86 |
-
self.
|
| 87 |
-
self.
|
| 88 |
-
self.
|
| 89 |
-
self.
|
| 90 |
-
self.
|
| 91 |
-
self.
|
| 92 |
-
|
| 93 |
-
|
| 94 |
-
|
| 95 |
-
|
|
|
|
| 96 |
self.status_label = QLabel("")
|
| 97 |
layout.addWidget(self.status_label)
|
| 98 |
|
| 99 |
self._apply_styles()
|
| 100 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 101 |
def _apply_styles(self):
|
| 102 |
c = theme.c
|
| 103 |
self._btn_output.setStyleSheet(
|
|
@@ -134,8 +144,9 @@ class ScheduleView(QWidget):
|
|
| 134 |
def _on_period_changed(self, idx):
|
| 135 |
self._period = self.period_combo.currentData()
|
| 136 |
if not self._period:
|
| 137 |
-
self.
|
| 138 |
-
|
|
|
|
| 139 |
return
|
| 140 |
self._load_data()
|
| 141 |
self._render_table()
|
|
@@ -156,91 +167,77 @@ class ScheduleView(QWidget):
|
|
| 156 |
def _render_table(self):
|
| 157 |
if not self._period or not self._employees:
|
| 158 |
return
|
|
|
|
|
|
|
| 159 |
|
|
|
|
| 160 |
dates = self._period.date_range()
|
| 161 |
-
slots = list(TimeSlot)
|
| 162 |
|
| 163 |
-
# 列: 氏名
|
| 164 |
col_headers = ["氏名"]
|
| 165 |
-
|
| 166 |
for d in dates:
|
| 167 |
-
|
| 168 |
-
|
| 169 |
-
|
| 170 |
-
|
| 171 |
-
|
| 172 |
-
|
| 173 |
-
|
| 174 |
-
|
| 175 |
-
|
| 176 |
-
|
| 177 |
-
|
| 178 |
-
# 行構成: ホールヘッダー + 全従業員 + 人員数行×2スロット + キャチン区切り
|
| 179 |
-
# シンプルに: 全従業員行 + 日付ごとの集計行
|
| 180 |
-
rows_data = [] # (row_type, data)
|
| 181 |
-
for emp in all_emps:
|
| 182 |
-
rows_data.append(("employee", emp))
|
| 183 |
-
# 集計行: 朝食・ディナー別
|
| 184 |
-
for slot in slots:
|
| 185 |
-
for pos in Position:
|
| 186 |
-
rows_data.append(("summary", (slot, pos)))
|
| 187 |
-
|
| 188 |
-
self.table.setRowCount(len(rows_data))
|
| 189 |
-
self.table.setColumnCount(len(col_headers))
|
| 190 |
-
self.table.setHorizontalHeaderLabels(col_headers)
|
| 191 |
-
|
| 192 |
-
# 列幅
|
| 193 |
-
self.table.setColumnWidth(0, 100)
|
| 194 |
-
for c in range(1, len(col_headers) - 1):
|
| 195 |
-
self.table.setColumnWidth(c, 58)
|
| 196 |
-
self.table.setColumnWidth(len(col_headers) - 1, 50)
|
| 197 |
|
| 198 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 199 |
|
| 200 |
-
# 集計
|
| 201 |
-
count_map: dict[tuple[str, str
|
| 202 |
-
|
| 203 |
for (emp_id, ds, slot_v), pos_v in self._assignments.items():
|
| 204 |
-
|
|
|
|
|
|
|
| 205 |
emp = next((e for e in self._employees if e.id == emp_id), None)
|
| 206 |
-
if emp and emp.
|
| 207 |
-
|
| 208 |
|
| 209 |
for row_idx, (row_type, row_data) in enumerate(rows_data):
|
| 210 |
if row_type == "employee":
|
| 211 |
-
|
| 212 |
-
self._fill_employee_row(row_idx, emp, dates, slots, col_meta)
|
| 213 |
else:
|
| 214 |
-
slot,
|
| 215 |
-
|
| 216 |
|
| 217 |
-
|
| 218 |
-
|
| 219 |
-
self.table.setRowHeight(r, 28)
|
| 220 |
-
|
| 221 |
-
def _fill_employee_row(self, row, emp: Employee, dates, slots, col_meta):
|
| 222 |
-
# 氏名セル
|
| 223 |
skill_b = SKILL_BADGE.get(emp.hall_skill, "")
|
| 224 |
skill_k = SKILL_BADGE.get(emp.kitchen_skill, "")
|
| 225 |
-
|
| 226 |
-
name_item = QTableWidgetItem(
|
| 227 |
name_item.setFont(QFont("", 9))
|
| 228 |
-
|
| 229 |
|
|
|
|
| 230 |
total = 0
|
| 231 |
-
for col_idx,
|
| 232 |
-
if
|
| 233 |
continue
|
| 234 |
-
ds, slot_v = meta
|
| 235 |
pos_v = self._assignments.get((emp.id, ds, slot_v))
|
| 236 |
req = self._requests.get((emp.id, ds))
|
| 237 |
-
can_work = (req[0] if
|
| 238 |
|
| 239 |
c = theme.c
|
| 240 |
if pos_v:
|
| 241 |
-
pos_label = "H" if pos_v == "hall" else "K"
|
| 242 |
skill = emp.hall_skill if pos_v == "hall" else emp.kitchen_skill
|
| 243 |
badge = SKILL_BADGE.get(skill, "")
|
|
|
|
| 244 |
item = QTableWidgetItem(f"{pos_label}{badge}")
|
| 245 |
item.setBackground(QBrush(QColor(c["cell_assigned"])))
|
| 246 |
item.setTextAlignment(Qt.AlignmentFlag.AlignCenter)
|
|
@@ -256,61 +253,47 @@ class ScheduleView(QWidget):
|
|
| 256 |
item = QTableWidgetItem("")
|
| 257 |
item.setBackground(QBrush(QColor(c["cell_unavail"])))
|
| 258 |
item.setData(Qt.ItemDataRole.UserRole, ("unavailable", emp.id, ds, slot_v))
|
|
|
|
| 259 |
|
| 260 |
-
self.table.setItem(row, col_idx, item)
|
| 261 |
-
|
| 262 |
-
# 合計
|
| 263 |
total_item = QTableWidgetItem(str(total))
|
| 264 |
total_item.setTextAlignment(Qt.AlignmentFlag.AlignCenter)
|
| 265 |
total_item.setFont(QFont("", 9, QFont.Weight.Bold))
|
| 266 |
-
|
| 267 |
|
| 268 |
-
def
|
| 269 |
-
|
| 270 |
-
|
|
|
|
| 271 |
label_item.setFont(QFont("", 8, QFont.Weight.Bold))
|
| 272 |
label_item.setBackground(QBrush(QColor(theme.c["surface2"])))
|
| 273 |
-
|
| 274 |
|
| 275 |
-
|
| 276 |
-
|
|
|
|
| 277 |
|
| 278 |
-
for col_idx,
|
| 279 |
-
if
|
| 280 |
-
continue
|
| 281 |
-
ds, slot_v = meta
|
| 282 |
-
if slot_v != slot.value:
|
| 283 |
-
item = QTableWidgetItem("")
|
| 284 |
-
item.setBackground(QBrush(QColor(theme.c["surface2"])))
|
| 285 |
-
self.table.setItem(row, col_idx, item)
|
| 286 |
continue
|
| 287 |
-
|
| 288 |
-
|
| 289 |
-
|
| 290 |
-
min_req = constraint.get("min", 0)
|
| 291 |
-
max_req = constraint.get("max", 99)
|
| 292 |
-
min_sk = constraint.get("min_skilled", 0)
|
| 293 |
-
|
| 294 |
-
text = f"{cnt}名\n熟{sk}"
|
| 295 |
item = QTableWidgetItem(text)
|
| 296 |
item.setTextAlignment(Qt.AlignmentFlag.AlignCenter)
|
| 297 |
item.setFont(QFont("", 8))
|
| 298 |
-
|
| 299 |
c = theme.c
|
| 300 |
-
if cnt < min_req or
|
| 301 |
item.setBackground(QBrush(QColor(c["status_err"])))
|
| 302 |
-
elif cnt == min_req:
|
| 303 |
item.setBackground(QBrush(QColor(c["status_warn"])))
|
| 304 |
else:
|
| 305 |
item.setBackground(QBrush(QColor(c["status_ok"])))
|
|
|
|
| 306 |
|
| 307 |
-
|
| 308 |
-
|
| 309 |
-
# 合計欄は空白
|
| 310 |
-
self.table.setItem(row, len(col_meta) - 1, QTableWidgetItem(""))
|
| 311 |
|
| 312 |
-
def _on_cell_clicked(self, row, col):
|
| 313 |
-
item =
|
| 314 |
if not item:
|
| 315 |
return
|
| 316 |
data = item.data(Qt.ItemDataRole.UserRole)
|
|
@@ -320,12 +303,9 @@ class ScheduleView(QWidget):
|
|
| 320 |
state, emp_id, ds, slot_v = data
|
| 321 |
|
| 322 |
if state == "assigned":
|
| 323 |
-
# クリックで削除確認
|
| 324 |
emp = next((e for e in self._employees if e.id == emp_id), None)
|
| 325 |
if not emp:
|
| 326 |
return
|
| 327 |
-
slot = TimeSlot(slot_v)
|
| 328 |
-
pos_v = self._assignments.get((emp_id, ds, slot_v))
|
| 329 |
reply = QMessageBox.question(
|
| 330 |
self, "シフト削除",
|
| 331 |
f"{emp.name} の {ds} {slot.short_label()} のアサインを削除しますか?",
|
|
@@ -337,14 +317,13 @@ class ScheduleView(QWidget):
|
|
| 337 |
self._render_table()
|
| 338 |
|
| 339 |
elif state == "available":
|
| 340 |
-
# クリックでポジション選択 → 追加
|
| 341 |
emp = next((e for e in self._employees if e.id == emp_id), None)
|
| 342 |
if not emp:
|
| 343 |
return
|
| 344 |
-
dlg = PositionSelectDialog(emp, ds,
|
| 345 |
if dlg.exec() == QDialog.DialogCode.Accepted and dlg.selected_position:
|
| 346 |
from models.schedule import ShiftAssignment
|
| 347 |
-
assignment = ShiftAssignment(emp_id, ds,
|
| 348 |
repo.add_assignment(self._period.id, assignment)
|
| 349 |
self._assignments[(emp_id, ds, slot_v)] = dlg.selected_position.value
|
| 350 |
self._render_table()
|
|
@@ -377,18 +356,18 @@ class PositionSelectDialog(QDialog):
|
|
| 377 |
key = (slot, pos)
|
| 378 |
constraint = SHIFT_CONSTRAINTS.get(key, {})
|
| 379 |
current = sum(1 for (eid, d2, s2), p in assignments.items() if d2 == ds and s2 == slot.value and p == pos.value)
|
| 380 |
-
|
| 381 |
for eid, d2, s2 in assignments:
|
| 382 |
if d2 == ds and s2 == slot.value and assignments.get((eid, d2, s2)) == pos.value:
|
| 383 |
e = next((x for x in all_employees if x.id == eid), None)
|
| 384 |
-
if e and e.
|
| 385 |
-
|
| 386 |
|
| 387 |
emp_skill = emp.skill_for(pos.value)
|
| 388 |
badge = SKILL_BADGE.get(emp_skill, "")
|
| 389 |
btn = QPushButton(
|
| 390 |
f"{pos.label()} [{current}/{constraint.get('max',3)}名] "
|
| 391 |
-
f"
|
| 392 |
f"自分の習熟度:{emp_skill.label()}{badge}"
|
| 393 |
)
|
| 394 |
btn.setFixedHeight(40)
|
|
|
|
| 7 |
QComboBox, QTableWidget, QTableWidgetItem, QHeaderView,
|
| 8 |
QGroupBox, QDialog, QListWidget, QListWidgetItem,
|
| 9 |
QDialogButtonBox, QScrollArea, QSizePolicy, QFrame,
|
| 10 |
+
QMessageBox, QAbstractItemView, QTabWidget
|
| 11 |
)
|
| 12 |
from PyQt6.QtCore import Qt, pyqtSignal
|
| 13 |
from PyQt6.QtGui import QFont, QColor, QBrush
|
|
|
|
| 82 |
legend.addWidget(QLabel("習熟度: ★★リーダー ★ベテラン ▼新人"))
|
| 83 |
layout.addLayout(legend)
|
| 84 |
|
| 85 |
+
# タブ(朝食 / ディナー)
|
| 86 |
+
self.tab_widget = QTabWidget()
|
| 87 |
+
self.table_b = self._make_table() # 朝食
|
| 88 |
+
self.table_d = self._make_table() # ディナー
|
| 89 |
+
self.tab_widget.addTab(self.table_b, "🌅 朝食")
|
| 90 |
+
self.tab_widget.addTab(self.table_d, "🌆 ディナー")
|
| 91 |
+
self.table_b.cellClicked.connect(
|
| 92 |
+
lambda r, c: self._on_cell_clicked(r, c, self.table_b, TimeSlot.BREAKFAST))
|
| 93 |
+
self.table_d.cellClicked.connect(
|
| 94 |
+
lambda r, c: self._on_cell_clicked(r, c, self.table_d, TimeSlot.DINNER))
|
| 95 |
+
layout.addWidget(self.tab_widget)
|
| 96 |
+
|
| 97 |
self.status_label = QLabel("")
|
| 98 |
layout.addWidget(self.status_label)
|
| 99 |
|
| 100 |
self._apply_styles()
|
| 101 |
|
| 102 |
+
def _make_table(self) -> QTableWidget:
|
| 103 |
+
t = QTableWidget()
|
| 104 |
+
t.setEditTriggers(QTableWidget.EditTrigger.NoEditTriggers)
|
| 105 |
+
t.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection)
|
| 106 |
+
t.verticalHeader().setVisible(False)
|
| 107 |
+
t.setShowGrid(True)
|
| 108 |
+
t.setAlternatingRowColors(False)
|
| 109 |
+
return t
|
| 110 |
+
|
| 111 |
def _apply_styles(self):
|
| 112 |
c = theme.c
|
| 113 |
self._btn_output.setStyleSheet(
|
|
|
|
| 144 |
def _on_period_changed(self, idx):
|
| 145 |
self._period = self.period_combo.currentData()
|
| 146 |
if not self._period:
|
| 147 |
+
for t in (self.table_b, self.table_d):
|
| 148 |
+
t.setRowCount(0)
|
| 149 |
+
t.setColumnCount(0)
|
| 150 |
return
|
| 151 |
self._load_data()
|
| 152 |
self._render_table()
|
|
|
|
| 167 |
def _render_table(self):
|
| 168 |
if not self._period or not self._employees:
|
| 169 |
return
|
| 170 |
+
self._render_slot_table(self.table_b, TimeSlot.BREAKFAST)
|
| 171 |
+
self._render_slot_table(self.table_d, TimeSlot.DINNER)
|
| 172 |
|
| 173 |
+
def _render_slot_table(self, table: QTableWidget, slot: TimeSlot):
|
| 174 |
dates = self._period.date_range()
|
|
|
|
| 175 |
|
| 176 |
+
# 列: 氏名 + 日付ごと + 合計
|
| 177 |
col_headers = ["氏名"]
|
| 178 |
+
col_date_strs: list[str | None] = [None]
|
| 179 |
for d in dates:
|
| 180 |
+
dow = DAY_OF_WEEK_LABELS[d.weekday()]
|
| 181 |
+
col_headers.append(f"{d.month}/{d.day}\n({dow})")
|
| 182 |
+
col_date_strs.append(d.isoformat())
|
| 183 |
+
col_headers.append("計")
|
| 184 |
+
col_date_strs.append(None)
|
| 185 |
+
|
| 186 |
+
# 行: 全従業員 + 集計行(ポジション別)
|
| 187 |
+
rows_data: list[tuple] = [("employee", emp) for emp in self._employees]
|
| 188 |
+
for pos in Position:
|
| 189 |
+
rows_data.append(("summary", pos))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 190 |
|
| 191 |
+
table.setRowCount(len(rows_data))
|
| 192 |
+
table.setColumnCount(len(col_headers))
|
| 193 |
+
table.setHorizontalHeaderLabels(col_headers)
|
| 194 |
+
table.setColumnWidth(0, 95)
|
| 195 |
+
for c in range(1, len(col_headers) - 1):
|
| 196 |
+
table.setColumnWidth(c, 50)
|
| 197 |
+
table.setColumnWidth(len(col_headers) - 1, 36)
|
| 198 |
+
table.horizontalHeader().setSectionResizeMode(0, QHeaderView.ResizeMode.Fixed)
|
| 199 |
|
| 200 |
+
# 集計
|
| 201 |
+
count_map: dict[tuple[str, str], int] = defaultdict(int)
|
| 202 |
+
leader_map: dict[tuple[str, str], int] = defaultdict(int)
|
| 203 |
for (emp_id, ds, slot_v), pos_v in self._assignments.items():
|
| 204 |
+
if slot_v != slot.value:
|
| 205 |
+
continue
|
| 206 |
+
count_map[(ds, pos_v)] += 1
|
| 207 |
emp = next((e for e in self._employees if e.id == emp_id), None)
|
| 208 |
+
if emp and emp.is_leader(pos_v):
|
| 209 |
+
leader_map[(ds, pos_v)] += 1
|
| 210 |
|
| 211 |
for row_idx, (row_type, row_data) in enumerate(rows_data):
|
| 212 |
if row_type == "employee":
|
| 213 |
+
self._fill_emp_slot_row(table, row_idx, row_data, slot, col_date_strs)
|
|
|
|
| 214 |
else:
|
| 215 |
+
self._fill_summary_slot_row(table, row_idx, row_data, slot, col_date_strs, count_map, leader_map)
|
| 216 |
+
table.setRowHeight(row_idx, 28)
|
| 217 |
|
| 218 |
+
def _fill_emp_slot_row(self, table: QTableWidget, row: int, emp: Employee,
|
| 219 |
+
slot: TimeSlot, col_date_strs: list):
|
|
|
|
|
|
|
|
|
|
|
|
|
| 220 |
skill_b = SKILL_BADGE.get(emp.hall_skill, "")
|
| 221 |
skill_k = SKILL_BADGE.get(emp.kitchen_skill, "")
|
| 222 |
+
pp = f"[{emp.primary_position.label()[:1]}]" if emp.primary_position else ""
|
| 223 |
+
name_item = QTableWidgetItem(f"{emp.name}{pp}\nH:{skill_b} K:{skill_k}")
|
| 224 |
name_item.setFont(QFont("", 9))
|
| 225 |
+
table.setItem(row, 0, name_item)
|
| 226 |
|
| 227 |
+
slot_v = slot.value
|
| 228 |
total = 0
|
| 229 |
+
for col_idx, ds in enumerate(col_date_strs):
|
| 230 |
+
if ds is None:
|
| 231 |
continue
|
|
|
|
| 232 |
pos_v = self._assignments.get((emp.id, ds, slot_v))
|
| 233 |
req = self._requests.get((emp.id, ds))
|
| 234 |
+
can_work = (req[0] if slot == TimeSlot.BREAKFAST else req[1]) if req else False
|
| 235 |
|
| 236 |
c = theme.c
|
| 237 |
if pos_v:
|
|
|
|
| 238 |
skill = emp.hall_skill if pos_v == "hall" else emp.kitchen_skill
|
| 239 |
badge = SKILL_BADGE.get(skill, "")
|
| 240 |
+
pos_label = "H" if pos_v == "hall" else "K"
|
| 241 |
item = QTableWidgetItem(f"{pos_label}{badge}")
|
| 242 |
item.setBackground(QBrush(QColor(c["cell_assigned"])))
|
| 243 |
item.setTextAlignment(Qt.AlignmentFlag.AlignCenter)
|
|
|
|
| 253 |
item = QTableWidgetItem("")
|
| 254 |
item.setBackground(QBrush(QColor(c["cell_unavail"])))
|
| 255 |
item.setData(Qt.ItemDataRole.UserRole, ("unavailable", emp.id, ds, slot_v))
|
| 256 |
+
table.setItem(row, col_idx, item)
|
| 257 |
|
|
|
|
|
|
|
|
|
|
| 258 |
total_item = QTableWidgetItem(str(total))
|
| 259 |
total_item.setTextAlignment(Qt.AlignmentFlag.AlignCenter)
|
| 260 |
total_item.setFont(QFont("", 9, QFont.Weight.Bold))
|
| 261 |
+
table.setItem(row, len(col_date_strs) - 1, total_item)
|
| 262 |
|
| 263 |
+
def _fill_summary_slot_row(self, table: QTableWidget, row: int, pos: Position,
|
| 264 |
+
slot: TimeSlot, col_date_strs: list,
|
| 265 |
+
count_map: dict, leader_map: dict):
|
| 266 |
+
label_item = QTableWidgetItem(pos.label())
|
| 267 |
label_item.setFont(QFont("", 8, QFont.Weight.Bold))
|
| 268 |
label_item.setBackground(QBrush(QColor(theme.c["surface2"])))
|
| 269 |
+
table.setItem(row, 0, label_item)
|
| 270 |
|
| 271 |
+
constraint = SHIFT_CONSTRAINTS.get((slot, pos), {})
|
| 272 |
+
min_req = constraint.get("min", 0)
|
| 273 |
+
min_leader = constraint.get("min_leader", 0)
|
| 274 |
|
| 275 |
+
for col_idx, ds in enumerate(col_date_strs):
|
| 276 |
+
if ds is None:
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 277 |
continue
|
| 278 |
+
cnt = count_map[(ds, pos.value)]
|
| 279 |
+
ld = leader_map[(ds, pos.value)]
|
| 280 |
+
text = f"{cnt}名\n★{ld}"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 281 |
item = QTableWidgetItem(text)
|
| 282 |
item.setTextAlignment(Qt.AlignmentFlag.AlignCenter)
|
| 283 |
item.setFont(QFont("", 8))
|
|
|
|
| 284 |
c = theme.c
|
| 285 |
+
if cnt < min_req or ld < min_leader:
|
| 286 |
item.setBackground(QBrush(QColor(c["status_err"])))
|
| 287 |
+
elif cnt == min_req or ld == min_leader:
|
| 288 |
item.setBackground(QBrush(QColor(c["status_warn"])))
|
| 289 |
else:
|
| 290 |
item.setBackground(QBrush(QColor(c["status_ok"])))
|
| 291 |
+
table.setItem(row, col_idx, item)
|
| 292 |
|
| 293 |
+
table.setItem(row, len(col_date_strs) - 1, QTableWidgetItem(""))
|
|
|
|
|
|
|
|
|
|
| 294 |
|
| 295 |
+
def _on_cell_clicked(self, row: int, col: int, table: QTableWidget, slot: TimeSlot):
|
| 296 |
+
item = table.item(row, col)
|
| 297 |
if not item:
|
| 298 |
return
|
| 299 |
data = item.data(Qt.ItemDataRole.UserRole)
|
|
|
|
| 303 |
state, emp_id, ds, slot_v = data
|
| 304 |
|
| 305 |
if state == "assigned":
|
|
|
|
| 306 |
emp = next((e for e in self._employees if e.id == emp_id), None)
|
| 307 |
if not emp:
|
| 308 |
return
|
|
|
|
|
|
|
| 309 |
reply = QMessageBox.question(
|
| 310 |
self, "シフト削除",
|
| 311 |
f"{emp.name} の {ds} {slot.short_label()} のアサインを削除しますか?",
|
|
|
|
| 317 |
self._render_table()
|
| 318 |
|
| 319 |
elif state == "available":
|
|
|
|
| 320 |
emp = next((e for e in self._employees if e.id == emp_id), None)
|
| 321 |
if not emp:
|
| 322 |
return
|
| 323 |
+
dlg = PositionSelectDialog(emp, ds, slot, self._employees, self._assignments, self._period.id, parent=self)
|
| 324 |
if dlg.exec() == QDialog.DialogCode.Accepted and dlg.selected_position:
|
| 325 |
from models.schedule import ShiftAssignment
|
| 326 |
+
assignment = ShiftAssignment(emp_id, ds, slot, dlg.selected_position)
|
| 327 |
repo.add_assignment(self._period.id, assignment)
|
| 328 |
self._assignments[(emp_id, ds, slot_v)] = dlg.selected_position.value
|
| 329 |
self._render_table()
|
|
|
|
| 356 |
key = (slot, pos)
|
| 357 |
constraint = SHIFT_CONSTRAINTS.get(key, {})
|
| 358 |
current = sum(1 for (eid, d2, s2), p in assignments.items() if d2 == ds and s2 == slot.value and p == pos.value)
|
| 359 |
+
leaders = 0
|
| 360 |
for eid, d2, s2 in assignments:
|
| 361 |
if d2 == ds and s2 == slot.value and assignments.get((eid, d2, s2)) == pos.value:
|
| 362 |
e = next((x for x in all_employees if x.id == eid), None)
|
| 363 |
+
if e and e.is_leader(pos.value):
|
| 364 |
+
leaders += 1
|
| 365 |
|
| 366 |
emp_skill = emp.skill_for(pos.value)
|
| 367 |
badge = SKILL_BADGE.get(emp_skill, "")
|
| 368 |
btn = QPushButton(
|
| 369 |
f"{pos.label()} [{current}/{constraint.get('max',3)}名] "
|
| 370 |
+
f"★リーダー:{leaders}/{constraint.get('min_leader',1)}名 "
|
| 371 |
f"自分の習熟度:{emp_skill.label()}{badge}"
|
| 372 |
)
|
| 373 |
btn.setFixedHeight(40)
|
ui/shift_input_view.py
CHANGED
|
@@ -8,7 +8,7 @@ from PyQt6.QtWidgets import (
|
|
| 8 |
QFrame
|
| 9 |
)
|
| 10 |
from PyQt6.QtCore import Qt, QDate
|
| 11 |
-
from PyQt6.QtGui import QFont, QColor, QBrush
|
| 12 |
from db import repositories as repo
|
| 13 |
from models.schedule import SchedulePeriod, ShiftRequest
|
| 14 |
from utils.constants import DAY_OF_WEEK_LABELS
|
|
@@ -209,6 +209,33 @@ class ShiftInputView(QWidget):
|
|
| 209 |
layout.addLayout(btn_row)
|
| 210 |
|
| 211 |
self._apply_styles()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 212 |
|
| 213 |
def _apply_styles(self):
|
| 214 |
c = theme.c
|
|
|
|
| 8 |
QFrame
|
| 9 |
)
|
| 10 |
from PyQt6.QtCore import Qt, QDate
|
| 11 |
+
from PyQt6.QtGui import QFont, QColor, QBrush, QKeySequence, QShortcut
|
| 12 |
from db import repositories as repo
|
| 13 |
from models.schedule import SchedulePeriod, ShiftRequest
|
| 14 |
from utils.constants import DAY_OF_WEEK_LABELS
|
|
|
|
| 209 |
layout.addLayout(btn_row)
|
| 210 |
|
| 211 |
self._apply_styles()
|
| 212 |
+
self._setup_shortcuts()
|
| 213 |
+
|
| 214 |
+
def _setup_shortcuts(self):
|
| 215 |
+
"""キーボードショートカット設定"""
|
| 216 |
+
# 左右矢印キー: 従業員切り替え
|
| 217 |
+
QShortcut(QKeySequence(Qt.Key.Key_Left), self).activated.connect(self._on_prev_employee)
|
| 218 |
+
QShortcut(QKeySequence(Qt.Key.Key_Right), self).activated.connect(self._on_next_employee)
|
| 219 |
+
# 0〜9キー: シフトパターン選択(0=休み, 1〜=各パターン)
|
| 220 |
+
for i in range(min(10, len(_COMBO_ITEMS))):
|
| 221 |
+
key = getattr(Qt.Key, f"Key_{i}")
|
| 222 |
+
QShortcut(QKeySequence(key), self).activated.connect(
|
| 223 |
+
lambda _=False, idx=i: self._select_pattern_by_key(idx)
|
| 224 |
+
)
|
| 225 |
+
|
| 226 |
+
def _select_pattern_by_key(self, combo_index: int):
|
| 227 |
+
"""現在選択中の行のシフトパターンをコンボインデックスで設定"""
|
| 228 |
+
row = self.table.currentRow()
|
| 229 |
+
if row < 0:
|
| 230 |
+
return
|
| 231 |
+
item = self.table.item(row, 0)
|
| 232 |
+
if not item:
|
| 233 |
+
return
|
| 234 |
+
date_str = item.data(Qt.ItemDataRole.UserRole)
|
| 235 |
+
cell = self._pattern_cells.get(date_str)
|
| 236 |
+
if cell and cell.combo.isEnabled() and combo_index < cell.combo.count():
|
| 237 |
+
cell.combo.setCurrentIndex(combo_index)
|
| 238 |
+
self._apply_row_color(row, date_str, False)
|
| 239 |
|
| 240 |
def _apply_styles(self):
|
| 241 |
c = theme.c
|
utils/constants.py
CHANGED
|
@@ -50,12 +50,21 @@ class Position(str, Enum):
|
|
| 50 |
return {"hall": "ホール", "kitchen": "キッチン"}[self.value]
|
| 51 |
|
| 52 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 53 |
# シフト制約定数
|
|
|
|
| 54 |
SHIFT_CONSTRAINTS = {
|
| 55 |
-
(TimeSlot.BREAKFAST, Position.HALL): {"min":
|
| 56 |
-
(TimeSlot.BREAKFAST, Position.KITCHEN): {"min":
|
| 57 |
-
(TimeSlot.DINNER, Position.HALL): {"min": 2, "max":
|
| 58 |
-
(TimeSlot.DINNER, Position.KITCHEN): {"min":
|
| 59 |
}
|
| 60 |
|
| 61 |
# 法令関連定数
|
|
|
|
| 50 |
return {"hall": "ホール", "kitchen": "キッチン"}[self.value]
|
| 51 |
|
| 52 |
|
| 53 |
+
class PrimaryPosition(str, Enum):
|
| 54 |
+
HALL = "hall"
|
| 55 |
+
KITCHEN = "kitchen"
|
| 56 |
+
|
| 57 |
+
def label(self):
|
| 58 |
+
return {"hall": "ホール専任", "kitchen": "キッチン専任"}[self.value]
|
| 59 |
+
|
| 60 |
+
|
| 61 |
# シフト制約定数
|
| 62 |
+
# min_leader: リーダー(最高習熟度)の最低配置人数
|
| 63 |
SHIFT_CONSTRAINTS = {
|
| 64 |
+
(TimeSlot.BREAKFAST, Position.HALL): {"min": 3, "max": 4, "min_leader": 1},
|
| 65 |
+
(TimeSlot.BREAKFAST, Position.KITCHEN): {"min": 3, "max": 3, "min_leader": 1},
|
| 66 |
+
(TimeSlot.DINNER, Position.HALL): {"min": 2, "max": 3, "min_leader": 1},
|
| 67 |
+
(TimeSlot.DINNER, Position.KITCHEN): {"min": 3, "max": 3, "min_leader": 2},
|
| 68 |
}
|
| 69 |
|
| 70 |
# 法令関連定数
|