1.4.7

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "app-ts",
-  "version": "1.3.8",
+  "version": "1.4.7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "app-ts",
-      "version": "1.3.8",
+      "version": "1.4.7",
       "license": "ISC",
       "dependencies": {
         "@dnd-kit/core": "^6.3.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "app-ts",
-  "version": "1.3.8",
+  "version": "1.4.7",
   "description": "",
   "main": "dist/server.js",
   "scripts": {

src/admin/pages/LeaveRequests.tsx

@@ -61,7 +61,7 @@ export default function LeaveRequests() {
 
   const fetchRequests = useCallback(async () => {
     try {
-      const response = await apiFetch(`${API_BASE}/leave-requests`);
+      const response = await apiFetch(`${API_BASE}/leave-requests?mine=1`);
       if (response.status === 401) return;
       const result = await response.json();
       if (result.success) {

src/admin/pages/TripsAdmin.tsx

@@ -127,7 +127,7 @@ export default function TripsAdmin() {
       try {
         const [vRes, uRes, csRes] = await Promise.all([
           apiFetch(`${API_BASE}/vehicles`),
-          apiFetch(`${API_BASE}/users?limit=1000`),
+          apiFetch(`${API_BASE}/trips/users`),
           apiFetch(`${API_BASE}/company-settings`),
         ]);
         const vJson = await vRes.json();
@@ -136,14 +136,7 @@ export default function TripsAdmin() {
         if (vJson.success) setVehicles(vJson.data);
         if (csJson.success) setCompanyName(csJson.data.company_name || "");
         if (uJson.success) {
-          setUsers(
+          setUsers(uJson.data);
-            uJson.data.map(
-              (u: { id: number; first_name: string; last_name: string }) => ({
-                id: u.id,
-                name: `${u.first_name} ${u.last_name}`,
-              }),
-            ),
-          );
         }
       } catch {
         // silently fail, filters will just be empty

src/routes/admin/invoices-pdf.ts

@@ -427,7 +427,7 @@ export default async function invoicesPdfRoutes(
           return `<tr>
             <td class="row-num">${i + 1}</td>
             <td class="desc">${escapeHtml(item.description)}</td>
-            <td class="center">${formatNum(qty, qtyDecimals)}</td>
+            <td class="center">${formatNum(qty, qtyDecimals)}${item.unit ? ` / ${escapeHtml(item.unit)}` : ""}</td>
             <td class="right">${formatNum(unitPrice)}</td>
             <td class="right">${formatNum(lineSubtotal)}</td>
             <td class="center">${applyVat ? Math.floor(vatRate) : 0}%</td>
@@ -515,76 +515,31 @@ export default async function invoicesPdfRoutes(
 
   .accent { color: #de3a3a; }
 
-  /* Hlavicka */
+  /* ── Hlavicka ── */
   .invoice-header {
     display: flex;
     justify-content: space-between;
-    align-items: flex-start;
+    align-items: center;
-    margin-bottom: 0;
+    margin-bottom: 3mm;
-    padding-bottom: 1mm;
+    padding-bottom: 3mm;
+    border-bottom: 2pt solid #de3a3a;
   }
   .invoice-header .left {
     display: flex;
-    align-items: flex-start;
+    align-items: center;
     gap: 3mm;
   }
-  .logo-header {
+  .logo-header { text-align: left; }
-    text-align: left;
-  }
   .company-title {
     font-size: 12pt;
     font-weight: 700;
-    margin-top: 2mm;
   }
   .invoice-title {
-    font-size: 10pt;
+    font-size: 13pt;
     font-weight: 700;
     color: #de3a3a;
     text-align: right;
-    margin-top: 2mm;
+    letter-spacing: 0.03em;
-  }
-
-  /* Adresy - dva sloupce, stejna vyska */
-  .addresses-row {
-    display: flex;
-    gap: 8mm;
-    align-items: stretch;
-    margin-bottom: 0;
-  }
-  .addresses-row .address-block {
-    flex: 1;
-    padding-bottom: 2mm;
-    border-bottom: 0.5pt solid #e0e0e0;
-  }
-
-  /* Detaily pod adresami */
-  .details-row {
-    display: flex;
-    gap: 8mm;
-    margin-bottom: 3mm;
-  }
-  .details-row .col { flex: 1; }
-
-  /* Adresy - styl z nabidek */
-  .address-block {
-    margin-bottom: 0;
-  }
-  .address-label {
-    font-size: 8pt;
-    font-weight: 600;
-    color: #646464;
-    line-height: 1.5;
-  }
-  .address-name {
-    font-size: 9pt;
-    font-weight: 700;
-    color: #1a1a1a;
-    line-height: 1.5;
-  }
-  .address-line {
-    font-size: 8.5pt;
-    color: #1a1a1a;
-    line-height: 1.5;
   }
 
   .logo {
@@ -593,46 +548,68 @@ export default async function invoicesPdfRoutes(
     object-fit: contain;
   }
 
-  /* Separator */
+  /* ── Adresy ── */
-  .header-separator {
+  .header-grid {
-    border: none;
+    border: 0.5pt solid #d0d0d0;
-    border-top: 0.5pt solid #e0e0e0;
+    border-collapse: collapse;
-    margin: 2mm 0 3mm 0;
+    width: 100%;
+    margin-bottom: 3mm;
   }
-
+  .header-grid td {
-  /* Banka */
+    padding: 3mm 4mm;
-  .bank-box {
+    border: 0.5pt solid #d0d0d0;
-    font-size: 8pt;
+    vertical-align: top;
-    line-height: 1.4;
+    width: 50%;
-    padding-top: 2mm;
   }
-  .bank-box .lbl {
+  .header-grid td.addr-customer {
-    font-weight: 600;
+    background: #f5f5f5;
+  }
+  .header-grid td.details-bank {
+    background: #f5f5f5;
+  }
+  .address-label {
+    font-size: 7pt;
+    font-weight: 700;
+    color: #de3a3a;
+    text-transform: uppercase;
+    letter-spacing: 0.08em;
+    margin-bottom: 1mm;
+  }
+  .address-name {
+    font-size: 10pt;
+    font-weight: 700;
     color: #1a1a1a;
-    display: inline-block;
+    line-height: 1.3;
-    min-width: 16mm;
+    margin-bottom: 1mm;
+  }
+  .address-line {
+    font-size: 8pt;
+    color: #444;
+    line-height: 1.5;
   }
 
-  /* Datumy */
+  /* ── Detaily (banka + datumy) — inside header-grid ── */
-  .dates-box {
+
-    font-size: 8pt;
+  .info-row {
-    line-height: 1.4;
-    padding-top: 2mm;
-  }
-  .dates-row {
     display: flex;
-    align-items: center;
+    align-items: baseline;
-    margin-bottom: 0.5mm;
+    font-size: 8pt;
+    padding: 1mm 0;
+    border-bottom: 0.5pt solid #f0f0f0;
   }
-  .dates-row .lbl {
+  .info-row:last-child { border-bottom: none; }
-    flex: 1;
+  .info-row .lbl {
-    color: #1a1a1a;
+    color: #666;
+    font-weight: 400;
+    flex-shrink: 0;
+    white-space: nowrap;
+    margin-right: 3mm;
   }
-  .dates-row .val {
+  .info-row .val {
     font-weight: 600;
-    min-width: 22mm;
+    color: #1a1a1a;
-    text-align: center;
+    text-align: right;
-    padding: 0.5mm 2mm;
+    margin-left: auto;
   }
 
   /* VS/KS blok */
@@ -642,32 +619,23 @@ export default async function invoicesPdfRoutes(
     padding-top: 2mm;
   }
 
-  /* Konecny prijemce */
+  /* ── Polozky ── */
-  .recipient-box {
-    font-size: 8pt;
-    margin-top: 2mm;
-    padding-top: 2mm;
-    border-top: 0.5pt solid #e0e0e0;
-  }
-  .recipient-box .lbl {
-    font-weight: 600;
-    font-style: italic;
-    color: #646464;
-  }
-
-  /* Polozky tabulka - styl z nabidek */
   .billing-label {
-    font-weight: 600;
+    font-weight: 700;
-    color: #de3a3a;
+    color: #1a1a1a;
-    font-size: 8.5pt;
+    font-size: 9pt;
-    padding: 3px 5px;
+    padding: 2mm 0 1mm 0;
+    border-bottom: 1.5pt solid #de3a3a;
+    margin-bottom: 0;
+    text-transform: uppercase;
+    letter-spacing: 0.03em;
   }
 
   table.items {
     width: 100%;
     table-layout: fixed;
     border-collapse: collapse;
-    font-size: 9pt;
+    font-size: 8pt;
     margin-bottom: 2mm;
   }
   table.items thead th {
@@ -678,7 +646,7 @@ export default async function invoicesPdfRoutes(
     text-align: left;
     letter-spacing: 0.02em;
     text-transform: uppercase;
-    border-bottom: 1pt solid #1a1a1a;
+    border-bottom: 0.5pt solid #d0d0d0;
     white-space: nowrap;
   }
   table.items thead th.center { text-align: center; }
@@ -698,8 +666,8 @@ export default async function invoicesPdfRoutes(
     font-size: 8pt;
   }
   table.items tbody td.desc {
-    font-size: 9.5pt;
+    font-size: 8pt;
-    font-weight: 500;
+    font-weight: 600;
     color: #1a1a1a;
   }
   table.items tbody td.total-cell { font-weight: 700; }
@@ -811,13 +779,14 @@ export default async function invoicesPdfRoutes(
   /* Prevzal / razitko */
   .footer-row {
     display: flex;
+    justify-content: space-between;
     margin-top: 4mm;
     font-size: 8pt;
-  }
-  .footer-row .col {
-    flex: 1;
     border-top: 0.5pt solid #aaa;
     padding-top: 2mm;
+    min-height: 15mm;
+  }
+  .footer-row .col {
     font-weight: 600;
     color: #555;
   }
@@ -898,59 +867,53 @@ ${indentCSS}
     <div class="invoice-title">${escapeHtml(t.heading)} ${invoiceNumber}</div>
   </div>
 
-  <hr class="header-separator" />
+  <!-- Dodavatel / Odberatel + Banka / Datumy -->
-
+  <table class="header-grid" cellspacing="0">
-  <!-- Dodavatel / Odberatel - stejna vyska -->
+    <tr>
-  <div class="addresses-row">
+      <td>
-    <div class="address-block">
+        <div class="address-label">${escapeHtml(t.supplier)}</div>
-      <div class="address-label">${escapeHtml(t.supplier)}</div>
+        <div class="address-name">${escapeHtml(supp.name)}</div>
-      <div class="address-name">${escapeHtml(supp.name)}</div>
+        ${suppLinesHtml}
-      ${suppLinesHtml}
+      </td>
-    </div>
+      <td class="addr-customer">
-    <div class="address-block">
+        <div class="address-label">${escapeHtml(t.customer)}</div>
-      <div class="address-label">${escapeHtml(t.customer)}</div>
+        <div class="address-name">${escapeHtml(cust.name)}</div>
-      <div class="address-name">${escapeHtml(cust.name)}</div>
+        ${custLinesHtml}
-      ${custLinesHtml}
+      </td>
-    </div>
+    </tr>
-  </div>
+    <tr>
-
+      <td class="details-bank">
-  <!-- Banka + VS / Datumy -->
+        <div class="info-row"><span class="lbl">${escapeHtml(t.bank)}</span> <span class="val">${escapeHtml(invoice.bank_name)}</span></div>
-  <div class="details-row">
+        <div class="info-row"><span class="lbl">${escapeHtml(t.swift)}</span> <span class="val">${escapeHtml(invoice.bank_swift)}</span></div>
-    <div class="col">
+        <div class="info-row"><span class="lbl">${escapeHtml(t.iban)}</span> <span class="val">${escapeHtml(invoice.bank_iban)}</span></div>
-      <div class="bank-box">
+        <div class="info-row"><span class="lbl">${escapeHtml(t.account_no)}</span> <span class="val">${escapeHtml(invoice.bank_account)}</span></div>
-        <span class="lbl">${escapeHtml(t.bank)}</span> ${escapeHtml(invoice.bank_name)}<br>
+        <div class="vs-block">
-        <span class="lbl">${escapeHtml(t.swift)}</span> ${escapeHtml(invoice.bank_swift)}<br>
+          ${escapeHtml(t.var_symbol)} <strong>${invoiceNumber}</strong>
-        <span class="lbl">${escapeHtml(t.iban)}</span> ${escapeHtml(invoice.bank_iban)}<br>
+          &nbsp;&nbsp;&nbsp; ${escapeHtml(t.const_symbol)} <strong>${escapeHtml(invoice.constant_symbol)}</strong><br>
-        <span class="lbl">${escapeHtml(t.account_no)}</span> ${escapeHtml(invoice.bank_account)}
+          ${orderNumber ? `${escapeHtml(t.order_no)} ${orderNumber}` : ""}
-      </div>
+        </div>
-      <div class="vs-block">
+      </td>
-        ${escapeHtml(t.var_symbol)} <strong>${invoiceNumber}</strong>
+      <td>
-        &nbsp;&nbsp;&nbsp; ${escapeHtml(t.const_symbol)} <strong>${escapeHtml(invoice.constant_symbol)}</strong><br>
+        <div class="info-row"><span class="lbl">${escapeHtml(t.issue_date)}</span> <span class="val">${escapeHtml(formatDate(invoice.issue_date))}</span></div>
-        ${orderNumber ? `${escapeHtml(t.order_no)} ${orderNumber}` : ""}
+        <div class="info-row"><span class="lbl">${escapeHtml(t.due_date)}</span> <span class="val">${escapeHtml(formatDate(invoice.due_date))}</span></div>
-      </div>
+        <div class="info-row"><span class="lbl">${escapeHtml(t.tax_date)}</span> <span class="val">${escapeHtml(formatDate(invoice.tax_date))}</span></div>
-    </div>
+        <div class="info-row"><span class="lbl">${escapeHtml(t.payment_method)}</span> <span class="val">${escapeHtml(invoice.payment_method)}</span></div>
-    <div class="col">
+      </td>
-      <div class="dates-box">
+    </tr>
-        <div class="dates-row"><span class="lbl">${escapeHtml(t.issue_date)}</span> <span class="val">${escapeHtml(formatDate(invoice.issue_date))}</span></div>
+  </table>
-        <div class="dates-row"><span class="lbl">${escapeHtml(t.due_date)}</span> <span class="val">${escapeHtml(formatDate(invoice.due_date))}</span></div>
-        <div class="dates-row"><span class="lbl">${escapeHtml(t.tax_date)}</span> <span class="val">${escapeHtml(formatDate(invoice.tax_date))}</span></div>
-        <div class="dates-row"><span class="lbl">${escapeHtml(t.payment_method)}</span> <span class="val">${escapeHtml(invoice.payment_method)}</span></div>
-      </div>
-    </div>
-  </div>
 
   <!-- Polozky -->
   <div class="billing-label">${escapeHtml(invoice.billing_text || t.billing)}</div>
   <table class="items">
     <thead>
       <tr>
-        <th class="center" style="width:5%">${escapeHtml(t.col_no)}</th>
+        <th class="center" style="width:3%">${escapeHtml(t.col_no)}</th>
-        <th style="width:30%">${escapeHtml(t.col_desc)}</th>
+        <th style="width:36%">${escapeHtml(t.col_desc)}</th>
-        <th class="center" style="width:9%">${escapeHtml(t.col_qty)}</th>
+        <th class="center" style="width:10%">${escapeHtml(t.col_qty)}</th>
-        <th class="right" style="width:11%">${escapeHtml(t.col_unit_price)}</th>
+        <th class="right" style="width:10%">${escapeHtml(t.col_unit_price)}</th>
-        <th class="right" style="width:11%">${escapeHtml(t.col_price)}</th>
+        <th class="right" style="width:10%">${escapeHtml(t.col_price)}</th>
-        <th class="center" style="width:7%">${escapeHtml(t.col_vat_pct)}</th>
+        <th class="center" style="width:5%">${escapeHtml(t.col_vat_pct)}</th>
-        <th class="right" style="width:11%">${escapeHtml(t.col_vat)}</th>
+        <th class="right" style="width:10%">${escapeHtml(t.col_vat)}</th>
         <th class="right" style="width:16%">${escapeHtml(t.col_total)}</th>
       </tr>
     </thead>

src/routes/admin/leave-requests.ts

@@ -29,7 +29,7 @@ export default async function leaveRequestsRoutes(
     const isAdmin = authData.permissions.includes("attendance.approve");
 
     const where: Record<string, unknown> = {};
-    if (!isAdmin) where.user_id = authData.userId;
+    if (!isAdmin || query.mine === "1") where.user_id = authData.userId;
     else if (query.user_id) where.user_id = Number(query.user_id);
     if (query.status) where.status = String(query.status);
 

src/routes/admin/offers-pdf.ts

@@ -517,7 +517,7 @@ ${indentCSS}
   }
   table.items tbody td.desc {
     font-size: 10pt;
-    font-weight: 500;
+    font-weight: 600;
     color: #1a1a1a;
   }
   table.items tbody td.total-cell {

src/routes/admin/trips.ts

@@ -66,6 +66,45 @@ export default async function tripsRoutes(
     });
   });
 
+  // GET /api/admin/trips/users — users with trips.record permission
+  fastify.get(
+    "/users",
+    { preHandler: requireAuth },
+    async (_request, reply) => {
+      const users = await prisma.users.findMany({
+        where: {
+          is_active: true,
+          roles: {
+            is: {
+              OR: [
+                { name: "admin" },
+                {
+                  role_permissions: {
+                    some: { permissions: { name: "trips.record" } },
+                  },
+                },
+              ],
+            },
+          },
+        },
+        select: {
+          id: true,
+          first_name: true,
+          last_name: true,
+          username: true,
+        },
+        orderBy: { last_name: "asc" },
+      });
+      return success(
+        reply,
+        users.map((u) => ({
+          id: u.id,
+          name: `${u.first_name} ${u.last_name}`.trim() || u.username,
+        })),
+      );
+    },
+  );
+
   // GET /api/admin/trips/print — print data for trip report
   fastify.get(
     "/print",

src/schemas/attendance.schema.ts

@@ -39,7 +39,9 @@ export const AttendanceBalancesSchema = z.object({
 
 export const AttendanceBulkSchema = z.object({
   month: z.string().regex(/^\d{4}-\d{2}$/, "Měsíc je povinný (formát YYYY-MM)"),
-  user_ids: z.array(z.number()).min(1, "Vyberte alespoň jednoho zaměstnance"),
+  user_ids: z
+    .array(z.union([z.number(), z.string()]).transform((v) => Number(v)))
+    .min(1, "Vyberte alespoň jednoho zaměstnance"),
   arrival_time: z.string().optional().default("08:00"),
   departure_time: z.string().optional().default("16:30"),
   break_start_time: z.string().optional().default("12:00"),

src/services/attendance.service.ts

@@ -1,6 +1,6 @@
 import { attendance_leave_type, Prisma } from "@prisma/client";
 import prisma from "../config/database";
-import { getBusinessDaysInMonth } from "../utils/czech-holidays";
+import { getBusinessDaysInMonth, isHoliday } from "../utils/czech-holidays";
 import { localDateStr } from "../utils/date";
 import { getSystemSettings } from "./system-settings";
 
@@ -1094,6 +1094,20 @@ export async function bulkCreateAttendance(data: BulkAttendanceData) {
       }
 
       const shiftDate = new Date(Date.UTC(yr, mo - 1, day, 12, 0, 0));
+
+      if (isHoliday(dateStr)) {
+        await prisma.attendance.create({
+          data: {
+            user_id: userId,
+            shift_date: shiftDate,
+            leave_type: "holiday",
+            leave_hours: 8,
+          },
+        });
+        inserted++;
+        continue;
+      }
+
       await prisma.attendance.create({
         data: {
           user_id: userId,