diff --git a/app/modules/cupang/templates/cupang/box_calc.html b/app/modules/cupang/templates/cupang/box_calc.html index afb7564..d263e7d 100644 --- a/app/modules/cupang/templates/cupang/box_calc.html +++ b/app/modules/cupang/templates/cupang/box_calc.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {% block content %}
@@ -248,7 +248,8 @@ }); }); var had = Object.keys(alloc).some(function (k) { return alloc[k].length; }); - alloc = {}; // 계산이 바뀌면 이전 배분은 근거가 사라지므로 비운다. + alloc = {}; + stamped = {}; // 계산이 바뀌면 이전 배분은 근거가 사라지므로 비운다. render(); msg.textContent = "계산 완료 (" + calc.results.length + "건)" + (had ? " — 센터 분배 초기화됨" : ""); }) @@ -303,9 +304,12 @@ ""; } - // 배분이 끝난 카드에 찍는 도장. - function stampHtml() { - return '배분 완료'; + // 배분이 끝난 카드에 찍는 도장. 애니메이션은 "이번에 막 완료된" 것만. + var stamped = {}; // key -> 이미 도장이 찍혀 있던 항목 + function stampHtml(key) { + var fresh = !stamped[key]; + stamped[key] = true; + return '배분 완료'; } function kpi(label, value, hint) { @@ -348,11 +352,12 @@ var key = prodKey(r.product_code); var remain = remainFor(key); var used = r.full_boxes - remain; + if (remain) delete stamped[key]; ph += '
' + '
' + '' + esc(r.product_name) + "" + - (remain ? "" : stampHtml()) + + (remain ? "" : stampHtml(key)) + "
" + '
' + "" + remain + "박스" + @@ -376,6 +381,7 @@ m.boxes.forEach(function (b, i) { var key = mixKey(m.box_name, i); var remain = remainFor(key); + if (remain) delete stamped[key]; var items = b.items.map(function (it) { return "
  • " + esc(it.product_name) + "" + it.quantity + "개
    • "; }).join(""); @@ -385,7 +391,7 @@ '
    ' + boxSvg(b.fill_percent, m.box_name) + "
    " + '
    ' + '
    ' + esc(m.box_name) + " 혼합 #" + (i + 1) + - (remain ? "" : stampHtml()) + "
    " + + (remain ? "" : stampHtml(key)) + "
    " + '
      ' + items + "
    " + '
    ' + '
    ' + b.fill_percent + "% 채움 · " + units[key] + "개
    " + diff --git a/app/modules/cupang/templates/cupang/box_rules.html b/app/modules/cupang/templates/cupang/box_rules.html index 4311e53..1444663 100644 --- a/app/modules/cupang/templates/cupang/box_rules.html +++ b/app/modules/cupang/templates/cupang/box_rules.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {% block content %}
    diff --git a/app/modules/cupang/templates/cupang/centers.html b/app/modules/cupang/templates/cupang/centers.html index a33ec2a..94b9de5 100644 --- a/app/modules/cupang/templates/cupang/centers.html +++ b/app/modules/cupang/templates/cupang/centers.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {% block content %}
    diff --git a/app/modules/cupang/templates/cupang/detail.html b/app/modules/cupang/templates/cupang/detail.html index 2a41160..985bfbb 100644 --- a/app/modules/cupang/templates/cupang/detail.html +++ b/app/modules/cupang/templates/cupang/detail.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {% block content %}
    diff --git a/app/modules/cupang/templates/cupang/form.html b/app/modules/cupang/templates/cupang/form.html index 16066ef..82b994e 100644 --- a/app/modules/cupang/templates/cupang/form.html +++ b/app/modules/cupang/templates/cupang/form.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {% block content %}
    diff --git a/app/modules/cupang/templates/cupang/index.html b/app/modules/cupang/templates/cupang/index.html index e456974..b6b0e9e 100644 --- a/app/modules/cupang/templates/cupang/index.html +++ b/app/modules/cupang/templates/cupang/index.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {% block content %}
    diff --git a/app/modules/cupang/templates/cupang/products.html b/app/modules/cupang/templates/cupang/products.html index c5cd319..1d5db97 100644 --- a/app/modules/cupang/templates/cupang/products.html +++ b/app/modules/cupang/templates/cupang/products.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {% block content %}
    diff --git a/app/static/cupang.css b/app/static/cupang.css index 4189f23..08340c9 100644 --- a/app/static/cupang.css +++ b/app/static/cupang.css @@ -748,8 +748,8 @@ body.cpg-dragging { cursor: grabbing; user-select: none; } opacity: .85; transform: rotate(-7deg); box-shadow: inset 0 0 0 1px rgba(29, 95, 208, .25); - animation: cpg-stamp-in .22s ease-out; } +.cpg-stamp.is-new { animation: cpg-stamp-in .22s ease-out; } @keyframes cpg-stamp-in { from { opacity: 0; transform: rotate(-7deg) scale(1.6); } to { opacity: .85; transform: rotate(-7deg) scale(1); } @@ -758,12 +758,13 @@ body.cpg-dragging { cursor: grabbing; user-select: none; } /* 배분이 끝난 카드는 흐리게 — 글자·상자 아이콘 모두 */ .cpg-sum-prod.is-done, .cpg-box-card.is-done { opacity: 1; } .cpg-sum-prod.is-done .cpg-sum-prod-name, +.cpg-box-card.is-done .cpg-box-title { color: var(--color-midtone-gray); } .cpg-sum-prod.is-done .cpg-sum-prod-nums, -.cpg-box-card.is-done .cpg-box-title, .cpg-box-card.is-done .cpg-box-items, .cpg-box-card.is-done .cpg-box-fillnum { color: var(--color-midtone-gray); opacity: .6; } .cpg-sum-prod.is-done .cpg-sum-prod-nums strong, .cpg-box-card.is-done .cpg-box-items b { color: var(--color-midtone-gray); } .cpg-box-card.is-done .cpg-box-svg { filter: grayscale(1); opacity: .45; } .cpg-box-card.is-done .cpg-box-bar { opacity: .4; } -.cpg-sum-prod.is-done .cpg-stamp, .cpg-box-card.is-done .cpg-stamp { opacity: .85; } +/* 도장은 카드가 흐려져도 또렷하게 유지 */ +.cpg-sum-prod.is-done .cpg-stamp, .cpg-box-card.is-done .cpg-stamp { opacity: 1; } diff --git a/tests/js/box_calc_ui.test.js b/tests/js/box_calc_ui.test.js index 1dc7f80..7ffcc9e 100644 --- a/tests/js/box_calc_ui.test.js +++ b/tests/js/box_calc_ui.test.js @@ -123,10 +123,21 @@ function dragCardTo(card, target) { text(".cpg-sum-prod .cpg-sum-prod-nums")); check("잔여 0 카드는 드래그 불가", $$(".cpg-sum-prod")[0].classList.contains("is-done")); check("배분 완료 도장 표시", !!$$(".cpg-sum-prod")[0].querySelector(".cpg-stamp")); + check("막 완료된 도장은 애니메이션", $$(".cpg-sum-prod")[0].querySelector(".cpg-stamp").classList.contains("is-new")); check("제품 카드에 박스명 배지 없음", !$$(".cpg-sum-prod")[0].querySelector(".erp-badge")); check("센터 합계 2박스/16개", text(".cpg-dist-sum").replace(/\s/g, "").startsWith("2박스16개"), text(".cpg-dist-sum")); + // 다른 카드를 담아 다시 렌더해도, 이미 찍힌 도장은 애니메이션을 반복하지 않는다 + $$(".cpg-sum-prod")[1].click(); + $("#cpg-dlg-all").click(); + check("기존 도장은 애니메이션 반복 없음", + !$$(".cpg-sum-prod")[0].querySelector(".cpg-stamp").classList.contains("is-new")); + check("새로 완료된 도장만 애니메이션", + $$(".cpg-sum-prod")[1].querySelector(".cpg-stamp").classList.contains("is-new")); + // 되돌려서 뒷 시나리오에 영향 없게 + $$(".cpg-dist-del")[1].click(); + // ── 수량 직접 수정 (상한 = 잔여 + 자기 수량) ────── const qty = $(".cpg-dist-item .cpg-dist-qty"); qty.value = "5"; fire(qty, "input");