From ed71bf500f3d007f91fcc51ff492d730ee5a6ad4 Mon Sep 17 00:00:00 2001
From: mariomitte <mario_mitte@hotmail.com>
Date: Thu, 6 Aug 2026 19:53:40 +0200
Subject: [PATCH] fix: use task work order data in service report context

Ensure /putni-nalozi/racuni reads service-report context from the selected task's own work order instead of reusing the parent page work-order data for every task.

- task-service-context now returns task_work_order metadata per task
- work hours modal reads location and travel data from task_work_order
- tasks without a linked work order fall back to None

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 backend/modules/fleet/views.py                   | 16 ++++++++++++++++
 .../dashboard/WorkOrderInvoicesPdfPage.jsx       |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/backend/modules/fleet/views.py b/backend/modules/fleet/views.py
index 170b7b6..043d593 100644
--- a/backend/modules/fleet/views.py
+++ b/backend/modules/fleet/views.py
@@ -3464,6 +3464,22 @@ class WorkOrderViewSet(viewsets.ModelViewSet):
                 'service_report_note': task.service_report_note or '',
                 'assigned_to_name': _user_display_name(task.assigned_to),
                 'vehicle_registration': getattr(task.vehicle, 'registration_number', None),
+                'task_work_order': (
+                    {
+                        'id': task.work_order_id,
+                        'display_code': getattr(task.work_order, 'display_code', None),
+                        'origin_location': getattr(task.work_order, 'origin_location', None),
+                        'location': getattr(task.work_order, 'location', None),
+                        'travel_start_at': getattr(task.work_order, 'travel_start_at', None),
+                        'travel_end_at': getattr(task.work_order, 'travel_end_at', None),
+                        'start_mileage': getattr(task.work_order, 'start_mileage', None),
+                        'end_mileage': getattr(task.work_order, 'end_mileage', None),
+                        'distance': getattr(task.work_order, 'distance', None),
+                        'servicer_vehicle_registration': getattr(task.work_order, 'servicer_vehicle_registration', None),
+                        'servicer_vehicle_make_model': getattr(task.work_order, 'servicer_vehicle_make_model', None),
+                    }
+                    if task.work_order_id else None
+                ),
                 'work_hours_table': getattr(getattr(task, 'work_hours_table', None), 'data', None),
                 'service_records': records_payload,
             })
diff --git a/frontend/src/components/dashboard/WorkOrderInvoicesPdfPage.jsx b/frontend/src/components/dashboard/WorkOrderInvoicesPdfPage.jsx
index c9b5c11..9c1cd74 100644
--- a/frontend/src/components/dashboard/WorkOrderInvoicesPdfPage.jsx
+++ b/frontend/src/components/dashboard/WorkOrderInvoicesPdfPage.jsx
@@ -554,8 +554,8 @@ export default function WorkOrderInvoicesPdfPage() {
             <TaskWorkHoursTableModal
                 open={!!editingTask}
                 task={editingTask}
-                workOrder={workOrder}
-                defaultLocation={workOrder?.location || ''}
+                workOrder={editingTask?.task_work_order ?? null}
+                defaultLocation={editingTask?.task_work_order?.location ?? ''}
                 saving={savingWorkHours}
                 onClose={() => setEditingTask(null)}
                 onSave={handleSaveWorkHoursTable}