feat(project): 보드 메인 업무 추가 카드에 협업자 아이콘(담당자 옆)

- 고른 협업자는 만들 때 followers 로 같이 저장, 담당자는 후보에서 빼고 담당자로 고르면 협업자에서 뺌

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-10-13 14:40:17 +09:00
parent 4d3b747ab7
commit deb5bfb9a1
13 changed files with 67 additions and 24 deletions
@@ -2,7 +2,7 @@
{% block head_extra %}
{# 프로젝트 화면 부품(설명 편집기·날짜 팝업·멤버 고르기)을 그대로 쓴다 — project.js 는 PJ_LIB_ONLY 로 부품만 #}
<link rel="stylesheet" href="/static/project.css?v=20261013e" />
<link rel="stylesheet" href="/static/project.css?v=20261013f" />
<link rel="stylesheet" href="/static/vendor/material-symbols/material-symbols.css" />
<script>window.PJ_LIB_ONLY = true; window.PJ_HOLIDAYS = {{ (pj_kr_holidays or {}) | tojson }};</script>
{% endblock %}
@@ -64,7 +64,7 @@
</section>
</div>
<script>window.NTC_PEOPLE = {{ people | tojson }};</script>
<script src="/static/project.js?v=20261013e" defer></script>
<script src="/static/project.js?v=20261013f" defer></script>
<script src="/static/erp-notice-admin.js?v=20261012b" defer></script>
{% endif %}
{% endblock %}
@@ -1,7 +1,7 @@
{% extends "project/_meeting_content_base.html" if meeting_embedded else "erp_base.html" %}
{% block head_extra %}
<link rel="stylesheet" href="/static/project.css?v=20261013e" />
<link rel="stylesheet" href="/static/project.css?v=20261013f" />
<link rel="stylesheet" href="/static/vendor/material-symbols/material-symbols.css" />
{% endblock %}
@@ -298,5 +298,5 @@
<script src="/static/project-goal-text.js?v=20261003d" defer></script>
<script src="/static/project-meeting-cells.js?v=20261012a" defer></script>
<script src="/static/project.js?v=20261013e" defer></script>
<script src="/static/project.js?v=20261013f" defer></script>
{% endblock %}
@@ -1,7 +1,7 @@
{% extends "erp_base.html" %}
{% block head_extra %}
<link rel="stylesheet" href="/static/project.css?v=20261013e" />
<link rel="stylesheet" href="/static/project.css?v=20261013f" />
<link rel="stylesheet" href="/static/vendor/material-symbols/material-symbols.css" />
{% endblock %}
@@ -207,5 +207,5 @@
{% include "project/_member_tasks_modal.html" %}
<script src="/static/project-goal-text.js?v=20261003d" defer></script>
<script src="/static/project.js?v=20261013e" defer></script>
<script src="/static/project.js?v=20261013f" defer></script>
{% endblock %}
@@ -1,7 +1,7 @@
{% extends "erp_base.html" %}
{% block head_extra %}
<link rel="stylesheet" href="/static/project.css?v=20261013e" />
<link rel="stylesheet" href="/static/project.css?v=20261013f" />
<link rel="stylesheet" href="/static/project-help.css?v=20261003a" />
<link rel="stylesheet" href="/static/vendor/material-symbols/material-symbols.css" />
{% endblock %}
@@ -1,7 +1,7 @@
{% extends "erp_base.html" %}
{% block head_extra %}
<link rel="stylesheet" href="/static/project.css?v=20261013e" />
<link rel="stylesheet" href="/static/project.css?v=20261013f" />
<link rel="stylesheet" href="/static/vendor/material-symbols/material-symbols.css" />
{% endblock %}
@@ -102,5 +102,5 @@
{% include "project/_side_modals.html" %}
{% include "project/_member_tasks_modal.html" %}
<script src="/static/project.js?v=20261013e" defer></script>
<script src="/static/project.js?v=20261013f" defer></script>
{% endblock %}
@@ -1,7 +1,7 @@
{% extends "erp_base.html" %}
{% block head_extra %}
<link rel="stylesheet" href="/static/project.css?v=20261013e" />
<link rel="stylesheet" href="/static/project.css?v=20261013f" />
<link rel="stylesheet" href="/static/vendor/material-symbols/material-symbols.css" />
{% endblock %}
@@ -100,5 +100,5 @@
"today": {{ today | tojson }}
}
</script>
<script src="/static/project.js?v=20261013e" defer></script>
<script src="/static/project.js?v=20261013f" defer></script>
{% endblock %}
@@ -1,7 +1,7 @@
{% extends "erp_base.html" %}
{% block head_extra %}
<link rel="stylesheet" href="/static/project.css?v=20261013e" />
<link rel="stylesheet" href="/static/project.css?v=20261013f" />
<link rel="stylesheet" href="/static/vendor/material-symbols/material-symbols.css" />
{% endblock %}
@@ -108,5 +108,5 @@
});
})();
</script>
<script src="/static/project.js?v=20261013e" defer></script>
<script src="/static/project.js?v=20261013f" defer></script>
{% endblock %}
@@ -1,7 +1,7 @@
{% extends "erp_base.html" %}
{% block head_extra %}
<link rel="stylesheet" href="/static/project.css?v=20261013e" />
<link rel="stylesheet" href="/static/project.css?v=20261013f" />
<!-- 구글 머티리얼 심볼(담당자 아이콘 등) — self-host -->
<link rel="stylesheet" href="/static/vendor/material-symbols/material-symbols.css" />
<!-- 타임라인 vis-timeline — self-host -->
@@ -470,5 +470,5 @@
</script>
<script src="/static/vendor/vis-timeline/vis-timeline-graph2d.min.js"></script>
<script src="/static/project.js?v=20261013e" defer></script>
<script src="/static/project.js?v=20261013f" defer></script>
{% endblock %}
@@ -1,7 +1,7 @@
{% extends "erp_base.html" %}
{% block head_extra %}
<link rel="stylesheet" href="/static/project.css?v=20261013e" />
<link rel="stylesheet" href="/static/project.css?v=20261013f" />
<link rel="stylesheet" href="/static/vendor/material-symbols/material-symbols.css" />
{% endblock %}
@@ -70,5 +70,5 @@
{% include "project/_side_modals.html" %}
{% include "project/_member_tasks_modal.html" %}
<script src="/static/project.js?v=20261013e" defer></script>
<script src="/static/project.js?v=20261013f" defer></script>
{% endblock %}
+2
View File
@@ -444,6 +444,8 @@ html.pj-side-resizing, html.pj-side-resizing * { cursor: col-resize !important;
}
.pj-tasknew-meta button:hover { background: #f1f2f4; }
.pj-tasknew-meta .pj-avatar { width: 20px; height: 20px; }
.pj-tasknew-meta .pj-tasknew-fol { gap: 1px; padding: 0 2px; border-radius: 12px; }
.pj-tasknew-meta .pj-tasknew-fol .pj-gicon { font-size: 20px; }
.pj-tasknew[aria-busy="true"] { opacity: .65; }
/* 하위 업무 한 줄 드래그 — 끄는 줄은 흐리게, 놓을 수 있는 카드는 보라 테두리 */
.pj-card-sub[draggable="true"] .pj-card-sub-title { cursor: grab; }
+35 -5
View File
@@ -4938,13 +4938,17 @@
'<div class="pj-tasknew-name"><span class="material-symbols-outlined pj-tasknew-check">check_circle</span>' +
'<input type="text" class="pj-tasknew-title" placeholder="업무 이름 입력" aria-label="업무 이름" autocomplete="off"></div>' +
'<div class="pj-tasknew-meta"><button type="button" class="pj-tasknew-assignee" aria-label="담당자 지정"></button>' +
// 협업자 — 담당자 옆(2026-10-13). 고른 사람은 만들 때 followers 로 같이 보낸다(담당자는 협업자가 아니라 후보에서 뺀다).
'<button type="button" class="pj-tasknew-fol" aria-label="협업자 지정"></button>' +
'<button type="button" class="pj-tasknew-due" aria-label="마감일 지정"></button></div>';
body.appendChild(card);
const inp = card.querySelector(".pj-tasknew-title");
const av = card.querySelector(".pj-tasknew-assignee");
const fol = card.querySelector(".pj-tasknew-fol");
const due = card.querySelector(".pj-tasknew-due");
if (!draft.followers) draft.followers = [];
inp.value = draft.title;
inp.disabled = av.disabled = due.disabled = draft.saving;
inp.disabled = av.disabled = fol.disabled = due.disabled = draft.saving;
function current() { return boardTaskDrafts[stage.id] === draft && !accessLost; }
function refocus() { if (current() && inp.isConnected && !draft.saving) inp.focus(); }
function paintAv() {
@@ -4956,7 +4960,11 @@
due.innerHTML = di ? escapeHtml(di.text) : DUE_EMPTY_ICON_SVG;
due.title = draft.due || "마감일 지정";
}
paintAv(); paintDue();
function paintFol() {
fol.innerHTML = followerIconHtml(draft.followers);
fol.title = followerTip(draft.followers);
}
paintAv(); paintFol(); paintDue();
inp.addEventListener("input", function () { draft.title = inp.value; });
inp.addEventListener("focus", function () { draft.focused = true; });
inp.addEventListener("blur", function () { draft.focused = false; });
@@ -4973,11 +4981,32 @@
const r = av.getBoundingClientRect();
showContextMenu(r.left, r.bottom + 4, assigneeMenuItems(
list.map(function (m) { return m.user_email; }), draft.assignee,
function (email) { if (!current()) return; draft.assignee = email || ""; paintAv(); refocus(); }
function (email) {
if (!current()) return;
draft.assignee = email || "";
const a = draft.assignee.toLowerCase();
if (a) draft.followers = draft.followers.filter(function (x) { return x !== a; }); // 담당자는 협업자가 아니다
paintAv(); paintFol(); refocus();
}
));
} catch (err) { showToast("멤버 조회 실패: " + err.message, "error"); }
finally { draft.picking = false; }
});
fol.addEventListener("click", async function () {
draft.picking = true; // 멤버 조회 중에는 바깥 클릭으로 저장하지 않는다.
try {
const list = await membersOfProject(projectId);
if (!current() || !fol.isConnected) return;
openFollowerMenu(fol, list.map(function (m) { return m.user_email; }), function () { return draft.followers; },
function (em, on) {
if (!current()) return false;
draft.followers = on ? draft.followers.concat([em]) : draft.followers.filter(function (x) { return x !== em; });
paintFol();
return true;
}, function () { return draft.assignee; });
} catch (err) { showToast("멤버 조회 실패: " + err.message, "error"); }
finally { draft.picking = false; }
});
due.addEventListener("click", function () {
openDatePopover(due, {
due: draft.due, allowStart: false,
@@ -4995,19 +5024,20 @@
const title = draft.title.trim();
if (!title) return;
draft.saving = true;
inp.disabled = av.disabled = due.disabled = true;
inp.disabled = av.disabled = fol.disabled = due.disabled = true;
card.setAttribute("aria-busy", "true");
try {
const res = await api("POST", "/project/api/projects/" + projectId + "/tasks", {
title: title, stage_id: stage.id,
assignee_email: draft.assignee, assignee_name: draft.assignee ? idOf(draft.assignee) : "",
due_date: draft.due || null,
followers: draft.followers,
});
if (!current()) return;
mergeTask(res.task);
if (keepOpen) {
boardTaskDrafts[stage.id] = {
title: "", assignee: stage.default_assignee_email || "", due: null, focused: true, saving: false,
title: "", assignee: stage.default_assignee_email || "", followers: [], due: null, focused: true, saving: false,
};
} else delete boardTaskDrafts[stage.id];
refreshActiveView();
+1
View File
@@ -1270,6 +1270,7 @@ Windows 트레이 프로그램 **DBX 알림**(`desktop/notifier/`, C# .NET Frame
만든 뒤 자동 협업자(만든 사람·담당자)와 함께 `_follow`. 화면:
· 업무 창 세부 업무 추가 칸 — 담당자 오른쪽 **[협업자 없음 / 협업자 N명]** 버튼(`#pj-subtask-add-followers`), [추가] 뒤·다른 업무를 열면 비움.
· 보드 카드 "+ 세부 업무 추가" 새 줄 — 담당자 오른쪽 협업자 아이콘(`.pj-card-subnew-fol`, 초안 `followers`). 협업자만 고른 줄은 바깥 클릭으로 닫히지 않는다.
· 보드 "+ 메인 업무 추가" 입력 카드 — 담당자 옆 협업자 아이콘(`.pj-tasknew-fol`, 초안 `followers`, 담당자는 후보에서 빠지고 담당자로 고르면 협업자에서 빠짐).
- **이미 있는 세부 업무** — 업무 창 줄(`.pj-subtask-fol`, 6-16)은 비어 있어도 늘 옅게 보이게(예전엔 마우스를 올릴 때만), 보드 카드 펼친 세부 업무 줄에도
협업자 아이콘(`.pj-card-sub-fol`, 편집 권한자, 비어 있으면 줄 hover 때만). 셋 다 공용 `openFollowerMenu`(멤버 메뉴, 협업자 ✓, 고를 때마다
같은 자리에 다시 열려 여러 명) · `followerIconHtml` · `setTaskFollower`.
+12 -2
View File
@@ -434,7 +434,16 @@ function titleVal(d) { return d.getElementById("pj-t-title").value; }
env.route("POST", /projects\/1\/tasks$/, function () { return pending.promise; });
d.querySelector('.pj-col[data-stage-id="11"] .pj-col-addtask').click(); await wait(10);
let input = d.querySelector(".pj-tasknew-title");
check("[board] 추가는 상세창 대신 이름·담당자·마감일 카드", input && d.getElementById("pj-modal-task").hidden && d.querySelectorAll(".pj-tasknew input").length === 1 && d.querySelectorAll(".pj-tasknew-meta button").length === 2);
check("[board] 추가는 상세창 대신 이름·담당자·협업자·마감일 카드", input && d.getElementById("pj-modal-task").hidden && d.querySelectorAll(".pj-tasknew input").length === 1 &&
Array.from(d.querySelectorAll(".pj-tasknew-meta button")).map(function (b) { return b.className; }).join(",") === "pj-tasknew-assignee,pj-tasknew-fol,pj-tasknew-due");
// 협업자(담당자 옆) — 고르면 아이콘이 바뀌고, 만들 때 followers 로 같이 보낸다
d.querySelector(".pj-tasknew-fol").click(); await settle();
const folPick = Array.from(d.querySelectorAll(".pj-ctxmenu-item")).find(function (b) { return /me/i.test(b.textContent); });
if (folPick) folPick.click();
await settle();
d.dispatchEvent(new w.KeyboardEvent("keydown", { key: "Escape", bubbles: true })); await settle();
input = d.querySelector(".pj-tasknew-title");
check("[board] 협업자 고르면 카드에 표시", !!folPick && /협업자: Me/i.test(d.querySelector(".pj-tasknew-fol").title), d.querySelector(".pj-tasknew-fol").title);
input.value = "간단한 새 작업"; input.dispatchEvent(new w.Event("input"));
input.dispatchEvent(new w.KeyboardEvent("keydown", { key: "Enter", isComposing: true, bubbles: true })); await settle();
input.dispatchEvent(new w.KeyboardEvent("keydown", { key: "Enter", keyCode: 229, bubbles: true })); await settle();
@@ -447,7 +456,8 @@ function titleVal(d) { return d.getElementById("pj-t-title").value; }
input = d.querySelector(".pj-tasknew-title");
input.dispatchEvent(new w.KeyboardEvent("keydown", { key: "Enter", bubbles: true })); await settle();
check("[board] 보드 다시 그리는 중에도 저장 상태 유지", input.disabled && input.value === "간단한 새 작업" && posts().length === 1);
check("[board] 생성 요청은 현재 섹션과 세 필드만", Object.keys(posts()[0].body).sort().join(",") === "assignee_email,assignee_name,due_date,stage_id,title" && posts()[0].body.stage_id === 11);
check("[board] 생성 요청은 현재 섹션과 이름·담당자·협업자·마감일만", Object.keys(posts()[0].body).sort().join(",") === "assignee_email,assignee_name,due_date,followers,stage_id,title" &&
posts()[0].body.stage_id === 11 && JSON.stringify(posts()[0].body.followers) === '["me@test.local"]', posts()[0].body);
pending.resolve({ body: { task: detail(801, "간단한 새 작업") } }); await settle(); await wait(10);
check("[board] Enter 저장 후 새 카드와 다음 빈 입력 유지", !!d.querySelector('.pj-card[data-task-id="801"]') && d.querySelector(".pj-tasknew-title").value === "");
input = d.querySelector(".pj-tasknew-title");