feat(project): add meeting cell editing
Apply project_db migration 019 to enable vertical cell merges. Other cell editing remains available before migration.
This commit is contained in:
@@ -19,7 +19,7 @@ const server = http.createServer(function (req, res) {
|
||||
res.setHeader("Content-Type", "text/html; charset=utf-8"); res.end(html); return;
|
||||
}
|
||||
if (url.pathname === "/project/goals/2026/meetings/9") {
|
||||
const fixture = url.searchParams.has("readonly") ? "meeting_layout_ro.html" : "meeting_layout_admin.html";
|
||||
const fixture = url.searchParams.has("merged") ? "meeting_merged.html" : url.searchParams.has("readonly") ? "meeting_layout_ro.html" : "meeting_layout_admin.html";
|
||||
const html = fs.readFileSync(path.join(__dirname, ".out", fixture), "utf8")
|
||||
.replace('<link rel="stylesheet"', '<link rel="stylesheet" href="/static/erp.css"><link rel="stylesheet" href="/static/erp-shell.css"><link rel="stylesheet"')
|
||||
.replace("<body>", '<body style="font-family:var(--pj-font)"><div class="erp-app">')
|
||||
@@ -249,12 +249,12 @@ const server = http.createServer(function (req, res) {
|
||||
checkMeeting(initial, 3);
|
||||
assert(Math.abs(initial.short - initial.line * 2 - initial.top - initial.bottom) <= 1, JSON.stringify(initial));
|
||||
if (!readonly) {
|
||||
await meetingPage.locator('tr[data-item="2"] textarea').fill("한 줄");
|
||||
await meetingPage.locator('tr[data-item="2"] .pj-meet-text').fill("한 줄");
|
||||
await meetingPage.locator('tr[data-item="2"] .is-prev .pj-meet-ro').evaluate(e => { e.textContent = "한 줄"; });
|
||||
const smaller = await meetingMetrics();
|
||||
checkMeeting(smaller, 1);
|
||||
assert(smaller.row < initial.row);
|
||||
await meetingPage.locator('tr[data-item="2"] textarea').fill("첫 번째 줄\n두 번째 줄\n세 번째 줄");
|
||||
await meetingPage.locator('tr[data-item="2"] .pj-meet-text').fill("첫 번째 줄\n두 번째 줄\n세 번째 줄");
|
||||
}
|
||||
await meetingPage.evaluate(function () {
|
||||
document.documentElement.classList.add("pj-ui-scale");
|
||||
@@ -266,6 +266,90 @@ const server = http.createServer(function (req, res) {
|
||||
console.log("PASS meeting row height, equal padding, top alignment, inline automatic/unused labels, shrink and 75% zoom" + (readonly ? " (read-only)" : ""));
|
||||
}
|
||||
|
||||
const meetingEditing = await browser.newPage({ viewport: { width: 1600, height: 1000 } });
|
||||
let releaseMeetingMove, meetingMoveStarted;
|
||||
const meetingMoveGate = new Promise(resolve => { releaseMeetingMove = resolve; });
|
||||
const meetingMoveStart = new Promise(resolve => { meetingMoveStarted = resolve; });
|
||||
const meetingWrites = [], meetingErrors = [];
|
||||
meetingEditing.on("pageerror", e => meetingErrors.push(e.message));
|
||||
await meetingEditing.route("**/project/api/**", async function (route) {
|
||||
const req = route.request();
|
||||
if (req.method() !== "GET") meetingWrites.push({ url: req.url(), body: req.postDataJSON() });
|
||||
if (req.url().endsWith("/meeting-cells/move")) {
|
||||
meetingMoveStarted(); await meetingMoveGate;
|
||||
await route.fulfill({ json: { ok: true, body: req.postDataJSON().source_body } });
|
||||
} else await route.fulfill({ json: { ok: true } });
|
||||
});
|
||||
await meetingEditing.goto("http://127.0.0.1:" + server.address().port + "/project/goals/2026/meetings/9");
|
||||
const meetingSource = meetingEditing.locator('tr[data-item="2"] .pj-meet-text');
|
||||
const meetingTarget = meetingEditing.locator('tr[data-item="3"] .pj-meet-text');
|
||||
await meetingSource.fill("앞 선택 뒤");
|
||||
await meetingSource.evaluate(function (e) {
|
||||
const r = document.createRange(); r.setStart(e.firstChild, 2); r.setEnd(e.firstChild, 4);
|
||||
window.getSelection().removeAllRanges(); window.getSelection().addRange(r);
|
||||
e.dispatchEvent(new MouseEvent("mouseup", { bubbles: true }));
|
||||
});
|
||||
for (const name of ["굵게", "기울임", "밑줄", "글자 크기 2px 키우기"]) await meetingEditing.getByRole("button", { name: name, exact: true }).click();
|
||||
await meetingEditing.getByRole("button", { name: "글자 색상", exact: true }).click();
|
||||
await meetingEditing.getByRole("button", { name: "#DC2626", exact: true }).click();
|
||||
const meetingRich = await meetingSource.evaluate(e => e.value);
|
||||
const selectedRun = JSON.parse(meetingRich.slice(11))[1];
|
||||
assert(selectedRun.bold && selectedRun.italic && selectedRun.underline && selectedRun.color === "#dc2626" && selectedRun.size === 16);
|
||||
await meetingSource.click();
|
||||
const meetingEdge = await meetingSource.locator("..").locator('.pj-goal-move-edge[data-edge="bottom"]').boundingBox();
|
||||
const meetingDest = await meetingTarget.locator("..").boundingBox();
|
||||
await meetingEditing.mouse.move(meetingEdge.x + meetingEdge.width / 2, meetingEdge.y + meetingEdge.height / 2);
|
||||
await meetingEditing.mouse.down();
|
||||
await meetingEditing.mouse.move(meetingDest.x + meetingDest.width / 2, meetingDest.y + meetingDest.height / 2, { steps: 5 });
|
||||
assert(await meetingTarget.locator("..").evaluate(td => td.classList.contains("is-goal-move-target")));
|
||||
await meetingEditing.mouse.up();
|
||||
await Promise.race([meetingMoveStart, new Promise((resolve, reject) => setTimeout(() => reject(new Error("meeting move request did not start")), 3000))]);
|
||||
assert.equal(await meetingSource.evaluate(e => e.value), meetingRich);
|
||||
releaseMeetingMove();
|
||||
await meetingEditing.waitForFunction(() => document.querySelector('tr[data-item="2"] .pj-meet-text').value === "");
|
||||
assert.equal(await meetingTarget.evaluate(e => e.value), meetingRich);
|
||||
assert(meetingWrites.findIndex(r => r.url.endsWith("/meeting-items/2")) < meetingWrites.findIndex(r => r.url.endsWith("/meeting-cells/move")));
|
||||
await meetingTarget.evaluate(e => { e.value = "명시적 줄바꿈\n너비 자동 맞춤은 이 문단 전체에 맞춥니다"; e.dispatchEvent(new Event("input", { bubbles: true })); });
|
||||
await meetingTarget.locator("..").locator(".pj-meet-colresize").dblclick();
|
||||
const fittedMeeting = await meetingEditing.locator('col[data-meet-col="content"]').evaluate(c => parseFloat(c.style.width));
|
||||
assert(fittedMeeting > 200);
|
||||
await meetingEditing.locator("#pj-meet-order").click();
|
||||
await meetingEditing.waitForFunction(() => document.getElementById("pj-meet-table").classList.contains("is-prev-first"));
|
||||
assert.equal(await meetingTarget.locator("..").getAttribute("data-meet-cols"), "content");
|
||||
await meetingEditing.evaluate(() => { document.documentElement.classList.add("pj-ui-scale"); window.dispatchEvent(new Event("resize")); });
|
||||
await meetingTarget.locator("..").locator(".pj-meet-colresize").dblclick();
|
||||
const zoomedMeeting = await meetingEditing.locator('col[data-meet-col="content"]').evaluate(c => parseFloat(c.style.width));
|
||||
assert(Math.abs(fittedMeeting - zoomedMeeting) <= 1, JSON.stringify({ fittedMeeting, zoomedMeeting }));
|
||||
await meetingTarget.click({ button: "right" });
|
||||
await meetingEditing.getByRole("menuitem", { name: "전체 열 너비 자동 맞춤" }).click();
|
||||
assert(await meetingEditing.evaluate(() => Object.keys(JSON.parse(localStorage.getItem("pj_meet_col_w"))).length === 9));
|
||||
assert.deepEqual(meetingErrors, []);
|
||||
await meetingEditing.locator("#pj-meet-table").screenshot({ path: path.join(__dirname, ".out", "meeting-cell-editing.png") });
|
||||
await meetingEditing.close();
|
||||
console.log("PASS actual meeting formatting, border move, draft save ordering, width fitting, review order and 75% zoom");
|
||||
|
||||
const mergedMeeting = await browser.newPage({ viewport: { width: 1600, height: 1000 } });
|
||||
const mergedErrors = []; mergedMeeting.on("pageerror", e => mergedErrors.push(e.message));
|
||||
await mergedMeeting.goto("http://127.0.0.1:" + server.address().port + "/project/goals/2026/meetings/9?merged");
|
||||
const mergedCell = mergedMeeting.locator('td[data-meet-item="2"]');
|
||||
assert.equal(await mergedCell.getAttribute("rowspan"), "2");
|
||||
assert.equal(await mergedMeeting.locator('td[data-meet-item="3"]').count(), 0);
|
||||
for (const order of [false, true]) {
|
||||
if (order) await mergedMeeting.locator("#pj-meet-order").click();
|
||||
await mergedMeeting.waitForFunction(() => document.querySelector('tr[data-item="3"] td.pj-meet-c-amt').dataset.meetCols === "target");
|
||||
const geometry = await mergedMeeting.evaluate(() => {
|
||||
const rect = el => el.getBoundingClientRect();
|
||||
const a = rect(document.querySelector('td[data-meet-item="2"]'));
|
||||
const b = rect(document.querySelector('tr[data-item="3"] td.pj-meet-c-amt'));
|
||||
const t = rect(document.querySelector('tr[data-item="2"] td.pj-meet-c-amt'));
|
||||
return { sameColumn: Math.abs(b.left - t.left) < 1, sameBottom: Math.abs(a.bottom - b.bottom) < 1, disjoint: a.right <= b.left + 1 };
|
||||
});
|
||||
assert(geometry.sameColumn && geometry.sameBottom && geometry.disjoint, JSON.stringify(geometry));
|
||||
await mergedCell.locator(".pj-meet-colresize").dblclick();
|
||||
}
|
||||
assert.deepEqual(mergedErrors, []); await mergedMeeting.close();
|
||||
console.log("PASS merged meeting rowspan, independent numeric cells and both column orders");
|
||||
|
||||
const interactive = await browser.newPage({ viewport: { width: 1600, height: 1000 } });
|
||||
let releaseMove, startedMove;
|
||||
const moveGate = new Promise(function (resolve) { releaseMove = resolve; });
|
||||
|
||||
Reference in New Issue
Block a user