diff --git a/app/modules/inout/CLAUDE.md b/app/modules/inout/CLAUDE.md index 9643263..996cc9b 100644 --- a/app/modules/inout/CLAUDE.md +++ b/app/modules/inout/CLAUDE.md @@ -74,6 +74,7 @@ - 입출고 **모든 화면** 2열(`.io-split` = 왼쪽 `section.io` | 오른쪽 `_calendar.html` 300px, 1100px 미만은 한 열). 달력 300×320, 스크롤해도 위에 붙음. - 프로젝트 달력 모양(일요일 시작·요일 줄 회색·오늘 검은 동그라미·토 파랑·일/공휴일 빨강 — 공휴일 표는 `project.store.holiday_name` 재사용). + 공휴일 이름은 숫자 아래 한 줄(`.io-cal-hol`, 8.5px — 5글자까지 다 보임, 더 길면 … + 말풍선에 전체 이름). - 날짜 칸 = 발주(발주일, 파랑)·입고(입고일, 초록) 건수(취소된 발주 제외), 누르면 그날 목록 팝업 → 발주서. 달 이동은 새로고침 없이 `GET /inout/api/calendar?month=YYYY-MM`(`db.calendar`). ## 시각 / 날짜 diff --git a/app/modules/inout/templates/inout/index.html b/app/modules/inout/templates/inout/index.html index 9b04562..f12b1cf 100644 --- a/app/modules/inout/templates/inout/index.html +++ b/app/modules/inout/templates/inout/index.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} {% from "inout/_macros.html" import order_badge, progress, due, n, ymd %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {% block content %}
{# 2열 — 왼쪽 화면 | 오른쪽 달력(2026-10-21) #} @@ -71,4 +71,4 @@ {% include "inout/_calendar.html" %}
{% endblock %} -{% block scripts %}{% endblock %} +{% block scripts %}{% endblock %} diff --git a/app/modules/inout/templates/inout/order_detail.html b/app/modules/inout/templates/inout/order_detail.html index 4c37ff7..7a03cd1 100644 --- a/app/modules/inout/templates/inout/order_detail.html +++ b/app/modules/inout/templates/inout/order_detail.html @@ -20,7 +20,7 @@ {%- endmacro -%} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {% block content %} {% set active = order.status in ('open', 'partial') %} @@ -256,4 +256,4 @@ {% include "inout/_calendar.html" %} {% endblock %} -{% block scripts %}{% endblock %} +{% block scripts %}{% endblock %} diff --git a/app/modules/inout/templates/inout/order_form.html b/app/modules/inout/templates/inout/order_form.html index a5dce4b..3a2d6a0 100644 --- a/app/modules/inout/templates/inout/order_form.html +++ b/app/modules/inout/templates/inout/order_form.html @@ -1,5 +1,5 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {% block content %}
{# 2열 — 왼쪽 화면 | 오른쪽 달력(2026-10-21) #} @@ -83,4 +83,4 @@ {% include "inout/_calendar.html" %}
{% endblock %} -{% block scripts %}{% endblock %} +{% block scripts %}{% endblock %} diff --git a/app/modules/inout/templates/inout/pending.html b/app/modules/inout/templates/inout/pending.html index 75ceed4..3b9f0a1 100644 --- a/app/modules/inout/templates/inout/pending.html +++ b/app/modules/inout/templates/inout/pending.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} {% from "inout/_macros.html" import due, n, ymd %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {% block content %}
{# 2열 — 왼쪽 화면 | 오른쪽 달력(2026-10-21) #} @@ -91,4 +91,4 @@ {% include "inout/_calendar.html" %}
{% endblock %} -{% block scripts %}{% endblock %} +{% block scripts %}{% endblock %} diff --git a/app/static/inout.css b/app/static/inout.css index 88e225a..01512fe 100644 --- a/app/static/inout.css +++ b/app/static/inout.css @@ -360,6 +360,12 @@ .io-cal-day.has-ev:hover { background: #f2f6ff; } .io-cal-day:focus-visible { outline: 2px solid #1d4ed8; outline-offset: -2px; } .io-cal-num { font-size: 12px; font-weight: 600; color: #0a0a0a; line-height: 18px; min-width: 18px; text-align: center; border-radius: 9999px; } +/* 공휴일 이름 — 숫자 아래 한 줄(2026-10-21). 칸이 좁아 넘치면 … (전체 이름은 말풍선). 공휴일 칸은 숫자·이름·건수가 다 들어가게 위아래를 줄인다 */ +.io-cal-hol { display: block; max-width: 100%; font-size: 8.5px; line-height: 10px; font-weight: 600; color: #c22b10; + overflow: hidden; text-overflow: ellipsis; white-space: nowrap; letter-spacing: -0.6px; } +.io-cal-day.is-out .io-cal-hol { color: #e3a397; } +.io-cal-day.has-hol { padding: 1px 1px 0; gap: 0; overflow: hidden; } +.io-cal-day.has-hol .io-cal-num { line-height: 16px; } .io-cal-day.is-sun .io-cal-num { color: #c22b10; } .io-cal-day.is-sat .io-cal-num { color: #1d4ed8; } .io-cal-day.is-out { background: #fafafa; } diff --git a/app/static/inout.js b/app/static/inout.js index aa432fa..ee88e59 100644 --- a/app/static/inout.js +++ b/app/static/inout.js @@ -792,11 +792,13 @@ if (iso === data.today) cls.push("is-today"); if (wd === 0 || hol) cls.push("is-sun"); else if (wd === 6) cls.push("is-sat"); if (ev.orders.length || ev.receipts.length) cls.push("has-ev"); + if (hol) cls.push("has-hol"); const tip = [iso.replace(/-/g, ".") + "(" + WD[wd] + ")" + (hol ? " " + hol : "")]; if (ev.orders.length) tip.push("발주 " + ev.orders.length + "건"); if (ev.receipts.length) tip.push("입고 " + ev.receipts.length + "건"); html += '