diff --git a/app/modules/project/templates/project/inbox.html b/app/modules/project/templates/project/inbox.html index 3025916..b89bfc9 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 6d7be15..ab8ce51 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 133d290..378937a 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 4b4c010..5bfb3b7 100644 --- a/app/static/project.css +++ b/app/static/project.css @@ -797,7 +797,7 @@ } .pj-card-subtoggle:hover { background: #f1f2f4; color: var(--pj-ink); } .pj-card-subtoggle.is-open { border-color: #4573d2; color: var(--pj-ink); background: #fff; } -.pj-card-subtoggle-ic { font-size: 15px; transform: scaleX(-1) rotate(90deg); } +.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; } diff --git a/app/static/project.js b/app/static/project.js index a2279bc..54a0a54 100644 --- a/app/static/project.js +++ b/app/static/project.js @@ -2614,6 +2614,16 @@ // 닫히면(거기서 하위 업무를 고쳤을 수 있으니) 캐시를 비운다(아래 observer). const expandedSubs = new Set(); const subsCache = {}; + // 아사나의 하위 업무 아이콘(위 노드 하나에서 두 갈래로 뻗은 노드). + const SUBTASK_ICON_SVG = + '"; function cardSubRowHtml(sub) { const overdue = sub.due_date && !sub.completed_at && sub.due_date < todayIso; return '
' + @@ -2633,7 +2643,8 @@ if (!subs) { box.innerHTML = '
불러오는 중…
'; api("GET", "/project/api/tasks/" + t.id).then(function (res) { - const subs = (res && res.subtasks) || []; + // 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; @@ -2701,7 +2712,7 @@ ? '" : "") +