diff --git a/app/modules/project/db.py b/app/modules/project/db.py
index 6c75598..96eadb9 100644
--- a/app/modules/project/db.py
+++ b/app/modules/project/db.py
@@ -656,6 +656,52 @@ class ProjectStore:
detail=f"{ttl} → {assignee}")
return self.get_task(task_id=row["id"])
+ def move_subtask(
+ self, *, task_id: int, parent_task_id: int, actor: str = ""
+ ) -> dict[str, Any]:
+ """하위 업무를 다른 상위 업무 밑으로 옮긴다(보드 카드로 드래그).
+
+ 받는 쪽은 보드 카드 = 최상위 업무만 허용한다 — 그래서 자기 자신이나
+ 자기 하위로 옮기는 순환이 생기지 않는다. 같은 프로젝트 안에서만
+ (하위 업무는 부모와 같은 프로젝트에 속한다 — create_task 와 같은 규칙).
+ 하위 업무의 하위 업무는 그대로 따라간다. 목록 끝(sort_order 최대+1)으로.
+ """
+ with self._pool.connection() as conn:
+ with conn.transaction():
+ sub = conn.execute(
+ "SELECT id, project_id, parent_task_id, title FROM tasks "
+ "WHERE id = %s FOR UPDATE",
+ (task_id,),
+ ).fetchone()
+ if not sub:
+ raise KeyError(f"업무를 찾을 수 없습니다: {task_id}")
+ if sub["parent_task_id"] is None:
+ raise ValueError("하위 업무만 다른 업무로 옮길 수 있습니다.")
+ parent = conn.execute(
+ "SELECT id, project_id, parent_task_id, title FROM tasks WHERE id = %s",
+ (parent_task_id,),
+ ).fetchone()
+ if not parent:
+ raise KeyError(f"상위 업무를 찾을 수 없습니다: {parent_task_id}")
+ if parent["parent_task_id"] is not None:
+ raise ValueError("하위 업무 안으로는 옮길 수 없습니다.")
+ if int(parent["project_id"]) != int(sub["project_id"]):
+ raise ValueError("다른 프로젝트의 업무로는 옮길 수 없습니다.")
+ if int(parent["id"]) != int(sub["parent_task_id"]):
+ nxt = conn.execute(
+ "SELECT COALESCE(MAX(sort_order), -1) + 1 AS n FROM tasks "
+ "WHERE project_id = %s",
+ (sub["project_id"],),
+ ).fetchone()
+ conn.execute(
+ "UPDATE tasks SET parent_task_id = %s, sort_order = %s WHERE id = %s",
+ (parent["id"], int(nxt["n"]), task_id),
+ )
+ self._log(conn, project_id=sub["project_id"], task_id=task_id,
+ actor=actor, action=store.ACTION_SUBTASK_MOVED,
+ detail=f"{sub['title']} → {parent['title']}")
+ return self.get_task(task_id=task_id)
+
def update_task(
self, *, task_id: int, fields: dict[str, Any], actor: str = ""
) -> dict[str, Any]:
diff --git a/app/modules/project/router.py b/app/modules/project/router.py
index f4054a0..594cb29 100644
--- a/app/modules/project/router.py
+++ b/app/modules/project/router.py
@@ -1356,6 +1356,35 @@ def api_get_task(request: Request, task_id: int) -> JSONResponse:
return JSONResponse({"task": task})
+@router.post("/api/tasks/{task_id}/move-parent")
+def api_move_subtask(
+ request: Request,
+ task_id: int,
+ payload: dict[str, Any] = Body(...),
+) -> JSONResponse:
+ """하위 업무를 다른 상위 업무로 옮긴다 — 보드에서 하위 업무 줄을 다른 카드로 드래그.
+
+ body: {"parent_task_id": 받는 업무 id}. 받는 업무는 같은 프로젝트의 최상위 업무만.
+ """
+ user = _require_user(request)
+ st = _db_or_503(request)
+ existing = st.get_task(task_id=task_id)
+ if existing is None:
+ raise HTTPException(status_code=404, detail="업무를 찾을 수 없습니다.")
+ _require_manage(request, st, user, existing["project_id"])
+ try:
+ parent_id = int(payload.get("parent_task_id"))
+ except (TypeError, ValueError):
+ raise HTTPException(status_code=400, detail="parent_task_id 가 필요합니다.")
+ try:
+ task = st.move_subtask(task_id=task_id, parent_task_id=parent_id, actor=user["email"])
+ except ValueError as exc:
+ raise HTTPException(status_code=400, detail=str(exc))
+ except KeyError as exc:
+ raise HTTPException(status_code=404, detail=str(exc))
+ return JSONResponse({"task": task})
+
+
# ────────────────────────────────────────────────────────────
# JSON API — 팔로워 (아사나의 협업자)
# ────────────────────────────────────────────────────────────
diff --git a/app/modules/project/store.py b/app/modules/project/store.py
index 76bd3ae..c5cbe1b 100644
--- a/app/modules/project/store.py
+++ b/app/modules/project/store.py
@@ -37,6 +37,7 @@ ACTION_ASSIGNED = "assigned"
ACTION_COMPLETED = "completed"
ACTION_STAGE_CHANGED = "stage_changed"
ACTION_REOPENED = "reopened"
+ACTION_SUBTASK_MOVED = "subtask_moved" # 하위 업무를 다른 상위 업무로 옮김(보드 드래그)
# 프로젝트 색상 팔레트(아사나 느낌) — UI 선택지
COLOR_PALETTE: tuple[str, ...] = (
diff --git a/app/modules/project/templates/project/inbox.html b/app/modules/project/templates/project/inbox.html
index ff88d22..298aa5a 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 %}
@@ -99,5 +99,5 @@
{% include "project/_side_modals.html" %}
{% 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 fe3269e..24f784f 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 %}
@@ -98,5 +98,5 @@
"today": {{ today | tojson }}
}
-
+
{% endblock %}
diff --git a/app/modules/project/templates/project/project.html b/app/modules/project/templates/project/project.html
index 5ded45a..98d04c0 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 %}
-
+
@@ -460,5 +460,5 @@
-
+
{% endblock %}
diff --git a/app/modules/project/templates/project/trash.html b/app/modules/project/templates/project/trash.html
index 8753e14..b7e712b 100644
--- a/app/modules/project/templates/project/trash.html
+++ b/app/modules/project/templates/project/trash.html
@@ -1,7 +1,7 @@
{% extends "erp_base.html" %}
{% block head_extra %}
-
+
{% endblock %}
@@ -68,5 +68,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 63a053a..f594d4d 100644
--- a/app/static/project.css
+++ b/app/static/project.css
@@ -297,6 +297,10 @@
}
.pj-card:hover { box-shadow: var(--pj-card-shadow-hover); transform: translateY(-1px); }
.pj-card.is-dragging { opacity: .5; }
+/* 하위 업무 한 줄 드래그 — 끄는 줄은 흐리게, 놓을 수 있는 카드는 보라 테두리 */
+.pj-card-sub[draggable="true"] .pj-card-sub-title { cursor: grab; }
+.pj-card-sub.is-dragging { opacity: .4; }
+.pj-card.is-sub-drop { outline: 2px solid var(--pj-accent); outline-offset: -2px; background: var(--pj-accent-tint); }
.pj-card.is-done .pj-card-title { text-decoration: line-through; color: #9aa1a9; }
.pj-card-title { font-size: 13.5px; font-weight: 600; color: var(--pj-ink); line-height: 1.4; }
.pj-card-meta { display: flex; align-items: center; gap: 6px; margin-top: 10px; }
diff --git a/app/static/project.js b/app/static/project.js
index 00a2d67..6efee2b 100644
--- a/app/static/project.js
+++ b/app/static/project.js
@@ -3171,6 +3171,10 @@
// 닫히면(거기서 하위 업무를 고쳤을 수 있으니) 캐시를 비운다(아래 observer).
const expandedSubs = new Set();
const subsCache = {};
+ // 지금 끌고 있는 하위 업무 줄 { sub, from(상위 업무) } — dragover 중엔
+ // dataTransfer 값을 읽을 수 없어서(보안상 type 만 보임) 여기 들고 있는다.
+ let dragSub = null;
+ const SUB_DRAG_TYPE = "application/x-pj-subtask";
// 아사나의 하위 업무 아이콘(위 노드 하나에서 두 갈래로 뻗은 노드).
const SUBTASK_ICON_SVG =
'