bleese14/004.erp.generic
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Compare commits

base: bleese14:7053ec32f84ece25cd8b26d033e456eaaacd0c48
Branches Tags
bleese14:main bleese14:agents/out-of-memory-error-fix bleese14:environment/production-fix
..
compare: bleese14:ee18af7877a11e98141334dd980adb5b76b68ca6
Branches Tags
bleese14:main bleese14:agents/out-of-memory-error-fix bleese14:environment/production-fix

2 Commits
7053ec32f8 ... ee18af7877

Author SHA1 Message Date
mariomitte
ee18af7877 fix: correct work-order navbar state and actions
Some checks failed
ERP CI/CD Pipeline / test (push) Has been cancelled
Details
ERP CI/CD Pipeline / Deploy (server git pull + compose) (push) Has been cancelled
Details 
Use prefix path matching so nested putni-nalozi routes highlight the correct nav item, load current user data in Navbar when auth token exists, and group PDF/DOCX work-order download buttons in one action block.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
 2026-08-07 07:36:58 +02:00
mariomitte
27b7c31c13 fix: restore crane edit modal in task service context 
Expose task details from the service-context task list and restore visible crane data editing within the task flow.

Add crane working-hours and mileage editing to the task creation modal when a service context is selected, and improve the task details modal action so servicers can update crane data directly.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
 2026-08-07 07:19:32 +02:00
5 changed files with 286 additions and 74 deletions
Expand all files Collapse all files

14
frontend/src/components/Navbar.jsx
View File

@@ -4,7 +4,7 @@ import AuthWidget from './AuthWidget';
import UserDisplay from './ui/UserDisplay'; import UserDisplay from './ui/UserDisplay';
import { useEffect, useRef, useState } from 'preact/hooks'; import { useEffect, useRef, useState } from 'preact/hooks';
import { useSpring, animated } from '@react-spring/web'; import { useSpring, animated } from '@react-spring/web';
import { hydrateAuthFromStorage } from '../stores/authStore'; import { hydrateAuthFromStorage, loadCurrentUser, $user, $accessToken } from '../stores/authStore';
const ITEMS = [ const ITEMS = [
{ id: 'dashboard', label: 'Dashboard', href: '/' }, { id: 'dashboard', label: 'Dashboard', href: '/' },
@@ -21,8 +21,12 @@ function normalizePath(p) {
} }
function getActiveIndex(path) { function getActiveIndex(path) {
const idx = ITEMS.findIndex((item) => item.href === path); // Exact match (e.g. '/' → Dashboard)
return idx >= 0 ? idx : 0; const exact = ITEMS.findIndex((item) => item.href === path);
if (exact >= 0) return exact;
// Prefix match for sub-paths (e.g. '/putni-nalozi/racuni' → Putni nalozi)
const prefix = ITEMS.findIndex((item) => item.href !== '/' && path.startsWith(item.href));
return prefix >= 0 ? prefix : 0;
} }
export default function Navbar({ minimal = false }) { export default function Navbar({ minimal = false }) {
@@ -55,6 +59,10 @@ export default function Navbar({ minimal = false }) {
// Mount: izmjeri početnu poziciju bez animacije, pa uključi animaciju za buduće navigacije // Mount: izmjeri početnu poziciju bez animacije, pa uključi animaciju za buduće navigacije
useEffect(() => { useEffect(() => {
hydrateAuthFromStorage(); hydrateAuthFromStorage();
// Učitaj korisnika ako token postoji ali $user još nije popunjen
if (!$user.get() && $accessToken.get()) {
loadCurrentUser();
}
const timer = setTimeout(() => { const timer = setTimeout(() => {
measureIndicator(); measureIndicator();

112
frontend/src/components/dashboard/FleetDashboardShell.jsx
View File

@@ -1,4 +1,4 @@
import { useStore } from '@nanostores/preact'; import { useStore } from '@nanostores/preact';
import { useEffect, useMemo, useState } from 'preact/hooks'; import { useEffect, useMemo, useState } from 'preact/hooks';
import { animated, useSpring, useTransition } from '@react-spring/web'; import { animated, useSpring, useTransition } from '@react-spring/web';
import DashboardTopbar from './DashboardTopbar'; import DashboardTopbar from './DashboardTopbar';
@@ -130,8 +130,8 @@ function SortableCodeLabel({ title, direction, onToggle }) {
title="Sortiraj po datumu iz koda (godina, mjesec, dan)" title="Sortiraj po datumu iz koda (godina, mjesec, dan)"
> >
<span>{title}</span> <span>{title}</span>
<span className={direction === 'asc' ? 'text-indigo-700' : 'text-text-muted/50'}>↑</span> <span className={direction === 'asc' ? 'text-indigo-700' : 'text-text-muted/50'}>↑</span>
<span className={direction === 'desc' ? 'text-indigo-700' : 'text-text-muted/50'}>↓</span> <span className={direction === 'desc' ? 'text-indigo-700' : 'text-text-muted/50'}>↓</span>
</button> </button>
); );
} }
@@ -276,7 +276,7 @@ export default function FleetDashboardShell({ pageMode = 'dashboard' }) {
if (targetWorkOrder) { if (targetWorkOrder) {
openWorkOrderDetails(targetWorkOrder); openWorkOrderDetails(targetWorkOrder);
} else { } else {
showToast('Traženi putni nalog nije pronađen u trenutnom prikazu.', 'warning'); showToast('TraĹľeni putni nalog nije pronaÄ‘en u trenutnom prikazu.', 'warning');
} }
return; return;
} }
@@ -293,7 +293,7 @@ export default function FleetDashboardShell({ pageMode = 'dashboard' }) {
setServiceRecordBackTask(null); setServiceRecordBackTask(null);
setSelectedServiceRecord(targetServiceRecord); setSelectedServiceRecord(targetServiceRecord);
} else { } else {
showToast('Traženi servisni zapis nije pronađen u trenutnom prikazu.', 'warning'); showToast('TraĹľeni servisni zapis nije pronaÄ‘en u trenutnom prikazu.', 'warning');
} }
return; return;
} }
@@ -445,7 +445,7 @@ export default function FleetDashboardShell({ pageMode = 'dashboard' }) {
} }
// Collect work order IDs that are directly assigned to tasks of the context crane. // Collect work order IDs that are directly assigned to tasks of the context crane.
// This covers cross-crane shared work orders: a WO created for crane A can be // This covers cross-crane shared work orders: a WO created for crane A can be
// assigned to a task of crane B — it should still appear in crane B's context view. // assigned to a task of crane B — it should still appear in crane B's context view.
const contextTaskWorkOrderIds = new Set( const contextTaskWorkOrderIds = new Set(
tasks tasks
.filter((t) => String(t.vehicle || '') === String(hydratedSelectedVehicleId) && t.work_order) .filter((t) => String(t.vehicle || '') === String(hydratedSelectedVehicleId) && t.work_order)
@@ -463,7 +463,7 @@ export default function FleetDashboardShell({ pageMode = 'dashboard' }) {
[scopedWorkOrders, currentPage] [scopedWorkOrders, currentPage]
); );
// Map: workOrderId → array of unique crane objects (own + cross-crane task links) // Map: workOrderId → array of unique crane objects (own + cross-crane task links)
const workOrderSharedCranes = useMemo(() => { const workOrderSharedCranes = useMemo(() => {
const craneById = new Map(cranes.map((c) => [String(c.id), c])); const craneById = new Map(cranes.map((c) => [String(c.id), c]));
const map = new Map(); const map = new Map();
@@ -658,11 +658,11 @@ export default function FleetDashboardShell({ pageMode = 'dashboard' }) {
async function handleUpdateWorkOrder(workOrder, changes) { async function handleUpdateWorkOrder(workOrder, changes) {
try { try {
await updateWorkOrder(workOrder.id, changes); await updateWorkOrder(workOrder.id, changes);
showToast('Nalog je uspješno ažuriran.', 'success'); showToast('Nalog je uspješno aĹľuriran.', 'success');
await fetchFleetDashboardData({ silent: true }); await fetchFleetDashboardData({ silent: true });
await fetchTasks({ force: true }); await fetchTasks({ force: true });
} catch (error) { } catch (error) {
showToast(error?.message || 'Ažuriranje naloga nije uspjelo.', 'error'); showToast(error?.message || 'AĹľuriranje naloga nije uspjelo.', 'error');
} }
} }
@@ -674,7 +674,7 @@ export default function FleetDashboardShell({ pageMode = 'dashboard' }) {
async function handleSetServiceContext() { async function handleSetServiceContext() {
if (!selectedCraneRowId) { if (!selectedCraneRowId) {
showToast('Prvo označite redak dizalice.', 'warning'); showToast('Prvo oznaÄŤite redak dizalice.', 'warning');
return; return;
} }
const selectedCrane = cranes.find((item) => String(item.id) === String(selectedCraneRowId)); const selectedCrane = cranes.find((item) => String(item.id) === String(selectedCraneRowId));
@@ -688,7 +688,7 @@ export default function FleetDashboardShell({ pageMode = 'dashboard' }) {
function handleSetServiceContextForCrane(selectedCrane) { function handleSetServiceContextForCrane(selectedCrane) {
if (!selectedCrane) { if (!selectedCrane) {
showToast('Odabrana dizalica više nije dostupna.', 'warning'); showToast('Odabrana dizalica više nije dostupna.', 'warning');
return; return;
} }
setSelectedCraneRowId(selectedCrane.id); setSelectedCraneRowId(selectedCrane.id);
@@ -711,7 +711,7 @@ export default function FleetDashboardShell({ pageMode = 'dashboard' }) {
return; return;
} }
} catch { } catch {
showToast('Ne mogu dohvatiti dizalice. Provjerite mrežu ili prijavu.', 'error'); showToast('Ne mogu dohvatiti dizalice. Provjerite mreĹľu ili prijavu.', 'error');
return; return;
} }
setIsTaskModalOpen(true); setIsTaskModalOpen(true);
@@ -741,7 +741,7 @@ export default function FleetDashboardShell({ pageMode = 'dashboard' }) {
{ key: 'serialNumber', label: 'SN', className: 'px-4 py-3' }, { key: 'serialNumber', label: 'SN', className: 'px-4 py-3' },
{ key: 'model', label: 'Marka / Model', className: 'px-4 py-3' }, { key: 'model', label: 'Marka / Model', className: 'px-4 py-3' },
{ key: 'client', label: 'Kupac', className: 'px-4 py-3' }, { key: 'client', label: 'Kupac', className: 'px-4 py-3' },
{ key: 'mileage', label: 'Kilometraža', className: 'px-4 py-3' }, { key: 'mileage', label: 'KilometraĹľa', className: 'px-4 py-3' },
{ key: 'status', label: 'Status', className: 'px-4 py-3' }, { key: 'status', label: 'Status', className: 'px-4 py-3' },
]; ];
const taskColumns = [ const taskColumns = [
@@ -784,7 +784,7 @@ export default function FleetDashboardShell({ pageMode = 'dashboard' }) {
return; return;
} }
} catch { } catch {
showToast('Ne mogu dohvatiti dizalice. Provjerite mrežu ili prijavu.', 'error'); showToast('Ne mogu dohvatiti dizalice. Provjerite mreĹľu ili prijavu.', 'error');
return; return;
} }
setIsWorkOrderModalOpen(true); setIsWorkOrderModalOpen(true);
@@ -839,9 +839,9 @@ export default function FleetDashboardShell({ pageMode = 'dashboard' }) {
<p className="text-[10px] text-text-muted">aktivnih zadataka</p> <p className="text-[10px] text-text-muted">aktivnih zadataka</p>
</article> </article>
{/* Dovršeni nalozi */} {/* Dovršeni nalozi */}
<article className="flex flex-col gap-0.5 rounded-xl border border-border-hairline bg-canvas-elevated px-3 py-2.5 shadow-sm"> <article className="flex flex-col gap-0.5 rounded-xl border border-border-hairline bg-canvas-elevated px-3 py-2.5 shadow-sm">
<p className="text-xs text-text-muted">Dovršeni nalozi</p> <p className="text-xs text-text-muted">Dovršeni nalozi</p>
<p className="text-xl font-semibold text-emerald-600">{stats.closedWorkOrders}</p> <p className="text-xl font-semibold text-emerald-600">{stats.closedWorkOrders}</p>
{stats.totalWorkOrders > 0 && ( {stats.totalWorkOrders > 0 && (
<p className="text-[10px] text-text-muted"> <p className="text-[10px] text-text-muted">
@@ -854,7 +854,7 @@ export default function FleetDashboardShell({ pageMode = 'dashboard' }) {
<article className="flex flex-col gap-0.5 rounded-xl border border-border-hairline bg-canvas-elevated px-3 py-2.5 shadow-sm"> <article className="flex flex-col gap-0.5 rounded-xl border border-border-hairline bg-canvas-elevated px-3 py-2.5 shadow-sm">
<p className="text-xs text-text-muted">Moji danas</p> <p className="text-xs text-text-muted">Moji danas</p>
<p className={`text-xl font-semibold ${myTasksToday > 0 ? 'text-indigo-600' : 'text-text-main'}`}> <p className={`text-xl font-semibold ${myTasksToday > 0 ? 'text-indigo-600' : 'text-text-main'}`}>
{hasMounted ? myTasksToday : '—'} {hasMounted ? myTasksToday : '—'}
</p> </p>
<p className="text-[10px] text-text-muted">planirani na mene</p> <p className="text-[10px] text-text-muted">planirani na mene</p>
</article> </article>
@@ -964,7 +964,7 @@ export default function FleetDashboardShell({ pageMode = 'dashboard' }) {
rows={dashboardTasks} rows={dashboardTasks}
rowKey={(task) => task.id} rowKey={(task) => task.id}
loading={loading} loading={loading}
loadingMessage="Učitavanje radnih zadataka..." loadingMessage="UÄŤitavanje radnih zadataka..."
emptyMessage="Nema radnih zadataka za odabrani filter." emptyMessage="Nema radnih zadataka za odabrani filter."
rowClassName={(task) => { rowClassName={(task) => {
const status = String(task?.status || '').toLowerCase(); const status = String(task?.status || '').toLowerCase();
@@ -1018,7 +1018,7 @@ export default function FleetDashboardShell({ pageMode = 'dashboard' }) {
<details className="overflow-hidden rounded-xl border border-border-hairline bg-canvas-elevated shadow-sm"> <details className="overflow-hidden rounded-xl border border-border-hairline bg-canvas-elevated shadow-sm">
<summary className="flex cursor-pointer select-none items-center justify-between px-4 py-3 text-sm font-medium text-text-muted hover:bg-canvas-deep"> <summary className="flex cursor-pointer select-none items-center justify-between px-4 py-3 text-sm font-medium text-text-muted hover:bg-canvas-deep">
<span>Sync log</span> <span>Sync log</span>
<span className="text-xs opacity-60">▼</span> <span className="text-xs opacity-60">â–Ľ</span>
</summary> </summary>
<div className="border-t border-border-hairline"> <div className="border-t border-border-hairline">
<SyncLogPanel /> <SyncLogPanel />
@@ -1070,7 +1070,7 @@ export default function FleetDashboardShell({ pageMode = 'dashboard' }) {
onClick={() => fetchFleetDashboardData()} onClick={() => fetchFleetDashboardData()}
className="text-sm font-medium text-indigo-600 hover:text-indigo-800" className="text-sm font-medium text-indigo-600 hover:text-indigo-800"
> >
Osvježi OsvjeĹľi
</button> </button>
</div> </div>
</div> </div>
@@ -1079,12 +1079,12 @@ export default function FleetDashboardShell({ pageMode = 'dashboard' }) {
rows={latestWorkOrders} rows={latestWorkOrders}
rowKey={(workOrder) => workOrder.id} rowKey={(workOrder) => workOrder.id}
loading={loading} loading={loading}
loadingMessage="Učitavanje..." loadingMessage="UÄŤitavanje..."
emptyMessage={ emptyMessage={
workOrderScope === 'context' workOrderScope === 'context'
? (!hydratedSelectedVehicleId ? (!hydratedSelectedVehicleId
? 'Odaberite dizalicu za prikaz putnih naloga iz servisnog konteksta.' ? 'Odaberite dizalicu za prikaz putnih naloga iz servisnog konteksta.'
: 'Nema dostupnih putnih naloga za odabrani servisni kontekst. Možete prebaciti na prikaz svih naloga.') : 'Nema dostupnih putnih naloga za odabrani servisni kontekst. MoĹľete prebaciti na prikaz svih naloga.')
: 'Nema dostupnih putnih naloga.' : 'Nema dostupnih putnih naloga.'
} }
renderRow={(workOrder) => ( renderRow={(workOrder) => (
@@ -1166,7 +1166,7 @@ export default function FleetDashboardShell({ pageMode = 'dashboard' }) {
className="rounded px-2 py-1 text-xs font-medium text-text-muted hover:bg-canvas-deep hover:text-text-main" className="rounded px-2 py-1 text-xs font-medium text-text-muted hover:bg-canvas-deep hover:text-text-main"
title="Upload fotografija putnog naloga" title="Upload fotografija putnog naloga"
> >
📷 đź“·
</button> </button>
</td> </td>
</> </>
@@ -1196,7 +1196,7 @@ export default function FleetDashboardShell({ pageMode = 'dashboard' }) {
disabled={currentPage >= totalPages} disabled={currentPage >= totalPages}
className="rounded border border-border-hairline px-2 py-1 text-text-main hover:bg-canvas-deep disabled:opacity-50" className="rounded border border-border-hairline px-2 py-1 text-text-main hover:bg-canvas-deep disabled:opacity-50"
> >
Sljedeća Sljedeća
</button> </button>
</div> </div>
</div> </div>
@@ -1230,7 +1230,7 @@ export default function FleetDashboardShell({ pageMode = 'dashboard' }) {
onClick={() => fetchFleetDashboardData()} onClick={() => fetchFleetDashboardData()}
className="text-sm font-medium text-indigo-600 hover:text-indigo-800" className="text-sm font-medium text-indigo-600 hover:text-indigo-800"
> >
Osvježi OsvjeĹľi
</button> </button>
</div> </div>
</div> </div>
@@ -1249,7 +1249,7 @@ export default function FleetDashboardShell({ pageMode = 'dashboard' }) {
{ key: 'date', label: 'Datum', className: 'px-4 py-3' }, { key: 'date', label: 'Datum', className: 'px-4 py-3' },
{ key: 'crane', label: 'Dizalica', className: 'px-4 py-3' }, { key: 'crane', label: 'Dizalica', className: 'px-4 py-3' },
{ key: 'description', label: 'Opis', className: 'px-4 py-3' }, { key: 'description', label: 'Opis', className: 'px-4 py-3' },
{ key: 'cost', label: 'Trošak', className: 'px-4 py-3' }, { key: 'cost', label: 'Trošak', className: 'px-4 py-3' },
{ key: 'actions', label: 'Akcije', className: 'px-4 py-3' }, { key: 'actions', label: 'Akcije', className: 'px-4 py-3' },
]} ]}
rows={paginatedRecentServiceRecords} rows={paginatedRecentServiceRecords}
@@ -1302,7 +1302,7 @@ export default function FleetDashboardShell({ pageMode = 'dashboard' }) {
disabled={serviceRecordsPage >= serviceRecordsTotalPages} disabled={serviceRecordsPage >= serviceRecordsTotalPages}
className="rounded border border-border-hairline px-2 py-1 text-text-main hover:bg-canvas-deep disabled:opacity-50" className="rounded border border-border-hairline px-2 py-1 text-text-main hover:bg-canvas-deep disabled:opacity-50"
> >
Sljedeća Sljedeća
</button> </button>
</div> </div>
</div> </div>
@@ -1312,7 +1312,7 @@ export default function FleetDashboardShell({ pageMode = 'dashboard' }) {
)} )}
{hydratedSelectedVehicleId && loading && ( {hydratedSelectedVehicleId && loading && (
<p className="px-4 py-6 text-center text-sm text-text-muted"> <p className="px-4 py-6 text-center text-sm text-text-muted">
Učitavanje... UÄŤitavanje...
</p> </p>
)} )}
{hydratedSelectedVehicleId && !loading && serviceTaskGroups.length === 0 && ( {hydratedSelectedVehicleId && !loading && serviceTaskGroups.length === 0 && (
@@ -1326,22 +1326,33 @@ export default function FleetDashboardShell({ pageMode = 'dashboard' }) {
const isOpen = String(expandedServiceTaskId || '') === String(group.id); const isOpen = String(expandedServiceTaskId || '') === String(group.id);
return ( return (
<animated.div key={group.id} style={style}> <animated.div key={group.id} style={style}>
<button <div className="flex items-center gap-3 px-4 py-3 hover:bg-canvas-deep">
type="button" <button
onClick={() => setExpandedServiceTaskId(isOpen ? null : group.id)} type="button"
className="flex w-full items-center justify-between px-4 py-3 text-left hover:bg-canvas-deep" onClick={() => setExpandedServiceTaskId(isOpen ? null : group.id)}
> className="flex min-w-0 flex-1 items-center justify-between gap-3 text-left"
<div> >
<span className="font-medium text-text-main">{group.title}</span> <div className="min-w-0">
<span className="ml-2 text-xs text-text-muted">{group.status}</span> <span className="font-medium text-text-main">{group.title}</span>
</div> <span className="ml-2 text-xs text-text-muted">{group.status}</span>
<div className="flex items-center gap-2"> </div>
<span className="rounded-full bg-indigo-50 px-2 py-0.5 text-xs text-indigo-700"> <div className="flex items-center gap-2">
{group.records.length} servisnih zapisa <span className="rounded-full bg-indigo-50 px-2 py-0.5 text-xs text-indigo-700">
</span> {group.records.length} servisnih zapisa
<span className="text-text-muted">{isOpen ? '▲' : '▼'}</span> </span>
</div> <span className="text-text-muted">{isOpen ? "^" : "v"}</span>
</button> </div>
</button>
{group.task && (
<button
type="button"
onClick={() => setSelectedTask(group.task)}
className="shrink-0 rounded border border-border-hairline px-2 py-1 text-xs text-text-main hover:bg-canvas-base"
>
Detalji taska
</button>
)}
</div>
{isOpen && ( {isOpen && (
<div className="border-t border-border-hairline bg-canvas-base/50 px-4 py-3"> <div className="border-t border-border-hairline bg-canvas-base/50 px-4 py-3">
{group.records.length === 0 ? ( {group.records.length === 0 ? (
@@ -1354,7 +1365,7 @@ export default function FleetDashboardShell({ pageMode = 'dashboard' }) {
{ key: 'date', label: 'Datum', className: 'px-4 py-3' }, { key: 'date', label: 'Datum', className: 'px-4 py-3' },
{ key: 'crane', label: 'DIZALICA', className: 'px-4 py-3' }, { key: 'crane', label: 'DIZALICA', className: 'px-4 py-3' },
{ key: 'description', label: 'Opis', className: 'px-4 py-3' }, { key: 'description', label: 'Opis', className: 'px-4 py-3' },
{ key: 'cost', label: 'Trošak', className: 'px-4 py-3' }, { key: 'cost', label: 'Trošak', className: 'px-4 py-3' },
{ key: 'files', label: 'Datoteke', className: 'px-4 py-3' }, { key: 'files', label: 'Datoteke', className: 'px-4 py-3' },
{ key: 'actions', label: 'Akcije', className: 'px-4 py-3' }, { key: 'actions', label: 'Akcije', className: 'px-4 py-3' },
]} ]}
@@ -1389,7 +1400,7 @@ export default function FleetDashboardShell({ pageMode = 'dashboard' }) {
onClick={() => setPhotoUpload({ open: true, serviceRecordId: record.id })} onClick={() => setPhotoUpload({ open: true, serviceRecordId: record.id })}
className="rounded border border-border-hairline px-2 py-1 text-xs text-text-main hover:bg-canvas-base" className="rounded border border-border-hairline px-2 py-1 text-xs text-text-main hover:bg-canvas-base"
> >
📎 Dodaj datoteke đź“Ž Dodaj datoteke
</button> </button>
</td> </td>
</> </>
@@ -1408,7 +1419,7 @@ export default function FleetDashboardShell({ pageMode = 'dashboard' }) {
{showClients && ( {showClients && (
<> <>
{/* ── Tablica klijenata i njihovih dizalica ───────── */} {/* ── Tablica klijenata i njihovih dizalica ───────── */}
<div id="section-clients"> <div id="section-clients">
<ClientsSection <ClientsSection
onSetServiceContext={handleSetServiceContextForCraneId} onSetServiceContext={handleSetServiceContextForCraneId}
@@ -1435,7 +1446,7 @@ export default function FleetDashboardShell({ pageMode = 'dashboard' }) {
onClick={() => fetchFleetDashboardData()} onClick={() => fetchFleetDashboardData()}
className="text-sm font-medium text-indigo-600 hover:text-indigo-800" className="text-sm font-medium text-indigo-600 hover:text-indigo-800"
> >
Osvježi OsvjeĹľi
</button> </button>
</div> </div>
</div> </div>
@@ -1446,7 +1457,7 @@ export default function FleetDashboardShell({ pageMode = 'dashboard' }) {
rowClassName="hover:bg-canvas-deep" rowClassName="hover:bg-canvas-deep"
isRowSelected={(vehicle) => String(vehicle.id) === String(selectedCraneRowId)} isRowSelected={(vehicle) => String(vehicle.id) === String(selectedCraneRowId)}
loading={loading} loading={loading}
loadingMessage="Učitavanje vozila..." loadingMessage="UÄŤitavanje vozila..."
emptyMessage="Nema dostupnih vozila." emptyMessage="Nema dostupnih vozila."
renderRow={(vehicle) => ( renderRow={(vehicle) => (
<> <>
@@ -1518,7 +1529,7 @@ export default function FleetDashboardShell({ pageMode = 'dashboard' }) {
onSubmit={handleUpdateWorkOrder} onSubmit={handleUpdateWorkOrder}
/> />
{/* Modali su na root razini div-a — van <main> i <section> — {/* Modali su na root razini div-a — van <main> i <section> —
kako bi fixed pozicioniranje i z-index radili ispravno */} kako bi fixed pozicioniranje i z-index radili ispravno */}
<ServiceRecordForm <ServiceRecordForm
open={serviceRecordOpen} open={serviceRecordOpen}
@@ -1621,3 +1632,4 @@ export default function FleetDashboardShell({ pageMode = 'dashboard' }) {
</AnimatedPage> </AnimatedPage>
); );
} }

176
frontend/src/components/dashboard/TaskCreateModal.jsx
View File

@@ -2,6 +2,7 @@
import { createTask, fetchTaskTemplates, getStatusLabel } from '../../stores/taskStore'; import { createTask, fetchTaskTemplates, getStatusLabel } from '../../stores/taskStore';
import { formatPurposeLabel, formatWorkOrderDisplayCode } from '../../lib/displayIds'; import { formatPurposeLabel, formatWorkOrderDisplayCode } from '../../lib/displayIds';
import ModalShell from '../ui/ModalShell'; import ModalShell from '../ui/ModalShell';
import { updateVehicle } from '../../stores/fleetDashboardStore';
const STATUS_OPTIONS = ['aktivan', 'servis', 'zavrsen', 'neaktivan']; const STATUS_OPTIONS = ['aktivan', 'servis', 'zavrsen', 'neaktivan'];
@@ -32,6 +33,10 @@ export default function TaskCreateModal({ open, workOrders = [], contextCrane =
const [templateLoading, setTemplateLoading] = useState(false); const [templateLoading, setTemplateLoading] = useState(false);
const [templateId, setTemplateId] = useState(''); const [templateId, setTemplateId] = useState('');
const [templates, setTemplates] = useState([]); const [templates, setTemplates] = useState([]);
const [craneDataModalOpen, setCraneDataModalOpen] = useState(false);
const [craneDataForm, setCraneDataForm] = useState({ superstructure_working_hours: '', chassis_working_hours: '', current_mileage: '' });
const [savingCraneData, setSavingCraneData] = useState(false);
const [craneDataError, setCraneDataError] = useState('');
const selectedTemplate = useMemo( const selectedTemplate = useMemo(
() => templates.find((template) => String(template.id) === String(templateId)) || null, () => templates.find((template) => String(template.id) === String(templateId)) || null,
@@ -51,6 +56,10 @@ export default function TaskCreateModal({ open, workOrders = [], contextCrane =
setTemplateId(''); setTemplateId('');
setTemplates([]); setTemplates([]);
setTemplateLoading(false); setTemplateLoading(false);
setCraneDataModalOpen(false);
setCraneDataForm({ superstructure_working_hours: '', chassis_working_hours: '', current_mileage: '' });
setSavingCraneData(false);
setCraneDataError('');
return; return;
} }
// Auto-pre-select today's open work order if exactly one exists for this crane // Auto-pre-select today's open work order if exactly one exists for this crane
@@ -76,6 +85,60 @@ export default function TaskCreateModal({ open, workOrders = [], contextCrane =
})); }));
}, [selectedTemplate]); }, [selectedTemplate]);
function openCraneDataModal() {
if (!contextCrane?.id) {
setCraneDataError('Dizalica nije odabrana u servisnom kontekstu.');
return;
}
setCraneDataForm({
superstructure_working_hours: String(contextCrane?.superstructure_working_hours ?? ''),
chassis_working_hours: String(contextCrane?.chassis_working_hours ?? ''),
current_mileage: String(contextCrane?.current_mileage ?? ''),
});
setCraneDataError('');
setCraneDataModalOpen(true);
}
async function handleSaveCraneData() {
if (!contextCrane?.id) {
setCraneDataError('Dizalica nije odabrana u servisnom kontekstu.');
return;
}
const superstructure = craneDataForm.superstructure_working_hours === '' ? undefined : Number(craneDataForm.superstructure_working_hours);
const chassis = craneDataForm.chassis_working_hours === '' ? undefined : Number(craneDataForm.chassis_working_hours);
const mileage = craneDataForm.current_mileage === '' ? undefined : Number(craneDataForm.current_mileage);
if (superstructure !== undefined && (Number.isNaN(superstructure) || superstructure < 0)) {
setCraneDataError('Radni sati nadogradnje moraju biti pozitivan broj.');
return;
}
if (chassis !== undefined && (Number.isNaN(chassis) || chassis < 0)) {
setCraneDataError('Radni sati podvozja moraju biti pozitivan broj.');
return;
}
if (mileage !== undefined && (Number.isNaN(mileage) || mileage < 0)) {
setCraneDataError('Kilometraza mora biti pozitivan broj.');
return;
}
const payload = {};
if (superstructure !== undefined) payload.superstructure_working_hours = superstructure;
if (chassis !== undefined) payload.chassis_working_hours = chassis;
if (mileage !== undefined) payload.current_mileage = mileage;
if (Object.keys(payload).length === 0) {
setCraneDataError('Unesite barem jednu vrijednost za azuriranje.');
return;
}
setSavingCraneData(true);
setCraneDataError('');
try {
await updateVehicle(contextCrane.id, payload);
setCraneDataModalOpen(false);
} catch (err) {
setCraneDataError(err?.message || 'Azuriranje podataka dizalice nije uspjelo.');
} finally {
setSavingCraneData(false);
}
}
if (!open) return null; if (!open) return null;
function setField(name, value) { function setField(name, value) {
@@ -156,6 +219,7 @@ export default function TaskCreateModal({ open, workOrders = [], contextCrane =
} }
return ( return (
<>
<ModalShell <ModalShell
onClose={onClose} onClose={onClose}
overlayClassName="z-50 overflow-y-auto p-4 pt-20" overlayClassName="z-50 overflow-y-auto p-4 pt-20"
@@ -215,6 +279,39 @@ export default function TaskCreateModal({ open, workOrders = [], contextCrane =
</label> </label>
)} )}
{contextCrane && (
<div className="rounded-lg border border-border-hairline bg-canvas-base p-3">
<div className="flex items-start justify-between gap-3">
<div>
<p className="text-sm font-semibold text-text-main">Podaci odabrane dizalice</p>
<p className="text-xs text-text-muted">{contextCrane.registration_number || '-'} / {contextCrane.make || '-'} {contextCrane.model || ''}</p>
</div>
<button
type="button"
onClick={openCraneDataModal}
disabled={submitting}
className="rounded border border-border-hairline px-3 py-1 text-xs font-semibold text-text-main hover:bg-canvas-deep disabled:opacity-60"
>
Uredi podatke dizalice
</button>
</div>
<dl className="mt-3 grid gap-2 text-sm sm:grid-cols-3">
<div>
<dt className="text-xs text-text-muted">Radni sati nadogradnje</dt>
<dd className="text-text-main">{contextCrane.superstructure_working_hours ?? '-'}</dd>
</div>
<div>
<dt className="text-xs text-text-muted">Radni sati podvozja</dt>
<dd className="text-text-main">{contextCrane.chassis_working_hours ?? '-'}</dd>
</div>
<div>
<dt className="text-xs text-text-muted">Kilometraza</dt>
<dd className="text-text-main">{contextCrane.current_mileage ?? '-'}</dd>
</div>
</dl>
</div>
)}
<label className="flex flex-col gap-1 text-sm"> <label className="flex flex-col gap-1 text-sm">
<span className="font-medium text-text-main">Naslov zadatka *</span> <span className="font-medium text-text-main">Naslov zadatka *</span>
<input <input
@@ -326,5 +423,84 @@ export default function TaskCreateModal({ open, workOrders = [], contextCrane =
</form> </form>
</div> </div>
</ModalShell> </ModalShell>
{craneDataModalOpen && (
<ModalShell
onClose={() => setCraneDataModalOpen(false)}
overlayClassName="z-[60] bg-black/40 p-4"
contentClassName="flex min-h-full items-center justify-center"
panelClassName="w-full max-w-lg rounded-xl border border-border-hairline bg-canvas-elevated shadow-2xl"
>
<div className="space-y-4 p-4">
<div>
<h4 className="text-base font-semibold text-text-main">Izmijeni podatke dizalice</h4>
<p className="mt-1 text-sm text-text-muted">
Azurirajte radne sate i kilometrazu za dizalicu: <strong>{contextCrane?.registration_number || "-"}</strong>
</p>
</div>
<label className="flex flex-col gap-1 text-sm">
<span className="text-xs text-text-muted">Radni sati nadogradnje</span>
<input
type="number"
min="0"
step="0.01"
value={craneDataForm.superstructure_working_hours}
onInput={(event) => setCraneDataForm((prev) => ({ ...prev, superstructure_working_hours: event.currentTarget.value }))}
disabled={savingCraneData}
className="rounded-lg border border-border-hairline bg-canvas-base px-3 py-2 text-text-main disabled:opacity-60"
/>
</label>
<label className="flex flex-col gap-1 text-sm">
<span className="text-xs text-text-muted">Radni sati podvozja</span>
<input
type="number"
min="0"
step="0.01"
value={craneDataForm.chassis_working_hours}
onInput={(event) => setCraneDataForm((prev) => ({ ...prev, chassis_working_hours: event.currentTarget.value }))}
disabled={savingCraneData}
className="rounded-lg border border-border-hairline bg-canvas-base px-3 py-2 text-text-main disabled:opacity-60"
/>
</label>
<label className="flex flex-col gap-1 text-sm">
<span className="text-xs text-text-muted">Kilometraza (km)</span>
<input
type="number"
min="0"
step="1"
value={craneDataForm.current_mileage}
onInput={(event) => setCraneDataForm((prev) => ({ ...prev, current_mileage: event.currentTarget.value }))}
disabled={savingCraneData}
className="rounded-lg border border-border-hairline bg-canvas-base px-3 py-2 text-text-main disabled:opacity-60"
/>
</label>
{craneDataError && (
<div className="rounded-lg border border-red-300 bg-red-50 px-3 py-2 text-sm text-red-700">
{craneDataError}
</div>
)}
<div className="flex justify-end gap-2">
<button
type="button"
onClick={() => setCraneDataModalOpen(false)}
disabled={savingCraneData}
className="rounded-lg border border-border-hairline px-4 py-2 text-sm font-medium text-text-main hover:bg-canvas-deep disabled:opacity-60"
>
Odustani
</button>
<button
type="button"
onClick={handleSaveCraneData}
disabled={savingCraneData}
className="rounded-lg bg-emerald-600 px-4 py-2 text-sm font-semibold text-white hover:bg-emerald-700 disabled:opacity-60"
>
{savingCraneData ? "Spremanje..." : "Spremi podatke"}
</button>
</div>
</div>
</ModalShell>
)}
</>
); );
} }

24
frontend/src/components/dashboard/TaskServiceRecordsModal.jsx
View File

@@ -1,4 +1,4 @@
import { useEffect, useMemo, useState } from 'preact/hooks'; import { useEffect, useMemo, useState } from 'preact/hooks';
import ModalShell from '../ui/ModalShell'; import ModalShell from '../ui/ModalShell';
import { formatWorkOrderDisplayCode } from '../../lib/displayIds'; import { formatWorkOrderDisplayCode } from '../../lib/displayIds';
import { getStatusLabel } from '../../stores/taskStore'; import { getStatusLabel } from '../../stores/taskStore';
@@ -251,6 +251,15 @@ export default function TaskServiceRecordsModal({
> >
Postavi servisni kontekst Postavi servisni kontekst
</button> </button>
{task?.vehicle && (
<button
type="button"
onClick={openCraneDataModal}
className="rounded-md border border-border-hairline px-3 py-1 text-xs font-semibold text-text-main hover:bg-canvas-base"
>
Uredi podatke dizalice
</button>
)}
<button <button
type="button" type="button"
onClick={onClose} onClick={onClose}
@@ -306,10 +315,10 @@ export default function TaskServiceRecordsModal({
<button <button
type="button" type="button"
onClick={openCraneDataModal} onClick={openCraneDataModal}
className="rounded border border-border-hairline px-1.5 py-0.5 text-[10px] text-text-muted hover:bg-canvas-base" className="rounded border border-border-hairline px-2 py-1 text-xs text-text-main hover:bg-canvas-base"
title="Izmijeni radne sate i kilometražu dizalice" title="Izmijeni radne sate i kilometrazu dizalice"
> >
🔧 Uredi podatke
</button> </button>
)} )}
</dd> </dd>
@@ -539,7 +548,12 @@ export default function TaskServiceRecordsModal({
</ModalShell> </ModalShell>
{craneDataModalOpen && ( {craneDataModalOpen && (
<ModalShell open={craneDataModalOpen} onClose={() => setCraneDataModalOpen(false)} title="Izmijeni podatke dizalice"> <ModalShell
onClose={() => setCraneDataModalOpen(false)}
overlayClassName="z-[60] bg-black/40 p-4"
contentClassName="flex min-h-full items-center justify-center"
panelClassName="w-full max-w-lg rounded-xl border border-border-hairline bg-canvas-elevated shadow-2xl"
>
<div className="p-4 space-y-4"> <div className="p-4 space-y-4">
<p className="text-sm text-text-muted"> <p className="text-sm text-text-muted">
Ažurirajte radne sate i kilometražu za dizalicu: <strong>{getTaskCraneDisplay(task)}</strong> Ažurirajte radne sate i kilometražu za dizalicu: <strong>{getTaskCraneDisplay(task)}</strong>

34
frontend/src/components/dashboard/WorkOrderInvoicesPdfPage.jsx
View File

@@ -321,22 +321,24 @@ export default function WorkOrderInvoicesPdfPage() {
{workOrder ? `Dizalica: ${workOrder.crane_label || workOrder.crane || '-'}` : 'Pregled računa prije kreiranja PDF-a.'} {workOrder ? `Dizalica: ${workOrder.crane_label || workOrder.crane || '-'}` : 'Pregled računa prije kreiranja PDF-a.'}
</p> </p>
</div> </div>
<button <div className="flex flex-wrap items-center gap-2">
type="button" <button
onClick={() => downloadWorkOrderPdf(workOrderId)} type="button"
disabled={!workOrderId} onClick={() => downloadWorkOrderPdf(workOrderId)}
className="rounded-lg bg-indigo-600 px-4 py-2 text-sm font-semibold text-white hover:bg-indigo-700 disabled:opacity-60" disabled={!workOrderId}
> className="rounded-lg bg-indigo-600 px-4 py-2 text-sm font-semibold text-white hover:bg-indigo-700 disabled:opacity-60"
Preuzmi PDF putnog naloga >
</button> Preuzmi PDF putnog naloga
<button </button>
type="button" <button
onClick={() => downloadWorkOrderDocx(workOrderId)} type="button"
disabled={!workOrderId} onClick={() => downloadWorkOrderDocx(workOrderId)}
className="rounded-lg border border-border-hairline px-4 py-2 text-sm font-semibold text-text-main hover:bg-canvas-deep disabled:opacity-60" disabled={!workOrderId}
> className="rounded-lg border border-border-hairline px-4 py-2 text-sm font-semibold text-text-main hover:bg-canvas-deep disabled:opacity-60"
Preuzmi DOCX putnog naloga >
</button> Preuzmi DOCX putnog naloga
</button>
</div>
</div> </div>
</div> </div>