feat(project): 주간 회의록 참석자를 전체 멤버에서 고르기
- 자유 입력 칸 대신 멤버 칩(사진·이름·×) + [참석자] 고르기 창(찾기·전원 선택·모두 해제·체크), 바뀔 때마다 저장 - 후보 = project 권한 보유 등록 사용자(_meet_members), 저장은 이메일 쉼표 목록(예전 글자는 칩으로 유지, _parse_attendees) - 참석자 길이 제한 500 → 3000자, 캐시 버전 20261001t, 문서 갱신 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -2553,7 +2553,7 @@ class ProjectStore:
|
||||
params.append(v)
|
||||
if "attendees" in fields:
|
||||
sets.append("attendees = %s")
|
||||
params.append(store.validate_meeting_text(fields["attendees"], limit=500, what="참석자"))
|
||||
params.append(store.validate_meeting_text(fields["attendees"], limit=3000, what="참석자"))
|
||||
if "notes" in fields:
|
||||
sets.append("notes = %s")
|
||||
params.append(store.validate_meeting_text(fields["notes"], what="메모"))
|
||||
|
||||
@@ -2945,6 +2945,35 @@ def _meeting_view(request: Request, st: Any, *, year: int, month: int, week: dat
|
||||
return {"meeting": meeting, "head": head, "markets": [{"code": m["code"], "name": m["name"]} for m in markets]}
|
||||
|
||||
|
||||
def _meet_members() -> list[dict[str, str]]:
|
||||
"""회의 참석자 후보 = 전체 멤버(project 모듈 권한 보유 등록 사용자) — 이름·이메일·사진."""
|
||||
try:
|
||||
from app.main import user_store # noqa: WPS433
|
||||
from app.store import has_module # noqa: WPS433
|
||||
|
||||
out = [{"email": u["email"], "name": u.get("name") or u["email"].split("@")[0], "avatar": u.get("picture") or ""}
|
||||
for u in user_store.list_all() if has_module(u, "project")]
|
||||
except Exception: # noqa: BLE001 — 사용자 목록이 없어도 회의록은 열린다
|
||||
logger.warning("meeting members unavailable", exc_info=True)
|
||||
return []
|
||||
return sorted(out, key=lambda m: m["name"])
|
||||
|
||||
|
||||
def _parse_attendees(text: str, members: list[dict[str, str]]) -> list[dict[str, str]]:
|
||||
"""참석자 칸(쉼표로 이은 이메일 — 예전엔 자유 입력 글자) → 칩 목록. 멤버 이메일이면 이름·사진, 아니면 글자 그대로."""
|
||||
by_email = {m["email"].lower(): m for m in members}
|
||||
out, seen = [], set()
|
||||
for tok in str(text or "").replace("\n", ",").split(","):
|
||||
t = tok.strip()
|
||||
if not t or t.lower() in seen:
|
||||
continue
|
||||
seen.add(t.lower())
|
||||
m = by_email.get(t.lower())
|
||||
out.append({"key": m["email"] if m else t, "email": m["email"] if m else "", "name": m["name"] if m else t,
|
||||
"avatar": m["avatar"] if m else ""})
|
||||
return out
|
||||
|
||||
|
||||
@router.get("/goals/{year}/meetings/{month}", response_class=HTMLResponse)
|
||||
def goal_meeting_page(request: Request, year: int, month: int, week: str | None = None) -> HTMLResponse:
|
||||
"""주간 회의록 — 그 달과 겹치는 주(월~일) 탭, 주마다 회의록 하나. 입력은 관리자만(목표 표와 같음)."""
|
||||
@@ -2975,6 +3004,7 @@ def goal_meeting_page(request: Request, year: int, month: int, week: str | None
|
||||
cal = store.calendar_weeks(year, month)
|
||||
existing = set(st.meeting_weeks(start=cal[0][0], end=cal[-1][0])) if enabled else set()
|
||||
view = _meeting_view(request, st, year=year, month=month, week=sel) if enabled else {}
|
||||
members = _meet_members()
|
||||
admin = is_admin(user)
|
||||
return render_template(
|
||||
request,
|
||||
@@ -3025,6 +3055,8 @@ def goal_meeting_page(request: Request, year: int, month: int, week: str | None
|
||||
"sync_from": (sel - timedelta(days=7)).isoformat() if sel - timedelta(days=7) <= today else "",
|
||||
"sync_to": min(sel + timedelta(days=6), today).isoformat(),
|
||||
"meeting_status": store.MEETING_STATUS,
|
||||
"meet_members": members,
|
||||
"attendee_list": _parse_attendees((view.get("meeting") or {}).get("attendees", ""), members),
|
||||
**view,
|
||||
},
|
||||
)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{% extends "erp_base.html" %}
|
||||
|
||||
{% block head_extra %}
|
||||
<link rel="stylesheet" href="/static/project.css?v=20261001s" />
|
||||
<link rel="stylesheet" href="/static/project.css?v=20261001t" />
|
||||
<link rel="stylesheet" href="/static/vendor/material-symbols/material-symbols.css" />
|
||||
{% endblock %}
|
||||
|
||||
@@ -143,10 +143,17 @@
|
||||
</div>
|
||||
{% if not h.perf %}<p class="pj-goal-note">실적 모듈이 연결되지 않아 실적·누적·쇼핑몰 자동 결과는 비어 있습니다(결과는 직접 입력).</p>{% endif %}
|
||||
|
||||
<label class="pj-meet-attend">참석자
|
||||
{% if edit %}<input type="text" id="pj-meet-attendees" maxlength="500" placeholder="예: 대표, 마케팅팀, 유통팀" value="{{ meeting.attendees }}" />
|
||||
{% else %}<span>{{ meeting.attendees or '—' }}</span>{% endif %}
|
||||
</label>
|
||||
{# 참석자 — 전체 멤버에서 고른다(칩, [참석자] = 고르기 창). 저장은 이메일을 쉼표로 이어서, 예전 자유 입력 글자도 칩으로 #}
|
||||
<div class="pj-meet-attend">
|
||||
<span class="pj-meet-attend-label">참석자</span>
|
||||
<div class="pj-meet-attend-chips" id="pj-meet-attend"{% if edit %} data-edit="1"{% endif %}>
|
||||
{% for a in attendee_list %}<span class="pj-meet-chip" data-key="{{ a.key }}" data-name="{{ a.name }}" data-avatar="{{ a.avatar }}"{% if not a.email %} title="멤버가 아닌 글자(예전 입력)"{% endif %}>
|
||||
{%- if a.avatar %}<img class="pj-avatar" src="{{ a.avatar }}" alt="" referrerpolicy="no-referrer">{% else %}<span class="pj-meet-chip-ini">{{ a.name[:1] }}</span>{% endif %}<span>{{ a.name }}</span>
|
||||
{%- if edit %}<button type="button" class="pj-meet-chip-x" title="빼기" aria-label="{{ a.name }} 빼기">×</button>{% endif %}</span>{% endfor %}
|
||||
{% if edit %}<button type="button" class="pj-meet-attend-add" id="pj-meet-attend-add"><span class="material-symbols-outlined">person_add</span>참석자</button>
|
||||
{% elif not attendee_list %}<span class="pj-muted">—</span>{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{# ── 구역별 줄 — 왼쪽: 이번주 / 오른쪽: 전주 리뷰(지난 회의록 같은 줄) ── #}
|
||||
<table class="pj-meet-table" id="pj-meet-table">
|
||||
@@ -245,8 +252,9 @@
|
||||
</div>
|
||||
|
||||
{% if markets %}<script>window.PJ_MEET_MARKETS = {{ markets | tojson }};</script>{% endif %}
|
||||
<script>window.PJ_MEET_MEMBERS = {{ (meet_members or []) | tojson }};</script>
|
||||
{% include "project/_side_modals.html" %}
|
||||
{% include "project/_member_tasks_modal.html" %}
|
||||
|
||||
<script src="/static/project.js?v=20261001s" defer></script>
|
||||
<script src="/static/project.js?v=20261001t" defer></script>
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{% extends "erp_base.html" %}
|
||||
|
||||
{% block head_extra %}
|
||||
<link rel="stylesheet" href="/static/project.css?v=20261001s" />
|
||||
<link rel="stylesheet" href="/static/project.css?v=20261001t" />
|
||||
<link rel="stylesheet" href="/static/vendor/material-symbols/material-symbols.css" />
|
||||
{% endblock %}
|
||||
|
||||
@@ -189,5 +189,5 @@
|
||||
{% include "project/_side_modals.html" %}
|
||||
{% include "project/_member_tasks_modal.html" %}
|
||||
|
||||
<script src="/static/project.js?v=20261001s" defer></script>
|
||||
<script src="/static/project.js?v=20261001t" defer></script>
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{% extends "erp_base.html" %}
|
||||
|
||||
{% block head_extra %}
|
||||
<link rel="stylesheet" href="/static/project.css?v=20261001s" />
|
||||
<link rel="stylesheet" href="/static/project.css?v=20261001t" />
|
||||
<link rel="stylesheet" href="/static/project-help.css?v=20260926v" />
|
||||
<link rel="stylesheet" href="/static/vendor/material-symbols/material-symbols.css" />
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{% extends "erp_base.html" %}
|
||||
|
||||
{% block head_extra %}
|
||||
<link rel="stylesheet" href="/static/project.css?v=20261001s" />
|
||||
<link rel="stylesheet" href="/static/project.css?v=20261001t" />
|
||||
<link rel="stylesheet" href="/static/vendor/material-symbols/material-symbols.css" />
|
||||
{% endblock %}
|
||||
|
||||
@@ -104,5 +104,5 @@
|
||||
{% include "project/_side_modals.html" %}
|
||||
{% include "project/_member_tasks_modal.html" %}
|
||||
|
||||
<script src="/static/project.js?v=20261001s" defer></script>
|
||||
<script src="/static/project.js?v=20261001t" defer></script>
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{% extends "erp_base.html" %}
|
||||
|
||||
{% block head_extra %}
|
||||
<link rel="stylesheet" href="/static/project.css?v=20261001s" />
|
||||
<link rel="stylesheet" href="/static/project.css?v=20261001t" />
|
||||
<link rel="stylesheet" href="/static/vendor/material-symbols/material-symbols.css" />
|
||||
{% endblock %}
|
||||
|
||||
@@ -100,5 +100,5 @@
|
||||
"today": {{ today | tojson }}
|
||||
}
|
||||
</script>
|
||||
<script src="/static/project.js?v=20261001s" defer></script>
|
||||
<script src="/static/project.js?v=20261001t" defer></script>
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{% extends "erp_base.html" %}
|
||||
|
||||
{% block head_extra %}
|
||||
<link rel="stylesheet" href="/static/project.css?v=20261001s" />
|
||||
<link rel="stylesheet" href="/static/project.css?v=20261001t" />
|
||||
<!-- 구글 머티리얼 심볼(담당자 아이콘 등) — self-host -->
|
||||
<link rel="stylesheet" href="/static/vendor/material-symbols/material-symbols.css" />
|
||||
<!-- 타임라인 vis-timeline — self-host -->
|
||||
@@ -496,5 +496,5 @@
|
||||
</script>
|
||||
|
||||
<script src="/static/vendor/vis-timeline/vis-timeline-graph2d.min.js"></script>
|
||||
<script src="/static/project.js?v=20261001s" defer></script>
|
||||
<script src="/static/project.js?v=20261001t" defer></script>
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{% extends "erp_base.html" %}
|
||||
|
||||
{% block head_extra %}
|
||||
<link rel="stylesheet" href="/static/project.css?v=20261001s" />
|
||||
<link rel="stylesheet" href="/static/project.css?v=20261001t" />
|
||||
<link rel="stylesheet" href="/static/vendor/material-symbols/material-symbols.css" />
|
||||
{% endblock %}
|
||||
|
||||
@@ -70,5 +70,5 @@
|
||||
{% include "project/_side_modals.html" %}
|
||||
{% include "project/_member_tasks_modal.html" %}
|
||||
|
||||
<script src="/static/project.js?v=20261001s" defer></script>
|
||||
<script src="/static/project.js?v=20261001t" defer></script>
|
||||
{% endblock %}
|
||||
|
||||
Reference in New Issue
Block a user