Commit ·
bda000c
1
Parent(s): c900e47
feat: 客数管理画面を独立した新規画面として追加
Browse files- ui/customer_count_view.py を新規作成
- 朝食・ディナー別タブのカレンダー形式表
- 期間の日付範囲を月〜日の7列×N週のグリッドで表示
- 各セルに日付と客数を表示(セルクリックで入力ダイアログ)
- 閾値未満は緑、閾値以上は赤でハイライト。今日の日付はボールド強調
- 閾値は設定画面の値をリアルタイム参照
- main_window.py にナビゲーション項目「🍽️ 客数管理」(index=4) を追加
設定は index=5 に変更。period_changed シグナル・テーマ変更・DB再読込に対応
- schedule_view.py から予約入力行を完全削除
(ReservationEditDialog・_render_reserv_row・_on_reserv_cell_clicked を削除)
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
- ui/customer_count_view.py +332 -0
- ui/main_window.py +24 -13
- ui/schedule_view.py +5 -146
ui/customer_count_view.py
ADDED
|
@@ -0,0 +1,332 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
"""客数管理画面(カレンダー形式で予約客数を入力)"""
|
| 2 |
+
from __future__ import annotations
|
| 3 |
+
from datetime import date, timedelta
|
| 4 |
+
|
| 5 |
+
from PyQt6.QtWidgets import (
|
| 6 |
+
QWidget, QVBoxLayout, QHBoxLayout, QLabel, QComboBox,
|
| 7 |
+
QTabWidget, QTableWidget, QTableWidgetItem, QHeaderView,
|
| 8 |
+
QPushButton, QDialog, QSpinBox, QAbstractItemView, QFrame
|
| 9 |
+
)
|
| 10 |
+
from PyQt6.QtCore import Qt, pyqtSignal
|
| 11 |
+
from PyQt6.QtGui import QFont, QColor, QBrush
|
| 12 |
+
|
| 13 |
+
from db import repositories as repo
|
| 14 |
+
from utils.constants import TimeSlot, DAY_OF_WEEK_LABELS
|
| 15 |
+
from utils.theme import theme
|
| 16 |
+
|
| 17 |
+
|
| 18 |
+
class CustomerCountView(QWidget):
|
| 19 |
+
period_changed = pyqtSignal(int)
|
| 20 |
+
|
| 21 |
+
def __init__(self, parent=None):
|
| 22 |
+
super().__init__(parent)
|
| 23 |
+
self._period = None
|
| 24 |
+
self._counts: dict[str, dict[str, int]] = {}
|
| 25 |
+
self._build_ui()
|
| 26 |
+
self._load_periods()
|
| 27 |
+
|
| 28 |
+
# ── UI構築 ─────────────────────────────────────────────────────────────
|
| 29 |
+
|
| 30 |
+
def _build_ui(self):
|
| 31 |
+
layout = QVBoxLayout(self)
|
| 32 |
+
layout.setContentsMargins(16, 16, 16, 16)
|
| 33 |
+
layout.setSpacing(10)
|
| 34 |
+
|
| 35 |
+
# ヘッダー
|
| 36 |
+
header = QHBoxLayout()
|
| 37 |
+
title = QLabel("客数管理")
|
| 38 |
+
title.setFont(QFont("", 16, QFont.Weight.Bold))
|
| 39 |
+
header.addWidget(title)
|
| 40 |
+
header.addStretch()
|
| 41 |
+
self.period_combo = QComboBox()
|
| 42 |
+
self.period_combo.setMinimumWidth(240)
|
| 43 |
+
self.period_combo.currentIndexChanged.connect(self._on_period_changed)
|
| 44 |
+
header.addWidget(QLabel("期間:"))
|
| 45 |
+
header.addWidget(self.period_combo)
|
| 46 |
+
layout.addLayout(header)
|
| 47 |
+
|
| 48 |
+
# 説明
|
| 49 |
+
info = QLabel(
|
| 50 |
+
"各日の予約客数を入力します。セルをクリックして客数を入力してください。\n"
|
| 51 |
+
"🟢 入力済み(閾値未満) 🔴 増員対象(閾値以上) 設定画面で閾値を変更できます。"
|
| 52 |
+
)
|
| 53 |
+
info.setWordWrap(True)
|
| 54 |
+
info.setStyleSheet("color:#6b7280; font-size:11px;")
|
| 55 |
+
layout.addWidget(info)
|
| 56 |
+
|
| 57 |
+
# タブ(朝食 / ディナー)
|
| 58 |
+
self.tab_widget = QTabWidget()
|
| 59 |
+
self._table_b = self._make_calendar_table(TimeSlot.BREAKFAST)
|
| 60 |
+
self._table_d = self._make_calendar_table(TimeSlot.DINNER)
|
| 61 |
+
self.tab_widget.addTab(self._table_b, "🌅 朝食")
|
| 62 |
+
self.tab_widget.addTab(self._table_d, "🌆 ディナー")
|
| 63 |
+
layout.addWidget(self.tab_widget)
|
| 64 |
+
|
| 65 |
+
# 凡例
|
| 66 |
+
legend = QHBoxLayout()
|
| 67 |
+
for color, text in [
|
| 68 |
+
("#DCFCE7", "入力済み(閾値未満)"),
|
| 69 |
+
("#FEE2E2", "増員対象(閾値以上)"),
|
| 70 |
+
("#FFFBEB", "土曜"),
|
| 71 |
+
("#FFF5F5", "日曜"),
|
| 72 |
+
]:
|
| 73 |
+
dot = QLabel("■")
|
| 74 |
+
dot.setStyleSheet(f"color:{color}; font-size:18px;")
|
| 75 |
+
legend.addWidget(dot)
|
| 76 |
+
lbl = QLabel(text)
|
| 77 |
+
lbl.setStyleSheet("font-size:11px;")
|
| 78 |
+
legend.addWidget(lbl)
|
| 79 |
+
legend.addStretch()
|
| 80 |
+
self._threshold_label = QLabel("")
|
| 81 |
+
self._threshold_label.setStyleSheet("font-size:11px; color:#6b7280;")
|
| 82 |
+
legend.addWidget(self._threshold_label)
|
| 83 |
+
layout.addLayout(legend)
|
| 84 |
+
|
| 85 |
+
def _make_calendar_table(self, slot: TimeSlot) -> QTableWidget:
|
| 86 |
+
table = QTableWidget()
|
| 87 |
+
table.setColumnCount(7)
|
| 88 |
+
table.setHorizontalHeaderLabels(["月", "火", "水", "木", "金", "土", "日"])
|
| 89 |
+
table.verticalHeader().setVisible(False)
|
| 90 |
+
table.setEditTriggers(QTableWidget.EditTrigger.NoEditTriggers)
|
| 91 |
+
table.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection)
|
| 92 |
+
table.horizontalHeader().setSectionResizeMode(QHeaderView.ResizeMode.Stretch)
|
| 93 |
+
table.horizontalHeader().setDefaultAlignment(Qt.AlignmentFlag.AlignCenter)
|
| 94 |
+
table.cellClicked.connect(
|
| 95 |
+
lambda r, c, s=slot: self._on_cell_clicked(r, c, s))
|
| 96 |
+
return table
|
| 97 |
+
|
| 98 |
+
# ── 期間管理 ──────────────────────────────────────────────────────────
|
| 99 |
+
|
| 100 |
+
def _load_periods(self):
|
| 101 |
+
from utils.period_fmt import fmt as _fmt
|
| 102 |
+
periods = repo.get_all_periods()
|
| 103 |
+
self.period_combo.blockSignals(True)
|
| 104 |
+
self.period_combo.clear()
|
| 105 |
+
self.period_combo.addItem("(期間を選択)", None)
|
| 106 |
+
for p in periods:
|
| 107 |
+
self.period_combo.addItem(_fmt(p.start_date, p.end_date), p)
|
| 108 |
+
self.period_combo.blockSignals(False)
|
| 109 |
+
|
| 110 |
+
def set_period_by_id(self, period_id: int):
|
| 111 |
+
for i in range(self.period_combo.count()):
|
| 112 |
+
p = self.period_combo.itemData(i)
|
| 113 |
+
if p and p.id == period_id:
|
| 114 |
+
self.period_combo.blockSignals(True)
|
| 115 |
+
self.period_combo.setCurrentIndex(i)
|
| 116 |
+
self.period_combo.blockSignals(False)
|
| 117 |
+
self._period = p
|
| 118 |
+
self._load_counts()
|
| 119 |
+
self._render_calendars()
|
| 120 |
+
return
|
| 121 |
+
|
| 122 |
+
def _on_period_changed(self, idx):
|
| 123 |
+
self._period = self.period_combo.currentData()
|
| 124 |
+
if not self._period:
|
| 125 |
+
self._table_b.setRowCount(0)
|
| 126 |
+
self._table_d.setRowCount(0)
|
| 127 |
+
self._threshold_label.setText("")
|
| 128 |
+
return
|
| 129 |
+
self._load_counts()
|
| 130 |
+
self._render_calendars()
|
| 131 |
+
self.period_changed.emit(self._period.id)
|
| 132 |
+
|
| 133 |
+
def _load_counts(self):
|
| 134 |
+
if not self._period:
|
| 135 |
+
self._counts = {}
|
| 136 |
+
return
|
| 137 |
+
self._counts = repo.get_reservation_counts(self._period.id)
|
| 138 |
+
|
| 139 |
+
def _get_threshold(self, slot_key: str) -> int:
|
| 140 |
+
key = "reserv_threshold_breakfast" if slot_key == "breakfast" else "reserv_threshold_dinner"
|
| 141 |
+
default = "100" if slot_key == "breakfast" else "25"
|
| 142 |
+
try:
|
| 143 |
+
return int(repo.get_app_setting(key, default))
|
| 144 |
+
except Exception:
|
| 145 |
+
return 999
|
| 146 |
+
|
| 147 |
+
# ── カレンダー描画 ────────────────────────────────────────────────────
|
| 148 |
+
|
| 149 |
+
def _render_calendars(self):
|
| 150 |
+
if not self._period:
|
| 151 |
+
return
|
| 152 |
+
b_thresh = self._get_threshold("breakfast")
|
| 153 |
+
d_thresh = self._get_threshold("dinner")
|
| 154 |
+
self._threshold_label.setText(
|
| 155 |
+
f"増員閾値 ─ 朝食: {b_thresh}名以上 ディナー: {d_thresh}名以上"
|
| 156 |
+
)
|
| 157 |
+
self._render_calendar(self._table_b, "breakfast", b_thresh)
|
| 158 |
+
self._render_calendar(self._table_d, "dinner", d_thresh)
|
| 159 |
+
|
| 160 |
+
def _render_calendar(self, table: QTableWidget, slot_key: str, threshold: int):
|
| 161 |
+
if not self._period:
|
| 162 |
+
return
|
| 163 |
+
|
| 164 |
+
dates = self._period.date_range()
|
| 165 |
+
if not dates:
|
| 166 |
+
table.setRowCount(0)
|
| 167 |
+
return
|
| 168 |
+
|
| 169 |
+
first_date = dates[0]
|
| 170 |
+
first_dow = first_date.weekday() # 0=月
|
| 171 |
+
grid_start = first_date - timedelta(days=first_dow)
|
| 172 |
+
|
| 173 |
+
last_date = dates[-1]
|
| 174 |
+
last_dow = last_date.weekday()
|
| 175 |
+
grid_end = last_date + timedelta(days=6 - last_dow)
|
| 176 |
+
|
| 177 |
+
n_weeks = ((grid_end - grid_start).days + 1) // 7
|
| 178 |
+
table.setRowCount(n_weeks)
|
| 179 |
+
|
| 180 |
+
period_date_set = {d.isoformat() for d in dates}
|
| 181 |
+
today_str = date.today().isoformat()
|
| 182 |
+
c = theme.c
|
| 183 |
+
|
| 184 |
+
cur = grid_start
|
| 185 |
+
for week_idx in range(n_weeks):
|
| 186 |
+
table.setRowHeight(week_idx, 68)
|
| 187 |
+
for dow in range(7):
|
| 188 |
+
ds = cur.isoformat()
|
| 189 |
+
if ds in period_date_set:
|
| 190 |
+
count = self._counts.get(ds, {}).get(slot_key, 0)
|
| 191 |
+
count_text = f"{count}名" if count > 0 else "─"
|
| 192 |
+
text = f"{cur.day}日\n{count_text}"
|
| 193 |
+
|
| 194 |
+
item = QTableWidgetItem(text)
|
| 195 |
+
item.setTextAlignment(Qt.AlignmentFlag.AlignCenter)
|
| 196 |
+
item.setFont(QFont("", 11))
|
| 197 |
+
item.setData(Qt.ItemDataRole.UserRole, ds)
|
| 198 |
+
|
| 199 |
+
# 背景色
|
| 200 |
+
if count > 0 and count >= threshold:
|
| 201 |
+
bg = "#FEE2E2"
|
| 202 |
+
elif count > 0:
|
| 203 |
+
bg = "#DCFCE7"
|
| 204 |
+
elif dow == 5:
|
| 205 |
+
bg = "#FFFBEB"
|
| 206 |
+
elif dow == 6:
|
| 207 |
+
bg = "#FFF5F5"
|
| 208 |
+
else:
|
| 209 |
+
bg = c["bg"]
|
| 210 |
+
item.setBackground(QBrush(QColor(bg)))
|
| 211 |
+
|
| 212 |
+
# 今日強調
|
| 213 |
+
if ds == today_str:
|
| 214 |
+
item.setForeground(QBrush(QColor(c["primary"])))
|
| 215 |
+
font = QFont("", 11, QFont.Weight.Bold)
|
| 216 |
+
item.setFont(font)
|
| 217 |
+
|
| 218 |
+
else:
|
| 219 |
+
# 期間外(グレー)
|
| 220 |
+
item = QTableWidgetItem(str(cur.day))
|
| 221 |
+
item.setTextAlignment(Qt.AlignmentFlag.AlignCenter)
|
| 222 |
+
item.setBackground(QBrush(QColor(c["surface2"])))
|
| 223 |
+
item.setForeground(QBrush(QColor(c["text3"])))
|
| 224 |
+
item.setFlags(Qt.ItemFlag.ItemIsEnabled)
|
| 225 |
+
|
| 226 |
+
table.setItem(week_idx, dow, item)
|
| 227 |
+
cur += timedelta(days=1)
|
| 228 |
+
|
| 229 |
+
# ── セルクリック ──────────────────────────────────────────────────────
|
| 230 |
+
|
| 231 |
+
def _on_cell_clicked(self, row: int, col: int, slot: TimeSlot):
|
| 232 |
+
if not self._period:
|
| 233 |
+
return
|
| 234 |
+
table = self._table_b if slot == TimeSlot.BREAKFAST else self._table_d
|
| 235 |
+
item = table.item(row, col)
|
| 236 |
+
if not item:
|
| 237 |
+
return
|
| 238 |
+
ds = item.data(Qt.ItemDataRole.UserRole)
|
| 239 |
+
if not ds:
|
| 240 |
+
return # 期間外セル
|
| 241 |
+
|
| 242 |
+
slot_key = "breakfast" if slot == TimeSlot.BREAKFAST else "dinner"
|
| 243 |
+
threshold = self._get_threshold(slot_key)
|
| 244 |
+
current = self._counts.get(ds, {}).get(slot_key, 0)
|
| 245 |
+
|
| 246 |
+
dlg = _CountInputDialog(ds, slot, current, threshold, parent=self)
|
| 247 |
+
if dlg.exec() == QDialog.DialogCode.Accepted:
|
| 248 |
+
count = dlg.count
|
| 249 |
+
rc = self._counts.get(ds, {"breakfast": 0, "dinner": 0}).copy()
|
| 250 |
+
rc[slot_key] = count
|
| 251 |
+
self._counts[ds] = rc
|
| 252 |
+
repo.save_reservation_count(self._period.id, ds, rc["breakfast"], rc["dinner"])
|
| 253 |
+
self._render_calendar(table, slot_key, threshold)
|
| 254 |
+
|
| 255 |
+
# ── 公開API ──────────────────────────────────────────────────────────
|
| 256 |
+
|
| 257 |
+
def refresh(self, period_id: int = None):
|
| 258 |
+
self._load_periods()
|
| 259 |
+
if period_id:
|
| 260 |
+
self.set_period_by_id(period_id)
|
| 261 |
+
elif self._period:
|
| 262 |
+
self._load_counts()
|
| 263 |
+
self._render_calendars()
|
| 264 |
+
|
| 265 |
+
def apply_theme(self):
|
| 266 |
+
self._render_calendars()
|
| 267 |
+
|
| 268 |
+
|
| 269 |
+
# ── 客数入力ダイアログ ─────────────────────────────────────────────────────
|
| 270 |
+
|
| 271 |
+
class _CountInputDialog(QDialog):
|
| 272 |
+
def __init__(self, date_str: str, slot: TimeSlot,
|
| 273 |
+
current_count: int, threshold: int, parent=None):
|
| 274 |
+
super().__init__(parent)
|
| 275 |
+
d = date.fromisoformat(date_str)
|
| 276 |
+
dow = DAY_OF_WEEK_LABELS[d.weekday()]
|
| 277 |
+
slot_label = "朝食" if slot == TimeSlot.BREAKFAST else "ディナー"
|
| 278 |
+
self.setWindowTitle(f"{d.month}/{d.day}({dow}) {slot_label} 予約客数")
|
| 279 |
+
self.setFixedWidth(320)
|
| 280 |
+
self._build_ui(d, dow, slot_label, current_count, threshold)
|
| 281 |
+
|
| 282 |
+
def _build_ui(self, d: date, dow: str, slot_label: str,
|
| 283 |
+
current_count: int, threshold: int):
|
| 284 |
+
layout = QVBoxLayout(self)
|
| 285 |
+
layout.setSpacing(12)
|
| 286 |
+
|
| 287 |
+
date_lbl = QLabel(f"📅 {d.year}年{d.month}月{d.day}日({dow}) {slot_label}")
|
| 288 |
+
date_lbl.setFont(QFont("", 11))
|
| 289 |
+
layout.addWidget(date_lbl)
|
| 290 |
+
|
| 291 |
+
sep = QFrame()
|
| 292 |
+
sep.setFrameShape(QFrame.Shape.HLine)
|
| 293 |
+
layout.addWidget(sep)
|
| 294 |
+
|
| 295 |
+
self._spin = QSpinBox()
|
| 296 |
+
self._spin.setRange(0, 9999)
|
| 297 |
+
self._spin.setValue(current_count)
|
| 298 |
+
self._spin.setFixedHeight(44)
|
| 299 |
+
self._spin.setSuffix(" 名")
|
| 300 |
+
self._spin.setFont(QFont("", 14))
|
| 301 |
+
self._spin.setAlignment(Qt.AlignmentFlag.AlignCenter)
|
| 302 |
+
layout.addWidget(self._spin)
|
| 303 |
+
|
| 304 |
+
c = theme.c
|
| 305 |
+
thresh_lbl = QLabel(f"増員閾値: {threshold}名以上で増員")
|
| 306 |
+
thresh_lbl.setStyleSheet(f"color:{c['text2']}; font-size:11px;")
|
| 307 |
+
layout.addWidget(thresh_lbl)
|
| 308 |
+
|
| 309 |
+
hint = QLabel("0 で保存するとデータを削除します。")
|
| 310 |
+
hint.setStyleSheet("color:#9ca3af; font-size:11px;")
|
| 311 |
+
layout.addWidget(hint)
|
| 312 |
+
|
| 313 |
+
btn_row = QHBoxLayout()
|
| 314 |
+
btn_cancel = QPushButton("キャンセル")
|
| 315 |
+
btn_cancel.clicked.connect(self.reject)
|
| 316 |
+
btn_ok = QPushButton("保存")
|
| 317 |
+
btn_ok.setDefault(True)
|
| 318 |
+
btn_ok.setFixedHeight(34)
|
| 319 |
+
btn_ok.clicked.connect(self.accept)
|
| 320 |
+
btn_ok.setStyleSheet(
|
| 321 |
+
f"QPushButton {{ background:{c['primary']}; color:white; "
|
| 322 |
+
f"border-radius:5px; padding:0 20px; font-weight:bold; }}"
|
| 323 |
+
f" QPushButton:hover {{ background:{c['primary_hover']}; }}"
|
| 324 |
+
)
|
| 325 |
+
btn_row.addStretch()
|
| 326 |
+
btn_row.addWidget(btn_cancel)
|
| 327 |
+
btn_row.addWidget(btn_ok)
|
| 328 |
+
layout.addLayout(btn_row)
|
| 329 |
+
|
| 330 |
+
@property
|
| 331 |
+
def count(self) -> int:
|
| 332 |
+
return self._spin.value()
|
ui/main_window.py
CHANGED
|
@@ -13,6 +13,7 @@ from ui.employee_view import EmployeeView
|
|
| 13 |
from ui.shift_input_view import ShiftInputView
|
| 14 |
from ui.generate_view import GenerateView
|
| 15 |
from ui.schedule_view import ScheduleView
|
|
|
|
| 16 |
from ui.settings_view import SettingsView
|
| 17 |
from ui.help_view import HelpDialog
|
| 18 |
from utils.theme import theme
|
|
@@ -24,7 +25,8 @@ NAV_ITEMS = [
|
|
| 24 |
("📝", "希望シフト入力", 1),
|
| 25 |
("⚡", "シフト自動生成", 2),
|
| 26 |
("📅", "シフト表示・編集", 3),
|
| 27 |
-
("
|
|
|
|
| 28 |
]
|
| 29 |
|
| 30 |
SIDEBAR_W = 160
|
|
@@ -410,17 +412,19 @@ class MainWindow(QMainWindow):
|
|
| 410 |
# スタック
|
| 411 |
self.stack = QStackedWidget()
|
| 412 |
|
| 413 |
-
self._employee_view
|
| 414 |
-
self._shift_input_view
|
| 415 |
-
self._generate_view
|
| 416 |
-
self._schedule_view
|
| 417 |
-
self.
|
|
|
|
| 418 |
|
| 419 |
-
self.stack.addWidget(self._employee_view)
|
| 420 |
-
self.stack.addWidget(self._shift_input_view)
|
| 421 |
-
self.stack.addWidget(self._generate_view)
|
| 422 |
-
self.stack.addWidget(self._schedule_view)
|
| 423 |
-
self.stack.addWidget(self.
|
|
|
|
| 424 |
|
| 425 |
self._generate_view.schedule_generated.connect(self._on_schedule_generated)
|
| 426 |
self._settings_view.db_imported.connect(self._on_db_imported)
|
|
@@ -429,6 +433,7 @@ class MainWindow(QMainWindow):
|
|
| 429 |
self._shift_input_view.period_changed.connect(self._on_view_period_changed)
|
| 430 |
self._generate_view.period_changed.connect(self._on_view_period_changed)
|
| 431 |
self._schedule_view.period_changed.connect(self._on_view_period_changed)
|
|
|
|
| 432 |
|
| 433 |
# 空状態ナビシグナルを接続(item 4)
|
| 434 |
self._shift_input_view.navigate_requested.connect(self._nav_to)
|
|
@@ -474,7 +479,8 @@ class MainWindow(QMainWindow):
|
|
| 474 |
for btn in self._nav_buttons:
|
| 475 |
btn.apply_theme()
|
| 476 |
for view in (self._employee_view, self._shift_input_view,
|
| 477 |
-
self._generate_view, self._schedule_view,
|
|
|
|
| 478 |
if hasattr(view, "apply_theme"):
|
| 479 |
view.apply_theme()
|
| 480 |
self._update_step_bar()
|
|
@@ -487,6 +493,8 @@ class MainWindow(QMainWindow):
|
|
| 487 |
self._generate_view.refresh()
|
| 488 |
elif idx == 3:
|
| 489 |
self._schedule_view.refresh()
|
|
|
|
|
|
|
| 490 |
# 現在の期間を該当ビューに適用
|
| 491 |
if self._current_period_id is not None:
|
| 492 |
if idx == 1:
|
|
@@ -495,6 +503,8 @@ class MainWindow(QMainWindow):
|
|
| 495 |
self._generate_view.set_period_by_id(self._current_period_id)
|
| 496 |
elif idx == 3:
|
| 497 |
self._schedule_view.set_period_by_id(self._current_period_id)
|
|
|
|
|
|
|
| 498 |
self._update_step_bar()
|
| 499 |
|
| 500 |
def _on_schedule_generated(self, period_id: int):
|
|
@@ -512,7 +522,7 @@ class MainWindow(QMainWindow):
|
|
| 512 |
def _update_step_bar(self):
|
| 513 |
from db import repositories as repo
|
| 514 |
nav_idx = self.stack.currentIndex()
|
| 515 |
-
step_idx = min(nav_idx, 3) # 設定
|
| 516 |
|
| 517 |
p = repo.get_period(self._current_period_id) if self._current_period_id else None
|
| 518 |
|
|
@@ -535,6 +545,7 @@ class MainWindow(QMainWindow):
|
|
| 535 |
self._shift_input_view._load_periods()
|
| 536 |
self._generate_view.refresh()
|
| 537 |
self._schedule_view.refresh()
|
|
|
|
| 538 |
self._current_period_id = None
|
| 539 |
self._update_step_bar()
|
| 540 |
|
|
|
|
| 13 |
from ui.shift_input_view import ShiftInputView
|
| 14 |
from ui.generate_view import GenerateView
|
| 15 |
from ui.schedule_view import ScheduleView
|
| 16 |
+
from ui.customer_count_view import CustomerCountView
|
| 17 |
from ui.settings_view import SettingsView
|
| 18 |
from ui.help_view import HelpDialog
|
| 19 |
from utils.theme import theme
|
|
|
|
| 25 |
("📝", "希望シフト入力", 1),
|
| 26 |
("⚡", "シフト自動生成", 2),
|
| 27 |
("📅", "シフト表示・編集", 3),
|
| 28 |
+
("🍽️", "客数管理", 4),
|
| 29 |
+
("⚙️", "設定", 5),
|
| 30 |
]
|
| 31 |
|
| 32 |
SIDEBAR_W = 160
|
|
|
|
| 412 |
# スタック
|
| 413 |
self.stack = QStackedWidget()
|
| 414 |
|
| 415 |
+
self._employee_view = EmployeeView()
|
| 416 |
+
self._shift_input_view = ShiftInputView()
|
| 417 |
+
self._generate_view = GenerateView()
|
| 418 |
+
self._schedule_view = ScheduleView()
|
| 419 |
+
self._customer_count_view = CustomerCountView()
|
| 420 |
+
self._settings_view = SettingsView()
|
| 421 |
|
| 422 |
+
self.stack.addWidget(self._employee_view) # 0
|
| 423 |
+
self.stack.addWidget(self._shift_input_view) # 1
|
| 424 |
+
self.stack.addWidget(self._generate_view) # 2
|
| 425 |
+
self.stack.addWidget(self._schedule_view) # 3
|
| 426 |
+
self.stack.addWidget(self._customer_count_view) # 4
|
| 427 |
+
self.stack.addWidget(self._settings_view) # 5
|
| 428 |
|
| 429 |
self._generate_view.schedule_generated.connect(self._on_schedule_generated)
|
| 430 |
self._settings_view.db_imported.connect(self._on_db_imported)
|
|
|
|
| 433 |
self._shift_input_view.period_changed.connect(self._on_view_period_changed)
|
| 434 |
self._generate_view.period_changed.connect(self._on_view_period_changed)
|
| 435 |
self._schedule_view.period_changed.connect(self._on_view_period_changed)
|
| 436 |
+
self._customer_count_view.period_changed.connect(self._on_view_period_changed)
|
| 437 |
|
| 438 |
# 空状態ナビシグナルを接続(item 4)
|
| 439 |
self._shift_input_view.navigate_requested.connect(self._nav_to)
|
|
|
|
| 479 |
for btn in self._nav_buttons:
|
| 480 |
btn.apply_theme()
|
| 481 |
for view in (self._employee_view, self._shift_input_view,
|
| 482 |
+
self._generate_view, self._schedule_view,
|
| 483 |
+
self._customer_count_view, self._settings_view):
|
| 484 |
if hasattr(view, "apply_theme"):
|
| 485 |
view.apply_theme()
|
| 486 |
self._update_step_bar()
|
|
|
|
| 493 |
self._generate_view.refresh()
|
| 494 |
elif idx == 3:
|
| 495 |
self._schedule_view.refresh()
|
| 496 |
+
elif idx == 4:
|
| 497 |
+
self._customer_count_view.refresh()
|
| 498 |
# 現在の期間を該当ビューに適用
|
| 499 |
if self._current_period_id is not None:
|
| 500 |
if idx == 1:
|
|
|
|
| 503 |
self._generate_view.set_period_by_id(self._current_period_id)
|
| 504 |
elif idx == 3:
|
| 505 |
self._schedule_view.set_period_by_id(self._current_period_id)
|
| 506 |
+
elif idx == 4:
|
| 507 |
+
self._customer_count_view.set_period_by_id(self._current_period_id)
|
| 508 |
self._update_step_bar()
|
| 509 |
|
| 510 |
def _on_schedule_generated(self, period_id: int):
|
|
|
|
| 522 |
def _update_step_bar(self):
|
| 523 |
from db import repositories as repo
|
| 524 |
nav_idx = self.stack.currentIndex()
|
| 525 |
+
step_idx = min(nav_idx, 3) # 客数管理(4)・設定(5)はステップ外
|
| 526 |
|
| 527 |
p = repo.get_period(self._current_period_id) if self._current_period_id else None
|
| 528 |
|
|
|
|
| 545 |
self._shift_input_view._load_periods()
|
| 546 |
self._generate_view.refresh()
|
| 547 |
self._schedule_view.refresh()
|
| 548 |
+
self._customer_count_view.refresh()
|
| 549 |
self._current_period_id = None
|
| 550 |
self._update_step_bar()
|
| 551 |
|
ui/schedule_view.py
CHANGED
|
@@ -43,9 +43,7 @@ class ScheduleView(QWidget):
|
|
| 43 |
self._requests: dict[tuple[int, str], tuple[bool, bool]] = {}
|
| 44 |
self._raw_requests: dict[tuple[int, str], ShiftRequest] = {}
|
| 45 |
self._notes: dict[str, str] = {} # {date_str: note}
|
| 46 |
-
self._reservations: dict[str, dict[str, int]] = {} # {date_str: {"breakfast": int, "dinner": int}}
|
| 47 |
self._col_date_strs_b: list[str | None] = [] # 朝食タブの日付列リスト
|
| 48 |
-
self._col_date_strs_d: list[str | None] = [] # ディナータブの日付列リスト
|
| 49 |
self._build_ui()
|
| 50 |
self._load_periods()
|
| 51 |
|
|
@@ -110,10 +108,9 @@ class ScheduleView(QWidget):
|
|
| 110 |
|
| 111 |
(tab_b, self.emp_table_b, self.sum_table_b,
|
| 112 |
self._btn_other_b, self._warn_label_b,
|
| 113 |
-
self._notes_table
|
| 114 |
(tab_d, self.emp_table_d, self.sum_table_d,
|
| 115 |
-
self._btn_other_d, self._warn_label_d,
|
| 116 |
-
_, self._reserv_table_d) = self._make_tab_widget(TimeSlot.DINNER)
|
| 117 |
|
| 118 |
self.tab_widget.addTab(tab_b, "🌅 朝食")
|
| 119 |
self.tab_widget.addTab(tab_d, "🌆 ディナー")
|
|
@@ -163,23 +160,6 @@ class ScheduleView(QWidget):
|
|
| 163 |
warn_label.setVisible(False)
|
| 164 |
vbox.addWidget(warn_label)
|
| 165 |
|
| 166 |
-
# 予約数テーブル(両タブ共通)
|
| 167 |
-
reserv_table = QTableWidget()
|
| 168 |
-
reserv_table.setRowCount(1)
|
| 169 |
-
reserv_table.setEditTriggers(QTableWidget.EditTrigger.NoEditTriggers)
|
| 170 |
-
reserv_table.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection)
|
| 171 |
-
reserv_table.verticalHeader().setVisible(False)
|
| 172 |
-
reserv_table.horizontalHeader().setVisible(False)
|
| 173 |
-
reserv_table.setShowGrid(True)
|
| 174 |
-
reserv_table.setFixedHeight(26)
|
| 175 |
-
reserv_table.setVerticalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAlwaysOff)
|
| 176 |
-
reserv_table.setHorizontalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAlwaysOff)
|
| 177 |
-
reserv_table.setRowHeight(0, 22)
|
| 178 |
-
reserv_table.setToolTip("クリックしてその日の予約客数を入力できます。シフト生成時の増員判定に使用されます。")
|
| 179 |
-
reserv_table.cellClicked.connect(
|
| 180 |
-
lambda r, c, s=slot: self._on_reserv_cell_clicked(c, s))
|
| 181 |
-
vbox.addWidget(reserv_table)
|
| 182 |
-
|
| 183 |
# 備考テーブル(朝食タブのみ)
|
| 184 |
notes_table = None
|
| 185 |
if slot == TimeSlot.BREAKFAST:
|
|
@@ -232,8 +212,6 @@ class ScheduleView(QWidget):
|
|
| 232 |
# 水平スクロール同期(emp_table ↔ sum_table、朝食タブは notes_table も同期)
|
| 233 |
emp_table.horizontalScrollBar().valueChanged.connect(
|
| 234 |
sum_table.horizontalScrollBar().setValue)
|
| 235 |
-
emp_table.horizontalScrollBar().valueChanged.connect(
|
| 236 |
-
reserv_table.horizontalScrollBar().setValue)
|
| 237 |
if notes_table is not None:
|
| 238 |
emp_table.horizontalScrollBar().valueChanged.connect(
|
| 239 |
notes_table.horizontalScrollBar().setValue)
|
|
@@ -243,7 +221,7 @@ class ScheduleView(QWidget):
|
|
| 243 |
sep.setFrameShape(QFrame.Shape.HLine)
|
| 244 |
vbox.insertWidget(vbox.count() - 1, sep) # sum_tableの直前に挿入
|
| 245 |
|
| 246 |
-
return container, emp_table, sum_table, btn, warn_label, notes_table
|
| 247 |
|
| 248 |
def _sync_col_width(self, col_idx: int, new_width: int, slot: TimeSlot):
|
| 249 |
"""従業員テーブルの列幅変更を集計・備考テーブルに反映"""
|
|
@@ -252,9 +230,6 @@ class ScheduleView(QWidget):
|
|
| 252 |
sum_t.setColumnWidth(col_idx, new_width)
|
| 253 |
if slot == TimeSlot.BREAKFAST and self._notes_table and col_idx < self._notes_table.columnCount():
|
| 254 |
self._notes_table.setColumnWidth(col_idx, new_width)
|
| 255 |
-
reserv_t = self._reserv_table_b if slot == TimeSlot.BREAKFAST else self._reserv_table_d
|
| 256 |
-
if col_idx < reserv_t.columnCount():
|
| 257 |
-
reserv_t.setColumnWidth(col_idx, new_width)
|
| 258 |
|
| 259 |
def _on_toggle_other(self, slot: TimeSlot, checked: bool):
|
| 260 |
self._show_other[slot] = checked
|
|
@@ -368,8 +343,7 @@ class ScheduleView(QWidget):
|
|
| 368 |
(r.employee_id, r.date): r
|
| 369 |
for r in requests
|
| 370 |
}
|
| 371 |
-
self._notes
|
| 372 |
-
self._reservations = repo.get_reservation_counts(self._period.id)
|
| 373 |
|
| 374 |
# ── 描画 ──────────────────────────────────────────────────────────────
|
| 375 |
|
|
@@ -542,14 +516,10 @@ class ScheduleView(QWidget):
|
|
| 542 |
# 警告更新
|
| 543 |
self._update_constraint_warnings(warn_label, slot, dates, count_map, leader_map, shift_constraints)
|
| 544 |
|
| 545 |
-
# 備考
|
| 546 |
if slot == TimeSlot.BREAKFAST:
|
| 547 |
self._col_date_strs_b = col_date_strs
|
| 548 |
self._render_notes_row()
|
| 549 |
-
self._render_reserv_row(TimeSlot.BREAKFAST, col_date_strs, self._reserv_table_b)
|
| 550 |
-
else:
|
| 551 |
-
self._col_date_strs_d = col_date_strs
|
| 552 |
-
self._render_reserv_row(TimeSlot.DINNER, col_date_strs, self._reserv_table_d)
|
| 553 |
|
| 554 |
def _fill_divider_row(self, table: QTableWidget, row: int, label: str, col_count: int):
|
| 555 |
c = theme.c
|
|
@@ -711,73 +681,6 @@ class ScheduleView(QWidget):
|
|
| 711 |
else:
|
| 712 |
warn_label.setVisible(False)
|
| 713 |
|
| 714 |
-
# ── 予約数テーブル ────────────────────────────────────────────────────
|
| 715 |
-
|
| 716 |
-
def _render_reserv_row(self, slot: TimeSlot, col_date_strs: list, reserv_table: QTableWidget):
|
| 717 |
-
if not col_date_strs:
|
| 718 |
-
return
|
| 719 |
-
slot_key = "breakfast" if slot == TimeSlot.BREAKFAST else "dinner"
|
| 720 |
-
label = "朝食予約" if slot == TimeSlot.BREAKFAST else "夜予約"
|
| 721 |
-
emp_table = self.emp_table_b if slot == TimeSlot.BREAKFAST else self.emp_table_d
|
| 722 |
-
n_cols = len(col_date_strs)
|
| 723 |
-
reserv_table.setColumnCount(n_cols)
|
| 724 |
-
for c_i in range(n_cols):
|
| 725 |
-
reserv_table.setColumnWidth(c_i, emp_table.columnWidth(c_i))
|
| 726 |
-
|
| 727 |
-
# 閾値を読んで超過日のハイライト判定
|
| 728 |
-
try:
|
| 729 |
-
thresh = int(repo.get_app_setting(
|
| 730 |
-
"reserv_threshold_breakfast" if slot == TimeSlot.BREAKFAST else "reserv_threshold_dinner",
|
| 731 |
-
"50" if slot == TimeSlot.BREAKFAST else "40"
|
| 732 |
-
))
|
| 733 |
-
except Exception:
|
| 734 |
-
thresh = 999
|
| 735 |
-
c = theme.c
|
| 736 |
-
for col_idx, ds in enumerate(col_date_strs):
|
| 737 |
-
if col_idx == 0 or ds is None:
|
| 738 |
-
item = QTableWidgetItem(label if col_idx == 0 else "")
|
| 739 |
-
item.setBackground(QBrush(QColor(c["surface2"])))
|
| 740 |
-
item.setFont(QFont("", 8, QFont.Weight.Bold))
|
| 741 |
-
item.setForeground(QBrush(QColor(c["text3"])))
|
| 742 |
-
item.setFlags(Qt.ItemFlag.ItemIsEnabled)
|
| 743 |
-
else:
|
| 744 |
-
count = self._reservations.get(ds, {}).get(slot_key, 0)
|
| 745 |
-
text = str(count) if count > 0 else "-"
|
| 746 |
-
item = QTableWidgetItem(text)
|
| 747 |
-
item.setTextAlignment(Qt.AlignmentFlag.AlignCenter)
|
| 748 |
-
item.setFont(QFont("", 8))
|
| 749 |
-
if count > 0 and count >= thresh:
|
| 750 |
-
item.setBackground(QBrush(QColor("#FEE2E2"))) # 赤系: 閾値超過
|
| 751 |
-
item.setForeground(QBrush(QColor(c["text"])))
|
| 752 |
-
elif count > 0:
|
| 753 |
-
item.setBackground(QBrush(QColor("#FEF3C7"))) # 黄系: 入力あり
|
| 754 |
-
item.setForeground(QBrush(QColor(c["text"])))
|
| 755 |
-
else:
|
| 756 |
-
item.setBackground(QBrush(QColor(c["bg"])))
|
| 757 |
-
item.setForeground(QBrush(QColor(c["text3"])))
|
| 758 |
-
reserv_table.setItem(0, col_idx, item)
|
| 759 |
-
|
| 760 |
-
def _on_reserv_cell_clicked(self, col: int, slot: TimeSlot):
|
| 761 |
-
if not self._period:
|
| 762 |
-
return
|
| 763 |
-
col_date_strs = self._col_date_strs_b if slot == TimeSlot.BREAKFAST else self._col_date_strs_d
|
| 764 |
-
if not col_date_strs or col == 0 or col >= len(col_date_strs) - 1:
|
| 765 |
-
return
|
| 766 |
-
ds = col_date_strs[col]
|
| 767 |
-
if not ds:
|
| 768 |
-
return
|
| 769 |
-
slot_key = "breakfast" if slot == TimeSlot.BREAKFAST else "dinner"
|
| 770 |
-
current = self._reservations.get(ds, {}).get(slot_key, 0)
|
| 771 |
-
dlg = ReservationEditDialog(ds, slot, current, parent=self)
|
| 772 |
-
if dlg.exec() == QDialog.DialogCode.Accepted:
|
| 773 |
-
count = dlg.count
|
| 774 |
-
rc = self._reservations.setdefault(ds, {"breakfast": 0, "dinner": 0}).copy()
|
| 775 |
-
rc[slot_key] = count
|
| 776 |
-
self._reservations[ds] = rc
|
| 777 |
-
repo.save_reservation_count(self._period.id, ds, rc["breakfast"], rc["dinner"])
|
| 778 |
-
reserv_table = self._reserv_table_b if slot == TimeSlot.BREAKFAST else self._reserv_table_d
|
| 779 |
-
self._render_reserv_row(slot, col_date_strs, reserv_table)
|
| 780 |
-
|
| 781 |
# ── 備考テーブル ──────────────────────────────────────────────────────
|
| 782 |
|
| 783 |
def _render_notes_row(self):
|
|
@@ -1289,50 +1192,6 @@ class NoteEditDialog(QDialog):
|
|
| 1289 |
return self._edit.text().strip()
|
| 1290 |
|
| 1291 |
|
| 1292 |
-
# ── 予約客数編集ダイアログ ────────────────────────────────────────────────
|
| 1293 |
-
|
| 1294 |
-
class ReservationEditDialog(QDialog):
|
| 1295 |
-
def __init__(self, date_str: str, slot: TimeSlot, current_count: int, parent=None):
|
| 1296 |
-
super().__init__(parent)
|
| 1297 |
-
d = date.fromisoformat(date_str)
|
| 1298 |
-
dow = DAY_OF_WEEK_LABELS[d.weekday()]
|
| 1299 |
-
slot_label = "朝食" if slot == TimeSlot.BREAKFAST else "ディナー"
|
| 1300 |
-
self.setWindowTitle(f"{d.month}/{d.day}({dow}) {slot_label}予約客数")
|
| 1301 |
-
self.setFixedWidth(320)
|
| 1302 |
-
|
| 1303 |
-
layout = QVBoxLayout(self)
|
| 1304 |
-
layout.setSpacing(10)
|
| 1305 |
-
layout.addWidget(QLabel(f"日付: {d.month}月{d.day}日 ({dow}) {slot_label}"))
|
| 1306 |
-
|
| 1307 |
-
from PyQt6.QtWidgets import QSpinBox
|
| 1308 |
-
self._spin = QSpinBox()
|
| 1309 |
-
self._spin.setRange(0, 999)
|
| 1310 |
-
self._spin.setValue(current_count)
|
| 1311 |
-
self._spin.setFixedHeight(36)
|
| 1312 |
-
self._spin.setSuffix(" 名")
|
| 1313 |
-
layout.addWidget(self._spin)
|
| 1314 |
-
|
| 1315 |
-
hint = QLabel("0 で入力するとデータを消去します。設定した閾値を超えると増員が発生します。")
|
| 1316 |
-
hint.setStyleSheet("font-size:11px; color:#6b7280;")
|
| 1317 |
-
hint.setWordWrap(True)
|
| 1318 |
-
layout.addWidget(hint)
|
| 1319 |
-
|
| 1320 |
-
btn_row = QHBoxLayout()
|
| 1321 |
-
btn_cancel = QPushButton("キャンセル")
|
| 1322 |
-
btn_cancel.clicked.connect(self.reject)
|
| 1323 |
-
btn_ok = QPushButton("保存")
|
| 1324 |
-
btn_ok.setDefault(True)
|
| 1325 |
-
btn_ok.clicked.connect(self.accept)
|
| 1326 |
-
btn_row.addStretch()
|
| 1327 |
-
btn_row.addWidget(btn_cancel)
|
| 1328 |
-
btn_row.addWidget(btn_ok)
|
| 1329 |
-
layout.addLayout(btn_row)
|
| 1330 |
-
|
| 1331 |
-
@property
|
| 1332 |
-
def count(self) -> int:
|
| 1333 |
-
return self._spin.value()
|
| 1334 |
-
|
| 1335 |
-
|
| 1336 |
# ── ポジション選択ダイアログ ──────────────────────────────────────────────
|
| 1337 |
|
| 1338 |
class PositionSelectDialog(QDialog):
|
|
|
|
| 43 |
self._requests: dict[tuple[int, str], tuple[bool, bool]] = {}
|
| 44 |
self._raw_requests: dict[tuple[int, str], ShiftRequest] = {}
|
| 45 |
self._notes: dict[str, str] = {} # {date_str: note}
|
|
|
|
| 46 |
self._col_date_strs_b: list[str | None] = [] # 朝食タブの日付列リスト
|
|
|
|
| 47 |
self._build_ui()
|
| 48 |
self._load_periods()
|
| 49 |
|
|
|
|
| 108 |
|
| 109 |
(tab_b, self.emp_table_b, self.sum_table_b,
|
| 110 |
self._btn_other_b, self._warn_label_b,
|
| 111 |
+
self._notes_table) = self._make_tab_widget(TimeSlot.BREAKFAST)
|
| 112 |
(tab_d, self.emp_table_d, self.sum_table_d,
|
| 113 |
+
self._btn_other_d, self._warn_label_d, _) = self._make_tab_widget(TimeSlot.DINNER)
|
|
|
|
| 114 |
|
| 115 |
self.tab_widget.addTab(tab_b, "🌅 朝食")
|
| 116 |
self.tab_widget.addTab(tab_d, "🌆 ディナー")
|
|
|
|
| 160 |
warn_label.setVisible(False)
|
| 161 |
vbox.addWidget(warn_label)
|
| 162 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 163 |
# 備考テーブル(朝食タブのみ)
|
| 164 |
notes_table = None
|
| 165 |
if slot == TimeSlot.BREAKFAST:
|
|
|
|
| 212 |
# 水平スクロール同期(emp_table ↔ sum_table、朝食タブは notes_table も同期)
|
| 213 |
emp_table.horizontalScrollBar().valueChanged.connect(
|
| 214 |
sum_table.horizontalScrollBar().setValue)
|
|
|
|
|
|
|
| 215 |
if notes_table is not None:
|
| 216 |
emp_table.horizontalScrollBar().valueChanged.connect(
|
| 217 |
notes_table.horizontalScrollBar().setValue)
|
|
|
|
| 221 |
sep.setFrameShape(QFrame.Shape.HLine)
|
| 222 |
vbox.insertWidget(vbox.count() - 1, sep) # sum_tableの直前に挿入
|
| 223 |
|
| 224 |
+
return container, emp_table, sum_table, btn, warn_label, notes_table
|
| 225 |
|
| 226 |
def _sync_col_width(self, col_idx: int, new_width: int, slot: TimeSlot):
|
| 227 |
"""従業員テーブルの列幅変更を集計・備考テーブルに反映"""
|
|
|
|
| 230 |
sum_t.setColumnWidth(col_idx, new_width)
|
| 231 |
if slot == TimeSlot.BREAKFAST and self._notes_table and col_idx < self._notes_table.columnCount():
|
| 232 |
self._notes_table.setColumnWidth(col_idx, new_width)
|
|
|
|
|
|
|
|
|
|
| 233 |
|
| 234 |
def _on_toggle_other(self, slot: TimeSlot, checked: bool):
|
| 235 |
self._show_other[slot] = checked
|
|
|
|
| 343 |
(r.employee_id, r.date): r
|
| 344 |
for r in requests
|
| 345 |
}
|
| 346 |
+
self._notes = repo.get_schedule_notes(self._period.id)
|
|
|
|
| 347 |
|
| 348 |
# ── 描画 ──────────────────────────────────────────────────────────────
|
| 349 |
|
|
|
|
| 516 |
# 警告更新
|
| 517 |
self._update_constraint_warnings(warn_label, slot, dates, count_map, leader_map, shift_constraints)
|
| 518 |
|
| 519 |
+
# 備考テーブル更新(朝食タブのみ)
|
| 520 |
if slot == TimeSlot.BREAKFAST:
|
| 521 |
self._col_date_strs_b = col_date_strs
|
| 522 |
self._render_notes_row()
|
|
|
|
|
|
|
|
|
|
|
|
|
| 523 |
|
| 524 |
def _fill_divider_row(self, table: QTableWidget, row: int, label: str, col_count: int):
|
| 525 |
c = theme.c
|
|
|
|
| 681 |
else:
|
| 682 |
warn_label.setVisible(False)
|
| 683 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 684 |
# ── 備考テーブル ──────────────────────────────────────────────────────
|
| 685 |
|
| 686 |
def _render_notes_row(self):
|
|
|
|
| 1192 |
return self._edit.text().strip()
|
| 1193 |
|
| 1194 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1195 |
# ── ポジション選択ダイアログ ──────────────────────────────────────────────
|
| 1196 |
|
| 1197 |
class PositionSelectDialog(QDialog):
|