Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3bd0d055d9 | ||
|
|
746d17e182 | ||
|
|
e96e51598a | ||
|
|
9abec36f07 | ||
|
|
ecd8e3679f |
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "app-ts",
|
"name": "app-ts",
|
||||||
"version": "1.5.6",
|
"version": "1.6.0",
|
||||||
"description": "",
|
"description": "",
|
||||||
"main": "dist/server.js",
|
"main": "dist/server.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -491,10 +491,69 @@
|
|||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@media (max-width: 768px) {
|
||||||
|
.offers-items-table .admin-table td .admin-form-input {
|
||||||
|
font-size: 16px;
|
||||||
|
min-height: 44px;
|
||||||
|
padding: 9px 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Give the description column more room by shrinking numeric columns */
|
||||||
|
.offers-col-qty {
|
||||||
|
width: 4rem !important;
|
||||||
|
}
|
||||||
|
.offers-col-unit {
|
||||||
|
width: 4rem !important;
|
||||||
|
}
|
||||||
|
.offers-col-price {
|
||||||
|
width: 5.5rem !important;
|
||||||
|
}
|
||||||
|
.offers-col-included {
|
||||||
|
width: 3.5rem !important;
|
||||||
|
}
|
||||||
|
.offers-col-total {
|
||||||
|
width: 5.5rem !important;
|
||||||
|
}
|
||||||
|
.offers-col-del {
|
||||||
|
width: 2.5rem !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@media (max-width: 640px) {
|
@media (max-width: 640px) {
|
||||||
.offers-items-table {
|
.offers-items-table {
|
||||||
margin: 0 -1rem;
|
margin: 0 -1rem;
|
||||||
width: calc(100% + 2rem);
|
width: calc(100% + 2rem);
|
||||||
|
border-radius: 0;
|
||||||
|
border-left: none;
|
||||||
|
border-right: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.offers-items-table .admin-table {
|
||||||
|
min-width: 700px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.offers-items-table .admin-table td {
|
||||||
|
padding: 6px;
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.offers-items-table .admin-table th {
|
||||||
|
font-size: 10px;
|
||||||
|
padding: 6px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Further reduce numeric columns on very small screens */
|
||||||
|
.offers-col-qty {
|
||||||
|
width: 3.5rem !important;
|
||||||
|
}
|
||||||
|
.offers-col-unit {
|
||||||
|
width: 3.5rem !important;
|
||||||
|
}
|
||||||
|
.offers-col-price {
|
||||||
|
width: 5rem !important;
|
||||||
|
}
|
||||||
|
.offers-col-total {
|
||||||
|
width: 5rem !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -391,6 +391,10 @@ export default function AuditLog() {
|
|||||||
>
|
>
|
||||||
<div className="admin-card-body">
|
<div className="admin-card-body">
|
||||||
<div className="admin-table-responsive">
|
<div className="admin-table-responsive">
|
||||||
|
<Skeleton
|
||||||
|
name="audit-log-rows"
|
||||||
|
loading={isPending}
|
||||||
|
fixture={
|
||||||
<table className="admin-table">
|
<table className="admin-table">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
@@ -403,20 +407,9 @@ export default function AuditLog() {
|
|||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<Skeleton
|
|
||||||
name="audit-log-rows"
|
|
||||||
loading={isPending}
|
|
||||||
fixture={
|
|
||||||
<div style={{ padding: "1rem" }}>
|
|
||||||
{Array.from({ length: 10 }, (_, i) => (
|
{Array.from({ length: 10 }, (_, i) => (
|
||||||
<div
|
<tr key={i}>
|
||||||
key={i}
|
<td>
|
||||||
style={{
|
|
||||||
display: "flex",
|
|
||||||
gap: "1rem",
|
|
||||||
marginBottom: "0.75rem",
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<div
|
<div
|
||||||
style={{
|
style={{
|
||||||
width: 110,
|
width: 110,
|
||||||
@@ -425,6 +418,8 @@ export default function AuditLog() {
|
|||||||
borderRadius: 4,
|
borderRadius: 4,
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
<div
|
<div
|
||||||
style={{
|
style={{
|
||||||
width: 80,
|
width: 80,
|
||||||
@@ -433,6 +428,8 @@ export default function AuditLog() {
|
|||||||
borderRadius: 4,
|
borderRadius: 4,
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
<div
|
<div
|
||||||
style={{
|
style={{
|
||||||
width: 70,
|
width: 70,
|
||||||
@@ -441,6 +438,8 @@ export default function AuditLog() {
|
|||||||
borderRadius: 10,
|
borderRadius: 10,
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
<div
|
<div
|
||||||
style={{
|
style={{
|
||||||
width: 80,
|
width: 80,
|
||||||
@@ -449,14 +448,18 @@ export default function AuditLog() {
|
|||||||
borderRadius: 4,
|
borderRadius: 4,
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
<div
|
<div
|
||||||
style={{
|
style={{
|
||||||
flex: 1,
|
width: "100%",
|
||||||
height: 14,
|
height: 14,
|
||||||
background: "var(--bg-tertiary)",
|
background: "var(--bg-tertiary)",
|
||||||
borderRadius: 4,
|
borderRadius: 4,
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
<div
|
<div
|
||||||
style={{
|
style={{
|
||||||
width: 90,
|
width: 90,
|
||||||
@@ -465,12 +468,25 @@ export default function AuditLog() {
|
|||||||
borderRadius: 4,
|
borderRadius: 4,
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</div>
|
</td>
|
||||||
|
</tr>
|
||||||
))}
|
))}
|
||||||
</div>
|
</tbody>
|
||||||
|
</table>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<>
|
<table className="admin-table">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>Čas</th>
|
||||||
|
<th>Uživatel</th>
|
||||||
|
<th>Akce</th>
|
||||||
|
<th>Typ entity</th>
|
||||||
|
<th>Popis</th>
|
||||||
|
<th>IP</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
{logs.length === 0 && (
|
{logs.length === 0 && (
|
||||||
<tr>
|
<tr>
|
||||||
<td colSpan={6}>
|
<td colSpan={6}>
|
||||||
@@ -518,10 +534,9 @@ export default function AuditLog() {
|
|||||||
<td className="admin-mono">{log.user_ip || "-"}</td>
|
<td className="admin-mono">{log.user_ip || "-"}</td>
|
||||||
</tr>
|
</tr>
|
||||||
))}
|
))}
|
||||||
</>
|
|
||||||
</Skeleton>
|
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
</Skeleton>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<Pagination
|
<Pagination
|
||||||
|
|||||||
@@ -274,9 +274,10 @@ function loadOfferDraft(): {
|
|||||||
sections?: unknown[];
|
sections?: unknown[];
|
||||||
} | null {
|
} | null {
|
||||||
try {
|
try {
|
||||||
const raw = localStorage.getItem("boha_offer_draft");
|
const raw = localStorage.getItem(DRAFT_KEY);
|
||||||
return raw ? JSON.parse(raw) : null;
|
return raw ? JSON.parse(raw) : null;
|
||||||
} catch {
|
} catch (e) {
|
||||||
|
console.error("Failed to load offer draft:", e);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -353,17 +354,28 @@ export default function OfferDetail() {
|
|||||||
const draft = loadOfferDraft();
|
const draft = loadOfferDraft();
|
||||||
if (draft?.form) {
|
if (draft?.form) {
|
||||||
return {
|
return {
|
||||||
...emptyForm,
|
quotation_number:
|
||||||
|
(draft.form.quotation_number as string) || emptyForm.quotation_number,
|
||||||
project_code:
|
project_code:
|
||||||
(draft.form.project_code as string) || emptyForm.project_code,
|
(draft.form.project_code as string) || emptyForm.project_code,
|
||||||
|
customer_id:
|
||||||
|
(draft.form.customer_id as number | null) ?? emptyForm.customer_id,
|
||||||
customer_name:
|
customer_name:
|
||||||
(draft.form.customer_name as string) || emptyForm.customer_name,
|
(draft.form.customer_name as string) || emptyForm.customer_name,
|
||||||
created_at: (draft.form.created_at as string) || emptyForm.created_at,
|
created_at: (draft.form.created_at as string) || emptyForm.created_at,
|
||||||
valid_until:
|
valid_until:
|
||||||
(draft.form.valid_until as string) || emptyForm.valid_until,
|
(draft.form.valid_until as string) || emptyForm.valid_until,
|
||||||
currency: (draft.form.currency as string) || emptyForm.currency,
|
currency: (draft.form.currency as string) || emptyForm.currency,
|
||||||
customer_id:
|
language: (draft.form.language as string) || emptyForm.language,
|
||||||
(draft.form.customer_id as number | null) ?? emptyForm.customer_id,
|
vat_rate: (draft.form.vat_rate as number) ?? emptyForm.vat_rate,
|
||||||
|
apply_vat: (draft.form.apply_vat as boolean) ?? emptyForm.apply_vat,
|
||||||
|
exchange_rate:
|
||||||
|
(draft.form.exchange_rate as string) || emptyForm.exchange_rate,
|
||||||
|
scope_title:
|
||||||
|
(draft.form.scope_title as string) || emptyForm.scope_title,
|
||||||
|
scope_description:
|
||||||
|
(draft.form.scope_description as string) ||
|
||||||
|
emptyForm.scope_description,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
return emptyForm;
|
return emptyForm;
|
||||||
@@ -590,22 +602,27 @@ export default function OfferDetail() {
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (isEdit) return;
|
if (isEdit) return;
|
||||||
try {
|
try {
|
||||||
|
const data = JSON.parse(debouncedDraft);
|
||||||
const draft = {
|
const draft = {
|
||||||
form: {
|
form: {
|
||||||
project_code: form.project_code,
|
project_code: data.form.project_code ?? "",
|
||||||
customer_id: form.customer_id,
|
customer_id: data.form.customer_id ?? null,
|
||||||
customer_name: form.customer_name,
|
customer_name: data.form.customer_name ?? "",
|
||||||
created_at: form.created_at,
|
created_at: data.form.created_at ?? "",
|
||||||
valid_until: form.valid_until,
|
valid_until: data.form.valid_until ?? "",
|
||||||
currency: form.currency,
|
currency: data.form.currency ?? "CZK",
|
||||||
|
language: data.form.language ?? "EN",
|
||||||
|
vat_rate: data.form.vat_rate ?? 21,
|
||||||
|
apply_vat: data.form.apply_vat ?? false,
|
||||||
|
exchange_rate: data.form.exchange_rate ?? "",
|
||||||
},
|
},
|
||||||
items,
|
items: data.items,
|
||||||
sections,
|
sections: data.sections,
|
||||||
savedAt: new Date().toISOString(),
|
savedAt: new Date().toISOString(),
|
||||||
};
|
};
|
||||||
localStorage.setItem(DRAFT_KEY, JSON.stringify(draft));
|
localStorage.setItem(DRAFT_KEY, JSON.stringify(draft));
|
||||||
} catch {
|
} catch (e) {
|
||||||
/* localStorage full or unavailable */
|
console.error("Failed to save offer draft:", e);
|
||||||
}
|
}
|
||||||
}, [debouncedDraft]); // eslint-disable-line react-hooks/exhaustive-deps
|
}, [debouncedDraft]); // eslint-disable-line react-hooks/exhaustive-deps
|
||||||
|
|
||||||
@@ -697,8 +714,8 @@ export default function OfferDetail() {
|
|||||||
if (!isEdit) {
|
if (!isEdit) {
|
||||||
try {
|
try {
|
||||||
localStorage.removeItem(DRAFT_KEY);
|
localStorage.removeItem(DRAFT_KEY);
|
||||||
} catch {
|
} catch (e) {
|
||||||
/* ignore */
|
console.error("Failed to remove offer draft:", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!isEdit && result.data?.id) {
|
if (!isEdit && result.data?.id) {
|
||||||
@@ -1283,7 +1300,7 @@ export default function OfferDetail() {
|
|||||||
</p>
|
</p>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<div className="admin-table-responsive">
|
<div className="offers-items-table">
|
||||||
<DndContext
|
<DndContext
|
||||||
sensors={dndSensors}
|
sensors={dndSensors}
|
||||||
collisionDetection={closestCenter}
|
collisionDetection={closestCenter}
|
||||||
@@ -1316,18 +1333,42 @@ export default function OfferDetail() {
|
|||||||
<th style={{ width: "2.5rem", textAlign: "center" }}>
|
<th style={{ width: "2.5rem", textAlign: "center" }}>
|
||||||
#
|
#
|
||||||
</th>
|
</th>
|
||||||
<th>Popis</th>
|
<th className="offers-col-desc">Popis</th>
|
||||||
<th style={{ width: "5rem" }}>Množství</th>
|
<th
|
||||||
<th style={{ width: "5rem" }}>Jednotka</th>
|
className="offers-col-qty"
|
||||||
<th style={{ width: "7rem" }}>Cena/ks</th>
|
style={{ width: "5rem" }}
|
||||||
<th style={{ width: "4rem", textAlign: "center" }}>
|
>
|
||||||
|
Množství
|
||||||
|
</th>
|
||||||
|
<th
|
||||||
|
className="offers-col-unit"
|
||||||
|
style={{ width: "5rem" }}
|
||||||
|
>
|
||||||
|
Jednotka
|
||||||
|
</th>
|
||||||
|
<th
|
||||||
|
className="offers-col-price"
|
||||||
|
style={{ width: "7rem" }}
|
||||||
|
>
|
||||||
|
Cena/ks
|
||||||
|
</th>
|
||||||
|
<th
|
||||||
|
className="offers-col-included"
|
||||||
|
style={{ width: "4rem", textAlign: "center" }}
|
||||||
|
>
|
||||||
V ceně
|
V ceně
|
||||||
</th>
|
</th>
|
||||||
<th style={{ width: "7rem", textAlign: "right" }}>
|
<th
|
||||||
|
className="offers-col-total"
|
||||||
|
style={{ width: "7rem", textAlign: "right" }}
|
||||||
|
>
|
||||||
Celkem
|
Celkem
|
||||||
</th>
|
</th>
|
||||||
{!isInvalidated && !isLockedByOther && (
|
{!isInvalidated && !isLockedByOther && (
|
||||||
<th style={{ width: "3rem" }} />
|
<th
|
||||||
|
className="offers-col-del"
|
||||||
|
style={{ width: "3rem" }}
|
||||||
|
/>
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ export default function OffersTemplates() {
|
|||||||
</div>
|
</div>
|
||||||
</motion.div>
|
</motion.div>
|
||||||
|
|
||||||
<div className="admin-tabs">
|
<div className="admin-tabs mb-4">
|
||||||
<button
|
<button
|
||||||
className={`admin-tab ${activeTab === "items" ? "active" : ""}`}
|
className={`admin-tab ${activeTab === "items" ? "active" : ""}`}
|
||||||
onClick={() => setActiveTab("items")}
|
onClick={() => setActiveTab("items")}
|
||||||
|
|||||||
@@ -1546,15 +1546,31 @@ export default function Settings() {
|
|||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
) : (
|
) : (
|
||||||
<Skeleton
|
<div
|
||||||
name="settings-permissions"
|
style={{
|
||||||
loading={
|
padding: "1rem",
|
||||||
!role.permissions || role.permissions.length === 0
|
display: "flex",
|
||||||
}
|
flexDirection: "column",
|
||||||
fixture={<span>...</span>}
|
gap: "0.5rem",
|
||||||
|
}}
|
||||||
>
|
>
|
||||||
<span>{role.permissions?.length || 0} oprávnění</span>
|
<div
|
||||||
</Skeleton>
|
style={{
|
||||||
|
height: "0.75rem",
|
||||||
|
background: "#e0e0e0",
|
||||||
|
borderRadius: "4px",
|
||||||
|
width: "60%",
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<div
|
||||||
|
style={{
|
||||||
|
height: "0.75rem",
|
||||||
|
background: "#e0e0e0",
|
||||||
|
borderRadius: "4px",
|
||||||
|
width: "40%",
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</motion.div>
|
</motion.div>
|
||||||
|
|||||||
@@ -220,8 +220,14 @@ export default async function attendanceRoutes(
|
|||||||
userId,
|
userId,
|
||||||
isAdmin,
|
isAdmin,
|
||||||
authUserId: authData.userId,
|
authUserId: authData.userId,
|
||||||
month: query.month ? Number(query.month) : undefined,
|
month: query.month
|
||||||
year: query.year ? Number(query.year) : undefined,
|
? Number(String(query.month).split("-")[1])
|
||||||
|
: undefined,
|
||||||
|
year: query.month
|
||||||
|
? Number(String(query.month).split("-")[0])
|
||||||
|
: query.year
|
||||||
|
? Number(query.year)
|
||||||
|
: undefined,
|
||||||
});
|
});
|
||||||
|
|
||||||
return reply.send({
|
return reply.send({
|
||||||
|
|||||||
Reference in New Issue
Block a user