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

fix: correct mojibake characters in dashboard UI labels and messages

Browse Source 
Replace corrupted UTF-8 sequences with proper Croatian characters and symbols in FleetDashboardShell: sorting arrows, action labels, loading messages, pagination buttons, and error toast messages now display correctly.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
mariomitte
2026-08-07 10:09:10 +02:00
parent ee18af7877
commit 3aecbdd6ea
1 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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"
> >
đź“· Foto
</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 && (
@@ -1365,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' },
]} ]}
@@ -1400,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>
</> </>
@@ -1419,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}
@@ -1446,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>
@@ -1457,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) => (
<> <>
@@ -1529,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}
@@ -1632,4 +1632,3 @@ export default function FleetDashboardShell({ pageMode = 'dashboard' }) {
</AnimatedPage> </AnimatedPage>
); );
} }