@@ -487,5 +487,5 @@
-
+
{% endblock %}
diff --git a/app/modules/project/templates/project/trash.html b/app/modules/project/templates/project/trash.html
index 32f1381..9cc54f6 100644
--- a/app/modules/project/templates/project/trash.html
+++ b/app/modules/project/templates/project/trash.html
@@ -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 8aaf055..8964e8b 100644
--- a/app/static/project.css
+++ b/app/static/project.css
@@ -2512,7 +2512,16 @@ html.pj-goal-selecting, html.pj-goal-selecting * { user-select: none !important;
.pj-meet-kpiline .pj-meet-kpi-rate { color: inherit; font-weight: 700; }
/* ③ 작업 등록 표 — 빈 칸을 누르면 목록(body 에 붙는 메뉴) */
.pj-meet-quick-table { width: 100%; border-collapse: collapse; table-layout: fixed; font-size: 12.5px; }
-.pj-meet-quick-table th { position: sticky; top: 0; z-index: 1; background: #f7f8f9; padding: 4px 6px; font-size: 11.5px; font-weight: 600; color: var(--pj-ink-soft); text-align: left; border-bottom: 1px solid var(--pj-border); }
+.pj-meet-quick-table th { position: sticky; top: 0; z-index: 1; background: #f7f8f9; padding: 4px 6px; font-size: 12px; font-weight: 700; color: var(--pj-ink); text-align: center; border-bottom: 1px solid var(--pj-border); }
+.pj-meet-pick-cell.is-person { display: flex; align-items: center; gap: 6px; }
+.pj-meet-pick-cell.is-person > span { min-width: 0; overflow: hidden; text-overflow: ellipsis; }
+.pj-meet-quick-face { width: 18px; height: 18px; flex: none; border-radius: 50%; object-fit: cover; }
+.pj-meet-quick-face.is-ini {
+ display: inline-flex; align-items: center; justify-content: center; background: var(--pj-accent-tint); color: var(--pj-accent-dark);
+ font-size: 10.5px; font-weight: 700;
+}
+.pj-ctxmenu-ic .pj-meet-quick-face { width: 20px; height: 20px; }
+.pj-member-pick.is-owner { opacity: .75; }
.pj-meet-quick-table th:nth-child(1) { width: 34%; }
.pj-meet-quick-table th:nth-child(2) { width: 17%; }
.pj-meet-quick-table th:nth-child(3) { width: 20%; }
diff --git a/app/static/project.js b/app/static/project.js
index 48e79e4..0749898 100644
--- a/app/static/project.js
+++ b/app/static/project.js
@@ -7178,6 +7178,9 @@
}).observe(taskModal, { attributes: true, attributeFilter: ["hidden"] });
}
+ // ── 멤버 배정·제외(2026-10-07) — 후보 전원을 보여 주고 지금 멤버는 체크된 채로. 체크 = 배정, 체크 해제 = 제외.
+ // 소유자는 늘 권한이 있어 뺄 수 없다(체크·잠금). 권한을 잃어 후보에 없는 지금 멤버도 보여서 뺄 수 있게.
+ const lowerEmail = function (e) { return String(e || "").toLowerCase(); };
const addMemberBtn = el("pj-add-member");
if (addMemberBtn) addMemberBtn.addEventListener("click", async function () {
const box = el("pj-m-users");
@@ -7185,11 +7188,26 @@
box.innerHTML = "불러오는 중…";
try {
const res = await api("GET", "/project/api/assignable-users");
- const existing = new Set(members.map(function (m) { return m.user_email; }));
- const candidates = res.users.filter(function (u) { return !existing.has(u.email); });
- box.innerHTML = candidates.length
- ? candidates.map(memberPickHtml).join("")
- : "
";
+ const owner = lowerEmail(currentProject && currentProject.owner_email);
+ const current = new Set(members.map(function (m) { return lowerEmail(m.user_email); }));
+ const seen = new Set();
+ const list = (res.users || []).map(function (u) { seen.add(lowerEmail(u.email)); return u; });
+ members.forEach(function (m) { // 후보 목록에 없는 지금 멤버(권한을 잃은 사람 등)
+ const e = lowerEmail(m.user_email);
+ if (!seen.has(e)) list.push({ email: e, id: idOf(e), name: m.user_name || idOf(e), avatar: "" });
+ });
+ if (!list.length) { box.innerHTML = "
"; return; }
+ box.innerHTML = list.map(memberPickHtml).join("");
+ box.querySelectorAll("input[type=checkbox]").forEach(function (cb) {
+ const e = lowerEmail(cb.value);
+ cb.checked = current.has(e) || e === owner;
+ cb.dataset.was = cb.checked ? "1" : "";
+ if (e === owner) {
+ cb.disabled = true;
+ const lab = cb.closest("label");
+ if (lab) { lab.title = "소유자 — 뺄 수 없습니다"; lab.classList.add("is-owner"); }
+ }
+ });
} catch (e) {
box.innerHTML = "
";
}
@@ -7197,10 +7215,15 @@
const saveMemberBtn = el("pj-save-member");
if (saveMemberBtn) saveMemberBtn.addEventListener("click", async function () {
const box = el("pj-m-users");
- const checked = box ? Array.from(box.querySelectorAll("input[type=checkbox]:checked")) : [];
- if (!checked.length) { alert("직원을 선택하세요."); return; }
+ const boxes = box ? Array.from(box.querySelectorAll("input[type=checkbox]:not(:disabled)")) : [];
+ const toAdd = boxes.filter(function (cb) { return cb.checked && !cb.dataset.was; });
+ const toRemove = boxes.filter(function (cb) { return !cb.checked && cb.dataset.was; });
+ if (!toAdd.length && !toRemove.length) { closeModal(memberModal); return; }
+ if (toRemove.length && !(await confirm(toRemove.length + "명을 이 프로젝트에서 제외할까요? 제외되면 이 프로젝트를 볼 수 없습니다.",
+ { okText: "제외", cancelText: "취소" }))) return;
+ saveMemberBtn.disabled = true;
let failCount = 0;
- for (const cb of checked) {
+ for (const cb of toAdd) {
try {
const res = await api("POST", "/project/api/projects/" + projectId + "/members", {
user_email: cb.value, user_name: cb.dataset.name || "",
@@ -7208,9 +7231,17 @@
members.push(res.member);
} catch (e) { failCount++; }
}
+ for (const cb of toRemove) {
+ try {
+ await api("DELETE", "/project/api/projects/" + projectId + "/members/" + encodeURIComponent(cb.value));
+ for (let i = members.length - 1; i >= 0; i--) if (lowerEmail(members[i].user_email) === lowerEmail(cb.value)) members.splice(i, 1);
+ } catch (e) { failCount++; }
+ }
+ saveMemberBtn.disabled = false;
renderMemberList();
closeModal(memberModal);
- if (failCount) showToast(failCount + "명 배정 실패", "error");
+ if (failCount) showToast(failCount + "명 처리 실패", "error");
+ else showToast("멤버를 저장했습니다" + (toAdd.length ? " · 배정 " + toAdd.length + "명" : "") + (toRemove.length ? " · 제외 " + toRemove.length + "명" : ""));
});
// 최초 렌더 — 아사나처럼 프로젝트에 들어오면 보드(세션)가 기본 화면이다
@@ -10248,9 +10279,18 @@
const tbody = box.querySelector("tbody");
const wrap = document.querySelector(".pj-wrap");
const KEY = "pj_meet_quick:" + ((wrap && wrap.dataset.me) || "");
- const people = {};
- (window.PJ_MEET_MEMBERS || []).forEach(function (m) { people[String(m.email).toLowerCase()] = m.name; });
+ const people = {}, faces = {};
+ (window.PJ_MEET_MEMBERS || []).forEach(function (m) {
+ people[String(m.email).toLowerCase()] = m.name;
+ faces[String(m.email).toLowerCase()] = m.avatar || "";
+ });
const nameOf = function (email) { return people[String(email).toLowerCase()] || capName(idOf(email)); };
+ // 담당자 = 아이콘(사진, 없으면 첫 글자) + 이름
+ const faceHtml = function (email) {
+ const url = faces[String(email).toLowerCase()];
+ return url ? '
";
+ };
const blank = function () { return { title: "", assignee: "", projectId: null, projectName: "", stageId: null, stageName: "" }; };
let rows = [];
try { rows = (JSON.parse(localStorage.getItem(KEY) || "[]") || []).filter(function (r) { return r && !r.done; }); } catch (_) { rows = []; }
@@ -10289,7 +10329,10 @@
tbody.innerHTML = rows.map(function (r, i) {
return '
" +
' ' +
- "" + cell("assignee", r.assignee ? nameOf(r.assignee) : "", "담당자") + " " +
+ "" + (r.assignee
+ ? '' + faceHtml(r.assignee) +
+ "" + escapeHtml(nameOf(r.assignee)) + " "
+ : cell("assignee", "", "담당자")) + " " +
"" + cell("project", r.projectName, "프로젝트") + " " +
"" + cell("stage", r.stageName, "섹션") + " " +
"" + (r.done
@@ -10326,7 +10369,7 @@
: (window.PJ_MEET_MEMBERS || []).map(function (m) { return String(m.email).toLowerCase(); });
menuAt(btn, [{ label: "담당자 없음", icon: menuIcon("person_off"), checked: !r.assignee, onClick: function () { r.assignee = ""; save(); render(); } }, null]
.concat(emails.map(function (e) {
- return { label: nameOf(e), icon: menuIcon("person"), checked: r.assignee === e, onClick: function () { r.assignee = e; save(); render(); } };
+ return { label: nameOf(e), icon: faceHtml(e), checked: r.assignee === e, onClick: function () { r.assignee = e; save(); render(); } };
})));
}
async function pickStage(r, btn) {
diff --git a/docs/PROJECT_MODULE.md b/docs/PROJECT_MODULE.md
index 23960cc..d23cf76 100644
--- a/docs/PROJECT_MODULE.md
+++ b/docs/PROJECT_MODULE.md
@@ -248,7 +248,9 @@
좌측 "내 작업"는 접이식 패널이 아니라 `/project/` 로 가는 링크다.
**이 프로젝트의 멤버는 화면 위 제목 오른쪽**에 겹친 아바타로 둔다(`.pj-title-members`) —
마우스를 올리면 이름(`data-tip`, `initHoverTips` 가 위임 방식이라 동적 요소에도 붙는다),
- 클릭하면 그 사람이 이 프로젝트에서 맡은 작업 팝업, 우클릭(관리자)하면 제외, 옆 `+` 는 멤버 배정.
+ 클릭하면 그 사람이 이 프로젝트에서 맡은 작업 팝업, 우클릭(관리자)하면 제외, 옆 `+` 는 **멤버 배정·제외 창**(2026-10-07 —
+ 후보 전원 + 지금 멤버는 체크된 채, 체크 = 배정 `POST …/members`, 해제 = 제외 `DELETE …/members/{email}`(확인 뒤), 소유자는 잠금.
+ 두 API 모두 관리자 + 그 프로젝트 관리 권한(`_require_manage`)).
좌측 트리의 작업 클릭도 페이지 이동 없이 바로 팝업(이미 로드된 전체 작업 데이터 사용).
좌측 맨 위 **수신함**(미확인 @태그 배지)과 **내 작업**(접이식, 기본 접힘 — 작업을 고르면
팝업이 열리며 다시 접힌다)가 있다. 예전 화면 오른쪽에 항상 떠 있던 "내 작업" 패널은 없앴고
diff --git a/tests/js/project_ui.test.js b/tests/js/project_ui.test.js
index 677887e..e3b9eea 100644
--- a/tests/js/project_ui.test.js
+++ b/tests/js/project_ui.test.js
@@ -15,6 +15,7 @@ const WATCHDOG = setTimeout(function () { console.log("TIMEOUT — 어딘가에
const ROOT = path.join(__dirname, "..", "..");
const html = fs.readFileSync(path.join(__dirname, ".out", "project_render.html"), "utf8");
+const adminHtml = fs.readFileSync(path.join(__dirname, ".out", "project_admin_render.html"), "utf8");
const JS = fs.readFileSync(path.join(ROOT, "app", "static", "project.js"), "utf8");
const fails = [];
@@ -29,8 +30,8 @@ function deferred() {
return { promise: p, resolve: resolve, reject: reject };
}
-function makeEnv() {
- const dom = new JSDOM(html, { runScripts: "dangerously", pretendToBeVisual: true, url: "http://localhost/project/p/1" });
+function makeEnv(page) {
+ const dom = new JSDOM(page || html, { runScripts: "dangerously", pretendToBeVisual: true, url: "http://localhost/project/p/1" });
const w = dom.window, d = w.document;
w.__PJ_TEST__ = true;
w.HTMLDialogElement.prototype.showModal = function () { this.open = true; };
@@ -726,6 +727,29 @@ function titleVal(d) { return d.getElementById("pj-t-title").value; }
check("[대시보드 담당자별] 항목 → 작업 편집 창(하위 작업은 서버에서 받아)", !env.d.getElementById("pj-modal-task").hidden &&
env.d.getElementById("pj-t-title").value === "하위 2", env.d.getElementById("pj-t-title").value);
}
+ // ── 멤버 배정·제외 — 지금 멤버는 체크된 채로, 체크 = 배정 · 해제 = 제외(확인 뒤) ──
+ {
+ const env = makeEnv(adminHtml); baseRoutes(env);
+ env.route("GET", /\/project\/api\/assignable-users$/, function () { return { body: { users: [
+ { email: "me@test.local", id: "me", name: "Me", avatar: "" },
+ { email: "bob@test.local", id: "bob", name: "Bob", avatar: "" },
+ { email: "carol@test.local", id: "carol", name: "Carol", avatar: "" }] } }; });
+ const added = [], removed = [];
+ env.route("POST", /\/project\/api\/projects\/1\/members$/, function (u, body) { added.push(body.user_email); return { body: { member: { user_email: body.user_email } } }; });
+ env.route("DELETE", /\/project\/api\/projects\/1\/members\/.+$/, function (u) { removed.push(decodeURIComponent(u.split("/").pop())); return { body: { ok: true } }; });
+ await boot(env);
+ const d = env.d;
+ d.getElementById("pj-add-member").click(); await settle();
+ const box = function (e) { return d.querySelector('#pj-m-users input[value="' + e + '"]'); };
+ check("[멤버 배정·제외] 지금 멤버 체크·나머지 해제", box("bob@test.local").checked && box("me@test.local").checked && !box("carol@test.local").checked);
+ box("bob@test.local").checked = false; box("carol@test.local").checked = true;
+ env.setConfirm(true);
+ d.getElementById("pj-save-member").click(); await settle(); await wait(10); await settle();
+ check("[멤버 배정·제외] 체크 = 배정, 해제 = 제외(확인 뒤)", JSON.stringify(added) === '["carol@test.local"]' &&
+ JSON.stringify(removed) === '["bob@test.local"]' && env.confirms === 1, [added, removed, env.confirms]);
+ const shown = Array.from(d.querySelectorAll(".pj-tmember")).map(function (n) { return n.dataset.email; });
+ check("[멤버 배정·제외] 머리 멤버 아이콘 갱신", shown.indexOf("bob@test.local") < 0 && shown.indexOf("carol@test.local") >= 0, shown);
+ }
clearTimeout(WATCHDOG);
console.log(fails.length ? "\nFAILED: " + fails.join(", ") : "\nALL PASS");
process.exit(fails.length ? 1 : 0);
diff --git a/tests/js/render_project.py b/tests/js/render_project.py
index 471c073..647f188 100644
--- a/tests/js/render_project.py
+++ b/tests/js/render_project.py
@@ -50,8 +50,13 @@ def main() -> None:
jinja2.FileSystemLoader(os.path.join(ROOT, "app", "modules", "project", "templates")),
]))
env.globals["pj_kr_holidays"] = {}
+ for name, admin in (("project_render.html", False), ("project_admin_render.html", True)):
+ render_one(env, name, admin)
+
+
+def render_one(env, name: str, admin: bool) -> None:
html = env.get_template("project/project.html").render(
- user={"email": ME, "is_super_admin": False}, is_admin=False, can_manage=True,
+ user={"email": ME, "is_super_admin": False}, is_admin=admin, can_manage=True,
project=PROJECTS[0], current_project_id=1, stages=STAGES[1], tasks=TASKS,
members=[{"user_email": ME, "role": "member"}, {"user_email": "bob@test.local", "role": "member"}],
projects_meta=PROJECTS, nav_projects=PROJECTS, stages_by_project=STAGES, board_stage_names=["할 일", "완료"],
@@ -62,7 +67,7 @@ def main() -> None:
my_open_total=0, mention_unread=0,
)
os.makedirs(OUT_DIR, exist_ok=True)
- path = os.path.join(OUT_DIR, "project_render.html")
+ path = os.path.join(OUT_DIR, name)
io.open(path, "w", encoding="utf-8", newline="\n").write(html)
print("rendered:", path)