Commit ·
6799fd5
1
Parent(s): 2727ce1
fix: アイコン高解像度化・習熟度表示を星(⭐)に変更
Browse files- assets/icon.ico を 16〜256px の6サイズ入りに作り直し(旧16pxのみ)
- SkillLevel.label() をリーダー/ベテラン/一般/新人 → ⭐⭐⭐⭐〜⭐ に変更
- employee_view コンボ・schedule_view 凡例/バッジ・help_view テキストを同期更新
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
- assets/icon.ico +0 -0
- ui/employee_view.py +3 -3
- ui/help_view.py +1 -1
- ui/schedule_view.py +6 -6
- utils/constants.py +1 -1
assets/icon.ico
CHANGED
|
|
|
|
ui/employee_view.py
CHANGED
|
@@ -156,7 +156,7 @@ class EmployeeDialog(QDialog):
|
|
| 156 |
form.setSpacing(10)
|
| 157 |
|
| 158 |
self.name_edit = QLineEdit()
|
| 159 |
-
self.name_edit.setPlaceholderText("例:
|
| 160 |
form.addRow("氏名 *", self.name_edit)
|
| 161 |
|
| 162 |
self.emp_type_combo = QComboBox()
|
|
@@ -185,8 +185,8 @@ class EmployeeDialog(QDialog):
|
|
| 185 |
|
| 186 |
self.hall_skill_combo = QComboBox()
|
| 187 |
self.kitchen_skill_combo = QComboBox()
|
| 188 |
-
for label, val in [("
|
| 189 |
-
("
|
| 190 |
self.hall_skill_combo.addItem(label, val)
|
| 191 |
self.kitchen_skill_combo.addItem(label, val)
|
| 192 |
self.hall_skill_combo.setCurrentIndex(3)
|
|
|
|
| 156 |
form.setSpacing(10)
|
| 157 |
|
| 158 |
self.name_edit = QLineEdit()
|
| 159 |
+
self.name_edit.setPlaceholderText("例:うおまん 太郎")
|
| 160 |
form.addRow("氏名 *", self.name_edit)
|
| 161 |
|
| 162 |
self.emp_type_combo = QComboBox()
|
|
|
|
| 185 |
|
| 186 |
self.hall_skill_combo = QComboBox()
|
| 187 |
self.kitchen_skill_combo = QComboBox()
|
| 188 |
+
for label, val in [("⭐⭐⭐⭐", SkillLevel.LEADER), ("⭐⭐⭐", SkillLevel.VETERAN),
|
| 189 |
+
("⭐⭐", SkillLevel.GENERAL), ("⭐", SkillLevel.BEGINNER)]:
|
| 190 |
self.hall_skill_combo.addItem(label, val)
|
| 191 |
self.kitchen_skill_combo.addItem(label, val)
|
| 192 |
self.hall_skill_combo.setCurrentIndex(3)
|
ui/help_view.py
CHANGED
|
@@ -16,7 +16,7 @@ _HELP_HTML = """
|
|
| 16 |
<ol>
|
| 17 |
<li><b>従業員管理</b> — 従業員を登録します。<br>
|
| 18 |
所属ポジション(ホール/キッチン専任)、勤務時間帯(朝食/ディナー専任)、
|
| 19 |
-
習熟度(
|
| 20 |
<li><b>希望シフト入力</b> — 期間を設定し、従業員ごとに出勤希望を入力します。<br>
|
| 21 |
シフトパターンを選択するか、カスタムで時刻を入力してください。</li>
|
| 22 |
<li><b>シフト自動生成</b> — 希望を元に最適なシフトを自動生成します。<br>
|
|
|
|
| 16 |
<ol>
|
| 17 |
<li><b>従業員管理</b> — 従業員を登録します。<br>
|
| 18 |
所属ポジション(ホール/キッチン専任)、勤務時間帯(朝食/ディナー専任)、
|
| 19 |
+
習熟度(⭐⭐⭐⭐〜⭐ の4段階)を設定してください。</li>
|
| 20 |
<li><b>希望シフト入力</b> — 期間を設定し、従業員ごとに出勤希望を入力します。<br>
|
| 21 |
シフトパターンを選択するか、カスタムで時刻を入力してください。</li>
|
| 22 |
<li><b>シフト自動生成</b> — 希望を元に最適なシフトを自動生成します。<br>
|
ui/schedule_view.py
CHANGED
|
@@ -20,10 +20,10 @@ from utils.constants import (
|
|
| 20 |
from utils.theme import theme
|
| 21 |
|
| 22 |
SKILL_BADGE = {
|
| 23 |
-
SkillLevel.LEADER: "
|
| 24 |
-
SkillLevel.VETERAN: "
|
| 25 |
-
SkillLevel.GENERAL: "",
|
| 26 |
-
SkillLevel.BEGINNER: "
|
| 27 |
}
|
| 28 |
|
| 29 |
# _assignments value: (position_str, is_reinforcement_bool)
|
|
@@ -79,7 +79,7 @@ class ScheduleView(QWidget):
|
|
| 79 |
self._status_legend_labels.append((lbl, color_key))
|
| 80 |
legend.addWidget(lbl)
|
| 81 |
legend.addStretch()
|
| 82 |
-
legend.addWidget(QLabel("習熟度:
|
| 83 |
reinf_lbl = QLabel("■ 応援要員(希望外追加)")
|
| 84 |
reinf_lbl.setStyleSheet("background:#fed7aa; border-radius:3px; padding:2px 6px; font-size:11px;")
|
| 85 |
legend.addWidget(reinf_lbl)
|
|
@@ -811,7 +811,7 @@ class PositionSelectDialog(QDialog):
|
|
| 811 |
badge = SKILL_BADGE.get(emp_skill, "")
|
| 812 |
btn = QPushButton(
|
| 813 |
f"{pos.label()} [{current}/{constraint.get('max',3)}名] "
|
| 814 |
-
f"
|
| 815 |
f"自分:{emp_skill.label()}{badge}"
|
| 816 |
)
|
| 817 |
btn.setFixedHeight(40)
|
|
|
|
| 20 |
from utils.theme import theme
|
| 21 |
|
| 22 |
SKILL_BADGE = {
|
| 23 |
+
SkillLevel.LEADER: "⭐⭐⭐⭐",
|
| 24 |
+
SkillLevel.VETERAN: "⭐⭐⭐",
|
| 25 |
+
SkillLevel.GENERAL: "⭐⭐",
|
| 26 |
+
SkillLevel.BEGINNER: "⭐",
|
| 27 |
}
|
| 28 |
|
| 29 |
# _assignments value: (position_str, is_reinforcement_bool)
|
|
|
|
| 79 |
self._status_legend_labels.append((lbl, color_key))
|
| 80 |
legend.addWidget(lbl)
|
| 81 |
legend.addStretch()
|
| 82 |
+
legend.addWidget(QLabel("習熟度: ⭐⭐⭐⭐〜⭐(4〜1) "))
|
| 83 |
reinf_lbl = QLabel("■ 応援要員(希望外追加)")
|
| 84 |
reinf_lbl.setStyleSheet("background:#fed7aa; border-radius:3px; padding:2px 6px; font-size:11px;")
|
| 85 |
legend.addWidget(reinf_lbl)
|
|
|
|
| 811 |
badge = SKILL_BADGE.get(emp_skill, "")
|
| 812 |
btn = QPushButton(
|
| 813 |
f"{pos.label()} [{current}/{constraint.get('max',3)}名] "
|
| 814 |
+
f"⭐⭐⭐⭐:{leaders}/{constraint.get('min_leader',1)}名 "
|
| 815 |
f"自分:{emp_skill.label()}{badge}"
|
| 816 |
)
|
| 817 |
btn.setFixedHeight(40)
|
utils/constants.py
CHANGED
|
@@ -16,7 +16,7 @@ class SkillLevel(str, Enum):
|
|
| 16 |
BEGINNER = "beginner"
|
| 17 |
|
| 18 |
def label(self):
|
| 19 |
-
return {"leader": "
|
| 20 |
|
| 21 |
def rank(self):
|
| 22 |
return {"leader": 3, "veteran": 2, "general": 1, "beginner": 0}[self.value]
|
|
|
|
| 16 |
BEGINNER = "beginner"
|
| 17 |
|
| 18 |
def label(self):
|
| 19 |
+
return {"leader": "⭐⭐⭐⭐", "veteran": "⭐⭐⭐", "general": "⭐⭐", "beginner": "⭐"}[self.value]
|
| 20 |
|
| 21 |
def rank(self):
|
| 22 |
return {"leader": 3, "veteran": 2, "general": 1, "beginner": 0}[self.value]
|