diff --git a/app/modules/project/templates/project/help.html b/app/modules/project/templates/project/help.html
index 0dc8744..7891e1c 100644
--- a/app/modules/project/templates/project/help.html
+++ b/app/modules/project/templates/project/help.html
@@ -1,7 +1,7 @@
{% extends "erp_base.html" %}
{% block head_extra %}
-
+
{% endblock %}
diff --git a/app/modules/project/templates/project/inbox.html b/app/modules/project/templates/project/inbox.html
index 7f2f746..2c8b17d 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 %}
@@ -104,5 +104,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 c8371eb..00b8a83 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 %}
@@ -100,5 +100,5 @@
"today": {{ today | tojson }}
}
-
+
{% endblock %}
diff --git a/app/modules/project/templates/project/project.html b/app/modules/project/templates/project/project.html
index 52dbc90..75e2c63 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 %}
-
+
@@ -491,5 +491,5 @@
-
+
{% endblock %}
diff --git a/app/modules/project/templates/project/trash.html b/app/modules/project/templates/project/trash.html
index 1f22a91..d248566 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 %}
@@ -70,5 +70,5 @@
{% include "project/_side_modals.html" %}
{% include "project/_member_tasks_modal.html" %}
-
+
{% endblock %}
diff --git a/app/static/project.css b/app/static/project.css
index df0e5fa..cccf3c6 100644
--- a/app/static/project.css
+++ b/app/static/project.css
@@ -1515,13 +1515,17 @@ img.pj-person-ic { width: 22px; height: 22px; }
.pj-dp-day { z-index: 0; }
.pj-dp-day > * { position: relative; }
.pj-dp-day:hover::before { background: #f1f2f4; }
-.pj-dp-day.is-weekend, .pj-dp-day.is-out { color: #8b929b; }
.pj-dp-day.is-out { color: #b3b8bf; }
+/* 일요일·공휴일(국경일·대체공휴일) 빨강, 토요일 파랑 — 다른 달 날짜는 옅게 */
+.pj-dp-day.is-sun, .pj-dp-wd.is-sun { color: #d93025; }
+.pj-dp-day.is-sat, .pj-dp-wd.is-sat { color: #1a73e8; }
+.pj-dp-day.is-out.is-sun { color: #efaaa3; }
+.pj-dp-day.is-out.is-sat { color: #a8c6f3; }
/* 오늘 = 파란 테두리 원 + 굵게 */
.pj-dp-day.is-today { font-weight: 800; }
.pj-dp-day.is-today::before { border: 1.5px solid #4573d2; }
/* 선택 = 파란 원 + 흰 글자 (숫자가 원 위에 보이도록 글자는 z 위로) */
-.pj-dp-day.is-selected { color: #fff; font-weight: 600; }
+.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 { isolation: isolate; }
diff --git a/app/static/project.js b/app/static/project.js
index 5285d67..a5c6cb5 100644
--- a/app/static/project.js
+++ b/app/static/project.js
@@ -256,6 +256,9 @@
const same = d.getFullYear() === new Date().getFullYear();
return (same ? "" : d.getFullYear() + "년 ") + (d.getMonth() + 1) + "월 " + d.getDate() + "일";
}
+ function pageHolidays() {
+ try { return JSON.parse((el("pj-data") || {}).textContent || "{}").holidays || {}; } catch (_) { return {}; }
+ }
function openDatePopover(anchor, opts) {
closeDatePopover();
const today = isoToday();
@@ -265,6 +268,8 @@
let active = "due";
const base = new Date((due || start || today) + "T00:00:00");
let viewY = base.getFullYear(), viewM = base.getMonth();
+ // 공휴일 표 — 공용 사이드바가 넘긴 것(모든 프로젝트 화면), 없으면 프로젝트 화면 데이터.
+ const holidays = window.PJ_HOLIDAYS || pageHolidays();
const pop = document.createElement("div");
pop.className = "pj-datepop";
@@ -289,11 +294,15 @@
const iso = isoOf(d);
const cls = ["pj-dp-day"];
if (d.getMonth() !== viewM) cls.push("is-out");
- if (d.getDay() === 0 || d.getDay() === 6) cls.push("is-weekend");
+ // 일요일·공휴일(국경일·대체공휴일 포함) = 빨강, 토요일 = 파랑. 공휴일 이름은 말풍선.
+ const holName = holidays[iso] || "";
+ if (d.getDay() === 0 || holName) cls.push("is-sun");
+ else if (d.getDay() === 6) cls.push("is-sat");
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");
- days += '' + d.getDate() + " ";
+ days += '" + d.getDate() + " ";
}
pop.innerHTML =
'' +
@@ -308,7 +317,9 @@
'chevron_right ' +
"
" +
'' +
- ["일", "월", "화", "수", "목", "금", "토"].map(function (w) { return '' + w + " "; }).join("") +
+ ["일", "월", "화", "수", "목", "금", "토"].map(function (w, i) {
+ return '' + w + " ";
+ }).join("") +
days +
"
" +
'