From ee8c2395ae96b8ccd359e12495842598ae64cf69 Mon Sep 17 00:00:00 2001 From: king Date: Sat, 26 Sep 2026 11:51:44 +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"=EC=98=88=EC=A0=95=EB=90=9C=20=EC=9E=91=EC=97=85?= =?UTF-8?q?=20=ED=95=A9=EA=B3=84(=EB=8B=B4=EB=8B=B9=EC=9E=90=EB=B3=84)"?= =?UTF-8?q?=EB=8A=94=20=EA=B4=80=EB=A6=AC=EC=9E=90=EC=97=90=EA=B2=8C?= =?UTF-8?q?=EB=A7=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 사람별 업무량이 드러나는 차트라 is_admin 일 때만 그린다. 나머지 타일·차트는 그대로. 정적 파일 버전 20260926e. Co-Authored-By: Claude Opus 5.5 --- .../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.js | 37 ++++++++++--------- docs/PROJECT_MODULE.md | 3 ++ 6 files changed, 31 insertions(+), 25 deletions(-) diff --git a/app/modules/project/templates/project/inbox.html b/app/modules/project/templates/project/inbox.html index f2c0929..0d82605 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 %} @@ -99,5 +99,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 91bccdd..5d45545 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 %} @@ -98,5 +98,5 @@ "today": {{ today | tojson }} } - + {% endblock %} diff --git a/app/modules/project/templates/project/project.html b/app/modules/project/templates/project/project.html index a4676d2..e5afc38 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 %} - + @@ -465,5 +465,5 @@ - + {% endblock %} diff --git a/app/modules/project/templates/project/trash.html b/app/modules/project/templates/project/trash.html index b66ae24..032e5eb 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 %} @@ -68,5 +68,5 @@ {% include "project/_side_modals.html" %} {% include "project/_member_tasks_modal.html" %} - + {% endblock %} diff --git a/app/static/project.js b/app/static/project.js index 7353077..2119671 100644 --- a/app/static/project.js +++ b/app/static/project.js @@ -4088,24 +4088,27 @@ ])); charts.appendChild(statusCard); - // 담당자별 예정된 업무 — 미완료 + 일정(시작/마감일) 있는 업무만, 상위 10명. - const byAssignee = {}; - incomplete.forEach(function (t) { - if (!t.start_date && !t.due_date) return; - const k = t.assignee_email ? (t.assignee_name || idOf(t.assignee_email)) : "담당자 없음"; - byAssignee[k] = (byAssignee[k] || 0) + 1; - }); - let assigneeEntries = Object.keys(byAssignee).map(function (k) { return { label: k, value: byAssignee[k] }; }) - .sort(function (a, b) { return b.value - a.value; }); - if (assigneeEntries.length > 10) { - const rest = assigneeEntries.slice(10).reduce(function (s, x) { return s + x.value; }, 0); - assigneeEntries = assigneeEntries.slice(0, 10).concat([{ label: "기타", value: rest }]); + // 담당자별 예정된 작업 — 미완료 + 일정(시작/마감일) 있는 작업만, 상위 10명. + // 사람별 업무량이 드러나는 표라 관리자에게만 보여준다. + if (isAdmin) { + const byAssignee = {}; + incomplete.forEach(function (t) { + if (!t.start_date && !t.due_date) return; + const k = t.assignee_email ? (t.assignee_name || idOf(t.assignee_email)) : "담당자 없음"; + byAssignee[k] = (byAssignee[k] || 0) + 1; + }); + let assigneeEntries = Object.keys(byAssignee).map(function (k) { return { label: k, value: byAssignee[k] }; }) + .sort(function (a, b) { return b.value - a.value; }); + if (assigneeEntries.length > 10) { + const rest = assigneeEntries.slice(10).reduce(function (s, x) { return s + x.value; }, 0); + assigneeEntries = assigneeEntries.slice(0, 10).concat([{ label: "기타", value: rest }]); + } + const assigneeCard = document.createElement("div"); + assigneeCard.className = "pj-dash-card pj-dash-card-wide"; + assigneeCard.innerHTML = '
예정된 작업 합계(담당자별)
'; + assigneeCard.appendChild(dashBarChart(assigneeEntries)); + charts.appendChild(assigneeCard); } - const assigneeCard = document.createElement("div"); - assigneeCard.className = "pj-dash-card pj-dash-card-wide"; - assigneeCard.innerHTML = '
예정된 작업 합계(담당자별)
'; - assigneeCard.appendChild(dashBarChart(assigneeEntries)); - charts.appendChild(assigneeCard); root.appendChild(charts); } diff --git a/docs/PROJECT_MODULE.md b/docs/PROJECT_MODULE.md index a46b1d3..01fe9fc 100644 --- a/docs/PROJECT_MODULE.md +++ b/docs/PROJECT_MODULE.md @@ -161,6 +161,9 @@ 이 메뉴가 그 역할을 대신한다(레이아웃도 3열 → 2열). - **캘린더** — FullCalendar. 작업을 시작~마감 기간으로 표시. 클릭 편집. - **타임라인** — vis-timeline(간트형). 기간 있는 작업만. + - **대시보드** — 합계 타일 4개 + 미완료 작업(섹션별)·작업 합계(완료 상태별) 차트. **"예정된 작업 합계 + (담당자별)" 차트는 관리자(`is_admin`)에게만** 보인다(사람별 업무량이 드러나서). 화면 표시만 막는 것 — + 작업 데이터 자체는 멤버가 원래 볼 수 있는 범위 그대로다. - **보드** — 섹션별 칸반. 섹션은 아사나처럼 **가로로 계속 늘어난다** — 화면을 넘치면 아래로 접히지 않고 보드가 가로로 스크롤된다(`.pj-board-canvas` = flex + `width:max-content`, 막대는 `attachHScrollIndicator` 가 직접 그린다. 예전 매이슨리 절대배치는 제거).