From 30fd2c5470afa277c501828e15f50dd760e80c6f Mon Sep 17 00:00:00 2001 From: king Date: Tue, 13 Oct 2026 23:43:22 +0900 Subject: [PATCH] =?UTF-8?q?feat(project):=20=EB=8C=80=EC=8B=9C=EB=B3=B4?= =?UTF-8?q?=EB=93=9C=20=EB=8B=B4=EB=8B=B9=EC=9E=90=EB=B3=84=20=ED=95=A9?= =?UTF-8?q?=EA=B3=84=20=EC=9D=B4=EB=A6=84=20=EC=99=BC=EC=AA=BD=EC=97=90=20?= =?UTF-8?q?=ED=94=84=EB=A1=9C=ED=95=84=20=EC=95=84=EC=9D=B4=EC=BD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 사진이 있으면 구글 프로필 사진, 없으면 기본 사람 아이콘(avatarHtml 공용). 정적 파일 캐시 키 20261013i. Co-Authored-By: Claude Opus 5.5 --- app/modules/notice/templates/notice/admin.html | 4 ++-- app/modules/project/templates/project/goal_meeting.html | 4 ++-- app/modules/project/templates/project/goals.html | 4 ++-- app/modules/project/templates/project/help.html | 2 +- app/modules/project/templates/project/inbox.html | 4 ++-- app/modules/project/templates/project/mytasks.html | 4 ++-- app/modules/project/templates/project/notifier.html | 4 ++-- app/modules/project/templates/project/project.html | 4 ++-- app/modules/project/templates/project/trash.html | 4 ++-- app/static/project.css | 5 ++++- app/static/project.js | 6 ++++-- docs/PROJECT_MODULE.md | 2 +- tests/js/project_ui.test.js | 4 ++++ 13 files changed, 30 insertions(+), 21 deletions(-) diff --git a/app/modules/notice/templates/notice/admin.html b/app/modules/notice/templates/notice/admin.html index 1a7ff9d..e23c5dc 100644 --- a/app/modules/notice/templates/notice/admin.html +++ b/app/modules/notice/templates/notice/admin.html @@ -2,7 +2,7 @@ {% block head_extra %} {# 프로젝트 화면 부품(설명 편집기·날짜 팝업·멤버 고르기)을 그대로 쓴다 — project.js 는 PJ_LIB_ONLY 로 부품만 #} - + {% endblock %} @@ -64,7 +64,7 @@ - + {% endif %} {% endblock %} diff --git a/app/modules/project/templates/project/goal_meeting.html b/app/modules/project/templates/project/goal_meeting.html index 87ceaa5..f017ee5 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 %} @@ -298,5 +298,5 @@ - + {% endblock %} diff --git a/app/modules/project/templates/project/goals.html b/app/modules/project/templates/project/goals.html index 789e352..992a9f4 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/help.html b/app/modules/project/templates/project/help.html index 8c856f6..0e9dab7 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 4792318..5a33353 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 %} @@ -102,5 +102,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 f798458..e1a676c 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/notifier.html b/app/modules/project/templates/project/notifier.html index 795a542..4904405 100644 --- a/app/modules/project/templates/project/notifier.html +++ b/app/modules/project/templates/project/notifier.html @@ -1,7 +1,7 @@ {% extends "erp_base.html" %} {% block head_extra %} - + {% endblock %} @@ -108,5 +108,5 @@ }); })(); - + {% endblock %} diff --git a/app/modules/project/templates/project/project.html b/app/modules/project/templates/project/project.html index 6a2ff2e..b58dea4 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 %} - + @@ -470,5 +470,5 @@ - + {% endblock %} diff --git a/app/modules/project/templates/project/trash.html b/app/modules/project/templates/project/trash.html index 751e412..248e5dc 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 5624d33..e83502b 100644 --- a/app/static/project.css +++ b/app/static/project.css @@ -1712,7 +1712,10 @@ img.pj-person-ic { width: 22px; height: 22px; } .pj-wl-col.is-sub .pj-wl-done { background: #5fbf86; } .pj-wl-kind { margin-top: 6px; font-size: 11px; color: var(--pj-ink-soft); white-space: nowrap; } /* "메인 작업"·"세부 작업" 한 줄 */ .pj-wl-name { display: flex; flex-direction: column; align-items: center; margin-top: 4px; max-width: 110px; text-align: center; } -.pj-wl-name b { font-size: 12.5px; font-weight: 600; color: var(--pj-ink); max-width: 110px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } +.pj-wl-name-row { display: flex; align-items: center; justify-content: center; gap: 5px; max-width: 110px; } +.pj-wl-name b { font-size: 12.5px; font-weight: 600; color: var(--pj-ink); min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } +.pj-wl-avatar.pj-avatar { width: 18px; height: 18px; } +.pj-wl-avatar.pj-gicon { font-size: 18px; color: #9aa1a9; } .pj-wl-name small { font-size: 11px; color: var(--pj-ink-soft); font-variant-numeric: tabular-nums; } /* 오른쪽 업무 목록 패널(body 에 붙음, 작업 편집 창(z 1000) 아래) */ .pj-wl-drawer { position: fixed; inset: 0; z-index: 950; } diff --git a/app/static/project.js b/app/static/project.js index 86e0984..5720810 100644 --- a/app/static/project.js +++ b/app/static/project.js @@ -6588,7 +6588,7 @@ const seen = {}, rows = {}; function row(email, name) { const k = email ? email.toLowerCase() : ""; - if (!rows[k]) rows[k] = { label: email ? capName(name || idOf(email)) : "담당자 없음", none: !email, + if (!rows[k]) rows[k] = { label: email ? capName(name || idOf(email)) : "담당자 없음", none: !email, email: k, mains: [], subs: [] }; return rows[k]; } @@ -6658,7 +6658,9 @@ group.appendChild(pair); const name = document.createElement("div"); name.className = "pj-wl-name"; - name.innerHTML = "" + done + "/" + all + " · " + (all ? Math.round(done / all * 100) : 0) + "%"; + // 이름 왼쪽 프로필 아이콘(2026-10-13) — 사진 없으면 기본 사람 아이콘 + name.innerHTML = '' + avatarHtml(r.email, "pj-wl-avatar") + "" + + done + "/" + all + " · " + (all ? Math.round(done / all * 100) : 0) + "%"; name.querySelector("b").textContent = r.label; group.appendChild(name); wrap.appendChild(group); diff --git a/docs/PROJECT_MODULE.md b/docs/PROJECT_MODULE.md index f76ac62..9eb20c8 100644 --- a/docs/PROJECT_MODULE.md +++ b/docs/PROJECT_MODULE.md @@ -290,7 +290,7 @@ 메인 작업(`scopeTasks()` 최상위, 중복 없이)과 하위 작업(화면 목록엔 없어 `GET /api/projects/{id}/subtasks-summary?scope=` — `db.list_subtasks_of`, 그 범위 메인 작업의 하위만, 하위 작업 자신의 담당자 기준)을 나눠 세고, 메인·하위·전체 완료 수와 전체 완료율. 하위 요약은 15초 캐시(`paintWorkload`). **세로 막대**(같은 날 변경 — 사람마다 메인·하위 막대, 막대 = 그 작업 전체(100%), - 초록 채움 높이 = 완료율, 위 = 완료/전체·%. 처음엔 높이를 작업 수로 그려 많은 사람 기준에 다른 막대가 눌려 보였다 → 완료율로 수정). 막대를 누르면 오른쪽 슬라이드 패널(`openWorkloadDrawer`, body 에 붙음, z 950 — 편집 창 아래)에 + 초록 채움 높이 = 완료율, 위 = 완료/전체·%, 이름 왼쪽 프로필 아이콘(`avatarHtml`, 사진 없으면 기본 사람 아이콘 — 2026-10-13). 처음엔 높이를 작업 수로 그려 많은 사람 기준에 다른 막대가 눌려 보였다 → 완료율로 수정). 막대를 누르면 오른쪽 슬라이드 패널(`openWorkloadDrawer`, body 에 붙음, z 950 — 편집 창 아래)에 그 업무 목록(미완료·완료, 하위는 상위 작업 이름), 항목 → `openTaskById`(하위는 서버에서 받아) 편집 창. 편집 창이 닫히면 요약을 다시 받아 대시보드·패널을 다시 그린다. 하위 요약 API 는 id·제목·마감일·완료 시각도 준다. **패널에서 연 편집 창은 패널 왼쪽에 붙어 열린다**(2026-10-13, `placeTaskBesideDrawer` — 패널은 그대로 보이고 다른 줄을 바로 누를 수 있음, 6-16). diff --git a/tests/js/project_ui.test.js b/tests/js/project_ui.test.js index abc588a..a7ac850 100644 --- a/tests/js/project_ui.test.js +++ b/tests/js/project_ui.test.js @@ -730,6 +730,10 @@ function titleVal(d) { return d.getElementById("pj-t-title").value; } // 막대 = 그 작업 전체, 채움 = 완료율(작업 수가 아니라) — Me 메인 1/2 → 50%, 하위 1/1 → 100%, Bob 0/1 → 0% const pcts = Array.from(env.d.querySelectorAll(".pj-wl-done")).map(function (f) { return f.dataset.pct; }); check("[대시보드 담당자별] 채움 높이 = 완료율", JSON.stringify(pcts) === JSON.stringify(["50", "50", "0", "0"]), pcts); + check("[대시보드 담당자별] 이름 왼쪽 프로필 아이콘", Array.from(env.d.querySelectorAll(".pj-wl-name")).every(function (n) { + const av = n.querySelector(".pj-wl-name-row > .pj-wl-avatar"); + return av && av.nextElementSibling === n.querySelector("b"); + }), env.d.querySelector(".pj-wl-name") && env.d.querySelector(".pj-wl-name").innerHTML); const sum = env.d.querySelector(".pj-wl-sum").textContent.replace(/\s+/g, " "); check("[대시보드 담당자별] 전체 완료 2/6 (33%)", /2 \/ 6 \(33%\)/.test(sum), sum); // 막대 → 오른쪽 패널(body 에) → 항목 → 편집 창