feat: integritet zatvaranja taska i putnog naloga
Dodaje status 'spreman_za_zavrsetak' i backend provjeru koja blokira zatvaranje taska kada je povezani putni nalog otvoren, uz 409 odgovor i opcionalni auto-close flow.\n\nPri zatvaranju putnog naloga taskovi u statusu 'servis' automatski prelaze u 'spreman_za_zavrsetak'. Frontend modal sada podržava potvrdu i retry s auto_close_work_order=true.\n\nUključeni su i ciljani testovi za novi behavior, te ažuriran prikaz statusa u dashboardu.\n\nCo-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
mariomitte
@@ -1,6 +1,9 @@
|
||||
import { useEffect, useMemo, useState } from 'preact/hooks';
|
||||
import ModalShell from '../ui/ModalShell';
|
||||
import { formatEntityCode } from '../../lib/displayIds';
|
||||
import { getStatusLabel } from '../../stores/taskStore';
|
||||
|
||||
const STATUS_OPTIONS = ['aktivan', 'servis', 'spreman_za_zavrsetak', 'zavrsen', 'neaktivan'];
|
||||
|
||||
function formatDate(value) {
|
||||
if (!value) return '-';
|
||||
@@ -9,6 +12,13 @@ function formatDate(value) {
|
||||
return parsed.toLocaleDateString('hr-HR');
|
||||
}
|
||||
|
||||
function formatDateTime(value) {
|
||||
if (!value) return '-';
|
||||
const parsed = new Date(value);
|
||||
if (Number.isNaN(parsed.getTime())) return '-';
|
||||
return parsed.toLocaleString('hr-HR');
|
||||
}
|
||||
|
||||
function formatCost(value) {
|
||||
const numeric = Number(value);
|
||||
if (Number.isNaN(numeric)) return '-';
|
||||
@@ -23,12 +33,21 @@ export default function TaskServiceRecordsModal({
|
||||
onClose,
|
||||
onOpenServiceRecord,
|
||||
onAssignWorkOrder,
|
||||
onUpdateTask,
|
||||
onCreateServiceRecord,
|
||||
}) {
|
||||
const [showWorkOrderEditor, setShowWorkOrderEditor] = useState(false);
|
||||
const [selectedWorkOrderId, setSelectedWorkOrderId] = useState('');
|
||||
const [assigningWorkOrder, setAssigningWorkOrder] = useState(false);
|
||||
const [assignError, setAssignError] = useState('');
|
||||
const [showTaskEditor, setShowTaskEditor] = useState(false);
|
||||
const [updatingTask, setUpdatingTask] = useState(false);
|
||||
const [taskError, setTaskError] = useState('');
|
||||
const [taskForm, setTaskForm] = useState({
|
||||
title: '',
|
||||
description: '',
|
||||
status: 'aktivan',
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
if (!open || typeof window === 'undefined') return;
|
||||
@@ -41,6 +60,14 @@ export default function TaskServiceRecordsModal({
|
||||
setShowWorkOrderEditor(!task.work_order);
|
||||
setAssignError('');
|
||||
setAssigningWorkOrder(false);
|
||||
setShowTaskEditor(false);
|
||||
setTaskError('');
|
||||
setUpdatingTask(false);
|
||||
setTaskForm({
|
||||
title: String(task.title || ''),
|
||||
description: String(task.description || ''),
|
||||
status: String(task.status || 'aktivan'),
|
||||
});
|
||||
}, [task?.id, task?.work_order]);
|
||||
|
||||
const currentWorkOrder = useMemo(
|
||||
@@ -53,6 +80,8 @@ export default function TaskServiceRecordsModal({
|
||||
[workOrders]
|
||||
);
|
||||
|
||||
const effectiveWorkOrderId = task?.work_order ? String(task.work_order) : String(selectedWorkOrderId || '');
|
||||
|
||||
const handleWorkOrderChange = async (event) => {
|
||||
const nextValue = String(event.currentTarget.value || '');
|
||||
setSelectedWorkOrderId(nextValue);
|
||||
@@ -68,6 +97,57 @@ export default function TaskServiceRecordsModal({
|
||||
}
|
||||
};
|
||||
|
||||
const handleTaskUpdate = async (event) => {
|
||||
event.preventDefault();
|
||||
const title = String(taskForm.title || '').trim();
|
||||
const status = String(taskForm.status || 'aktivan');
|
||||
const description = String(taskForm.description || '').trim();
|
||||
if (!title) {
|
||||
setTaskError('Naslov zadatka je obavezan.');
|
||||
return;
|
||||
}
|
||||
if ((status === 'zavrsen' || status === 'neaktivan') && !effectiveWorkOrderId) {
|
||||
setTaskError('Putni nalog je obavezan prije zatvaranja zadatka.');
|
||||
return;
|
||||
}
|
||||
setTaskError('');
|
||||
setUpdatingTask(true);
|
||||
try {
|
||||
await onUpdateTask?.(task, {
|
||||
title,
|
||||
description,
|
||||
status,
|
||||
});
|
||||
setShowTaskEditor(false);
|
||||
} catch (error) {
|
||||
const conflictCode = error?.details?.code;
|
||||
if (error?.status === 409 && conflictCode === 'OPEN_WORK_ORDER_BLOCKING_TASK_CLOSE') {
|
||||
const confirmText = error?.details?.message || error?.message || 'Povezani putni nalog je još otvoren. Želite li ga automatski zatvoriti?';
|
||||
const approved = typeof window !== 'undefined' ? window.confirm(confirmText) : false;
|
||||
if (approved) {
|
||||
try {
|
||||
await onUpdateTask?.(task, {
|
||||
title,
|
||||
description,
|
||||
status,
|
||||
auto_close_work_order: true,
|
||||
});
|
||||
setShowTaskEditor(false);
|
||||
return;
|
||||
} catch (retryError) {
|
||||
setTaskError(retryError?.message || 'Neuspješno automatsko zatvaranje putnog naloga i završetak zadatka.');
|
||||
return;
|
||||
}
|
||||
}
|
||||
setTaskError(confirmText);
|
||||
return;
|
||||
}
|
||||
setTaskError(error?.message || 'Neuspješno spremanje izmjena radnog zadatka.');
|
||||
} finally {
|
||||
setUpdatingTask(false);
|
||||
}
|
||||
};
|
||||
|
||||
if (!open || !task) return null;
|
||||
|
||||
return (
|
||||
@@ -82,7 +162,7 @@ export default function TaskServiceRecordsModal({
|
||||
<div>
|
||||
<h3 className="text-lg font-semibold text-text-main">Radni zadatak detalji</h3>
|
||||
<p className="text-xs text-text-muted">
|
||||
Radni zadatak: {task.title || '-'} • Status: {task.status || '-'} • Zapisa: {records.length}
|
||||
Radni zadatak: {task.title || '-'} • Status: {getStatusLabel(task.status || '-')} • Zapisa: {records.length}
|
||||
</p>
|
||||
</div>
|
||||
<button
|
||||
@@ -97,6 +177,125 @@ export default function TaskServiceRecordsModal({
|
||||
|
||||
<div className="max-h-[calc(100vh-12rem)] overflow-y-auto p-4">
|
||||
<div className="space-y-4">
|
||||
<div className="rounded-lg border border-border-hairline bg-canvas-base p-3">
|
||||
<div className="mb-2 flex items-center justify-between gap-2">
|
||||
<h4 className="text-sm font-semibold text-text-main">Podaci radnog zadatka</h4>
|
||||
{!showTaskEditor ? (
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => {
|
||||
setTaskError('');
|
||||
setShowTaskEditor(true);
|
||||
}}
|
||||
className="rounded border border-border-hairline px-2 py-1 text-xs text-text-main hover:bg-canvas-base"
|
||||
>
|
||||
Izmijeni radni zadatak
|
||||
</button>
|
||||
) : null}
|
||||
</div>
|
||||
{!showTaskEditor ? (
|
||||
<dl className="grid gap-2 text-sm sm:grid-cols-2">
|
||||
<div>
|
||||
<dt className="text-xs text-text-muted">Naslov</dt>
|
||||
<dd className="text-text-main">{task.title || '-'}</dd>
|
||||
</div>
|
||||
<div>
|
||||
<dt className="text-xs text-text-muted">Status</dt>
|
||||
<dd className="text-text-main">{getStatusLabel(task.status || '-')}</dd>
|
||||
</div>
|
||||
<div>
|
||||
<dt className="text-xs text-text-muted">Dodijeljeno</dt>
|
||||
<dd className="text-text-main">{task.assigned_to_name || '-'}</dd>
|
||||
</div>
|
||||
<div>
|
||||
<dt className="text-xs text-text-muted">Dizalica</dt>
|
||||
<dd className="text-text-main">{task.vehicle_registration || '-'}</dd>
|
||||
</div>
|
||||
<div>
|
||||
<dt className="text-xs text-text-muted">Putni nalog</dt>
|
||||
<dd className="text-text-main">{task.work_order_label || '-'}</dd>
|
||||
</div>
|
||||
<div>
|
||||
<dt className="text-xs text-text-muted">Vrijeme izrade</dt>
|
||||
<dd className="text-text-main">{formatDateTime(task.created_at)}</dd>
|
||||
</div>
|
||||
<div className="sm:col-span-2">
|
||||
<dt className="text-xs text-text-muted">Opis</dt>
|
||||
<dd className="whitespace-pre-wrap text-text-main">{task.description || '-'}</dd>
|
||||
</div>
|
||||
</dl>
|
||||
) : (
|
||||
<form onSubmit={handleTaskUpdate} className="space-y-3">
|
||||
<label className="flex flex-col gap-1 text-sm">
|
||||
<span className="text-xs text-text-muted">Naslov *</span>
|
||||
<input
|
||||
type="text"
|
||||
value={taskForm.title}
|
||||
onInput={(event) => setTaskForm((prev) => ({ ...prev, title: event.currentTarget.value }))}
|
||||
disabled={updatingTask}
|
||||
className="rounded-lg border border-border-hairline bg-canvas-elevated px-3 py-2 text-text-main disabled:opacity-60"
|
||||
required
|
||||
/>
|
||||
</label>
|
||||
<label className="flex flex-col gap-1 text-sm">
|
||||
<span className="text-xs text-text-muted">Opis</span>
|
||||
<textarea
|
||||
rows={3}
|
||||
value={taskForm.description}
|
||||
onInput={(event) => setTaskForm((prev) => ({ ...prev, description: event.currentTarget.value }))}
|
||||
disabled={updatingTask}
|
||||
className="resize-none rounded-lg border border-border-hairline bg-canvas-elevated 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">Status</span>
|
||||
<select
|
||||
value={taskForm.status}
|
||||
onChange={(event) => setTaskForm((prev) => ({ ...prev, status: event.currentTarget.value }))}
|
||||
disabled={updatingTask}
|
||||
className="rounded-lg border border-border-hairline bg-canvas-elevated px-3 py-2 text-text-main disabled:opacity-60"
|
||||
>
|
||||
{STATUS_OPTIONS.map((status) => (
|
||||
<option key={status} value={status}>
|
||||
{getStatusLabel(status)}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
</label>
|
||||
{taskError ? (
|
||||
<div className="rounded-lg border border-red-200 bg-red-50 px-3 py-2 text-sm text-red-700">
|
||||
{taskError}
|
||||
</div>
|
||||
) : null}
|
||||
<div className="flex justify-end gap-2">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => {
|
||||
setTaskError('');
|
||||
setShowTaskEditor(false);
|
||||
setTaskForm({
|
||||
title: String(task.title || ''),
|
||||
description: String(task.description || ''),
|
||||
status: String(task.status || 'aktivan'),
|
||||
});
|
||||
}}
|
||||
disabled={updatingTask}
|
||||
className="rounded border border-border-hairline px-3 py-1.5 text-xs text-text-main hover:bg-canvas-elevated disabled:opacity-60"
|
||||
>
|
||||
Odustani
|
||||
</button>
|
||||
<button
|
||||
type="submit"
|
||||
disabled={updatingTask}
|
||||
className="rounded bg-indigo-600 px-3 py-1.5 text-xs font-semibold text-white hover:bg-indigo-700 disabled:opacity-60"
|
||||
>
|
||||
{updatingTask ? 'Spremanje...' : 'Spremi izmjene'}
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="rounded-lg border border-border-hairline bg-canvas-base p-3">
|
||||
<h4 className="mb-2 text-sm font-semibold text-text-main">Putni nalozi</h4>
|
||||
{currentWorkOrder && !showWorkOrderEditor ? (
|
||||
|
||||
Reference in New Issue
Block a user