From 38d0a87d6b45931fd5a248aae44b8e64b9a4395b Mon Sep 17 00:00:00 2001 From: king Date: Wed, 7 Oct 2026 11:30:49 +0900 Subject: [PATCH] feat(project): show weekday and day count in weekly target popup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Each week reads like "11/1(일)~11/8(일) 8일". Co-Authored-By: Claude Opus 5.5 --- app/modules/project/router.py | 4 +++- app/modules/project/templates/project/goal_meeting.html | 4 ++-- app/modules/project/templates/project/goals.html | 4 ++-- app/modules/project/templates/project/inbox.html | 2 +- app/modules/project/templates/project/mytasks.html | 2 +- app/modules/project/templates/project/project.html | 2 +- app/modules/project/templates/project/trash.html | 2 +- app/static/project.css | 6 +++++- app/static/project.js | 3 ++- tests/js/goals_meeting_ui.test.js | 1 + tests/js/render_goals.py | 2 +- 11 files changed, 20 insertions(+), 12 deletions(-) diff --git a/app/modules/project/router.py b/app/modules/project/router.py index b1289b2..a5ff7f5 100644 --- a/app/modules/project/router.py +++ b/app/modules/project/router.py @@ -2650,7 +2650,9 @@ def goals_page(request: Request, year: int) -> HTMLResponse: week_targets = None if board and st.week_targets_enabled(): saved = st.goal_week_targets(start=date(year, 1, 1), end=date(year, 12, 31)) - week_targets = {mo: [{"start": a.isoformat(), "n": i + 1, "label": f"{a.month}/{a.day}~{b.month}/{b.day}", + # 기간 표기 — 11/1(일)~11/8(일), days = 그 주차 날 수 + week_targets = {mo: [{"start": a.isoformat(), "n": i + 1, "days": (b - a).days + 1, + "label": f"{a.month}/{a.day}({_WEEKDAYS_KR[a.weekday()]})~{b.month}/{b.day}({_WEEKDAYS_KR[b.weekday()]})", "value": _goal_label("sales", saved.get(a.isoformat()))} for i, (a, b) in enumerate(store.month_weeks(year, mo))] for mo in range(1, 13)} return render_template( diff --git a/app/modules/project/templates/project/goal_meeting.html b/app/modules/project/templates/project/goal_meeting.html index 47dbe81..8573d21 100644 --- a/app/modules/project/templates/project/goal_meeting.html +++ b/app/modules/project/templates/project/goal_meeting.html @@ -1,7 +1,7 @@ {% extends "project/_meeting_content_base.html" if meeting_embedded else "erp_base.html" %} {% block head_extra %} - + {% endblock %} @@ -262,5 +262,5 @@ - + {% endblock %} diff --git a/app/modules/project/templates/project/goals.html b/app/modules/project/templates/project/goals.html index 9d2e6e8..018f65d 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/_member_tasks_modal.html" %} - + {% endblock %} diff --git a/app/modules/project/templates/project/inbox.html b/app/modules/project/templates/project/inbox.html index 0014605..425c373 100644 --- a/app/modules/project/templates/project/inbox.html +++ b/app/modules/project/templates/project/inbox.html @@ -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 55d7477..20ddbc8 100644 --- a/app/modules/project/templates/project/mytasks.html +++ b/app/modules/project/templates/project/mytasks.html @@ -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 72a8fc9..46f2cd2 100644 --- a/app/modules/project/templates/project/project.html +++ b/app/modules/project/templates/project/project.html @@ -492,5 +492,5 @@ - + {% endblock %} diff --git a/app/modules/project/templates/project/trash.html b/app/modules/project/templates/project/trash.html index 939ef47..898419c 100644 --- a/app/modules/project/templates/project/trash.html +++ b/app/modules/project/templates/project/trash.html @@ -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 1bb32e9..a2500dc 100644 --- a/app/static/project.css +++ b/app/static/project.css @@ -2692,13 +2692,17 @@ input.pj-meet-amount::placeholder { color: rgba(0, 0, 0, .28); } .pj-goal-numtd.is-weekly .pj-goal-num { cursor: pointer; } .pj-goal-numtd.is-weekly input.pj-goal-num:hover { background: var(--pj-accent-tint); } .pj-goal-wkpop { - position: fixed; z-index: 1000; width: 260px; padding: 10px 12px; background: #fff; border: 1px solid var(--pj-border); + position: fixed; z-index: 1000; width: 330px; padding: 10px 12px; background: #fff; border: 1px solid var(--pj-border); border-radius: 10px; box-shadow: 0 8px 24px rgba(16, 24, 40, .16); font-size: 13px; } .pj-goal-wkpop-head { font-weight: 700; margin-bottom: 8px; } .pj-goal-wkpop-head small { font-weight: 500; color: var(--pj-ink-soft); } .pj-goal-wkpop-row { display: flex; align-items: center; justify-content: space-between; gap: 8px; margin: 4px 0; } .pj-goal-wkpop-row em { font-style: normal; color: var(--pj-ink-soft); font-size: 12px; } +.pj-goal-wkpop-days { + font-style: normal; display: inline-block; margin-left: 2px; padding: 0 6px; border-radius: 999px; background: #f1f3f6; + color: var(--pj-ink-soft); font-size: 11px; font-weight: 600; line-height: 18px; +} .pj-goal-wkpop-row input { width: 100px; height: 26px; padding: 0 6px; border: 1px solid var(--pj-border); border-radius: 6px; font: inherit; text-align: right; font-variant-numeric: tabular-nums; diff --git a/app/static/project.js b/app/static/project.js index 15afa24..da36fdc 100644 --- a/app/static/project.js +++ b/app/static/project.js @@ -9052,7 +9052,8 @@ weekPop.innerHTML = '
' + mo + "월 주차별 매출 목표" + (unit ? " (" + escapeHtml(unit) + ")" : "") + "
" + list.map(function (w) { - return '