feat(project): month-bounded meeting weeks, weekly sales targets, sticky header

- Weeks stay inside the month: week 1 starts on the 1st (through the next
  Sunday if the 1st is a weekend); a trailing Mon/Tue joins the last week.
  "Last week" is the previous period.
- Prev-week review columns: 전주 업무 | 결과(text, new result_note) |
  전주 목표 | 결과(amount).
- Header now shows month target, cumulative weekly target, month-to-date
  sales and gap (amount + %), with decisions/notes beside it; the area
  stays fixed while scrolling.
- Goals board: the monthly sales target is entered per week; the sum
  becomes the month target.
- Migration 020: result_note, goal_week_targets, drop Monday-only check,
  move absorbed Monday meetings to the new week start.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-10-07 11:24:41 +09:00
parent 9194487217
commit cd3577b299
21 changed files with 751 additions and 250 deletions
+91 -7
View File
@@ -2535,7 +2535,21 @@ class ProjectStore:
def _meeting_cols(self, conn: Any) -> str:
return (self._MEETING_ITEM_COLS + (", line_key" if self._meeting_keys(conn) else "")
+ (", content_row_span" if self._meeting_cells(conn) else ""))
+ (", content_row_span" if self._meeting_cells(conn) else "")
+ (", result_note" if self._meeting_v20(conn) else ""))
def _meeting_v20(self, conn: Any) -> bool:
"""마이그레이션 020 — 결과 글 칸(result_note)·월요일이 아닌 주차 시작일·주차별 목표(goal_week_targets)."""
if getattr(self, "_meeting_v20_ok", False):
return True
ok = self._column_exists(conn, "goal_meeting_items", "result_note")
if ok:
self._meeting_v20_ok = True
return ok
def meetings_v20(self) -> bool:
with self._pool.connection() as conn:
return self._table_exists(conn, "goal_meetings") and self._meeting_v20(conn)
def _meeting_cells(self, conn: Any) -> bool:
if getattr(self, "_meeting_cells_ok", False):
@@ -2591,7 +2605,7 @@ class ProjectStore:
return out
def meeting_weeks(self, *, start: date, end: date) -> list[str]:
"""기간 안에 회의록이 있는 주(월요일) 목록."""
"""기간 안에 회의록이 있는 주차(시작일) 목록."""
with self._pool.connection() as conn:
if not self._table_exists(conn, "goal_meetings"):
return []
@@ -2604,7 +2618,7 @@ class ProjectStore:
def get_meeting(self, *, week_start: date) -> dict[str, Any] | None:
"""한 주 회의록 — 머리(금주 목표·참석자·메모) + 줄(지난주 줄 prev 포함). 없으면 None.
"지난주"는 **정확히 7일 전 주(week_start − 7)** 만이다(몇 주 전 회의록을 지난주로 보이지 않게).
"지난주"는 **바로 앞 주차(store.prev_week_period)** 만이다(몇 주 전 회의록을 지난주로 보이지 않게).
· prev_meeting = 그 주 회의록 머리(전주 목표), 그 주 회의록이 없으면 None.
· 줄의 prev = 그 주 회의록에서 **같은 연결키(line_key, 마이그레이션 018)** 의 줄 — 생성 순서·이름 변경·
순서 이동과 무관하다. 018 미적용이면 예전 carry_from 을 쓰되 가리키는 줄이 정확히 7일 전 주일 때만.
@@ -2614,13 +2628,14 @@ class ProjectStore:
cols = self._meeting_cols(conn)
keyed = self._meeting_keys(conn)
cell_merges = self._meeting_cells(conn)
result_notes = self._meeting_v20(conn)
head = conn.execute(
"SELECT week_start, week_target, attendees, notes, updated_by, updated_at "
"FROM goal_meetings WHERE week_start = %s", (week_start,),
).fetchone()
if head is None:
return None
prev_week = week_start - timedelta(days=7)
prev_week = store.prev_week_period(week_start)[0]
items = conn.execute(
f"SELECT {cols} FROM goal_meeting_items WHERE week_start = %s "
"ORDER BY sort_order, id", (week_start,),
@@ -2653,6 +2668,7 @@ class ProjectStore:
else None} if prev_head else None,
"line_keys": keyed,
"cell_merges": cell_merges,
"result_notes": result_notes,
}
def create_meeting(self, *, week_start: date, sections: list[tuple[str, str]], created_by: str = "") -> bool:
@@ -2662,11 +2678,13 @@ class ProjectStore:
③ 둘 다 없으면 sections(목표 표 업무 영역 이름·색)마다 기본 양식 줄(store.MEETING_TEMPLATE).
이어받은 줄은 원본 줄의 연결키(line_key, 018)를 그대로 갖는다 → 생성 순서와 무관하게 7일 전 주의 같은 키 줄이
"지난주"가 된다. 새 줄(양식·줄 추가)은 새 키. carry_from 은 앞선 원본 줄일 때만 기록(이력, 화면 연결에는 안 씀)."""
ws = store.validate_week_start(week_start)
ws = store.validate_period_start(week_start)
who = store.norm_str(created_by, lower=True)
with self._pool.connection() as conn:
with conn.transaction():
self._require_meetings(conn)
if ws.weekday() != 0 and not self._meeting_v20(conn):
raise store.MeetingMigration020Needed() # 월요일만 허용하던 CHECK 가 아직 있다
keyed = self._meeting_keys(conn)
ins = conn.execute(
"INSERT INTO goal_meetings (week_start, created_by, updated_by) VALUES (%s, %s, %s) "
@@ -2817,8 +2835,8 @@ class ProjectStore:
return new_id
def update_meeting_item(self, *, item_id: int, fields: dict[str, Any], updated_by: str = "") -> dict[str, Any]:
"""줄 칸 — label · content(이번주 할 일) · target_amount · result_amount(그 주 결과, 원) · status(평가) ·
marketplace_code(실적 쇼핑몰 연결 — 결과 자동). 저장된 줄을 돌려준다."""
"""줄 칸 — label · content(주요 업무) · target_amount · result_amount(그 주 결과, 원) · result_note(그 주 결과 글, 020) ·
status(평가, 화면에선 폐지) · marketplace_code(화면에선 폐지). 저장된 줄을 돌려준다."""
sets: list[str] = []
params: list[Any] = []
if "label" in fields:
@@ -2837,6 +2855,9 @@ class ProjectStore:
if "status" in fields:
sets.append("status = %s")
params.append(store.validate_meeting_status(fields["status"]))
if "result_note" in fields:
sets.append("result_note = %s")
params.append(store.validate_meeting_text(fields["result_note"], what="결과"))
if "marketplace_code" in fields:
code = store.norm_str(fields["marketplace_code"], lower=True)
if len(code) > 30 or not re.fullmatch(r"[a-z0-9_]*", code):
@@ -2846,6 +2867,8 @@ class ProjectStore:
with self._pool.connection() as conn:
with conn.transaction():
self._require_meetings(conn)
if "result_note" in fields and not self._meeting_v20(conn):
raise store.MeetingMigration020Needed()
rows = self._locked_meeting_items(conn, item_id)
if "content" in fields:
self._require_meeting_cell_visible(rows, item_id)
@@ -2976,6 +2999,67 @@ class ProjectStore:
return {"sales_unit": head["sales_unit"] if head else "", "sales_target": vals.get(("sales", "target")),
"sales_actual": vals.get(("sales", "actual")), "roas_target": vals.get(("roas", "target"))}
# ── 주차별 매출 목표(020) — 목표 표 매출 단위 그대로, 월 목표 = 그 달 주차 합계 ──
def week_targets_enabled(self) -> bool:
with self._pool.connection() as conn:
return self._table_exists(conn, "goal_week_targets")
def goal_week_targets(self, *, start: date, end: date) -> dict[str, float]:
"""기간 안 주차 시작일 → 목표(매출 단위). 020 미적용이면 빈 값."""
with self._pool.connection() as conn:
if not self._table_exists(conn, "goal_week_targets"):
return {}
rows = conn.execute(
"SELECT week_start, value FROM goal_week_targets WHERE week_start BETWEEN %s AND %s ORDER BY week_start",
(start, end),
).fetchall()
return {r["week_start"].isoformat(): float(r["value"]) for r in rows}
def set_goal_week_targets(
self, *, year: int, month: int, values: dict[date, float | None], updated_by: str = ""
) -> float | None:
"""그 달 주차별 목표 저장(None = 지움) → 그 달 주차 합계를 매출 목표(goal_metrics sales/target)로.
주차가 모두 비면 월 목표도 지운다(월 목표 = 주차 합계). 합계를 돌려준다(없으면 None)."""
m = store.validate_goal_month(month)
periods = {a for a, _ in store.month_weeks(year, m)}
if any(d not in periods for d in values):
raise ValueError("주차가 바뀌었습니다. 새로고침해 주세요.")
who = store.norm_str(updated_by, lower=True)
with self._pool.connection() as conn:
with conn.transaction():
if not self._table_exists(conn, "goal_week_targets"):
raise store.MeetingMigration020Needed()
if not conn.execute("SELECT 1 FROM goal_years WHERE year = %s FOR UPDATE", (year,)).fetchone():
raise KeyError(year)
for d, v in values.items():
if v is None:
conn.execute("DELETE FROM goal_week_targets WHERE week_start = %s", (d,))
else:
if v < 0:
raise ValueError("주차 목표는 0 이상이어야 합니다.")
conn.execute(
"INSERT INTO goal_week_targets (week_start, year, month, value, updated_by) "
"VALUES (%s,%s,%s,%s,%s) ON CONFLICT (week_start) DO UPDATE "
"SET value = EXCLUDED.value, updated_by = EXCLUDED.updated_by, updated_at = now()",
(d, year, m, v, who),
)
row = conn.execute(
"SELECT count(*) AS n, sum(value) AS total FROM goal_week_targets WHERE year = %s AND month = %s",
(year, m),
).fetchone()
total = float(row["total"]) if row["n"] else None
if total is None:
conn.execute("DELETE FROM goal_metrics WHERE year=%s AND metric='sales' AND kind='target' AND month=%s",
(year, m))
else:
conn.execute(
"INSERT INTO goal_metrics (year, metric, kind, month, value, updated_by) "
"VALUES (%s,'sales','target',%s,%s,%s) ON CONFLICT (year, metric, kind, month) DO UPDATE "
"SET value = EXCLUDED.value, updated_by = EXCLUDED.updated_by, updated_at = now()",
(year, m, total, who),
)
return total
def goal_area_sections(self, *, year: int) -> list[tuple[str, str]]:
"""그 해 목표 표의 업무 영역(이름, 색) — 첫 회의록 구역. 없으면 빈 목록(기본 양식 구역)."""
with self._pool.connection() as conn: