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 = '