Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bf33d0a543 | ||
|
|
64bb7f9c37 | ||
|
|
6f3f1c40e7 | ||
|
|
164ce54adf | ||
|
|
6877919133 | ||
|
|
5ec70599aa | ||
|
|
7e4469b29a | ||
|
|
08af4cd0ae | ||
|
|
eb279a87a9 | ||
|
|
ea3b595b32 | ||
|
|
e9b432bec6 |
4
package-lock.json
generated
4
package-lock.json
generated
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "app-ts",
|
"name": "app-ts",
|
||||||
"version": "2.4.24",
|
"version": "2.4.29",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "app-ts",
|
"name": "app-ts",
|
||||||
"version": "2.4.24",
|
"version": "2.4.29",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@anthropic-ai/sdk": "^0.102.0",
|
"@anthropic-ai/sdk": "^0.102.0",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "app-ts",
|
"name": "app-ts",
|
||||||
"version": "2.4.24",
|
"version": "2.4.29",
|
||||||
"description": "",
|
"description": "",
|
||||||
"main": "dist/server.js",
|
"main": "dist/server.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -0,0 +1,3 @@
|
|||||||
|
-- AlterTable
|
||||||
|
ALTER TABLE `project_notes` ADD COLUMN `edited_at` DATETIME(0) NULL;
|
||||||
|
|
||||||
@@ -457,6 +457,7 @@ model project_notes {
|
|||||||
user_name String? @db.VarChar(100)
|
user_name String? @db.VarChar(100)
|
||||||
content String? @db.Text
|
content String? @db.Text
|
||||||
created_at DateTime? @default(now()) @db.DateTime(0)
|
created_at DateTime? @default(now()) @db.DateTime(0)
|
||||||
|
edited_at DateTime? @db.DateTime(0)
|
||||||
projects projects @relation(fields: [project_id], references: [id], onDelete: Cascade, onUpdate: NoAction, map: "project_notes_ibfk_1")
|
projects projects @relation(fields: [project_id], references: [id], onDelete: Cascade, onUpdate: NoAction, map: "project_notes_ibfk_1")
|
||||||
|
|
||||||
@@index([project_id], map: "project_id")
|
@@index([project_id], map: "project_id")
|
||||||
|
|||||||
@@ -765,6 +765,34 @@ describe("ai-tools — employees, attendance detail, trips, work plan", () => {
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("get_document_totals: received_invoices sums gross + converts to CZK", async () => {
|
||||||
|
// invoices.view alone unlocks the received-invoices branch.
|
||||||
|
const res = await executeTool(
|
||||||
|
"get_document_totals",
|
||||||
|
{ type: "received_invoices", month: 6, year: 2098 },
|
||||||
|
VIEWER_INVOICES,
|
||||||
|
);
|
||||||
|
expect(res.ok).toBe(true);
|
||||||
|
const r = res.result as {
|
||||||
|
period: string;
|
||||||
|
invoice_count: number;
|
||||||
|
totals: { currency: string; amount: number }[];
|
||||||
|
total_czk: number;
|
||||||
|
};
|
||||||
|
expect(r.period).toBe("6/2098");
|
||||||
|
expect(r.invoice_count).toBe(1);
|
||||||
|
expect(r.totals).toEqual([{ currency: "CZK", amount: 1210 }]);
|
||||||
|
expect(r.total_czk).toBe(1210); // CZK rows convert 1:1, no rate fetch
|
||||||
|
|
||||||
|
// orders.view alone cannot read expense totals.
|
||||||
|
const denied = await executeTool(
|
||||||
|
"get_document_totals",
|
||||||
|
{ type: "received_invoices" },
|
||||||
|
{ userId: 999999998, roleName: "viewer", permissions: ["orders.view"] },
|
||||||
|
);
|
||||||
|
expect(denied.ok).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
it("get_top_customers aggregates per customer across the whole table", async () => {
|
it("get_top_customers aggregates per customer across the whole table", async () => {
|
||||||
const res = await executeTool(
|
const res = await executeTool(
|
||||||
"get_top_customers",
|
"get_top_customers",
|
||||||
|
|||||||
55
src/__tests__/pdf-shared.test.ts
Normal file
55
src/__tests__/pdf-shared.test.ts
Normal file
@@ -0,0 +1,55 @@
|
|||||||
|
import { describe, it, expect } from "vitest";
|
||||||
|
import { cleanQuillHtml } from "../utils/pdf-shared";
|
||||||
|
|
||||||
|
describe("cleanQuillHtml — inline-style whitelist", () => {
|
||||||
|
it("keeps Quill text and background colors", () => {
|
||||||
|
const html =
|
||||||
|
'<p><span style="color: rgb(230, 0, 0);">červeně</span> ' +
|
||||||
|
'<span style="background-color: #ffff00;">zvýrazněně</span> ' +
|
||||||
|
'<span style="color: #06c;">modře</span></p>';
|
||||||
|
const out = cleanQuillHtml(html);
|
||||||
|
expect(out).toContain('style="color: rgb(230, 0, 0)"');
|
||||||
|
expect(out).toContain('style="background-color: #ffff00"');
|
||||||
|
expect(out).toContain('style="color: #06c"');
|
||||||
|
});
|
||||||
|
|
||||||
|
it("drops every non-color style declaration", () => {
|
||||||
|
const out = cleanQuillHtml(
|
||||||
|
'<span style="position: fixed; color: red; font-size: 99px;">x</span>',
|
||||||
|
);
|
||||||
|
expect(out).toBe('<span style="color: red">x</span>');
|
||||||
|
});
|
||||||
|
|
||||||
|
it("drops unsafe color values (url, expression, quotes)", () => {
|
||||||
|
expect(
|
||||||
|
cleanQuillHtml('<span style="color: url(javascript:alert(1))">x</span>'),
|
||||||
|
).toBe("<span>x</span>");
|
||||||
|
expect(
|
||||||
|
cleanQuillHtml('<span style="color: expression(alert(1))">x</span>'),
|
||||||
|
).toBe("<span>x</span>");
|
||||||
|
expect(cleanQuillHtml("<span style='color: \"red\"'>x</span>")).toBe(
|
||||||
|
"<span>x</span>",
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("restores Quill 2's empty <p></p> blank lines to <p><br></p>", () => {
|
||||||
|
// Quill 2's semantic HTML drops the <br> placeholder from blank lines.
|
||||||
|
expect(cleanQuillHtml("<p>A</p><p></p><p>B</p>")).toBe(
|
||||||
|
"<p>A</p><p><br></p><p>B</p>",
|
||||||
|
);
|
||||||
|
// Attribute-carrying and whitespace-only empties too.
|
||||||
|
expect(cleanQuillHtml('<p class="ql-align-center"> </p>')).toBe(
|
||||||
|
'<p class="ql-align-center"><br></p>',
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("keeps stripping scripts, event handlers and js: URLs", () => {
|
||||||
|
const out = cleanQuillHtml(
|
||||||
|
'<p onclick="alert(1)"><script>alert(1)</script>' +
|
||||||
|
'<a href="javascript:alert(1)">x</a></p>',
|
||||||
|
);
|
||||||
|
expect(out).not.toContain("script");
|
||||||
|
expect(out).not.toContain("onclick");
|
||||||
|
expect(out).not.toContain("javascript:");
|
||||||
|
});
|
||||||
|
});
|
||||||
227
src/__tests__/project-notes.test.ts
Normal file
227
src/__tests__/project-notes.test.ts
Normal file
@@ -0,0 +1,227 @@
|
|||||||
|
import { describe, it, expect, beforeAll, afterAll } from "vitest";
|
||||||
|
import Fastify from "fastify";
|
||||||
|
import cookie from "@fastify/cookie";
|
||||||
|
import rateLimit from "@fastify/rate-limit";
|
||||||
|
import jwt from "jsonwebtoken";
|
||||||
|
import prisma from "../config/database";
|
||||||
|
import { config } from "../config/env";
|
||||||
|
import { securityHeaders } from "../middleware/security";
|
||||||
|
import projectsRoutes from "../routes/admin/projects";
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Project notes: author-only editing with a visible edited_at stamp, and
|
||||||
|
// admin-only deletion (a projects.edit holder may add + edit their own notes
|
||||||
|
// but never delete — user decision 2026-06-12).
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
const N = "projnotes_test_";
|
||||||
|
|
||||||
|
let app: Awaited<ReturnType<typeof buildApp>>;
|
||||||
|
let adminToken: string;
|
||||||
|
let userAId: number;
|
||||||
|
let userAToken: string;
|
||||||
|
let userBToken: string;
|
||||||
|
let roleId: number;
|
||||||
|
let projectId: number;
|
||||||
|
let noteId: number;
|
||||||
|
|
||||||
|
async function buildApp() {
|
||||||
|
const a = Fastify({ logger: false });
|
||||||
|
await a.register(cookie);
|
||||||
|
await a.register(rateLimit, { max: 1000, timeWindow: "1 minute" });
|
||||||
|
a.addHook("onRequest", securityHeaders);
|
||||||
|
await a.register(projectsRoutes, { prefix: "/api/admin/projects" });
|
||||||
|
return a;
|
||||||
|
}
|
||||||
|
|
||||||
|
function generateToken(user: {
|
||||||
|
id: number;
|
||||||
|
username: string;
|
||||||
|
roleName: string | null;
|
||||||
|
}): string {
|
||||||
|
return jwt.sign(
|
||||||
|
{ sub: user.id, username: user.username, role: user.roleName },
|
||||||
|
config.jwt.secret,
|
||||||
|
{ expiresIn: "15m" },
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function inject(
|
||||||
|
method: "POST" | "PUT" | "DELETE",
|
||||||
|
path: string,
|
||||||
|
token: string,
|
||||||
|
body?: unknown,
|
||||||
|
) {
|
||||||
|
return app.inject({
|
||||||
|
method,
|
||||||
|
url: path,
|
||||||
|
headers: {
|
||||||
|
Authorization: `Bearer ${token}`,
|
||||||
|
// Content-Type only with a body — Fastify 400s an empty JSON body.
|
||||||
|
...(body !== undefined ? { "Content-Type": "application/json" } : {}),
|
||||||
|
},
|
||||||
|
...(body !== undefined ? { payload: body as object } : {}),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
beforeAll(async () => {
|
||||||
|
app = await buildApp();
|
||||||
|
|
||||||
|
// Defensive pre-clean of a previously failed run.
|
||||||
|
await prisma.project_notes.deleteMany({
|
||||||
|
where: { content: { contains: N } },
|
||||||
|
});
|
||||||
|
await prisma.projects.deleteMany({ where: { name: { startsWith: N } } });
|
||||||
|
await prisma.users.deleteMany({ where: { username: { startsWith: N } } });
|
||||||
|
await prisma.roles.deleteMany({ where: { name: `${N}role` } });
|
||||||
|
|
||||||
|
const admin = await prisma.users.findFirst({
|
||||||
|
where: { roles: { name: "admin" } },
|
||||||
|
include: { roles: true },
|
||||||
|
});
|
||||||
|
if (!admin) throw new Error("Test setup: admin user not found");
|
||||||
|
adminToken = generateToken({
|
||||||
|
id: admin.id,
|
||||||
|
username: admin.username,
|
||||||
|
roleName: admin.roles?.name ?? null,
|
||||||
|
});
|
||||||
|
|
||||||
|
// Non-admin role with projects.view + projects.edit.
|
||||||
|
const role = await prisma.roles.create({
|
||||||
|
data: { name: `${N}role`, display_name: "ProjNotes test role" },
|
||||||
|
});
|
||||||
|
roleId = role.id;
|
||||||
|
const perms = await prisma.permissions.findMany({
|
||||||
|
where: { name: { in: ["projects.view", "projects.edit"] } },
|
||||||
|
select: { id: true },
|
||||||
|
});
|
||||||
|
if (perms.length !== 2) {
|
||||||
|
throw new Error("Test setup: projects.view/projects.edit missing");
|
||||||
|
}
|
||||||
|
await prisma.role_permissions.createMany({
|
||||||
|
data: perms.map((p) => ({ role_id: roleId, permission_id: p.id })),
|
||||||
|
});
|
||||||
|
|
||||||
|
const mkUser = async (suffix: string) =>
|
||||||
|
prisma.users.create({
|
||||||
|
data: {
|
||||||
|
username: `${N}${suffix}`,
|
||||||
|
email: `${N}${suffix}@test.local`,
|
||||||
|
password_hash: "x",
|
||||||
|
first_name: "Projnotes",
|
||||||
|
last_name: suffix.toUpperCase(),
|
||||||
|
is_active: true,
|
||||||
|
role_id: roleId,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
const userA = await mkUser("a");
|
||||||
|
const userB = await mkUser("b");
|
||||||
|
userAId = userA.id;
|
||||||
|
userAToken = generateToken({
|
||||||
|
id: userA.id,
|
||||||
|
username: userA.username,
|
||||||
|
roleName: `${N}role`,
|
||||||
|
});
|
||||||
|
userBToken = generateToken({
|
||||||
|
id: userB.id,
|
||||||
|
username: userB.username,
|
||||||
|
roleName: `${N}role`,
|
||||||
|
});
|
||||||
|
|
||||||
|
const project = await prisma.projects.create({
|
||||||
|
data: { name: `${N}project`, status: "aktivni" },
|
||||||
|
});
|
||||||
|
projectId = project.id;
|
||||||
|
|
||||||
|
// Note authored by user A (through the route, like the UI does).
|
||||||
|
const res = await inject(
|
||||||
|
"POST",
|
||||||
|
`/api/admin/projects/${projectId}/notes`,
|
||||||
|
userAToken,
|
||||||
|
{ content: `${N}original` },
|
||||||
|
);
|
||||||
|
expect(res.statusCode).toBe(201);
|
||||||
|
noteId = res.json().data.note.id;
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async () => {
|
||||||
|
await prisma.project_notes.deleteMany({ where: { project_id: projectId } });
|
||||||
|
await prisma.projects.deleteMany({ where: { id: projectId } });
|
||||||
|
await prisma.users.deleteMany({ where: { username: { startsWith: N } } });
|
||||||
|
await prisma.roles.deleteMany({ where: { id: roleId } });
|
||||||
|
await app.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("project notes — author-only edit with edited_at stamp", () => {
|
||||||
|
it("the author edits their own note and the edit is stamped", async () => {
|
||||||
|
const res = await inject(
|
||||||
|
"PUT",
|
||||||
|
`/api/admin/projects/${projectId}/notes/${noteId}`,
|
||||||
|
userAToken,
|
||||||
|
{ content: `${N}edited` },
|
||||||
|
);
|
||||||
|
expect(res.statusCode).toBe(200);
|
||||||
|
const row = await prisma.project_notes.findUnique({
|
||||||
|
where: { id: noteId },
|
||||||
|
});
|
||||||
|
expect(row?.content).toBe(`${N}edited`);
|
||||||
|
expect(row?.user_id).toBe(userAId);
|
||||||
|
expect(row?.edited_at).not.toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("another user cannot edit someone else's note", async () => {
|
||||||
|
const res = await inject(
|
||||||
|
"PUT",
|
||||||
|
`/api/admin/projects/${projectId}/notes/${noteId}`,
|
||||||
|
userBToken,
|
||||||
|
{ content: `${N}hijack` },
|
||||||
|
);
|
||||||
|
expect(res.statusCode).toBe(403);
|
||||||
|
const row = await prisma.project_notes.findUnique({
|
||||||
|
where: { id: noteId },
|
||||||
|
});
|
||||||
|
expect(row?.content).toBe(`${N}edited`); // unchanged
|
||||||
|
});
|
||||||
|
|
||||||
|
it("rejects empty content and unknown note ids", async () => {
|
||||||
|
const empty = await inject(
|
||||||
|
"PUT",
|
||||||
|
`/api/admin/projects/${projectId}/notes/${noteId}`,
|
||||||
|
userAToken,
|
||||||
|
{ content: " " },
|
||||||
|
);
|
||||||
|
expect(empty.statusCode).toBe(400);
|
||||||
|
|
||||||
|
const missing = await inject(
|
||||||
|
"PUT",
|
||||||
|
`/api/admin/projects/${projectId}/notes/999999999`,
|
||||||
|
userAToken,
|
||||||
|
{ content: "x" },
|
||||||
|
);
|
||||||
|
expect(missing.statusCode).toBe(404);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("project notes — admin-only deletion", () => {
|
||||||
|
it("a projects.edit holder cannot delete (even their own note)", async () => {
|
||||||
|
const res = await inject(
|
||||||
|
"DELETE",
|
||||||
|
`/api/admin/projects/${projectId}/notes/${noteId}`,
|
||||||
|
userAToken,
|
||||||
|
);
|
||||||
|
expect(res.statusCode).toBe(403);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("an admin deletes anybody's note", async () => {
|
||||||
|
const res = await inject(
|
||||||
|
"DELETE",
|
||||||
|
`/api/admin/projects/${projectId}/notes/${noteId}`,
|
||||||
|
adminToken,
|
||||||
|
);
|
||||||
|
expect(res.statusCode).toBe(200);
|
||||||
|
const row = await prisma.project_notes.findUnique({
|
||||||
|
where: { id: noteId },
|
||||||
|
});
|
||||||
|
expect(row).toBeNull();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -162,7 +162,7 @@ export default function BulkPlanModal({
|
|||||||
value={form.project_id}
|
value={form.project_id}
|
||||||
onChange={(val) => setForm({ ...form, project_id: val })}
|
onChange={(val) => setForm({ ...form, project_id: val })}
|
||||||
options={[
|
options={[
|
||||||
{ value: "", label: "— bez projektu —" },
|
{ value: "", label: "Vyberte projekt" },
|
||||||
...projects.map((p) => ({ value: String(p.id), label: p.name })),
|
...projects.map((p) => ({ value: String(p.id), label: p.name })),
|
||||||
]}
|
]}
|
||||||
/>
|
/>
|
||||||
|
|||||||
249
src/admin/components/NoteCard.tsx
Normal file
249
src/admin/components/NoteCard.tsx
Normal file
@@ -0,0 +1,249 @@
|
|||||||
|
import { useState } from "react";
|
||||||
|
import Box from "@mui/material/Box";
|
||||||
|
import Typography from "@mui/material/Typography";
|
||||||
|
import IconButton from "@mui/material/IconButton";
|
||||||
|
import TextField from "@mui/material/TextField";
|
||||||
|
import Button from "@mui/material/Button";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Chat-bubble style note row (author avatar + bubble), shared by the
|
||||||
|
* project notes list. Mobile-first: the header wraps (name / timestamp),
|
||||||
|
* the action icons live in the bubble's top-right corner so they never
|
||||||
|
* squeeze the content column, and editing happens inline in the bubble.
|
||||||
|
*/
|
||||||
|
|
||||||
|
const initialsOf = (name: string): string =>
|
||||||
|
name
|
||||||
|
.split(/\s+/)
|
||||||
|
.filter(Boolean)
|
||||||
|
.slice(0, 2)
|
||||||
|
.map((p) => p[0]?.toUpperCase() ?? "")
|
||||||
|
.join("");
|
||||||
|
|
||||||
|
// Same edit/delete glyphs as the data tables (AttendanceShiftTable & co.).
|
||||||
|
const EditIcon = (
|
||||||
|
<svg
|
||||||
|
width="18"
|
||||||
|
height="18"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
fill="none"
|
||||||
|
stroke="currentColor"
|
||||||
|
strokeWidth="2"
|
||||||
|
strokeLinecap="round"
|
||||||
|
strokeLinejoin="round"
|
||||||
|
>
|
||||||
|
<path d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7" />
|
||||||
|
<path d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z" />
|
||||||
|
</svg>
|
||||||
|
);
|
||||||
|
|
||||||
|
const DeleteIcon = (
|
||||||
|
<svg
|
||||||
|
width="18"
|
||||||
|
height="18"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
fill="none"
|
||||||
|
stroke="currentColor"
|
||||||
|
strokeWidth="2"
|
||||||
|
strokeLinecap="round"
|
||||||
|
strokeLinejoin="round"
|
||||||
|
>
|
||||||
|
<polyline points="3 6 5 6 21 6" />
|
||||||
|
<path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2" />
|
||||||
|
</svg>
|
||||||
|
);
|
||||||
|
|
||||||
|
function formatNoteDate(dateStr: string | null | undefined): string {
|
||||||
|
if (!dateStr) return "";
|
||||||
|
const d = new Date(dateStr);
|
||||||
|
if (isNaN(d.getTime())) return "";
|
||||||
|
const hours = String(d.getHours()).padStart(2, "0");
|
||||||
|
const mins = String(d.getMinutes()).padStart(2, "0");
|
||||||
|
return `${d.getDate()}. ${d.getMonth() + 1}. ${d.getFullYear()} ${hours}:${mins}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface NoteCardProps {
|
||||||
|
authorName: string;
|
||||||
|
createdAt: string;
|
||||||
|
editedAt?: string | null;
|
||||||
|
content: string;
|
||||||
|
canEdit?: boolean;
|
||||||
|
canDelete?: boolean;
|
||||||
|
deleting?: boolean;
|
||||||
|
/** Reject (throw) to keep the editor open — the caller shows the alert. */
|
||||||
|
onSave?: (content: string) => Promise<void>;
|
||||||
|
onDelete?: () => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function NoteCard({
|
||||||
|
authorName,
|
||||||
|
createdAt,
|
||||||
|
editedAt,
|
||||||
|
content,
|
||||||
|
canEdit = false,
|
||||||
|
canDelete = false,
|
||||||
|
deleting = false,
|
||||||
|
onSave,
|
||||||
|
onDelete,
|
||||||
|
}: NoteCardProps) {
|
||||||
|
const [editing, setEditing] = useState(false);
|
||||||
|
const [draft, setDraft] = useState("");
|
||||||
|
const [saving, setSaving] = useState(false);
|
||||||
|
|
||||||
|
const startEdit = () => {
|
||||||
|
setDraft(content);
|
||||||
|
setEditing(true);
|
||||||
|
};
|
||||||
|
|
||||||
|
const save = async () => {
|
||||||
|
if (!onSave || !draft.trim() || saving) return;
|
||||||
|
setSaving(true);
|
||||||
|
try {
|
||||||
|
await onSave(draft.trim());
|
||||||
|
setEditing(false);
|
||||||
|
} catch {
|
||||||
|
// Caller already alerted; keep the editor open with the draft.
|
||||||
|
} finally {
|
||||||
|
setSaving(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Box sx={{ display: "flex", gap: 1, alignItems: "flex-start" }}>
|
||||||
|
<Box
|
||||||
|
aria-hidden
|
||||||
|
sx={(t) => ({
|
||||||
|
width: 32,
|
||||||
|
height: 32,
|
||||||
|
borderRadius: "50%",
|
||||||
|
flexShrink: 0,
|
||||||
|
display: "flex",
|
||||||
|
alignItems: "center",
|
||||||
|
justifyContent: "center",
|
||||||
|
fontSize: "0.75rem",
|
||||||
|
fontWeight: 700,
|
||||||
|
bgcolor: `rgba(${t.vars!.palette.primary.mainChannel} / 0.12)`,
|
||||||
|
color: "primary.main",
|
||||||
|
})}
|
||||||
|
>
|
||||||
|
{initialsOf(authorName)}
|
||||||
|
</Box>
|
||||||
|
|
||||||
|
<Box
|
||||||
|
sx={{
|
||||||
|
flex: 1,
|
||||||
|
minWidth: 0,
|
||||||
|
bgcolor: "action.hover",
|
||||||
|
borderRadius: 2,
|
||||||
|
borderTopLeftRadius: 4,
|
||||||
|
p: 1.5,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Box
|
||||||
|
sx={{ display: "flex", alignItems: "flex-start", gap: 1, mb: 0.5 }}
|
||||||
|
>
|
||||||
|
<Box
|
||||||
|
sx={{
|
||||||
|
flex: 1,
|
||||||
|
minWidth: 0,
|
||||||
|
display: "flex",
|
||||||
|
alignItems: "baseline",
|
||||||
|
columnGap: 1,
|
||||||
|
flexWrap: "wrap",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Typography variant="body2" sx={{ fontWeight: 600 }}>
|
||||||
|
{authorName}
|
||||||
|
</Typography>
|
||||||
|
<Typography variant="caption" color="text.secondary">
|
||||||
|
{formatNoteDate(createdAt)}
|
||||||
|
{editedAt && (
|
||||||
|
<Box component="span" sx={{ fontStyle: "italic" }}>
|
||||||
|
{" "}
|
||||||
|
· upraveno {formatNoteDate(editedAt)}
|
||||||
|
</Box>
|
||||||
|
)}
|
||||||
|
</Typography>
|
||||||
|
</Box>
|
||||||
|
{!editing && (canEdit || canDelete) && (
|
||||||
|
<Box
|
||||||
|
sx={{
|
||||||
|
display: "flex",
|
||||||
|
gap: 0.25,
|
||||||
|
flexShrink: 0,
|
||||||
|
mt: -0.5,
|
||||||
|
mr: -0.5,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{canEdit && (
|
||||||
|
<IconButton
|
||||||
|
size="small"
|
||||||
|
onClick={startEdit}
|
||||||
|
title="Upravit poznámku"
|
||||||
|
aria-label="Upravit poznámku"
|
||||||
|
>
|
||||||
|
{EditIcon}
|
||||||
|
</IconButton>
|
||||||
|
)}
|
||||||
|
{canDelete && (
|
||||||
|
<IconButton
|
||||||
|
size="small"
|
||||||
|
color="error"
|
||||||
|
onClick={onDelete}
|
||||||
|
title="Smazat poznámku"
|
||||||
|
aria-label="Smazat poznámku"
|
||||||
|
disabled={deleting}
|
||||||
|
>
|
||||||
|
{DeleteIcon}
|
||||||
|
</IconButton>
|
||||||
|
)}
|
||||||
|
</Box>
|
||||||
|
)}
|
||||||
|
</Box>
|
||||||
|
|
||||||
|
{editing ? (
|
||||||
|
<Box>
|
||||||
|
<TextField
|
||||||
|
value={draft}
|
||||||
|
onChange={(e) => setDraft(e.target.value)}
|
||||||
|
multiline
|
||||||
|
minRows={2}
|
||||||
|
maxRows={16}
|
||||||
|
fullWidth
|
||||||
|
autoFocus
|
||||||
|
onKeyDown={(e) => {
|
||||||
|
if (e.key === "Enter" && e.ctrlKey && draft.trim()) save();
|
||||||
|
if (e.key === "Escape") setEditing(false);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<Box sx={{ mt: 1, display: "flex", gap: 1 }}>
|
||||||
|
<Button
|
||||||
|
size="small"
|
||||||
|
variant="contained"
|
||||||
|
onClick={save}
|
||||||
|
disabled={saving || !draft.trim()}
|
||||||
|
>
|
||||||
|
{saving ? "Ukládání…" : "Uložit"}
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
size="small"
|
||||||
|
color="inherit"
|
||||||
|
onClick={() => setEditing(false)}
|
||||||
|
disabled={saving}
|
||||||
|
>
|
||||||
|
Zrušit
|
||||||
|
</Button>
|
||||||
|
</Box>
|
||||||
|
</Box>
|
||||||
|
) : (
|
||||||
|
<Typography
|
||||||
|
variant="body2"
|
||||||
|
sx={{ whiteSpace: "pre-wrap", lineHeight: 1.5 }}
|
||||||
|
>
|
||||||
|
{content}
|
||||||
|
</Typography>
|
||||||
|
)}
|
||||||
|
</Box>
|
||||||
|
</Box>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -392,7 +392,7 @@ function EditForm(props: Props) {
|
|||||||
value={projectId === null ? "" : String(projectId)}
|
value={projectId === null ? "" : String(projectId)}
|
||||||
onChange={(val) => setProjectId(val ? Number(val) : null)}
|
onChange={(val) => setProjectId(val ? Number(val) : null)}
|
||||||
options={[
|
options={[
|
||||||
{ value: "", label: "— bez projektu —" },
|
{ value: "", label: "Vyberte projekt" },
|
||||||
...projects.map((p) => ({
|
...projects.map((p) => ({
|
||||||
value: String(p.id),
|
value: String(p.id),
|
||||||
label: p.name,
|
label: p.name,
|
||||||
|
|||||||
@@ -157,7 +157,7 @@ function ProjectLogRow({
|
|||||||
value={String(log.project_id)}
|
value={String(log.project_id)}
|
||||||
onChange={(val) => onUpdate(index, "project_id", val)}
|
onChange={(val) => onUpdate(index, "project_id", val)}
|
||||||
options={[
|
options={[
|
||||||
{ value: "", label: "— Projekt —" },
|
{ value: "", label: "Vyberte projekt" },
|
||||||
...projectList.map((p) => ({
|
...projectList.map((p) => ({
|
||||||
value: String(p.id),
|
value: String(p.id),
|
||||||
label: `${p.project_number} – ${p.name}`,
|
label: `${p.project_number} – ${p.name}`,
|
||||||
|
|||||||
@@ -214,7 +214,8 @@ function SortableItemRow({
|
|||||||
placeholder="Volitelný"
|
placeholder="Volitelný"
|
||||||
InputProps={{ readOnly }}
|
InputProps={{ readOnly }}
|
||||||
multiline
|
multiline
|
||||||
rows={2}
|
minRows={2}
|
||||||
|
maxRows={16}
|
||||||
slotProps={{ htmlInput: { maxLength: itemDescriptionMaxLength } }}
|
slotProps={{ htmlInput: { maxLength: itemDescriptionMaxLength } }}
|
||||||
sx={{ "& textarea": { resize: "vertical" } }}
|
sx={{ "& textarea": { resize: "vertical" } }}
|
||||||
/>
|
/>
|
||||||
@@ -352,7 +353,8 @@ function SortableItemRow({
|
|||||||
placeholder="Podrobný popis (volitelný)"
|
placeholder="Podrobný popis (volitelný)"
|
||||||
InputProps={{ readOnly }}
|
InputProps={{ readOnly }}
|
||||||
multiline
|
multiline
|
||||||
rows={2}
|
minRows={2}
|
||||||
|
maxRows={16}
|
||||||
slotProps={{ htmlInput: { maxLength: itemDescriptionMaxLength } }}
|
slotProps={{ htmlInput: { maxLength: itemDescriptionMaxLength } }}
|
||||||
sx={{
|
sx={{
|
||||||
"& textarea": {
|
"& textarea": {
|
||||||
|
|||||||
@@ -5,8 +5,10 @@ import apiFetch from "../../utils/api";
|
|||||||
export interface ProjectNote {
|
export interface ProjectNote {
|
||||||
id: number;
|
id: number;
|
||||||
content: string;
|
content: string;
|
||||||
|
user_id: number | null;
|
||||||
user_name: string;
|
user_name: string;
|
||||||
created_at: string;
|
created_at: string;
|
||||||
|
edited_at: string | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface ProjectData {
|
export interface ProjectData {
|
||||||
|
|||||||
@@ -835,7 +835,7 @@ export default function Attendance() {
|
|||||||
onChange={(val) => handleSwitchProject(val || null)}
|
onChange={(val) => handleSwitchProject(val || null)}
|
||||||
disabled={switchingProject}
|
disabled={switchingProject}
|
||||||
options={[
|
options={[
|
||||||
{ value: "", label: "— Bez projektu —" },
|
{ value: "", label: "Vyberte projekt" },
|
||||||
...projects.map((p) => ({
|
...projects.map((p) => ({
|
||||||
value: String(p.id),
|
value: String(p.id),
|
||||||
label: `${p.project_number} – ${p.name}`,
|
label: `${p.project_number} – ${p.name}`,
|
||||||
|
|||||||
@@ -58,6 +58,7 @@ import {
|
|||||||
formatCurrency,
|
formatCurrency,
|
||||||
formatDate,
|
formatDate,
|
||||||
numberOr,
|
numberOr,
|
||||||
|
restoreQuillBlankLines,
|
||||||
todayLocalStr,
|
todayLocalStr,
|
||||||
} from "../utils/formatters";
|
} from "../utils/formatters";
|
||||||
import { normalizeDateStr } from "../utils/attendanceHelpers";
|
import { normalizeDateStr } from "../utils/attendanceHelpers";
|
||||||
@@ -317,7 +318,8 @@ function SortableInvoiceRow({
|
|||||||
onChange={(e) => onUpdate(index, "item_description", e.target.value)}
|
onChange={(e) => onUpdate(index, "item_description", e.target.value)}
|
||||||
placeholder="Volitelný"
|
placeholder="Volitelný"
|
||||||
multiline
|
multiline
|
||||||
rows={2}
|
minRows={2}
|
||||||
|
maxRows={16}
|
||||||
sx={{ "& textarea": { resize: "vertical" } }}
|
sx={{ "& textarea": { resize: "vertical" } }}
|
||||||
/>
|
/>
|
||||||
<Box
|
<Box
|
||||||
@@ -418,7 +420,8 @@ function SortableInvoiceRow({
|
|||||||
}
|
}
|
||||||
placeholder="Podrobný popis (volitelný)"
|
placeholder="Podrobný popis (volitelný)"
|
||||||
multiline
|
multiline
|
||||||
rows={2}
|
minRows={2}
|
||||||
|
maxRows={16}
|
||||||
sx={{
|
sx={{
|
||||||
"& textarea": {
|
"& textarea": {
|
||||||
fontSize: "0.8rem",
|
fontSize: "0.8rem",
|
||||||
@@ -1668,7 +1671,9 @@ export default function InvoiceDetail() {
|
|||||||
{(s.content || "").replace(/<[^>]*>/g, "").trim() && (
|
{(s.content || "").replace(/<[^>]*>/g, "").trim() && (
|
||||||
<RichTextView
|
<RichTextView
|
||||||
dangerouslySetInnerHTML={{
|
dangerouslySetInnerHTML={{
|
||||||
__html: DOMPurify.sanitize(s.content || ""),
|
__html: DOMPurify.sanitize(
|
||||||
|
restoreQuillBlankLines(s.content),
|
||||||
|
),
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
@@ -1688,7 +1693,9 @@ export default function InvoiceDetail() {
|
|||||||
invoice.internal_notes !== "<p><br></p>" ? (
|
invoice.internal_notes !== "<p><br></p>" ? (
|
||||||
<RichTextView
|
<RichTextView
|
||||||
dangerouslySetInnerHTML={{
|
dangerouslySetInnerHTML={{
|
||||||
__html: DOMPurify.sanitize(invoice.internal_notes),
|
__html: DOMPurify.sanitize(
|
||||||
|
restoreQuillBlankLines(invoice.internal_notes),
|
||||||
|
),
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
) : (
|
) : (
|
||||||
|
|||||||
@@ -18,7 +18,11 @@ import Typography from "@mui/material/Typography";
|
|||||||
import OrderConfirmationModal from "../components/OrderConfirmationModal";
|
import OrderConfirmationModal from "../components/OrderConfirmationModal";
|
||||||
import Forbidden from "../components/Forbidden";
|
import Forbidden from "../components/Forbidden";
|
||||||
import apiFetch from "../utils/api";
|
import apiFetch from "../utils/api";
|
||||||
import { formatCurrency, formatDate } from "../utils/formatters";
|
import {
|
||||||
|
formatCurrency,
|
||||||
|
formatDate,
|
||||||
|
restoreQuillBlankLines,
|
||||||
|
} from "../utils/formatters";
|
||||||
import { ORDER_STATUS, statusLabel, statusColor } from "../lib/documentStatus";
|
import { ORDER_STATUS, statusLabel, statusColor } from "../lib/documentStatus";
|
||||||
import {
|
import {
|
||||||
Button,
|
Button,
|
||||||
@@ -713,7 +717,9 @@ export default function OrderDetail() {
|
|||||||
<RichTextView
|
<RichTextView
|
||||||
sx={{ p: 2 }}
|
sx={{ p: 2 }}
|
||||||
dangerouslySetInnerHTML={{
|
dangerouslySetInnerHTML={{
|
||||||
__html: DOMPurify.sanitize(section.content),
|
__html: DOMPurify.sanitize(
|
||||||
|
restoreQuillBlankLines(section.content),
|
||||||
|
),
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
import { useState, useEffect, useRef } from "react";
|
import { useState, useEffect, useRef } from "react";
|
||||||
import { useQuery } from "@tanstack/react-query";
|
import { useQuery, useQueryClient } from "@tanstack/react-query";
|
||||||
import { useApiMutation } from "../lib/queries/mutations";
|
import { useApiMutation } from "../lib/queries/mutations";
|
||||||
|
import apiFetch from "../utils/api";
|
||||||
import { useAlert } from "../context/AlertContext";
|
import { useAlert } from "../context/AlertContext";
|
||||||
import { useAuth } from "../context/AuthContext";
|
import { useAuth } from "../context/AuthContext";
|
||||||
import { useParams, useNavigate, Link as RouterLink } from "react-router-dom";
|
import { useParams, useNavigate, Link as RouterLink } from "react-router-dom";
|
||||||
import Box from "@mui/material/Box";
|
import Box from "@mui/material/Box";
|
||||||
import Typography from "@mui/material/Typography";
|
import Typography from "@mui/material/Typography";
|
||||||
import IconButton from "@mui/material/IconButton";
|
|
||||||
import MenuItem from "@mui/material/MenuItem";
|
import MenuItem from "@mui/material/MenuItem";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
@@ -17,6 +17,7 @@ import {
|
|||||||
import { userListOptions, type User as ApiUser } from "../lib/queries/users";
|
import { userListOptions, type User as ApiUser } from "../lib/queries/users";
|
||||||
import Forbidden from "../components/Forbidden";
|
import Forbidden from "../components/Forbidden";
|
||||||
import ProjectFileManager from "../components/ProjectFileManager";
|
import ProjectFileManager from "../components/ProjectFileManager";
|
||||||
|
import NoteCard from "../components/NoteCard";
|
||||||
import {
|
import {
|
||||||
Button,
|
Button,
|
||||||
Card,
|
Card,
|
||||||
@@ -49,17 +50,6 @@ const STATUS_COLORS: Record<
|
|||||||
zruseny: "default",
|
zruseny: "default",
|
||||||
};
|
};
|
||||||
|
|
||||||
function formatNoteDate(dateStr: string) {
|
|
||||||
if (!dateStr) return "";
|
|
||||||
const d = new Date(dateStr);
|
|
||||||
const day = d.getDate();
|
|
||||||
const month = d.getMonth() + 1;
|
|
||||||
const year = d.getFullYear();
|
|
||||||
const hours = String(d.getHours()).padStart(2, "0");
|
|
||||||
const mins = String(d.getMinutes()).padStart(2, "0");
|
|
||||||
return `${day}. ${month}. ${year} ${hours}:${mins}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
interface User {
|
interface User {
|
||||||
id: number;
|
id: number;
|
||||||
name: string;
|
name: string;
|
||||||
@@ -86,28 +76,12 @@ const BackIcon = (
|
|||||||
</svg>
|
</svg>
|
||||||
);
|
);
|
||||||
|
|
||||||
const TrashIcon = (
|
|
||||||
<svg
|
|
||||||
width="16"
|
|
||||||
height="16"
|
|
||||||
viewBox="0 0 24 24"
|
|
||||||
fill="none"
|
|
||||||
stroke="currentColor"
|
|
||||||
strokeWidth="2"
|
|
||||||
strokeLinecap="round"
|
|
||||||
strokeLinejoin="round"
|
|
||||||
>
|
|
||||||
<polyline points="3 6 5 6 21 6" />
|
|
||||||
<path d="M19 6l-1 14a2 2 0 0 1-2 2H8a2 2 0 0 1-2-2L5 6" />
|
|
||||||
<path d="M10 11v6M14 11v6" />
|
|
||||||
</svg>
|
|
||||||
);
|
|
||||||
|
|
||||||
export default function ProjectDetail() {
|
export default function ProjectDetail() {
|
||||||
const { id } = useParams();
|
const { id } = useParams();
|
||||||
const alert = useAlert();
|
const alert = useAlert();
|
||||||
const { hasPermission, isAdmin } = useAuth();
|
const { hasPermission, isAdmin, user } = useAuth();
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
|
const qc = useQueryClient();
|
||||||
|
|
||||||
const [saving, setSaving] = useState(false);
|
const [saving, setSaving] = useState(false);
|
||||||
const [form, setForm] = useState<ProjectForm>({
|
const [form, setForm] = useState<ProjectForm>({
|
||||||
@@ -278,6 +252,30 @@ export default function ProjectDetail() {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Throws on failure so NoteCard keeps its editor open with the draft.
|
||||||
|
const saveNoteEdit = async (noteId: number, content: string) => {
|
||||||
|
// Raw apiFetch: the body must carry ONLY content (strict schema), the
|
||||||
|
// note id lives in the URL — useApiMutation sends its whole input.
|
||||||
|
let res: Response;
|
||||||
|
try {
|
||||||
|
res = await apiFetch(`${API_BASE}/projects/${id}/notes/${noteId}`, {
|
||||||
|
method: "PUT",
|
||||||
|
headers: { "Content-Type": "application/json" },
|
||||||
|
body: JSON.stringify({ content }),
|
||||||
|
});
|
||||||
|
} catch {
|
||||||
|
alert.error("Chyba připojení");
|
||||||
|
throw new Error("network");
|
||||||
|
}
|
||||||
|
const body = await res.json().catch(() => null);
|
||||||
|
if (!res.ok) {
|
||||||
|
alert.error(body?.error || "Uložení selhalo");
|
||||||
|
throw new Error(body?.error || "Uložení selhalo");
|
||||||
|
}
|
||||||
|
qc.invalidateQueries({ queryKey: ["projects"] });
|
||||||
|
alert.success("Poznámka upravena");
|
||||||
|
};
|
||||||
|
|
||||||
if (isPending) {
|
if (isPending) {
|
||||||
return <LoadingState />;
|
return <LoadingState />;
|
||||||
}
|
}
|
||||||
@@ -493,61 +491,18 @@ export default function ProjectDetail() {
|
|||||||
{(notes.length > 0 || project.notes) && (
|
{(notes.length > 0 || project.notes) && (
|
||||||
<Box sx={{ display: "flex", flexDirection: "column", gap: 1 }}>
|
<Box sx={{ display: "flex", flexDirection: "column", gap: 1 }}>
|
||||||
{notes.map((note) => (
|
{notes.map((note) => (
|
||||||
<Box
|
<NoteCard
|
||||||
key={note.id}
|
key={note.id}
|
||||||
sx={{
|
authorName={note.user_name}
|
||||||
p: 1.5,
|
createdAt={note.created_at}
|
||||||
bgcolor: "action.hover",
|
editedAt={note.edited_at}
|
||||||
borderRadius: 2,
|
content={note.content || ""}
|
||||||
position: "relative",
|
canEdit={user?.id === note.user_id}
|
||||||
}}
|
canDelete={isAdmin}
|
||||||
>
|
deleting={deletingNoteId === note.id}
|
||||||
<Box
|
onSave={(content) => saveNoteEdit(note.id, content)}
|
||||||
sx={{
|
onDelete={() => handleDeleteNote(note.id)}
|
||||||
display: "flex",
|
/>
|
||||||
justifyContent: "space-between",
|
|
||||||
alignItems: "flex-start",
|
|
||||||
gap: 1,
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<Box sx={{ flex: 1 }}>
|
|
||||||
<Box
|
|
||||||
sx={{
|
|
||||||
display: "flex",
|
|
||||||
alignItems: "center",
|
|
||||||
gap: 1,
|
|
||||||
mb: 0.5,
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<Typography variant="body2" sx={{ fontWeight: 600 }}>
|
|
||||||
{note.user_name}
|
|
||||||
</Typography>
|
|
||||||
<Typography variant="caption" color="text.secondary">
|
|
||||||
{formatNoteDate(note.created_at)}
|
|
||||||
</Typography>
|
|
||||||
</Box>
|
|
||||||
<Typography
|
|
||||||
variant="body2"
|
|
||||||
sx={{ whiteSpace: "pre-wrap", lineHeight: 1.5 }}
|
|
||||||
>
|
|
||||||
{note.content}
|
|
||||||
</Typography>
|
|
||||||
</Box>
|
|
||||||
{isAdmin && (
|
|
||||||
<IconButton
|
|
||||||
size="small"
|
|
||||||
color="error"
|
|
||||||
onClick={() => handleDeleteNote(note.id)}
|
|
||||||
title="Smazat poznámku"
|
|
||||||
aria-label="Smazat poznámku"
|
|
||||||
disabled={deletingNoteId === note.id}
|
|
||||||
sx={{ flexShrink: 0 }}
|
|
||||||
>
|
|
||||||
{TrashIcon}
|
|
||||||
</IconButton>
|
|
||||||
)}
|
|
||||||
</Box>
|
|
||||||
</Box>
|
|
||||||
))}
|
))}
|
||||||
</Box>
|
</Box>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -554,7 +554,7 @@ export default function Projects() {
|
|||||||
setCreateForm({ ...createForm, customer_id: value })
|
setCreateForm({ ...createForm, customer_id: value })
|
||||||
}
|
}
|
||||||
options={[
|
options={[
|
||||||
{ value: "", label: "— bez zákazníka —" },
|
{ value: "", label: "Vyberte zákaznika" },
|
||||||
...(customersQuery.data ?? []).map((c) => ({
|
...(customersQuery.data ?? []).map((c) => ({
|
||||||
value: String(c.id),
|
value: String(c.id),
|
||||||
label: c.name,
|
label: c.name,
|
||||||
@@ -571,7 +571,7 @@ export default function Projects() {
|
|||||||
setCreateForm({ ...createForm, responsible_user_id: value })
|
setCreateForm({ ...createForm, responsible_user_id: value })
|
||||||
}
|
}
|
||||||
options={[
|
options={[
|
||||||
{ value: "", label: "— nepřiřazeno —" },
|
{ value: "", label: "Vyberte zaměstnance" },
|
||||||
...(usersQuery.data ?? [])
|
...(usersQuery.data ?? [])
|
||||||
.filter((u) => u.is_active)
|
.filter((u) => u.is_active)
|
||||||
.map((u) => ({
|
.map((u) => ({
|
||||||
|
|||||||
@@ -625,7 +625,7 @@ export default function OrdersReceived({
|
|||||||
setCreateForm({ ...createForm, customer_id: value })
|
setCreateForm({ ...createForm, customer_id: value })
|
||||||
}
|
}
|
||||||
options={[
|
options={[
|
||||||
{ value: "", label: "— bez zákazníka —" },
|
{ value: "", label: "Vyberte zákazníka" },
|
||||||
...(customersQuery.data ?? []).map((c) => ({
|
...(customersQuery.data ?? []).map((c) => ({
|
||||||
value: String(c.id),
|
value: String(c.id),
|
||||||
label: c.name,
|
label: c.name,
|
||||||
|
|||||||
@@ -76,3 +76,15 @@ export function czechPlural(
|
|||||||
if (n >= 2 && n <= 4) return few;
|
if (n >= 2 && n <= 4) return few;
|
||||||
return many;
|
return many;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Quill 2's semantic HTML saves blank lines as truly empty <p></p>, which
|
||||||
|
* collapse to zero height outside the editor — restore the <br> placeholder
|
||||||
|
* before rendering stored rich text read-only. (The PDF path does the same
|
||||||
|
* in cleanQuillHtml.)
|
||||||
|
*/
|
||||||
|
export function restoreQuillBlankLines(
|
||||||
|
html: string | null | undefined,
|
||||||
|
): string {
|
||||||
|
return (html || "").replace(/<p([^>]*)>\s*<\/p>/gi, "<p$1><br></p>");
|
||||||
|
}
|
||||||
|
|||||||
@@ -253,7 +253,7 @@ export function buildInvoicePdfFooter(
|
|||||||
const t = translations[lang] || translations.cs;
|
const t = translations[lang] || translations.cs;
|
||||||
const pageWord = lang === "cs" ? "Strana" : "Page";
|
const pageWord = lang === "cs" ? "Strana" : "Page";
|
||||||
const ofWord = lang === "cs" ? "z" : "of";
|
const ofWord = lang === "cs" ? "z" : "of";
|
||||||
return `<div style="width:100%; font-size:8pt; font-family:Tahoma, sans-serif; color:#646464; padding:0 12mm; box-sizing:border-box; display:flex; align-items:center;">
|
return `<div style="width:100%; font-size:8pt; font-family:'Segoe UI', Tahoma, Arial, sans-serif; color:#646464; padding:0 12mm; box-sizing:border-box; display:flex; align-items:center;">
|
||||||
<div style="flex:1; text-align:left;"><span style="font-weight:600;">${escapeHtml(t.issued_by)}</span> ${escapeHtml(issuerLine)}</div>
|
<div style="flex:1; text-align:left;"><span style="font-weight:600;">${escapeHtml(t.issued_by)}</span> ${escapeHtml(issuerLine)}</div>
|
||||||
<div style="flex:1; text-align:center;">${pageWord} <span class="pageNumber"></span> ${ofWord} <span class="totalPages"></span></div>
|
<div style="flex:1; text-align:center;">${pageWord} <span class="pageNumber"></span> ${ofWord} <span class="totalPages"></span></div>
|
||||||
<div style="flex:1;"></div>
|
<div style="flex:1;"></div>
|
||||||
@@ -898,7 +898,7 @@ export default async function invoicesPdfRoutes(
|
|||||||
}
|
}
|
||||||
.section-content,
|
.section-content,
|
||||||
.section-content * {
|
.section-content * {
|
||||||
font-family: Tahoma, sans-serif !important;
|
font-family: "Segoe UI", Tahoma, Arial, sans-serif !important;
|
||||||
}
|
}
|
||||||
.section-content { font-size: 14px; }
|
.section-content { font-size: 14px; }
|
||||||
.section-content h1 { font-size: 20px; }
|
.section-content h1 { font-size: 20px; }
|
||||||
@@ -910,7 +910,7 @@ export default async function invoicesPdfRoutes(
|
|||||||
.section-content li { margin-bottom: 0.2em; }
|
.section-content li { margin-bottom: 0.2em; }
|
||||||
|
|
||||||
/* Quill fonty – v PDF vynuceno Tahoma */
|
/* Quill fonty – v PDF vynuceno Tahoma */
|
||||||
[class*="ql-font-"] { font-family: Tahoma, sans-serif !important; }
|
[class*="ql-font-"] { font-family: "Segoe UI", Tahoma, Arial, sans-serif !important; }
|
||||||
.ql-align-center { text-align: center; }
|
.ql-align-center { text-align: center; }
|
||||||
.ql-align-right { text-align: right; }
|
.ql-align-right { text-align: right; }
|
||||||
.ql-align-justify { text-align: justify; }
|
.ql-align-justify { text-align: justify; }
|
||||||
|
|||||||
@@ -267,7 +267,7 @@ export function buildIssuedOrderPdfFooter(
|
|||||||
const t = translations[lang];
|
const t = translations[lang];
|
||||||
const pageWord = lang === "cs" ? "Strana" : "Page";
|
const pageWord = lang === "cs" ? "Strana" : "Page";
|
||||||
const ofWord = lang === "cs" ? "z" : "of";
|
const ofWord = lang === "cs" ? "z" : "of";
|
||||||
return `<div style="width:100%; font-size:8pt; font-family:Tahoma, sans-serif; color:#646464; padding:0 12mm; box-sizing:border-box; display:flex; align-items:center;">
|
return `<div style="width:100%; font-size:8pt; font-family:'Segoe UI', Tahoma, Arial, sans-serif; color:#646464; padding:0 12mm; box-sizing:border-box; display:flex; align-items:center;">
|
||||||
<div style="flex:1; text-align:left;"><span style="font-weight:600;">${escapeHtml(t.issued_by)}</span> ${escapeHtml(issuerName)}</div>
|
<div style="flex:1; text-align:left;"><span style="font-weight:600;">${escapeHtml(t.issued_by)}</span> ${escapeHtml(issuerName)}</div>
|
||||||
<div style="flex:1; text-align:center;">${pageWord} <span class="pageNumber"></span> ${ofWord} <span class="totalPages"></span></div>
|
<div style="flex:1; text-align:center;">${pageWord} <span class="pageNumber"></span> ${ofWord} <span class="totalPages"></span></div>
|
||||||
<div style="flex:1;"></div>
|
<div style="flex:1;"></div>
|
||||||
@@ -655,7 +655,7 @@ export function renderIssuedOrderHtml(
|
|||||||
}
|
}
|
||||||
.section-content,
|
.section-content,
|
||||||
.section-content * {
|
.section-content * {
|
||||||
font-family: Tahoma, sans-serif !important;
|
font-family: "Segoe UI", Tahoma, Arial, sans-serif !important;
|
||||||
}
|
}
|
||||||
.section-content { font-size: 14px; }
|
.section-content { font-size: 14px; }
|
||||||
.section-content h1 { font-size: 20px; }
|
.section-content h1 { font-size: 20px; }
|
||||||
@@ -667,7 +667,7 @@ export function renderIssuedOrderHtml(
|
|||||||
.section-content li { margin-bottom: 0.2em; }
|
.section-content li { margin-bottom: 0.2em; }
|
||||||
|
|
||||||
/* Quill fonty – v PDF vynuceno Tahoma */
|
/* Quill fonty – v PDF vynuceno Tahoma */
|
||||||
[class*="ql-font-"] { font-family: Tahoma, sans-serif !important; }
|
[class*="ql-font-"] { font-family: "Segoe UI", Tahoma, Arial, sans-serif !important; }
|
||||||
.ql-align-center { text-align: center; }
|
.ql-align-center { text-align: center; }
|
||||||
.ql-align-right { text-align: right; }
|
.ql-align-right { text-align: right; }
|
||||||
.ql-align-justify { text-align: justify; }
|
.ql-align-justify { text-align: justify; }
|
||||||
|
|||||||
@@ -293,7 +293,7 @@ export function renderOfferHtml(
|
|||||||
img, table, pre, code { max-width: 100%; }
|
img, table, pre, code { max-width: 100%; }
|
||||||
|
|
||||||
/* ---- Quill font classes – v PDF vynuceno Tahoma ---- */
|
/* ---- Quill font classes – v PDF vynuceno Tahoma ---- */
|
||||||
[class*="ql-font-"] { font-family: Tahoma, sans-serif !important; }
|
[class*="ql-font-"] { font-family: "Segoe UI", Tahoma, Arial, sans-serif !important; }
|
||||||
|
|
||||||
/* ---- Quill alignment ---- */
|
/* ---- Quill alignment ---- */
|
||||||
.ql-align-center { text-align: center; }
|
.ql-align-center { text-align: center; }
|
||||||
@@ -502,7 +502,7 @@ ${indentCSS}
|
|||||||
}
|
}
|
||||||
.section-content,
|
.section-content,
|
||||||
.section-content * {
|
.section-content * {
|
||||||
font-family: Tahoma, sans-serif !important;
|
font-family: "Segoe UI", Tahoma, Arial, sans-serif !important;
|
||||||
}
|
}
|
||||||
.section-content { font-size: 14px; }
|
.section-content { font-size: 14px; }
|
||||||
.section-content h1 { font-size: 20px; }
|
.section-content h1 { font-size: 20px; }
|
||||||
|
|||||||
@@ -570,7 +570,7 @@ export function renderOrderConfirmationHtml(
|
|||||||
.invoice-notes-content li { margin-bottom: 0.2em; }
|
.invoice-notes-content li { margin-bottom: 0.2em; }
|
||||||
.invoice-notes-content,
|
.invoice-notes-content,
|
||||||
.invoice-notes-content * {
|
.invoice-notes-content * {
|
||||||
font-family: Tahoma, sans-serif !important;
|
font-family: "Segoe UI", Tahoma, Arial, sans-serif !important;
|
||||||
}
|
}
|
||||||
.invoice-notes-content { font-size: 14px; }
|
.invoice-notes-content { font-size: 14px; }
|
||||||
.invoice-notes-content h1 { font-size: 20px; }
|
.invoice-notes-content h1 { font-size: 20px; }
|
||||||
@@ -579,7 +579,7 @@ export function renderOrderConfirmationHtml(
|
|||||||
.invoice-notes-content h4 { font-size: 15px; }
|
.invoice-notes-content h4 { font-size: 15px; }
|
||||||
|
|
||||||
/* Quill fonty – v PDF vynuceno Tahoma */
|
/* Quill fonty – v PDF vynuceno Tahoma */
|
||||||
[class*="ql-font-"] { font-family: Tahoma, sans-serif !important; }
|
[class*="ql-font-"] { font-family: "Segoe UI", Tahoma, Arial, sans-serif !important; }
|
||||||
.ql-align-center { text-align: center; }
|
.ql-align-center { text-align: center; }
|
||||||
.ql-align-right { text-align: right; }
|
.ql-align-right { text-align: right; }
|
||||||
.ql-align-justify { text-align: justify; }
|
.ql-align-justify { text-align: justify; }
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import {
|
|||||||
UpdateProjectSchema,
|
UpdateProjectSchema,
|
||||||
CreateProjectSchema,
|
CreateProjectSchema,
|
||||||
CreateProjectNoteSchema,
|
CreateProjectNoteSchema,
|
||||||
|
UpdateProjectNoteSchema,
|
||||||
} from "../../schemas/projects.schema";
|
} from "../../schemas/projects.schema";
|
||||||
import {
|
import {
|
||||||
listProjects,
|
listProjects,
|
||||||
@@ -19,6 +20,7 @@ import {
|
|||||||
deleteProject,
|
deleteProject,
|
||||||
createProjectNote,
|
createProjectNote,
|
||||||
deleteProjectNote,
|
deleteProjectNote,
|
||||||
|
updateProjectNote,
|
||||||
} from "../../services/projects.service";
|
} from "../../services/projects.service";
|
||||||
|
|
||||||
// Body for DELETE /:id — optional delete_files flag. The body may be absent on
|
// Body for DELETE /:id — optional delete_files flag. The body may be absent on
|
||||||
@@ -174,7 +176,47 @@ export default async function projectsRoutes(
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
// DELETE /api/admin/projects/:id/notes/:noteId
|
// PUT /api/admin/projects/:id/notes/:noteId — author-only edit; the edit
|
||||||
|
// is visibly stamped (edited_at) so a changed note can't pose as original.
|
||||||
|
fastify.put<{ Params: { id: string; noteId: string } }>(
|
||||||
|
"/:id/notes/:noteId",
|
||||||
|
{ preHandler: requirePermission("projects.edit") },
|
||||||
|
async (request, reply) => {
|
||||||
|
const noteId = parseId(request.params.noteId, reply);
|
||||||
|
if (noteId === null) return;
|
||||||
|
const projectId = parseId(request.params.id, reply);
|
||||||
|
if (projectId === null) return;
|
||||||
|
const parsed = parseBody(UpdateProjectNoteSchema, request.body);
|
||||||
|
if ("error" in parsed) return error(reply, parsed.error, 400);
|
||||||
|
const authData = request.authData!;
|
||||||
|
|
||||||
|
const result = await updateProjectNote(
|
||||||
|
projectId,
|
||||||
|
noteId,
|
||||||
|
authData.userId,
|
||||||
|
parsed.data.content,
|
||||||
|
);
|
||||||
|
if (!result) return error(reply, "Poznámka nenalezena", 404);
|
||||||
|
if (result.error !== undefined) {
|
||||||
|
return error(reply, result.error, result.status ?? 403);
|
||||||
|
}
|
||||||
|
|
||||||
|
await logAudit({
|
||||||
|
request,
|
||||||
|
authData,
|
||||||
|
action: "update",
|
||||||
|
entityType: "project",
|
||||||
|
entityId: projectId,
|
||||||
|
description: `Upravena poznámka projektu`,
|
||||||
|
oldValues: { content: result.previousContent },
|
||||||
|
newValues: { content: result.note.content },
|
||||||
|
});
|
||||||
|
return success(reply, { note: result.note }, 200, "Poznámka upravena");
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
// DELETE /api/admin/projects/:id/notes/:noteId — admin only (user
|
||||||
|
// decision: authors edit their notes, only an admin removes anyone's).
|
||||||
fastify.delete<{ Params: { id: string; noteId: string } }>(
|
fastify.delete<{ Params: { id: string; noteId: string } }>(
|
||||||
"/:id/notes/:noteId",
|
"/:id/notes/:noteId",
|
||||||
{ preHandler: requirePermission("projects.edit") },
|
{ preHandler: requirePermission("projects.edit") },
|
||||||
@@ -183,6 +225,9 @@ export default async function projectsRoutes(
|
|||||||
if (noteId === null) return;
|
if (noteId === null) return;
|
||||||
const projectId = parseId(request.params.id, reply);
|
const projectId = parseId(request.params.id, reply);
|
||||||
if (projectId === null) return;
|
if (projectId === null) return;
|
||||||
|
if (request.authData!.roleName !== "admin") {
|
||||||
|
return error(reply, "Poznámky může mazat pouze administrátor", 403);
|
||||||
|
}
|
||||||
|
|
||||||
const note = await deleteProjectNote(projectId, noteId);
|
const note = await deleteProjectNote(projectId, noteId);
|
||||||
if (!note) return error(reply, "Poznámka nenalezena", 404);
|
if (!note) return error(reply, "Poznámka nenalezena", 404);
|
||||||
|
|||||||
@@ -27,6 +27,14 @@ export const CreateProjectNoteSchema = z.object({
|
|||||||
content: z.string().nullish(),
|
content: z.string().nullish(),
|
||||||
});
|
});
|
||||||
|
|
||||||
|
export const UpdateProjectNoteSchema = z.strictObject({
|
||||||
|
content: z
|
||||||
|
.string()
|
||||||
|
.trim()
|
||||||
|
.min(1, "Poznámka nesmí být prázdná")
|
||||||
|
.max(5000, "Poznámka může mít maximálně 5000 znaků"),
|
||||||
|
});
|
||||||
|
|
||||||
export type CreateProjectInput = z.infer<typeof CreateProjectSchema>;
|
export type CreateProjectInput = z.infer<typeof CreateProjectSchema>;
|
||||||
export type UpdateProjectInput = z.infer<typeof UpdateProjectSchema>;
|
export type UpdateProjectInput = z.infer<typeof UpdateProjectSchema>;
|
||||||
export type CreateProjectNoteInput = z.infer<typeof CreateProjectNoteSchema>;
|
export type CreateProjectNoteInput = z.infer<typeof CreateProjectNoteSchema>;
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ import {
|
|||||||
getWorkfund,
|
getWorkfund,
|
||||||
getProjectReport,
|
getProjectReport,
|
||||||
} from "./attendance.service";
|
} from "./attendance.service";
|
||||||
|
import { toCzk } from "./exchange-rates";
|
||||||
import { resolveGrid, listPlanUsers } from "./plan.service";
|
import { resolveGrid, listPlanUsers } from "./plan.service";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -1319,6 +1320,7 @@ const TOOLS: ToolSpec[] = [
|
|||||||
recent_notes: p.project_notes.slice(0, 5).map((n) => ({
|
recent_notes: p.project_notes.slice(0, 5).map((n) => ({
|
||||||
author: n.user_name,
|
author: n.user_name,
|
||||||
date: n.created_at,
|
date: n.created_at,
|
||||||
|
...(n.edited_at ? { edited_at: n.edited_at } : {}),
|
||||||
text: stripHtml(n.content).slice(0, 300),
|
text: stripHtml(n.content).slice(0, 300),
|
||||||
})),
|
})),
|
||||||
};
|
};
|
||||||
@@ -1688,35 +1690,38 @@ const TOOLS: ToolSpec[] = [
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
// Coarse gate any-of; the handler re-checks the exact permission per
|
// Coarse gate any-of; the handler re-checks the exact permission per
|
||||||
// document type (offers vs orders families).
|
// document type (offers vs orders vs invoices families).
|
||||||
permission: ["offers.view", "orders.view"],
|
permission: ["offers.view", "orders.view", "invoices.view"],
|
||||||
definition: {
|
definition: {
|
||||||
name: "get_document_totals",
|
name: "get_document_totals",
|
||||||
description:
|
description:
|
||||||
"Součty hodnot dokumentů za CELÝ filtr (ne jen prvních 20 z listu!) po měnách, BEZ DPH. Typy: offers (nabídky), orders (objednávky přijaté), issued_orders (objednávky vydané). VŽDY použij tento nástroj místo sčítání řádků z list_* nástrojů, když je výsledků víc než 20.",
|
"Součty hodnot dokumentů za CELÝ filtr (ne jen prvních 20 z listu!) po měnách. Typy: offers (nabídky, bez DPH), orders (objednávky přijaté, bez DPH), issued_orders (objednávky vydané, bez DPH), received_invoices (přijaté faktury = VÝDAJE, včetně DPH, s přepočtem do CZK). VŽDY použij tento nástroj místo sčítání řádků z list_* nástrojů. Na dotazy 'kolik jsme utratili' použij received_invoices a/nebo issued_orders.",
|
||||||
input_schema: {
|
input_schema: {
|
||||||
type: "object",
|
type: "object",
|
||||||
properties: {
|
properties: {
|
||||||
type: {
|
type: {
|
||||||
type: "string",
|
type: "string",
|
||||||
enum: ["offers", "orders", "issued_orders"],
|
enum: ["offers", "orders", "issued_orders", "received_invoices"],
|
||||||
description: "Typ dokumentů",
|
description:
|
||||||
|
"Typ dokumentů (received_invoices = přijaté faktury / výdaje, VČETNĚ DPH + přepočet do CZK)",
|
||||||
},
|
},
|
||||||
status: {
|
status: {
|
||||||
type: "string",
|
type: "string",
|
||||||
description: "Filtr stavu (vynech pro všechny)",
|
description:
|
||||||
|
"Filtr stavu (vynech pro všechny; received_invoices: unpaid/paid)",
|
||||||
},
|
},
|
||||||
search: {
|
search: {
|
||||||
type: "string",
|
type: "string",
|
||||||
description: "Hledání jako v list_* nástroji",
|
description:
|
||||||
|
"Hledání jako v list_* nástroji (ne received_invoices)",
|
||||||
},
|
},
|
||||||
month: {
|
month: {
|
||||||
type: "number",
|
type: "number",
|
||||||
description: "Měsíc 1-12 (jen orders/issued_orders)",
|
description: "Měsíc 1-12 (ne offers)",
|
||||||
},
|
},
|
||||||
year: {
|
year: {
|
||||||
type: "number",
|
type: "number",
|
||||||
description: "Rok (jen orders/issued_orders)",
|
description: "Rok (ne offers)",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
required: ["type"],
|
required: ["type"],
|
||||||
@@ -1766,6 +1771,59 @@ const TOOLS: ToolSpec[] = [
|
|||||||
const { totals } = await getOrderTotals(filters);
|
const { totals } = await getOrderTotals(filters);
|
||||||
return { type, period, totals, note: "Součty bez DPH, po měnách." };
|
return { type, period, totals, note: "Součty bez DPH, po měnách." };
|
||||||
}
|
}
|
||||||
|
if (type === "received_invoices") {
|
||||||
|
if (!ctxCan(ctx, "invoices.view")) {
|
||||||
|
return { error: DENIED("přijaté faktury") };
|
||||||
|
}
|
||||||
|
// month/year are literal columns on received_invoices; gross sums
|
||||||
|
// per currency + CZK conversion mirror GET /received-invoices/stats.
|
||||||
|
const where: Record<string, unknown> = {};
|
||||||
|
if (month && year) {
|
||||||
|
where.month = month;
|
||||||
|
where.year = year;
|
||||||
|
} else if (year) {
|
||||||
|
where.year = year;
|
||||||
|
}
|
||||||
|
const status = str(input.status);
|
||||||
|
if (status === "unpaid" || status === "paid") where.status = status;
|
||||||
|
const rows = await prisma.received_invoices.findMany({
|
||||||
|
where,
|
||||||
|
select: { amount: true, currency: true },
|
||||||
|
});
|
||||||
|
const byCurrency: Record<string, number> = {};
|
||||||
|
for (const r of rows) {
|
||||||
|
const cur = r.currency || "CZK";
|
||||||
|
byCurrency[cur] = (byCurrency[cur] || 0) + (Number(r.amount) || 0);
|
||||||
|
}
|
||||||
|
const totals = Object.entries(byCurrency).map(([currency, amount]) => ({
|
||||||
|
currency,
|
||||||
|
amount: round2(amount),
|
||||||
|
}));
|
||||||
|
// CZK conversion mirrors the stats route: a row with an unknown
|
||||||
|
// currency is skipped (logged), never fails the whole sum.
|
||||||
|
let totalCzk = 0;
|
||||||
|
let skipped = 0;
|
||||||
|
for (const r of rows) {
|
||||||
|
try {
|
||||||
|
totalCzk += await toCzk(Number(r.amount) || 0, r.currency);
|
||||||
|
} catch (e) {
|
||||||
|
skipped += 1;
|
||||||
|
console.error(
|
||||||
|
`[ai-tools] toCzk failed for currency "${r.currency}"`,
|
||||||
|
e,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
type,
|
||||||
|
period: month && year ? `${month}/${year}` : year ? `${year}` : "vše",
|
||||||
|
invoice_count: rows.length,
|
||||||
|
totals,
|
||||||
|
total_czk: round2(totalCzk),
|
||||||
|
...(skipped ? { czk_conversion_skipped_rows: skipped } : {}),
|
||||||
|
note: "Částky jsou VČETNĚ DPH (gross); total_czk je přepočet aktuálním kurzem.",
|
||||||
|
};
|
||||||
|
}
|
||||||
if (type === "issued_orders") {
|
if (type === "issued_orders") {
|
||||||
if (!ctxCan(ctx, "orders.view")) {
|
if (!ctxCan(ctx, "orders.view")) {
|
||||||
return { error: DENIED("objednávky vydané") };
|
return { error: DENIED("objednávky vydané") };
|
||||||
|
|||||||
@@ -283,3 +283,37 @@ export async function deleteProjectNote(projectId: number, noteId: number) {
|
|||||||
await prisma.project_notes.delete({ where: { id: noteId } });
|
await prisma.project_notes.delete({ where: { id: noteId } });
|
||||||
return note;
|
return note;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Author-only note edit: a note belongs to whoever wrote it (even admins
|
||||||
|
* edit only their own — editing someone else's words would falsify
|
||||||
|
* authorship; admins delete instead). Stamps edited_at for the UI marker.
|
||||||
|
*/
|
||||||
|
export async function updateProjectNote(
|
||||||
|
projectId: number,
|
||||||
|
noteId: number,
|
||||||
|
userId: number,
|
||||||
|
content: string,
|
||||||
|
): Promise<
|
||||||
|
| null
|
||||||
|
| { error: string; status: number; note?: never }
|
||||||
|
| {
|
||||||
|
error?: never;
|
||||||
|
status?: never;
|
||||||
|
note: Awaited<ReturnType<typeof prisma.project_notes.update>>;
|
||||||
|
previousContent: string | null;
|
||||||
|
}
|
||||||
|
> {
|
||||||
|
const note = await prisma.project_notes.findFirst({
|
||||||
|
where: { id: noteId, project_id: projectId },
|
||||||
|
});
|
||||||
|
if (!note) return null;
|
||||||
|
if (note.user_id !== userId) {
|
||||||
|
return { error: "Upravit lze pouze vlastní poznámku", status: 403 };
|
||||||
|
}
|
||||||
|
const updated = await prisma.project_notes.update({
|
||||||
|
where: { id: noteId },
|
||||||
|
data: { content, edited_at: new Date() },
|
||||||
|
});
|
||||||
|
return { note: updated, previousContent: note.content };
|
||||||
|
}
|
||||||
|
|||||||
@@ -94,7 +94,7 @@ export function buildPdfHeaderTemplate(
|
|||||||
logoDataUri: string,
|
logoDataUri: string,
|
||||||
heading: string,
|
heading: string,
|
||||||
): string {
|
): string {
|
||||||
return `<div style="width:100%; font-family:Tahoma, sans-serif; padding:0 12mm; box-sizing:border-box;">
|
return `<div style="width:100%; font-family:'Segoe UI', Tahoma, Arial, sans-serif; padding:0 12mm; box-sizing:border-box;">
|
||||||
<div style="display:flex; justify-content:space-between; align-items:center; padding-bottom:1mm; border-bottom:2pt solid #de3a3a;">
|
<div style="display:flex; justify-content:space-between; align-items:center; padding-bottom:1mm; border-bottom:2pt solid #de3a3a;">
|
||||||
<div style="flex:0 0 auto;">${logoDataUri ? `<img src="${logoDataUri}" style="max-width:42mm; max-height:22mm; object-fit:contain;" />` : ""}</div>
|
<div style="flex:0 0 auto;">${logoDataUri ? `<img src="${logoDataUri}" style="max-width:42mm; max-height:22mm; object-fit:contain;" />` : ""}</div>
|
||||||
<div style="font-size:13pt; font-weight:700; color:#de3a3a; text-align:right; letter-spacing:0.03em;">${escapeHtml(heading)}</div>
|
<div style="font-size:13pt; font-weight:700; color:#de3a3a; text-align:right; letter-spacing:0.03em;">${escapeHtml(heading)}</div>
|
||||||
@@ -108,6 +108,13 @@ export function buildPdfHeaderTemplate(
|
|||||||
* and merge adjacent identical spans. Runs AFTER DOMPurify at every call site
|
* and merge adjacent identical spans. Runs AFTER DOMPurify at every call site
|
||||||
* (regex pass = defense-in-depth, not the primary sanitizer).
|
* (regex pass = defense-in-depth, not the primary sanitizer).
|
||||||
*/
|
*/
|
||||||
|
/**
|
||||||
|
* Literal CSS color values only: #hex, rgb()/rgba() with numeric components,
|
||||||
|
* or a bare keyword. No quotes, parentheses beyond rgb(a), url(), variables.
|
||||||
|
*/
|
||||||
|
const SAFE_CSS_COLOR =
|
||||||
|
/^(#[0-9a-f]{3,8}|rgba?\(\s*\d{1,3}\s*,\s*\d{1,3}\s*,\s*\d{1,3}\s*(,\s*(0|1|0?\.\d+)\s*)?\)|[a-z]{3,20})$/i;
|
||||||
|
|
||||||
export function cleanQuillHtml(html: string | null | undefined): string {
|
export function cleanQuillHtml(html: string | null | undefined): string {
|
||||||
if (!html) return "";
|
if (!html) return "";
|
||||||
let s = html;
|
let s = html;
|
||||||
@@ -134,7 +141,32 @@ export function cleanQuillHtml(html: string | null | undefined): string {
|
|||||||
);
|
);
|
||||||
// Replace with regular space (outside of tags)
|
// Replace with regular space (outside of tags)
|
||||||
s = s.replace(/( )/g, " ");
|
s = s.replace(/( )/g, " ");
|
||||||
s = s.replace(/\s+style\s*=\s*("[^"]*"|'[^']*'|[^\s>]*)/gi, "");
|
// Quill 2's semantic HTML saves blank lines as truly empty <p></p>, which
|
||||||
|
// collapse to zero height in the PDF — restore the <br> placeholder so an
|
||||||
|
// editor blank line stays a blank line.
|
||||||
|
s = s.replace(/<p([^>]*)>\s*<\/p>/gi, "<p$1><br></p>");
|
||||||
|
// Inline styles: Quill writes text/background colors as style attributes.
|
||||||
|
// Keep ONLY color/background-color with literal color values — everything
|
||||||
|
// else (url(), expression(), positioning…) must never reach Puppeteer.
|
||||||
|
s = s.replace(
|
||||||
|
/\s+style\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s>]+))/gi,
|
||||||
|
(_m, dq, sq, bare) => {
|
||||||
|
const kept = String(dq ?? sq ?? bare ?? "")
|
||||||
|
.split(";")
|
||||||
|
.map((decl) => {
|
||||||
|
const i = decl.indexOf(":");
|
||||||
|
if (i < 0) return null;
|
||||||
|
const prop = decl.slice(0, i).trim().toLowerCase();
|
||||||
|
const val = decl.slice(i + 1).trim();
|
||||||
|
return (prop === "color" || prop === "background-color") &&
|
||||||
|
SAFE_CSS_COLOR.test(val)
|
||||||
|
? `${prop}: ${val}`
|
||||||
|
: null;
|
||||||
|
})
|
||||||
|
.filter((d): d is string => d !== null);
|
||||||
|
return kept.length ? ` style="${kept.join("; ")}"` : "";
|
||||||
|
},
|
||||||
|
);
|
||||||
// Merge adjacent spans with same attributes
|
// Merge adjacent spans with same attributes
|
||||||
let prev = "";
|
let prev = "";
|
||||||
while (prev !== s) {
|
while (prev !== s) {
|
||||||
|
|||||||
Reference in New Issue
Block a user