feat: dnevni unosi i svi dani u mjesecnom izvjestaju servisera
- Dodan model MonthlyServicerDayEntry s automatskom popunom prema tipu: office (08:00-16:00, Zagreb ured), vacation i sick_leave (8h bez vremena) - Migracija 0034_monthlyservicerdayentry za novu tablicu s UniqueConstraint - Novi ViewSet + serializer + endpoint fleet/monthly-servicer-day-entries/ (upsert: POST za novi dan ili update za isti dan ako vec postoji) - Backend DOCX report (_build_monthly_servicer_report_rows) sad generira redak za SVAKI dan u mjesecu: taskovi > rucni unos > prazan red - TaskCalendarWidget potpuno prepisan bez mojibake znakova (zamjena UTF-8 specijalnih znakova ASCII ekvivalentima u string literalima) - Tablica izvjestaja servisera: klikom na red bez naloga otvara se overlay s tri opcije (Rad u uredu / Bolovanje / Godisnji) - TaskCalendarPortal: dodan calendarWorkOrders computed (svi statusi) kako bi report imao potpune podatke o radnom vremenu - fetchMonthlyServicerEntries i upsertMonthlyServicerEntry u store-u Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
mariomitte
@@ -1,48 +1,81 @@
|
||||
import { useMemo, useState } from 'preact/hooks';
|
||||
import { useEffect, useMemo, useState } from 'preact/hooks';
|
||||
import { getStatusLabel } from '../../stores/taskStore';
|
||||
import { downloadMonthlyServiserReport, downloadMonthlyCostsReport } from '../../stores/fleetDashboardStore';
|
||||
import {
|
||||
downloadMonthlyCostsReport,
|
||||
downloadMonthlyServiserReport,
|
||||
fetchMonthlyServicerEntries,
|
||||
upsertMonthlyServicerEntry,
|
||||
} from '../../stores/fleetDashboardStore';
|
||||
import LeftSlideDrawer from '../layout/LeftSlideDrawer';
|
||||
import { getTaskCraneKind, getTaskCraneOwner, getTaskCraneSerial } from '../../lib/taskCraneDisplay';
|
||||
|
||||
const WEEKDAY_LABELS = ['Po', 'Ut', 'Sr', 'ÄŚe', 'Pe', 'Su', 'Ne'];
|
||||
const WEEKDAY_LABELS = ['Po', 'Ut', 'Sr', 'Ce', 'Pe', 'Su', 'Ne'];
|
||||
const MONTH_NAMES = [
|
||||
'SijeÄŤanj', 'VeljaÄŤa', 'OĹľujak', 'Travanj', 'Svibanj', 'Lipanj',
|
||||
'Sijecanj', 'Veljaca', 'Ozujak', 'Travanj', 'Svibanj', 'Lipanj',
|
||||
'Srpanj', 'Kolovoz', 'Rujan', 'Listopad', 'Studeni', 'Prosinac',
|
||||
];
|
||||
function toIsoDateKey(dateStr) {
|
||||
if (!dateStr) return null;
|
||||
const d = new Date(dateStr);
|
||||
if (Number.isNaN(d.getTime())) return null;
|
||||
return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
|
||||
const SERVICER_HEADERS = ['DATUM', 'OPIS POSLA', 'BR. DIZALICE', 'KOMITENT', 'MJESTO RADA', 'POCETAK RADA', 'KRAJ RADA', 'REDOVAN RAD (h)', 'PREKOVREMENI (h)', 'RADNI NALOG'];
|
||||
const COST_HEADERS = ['DATUM', 'NAZIV RACUNA', 'LOKACIJA', 'OPIS', 'RADNI NALOG'];
|
||||
|
||||
function toDateKey(value) {
|
||||
const text = String(value || '').trim();
|
||||
if (!text) return null;
|
||||
if (/^\d{4}-\d{2}-\d{2}$/.test(text)) return text;
|
||||
const parsed = new Date(text);
|
||||
if (Number.isNaN(parsed.getTime())) return null;
|
||||
return `${parsed.getFullYear()}-${String(parsed.getMonth() + 1).padStart(2, '0')}-${String(parsed.getDate()).padStart(2, '0')}`;
|
||||
}
|
||||
|
||||
function formatDayLabel(year, month, day) {
|
||||
return `${String(day).padStart(2, '0')}.${String(month + 1).padStart(2, '0')}.${year}`;
|
||||
}
|
||||
|
||||
function formatTime(isoStr) {
|
||||
if (!isoStr) return '-';
|
||||
const d = new Date(isoStr);
|
||||
if (Number.isNaN(d.getTime())) return '-';
|
||||
return d.toLocaleTimeString('hr-HR', { hour: '2-digit', minute: '2-digit' });
|
||||
function formatDateFromKey(dateKey) {
|
||||
const [year, month, day] = String(dateKey || '').split('-');
|
||||
if (!year || !month || !day) return '-';
|
||||
return `${day}.${month}.${year}.`;
|
||||
}
|
||||
|
||||
const SERVICER_HEADERS = ['DATUM', 'OPIS POSLA', 'BR. DIZALICE', 'KOMITENT', 'MJESTO RADA', 'POÄŚETAK', 'KRAJ', 'REDOVAN (h)', 'PREKOVR. (h)', 'RADNI NALOG'];
|
||||
function formatTime(value) {
|
||||
if (!value) return '-';
|
||||
if (typeof value === 'string' && /^\d{2}:\d{2}/.test(value)) {
|
||||
return value.slice(0, 5);
|
||||
}
|
||||
const parsed = new Date(value);
|
||||
if (Number.isNaN(parsed.getTime())) return '-';
|
||||
return parsed.toLocaleTimeString('hr-HR', { hour: '2-digit', minute: '2-digit' });
|
||||
}
|
||||
|
||||
function formatHourValue(value, fallback = '-') {
|
||||
if (value == null || value === '') return fallback;
|
||||
const numeric = Number(value);
|
||||
if (!Number.isFinite(numeric)) return String(value);
|
||||
if (Number.isInteger(numeric)) return String(numeric);
|
||||
return numeric.toFixed(2).replace(/\.?0+$/, '');
|
||||
}
|
||||
|
||||
function joinUnique(values) {
|
||||
return Array.from(new Set(values.filter(Boolean).map((item) => String(item).trim()).filter(Boolean))).join(', ');
|
||||
}
|
||||
|
||||
export default function TaskCalendarWidget({ tasks = [], notes = [], workOrders = [], onTaskClick }) {
|
||||
const [viewYear, setViewYear] = useState(() => new Date().getFullYear());
|
||||
const [viewMonth, setViewMonth] = useState(() => new Date().getMonth());
|
||||
const [selectedDay, setSelectedDay] = useState(null);
|
||||
const [reportType, setReportType] = useState(null); // 'servicer' | 'costs' | null
|
||||
const [reportType, setReportType] = useState(null);
|
||||
const [downloading, setDownloading] = useState(false);
|
||||
const [manualEntries, setManualEntries] = useState([]);
|
||||
const [loadingManualEntries, setLoadingManualEntries] = useState(false);
|
||||
const [manualEntryTarget, setManualEntryTarget] = useState(null);
|
||||
const [savingManualEntry, setSavingManualEntry] = useState(false);
|
||||
|
||||
const reportOpen = reportType !== null;
|
||||
const panelWidth = reportOpen ? 680 : 300;
|
||||
const panelWidth = reportOpen ? 920 : 300;
|
||||
|
||||
const tasksByDate = useMemo(() => {
|
||||
const map = {};
|
||||
for (const task of tasks) {
|
||||
const key = toIsoDateKey(task.scheduled_date);
|
||||
const key = toDateKey(task.scheduled_date);
|
||||
if (!key) continue;
|
||||
if (!map[key]) map[key] = [];
|
||||
map[key].push(task);
|
||||
@@ -53,7 +86,7 @@ export default function TaskCalendarWidget({ tasks = [], notes = [], workOrders
|
||||
const notesByDate = useMemo(() => {
|
||||
const map = {};
|
||||
for (const note of notes) {
|
||||
const key = toIsoDateKey(note.note_date);
|
||||
const key = toDateKey(note.note_date);
|
||||
if (!key) continue;
|
||||
if (!map[key]) map[key] = [];
|
||||
map[key].push(note);
|
||||
@@ -61,84 +94,182 @@ export default function TaskCalendarWidget({ tasks = [], notes = [], workOrders
|
||||
return map;
|
||||
}, [notes]);
|
||||
|
||||
const workOrdersById = useMemo(() => {
|
||||
const map = new Map();
|
||||
for (const workOrder of workOrders) {
|
||||
if (workOrder?.id) {
|
||||
map.set(String(workOrder.id), workOrder);
|
||||
}
|
||||
}
|
||||
return map;
|
||||
}, [workOrders]);
|
||||
|
||||
const manualEntriesByDate = useMemo(() => {
|
||||
const map = {};
|
||||
for (const entry of manualEntries) {
|
||||
const key = toDateKey(entry.entry_date);
|
||||
if (key) {
|
||||
map[key] = entry;
|
||||
}
|
||||
}
|
||||
return map;
|
||||
}, [manualEntries]);
|
||||
|
||||
const calendarDays = useMemo(() => {
|
||||
const firstDay = new Date(viewYear, viewMonth, 1);
|
||||
let startDow = firstDay.getDay();
|
||||
startDow = (startDow + 6) % 7;
|
||||
const daysInMonth = new Date(viewYear, viewMonth + 1, 0).getDate();
|
||||
const cells = [];
|
||||
for (let i = 0; i < startDow; i++) cells.push(null);
|
||||
for (let d = 1; d <= daysInMonth; d++) cells.push(d);
|
||||
for (let i = 0; i < startDow; i += 1) cells.push(null);
|
||||
for (let d = 1; d <= daysInMonth; d += 1) cells.push(d);
|
||||
return cells;
|
||||
}, [viewYear, viewMonth]);
|
||||
|
||||
// Rows for servicer report preview table (current month tasks)
|
||||
useEffect(() => {
|
||||
if (!reportOpen || reportType !== 'servicer') return undefined;
|
||||
let active = true;
|
||||
setLoadingManualEntries(true);
|
||||
fetchMonthlyServicerEntries(viewYear, viewMonth + 1)
|
||||
.then((rows) => {
|
||||
if (!active) return;
|
||||
setManualEntries(Array.isArray(rows) ? rows : []);
|
||||
})
|
||||
.catch(() => {
|
||||
if (!active) return;
|
||||
setManualEntries([]);
|
||||
})
|
||||
.finally(() => {
|
||||
if (!active) return;
|
||||
setLoadingManualEntries(false);
|
||||
});
|
||||
return () => {
|
||||
active = false;
|
||||
};
|
||||
}, [reportOpen, reportType, viewYear, viewMonth]);
|
||||
|
||||
const servicerRows = useMemo(() => {
|
||||
if (reportType !== 'servicer') return [];
|
||||
return tasks
|
||||
.filter((t) => {
|
||||
const d = t.scheduled_date ? new Date(t.scheduled_date) : null;
|
||||
return d && !Number.isNaN(d.getTime()) && d.getFullYear() === viewYear && d.getMonth() === viewMonth;
|
||||
})
|
||||
.sort((a, b) => (a.scheduled_date || '').localeCompare(b.scheduled_date || ''))
|
||||
.map((task) => {
|
||||
const wo = workOrders.find((w) => String(w.id) === String(task.work_order));
|
||||
let start = '-', end = '-', regular = '-', overtime = '0';
|
||||
if (wo?.travel_start_at) start = formatTime(wo.travel_start_at);
|
||||
if (wo?.travel_end_at) end = formatTime(wo.travel_end_at);
|
||||
if (wo?.travel_start_at && wo?.travel_end_at) {
|
||||
const deltaH = (new Date(wo.travel_end_at) - new Date(wo.travel_start_at)) / 3_600_000;
|
||||
if (deltaH > 0) {
|
||||
const reg = Math.min(deltaH, 8);
|
||||
const ovt = Math.max(0, deltaH - 8);
|
||||
regular = reg % 1 === 0 ? String(reg) : reg.toFixed(2);
|
||||
overtime = ovt > 0 ? (ovt % 1 === 0 ? String(ovt) : ovt.toFixed(2)) : '0';
|
||||
const rows = [];
|
||||
const daysInMonth = new Date(viewYear, viewMonth + 1, 0).getDate();
|
||||
const monthPrefix = `${viewYear}-${String(viewMonth + 1).padStart(2, '0')}`;
|
||||
|
||||
for (let day = 1; day <= daysInMonth; day += 1) {
|
||||
const key = `${monthPrefix}-${String(day).padStart(2, '0')}`;
|
||||
const dayTasks = tasksByDate[key] ?? [];
|
||||
const manualEntry = manualEntriesByDate[key];
|
||||
|
||||
if (dayTasks.length > 0) {
|
||||
const titles = [];
|
||||
const serials = [];
|
||||
const clients = [];
|
||||
const locations = [];
|
||||
const workOrderLabels = [];
|
||||
const workStartTimes = [];
|
||||
const workEndTimes = [];
|
||||
const countedWorkOrders = new Set();
|
||||
let totalHours = 0;
|
||||
|
||||
for (const task of dayTasks) {
|
||||
if (task?.title) titles.push(task.title);
|
||||
serials.push(getTaskCraneSerial(task));
|
||||
clients.push(getTaskCraneOwner(task));
|
||||
if (task?.work_order_label) workOrderLabels.push(task.work_order_label);
|
||||
|
||||
const workOrder = workOrdersById.get(String(task.work_order || ''));
|
||||
if (workOrder?.location) locations.push(workOrder.location);
|
||||
if (
|
||||
workOrder?.travel_start_at
|
||||
&& workOrder?.travel_end_at
|
||||
&& !countedWorkOrders.has(String(workOrder.id))
|
||||
) {
|
||||
const startAt = new Date(workOrder.travel_start_at);
|
||||
const endAt = new Date(workOrder.travel_end_at);
|
||||
if (!Number.isNaN(startAt.getTime()) && !Number.isNaN(endAt.getTime()) && endAt > startAt) {
|
||||
countedWorkOrders.add(String(workOrder.id));
|
||||
workStartTimes.push(startAt);
|
||||
workEndTimes.push(endAt);
|
||||
totalHours += (endAt.getTime() - startAt.getTime()) / 3600000;
|
||||
}
|
||||
}
|
||||
}
|
||||
const datum = task.scheduled_date
|
||||
? new Date(task.scheduled_date).toLocaleDateString('hr-HR')
|
||||
: '-';
|
||||
return [
|
||||
datum,
|
||||
task.title || '-',
|
||||
getTaskCraneSerial(task),
|
||||
getTaskCraneOwner(task),
|
||||
wo?.location || '-',
|
||||
start,
|
||||
end,
|
||||
regular,
|
||||
overtime,
|
||||
task.work_order_label || '-',
|
||||
];
|
||||
});
|
||||
}, [reportType, tasks, workOrders, viewYear, viewMonth]);
|
||||
|
||||
// Costs report rows: aggregate invoices from work orders linked to tasks in current month
|
||||
rows.push({
|
||||
key,
|
||||
clickable: false,
|
||||
source: 'task',
|
||||
cells: [
|
||||
formatDateFromKey(key),
|
||||
joinUnique(titles) || '-',
|
||||
joinUnique(serials) || '-',
|
||||
joinUnique(clients) || '-',
|
||||
joinUnique(locations) || '-',
|
||||
workStartTimes.length ? formatTime(new Date(Math.min(...workStartTimes.map((item) => item.getTime()))).toISOString()) : '-',
|
||||
workEndTimes.length ? formatTime(new Date(Math.max(...workEndTimes.map((item) => item.getTime()))).toISOString()) : '-',
|
||||
totalHours > 0 ? formatHourValue(Math.min(totalHours, 8), '0') : '-',
|
||||
totalHours > 8 ? formatHourValue(totalHours - 8, '0') : '0',
|
||||
joinUnique(workOrderLabels) || '-',
|
||||
],
|
||||
});
|
||||
continue;
|
||||
}
|
||||
|
||||
if (manualEntry) {
|
||||
rows.push({
|
||||
key,
|
||||
clickable: true,
|
||||
source: manualEntry.entry_type,
|
||||
cells: [
|
||||
formatDateFromKey(key),
|
||||
manualEntry.description || '-',
|
||||
'-',
|
||||
'-',
|
||||
manualEntry.location || '-',
|
||||
formatTime(manualEntry.start_time),
|
||||
formatTime(manualEntry.end_time),
|
||||
formatHourValue(manualEntry.regular_hours, '0'),
|
||||
formatHourValue(manualEntry.overtime_hours, '0'),
|
||||
'-',
|
||||
],
|
||||
});
|
||||
continue;
|
||||
}
|
||||
|
||||
rows.push({
|
||||
key,
|
||||
clickable: true,
|
||||
source: 'empty',
|
||||
cells: [formatDateFromKey(key), 'Klikni za unos', '-', '-', '-', '-', '-', '-', '0', '-'],
|
||||
});
|
||||
}
|
||||
|
||||
return rows;
|
||||
}, [manualEntriesByDate, reportType, tasksByDate, viewMonth, viewYear, workOrdersById]);
|
||||
|
||||
const costsRows = useMemo(() => {
|
||||
if (reportType !== 'costs') return [];
|
||||
// Collect work order IDs from tasks in current month
|
||||
const woIds = new Set(
|
||||
const monthPrefix = `${viewYear}-${String(viewMonth + 1).padStart(2, '0')}`;
|
||||
const workOrderIds = new Set(
|
||||
tasks
|
||||
.filter((t) => {
|
||||
const d = t.scheduled_date ? new Date(t.scheduled_date) : null;
|
||||
return d && !Number.isNaN(d.getTime()) && d.getFullYear() === viewYear && d.getMonth() === viewMonth && t.work_order;
|
||||
.filter((task) => {
|
||||
const key = toDateKey(task.scheduled_date);
|
||||
return Boolean(key && key.startsWith(monthPrefix) && task.work_order);
|
||||
})
|
||||
.map((t) => String(t.work_order))
|
||||
.map((task) => String(task.work_order))
|
||||
);
|
||||
// Filter work orders with invoices
|
||||
|
||||
return workOrders
|
||||
.filter((wo) => woIds.has(String(wo.id)) && Array.isArray(wo.invoices) && wo.invoices.length > 0)
|
||||
.flatMap((wo) =>
|
||||
wo.invoices.map((inv) => [
|
||||
inv.datum ? new Date(inv.datum).toLocaleDateString('hr-HR') : '-',
|
||||
inv.naziv_racuna || '-',
|
||||
inv.lokacija || '-',
|
||||
inv.opis || '-',
|
||||
wo.display_code || '-',
|
||||
])
|
||||
)
|
||||
.sort((a, b) => (a[0] || '').localeCompare(b[0] || ''));
|
||||
}, [reportType, tasks, workOrders, viewYear, viewMonth]);
|
||||
.filter((workOrder) => workOrderIds.has(String(workOrder.id)) && Array.isArray(workOrder.invoices))
|
||||
.flatMap((workOrder) => (
|
||||
workOrder.invoices.map((invoice) => ([
|
||||
invoice?.datum ? new Date(invoice.datum).toLocaleDateString('hr-HR') : '-',
|
||||
invoice?.naziv_racuna || '-',
|
||||
invoice?.lokacija || '-',
|
||||
invoice?.opis || '-',
|
||||
workOrder.display_code || '-',
|
||||
]))
|
||||
));
|
||||
}, [reportType, tasks, viewYear, viewMonth, workOrders]);
|
||||
|
||||
const selectedDayKey = selectedDay
|
||||
? `${viewYear}-${String(viewMonth + 1).padStart(2, '0')}-${String(selectedDay).padStart(2, '0')}`
|
||||
@@ -146,16 +277,27 @@ export default function TaskCalendarWidget({ tasks = [], notes = [], workOrders
|
||||
const selectedDayTasks = selectedDayKey ? (tasksByDate[selectedDayKey] ?? []) : [];
|
||||
const selectedDayNotes = selectedDayKey ? (notesByDate[selectedDayKey] ?? []) : [];
|
||||
const today = new Date();
|
||||
const totalScheduled = Object.values(tasksByDate).flat().length;
|
||||
const totalNoteReminders = Object.values(notesByDate).flat().length;
|
||||
|
||||
function prevMonth() {
|
||||
setSelectedDay(null);
|
||||
if (viewMonth === 0) { setViewYear((y) => y - 1); setViewMonth(11); }
|
||||
else setViewMonth((m) => m - 1);
|
||||
if (viewMonth === 0) {
|
||||
setViewYear((y) => y - 1);
|
||||
setViewMonth(11);
|
||||
return;
|
||||
}
|
||||
setViewMonth((m) => m - 1);
|
||||
}
|
||||
|
||||
function nextMonth() {
|
||||
setSelectedDay(null);
|
||||
if (viewMonth === 11) { setViewYear((y) => y + 1); setViewMonth(0); }
|
||||
else setViewMonth((m) => m + 1);
|
||||
if (viewMonth === 11) {
|
||||
setViewYear((y) => y + 1);
|
||||
setViewMonth(0);
|
||||
return;
|
||||
}
|
||||
setViewMonth((m) => m + 1);
|
||||
}
|
||||
|
||||
function handleDayClick(day) {
|
||||
@@ -169,6 +311,7 @@ export default function TaskCalendarWidget({ tasks = [], notes = [], workOrders
|
||||
|
||||
function toggleReport(type) {
|
||||
setReportType((prev) => (prev === type ? null : type));
|
||||
setManualEntryTarget(null);
|
||||
}
|
||||
|
||||
async function handleDownload() {
|
||||
@@ -177,7 +320,7 @@ export default function TaskCalendarWidget({ tasks = [], notes = [], workOrders
|
||||
try {
|
||||
if (reportType === 'servicer') {
|
||||
await downloadMonthlyServiserReport(viewYear, viewMonth + 1);
|
||||
} else {
|
||||
} else if (reportType === 'costs') {
|
||||
await downloadMonthlyCostsReport(viewYear, viewMonth + 1);
|
||||
}
|
||||
} finally {
|
||||
@@ -185,14 +328,40 @@ export default function TaskCalendarWidget({ tasks = [], notes = [], workOrders
|
||||
}
|
||||
}
|
||||
|
||||
const totalScheduled = Object.values(tasksByDate).flat().length;
|
||||
const totalNoteReminders = Object.values(notesByDate).flat().length;
|
||||
function handleServicerRowClick(row) {
|
||||
if (!row?.clickable) return;
|
||||
setManualEntryTarget(row);
|
||||
}
|
||||
|
||||
async function handleSaveManualEntry(entryType) {
|
||||
if (!manualEntryTarget || savingManualEntry) return;
|
||||
setSavingManualEntry(true);
|
||||
try {
|
||||
const saved = await upsertMonthlyServicerEntry({
|
||||
entry_date: manualEntryTarget.key,
|
||||
entry_type: entryType,
|
||||
});
|
||||
setManualEntries((prev) => {
|
||||
const next = Array.isArray(prev) ? [...prev] : [];
|
||||
const index = next.findIndex((item) => toDateKey(item.entry_date) === toDateKey(saved.entry_date));
|
||||
if (index >= 0) {
|
||||
next[index] = saved;
|
||||
} else {
|
||||
next.push(saved);
|
||||
}
|
||||
return next.sort((a, b) => String(a.entry_date || '').localeCompare(String(b.entry_date || '')));
|
||||
});
|
||||
setManualEntryTarget(null);
|
||||
} finally {
|
||||
setSavingManualEntry(false);
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<LeftSlideDrawer
|
||||
drawerId="calendar"
|
||||
title="đź“… Kalendar zadataka"
|
||||
tabLabel="đź“… Kalendar"
|
||||
title="Kalendar zadataka"
|
||||
tabLabel="Kalendar"
|
||||
tabTitle="Kalendar zadataka"
|
||||
tabTopClassName="top-1/2"
|
||||
backdropClassName="z-[45]"
|
||||
@@ -201,14 +370,11 @@ export default function TaskCalendarWidget({ tasks = [], notes = [], workOrders
|
||||
panelWidth={panelWidth}
|
||||
>
|
||||
{({ close }) => (
|
||||
<div className="flex flex-1 min-h-0 overflow-hidden">
|
||||
|
||||
{/* ── Calendar column (fixed 300 px) ── */}
|
||||
<div className="relative flex min-h-0 flex-1 overflow-hidden">
|
||||
<div
|
||||
className="flex w-[300px] flex-shrink-0 flex-col overflow-hidden"
|
||||
style={reportOpen ? { borderRight: '1px solid var(--color-border-hairline, #e5e7eb)' } : {}}
|
||||
>
|
||||
{/* Report toggle buttons */}
|
||||
<div className="flex gap-1.5 border-b border-border-hairline px-3 py-2">
|
||||
<button
|
||||
type="button"
|
||||
@@ -219,9 +385,9 @@ export default function TaskCalendarWidget({ tasks = [], notes = [], workOrders
|
||||
? 'bg-indigo-600 text-white'
|
||||
: 'bg-canvas-deep text-text-main hover:bg-indigo-50 hover:text-indigo-700',
|
||||
].join(' ')}
|
||||
title="Otvori panel za izradu mjesečnog izvještaja servisera"
|
||||
title="Otvori panel za mjesecni izvjestaj servisera"
|
||||
>
|
||||
📊 Izvještaj servisera
|
||||
Izvjestaj servisera
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
@@ -232,13 +398,12 @@ export default function TaskCalendarWidget({ tasks = [], notes = [], workOrders
|
||||
? 'bg-emerald-600 text-white'
|
||||
: 'bg-canvas-deep text-text-main hover:bg-emerald-50 hover:text-emerald-700',
|
||||
].join(' ')}
|
||||
title="Otvori panel za izradu mjesečnog izvještaja troškova"
|
||||
title="Otvori panel za mjesecni izvjestaj troskova"
|
||||
>
|
||||
💰 Izvještaj troškova
|
||||
Izvjestaj troskova
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{/* Month navigation */}
|
||||
<div className="flex items-center justify-between px-4 py-2">
|
||||
<button
|
||||
type="button"
|
||||
@@ -246,7 +411,7 @@ export default function TaskCalendarWidget({ tasks = [], notes = [], workOrders
|
||||
className="rounded p-1 text-sm text-text-main hover:bg-canvas-deep"
|
||||
aria-label="Prethodni mjesec"
|
||||
>
|
||||
â—€
|
||||
<
|
||||
</button>
|
||||
<span className="text-sm font-medium text-text-main">
|
||||
{MONTH_NAMES[viewMonth]} {viewYear}
|
||||
@@ -255,13 +420,12 @@ export default function TaskCalendarWidget({ tasks = [], notes = [], workOrders
|
||||
type="button"
|
||||
onClick={nextMonth}
|
||||
className="rounded p-1 text-sm text-text-main hover:bg-canvas-deep"
|
||||
aria-label="Sljedeći mjesec"
|
||||
aria-label="Sljedeci mjesec"
|
||||
>
|
||||
â–¶
|
||||
>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{/* Calendar grid */}
|
||||
<div className="px-3">
|
||||
<div className="grid grid-cols-7 text-center">
|
||||
{WEEKDAY_LABELS.map((label) => (
|
||||
@@ -279,16 +443,16 @@ export default function TaskCalendarWidget({ tasks = [], notes = [], workOrders
|
||||
const taskCount = tasksByDate[key]?.length ?? 0;
|
||||
const noteCount = notesByDate[key]?.length ?? 0;
|
||||
const isToday =
|
||||
today.getFullYear() === viewYear &&
|
||||
today.getMonth() === viewMonth &&
|
||||
today.getDate() === day;
|
||||
today.getFullYear() === viewYear
|
||||
&& today.getMonth() === viewMonth
|
||||
&& today.getDate() === day;
|
||||
const isSelected = selectedDay === day;
|
||||
return (
|
||||
<button
|
||||
key={key}
|
||||
type="button"
|
||||
onClick={() => handleDayClick(day)}
|
||||
title={hasTasks || hasNotes ? `${taskCount} zadatak/a, ${noteCount} bilješki` : undefined}
|
||||
title={hasTasks || hasNotes ? `${taskCount} zadatak/a, ${noteCount} biljeski` : undefined}
|
||||
className={[
|
||||
'relative mx-auto flex h-8 w-8 items-center justify-center rounded-full text-xs transition-colors',
|
||||
isSelected
|
||||
@@ -317,10 +481,8 @@ export default function TaskCalendarWidget({ tasks = [], notes = [], workOrders
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Divider */}
|
||||
<div className="mt-2 border-t border-border-hairline" />
|
||||
|
||||
{/* Task list for selected day OR hint */}
|
||||
<div className="flex-1 overflow-y-auto px-4 py-3">
|
||||
{selectedDay ? (
|
||||
<>
|
||||
@@ -328,12 +490,12 @@ export default function TaskCalendarWidget({ tasks = [], notes = [], workOrders
|
||||
{formatDayLabel(viewYear, viewMonth, selectedDay)}
|
||||
</p>
|
||||
{selectedDayTasks.length === 0 && selectedDayNotes.length === 0 ? (
|
||||
<p className="text-sm text-text-muted">Nema događaja za odabrani datum.</p>
|
||||
<p className="text-sm text-text-muted">Nema dogadjaja za odabrani datum.</p>
|
||||
) : (
|
||||
<div className="space-y-3">
|
||||
{selectedDayNotes.length > 0 && (
|
||||
<div>
|
||||
<p className="mb-1 text-[11px] font-semibold uppercase tracking-wide text-violet-700">Bilješke</p>
|
||||
<p className="mb-1 text-[11px] font-semibold uppercase tracking-wide text-violet-700">Biljeske</p>
|
||||
<ul className="space-y-1.5">
|
||||
{selectedDayNotes.map((note) => (
|
||||
<li key={note.id} className="rounded-lg border border-violet-200 bg-violet-50 px-3 py-2 text-sm text-violet-900">
|
||||
@@ -355,14 +517,16 @@ export default function TaskCalendarWidget({ tasks = [], notes = [], workOrders
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => handleTaskClick(task, close)}
|
||||
className="w-full rounded-lg border border-border-hairline bg-canvas-base px-3 py-2 text-left text-sm hover:bg-indigo-50 hover:border-indigo-200 transition-colors"
|
||||
className="w-full rounded-lg border border-border-hairline bg-canvas-base px-3 py-2 text-left text-sm transition-colors hover:border-indigo-200 hover:bg-indigo-50"
|
||||
>
|
||||
<span className="block truncate font-medium text-text-main">{task.title || '-'}</span>
|
||||
<span className="mt-0.5 block text-[11px] text-text-muted">
|
||||
{task.assigned_to_name || '-'} • {getStatusLabel(task.status || '-')}
|
||||
<span className="block truncate font-medium text-text-main">
|
||||
{task.title || '-'}
|
||||
</span>
|
||||
<span className="mt-0.5 block text-[11px] text-text-muted">
|
||||
{getTaskCraneSerial(task)} • {getTaskCraneKind(task)} • {getTaskCraneOwner(task)}
|
||||
{task.assigned_to_name || '-'} | {getStatusLabel(task.status || '-')}
|
||||
</span>
|
||||
<span className="mt-0.5 block text-[11px] text-text-muted">
|
||||
{getTaskCraneSerial(task)} | {getTaskCraneKind(task)} | {getTaskCraneOwner(task)}
|
||||
</span>
|
||||
</button>
|
||||
</li>
|
||||
@@ -385,7 +549,7 @@ export default function TaskCalendarWidget({ tasks = [], notes = [], workOrders
|
||||
)}
|
||||
{totalNoteReminders > 0 && (
|
||||
<p className="mt-1 text-xs font-medium text-violet-600">
|
||||
{totalNoteReminders} bilješki/podsjetnika u kalendaru.
|
||||
{totalNoteReminders} biljeski/podsjetnika u kalendaru.
|
||||
</p>
|
||||
)}
|
||||
{totalScheduled === 0 && (
|
||||
@@ -398,14 +562,12 @@ export default function TaskCalendarWidget({ tasks = [], notes = [], workOrders
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* ── Report panel (visible when reportType is set) ── */}
|
||||
{reportOpen && (
|
||||
<div className="flex flex-1 flex-col overflow-hidden">
|
||||
{/* Report header */}
|
||||
<div className="flex items-center justify-between border-b border-border-hairline px-4 py-2">
|
||||
<div>
|
||||
<span className="text-sm font-semibold text-text-main">
|
||||
{reportType === 'servicer' ? '📊 Izvještaj servisera' : '💰 Izvještaj troškova'}
|
||||
{reportType === 'servicer' ? 'Mjesecni izvjestaj servisera' : 'Mjesecni izvjestaj troskova'}
|
||||
</span>
|
||||
<span className="ml-2 text-xs text-text-muted">
|
||||
{MONTH_NAMES[viewMonth]} {viewYear}
|
||||
@@ -413,45 +575,48 @@ export default function TaskCalendarWidget({ tasks = [], notes = [], workOrders
|
||||
</div>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => downloadMonthlyServiserReport && handleDownload()}
|
||||
onClick={handleDownload}
|
||||
disabled={downloading}
|
||||
className="flex items-center gap-1.5 rounded-md bg-indigo-600 px-3 py-1.5 text-xs font-medium text-white hover:bg-indigo-700 disabled:opacity-60"
|
||||
className="rounded-md bg-indigo-600 px-3 py-1.5 text-xs font-medium text-white hover:bg-indigo-700 disabled:opacity-60"
|
||||
>
|
||||
{downloading ? '⏳' : '📥'} Preuzmi DOCX
|
||||
{downloading ? 'Preuzimanje...' : 'Preuzmi DOCX'}
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{/* Report info note */}
|
||||
<p className="border-b border-border-hairline bg-canvas-deep px-4 py-1.5 text-[11px] text-text-muted">
|
||||
{reportType === 'servicer'
|
||||
? 'Pregled podataka za odabrani mjesec. Preuzmi DOCX za točan i formatiran izvještaj.'
|
||||
: 'Pregled troškova za odabrani mjesec iz putnih naloga. Preuzmi DOCX za točan izvještaj.'
|
||||
}
|
||||
? 'Tablica prikazuje sve dane u mjesecu. Klikni na red bez putnog naloga i odaberi status dana.'
|
||||
: 'Pregled troskova iz racuna vezanih uz putne naloge u odabranom mjesecu.'}
|
||||
</p>
|
||||
|
||||
{/* Table */}
|
||||
<div className="flex-1 overflow-auto">
|
||||
{reportType === 'servicer' && (
|
||||
servicerRows.length === 0 ? (
|
||||
<p className="px-4 py-8 text-center text-sm text-text-muted">
|
||||
Nema zadataka za {MONTH_NAMES[viewMonth]} {viewYear}.
|
||||
</p>
|
||||
loadingManualEntries ? (
|
||||
<p className="px-4 py-8 text-center text-sm text-text-muted">Ucitam dnevne unose...</p>
|
||||
) : (
|
||||
<table className="w-full min-w-[580px] border-collapse text-[11px]">
|
||||
<table className="w-full min-w-[980px] border-collapse text-[11px]">
|
||||
<thead>
|
||||
<tr className="bg-canvas-deep">
|
||||
{SERVICER_HEADERS.map((h) => (
|
||||
<th key={h} className="border border-border-hairline px-2 py-1.5 text-left font-semibold text-text-muted whitespace-nowrap">
|
||||
{h}
|
||||
{SERVICER_HEADERS.map((header) => (
|
||||
<th key={header} className="border border-border-hairline px-2 py-1.5 text-left font-semibold text-text-muted whitespace-nowrap">
|
||||
{header}
|
||||
</th>
|
||||
))}
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{servicerRows.map((row, i) => (
|
||||
<tr key={i} className={i % 2 === 0 ? 'bg-canvas-base' : 'bg-canvas-deep'}>
|
||||
{row.map((cell, j) => (
|
||||
<td key={j} className="border border-border-hairline px-2 py-1 text-text-main whitespace-nowrap">
|
||||
{servicerRows.map((row, index) => (
|
||||
<tr
|
||||
key={row.key}
|
||||
onClick={() => handleServicerRowClick(row)}
|
||||
className={[
|
||||
index % 2 === 0 ? 'bg-canvas-base' : 'bg-canvas-deep',
|
||||
row.clickable ? 'cursor-pointer hover:bg-indigo-50' : '',
|
||||
].join(' ')}
|
||||
title={row.clickable ? 'Klikni za unos ili izmjenu dana bez putnog naloga.' : undefined}
|
||||
>
|
||||
{row.cells.map((cell, cellIndex) => (
|
||||
<td key={`${row.key}-${cellIndex}`} className="border border-border-hairline px-2 py-1 text-text-main whitespace-nowrap">
|
||||
{cell}
|
||||
</td>
|
||||
))}
|
||||
@@ -461,29 +626,28 @@ export default function TaskCalendarWidget({ tasks = [], notes = [], workOrders
|
||||
</table>
|
||||
)
|
||||
)}
|
||||
|
||||
{reportType === 'costs' && (
|
||||
costsRows.length === 0 ? (
|
||||
<p className="px-4 py-8 text-center text-sm text-text-muted">
|
||||
Nema troškova za {MONTH_NAMES[viewMonth]} {viewYear}.
|
||||
<br />
|
||||
<span className="text-[11px]">Napomena: prikaz ovisi o dostupnim podacima raÄŤuna u putnim nalozima.</span>
|
||||
Nema troskova za {MONTH_NAMES[viewMonth]} {viewYear}.
|
||||
</p>
|
||||
) : (
|
||||
<table className="w-full min-w-[400px] border-collapse text-[11px]">
|
||||
<table className="w-full min-w-[640px] border-collapse text-[11px]">
|
||||
<thead>
|
||||
<tr className="bg-canvas-deep">
|
||||
{['DATUM', 'NAZIV RAÄŚUNA', 'LOKACIJA', 'OPIS', 'RADNI NALOG'].map((h) => (
|
||||
<th key={h} className="border border-border-hairline px-2 py-1.5 text-left font-semibold text-text-muted whitespace-nowrap">
|
||||
{h}
|
||||
{COST_HEADERS.map((header) => (
|
||||
<th key={header} className="border border-border-hairline px-2 py-1.5 text-left font-semibold text-text-muted whitespace-nowrap">
|
||||
{header}
|
||||
</th>
|
||||
))}
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{costsRows.map((row, i) => (
|
||||
<tr key={i} className={i % 2 === 0 ? 'bg-canvas-base' : 'bg-canvas-deep'}>
|
||||
{row.map((cell, j) => (
|
||||
<td key={j} className="border border-border-hairline px-2 py-1 text-text-main whitespace-nowrap">
|
||||
{costsRows.map((row, index) => (
|
||||
<tr key={`${row[0]}-${row[1]}-${index}`} className={index % 2 === 0 ? 'bg-canvas-base' : 'bg-canvas-deep'}>
|
||||
{row.map((cell, cellIndex) => (
|
||||
<td key={cellIndex} className="border border-border-hairline px-2 py-1 text-text-main whitespace-nowrap">
|
||||
{cell}
|
||||
</td>
|
||||
))}
|
||||
@@ -496,6 +660,59 @@ export default function TaskCalendarWidget({ tasks = [], notes = [], workOrders
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{manualEntryTarget && (
|
||||
<div className="absolute inset-0 z-10 flex items-center justify-center bg-black/20">
|
||||
<div className="w-full max-w-sm rounded-xl border border-border-hairline bg-canvas-elevated p-4 shadow-2xl">
|
||||
<div className="flex items-start justify-between gap-3">
|
||||
<div>
|
||||
<h3 className="text-sm font-semibold text-text-main">Odaberi vrstu unosa</h3>
|
||||
<p className="mt-1 text-xs text-text-muted">
|
||||
{formatDateFromKey(manualEntryTarget.key)} nema putni nalog. Odaberi status dana.
|
||||
</p>
|
||||
</div>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setManualEntryTarget(null)}
|
||||
className="rounded p-1 text-text-muted hover:bg-canvas-deep"
|
||||
aria-label="Zatvori"
|
||||
>
|
||||
x
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div className="mt-4 grid gap-2">
|
||||
<button
|
||||
type="button"
|
||||
disabled={savingManualEntry}
|
||||
onClick={() => handleSaveManualEntry('office')}
|
||||
className="rounded-lg border border-border-hairline px-3 py-2 text-left text-sm hover:bg-indigo-50"
|
||||
>
|
||||
<span className="block font-medium text-text-main">Rad u uredu</span>
|
||||
<span className="block text-xs text-text-muted">08:00 - 16:00, 8h, Zagreb (ured)</span>
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
disabled={savingManualEntry}
|
||||
onClick={() => handleSaveManualEntry('sick_leave')}
|
||||
className="rounded-lg border border-border-hairline px-3 py-2 text-left text-sm hover:bg-indigo-50"
|
||||
>
|
||||
<span className="block font-medium text-text-main">Bolovanje</span>
|
||||
<span className="block text-xs text-text-muted">Ukupno 8h</span>
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
disabled={savingManualEntry}
|
||||
onClick={() => handleSaveManualEntry('vacation')}
|
||||
className="rounded-lg border border-border-hairline px-3 py-2 text-left text-sm hover:bg-indigo-50"
|
||||
>
|
||||
<span className="block font-medium text-text-main">Godisnji</span>
|
||||
<span className="block text-xs text-text-muted">Ukupno 8h</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</LeftSlideDrawer>
|
||||
|
||||
@@ -64,6 +64,17 @@ export default function TaskCalendarPortal() {
|
||||
));
|
||||
}, [workOrders, isSupervisorNotServiser, user?.id]);
|
||||
|
||||
const calendarWorkOrders = useMemo(() => {
|
||||
const base = Array.isArray(workOrders) ? workOrders : [];
|
||||
if (isSupervisorNotServiser) {
|
||||
return base;
|
||||
}
|
||||
return base.filter((item) => (
|
||||
String(item.creator || '') === String(user?.id || '')
|
||||
|| String(item.craneInfo?.assigned_servicer || '') === String(user?.id || '')
|
||||
));
|
||||
}, [workOrders, isSupervisorNotServiser, user?.id]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!user?.id) return;
|
||||
fetchServiceNotes().catch(() => {});
|
||||
@@ -103,7 +114,7 @@ export default function TaskCalendarPortal() {
|
||||
<TaskCalendarWidget
|
||||
tasks={tasks}
|
||||
notes={notes}
|
||||
workOrders={activeWorkOrders}
|
||||
workOrders={calendarWorkOrders}
|
||||
onTaskClick={handleTaskClick}
|
||||
/>
|
||||
<ServiceNotesWidget
|
||||
|
||||
@@ -913,6 +913,30 @@ export async function downloadWorkOrderInvoicesDocx(workOrderId) {
|
||||
}
|
||||
}
|
||||
|
||||
export async function fetchMonthlyServicerEntries(year, month) {
|
||||
const payload = await api.get(
|
||||
`fleet/monthly-servicer-day-entries/?year=${year}&month=${month}`
|
||||
);
|
||||
return Array.isArray(payload) ? payload : (payload?.results ?? []);
|
||||
}
|
||||
|
||||
export async function upsertMonthlyServicerEntry(data = {}) {
|
||||
if (!data.entry_date) {
|
||||
throw new Error('Datum dnevnog unosa je obavezan.');
|
||||
}
|
||||
if (!data.entry_type) {
|
||||
throw new Error('Vrsta dnevnog unosa je obavezna.');
|
||||
}
|
||||
try {
|
||||
const response = await api.post('fleet/monthly-servicer-day-entries/', data);
|
||||
showToast('Dnevni unos je uspjesno spremljen.', 'success');
|
||||
return response;
|
||||
} catch (err) {
|
||||
showToast(err?.message || 'Spremanje dnevnog unosa nije uspjelo.', 'error');
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
|
||||
export async function downloadMonthlyServiserReport(year, month) {
|
||||
try {
|
||||
const blob = await api.get(
|
||||
|
||||
Reference in New Issue
Block a user