feat(project): workload as vertical bars with task list drawer
Per assignee, main and subtask bars (height = count, green = done). Clicking a bar slides in a right-side panel listing those tasks; clicking an item opens the task editor. Closing the editor refreshes the counts. Subtask summary API now returns id, title, due date. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
+144
-40
@@ -5816,60 +5816,164 @@
|
||||
.finally(function () { workloadCache.pending = null; });
|
||||
return workloadCache.pending;
|
||||
}
|
||||
// ── 담당자별 업무 목록 — 오른쪽에서 밀려 나오는 패널(body 에 붙음). 항목을 누르면 작업 편집 창(openTaskById).
|
||||
// 하위 작업은 화면 목록에 없으니 openTaskById 가 서버에서 받아 연다. 편집 창을 닫으면 대시보드·패널을 다시 그린다.
|
||||
let wlDrawer = null;
|
||||
function closeWorkloadDrawer() {
|
||||
if (!wlDrawer) return;
|
||||
const d = wlDrawer;
|
||||
wlDrawer = null;
|
||||
d.classList.remove("is-open");
|
||||
document.removeEventListener("keydown", onWorkloadKey, true);
|
||||
setTimeout(function () { d.remove(); }, 260);
|
||||
}
|
||||
function onWorkloadKey(e) {
|
||||
if (e.key === "Escape" && taskModal && taskModal.hidden) { e.stopPropagation(); closeWorkloadDrawer(); }
|
||||
}
|
||||
function openWorkloadDrawer(person, kind, items, isSub) {
|
||||
closeWorkloadDrawer();
|
||||
const done = items.filter(function (t) { return t.completed_at || t.done; });
|
||||
const open = items.filter(function (t) { return !(t.completed_at || t.done); });
|
||||
const d = document.createElement("div");
|
||||
d.className = "pj-wl-drawer";
|
||||
d.innerHTML = '<div class="pj-wl-drawer-dim"></div><aside class="pj-wl-panel" role="dialog" aria-label="업무 목록">' +
|
||||
'<header><div><b></b><small></small></div><button type="button" class="pj-icon-btn" data-act="close" title="닫기">' +
|
||||
'<span class="material-symbols-outlined">close</span></button></header><div class="pj-wl-panel-body"></div></aside>';
|
||||
d.querySelector("header b").textContent = person + " · " + kind + " 작업";
|
||||
d.querySelector("header small").textContent = "완료 " + done.length + " / " + items.length + (items.length ? " (" + Math.round(done.length / items.length * 100) + "%)" : "");
|
||||
const body = d.querySelector(".pj-wl-panel-body");
|
||||
const sortKey = function (t) { return (t.due_date || "9999") + (t.title || ""); };
|
||||
[["미완료", open], ["완료", done]].forEach(function (g) {
|
||||
if (!g[1].length) return;
|
||||
const h = document.createElement("div");
|
||||
h.className = "pj-wl-panel-group";
|
||||
h.textContent = g[0] + " " + g[1].length;
|
||||
body.appendChild(h);
|
||||
g[1].slice().sort(function (a, b) { return sortKey(a) < sortKey(b) ? -1 : 1; }).forEach(function (t) {
|
||||
const btn = document.createElement("button");
|
||||
btn.type = "button";
|
||||
btn.className = "pj-wl-item" + ((t.completed_at || t.done) ? " is-done" : "");
|
||||
btn.innerHTML = '<span class="material-symbols-outlined">' + ((t.completed_at || t.done) ? "check_circle" : "radio_button_unchecked") + "</span>" +
|
||||
'<span class="pj-wl-item-main"><span class="pj-wl-item-title"></span><small></small></span><em></em>';
|
||||
btn.querySelector(".pj-wl-item-title").textContent = t.title || "(제목 없음)";
|
||||
const parent = isSub && seenTask(t.parent_task_id);
|
||||
btn.querySelector("small").textContent = parent ? "상위: " + (parent.title || "") : (t.stage_name || "");
|
||||
btn.querySelector("em").textContent = t.due_date ? fmtShortDate(t.due_date) : "";
|
||||
btn.addEventListener("click", function () { openTaskById(t.id); });
|
||||
body.appendChild(btn);
|
||||
});
|
||||
});
|
||||
if (!items.length) body.innerHTML = "<div class='pj-empty-sm'>작업이 없습니다.</div>";
|
||||
d.addEventListener("click", function (e) {
|
||||
if (e.target.closest('[data-act="close"]') || e.target.classList.contains("pj-wl-drawer-dim")) closeWorkloadDrawer();
|
||||
});
|
||||
document.body.appendChild(d);
|
||||
wlDrawer = d;
|
||||
wlDrawer.dataset.person = person; wlDrawer.dataset.kind = kind;
|
||||
document.addEventListener("keydown", onWorkloadKey, true);
|
||||
watchTaskModalForWorkload();
|
||||
requestAnimationFrame(function () { requestAnimationFrame(function () { d.classList.add("is-open"); }); });
|
||||
}
|
||||
function seenTask(id) {
|
||||
return tasks.find(function (x) { return x.id === id; }) || null;
|
||||
}
|
||||
function fmtShortDate(iso) {
|
||||
const m = String(iso).slice(0, 10).split("-");
|
||||
return m.length === 3 ? parseInt(m[1], 10) + "/" + parseInt(m[2], 10) : "";
|
||||
}
|
||||
// 편집 창을 닫으면(hidden) 하위 작업 요약을 새로 받아 대시보드·열린 패널을 다시 그린다.
|
||||
// taskModal 은 이 함수 아래쪽에서 정의되므로 처음 패널을 열 때 연결한다.
|
||||
let wlWatching = false;
|
||||
function watchTaskModalForWorkload() {
|
||||
if (wlWatching || !taskModal) return;
|
||||
wlWatching = true;
|
||||
new MutationObserver(function () {
|
||||
if (!taskModal.hidden || !wlDrawer) return;
|
||||
const person = wlDrawer.dataset.person, kind = wlDrawer.dataset.kind;
|
||||
loadWorkloadSubtasks(true).then(function () {
|
||||
if (!wlDrawer) return;
|
||||
renderDashboard();
|
||||
const bar = Array.from(document.querySelectorAll("#pj-dash .pj-wl-group")).find(function (g) {
|
||||
return g.querySelector(".pj-wl-name b").textContent === person;
|
||||
});
|
||||
const col = bar && bar.querySelector(kind === "메인" ? ".pj-wl-col.is-main" : ".pj-wl-col.is-sub");
|
||||
if (col && !col.disabled) col.click(); else closeWorkloadDrawer();
|
||||
}).catch(function () {});
|
||||
}).observe(taskModal, { attributes: true, attributeFilter: ["hidden"] });
|
||||
}
|
||||
|
||||
function paintWorkload(box) {
|
||||
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,
|
||||
main: 0, mainDone: 0, sub: 0, subDone: 0 };
|
||||
mains: [], subs: [] };
|
||||
return rows[k];
|
||||
}
|
||||
const mains = scopeTasks().filter(function (t) {
|
||||
if (t.parent_task_id || seen[t.id]) return false;
|
||||
seen[t.id] = true; return true;
|
||||
});
|
||||
mains.forEach(function (t) {
|
||||
const r = row(t.assignee_email, t.assignee_name);
|
||||
r.main++; if (t.completed_at) r.mainDone++;
|
||||
seen[t.id] = t; return true;
|
||||
});
|
||||
mains.forEach(function (t) { row(t.assignee_email, t.assignee_name).mains.push(t); });
|
||||
// 세로 막대(다른 대시보드 그래프와 같은 모양) — 사람마다 메인·하위 두 막대, 높이 = 작업 수, 아래 초록 = 완료.
|
||||
// 막대를 누르면 오른쪽 패널에 그 업무 목록(openWorkloadDrawer).
|
||||
function draw(subs) {
|
||||
Object.keys(rows).forEach(function (k) { rows[k].sub = 0; rows[k].subDone = 0; });
|
||||
(subs || []).forEach(function (s) {
|
||||
if (!seen[s.parent_task_id]) return; // 이 범위의 메인 작업에 딸린 하위 작업만
|
||||
const r = row(s.assignee_email, s.assignee_name);
|
||||
r.sub++; if (s.done) r.subDone++;
|
||||
Object.keys(rows).forEach(function (k) { rows[k].subs = []; });
|
||||
(subs || []).forEach(function (st) {
|
||||
if (!seen[st.parent_task_id]) return; // 이 범위의 메인 작업에 딸린 하위 작업만
|
||||
row(st.assignee_email, st.assignee_name).subs.push(st);
|
||||
});
|
||||
const doneOf = function (list) { return list.filter(function (t) { return t.completed_at || t.done; }).length; };
|
||||
const list = Object.keys(rows).map(function (k) { return rows[k]; })
|
||||
.filter(function (r) { return r.main + r.sub > 0; })
|
||||
.sort(function (a, b) { return (a.none - b.none) || ((b.main + b.sub) - (a.main + a.sub)) || a.label.localeCompare(b.label); });
|
||||
if (!list.length) { box.innerHTML = "<div class='pj-empty-sm'>배정된 작업이 없습니다.</div>"; return; }
|
||||
const total = list.reduce(function (t, r) {
|
||||
return { main: t.main + r.main, mainDone: t.mainDone + r.mainDone, sub: t.sub + r.sub, subDone: t.subDone + r.subDone };
|
||||
}, { main: 0, mainDone: 0, sub: 0, subDone: 0 });
|
||||
function bar(done, all) {
|
||||
const pct = all ? Math.round(done / all * 100) : 0;
|
||||
return '<div class="pj-wl-bar" title="완료 ' + done + ' / ' + all + '"><i style="width:' + pct + '%"></i></div>';
|
||||
}
|
||||
function cell(done, all) {
|
||||
return '<td class="pj-wl-num">' + (all ? bar(done, all) + '<span><b>' + done + "</b> / " + all + "</span>" : '<span class="pj-muted">—</span>') + "</td>";
|
||||
}
|
||||
function tr(r, cls) {
|
||||
const all = r.main + r.sub, done = r.mainDone + r.subDone, pct = all ? Math.round(done / all * 100) : 0;
|
||||
return '<tr class="' + (cls || "") + '"><th>' + escapeHtml(r.label) + "</th>" +
|
||||
'<td class="pj-wl-cnt">' + r.main + "</td>" + '<td class="pj-wl-cnt">' + r.sub + "</td>" +
|
||||
'<td class="pj-wl-cnt"><b>' + all + "</b></td>" +
|
||||
cell(r.mainDone, r.main) + cell(r.subDone, r.sub) +
|
||||
'<td class="pj-wl-num pj-wl-all">' + bar(done, all) + "<span><b>" + done + "</b> / " + all +
|
||||
' <em class="' + (pct >= 100 ? "is-good" : "") + '">' + pct + "%</em></span></td></tr>";
|
||||
}
|
||||
box.innerHTML = '<table class="pj-wl-table"><thead><tr><th>담당자</th><th>메인 작업</th><th>하위 작업</th><th>전체</th>' +
|
||||
"<th>메인 완료</th><th>하위 완료</th><th>전체 완료(완료율)</th></tr></thead><tbody>" +
|
||||
list.map(function (r) { return tr(r); }).join("") + "</tbody><tfoot>" +
|
||||
tr(Object.assign({ label: "합계" }, total), "pj-wl-total") + "</tfoot></table>";
|
||||
requestAnimationFrame(function () { // 막대는 0 에서 늘어나게
|
||||
box.querySelectorAll(".pj-wl-bar i").forEach(function (i) {
|
||||
const w = i.style.width; i.style.width = "0"; requestAnimationFrame(function () { i.style.width = w; });
|
||||
.filter(function (r) { return r.mains.length + r.subs.length > 0; })
|
||||
.sort(function (a, b) {
|
||||
return (a.none - b.none) || ((b.mains.length + b.subs.length) - (a.mains.length + a.subs.length)) || a.label.localeCompare(b.label);
|
||||
});
|
||||
if (!list.length) { box.innerHTML = "<div class='pj-empty-sm'>배정된 작업이 없습니다.</div>"; return; }
|
||||
const max = Math.max.apply(null, list.map(function (r) { return Math.max(r.mains.length, r.subs.length); }).concat([1]));
|
||||
const allTotal = list.reduce(function (n, r) { return n + r.mains.length + r.subs.length; }, 0);
|
||||
const allDone = list.reduce(function (n, r) { return n + doneOf(r.mains) + doneOf(r.subs); }, 0);
|
||||
box.innerHTML = '<div class="pj-wl-legend"><span><i class="is-done"></i>완료</span><span><i class="is-open"></i>미완료</span>' +
|
||||
'<span class="pj-wl-sum">전체 완료 <b>' + allDone + "</b> / " + allTotal + " (" + (allTotal ? Math.round(allDone / allTotal * 100) : 0) + "%)</span>" +
|
||||
'<span class="pj-wl-hint">막대를 누르면 업무 목록</span></div><div class="pj-wl-bars"></div>';
|
||||
const wrap = box.querySelector(".pj-wl-bars");
|
||||
const tooltip = dashTooltip();
|
||||
list.forEach(function (r) {
|
||||
const group = document.createElement("div");
|
||||
group.className = "pj-wl-group";
|
||||
const all = r.mains.length + r.subs.length, done = doneOf(r.mains) + doneOf(r.subs);
|
||||
const pair = document.createElement("div");
|
||||
pair.className = "pj-wl-pair";
|
||||
[["main", "메인", r.mains], ["sub", "하위", r.subs]].forEach(function (k) {
|
||||
const items = k[2], n = items.length, d = doneOf(items);
|
||||
const col = document.createElement("button");
|
||||
col.type = "button";
|
||||
col.className = "pj-wl-col is-" + k[0];
|
||||
col.disabled = !n;
|
||||
col.innerHTML = '<span class="pj-wl-val">' + (n ? d + "/" + n : "0") + "</span>" +
|
||||
'<span class="pj-wl-track"><span class="pj-wl-stack"><i class="pj-wl-open"></i><i class="pj-wl-done"></i></span></span>' +
|
||||
'<span class="pj-wl-kind">' + k[1] + "</span>";
|
||||
const stack = col.querySelector(".pj-wl-stack");
|
||||
stack.querySelector(".pj-wl-done").style.flexGrow = d;
|
||||
stack.querySelector(".pj-wl-open").style.flexGrow = n - d;
|
||||
const h = (n ? Math.max(8, Math.round(n / max * 100)) : 0) + "%"; // 작업이 적어도 보이게 최소 8%
|
||||
requestAnimationFrame(function () { requestAnimationFrame(function () { stack.style.height = h; }); });
|
||||
const tipLabel = r.label + " · " + k[1] + " 작업 (완료 " + d + " / " + n + ")";
|
||||
col.addEventListener("mouseenter", function () { if (n) tooltip.show(col, tipLabel, d + "/" + n); });
|
||||
col.addEventListener("mouseleave", tooltip.hide);
|
||||
col.addEventListener("click", function () {
|
||||
tooltip.hide();
|
||||
openWorkloadDrawer(r.label, k[1], items, k[0] === "sub");
|
||||
});
|
||||
pair.appendChild(col);
|
||||
});
|
||||
group.appendChild(pair);
|
||||
const name = document.createElement("div");
|
||||
name.className = "pj-wl-name";
|
||||
name.innerHTML = "<b></b><small>" + done + "/" + all + " · " + (all ? Math.round(done / all * 100) : 0) + "%</small>";
|
||||
name.querySelector("b").textContent = r.label;
|
||||
group.appendChild(name);
|
||||
wrap.appendChild(group);
|
||||
});
|
||||
}
|
||||
if (workloadCache.subtasks && workloadCache.scope === viewScope) draw(workloadCache.subtasks);
|
||||
|
||||
Reference in New Issue
Block a user