diff --git a/app/modules/project/router.py b/app/modules/project/router.py index 8272b27..0449961 100644 --- a/app/modules/project/router.py +++ b/app/modules/project/router.py @@ -484,6 +484,7 @@ def _build_task_calendar( seg_end = min(re_, w_end) # bar 라벨: [프로젝트명] 제목 · 담당자(아이디) assignee = (t.get("assignee_email") or "").split("@")[0] + assignee = assignee[:1].upper() + assignee[1:] # 멤버 이름은 첫 글자 대문자 proj = t.get("project_name") or "" parts = [] if proj: @@ -2022,7 +2023,8 @@ def _trash_view_items(items: list[dict[str, Any]]) -> list[dict[str, Any]]: it["days_left"] = max(0, (expires - now).days) except (TypeError, ValueError): it["days_left"] = None - it["deleted_by_id"] = (it.get("deleted_by") or "").split("@")[0] + did = (it.get("deleted_by") or "").split("@")[0] + it["deleted_by_id"] = did[:1].upper() + did[1:] # 멤버 이름은 첫 글자 대문자 return items diff --git a/app/modules/project/templates/project/inbox.html b/app/modules/project/templates/project/inbox.html index 0d82605..23129dd 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 %} @@ -45,7 +45,7 @@ ● {{ t.project_name }} {% if t.stage_name %} · {{ t.stage_name }}{% endif %} {% if t.due_label %} · 마감 {{ t.due_label }}{% endif %} - {% if t.mention_actor %} · {{ t.mention_actor.split('@')[0] }}님이 태그{% endif %} + {% if t.mention_actor %} · {% set nm = t.mention_actor.split('@')[0] %}{{ nm[:1]|upper }}{{ nm[1:] }}님이 태그{% endif %} 열기 @@ -79,7 +79,7 @@
{{ n.title }}
{% if n.body %}
{{ n.body }}
{% endif %}
- {% if n.actor_email %}{{ n.actor_email.split('@')[0] }} · {% endif %}{{ n.created_at[:16].replace('T',' ') }} + {% if n.actor_email %}{% set nm = n.actor_email.split('@')[0] %}{{ nm[:1]|upper }}{{ nm[1:] }} · {% endif %}{{ n.created_at[:16].replace('T',' ') }}
{% if n.project_id %} @@ -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 5d45545..85d2cab 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 e5afc38..9d5a1db 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 %} - + @@ -53,7 +53,7 @@
{% for m in members %} + data-tip="{{ m.user_email.split('@')[0][:1]|upper }}{{ m.user_email.split('@')[0][1:] }}{% if m.role == 'manager' %} (관리){% endif %}"> {% if avatars.get(m.user_email | lower) %} {% else %} @@ -267,8 +267,9 @@ @@ -465,5 +466,5 @@ - + {% endblock %} diff --git a/app/modules/project/templates/project/trash.html b/app/modules/project/templates/project/trash.html index 032e5eb..623f4ec 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.js b/app/static/project.js index 2119671..9900bc2 100644 --- a/app/static/project.js +++ b/app/static/project.js @@ -507,7 +507,7 @@ : 'account_circle'; return '"; } @@ -788,8 +788,8 @@ const icon = u.avatar ? '' : 'account_circle'; - return '"; + return '"; }).join("") : "없음"; grid.querySelectorAll(".pj-allmember-item").forEach(function (btn) { @@ -1468,7 +1468,7 @@ (u.avatar ? '' : 'account_circle') + - "" + escapeHtml(u.id || u.name || u.email) + ""; + "" + escapeHtml(capName(u.id || u.name || u.email)) + ""; b.addEventListener("click", function () { onPick(u); }); menu.appendChild(b); }); @@ -1547,7 +1547,7 @@ if (!ctx) { closeMentionMenu(); return; } const users = filterMentionUsers(await mentionUsers(), ctx.query); renderMentionMenu(users, input.getBoundingClientRect(), function (u) { - const token = "@" + (u.id || u.email.split("@")[0]); + const token = "@" + capName(u.id || u.email.split("@")[0]); input.value = input.value.slice(0, ctx.start) + token + " " + input.value.slice(ctx.end); input._pjMentions[token] = u.email; const caret = ctx.start + token.length + 1; @@ -1610,7 +1610,7 @@ chip.className = "pj-mention"; chip.setAttribute("data-email", u.email); chip.setAttribute("contenteditable", "false"); - chip.textContent = "@" + (u.id || u.email.split("@")[0]); + chip.textContent = "@" + capName(u.id || u.email.split("@")[0]); const space = document.createTextNode("\u00a0"); range.insertNode(space); range.insertNode(chip); @@ -4094,7 +4094,7 @@ const byAssignee = {}; incomplete.forEach(function (t) { if (!t.start_date && !t.due_date) return; - const k = t.assignee_email ? (t.assignee_name || idOf(t.assignee_email)) : "담당자 없음"; + const k = t.assignee_email ? capName(t.assignee_name || idOf(t.assignee_email)) : "담당자 없음"; byAssignee[k] = (byAssignee[k] || 0) + 1; }); let assigneeEntries = Object.keys(byAssignee).map(function (k) { return { label: k, value: byAssignee[k] }; }) @@ -5506,8 +5506,13 @@ }; } + // 화면에 보이는 멤버 이름 = 이메일 아이디, 맨 앞 글자만 대문자(king → King). + function capName(s) { + s = String(s == null ? "" : s); + return s.charAt(0).toUpperCase() + s.slice(1); + } function idOf(email) { - return String(email == null ? "" : email).split("@")[0]; + return capName(String(email == null ? "" : email).split("@")[0]); } // ════════════════════════════════════════════════════════════ diff --git a/docs/PROJECT_MODULE.md b/docs/PROJECT_MODULE.md index 01fe9fc..ed943ad 100644 --- a/docs/PROJECT_MODULE.md +++ b/docs/PROJECT_MODULE.md @@ -9,6 +9,8 @@ 목록(보기 탭, 예전 "리스트") · 캘린더(예전 "달력") · 수신함 · 첨부 파일 · 작업 링크 복사 · 프로젝트 칸 + "다른 프로젝트에 추가"(예전 "연결된 프로젝트") · 담당자 없음(예전 "(미지정)"). "@태그"는 그대로 쓴다. 코드 식별자·DB 컬럼(`tasks`, `stage_id`, `task_followers` 등)과 코드 주석은 예전 이름 그대로다. +**멤버 이름 표기** — 이메일 아이디의 첫 글자만 대문자(king → King). JS 는 `idOf(email)`/`capName(s)`, +템플릿은 `{{ nm[:1]|upper }}{{ nm[1:] }}` 로 화면에 그릴 때만 바꾼다(API `id`·DB 값은 그대로 — 멘션·검색은 이메일 기준). ## 1. 개요