From 2dab20f718818e9f1b28d81e675476a9aae3d34d Mon Sep 17 00:00:00 2001 From: king Date: Thu, 1 Oct 2026 12:07:21 +0900 Subject: [PATCH] =?UTF-8?q?feat(project):=20=EC=A3=BC=EA=B0=84=20=ED=9A=8C?= =?UTF-8?q?=EC=9D=98=EB=A1=9D=20=EC=9E=91=EC=9D=80=20=EB=8B=AC=EB=A0=A5=20?= =?UTF-8?q?=E2=80=94=20=EB=B3=B4=EA=B3=A0=20=EC=9E=88=EB=8A=94=20=EC=A3=BC?= =?UTF-8?q?=20=EC=98=81=EC=97=AD=20=ED=91=9C=EC=8B=9C,=20=EC=A3=BC=20?= =?UTF-8?q?=EC=A4=84=EC=9D=84=20=EB=88=84=EB=A5=B4=EB=A9=B4=20=EA=B7=B8=20?= =?UTF-8?q?=EC=A3=BC=20=ED=9A=8C=EC=9D=98=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 주차 탭 오른쪽에 그 달 월요일 시작 달력(주 = 월~일 한 줄) - 보고 있는 주 영역 표시, 오늘 동그라미, 토 파랑·일/공휴일 빨강, 다른 달 날짜 흐리게, 회의록 있는 주 점 - 줄(주)을 누르면 그 주 회의록(?week=), 인쇄에선 숨김, 좁은 화면은 아래로 - 캐시 버전 20261001g, 문서 갱신 Co-Authored-By: Claude Opus 5.5 --- app/modules/project/router.py | 8 +++- .../templates/project/goal_meeting.html | 40 +++++++++++++------ .../project/templates/project/goals.html | 4 +- .../project/templates/project/help.html | 2 +- .../project/templates/project/inbox.html | 4 +- .../project/templates/project/mytasks.html | 4 +- .../project/templates/project/project.html | 4 +- .../project/templates/project/trash.html | 4 +- app/static/project.css | 29 +++++++++++++- docs/PROJECT_MODULE.md | 3 ++ 10 files changed, 76 insertions(+), 26 deletions(-) diff --git a/app/modules/project/router.py b/app/modules/project/router.py index 2111677..21d3a26 100644 --- a/app/modules/project/router.py +++ b/app/modules/project/router.py @@ -2964,7 +2964,13 @@ def goal_meeting_page(request: Request, year: int, month: int, week: str | None "goal_month": month, "meetings_enabled": enabled, "weeks": [{"start": w.isoformat(), "end": e.isoformat(), "n": i + 1, "label": f"{w.month}/{w.day}~{e.month}/{e.day}", - "has": w.isoformat() in existing, "now": w <= today <= e} for i, (w, e) in enumerate(weeks)], + "has": w.isoformat() in existing, "now": w <= today <= e, + # 작은 달력(월요일 시작) 한 줄 — 날짜·그 달 여부·오늘·요일(5 토, 6 일)·공휴일 + "days": [{"d": (w + timedelta(days=k)).day, "iso": (w + timedelta(days=k)).isoformat(), + "in": (w + timedelta(days=k)).month == month, "today": w + timedelta(days=k) == today, + "wd": k, "hol": store.KR_HOLIDAYS.get((w + timedelta(days=k)).isoformat(), "")} + for k in range(7)]} + for i, (w, e) in enumerate(weeks)], "week": sel.isoformat(), "week_n": next(i + 1 for i, (w, _) in enumerate(weeks) if w == sel), "week_end": (sel + timedelta(days=6)).isoformat(), diff --git a/app/modules/project/templates/project/goal_meeting.html b/app/modules/project/templates/project/goal_meeting.html index 6c61706..0800285 100644 --- a/app/modules/project/templates/project/goal_meeting.html +++ b/app/modules/project/templates/project/goal_meeting.html @@ -1,7 +1,7 @@ {% extends "erp_base.html" %} {% block head_extra %} - + {% endblock %} @@ -45,17 +45,31 @@
- {# 주차 탭 — 주 = 월요일~일요일, 1주차 = 1일이 들어 있는 주. 점 = 회의록 있음 #} - +
+ {# 주차 탭 — 주 = 월요일~일요일, 1주차 = 1일이 들어 있는 주. 점 = 회의록 있음 #} + + {# 작은 달력 — 월요일 시작(주 = 월~일), 보고 있는 주는 영역 표시, 줄을 누르면 그 주 회의록. 점 = 회의록 있음 #} +
+
{{ goal_year }}년 {{ goal_month }}월
+
월화수목금토일
+ {% for w in weeks %} + + {% for d in w.days %}{{ d.d }}{% endfor %} + {% if w.has %}{% endif %} + + {% endfor %} +
+
{% if not meetings_enabled %}
주간 회의록이 아직 준비되지 않았습니다(DB 마이그레이션 015 필요).
@@ -241,5 +255,5 @@ {% include "project/_side_modals.html" %} {% include "project/_member_tasks_modal.html" %} - + {% endblock %} diff --git a/app/modules/project/templates/project/goals.html b/app/modules/project/templates/project/goals.html index c471bac..155deaa 100644 --- a/app/modules/project/templates/project/goals.html +++ b/app/modules/project/templates/project/goals.html @@ -1,7 +1,7 @@ {% extends "erp_base.html" %} {% block head_extra %} - + {% endblock %} @@ -207,5 +207,5 @@ {% include "project/_side_modals.html" %} {% include "project/_member_tasks_modal.html" %} - + {% endblock %} diff --git a/app/modules/project/templates/project/help.html b/app/modules/project/templates/project/help.html index 69b62ca..dec73c1 100644 --- a/app/modules/project/templates/project/help.html +++ b/app/modules/project/templates/project/help.html @@ -1,7 +1,7 @@ {% extends "erp_base.html" %} {% block head_extra %} - + {% endblock %} diff --git a/app/modules/project/templates/project/inbox.html b/app/modules/project/templates/project/inbox.html index 8fa48a7..ecae76f 100644 --- a/app/modules/project/templates/project/inbox.html +++ b/app/modules/project/templates/project/inbox.html @@ -1,7 +1,7 @@ {% extends "erp_base.html" %} {% block head_extra %} - + {% endblock %} @@ -104,5 +104,5 @@ {% include "project/_side_modals.html" %} {% include "project/_member_tasks_modal.html" %} - + {% endblock %} diff --git a/app/modules/project/templates/project/mytasks.html b/app/modules/project/templates/project/mytasks.html index 5e2b17d..7cc89c6 100644 --- a/app/modules/project/templates/project/mytasks.html +++ b/app/modules/project/templates/project/mytasks.html @@ -1,7 +1,7 @@ {% extends "erp_base.html" %} {% block head_extra %} - + {% endblock %} @@ -100,5 +100,5 @@ "today": {{ today | tojson }} } - + {% endblock %} diff --git a/app/modules/project/templates/project/project.html b/app/modules/project/templates/project/project.html index d4f4951..eb54f86 100644 --- a/app/modules/project/templates/project/project.html +++ b/app/modules/project/templates/project/project.html @@ -1,7 +1,7 @@ {% extends "erp_base.html" %} {% block head_extra %} - + @@ -496,5 +496,5 @@ - + {% endblock %} diff --git a/app/modules/project/templates/project/trash.html b/app/modules/project/templates/project/trash.html index 39ee233..9c0138a 100644 --- a/app/modules/project/templates/project/trash.html +++ b/app/modules/project/templates/project/trash.html @@ -1,7 +1,7 @@ {% extends "erp_base.html" %} {% block head_extra %} - + {% endblock %} @@ -70,5 +70,5 @@ {% include "project/_side_modals.html" %} {% include "project/_member_tasks_modal.html" %} - + {% endblock %} diff --git a/app/static/project.css b/app/static/project.css index 0cd9fb7..f8c5042 100644 --- a/app/static/project.css +++ b/app/static/project.css @@ -2172,7 +2172,34 @@ html.pj-goal-selecting, html.pj-goal-selecting * { user-select: none !important; .pj-meet-back:hover { background: #f1f2f4; color: var(--pj-ink); } .pj-goal-head-acts .pj-btn .material-symbols-outlined { font-size: 17px; vertical-align: -3px; } -.pj-meet-weeks { display: flex; flex-wrap: wrap; gap: 6px; margin: 0 0 14px; padding-top: 9px; } /* "이번 주" 꼬리표 자리 */ +/* 주차 탭(왼쪽) + 작은 달력(오른쪽) */ +.pj-meet-top { display: flex; align-items: flex-start; gap: 16px; margin: 0 0 14px; } +.pj-meet-weeks { flex: 1 1 auto; display: flex; flex-wrap: wrap; gap: 6px; margin: 0; padding-top: 9px; } /* "이번 주" 꼬리표 자리 */ +.pj-meet-cal { + flex: 0 0 auto; width: 236px; padding: 8px 12px 6px; border: 1px solid var(--pj-border); border-radius: 12px; background: #fff; +} +.pj-meet-cal-head { font-size: 12.5px; font-weight: 800; text-align: center; margin-bottom: 4px; } +.pj-meet-cal-wd, .pj-meet-cal-row { display: grid; grid-template-columns: repeat(7, 1fr); } +.pj-meet-cal-wd span { font-size: 10.5px; font-weight: 700; color: var(--pj-ink-soft); text-align: center; padding: 2px 0; } +.pj-meet-cal-row { + position: relative; margin: 1px 0; border-radius: 8px; color: var(--pj-ink); text-decoration: none; cursor: pointer; +} +.pj-meet-cal-row:hover { background: #f3f4f6; } +/* 보고 있는 주 = 영역 표시 */ +.pj-meet-cal-row.is-on { background: var(--pj-accent-tint); box-shadow: inset 0 0 0 1.5px var(--pj-accent); } +.pj-meet-cal-d { height: 24px; line-height: 24px; text-align: center; font-size: 12px; font-variant-numeric: tabular-nums; } +.pj-meet-cal-d.is-sat { color: #2563eb; } +.pj-meet-cal-d.is-sun { color: #dc2626; } +.pj-meet-cal-d.is-out { opacity: .35; } +.pj-meet-cal-d.is-today { position: relative; color: #fff; font-weight: 800; } +.pj-meet-cal-d.is-today::before { + content: ""; position: absolute; inset: 1px 3px; border-radius: 999px; background: var(--pj-accent); z-index: -1; +} +.pj-meet-cal-d.is-today { z-index: 0; } +.pj-meet-cal-row.is-on .pj-meet-cal-d { font-weight: 700; } +.pj-meet-cal-dot { position: absolute; left: -8px; top: 50%; width: 5px; height: 5px; margin-top: -2.5px; border-radius: 50%; background: #34a853; } +@media (max-width: 900px) { .pj-meet-top { flex-direction: column; } .pj-meet-cal { align-self: flex-end; } } +@media print { .pj-meet-cal { display: none !important; } } .pj-meet-week { position: relative; display: flex; flex-direction: column; gap: 1px; min-width: 104px; padding: 7px 12px; border: 1px solid var(--pj-border); border-radius: 10px; background: #fff; color: var(--pj-ink); text-decoration: none; diff --git a/docs/PROJECT_MODULE.md b/docs/PROJECT_MODULE.md index dfee43b..4db154c 100644 --- a/docs/PROJECT_MODULE.md +++ b/docs/PROJECT_MODULE.md @@ -569,6 +569,9 @@ description 을 항상 HTML로 취급하기 때문). 두 번 실행하면 이중 - 화면 `/project/goals/{연도}/meetings/{월}?week={월요일}`(`goal_meeting.html`, `initGoalMeeting`) — 목표 표 월 머리를 누르면 열린다. - **주차 탭**: 그 달과 겹치는 주(월~일, `store.month_weeks`, 1주차 = 1일이 든 주 — 앞뒤 달과 겹치는 주는 양쪽 달에 같은 회의록). 점 = 회의록 있음, "이번 주" 꼬리표. 기본 선택 = 이번 주(그 달이면) 아니면 1주차. ‹ 이전 달 · 다음 달 › 링크, ← 목표 표. + - **작은 달력**(주차 탭 오른쪽, `.pj-meet-cal`): 그 달 월요일 시작 달력, 줄 = 주(월~일) — 보고 있는 주는 영역 표시(테두리·배경), + 오늘 동그라미, 토 파랑·일/공휴일(`store.KR_HOLIDAYS`) 빨강, 다른 달 날짜 흐리게, 회의록 있는 주는 왼쪽 점. 줄을 누르면 그 주 회의록 + (`?week=`). 날짜 정보는 라우터가 주마다 `days`(d·in·today·wd·hol)로 넘긴다. 인쇄에선 숨김. - **머리 숫자**(`router._meeting_view`): 월 목표 매출(목표 표 숫자 + 단위, 단위가 원/천/만/십만/백만/천만/억이면 원 환산 — `store.sales_unit_multiplier`) · **월 누적 실적(지난주 일요일까지)** · **주당 필요 매출** = (월 목표 − 누적) ÷ 이번 주 포함 남은 주 수 · 목표 ROAS(목표 표) / 전주 목표(바로 앞 주 회의록의 금주 목표) · **전주 결과** · 전주 달성률 · **금주 목표**(입력, 칸 안내 = 필요 매출) ·