diff --git a/app/modules/project/templates/project/inbox.html b/app/modules/project/templates/project/inbox.html index 622122b..fe5f61b 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 %} @@ -98,5 +98,5 @@ {% 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 729ba0e..97dfe41 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 %} @@ -119,5 +119,5 @@ "today": {{ today | tojson }} } - + {% endblock %} diff --git a/app/modules/project/templates/project/project.html b/app/modules/project/templates/project/project.html index 7b8636d..23b209b 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 %} - + @@ -505,5 +505,5 @@ - + {% endblock %} diff --git a/app/static/project.css b/app/static/project.css index f2b94ea..0b87c9a 100644 --- a/app/static/project.css +++ b/app/static/project.css @@ -800,7 +800,14 @@ .pj-card-subtoggle-ic { display: block; margin-left: 3px; } .pj-card-subtoggle-caret { font-size: 18px; margin-left: -2px; transition: transform .12s; } .pj-card-subtoggle.is-open .pj-card-subtoggle-caret { transform: rotate(180deg); } -.pj-card-subs { margin: 10px -4px 0; border-top: 1px solid #eef0f2; } +/* 펼침 애니메이션 — grid 행 0fr→1fr 로 내용 높이만큼 부드럽게(높이 고정값 불필요) */ +.pj-card-subs-wrap { + display: grid; grid-template-rows: 0fr; margin-top: 0; opacity: 0; + transition: grid-template-rows .25s ease, margin-top .25s ease, opacity .2s ease; +} +.pj-card-subs-wrap.is-open { grid-template-rows: 1fr; margin-top: 10px; opacity: 1; } +.pj-card-subs { min-height: 0; overflow: hidden; margin: 0 -4px; border-top: 1px solid #eef0f2; } +@media (prefers-reduced-motion: reduce) { .pj-card-subs-wrap { transition: none; } } .pj-card-sub { display: flex; align-items: center; gap: 6px; min-height: 34px; padding: 2px 4px; border-bottom: 1px solid #eef0f2; font-size: 13px; color: var(--pj-ink); diff --git a/app/static/project.js b/app/static/project.js index 54a0a54..c40ce09 100644 --- a/app/static/project.js +++ b/app/static/project.js @@ -2638,22 +2638,28 @@ : "") + ""; } + // 하위 업무를 받아 캐시. 카드 숫자가 옛 값이면(팝업에서 하위 업무를 + // 추가·삭제) 맞춰 두고 true 를 돌려준다 — 그땐 보드를 다시 그려야 한다. + function loadCardSubs(t) { + return api("GET", "/project/api/tasks/" + t.id).then(function (res) { + // GET /api/tasks/{id} 응답은 {task: {..., subtasks: [...]}}. + const subs = (res && res.task && res.task.subtasks) || []; + subsCache[t.id] = subs; + const doneN = subs.filter(function (x) { return x.completed_at; }).length; + if (subs.length === (t.subtask_total || 0) && doneN === (t.subtask_done || 0)) return false; + t.subtask_total = subs.length; + t.subtask_done = doneN; + if (!subs.length) expandedSubs.delete(t.id); + return true; + }); + } function fillCardSubs(box, t) { const subs = subsCache[t.id]; if (!subs) { box.innerHTML = '
불러오는 중…
'; - api("GET", "/project/api/tasks/" + t.id).then(function (res) { - // GET /api/tasks/{id} 응답은 {task: {..., subtasks: [...]}}. - const subs = (res && res.task && res.task.subtasks) || []; - subsCache[t.id] = subs; - // 카드 숫자가 옛 값이면(팝업에서 하위 업무를 추가·삭제) 맞춰서 다시 그린다. - const doneN = subs.filter(function (x) { return x.completed_at; }).length; - if (subs.length !== (t.subtask_total || 0) || doneN !== (t.subtask_done || 0)) { - t.subtask_total = subs.length; - t.subtask_done = doneN; - if (!subs.length) expandedSubs.delete(t.id); - renderBoard(); - } else if (box.isConnected) fillCardSubs(box, t); + loadCardSubs(t).then(function (changed) { + if (changed) renderBoard(); + else if (box.isConnected) fillCardSubs(box, t); }).catch(function (e) { box.innerHTML = '
불러오기 실패: ' + escapeHtml(e.message) + "
"; }); @@ -2680,6 +2686,45 @@ }); } + // 카드 하위 업무 펼치기/접기 — 보드를 다시 그리지 않고 그 카드 안에서만 + // 높이를 애니메이션한다(아사나처럼 카드가 아래로 스르륵 늘어남). + // 펼칠 땐 목록을 먼저 받아 채운 뒤 펼친다 — "불러오는 중…"에서 목록으로 + // 바뀌며 높이가 한 번 더 튀지 않게. + function toggleCardSubs(card, t, tog) { + let wrap = card.querySelector(".pj-card-subs-wrap"); + if (expandedSubs.has(t.id)) { + expandedSubs.delete(t.id); + tog.classList.remove("is-open"); + if (wrap) { + wrap.classList.remove("is-open"); + wrap.addEventListener("transitionend", function (ev) { + if (ev.propertyName === "grid-template-rows" && !expandedSubs.has(t.id)) wrap.remove(); + }); + } + return; + } + expandedSubs.add(t.id); + tog.classList.add("is-open"); + loadCardSubs(t).then(function (changed) { // 펼칠 때마다 최신으로 + if (changed) { renderBoard(); return; } + if (!expandedSubs.has(t.id) || !card.isConnected) return; + wrap = card.querySelector(".pj-card-subs-wrap"); + if (!wrap) { + wrap = document.createElement("div"); + wrap.className = "pj-card-subs-wrap"; + wrap.innerHTML = '
'; + card.appendChild(wrap); + } + fillCardSubs(wrap.querySelector(".pj-card-subs"), t); + void wrap.offsetHeight; // 닫힌 상태(0fr)를 한 번 그린 뒤 여는 클래스를 붙여야 전환이 걸린다 + wrap.classList.add("is-open"); + }).catch(function (err) { + expandedSubs.delete(t.id); + tog.classList.remove("is-open"); + showToast("하위 업무를 불러오지 못했습니다: " + err.message, "error"); + }); + } + function taskCard(t) { const card = document.createElement("div"); card.className = "pj-card" + (t.completed_at ? " is-done" : ""); @@ -2721,16 +2766,19 @@ '" title="댓글 ' + t.comment_count + '개">' + cmtBadge(t) + "" : "") + "" + - (t.subtask_total && expandedSubs.has(t.id) ? '
' : ""); + // 펼침 영역 — 바깥(.pj-card-subs-wrap)이 grid 0fr↔1fr 로 높이를 + // 부드럽게 늘이고 줄인다(toggleCardSubs). 다시 그릴 땐 펼친 채로. + (t.subtask_total && expandedSubs.has(t.id) + ? '
' + : ""); const subsBox = card.querySelector(".pj-card-subs"); if (subsBox) fillCardSubs(subsBox, t); card.addEventListener("click", function (e) { // 하위 업무 펼치기/접기 — 보기 권한만 있어도 된다. - if (e.target.closest(".pj-card-subtoggle")) { + const tog = e.target.closest(".pj-card-subtoggle"); + if (tog) { e.stopPropagation(); - if (expandedSubs.has(t.id)) expandedSubs.delete(t.id); - else { expandedSubs.add(t.id); delete subsCache[t.id]; } // 펼칠 때마다 최신으로 - renderBoard(); + toggleCardSubs(card, t, tog); return; } if (e.target.closest(".pj-card-sub-check")) return;