Merge branch 'sub_laptop_1' of C:/Aislo_wt/sub_laptop_1 into main_laptop_1

This commit is contained in:
2026-11-15 13:52:01 +09:00
16 changed files with 191 additions and 108 deletions
+3 -4
View File
@@ -194,7 +194,6 @@ def test_screen_same_part_first_tab():
root = Path(__file__).resolve().parents[2] / "M02_MasterTemplete"
assert not (root / "M02_MasterTemplete_Sangeun_Equation.ts").exists()
tabs = (root / "M02_MasterTemplete_Sangeun_Tabs.ts").read_text(encoding="utf-8")
views = re.findall(r'\{ value: "(\w+)", label: ', tabs)
# 799-2 — 시트 · 인력·재료·경비 · 시험 계산 · 텍스트 수식 걷음
assert views == ["equation", "ho"]
assert 'show("equation");' in tabs
# 799-2 · 836-3 — 시트 · 인력·재료·경비 · 시험 계산 · 텍스트 수식 · 보기 고르기(단가산출 상세 탭) 걷음
assert not re.findall(r'\{ value: "(\w+)", label: ', tabs) and "createSegment" not in tabs
assert "show(true);" in tabs
+4 -2
View File
@@ -56,11 +56,13 @@ def test_걷은_파일_없고_부르는_곳_없음():
)
def test_보기는_수식_단가산출상세_둘():
def test_보기는_수식_하나_고르기_없음():
m01 = _text(M01 / "M01_MasterData_UI_LogicLab_View.ts")
m02 = _text(M02 / "M02_MasterTemplete_Sangeun_Tabs.ts")
for src in (m01, m02):
assert re.findall(r'\{ value: "(\w+)", label: ', src) == ["stack", "ho"] # 804-6
assert not re.findall(r'\{ value: "(\w+)", label: ', src) and "createSegment" not in src
assert "createViewPicker" not in _text(M01 / "M01_MasterData_UI_LogicLab.ts") # 836-3
assert 'editor.dataset.view = "stack";' in _text(M01 / "M01_MasterData_UI_LogicLab.ts")
assert 'export type LabView = "stack" | "ho";' in m01
css = _text(M01 / "M01_MasterData_UI_LogicLab_Style.css")
assert '[data-view="ho"] [data-block]:not([data-block="ho"])' in css
+1 -1
View File
@@ -52,7 +52,7 @@ def test_길_앞머리_M02_공용화면():
assert "/m02/layers/${scope.layer}/sangeun/${encodeURIComponent(key)}/doc${tail}" in tabs
assert "admin: opt.edit" in tabs # 층 쓰기 권한 = 고침
scr = _src("A00_Common/line_stack_screen.ts") # 804-6 수식 탭 = 줄 쌓기
assert "cp ? cp.route(key, path) : opt.base + path" in scr
assert 'cp ? cp.route(saved ? "-" : key, path) : opt.base + path' in scr # 836-5 저장 전 문서 = 길 키 「-」
assert "{ 문서: doc, 끊음: cut, 판: version }" in scr # 저장 몸
detail = _src("M02_MasterTemplete/M02_MasterTemplete_Sangeun_Detail.ts")
assert (
+1 -3
View File
@@ -240,9 +240,7 @@ def test_화면_이음():
'base: "/m01/logic/doc",' in lab and 'cache: "m01_doc_drafts",' in lab
) # 804-7 page = 페이지 [저장]
assert "stack: stack.root" in lab and "=> stack.canLeave();" in lab # 804-6 수식 탭 = 줄 쌓기
assert '{ value: "stack", label: tl("View_Equation") }' in _src(
"M01_MasterData/M01_MasterData_UI_LogicLab_View.ts"
)
assert 'editor.dataset.view = "stack";' in lab # 836-3 보기 고르기 없음 · 수식 하나
assert '[data-view="stack"]' in _src("M01_MasterData/M01_MasterData_UI_LogicLab_Style.css")
tabs = _src("M02_MasterTemplete/M02_MasterTemplete_Sangeun_Tabs.ts")
assert 'cache: "m02_sk_doc_drafts"' in tabs and tabs.count("skDocPath(opt.scope, k, p)") == 1
@@ -56,8 +56,7 @@ def test_보기_수식은_줄쌓기_첫탭():
"M02_MasterTemplete/M02_MasterTemplete_Sangeun_Tabs.ts",
):
src = _text(rel)
assert '{ value: "stack", label: tl("View_Equation") },' in src, rel
assert 'value: "stack",\n' in src and '"equation"' not in src, rel
assert "createSegment" not in src and '"equation"' not in src, rel # 836-3 고르기 없음
lab = _text("M01_MasterData/M01_MasterData_UI_LogicLab.ts")
assert "createStackScreen({" in lab and "createDocScreen" not in lab
@@ -340,7 +340,7 @@ def test_808_1_수량_칸_식_글_꼬리표_글꼴_머리():
assert "opt.tools?.replaceChildren(...tools);" in screen
assert "children: opt.tools ? [] : tools" in screen
tabs = _src("M02_MasterTemplete/M02_MasterTemplete_Sangeun_Tabs.ts")
assert 'stack.root.hidden = tools.hidden = v !== "stack";' in tabs
assert "stack.root.hidden = tools.hidden = !doc;" in tabs
assert 'Reset: ["M01 값으로", "To M01"]' in _src(
"M02_MasterTemplete/M02_MasterTemplete_Main_Actions.ts"
)
+2 -2
View File
@@ -134,7 +134,7 @@ def test_808_1_모달_머리_일원화():
assert "slot: o.slot," in _src("M02_MasterTemplete_Labor_RowSk.ts")
detail = _src("M02_MasterTemplete_Sangeun_Detail.ts")
assert "...(opt.slot\n ? []" in detail # 머리 칸 있으면 옛 단추 줄 없음
assert "children: [tabs.picker, tabs.tools]" in detail
assert "children: [tabs.tools]" in detail and "tabs.picker" not in detail
assert r"/^SK-(?!0{6})\d{6}$/" in detail
tabs = _src("M02_MasterTemplete_Sangeun_Tabs.ts")
assert 'if (!k && !opt.page && view === "stack")' in tabs
assert "const doc = !!k || !!opt.page || !!opt.memory?.();" in tabs # 836-3 · 836-5 문서 없는 줄 = 상세 몸만
+73
View File
@@ -0,0 +1,73 @@
# ruff: noqa: F811 — 임시 층 fixture(world)를 test_m02_labor_ref 에서 받아 씀
"""836-5 저장 전 단가산출(불러오기 미리 보기)도 수식 보기 — 임시 storage · M01 그대로.
① 미리 보기 문서째 수식 길 읽기(`Sk_Path.read_memory`) = 디스크 쓰기 0 · 금액 = 저장한 SK 를 읽은 값 · 미리 셈(`본`)도 쓰기 0
② 화면 — 줄 쌓기가 빈 키 + 저장 전 문서를 서버에 문서째 읽힘 · 왼쪽은 보기만 · 탭은 그 문서가 있을 때만 수식
실무 엑셀 없으면 ① skip.
"""
from __future__ import annotations
from pathlib import Path
import helper_m02_hopyo_golden as golden
import pytest
from M02_MasterTemplete import M02_Doc_Sk_Path as path
from M02_MasterTemplete import M02_Hopyo_Excel as hx
from M02_MasterTemplete import M02_Hopyo_Store as hs
from M02_MasterTemplete import M02_MasterTemplete_Store as store
from M02_MasterTemplete import M02_Sangeun_FromHopyo as fh
from resources.tester.test_m02_labor_ref import world # noqa: F401 — 같은 임시 층
ROOT = Path(__file__).resolve().parents[2]
def _files(folder: Path) -> dict[str, int]:
return {str(p.relative_to(folder)): p.stat().st_mtime_ns for p in folder.rglob("*") if p.is_file()} # fmt: skip
@pytest.mark.parametrize(
("tag", "no"), [("봉화", 3), ("북부청임도", 2)]
) # STmate 원파일 · 엑셀(EST)
def test_memory_doc_read_writes_nothing_same_as_saved(world, tag, no) -> None:
src = golden.FILES.get(tag)
if src is None or not src.exists():
pytest.skip(f"실무 엑셀 없음 {tag}")
folder, data = world["personal"], src.read_bytes()
with store.at(folder):
parsed = hx.read_book(src.name, data)
row = hs.save(folder, src.name, parsed, {"이름": "sub1임시"}, None, hs.fingerprint(data))
fh.keep(folder, row["키"], src.name, data)
with store.at(folder):
seen = fh.draft(folder, row["키"], no)
before = _files(folder)
got = path.read_memory(seen["문서"]) # 저장 전 문서째
asked = path.preview("-", {"본": seen["문서"], "문서": got["문서"]}) # 미리 셈
assert _files(folder) == before # 읽기 · 미리 셈 = 디스크 쓰기 0
assert got["판"] == "" and got["셈"] and asked["셈"] == got["셈"]
made = fh.make(folder, row["키"], no, doc=seen["문서"]) # [저장]
saved = path.read(made["이름"])
assert saved["셈"] == got["셈"] # 금액 = 저장한 SK 와 같음
with pytest.raises(store.StoreError):
path.read_memory("문서 아님")
def test_screen_memory_doc_stack_view() -> None:
stack = (ROOT / "A00_Common" / "line_stack_screen.ts").read_text(encoding="utf-8")
assert "memory?: () => Record<string, unknown> | null;" in stack
assert 'cp.route(saved ? "-" : key, path)' in stack and "본: saved" in stack
assert 'call<Loaded>("/read", {})' in stack and "left.inert = !!mem();" in stack
tabs = (ROOT / "M02_MasterTemplete" / "M02_MasterTemplete_Sangeun_Tabs.ts").read_text(
encoding="utf-8"
)
assert (
"const doc = !!k || !!opt.page || !!opt.memory?.();" in tabs
and "memory: opt.memory," in tabs
)
detail = (ROOT / "M02_MasterTemplete" / "M02_MasterTemplete_Sangeun_Detail.ts").read_text(
encoding="utf-8"
)
assert "doc.가져온 &&" in detail and "memory: () =>" in detail
router = (ROOT / "M02_MasterTemplete" / "M02_Doc_Router.py").read_text(encoding="utf-8")
assert '"/layers/{layer}/sangeun/-/doc/read"' in router and "write=body.본 is None" in router