feat(project): 날짜 팝업 공휴일 숫자 밑에 휴일 이름 표시

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-09-29 02:50:03 +09:00
parent f1e7de585d
commit ce7879f43d
8 changed files with 34 additions and 14 deletions
@@ -1,7 +1,7 @@
{% extends "erp_base.html" %}
{% block head_extra %}
<link rel="stylesheet" href="/static/project.css?v=20260929a" />
<link rel="stylesheet" href="/static/project.css?v=20260929c" />
<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=20260929a" />
<link rel="stylesheet" href="/static/project.css?v=20260929c" />
<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=20260929a" defer></script>
<script src="/static/project.js?v=20260929c" defer></script>
{% endblock %}
@@ -1,7 +1,7 @@
{% extends "erp_base.html" %}
{% block head_extra %}
<link rel="stylesheet" href="/static/project.css?v=20260929a" />
<link rel="stylesheet" href="/static/project.css?v=20260929c" />
<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=20260929a" defer></script>
<script src="/static/project.js?v=20260929c" defer></script>
{% endblock %}
@@ -1,7 +1,7 @@
{% extends "erp_base.html" %}
{% block head_extra %}
<link rel="stylesheet" href="/static/project.css?v=20260929a" />
<link rel="stylesheet" href="/static/project.css?v=20260929c" />
<!-- 구글 머티리얼 심볼(담당자 아이콘 등) — self-host -->
<link rel="stylesheet" href="/static/vendor/material-symbols/material-symbols.css" />
<!-- 타임라인 vis-timeline — self-host -->
@@ -491,5 +491,5 @@
</script>
<script src="/static/vendor/vis-timeline/vis-timeline-graph2d.min.js"></script>
<script src="/static/project.js?v=20260929a" defer></script>
<script src="/static/project.js?v=20260929c" defer></script>
{% endblock %}
@@ -1,7 +1,7 @@
{% extends "erp_base.html" %}
{% block head_extra %}
<link rel="stylesheet" href="/static/project.css?v=20260929a" />
<link rel="stylesheet" href="/static/project.css?v=20260929c" />
<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=20260929a" defer></script>
<script src="/static/project.js?v=20260929c" defer></script>
{% endblock %}
+16 -4
View File
@@ -1502,16 +1502,27 @@ img.pj-person-ic { width: 22px; height: 22px; }
.pj-dp-navbtn:hover { background: #f1f2f4; color: var(--pj-ink); }
.pj-dp-navbtn .material-symbols-outlined { font-size: 22px; }
.pj-dp-grid { display: grid; grid-template-columns: repeat(7, 1fr); row-gap: 2px; }
.pj-dp-grid { display: grid; grid-template-columns: repeat(7, minmax(0, 1fr)); row-gap: 2px; }
.pj-dp-wd { text-align: center; font-size: 12px; font-weight: 600; color: #6d6e6f; padding: 4px 0 6px; }
.pj-dp-day {
position: relative; height: 34px; border: 0; background: transparent; cursor: pointer;
font: inherit; font-size: 13.5px; color: var(--pj-ink); display: flex; align-items: center; justify-content: center;
position: relative; height: 34px; border: 0; padding: 0; background: transparent; cursor: pointer;
font: inherit; font-size: 13.5px; color: var(--pj-ink);
display: flex; flex-direction: column; align-items: center; justify-content: flex-start; min-width: 0;
}
/* 원(오늘·선택·마우스)은 숫자 자리(위 34px)의 가운데 — 공휴일 이름 줄이 붙어도 그대로 */
.pj-dp-day::before {
content: ""; position: absolute; width: 30px; height: 30px; border-radius: 50%; z-index: 0;
left: 50%; top: 50%; transform: translate(-50%, -50%);
left: 50%; top: 17px; transform: translate(-50%, -50%);
}
.pj-dp-num { height: 34px; display: flex; align-items: center; justify-content: center; flex: none; }
/* 공휴일 이름 — 숫자 밑 작은 글씨. 이 칸이 있는 주만 줄이 높아진다(다른 칸은 34px 그대로 위에 붙음). */
.pj-dp-day.has-hol { height: 46px; }
.pj-dp-hol {
max-width: 100%; margin-top: -3px; padding: 0 1px; box-sizing: border-box;
font-size: 9px; line-height: 1.1; letter-spacing: -.5px; font-weight: 500;
white-space: nowrap; overflow: hidden; text-overflow: ellipsis; color: #d93025;
}
.pj-dp-day.is-out .pj-dp-hol { color: #efaaa3; }
.pj-dp-day { z-index: 0; }
.pj-dp-day > * { position: relative; }
.pj-dp-day:hover::before { background: #f1f2f4; }
@@ -1528,6 +1539,7 @@ img.pj-person-ic { width: 22px; height: 22px; }
.pj-dp-day.is-selected, .pj-dp-day.is-selected.is-sun, .pj-dp-day.is-selected.is-sat { color: #fff; font-weight: 600; }
.pj-dp-day.is-selected::before { background: #4573d2; border: 0; }
.pj-dp-day.is-inrange { background: #e8effb; }
.pj-dp-day.is-selected .pj-dp-hol { color: #d93025; font-weight: 600; }
.pj-dp-day { isolation: isolate; }
.pj-dp-day::before { z-index: -1; }
+8 -1
View File
@@ -256,6 +256,7 @@
const same = d.getFullYear() === new Date().getFullYear();
return (same ? "" : d.getFullYear() + "년 ") + (d.getMonth() + 1) + "월 " + d.getDate() + "일";
}
const HOLIDAY_SHORT = { "부처님오신날": "석가탄신일", "추석·개천절": "추석" };
function pageHolidays() {
try { return JSON.parse((el("pj-data") || {}).textContent || "{}").holidays || {}; } catch (_) { return {}; }
}
@@ -301,8 +302,14 @@
if (iso === today) cls.push("is-today");
if (iso === due || (showStart && iso === start)) cls.push("is-selected");
if (showStart && start && due && iso > start && iso < due) cls.push("is-inrange");
// 공휴일은 숫자 밑에 이름. 칸이 좁아 5글자 안쪽으로 줄인다(전체 이름은 말풍선).
if (holName) cls.push("has-hol");
const holShort = /\s대체$/.test(holName) ? "대체휴일" : (HOLIDAY_SHORT[holName] || holName);
days += '<button type="button" class="' + cls.join(" ") + '" data-iso="' + iso + '"' +
(holName ? ' data-tip="' + escapeHtml(holName) + '"' : "") + ">" + d.getDate() + "</button>";
(holName ? ' data-tip="' + escapeHtml(holName) + '"' : "") + ">" +
'<span class="pj-dp-num">' + d.getDate() + "</span>" +
(holName ? '<span class="pj-dp-hol">' + escapeHtml(holShort) + "</span>" : "") +
"</button>";
}
pop.innerHTML =
'<div class="pj-dp-fields">' +
+1
View File
@@ -79,6 +79,7 @@
삭제는 우클릭 메뉴(줄에 × 없음). 그 하위 작업에도 하위 작업이 있으면 제목 옆에 "N ⤷"
아이콘(`nestedSubsHtml`, `list_tasks` 의 `subtask_total`) — 보드 카드 펼친 목록도 같다.
- **날짜 팝업 색** — 일요일·공휴일(국경일·대체공휴일, `store.KR_HOLIDAYS`) 빨강, 토요일 파랑, 공휴일 이름은 말풍선.
공휴일 날짜는 숫자 밑에 이름(좁아서 "OO 대체"→"대체휴일", `HOLIDAY_SHORT`), 그 주만 줄이 높아진다.
공휴일 표는 `main.py` Jinja 전역 `pj_kr_holidays` → 공용 사이드바 `_side.html` 이 `window.PJ_HOLIDAYS` 로 넘긴다
(새 연도는 `KR_HOLIDAYS` 에만 추가하면 캘린더·타임라인·날짜 팝업 모두 반영).
- **날짜 고르기는 전부 아사나식 날짜 팝업(`openDatePopover`)** — 브라우저 기본 달력(`input[type=date]`)을