diff --git a/app/modules/performance/templates/performance/ads.html b/app/modules/performance/templates/performance/ads.html index 028a75a..89115e4 100644 --- a/app/modules/performance/templates/performance/ads.html +++ b/app/modules/performance/templates/performance/ads.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {#- ROAS 덧붙임 — "광고비(ROAS%)". 광고비가 없으면 아무것도 안 붙는다. -#} {%- macro roas(p) -%}{%- if p is not none -%}({{ "{:,}".format(p) }}%){%- endif -%}{%- endmacro -%} @@ -241,4 +241,4 @@ } | tojson }} {% endblock %} -{% block scripts %}{% endblock %} +{% block scripts %}{% endblock %} diff --git a/app/modules/performance/templates/performance/index.html b/app/modules/performance/templates/performance/index.html index 3057009..2fd2578 100644 --- a/app/modules/performance/templates/performance/index.html +++ b/app/modules/performance/templates/performance/index.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {%- macro won(v) -%} {%- if v is none -%} @@ -292,4 +292,4 @@ } | tojson }} {% endblock %} -{% block scripts %}{% endblock %} +{% block scripts %}{% endblock %} diff --git a/app/modules/performance/templates/performance/settings.html b/app/modules/performance/templates/performance/settings.html index a9bb220..c2167d6 100644 --- a/app/modules/performance/templates/performance/settings.html +++ b/app/modules/performance/templates/performance/settings.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {%- macro when(v) -%}{{ (v or '')[:16] | replace('T', ' ') or '—' }}{%- endmacro -%} @@ -316,4 +316,4 @@ {% endblock %} -{% block scripts %}{% endblock %} +{% block scripts %}{% endblock %} diff --git a/app/static/performance.css b/app/static/performance.css index 368ea7c..9d48473 100644 --- a/app/static/performance.css +++ b/app/static/performance.css @@ -394,8 +394,19 @@ td.is-link:hover { background: #eef2ff; text-decoration: underline; } .perf-day.is-sun span { color: var(--perf-sun); } .perf-day input:checked + span { background: #111; border-color: #111; color: #fff; } .perf-day input:focus-visible + span { outline: 2px solid var(--perf-good); outline-offset: 1px; } -.perf-auto-time { width: auto; padding-right: 22px; } -.perf-auto-interval { width: 76px; } +/* 공용 .erp-input 은 min-width 240px — 이 카드는 글자 너비만큼 */ +#perf-auto-sync .perf-auto-time { min-width: 0; width: auto; padding-right: 4px; } +#perf-auto-sync .perf-auto-interval { min-width: 0; width: calc(3ch + 40px); } +/* 시간 오른쪽 아날로그 시계 — 시작 ~ 끝 바늘 사이를 빨갛게(12시간 넘는 부분은 진하게 한 번 더) */ +.perf-auto-clock { width: 64px; height: 64px; flex: 0 0 auto; margin-left: 6px; } +.perf-auto-clock .c-face { fill: #fff; stroke: #c9c9c9; stroke-width: 1.5; } +.perf-auto-clock .c-span { fill: var(--perf-down); fill-opacity: .78; } +.perf-auto-clock .c-span2 { fill: #8f1414; fill-opacity: .85; } +.perf-auto-clock .c-tick { stroke: #9a9a9a; stroke-width: 1.5; stroke-linecap: round; } +.perf-auto-clock .c-tick.is-major { stroke: #333; stroke-width: 2.5; } +.perf-auto-clock .c-hand { stroke: #111; stroke-width: 3; stroke-linecap: round; } +.perf-auto-clock .c-hand.is-end { stroke-width: 2.2; } +.perf-auto-clock .c-pin { fill: #111; } .perf-auto-next { grid-column: 2; } .perf-auto-actions { display: flex; align-items: center; gap: 10px; margin-top: 6px; } #perf-auto-msg.is-ok { color: var(--perf-up); } diff --git a/app/static/performance.js b/app/static/performance.js index b2a623f..1ce548a 100644 --- a/app/static/performance.js +++ b/app/static/performance.js @@ -1071,8 +1071,43 @@ return ""; } function dirty() { msg.textContent = "바뀐 내용이 있습니다 — [저장]을 누르세요."; msg.classList.remove("is-ok"); } + // 아날로그 시계(12시간 문자판) — 시작 바늘 ~ 끝 바늘 사이(시계 방향)를 빨갛게, 12시간을 넘는 부분은 진한 빨강으로 한 번 더 + function drawClock(row) { + const svg = row.querySelector(".perf-auto-clock"); + if (!svg) return; + const s = read(row); + function mins(hhmm) { const p = hhmm.split(":"); return Number(p[0]) * 60 + Number(p[1]); } + const a = mins(s.start), b = mins(s.end), R = 44; + function pt(m, r) { const t = (m % 720) / 720 * 2 * Math.PI; return [(r * Math.sin(t)).toFixed(2), (-r * Math.cos(t)).toFixed(2)]; } + function sector(from, len, cls) { + if (len <= 0) return ""; + if (len >= 720) return ''; + const p0 = pt(from, R), p1 = pt(from + len, R); + return ' 360 ? 1 : 0) + " 1 " + + p1[0] + " " + p1[1] + 'Z"/>'; + } + let g = '' + sector(a, Math.min(b - a, 720), "c-span") + sector(a + 720, b - a - 720, "c-span2"); + for (let h = 0; h < 12; h++) { + const major = h % 3 === 0, o = pt(h * 60, 46), i = pt(h * 60, major ? 36 : 40); + g += ''; + } + const hs = pt(a, 30), he = pt(b, 38); + g += '' + + ''; + const span = b - a, hours = Math.floor(span / 60), rest = span % 60; + const title = s.start + " ~ " + s.end + " (" + (hours ? hours + "시간" : "") + (rest ? (hours ? " " : "") + rest + "분" : "") + (span ? "" : "한 번") + ")"; + svg.innerHTML = "" + title + "" + g; + svg.setAttribute("aria-label", "자동 업데이트 시간대 " + title); + } card.querySelectorAll(".perf-auto-row").forEach(function (row) { - row.addEventListener("change", function () { row.classList.toggle("is-off", !read(row).enabled); dirty(); }); + const tf = row.querySelector('[data-t="end-m"]').closest(".perf-auto-field"); + const svg = document.createElementNS("http://www.w3.org/2000/svg", "svg"); + svg.setAttribute("class", "perf-auto-clock"); + svg.setAttribute("viewBox", "-50 -50 100 100"); + svg.setAttribute("role", "img"); + tf.appendChild(svg); + drawClock(row); + row.addEventListener("change", function () { row.classList.toggle("is-off", !read(row).enabled); drawClock(row); dirty(); }); row.querySelectorAll("[data-days]").forEach(function (b) { b.addEventListener("click", function () { row.querySelectorAll("[data-day]").forEach(function (c) { diff --git a/tests/js/perf_auto_sync.browser.test.js b/tests/js/perf_auto_sync.browser.test.js index c254bfb..f3ab5b6 100644 --- a/tests/js/perf_auto_sync.browser.test.js +++ b/tests/js/perf_auto_sync.browser.test.js @@ -39,6 +39,9 @@ function page(file, edit) { sales: { schedule: body.sales, label: "매일 08:30~19:00 · 15분마다", next_at: "2026-10-27T08:30:00+09:00" }, ads: { schedule: body.ads, label: "꺼짐", next_at: "" } }) }); } + // 공용 CSS(erp.css — .erp-input min-width 240px 등)는 진짜로 싣는다: 칸 너비가 운영 화면과 같게 + const shared = /\/static\/(erp(?:-shell)?\.css)/.exec(req.url()); + if (shared) return r.fulfill({ status: 200, contentType: "text/css", body: fs.readFileSync(path.join(ROOT, "app", "static", shared[1]), "utf8") }); if (req.url().indexOf("/static/") >= 0) return r.fulfill({ status: 200, body: "" }); r.fulfill({ status: 200, contentType: "text/html; charset=utf-8", body: page("perf_settings_shell.html") }); }); @@ -63,6 +66,48 @@ function page(file, edit) { const minuteOpts = await p.$$eval('[data-kind="sales"] [data-t="start-m"] option', function (os) { return os.map(function (o) { return o.value; }); }); check("분은 5분 단위(00~55)", minuteOpts.length === 12 && minuteOpts[1] === "05" && minuteOpts[11] === "55", minuteOpts); + // 시간·간격 칸 = 글자 너비만큼(공용 .erp-input min-width 240px 를 덮음) + const widths = await p.evaluate(function () { + const w = function (sel) { return Math.round(document.querySelector('[data-kind="sales"] ' + sel).getBoundingClientRect().width); }; + return { hour: w('[data-t="start-h"]'), minute: w('[data-t="start-m"]'), interval: w('[data-f="interval"]') }; + }); + check("시간·간격 칸이 글자 너비만큼", widths.hour < 110 && widths.minute < 110 && widths.interval < 100, widths); + + // 아날로그 시계 — 시간 오른쪽, 시작 ~ 끝 사이 빨간 부채꼴 + const clock = function (kind) { + return p.evaluate(function (k) { + const row = document.querySelector('[data-kind="' + k + '"]'), svg = row.querySelector(".perf-auto-clock"); + if (!svg) return null; + const field = svg.closest(".perf-auto-field"), end = row.querySelector('[data-t="end-m"]'); + const span = svg.querySelector(".c-span"); + return { inTimeField: field === end.closest(".perf-auto-field"), + rightOfTime: svg.getBoundingClientRect().left >= end.getBoundingClientRect().right, + span: span ? (span.getAttribute("d") || "circle") : "", span2: !!svg.querySelector(".c-span2"), + ticks: svg.querySelectorAll(".c-tick").length, hands: svg.querySelectorAll(".c-hand").length, + title: (svg.querySelector("title") || {}).textContent || "", + fill: span ? getComputedStyle(span).fill : "" }; + }, kind); + }; + let ck = await clock("sales"); + check("시계가 시간 오른쪽에", ck && ck.inTimeField && ck.rightOfTime, ck); + check("시계: 눈금 12 · 바늘 2(시작·끝)", ck && ck.ticks === 12 && ck.hands === 2, ck); + // 09:00 → 19:00 = 9시 방향에서 시계 방향 10시간(큰 호) — 9시 = (-44, 0), 7시 = (-22, 38.1) + check("시계: 09:00~19:00 빨간 부채꼴", ck && ck.span === "M0 0L-44.00 0.00A44 44 0 1 1 -22.00 38.11Z" && !ck.span2, ck && ck.span); + check("시계: 빨강", ck && /^rgb\((\d+)/.exec(ck.fill) && Number(/^rgb\((\d+)/.exec(ck.fill)[1]) > 150, ck && ck.fill); + check("시계: 시간대 풀이", ck && ck.title === "09:00 ~ 19:00 (10시간)", ck && ck.title); + await p.selectOption('[data-kind="sales"] [data-t="end-h"]', "11"); + await p.selectOption('[data-kind="sales"] [data-t="end-m"]', "30"); + ck = await clock("sales"); + // 11:30 = 345° → (-11.39, -42.50), 2시간 30분 = 75° 작은 호 + check("시간 바꾸면 시계도(09:00~11:30 작은 호)", ck.span === "M0 0L-44.00 0.00A44 44 0 0 1 -11.39 -42.50Z" && ck.title === "09:00 ~ 11:30 (2시간 30분)", ck); + await p.selectOption('[data-kind="sales"] [data-t="start-h"]', "05"); + await p.selectOption('[data-kind="sales"] [data-t="end-h"]', "21"); + ck = await clock("sales"); + check("12시간 넘으면 한 바퀴 + 넘친 부분 진하게", ck.span === "circle" && ck.span2 && ck.title === "05:00 ~ 21:30 (16시간 30분)", ck); + await p.selectOption('[data-kind="sales"] [data-t="start-h"]', "09"); + await p.selectOption('[data-kind="sales"] [data-t="end-h"]', "19"); + await p.selectOption('[data-kind="sales"] [data-t="end-m"]', "00"); + const noOverflow = function () { return p.evaluate(function () { // 카드만 본다 — 테스트는 erp.css·아이콘 글꼴을 싣지 않아 다른 표·아이콘이 페이지를 넓힌다