fix: reduce memory usage for monthly ZIP archive flow

Replace generated archive download response with FileResponse streaming so ZIP files are not fully loaded into process memory.

Move monthly archive task output to a temporary file and upload that file to storage, and write invoice attachments into ZIP archives in chunks.

Add Celery memory guard settings, a memory-aware base task hook, and periodic /tmp cleanup for prefixed archive files older than one day.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

README.md

@@ -7,7 +7,7 @@ Nakon što je gitea webhook i testirana skripta za automatsko povlačenje promje
 ```bash
 cd /opt/erp/app
 git fetch origin
-git reset --hard origin/main
+git reset --hard origin/main ili git pull --ff-only origin main
 
 # rebuild backend + worker + beat + frontend
 docker compose -f docker-compose.yml -f docker-compose.prod.yml build backend worker beat frontend

backend/core/celery.py

@@ -1,7 +1,12 @@
 # backend/core/celery.py
 
 import os
+import gc
+import logging
 from celery import Celery
+from celery import Task
+
+logger = logging.getLogger(__name__)
 
 # Postavi Django settings modul
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'core.settings')
@@ -11,5 +16,42 @@ app = Celery('core')
 # Koristi konfiguraciju iz settings.py s prefiksom 'CELERY_'
 app.config_from_object('django.conf:settings', namespace='CELERY')
 
+
+def _rss_memory_mb():
+    try:
+        import resource
+
+        usage_kb = resource.getrusage(resource.RUSAGE_SELF).ru_maxrss
+        # Na Linuxu je ru_maxrss u KiB.
+        return round(float(usage_kb) / 1024.0, 2)
+    except (ImportError, AttributeError, OSError, ValueError):
+        return None
+
+
+class MemoryAwareTask(Task):
+    abstract = True
+
+    def __call__(self, *args, **kwargs):
+        gc.collect()
+        return super().__call__(*args, **kwargs)
+
+    def after_return(self, status, retval, task_id, args, kwargs, einfo):
+        memory_before_gc = _rss_memory_mb()
+        gc.collect()
+        memory_after_gc = _rss_memory_mb()
+        if memory_before_gc is not None and memory_after_gc is not None:
+            logger.info(
+                "Task %s (%s) status=%s RSS prije/poslije GC: %.2fMB -> %.2fMB",
+                self.name,
+                task_id,
+                status,
+                memory_before_gc,
+                memory_after_gc,
+            )
+        return super().after_return(status, retval, task_id, args, kwargs, einfo)
+
+
+app.Task = MemoryAwareTask
+
 # Automatski pronalazi taskove u svim 'modules.*'
 app.autodiscover_tasks()

backend/core/settings/base.py

@@ -154,6 +154,11 @@ REDIS_URL = os.environ.get('REDIS_URL', 'redis://localhost:6379/0')
 
 CELERY_BROKER_URL = REDIS_URL
 CELERY_RESULT_BACKEND = REDIS_URL
+CELERY_WORKER_PREFETCH_MULTIPLIER = int(os.environ.get('CELERY_WORKER_PREFETCH_MULTIPLIER', '1'))
+CELERY_WORKER_MAX_TASKS_PER_CHILD = int(os.environ.get('CELERY_WORKER_MAX_TASKS_PER_CHILD', '20'))
+CELERY_WORKER_MAX_MEMORY_PER_CHILD = int(os.environ.get('CELERY_WORKER_MAX_MEMORY_PER_CHILD', '350000'))
+CELERY_TASK_ACKS_LATE = True
+CELERY_TASK_REJECT_ON_WORKER_LOST = True
 
 # Ako želiš koristiti Redis kao brzi cache sustav unutar Djanga (izvrsno za ERP performanse)
 # Za ovo ti je potreban paket 'django-redis' u requirements.txt
@@ -171,10 +176,18 @@ CACHES = {
 CELERY_ACCEPT_CONTENT = ['json']
 CELERY_TASK_SERIALIZER = 'json'
 CELERY_BEAT_SCHEDULE = {
+    'cleanup-expired-generated-archives-hourly': {
+        'task': 'modules.fleet.tasks.cleanup_expired_generated_archives_task',
+        'schedule': crontab(minute=5),
+    },
     'cleanup-expired-generated-pdfs-hourly': {
         'task': 'modules.fleet.tasks.cleanup_expired_generated_pdfs_task',
         'schedule': crontab(minute=0),
     },
+    'cleanup-app-tmp-daily': {
+        'task': 'modules.fleet.tasks.cleanup_tmp_files_task',
+        'schedule': crontab(hour=3, minute=15),
+    },
     'notify-upcoming-tasks-daily': {
         'task': 'modules.task_management.tasks.notify_upcoming_tasks',
         'schedule': crontab(hour=8, minute=0),
@@ -190,6 +203,13 @@ STATIC_URL = '/static/'
 # (Opcionalno, ali preporučeno za ERP) Ako koristiš i medije (dokumente)
 MEDIA_URL = '/media/'
 MEDIA_ROOT = BASE_DIR / 'media'
+APP_TMP_CLEANUP_DIR = os.environ.get('APP_TMP_CLEANUP_DIR', '/tmp')
+APP_TMP_CLEANUP_MAX_AGE_HOURS = int(os.environ.get('APP_TMP_CLEANUP_MAX_AGE_HOURS', '24'))
+APP_TMP_CLEANUP_PREFIXES = [
+    prefix.strip()
+    for prefix in os.environ.get('APP_TMP_CLEANUP_PREFIXES', 'erp-fleet-archive-').split(',')
+    if prefix.strip()
+]
 
 
 # ==============================================================================

backend/modules/fleet/migrations/0034_monthlyservicerdayentry.py

@@ -0,0 +1,45 @@
+# Generated by Django 5.2.15 on 2026-07-31 12:30
+
+import uuid
+from decimal import Decimal
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fleet', '0033_emaildispatchlog'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='MonthlyServicerDayEntry',
+            fields=[
+                ('id', models.UUIDField(default=uuid.uuid4, editable=False, help_text='Unikatni identifikator entiteta (UUID).', primary_key=True, serialize=False)),
+                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Vrijeme kreiranja')),
+                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='Vrijeme zadnje izmjene')),
+                ('is_active', models.BooleanField(default=True, verbose_name='Aktivan zapis')),
+                ('entry_date', models.DateField(db_index=True, verbose_name='Datum')),
+                ('entry_type', models.CharField(choices=[('office', 'Rad u uredu'), ('sick_leave', 'Bolovanje'), ('vacation', 'Godišnji odmor')], max_length=24, verbose_name='Vrsta unosa')),
+                ('description', models.CharField(blank=True, max_length=255, verbose_name='Opis posla')),
+                ('location', models.CharField(blank=True, max_length=255, verbose_name='Mjesto rada')),
+                ('start_time', models.TimeField(blank=True, null=True, verbose_name='Početak rada')),
+                ('end_time', models.TimeField(blank=True, null=True, verbose_name='Kraj rada')),
+                ('regular_hours', models.DecimalField(decimal_places=2, default=Decimal('8.00'), max_digits=5, verbose_name='Redovan rad')),
+                ('overtime_hours', models.DecimalField(decimal_places=2, default=Decimal('0.00'), max_digits=5, verbose_name='Prekovremeni rad')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='monthly_servicer_day_entries', to=settings.AUTH_USER_MODEL, verbose_name='Serviser')),
+            ],
+            options={
+                'verbose_name': 'Dnevni unos mjesečnog izvještaja servisera',
+                'verbose_name_plural': 'Dnevni unosi mjesečnog izvještaja servisera',
+                'ordering': ['entry_date'],
+            },
+        ),
+        migrations.AddConstraint(
+            model_name='monthlyservicerdayentry',
+            constraint=models.UniqueConstraint(fields=('user', 'entry_date', 'is_active'), name='uniq_monthly_servicer_day_entry_user_date_active'),
+        ),
+    ]

backend/modules/fleet/migrations/0035_generatedfleetarchive.py

@@ -0,0 +1,39 @@
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import modules.fleet.models
+import uuid
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fleet', '0034_monthlyservicerdayentry'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='GeneratedFleetArchive',
+            fields=[
+                ('id', models.UUIDField(default=uuid.uuid4, editable=False, help_text='Unikatni identifikator entiteta (UUID).', primary_key=True, serialize=False)),
+                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Vrijeme kreiranja')),
+                ('updated_at', models.DateTimeField(auto_now=True, verbose_name='Vrijeme zadnje izmjene')),
+                ('is_active', models.BooleanField(default=True, verbose_name='Aktivan zapis')),
+                ('archive_type', models.CharField(choices=[('service_tasks', 'Pojedinačni servisni taskovi'), ('work_orders', 'Putni nalozi i računi')], db_index=True, max_length=32, verbose_name='Tip ZIP arhive')),
+                ('year', models.PositiveSmallIntegerField(db_index=True, verbose_name='Godina')),
+                ('month', models.PositiveSmallIntegerField(db_index=True, verbose_name='Mjesec')),
+                ('status', models.CharField(choices=[('pending', 'U obradi'), ('ready', 'Spremno'), ('failed', 'Neuspješno')], db_index=True, default='pending', max_length=16, verbose_name='Status')),
+                ('file', models.FileField(blank=True, null=True, upload_to=modules.fleet.models._generated_fleet_archive_upload_to, verbose_name='ZIP datoteka')),
+                ('filename', models.CharField(blank=True, max_length=255, verbose_name='Naziv datoteke')),
+                ('expires_at', models.DateTimeField(blank=True, db_index=True, null=True, verbose_name='Vrijedi do')),
+                ('error_message', models.TextField(blank=True, verbose_name='Poruka greške')),
+                ('requested_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='requested_generated_fleet_archives', to=settings.AUTH_USER_MODEL, verbose_name='Zatražio')),
+            ],
+            options={
+                'verbose_name': 'Generirana ZIP arhiva',
+                'verbose_name_plural': 'Generirane ZIP arhive',
+                'ordering': ['-created_at'],
+            },
+        ),
+    ]

backend/modules/fleet/migrations/0036_workordertravelexpenses_table.py

@@ -0,0 +1,34 @@
+from decimal import Decimal
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fleet', '0035_generatedfleetarchive'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='WorkOrderTravelExpensesTable',
+            fields=[
+                ('id', models.UUIDField(editable=False, primary_key=True, serialize=False)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('is_active', models.BooleanField(default=True)),
+                ('broj_sati', models.DecimalField(decimal_places=2, default=Decimal('0.00'), max_digits=10, verbose_name='Broj sati')),
+                ('kolicina_dnevnica', models.DecimalField(decimal_places=2, default=Decimal('0.00'), max_digits=10, verbose_name='Količina dnevnica')),
+                ('iznos_dnevnica', models.DecimalField(decimal_places=2, default=Decimal('30.00'), max_digits=10, verbose_name='Iznos dnevnice')),
+                ('daily_rate_country', models.CharField(choices=[('HR', 'Hrvatska'), ('BIH', 'BiH'), ('SI', 'Slovenija'), ('CG', 'Crna Gora')], default='HR', max_length=8, verbose_name='Država dnevnice')),
+                ('total_for_payout', models.DecimalField(decimal_places=2, default=Decimal('0.00'), max_digits=12, verbose_name='Ukupan iznos')),
+                ('work_order', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='travel_expenses_table', to='fleet.workorder', verbose_name='Putni nalog')),
+            ],
+            options={
+                'verbose_name': 'Tablica obračuna putnih troškova',
+                'verbose_name_plural': 'Tablice obračuna putnih troškova',
+                'ordering': ['-updated_at'],
+            },
+        ),
+    ]

backend/modules/fleet/migrations/0037_alter_workordertravelexpensestable_created_at_and_more.py

@@ -0,0 +1,32 @@
+import uuid
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fleet', '0036_workordertravelexpenses_table'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='workordertravelexpensestable',
+            name='created_at',
+            field=models.DateTimeField(auto_now_add=True, verbose_name='Vrijeme kreiranja'),
+        ),
+        migrations.AlterField(
+            model_name='workordertravelexpensestable',
+            name='id',
+            field=models.UUIDField(default=uuid.uuid4, editable=False, help_text='Unikatni identifikator entiteta (UUID).', primary_key=True, serialize=False),
+        ),
+        migrations.AlterField(
+            model_name='workordertravelexpensestable',
+            name='is_active',
+            field=models.BooleanField(default=True, verbose_name='Aktivan zapis'),
+        ),
+        migrations.AlterField(
+            model_name='workordertravelexpensestable',
+            name='updated_at',
+            field=models.DateTimeField(auto_now=True, verbose_name='Vrijeme zadnje izmjene'),
+        ),
+    ]

backend/modules/fleet/models.py

@@ -1,10 +1,13 @@
 import uuid
 import re
+from datetime import time
 from django.db import models
+from django.db.models.signals import post_save, pre_delete
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.utils.translation import gettext_lazy as _
 from django.utils import timezone
+from django.dispatch import receiver
 from core.base_models import BaseModel
 from decimal import Decimal
 
@@ -64,6 +67,16 @@ def _generated_work_order_pdf_upload_to(instance, filename):
     return f"fleet/{vehicle_reg}/generated_pdfs/{unique_name}"
 
 
+def _generated_fleet_archive_upload_to(instance, filename):
+    requester = 'unknown'
+    try:
+        requester = str(instance.requested_by_id or 'unknown')
+    except Exception:
+        requester = 'unknown'
+    unique_name = f"{uuid.uuid4().hex}_{filename}"
+    return f"fleet/generated_archives/{requester}/{unique_name}"
+
+
 class VehicleServicePhoto(BaseModel):
     """
     Fotografije kvarova / radova povezane s VehicleServiceRecord.
@@ -131,6 +144,67 @@ class VehicleServiceAttachment(BaseModel):
     def __str__(self):
         return f"Attachment {self.pk} for {self.service_record} ({self.file.name if self.file else 'no-file'})"
 
+
+def _service_record_work_order_id(instance):
+    if isinstance(instance, VehicleServiceRecord):
+        task = getattr(instance, 'task', None)
+        if task and getattr(task, 'work_order_id', None):
+            return task.work_order_id
+        if getattr(instance, 'task_id', None):
+            return VehicleServiceRecord.objects.filter(pk=instance.pk).values_list('task__work_order_id', flat=True).first()
+        return None
+
+    service_record = getattr(instance, 'service_record', None)
+    if service_record and getattr(service_record, 'task', None) and getattr(service_record.task, 'work_order_id', None):
+        return service_record.task.work_order_id
+
+    service_record_id = getattr(instance, 'service_record_id', None)
+    if not service_record_id:
+        return None
+    return VehicleServiceRecord.objects.filter(pk=service_record_id).values_list('task__work_order_id', flat=True).first()
+
+
+def _invalidate_service_records_pdf_cache(work_order_id):
+    if not work_order_id:
+        return
+
+    cached_pdfs = GeneratedWorkOrderPdf.objects.filter(
+        is_active=True,
+        work_order_id=work_order_id,
+        pdf_type='service_records',
+    )
+    for cached in cached_pdfs:
+        file_name = getattr(cached.file, 'name', '')
+        if file_name:
+            try:
+                if cached.file.storage.exists(file_name):
+                    cached.file.delete(save=False)
+            except (FileNotFoundError, OSError, ValueError):
+                pass
+        cached.file = None
+        cached.is_active = False
+        cached.status = 'failed'
+        cached.error_message = 'PDF cache invalidiran zbog promjene servisnih zapisa.'
+        cached.save(update_fields=['file', 'is_active', 'status', 'error_message', 'updated_at'])
+
+
+@receiver(post_save, sender='fleet.VehicleServiceRecord')
+@receiver(pre_delete, sender='fleet.VehicleServiceRecord')
+def _invalidate_service_records_pdf_for_service_record(sender, instance, **kwargs):
+    _invalidate_service_records_pdf_cache(_service_record_work_order_id(instance))
+
+
+@receiver(post_save, sender='fleet.VehicleServicePhoto')
+@receiver(pre_delete, sender='fleet.VehicleServicePhoto')
+def _invalidate_service_records_pdf_for_service_photo(sender, instance, **kwargs):
+    _invalidate_service_records_pdf_cache(_service_record_work_order_id(instance))
+
+
+@receiver(post_save, sender='fleet.VehicleServiceAttachment')
+@receiver(pre_delete, sender='fleet.VehicleServiceAttachment')
+def _invalidate_service_records_pdf_for_service_attachment(sender, instance, **kwargs):
+    _invalidate_service_records_pdf_cache(_service_record_work_order_id(instance))
+
 class Vehicle(BaseModel):
     ASSET_TYPE_CHOICES = [
         ('vehicle', _("Vozilo")),
@@ -406,6 +480,63 @@ class WorkOrderAdditionalCostsTable(BaseModel):
         return f"Additional costs table for work order {self.work_order_id}"
 
 
+class WorkOrderTravelExpensesTable(BaseModel):
+    RATE_CHOICES = [
+        ('HR', _("Hrvatska")),
+        ('BIH', _("BiH")),
+        ('SI', _("Slovenija")),
+        ('CG', _("Crna Gora")),
+    ]
+
+    DEFAULT_RATE_COUNTRY = 'HR'
+    DEFAULT_RATE_AMOUNT = Decimal('30.00')
+
+    work_order = models.OneToOneField(
+        WorkOrder,
+        on_delete=models.CASCADE,
+        related_name='travel_expenses_table',
+        verbose_name=_("Putni nalog"),
+    )
+    broj_sati = models.DecimalField(
+        max_digits=10,
+        decimal_places=2,
+        default=Decimal('0.00'),
+        verbose_name=_("Broj sati"),
+    )
+    kolicina_dnevnica = models.DecimalField(
+        max_digits=10,
+        decimal_places=2,
+        default=Decimal('0.00'),
+        verbose_name=_("Količina dnevnica"),
+    )
+    iznos_dnevnica = models.DecimalField(
+        max_digits=10,
+        decimal_places=2,
+        default=DEFAULT_RATE_AMOUNT,
+        verbose_name=_("Iznos dnevnice"),
+    )
+    daily_rate_country = models.CharField(
+        max_length=8,
+        choices=RATE_CHOICES,
+        default=DEFAULT_RATE_COUNTRY,
+        verbose_name=_("Država dnevnice"),
+    )
+    total_for_payout = models.DecimalField(
+        max_digits=12,
+        decimal_places=2,
+        default=Decimal('0.00'),
+        verbose_name=_("Ukupan iznos"),
+    )
+
+    class Meta:
+        ordering = ['-updated_at']
+        verbose_name = _("Tablica obračuna putnih troškova")
+        verbose_name_plural = _("Tablice obračuna putnih troškova")
+
+    def __str__(self):
+        return f"Travel expenses table for work order {self.work_order_id}"
+
+
 class WorkOrderPhoto(BaseModel):
     work_order = models.ForeignKey(
         WorkOrder,
@@ -479,6 +610,59 @@ class GeneratedWorkOrderPdf(BaseModel):
         return f"{self.pdf_type}:{self.work_order_id}:{self.status}"
 
 
+class GeneratedFleetArchive(BaseModel):
+    ARCHIVE_TYPE_CHOICES = [
+        ('service_tasks', _("Pojedinačni servisni taskovi")),
+        ('work_orders', _("Putni nalozi i računi")),
+    ]
+    STATUS_CHOICES = [
+        ('pending', _("U obradi")),
+        ('ready', _("Spremno")),
+        ('failed', _("Neuspješno")),
+    ]
+
+    requested_by = models.ForeignKey(
+        settings.AUTH_USER_MODEL,
+        null=True,
+        blank=True,
+        on_delete=models.SET_NULL,
+        related_name='requested_generated_fleet_archives',
+        verbose_name=_("Zatražio"),
+    )
+    archive_type = models.CharField(
+        max_length=32,
+        choices=ARCHIVE_TYPE_CHOICES,
+        db_index=True,
+        verbose_name=_("Tip ZIP arhive"),
+    )
+    year = models.PositiveSmallIntegerField(db_index=True, verbose_name=_("Godina"))
+    month = models.PositiveSmallIntegerField(db_index=True, verbose_name=_("Mjesec"))
+    status = models.CharField(
+        max_length=16,
+        choices=STATUS_CHOICES,
+        default='pending',
+        db_index=True,
+        verbose_name=_("Status"),
+    )
+    file = models.FileField(
+        upload_to=_generated_fleet_archive_upload_to,
+        null=True,
+        blank=True,
+        verbose_name=_("ZIP datoteka"),
+    )
+    filename = models.CharField(max_length=255, blank=True, verbose_name=_("Naziv datoteke"))
+    expires_at = models.DateTimeField(null=True, blank=True, db_index=True, verbose_name=_("Vrijedi do"))
+    error_message = models.TextField(blank=True, verbose_name=_("Poruka greške"))
+
+    class Meta:
+        verbose_name = _("Generirana ZIP arhiva")
+        verbose_name_plural = _("Generirane ZIP arhive")
+        ordering = ['-created_at']
+
+    def __str__(self):
+        return f"{self.archive_type}:{self.year}-{self.month:02d}:{self.status}"
+
+
 class VehicleServiceRecord(BaseModel):
     """
     Zapisi o servisima/popravcima na vozilu.
@@ -694,4 +878,106 @@ class ServiceContextNote(BaseModel):
             if self.task.work_order_id != self.work_order_id:
                 raise ValidationError({
                     'task': _("Radni zadatak mora biti povezan s istim putnim nalogom kao bilješka."),
-                })
+                })
+
+
+class MonthlyServicerDayEntry(BaseModel):
+    ENTRY_TYPE_CHOICES = [
+        ('office', _('Rad u uredu')),
+        ('sick_leave', _('Bolovanje')),
+        ('vacation', _('Godišnji odmor')),
+    ]
+
+    user = models.ForeignKey(
+        settings.AUTH_USER_MODEL,
+        on_delete=models.CASCADE,
+        related_name='monthly_servicer_day_entries',
+        verbose_name=_('Serviser'),
+    )
+    entry_date = models.DateField(db_index=True, verbose_name=_('Datum'))
+    entry_type = models.CharField(
+        max_length=24,
+        choices=ENTRY_TYPE_CHOICES,
+        verbose_name=_('Vrsta unosa'),
+    )
+    description = models.CharField(max_length=255, blank=True, verbose_name=_('Opis posla'))
+    location = models.CharField(max_length=255, blank=True, verbose_name=_('Mjesto rada'))
+    start_time = models.TimeField(null=True, blank=True, verbose_name=_('Početak rada'))
+    end_time = models.TimeField(null=True, blank=True, verbose_name=_('Kraj rada'))
+    regular_hours = models.DecimalField(
+        max_digits=5,
+        decimal_places=2,
+        default=Decimal('8.00'),
+        verbose_name=_('Redovan rad'),
+    )
+    overtime_hours = models.DecimalField(
+        max_digits=5,
+        decimal_places=2,
+        default=Decimal('0.00'),
+        verbose_name=_('Prekovremeni rad'),
+    )
+
+    class Meta:
+        verbose_name = _('Dnevni unos mjesečnog izvještaja servisera')
+        verbose_name_plural = _('Dnevni unosi mjesečnog izvještaja servisera')
+        ordering = ['entry_date']
+        constraints = [
+            models.UniqueConstraint(
+                fields=['user', 'entry_date', 'is_active'],
+                name='uniq_monthly_servicer_day_entry_user_date_active',
+            ),
+        ]
+
+    def __str__(self):
+        return f"{self.user_id} @ {self.entry_date} ({self.entry_type})"
+
+    def _calculate_regular_hours(self, start_time, end_time):
+        if start_time is None or end_time is None:
+            return Decimal('8.00')
+
+        start_minutes = (start_time.hour * 60) + start_time.minute + (start_time.second / 60)
+        end_minutes = (end_time.hour * 60) + end_time.minute + (end_time.second / 60)
+        if end_minutes <= start_minutes:
+            raise ValidationError({
+                'end_time': _('Kraj rada mora biti nakon početka rada.'),
+            })
+
+        hours = Decimal(str((end_minutes - start_minutes) / 60)).quantize(Decimal('0.01'))
+        return hours
+
+    def apply_defaults(self):
+        start_time = self.start_time
+        end_time = self.end_time
+
+        if self.entry_type == 'office':
+            if not self.description:
+                self.description = 'Rad u uredu'
+            if not self.location:
+                self.location = 'Zagreb (ured)'
+            if start_time is None:
+                start_time = time(8, 0)
+            if end_time is None:
+                end_time = time(16, 0)
+        elif self.entry_type == 'vacation':
+            if not self.description:
+                self.description = 'Godišnji odmor'
+            self.location = self.location or ''
+        elif self.entry_type == 'sick_leave':
+            if not self.description:
+                self.description = 'Bolovanje'
+            self.location = self.location or ''
+        else:
+            self.location = self.location or ''
+
+        self.start_time = start_time
+        self.end_time = end_time
+        self.regular_hours = self._calculate_regular_hours(start_time, end_time)
+        self.overtime_hours = Decimal('0.00')
+
+    def clean(self):
+        super().clean()
+        self.apply_defaults()
+
+    def save(self, *args, **kwargs):
+        self.full_clean()
+        return super().save(*args, **kwargs)

backend/modules/fleet/serializers.py

@@ -10,9 +10,11 @@ from .models import (
     Crane,
     Vehicle,
     ServiceContextNote,
+    MonthlyServicerDayEntry,
     VehicleNotification,
     WorkOrder,
     WorkOrderAdditionalCostsTable,
+    WorkOrderTravelExpensesTable,
     WorkOrderPhoto,
     WorkOrderInvoice,
     VehicleServiceRecord,
@@ -38,7 +40,7 @@ class VehicleSerializer(serializers.ModelSerializer):
             'is_company_vehicle', 'client', 'client_name',
             'assigned_servicer', 'is_active',
         ]
-        read_only_fields = ['id', 'current_mileage', 'client_name']
+        read_only_fields = ['id', 'client_name']
 
     def get_client_name(self, obj):
         if obj.client_id:
@@ -154,12 +156,12 @@ class ServiceContextNoteCreateSerializer(serializers.Serializer):
     note_date = serializers.DateField(required=False, allow_null=True)
     audience = serializers.ChoiceField(choices=AUDIENCE_CHOICES, default='self')
     target_user = serializers.PrimaryKeyRelatedField(
-        queryset=User.objects.filter(is_active=True),
+        queryset=User.objects.filter(is_active=True, is_team_member=True),
         required=False,
         allow_null=True,
     )
     target_users = serializers.ListField(
-        child=serializers.PrimaryKeyRelatedField(queryset=User.objects.filter(is_active=True)),
+        child=serializers.PrimaryKeyRelatedField(queryset=User.objects.filter(is_active=True, is_team_member=True)),
         required=False,
         allow_empty=False,
     )
@@ -202,12 +204,12 @@ class ServiceContextNoteCreateSerializer(serializers.Serializer):
         if audience in {'self', 'team'} and target_user:
             raise serializers.ValidationError({'target_user': 'Odabrani tip publike ne koristi ciljano polje člana tima.'})
         if audience in {'self', 'team'} and len(target_users) > 0:
-            raise serializers.ValidationError({'target_users': 'Odabrani tip publike ne koristi listu servisera.'})
+            raise serializers.ValidationError({'target_users': 'Odabrani tip publike ne koristi listu članova tima.'})
-        if target_user and not getattr(target_user, 'is_serviser', False):
+        if target_user and not getattr(target_user, 'is_team_member', False):
-            raise serializers.ValidationError({'target_user': 'Bilješku je moguće poslati samo serviseru.'})
+            raise serializers.ValidationError({'target_user': 'Bilješku je moguće poslati samo članu tima.'})
         for selected_user in target_users:
-            if not getattr(selected_user, 'is_serviser', False):
+            if not getattr(selected_user, 'is_team_member', False):
-                raise serializers.ValidationError({'target_users': 'Bilješku je moguće poslati samo serviserima.'})
+                raise serializers.ValidationError({'target_users': 'Bilješku je moguće poslati samo članovima tima.'})
 
         if work_order:
             if not work_order.is_active or str(work_order.status or '').lower() != 'open':
@@ -228,6 +230,33 @@ class ServiceContextNoteCreateSerializer(serializers.Serializer):
             attrs['target_users'] = [target_user]
         return attrs
 
+
+class MonthlyServicerDayEntrySerializer(serializers.ModelSerializer):
+    class Meta:
+        model = MonthlyServicerDayEntry
+        fields = [
+            'id',
+            'entry_date',
+            'entry_type',
+            'description',
+            'location',
+            'start_time',
+            'end_time',
+            'regular_hours',
+            'overtime_hours',
+            'created_at',
+            'updated_at',
+        ]
+        read_only_fields = [
+            'id',
+            'description',
+            'location',
+            'regular_hours',
+            'overtime_hours',
+            'created_at',
+            'updated_at',
+        ]
+
 class WorkOrderSerializer(serializers.ModelSerializer):
     crane = serializers.SerializerMethodField()
     crane_label = serializers.SerializerMethodField()
@@ -349,12 +378,14 @@ class WorkOrderSerializer(serializers.ModelSerializer):
 class WorkOrderInvoiceSerializer(serializers.ModelSerializer):
     image_url = serializers.SerializerMethodField()
     image_content_type = serializers.SerializerMethodField()
+    work_order_display_code = serializers.SerializerMethodField()
 
     class Meta:
         model = WorkOrderInvoice
         fields = [
             'id',
             'work_order',
+            'work_order_display_code',
             'naziv_racuna',
             'lokacija',
             'datum',
@@ -397,6 +428,15 @@ class WorkOrderInvoiceSerializer(serializers.ModelSerializer):
             return 'image/gif'
         return 'application/octet-stream'
 
+    def get_work_order_display_code(self, obj):
+        work_order = getattr(obj, 'work_order', None)
+        if work_order is None:
+            return None
+        display_code = str(getattr(work_order, 'display_code', '') or '').strip()
+        if display_code:
+            return display_code
+        return str(getattr(work_order, 'id', '') or '').strip() or None
+
     def validate_image(self, value):
         if not value:
             return value
@@ -462,6 +502,105 @@ class WorkOrderAdditionalCostsTableSerializer(serializers.ModelSerializer):
         return super().update(instance, validated_data)
 
 
+class WorkOrderTravelExpensesTableSerializer(serializers.ModelSerializer):
+    RATE_DEFAULTS = {
+        'HR': Decimal('30.00'),
+        'BIH': Decimal('50.00'),
+        'SI': Decimal('80.00'),
+        'CG': Decimal('50.00'),
+    }
+
+    class Meta:
+        model = WorkOrderTravelExpensesTable
+        fields = [
+            'id',
+            'work_order',
+            'broj_sati',
+            'kolicina_dnevnica',
+            'iznos_dnevnica',
+            'daily_rate_country',
+            'total_for_payout',
+            'created_at',
+            'updated_at',
+        ]
+        read_only_fields = ['id', 'total_for_payout', 'created_at', 'updated_at']
+
+    @staticmethod
+    def _parse_decimal(value):
+        if value in (None, ''):
+            return None
+        try:
+            normalized = str(value).strip().replace('€', '').replace(' ', '').replace(',', '.')
+            return Decimal(normalized)
+        except (InvalidOperation, ValueError, TypeError):
+            raise serializers.ValidationError('Neispravna decimalna vrijednost.')
+
+    def validate_daily_rate_country(self, value):
+        normalized = str(value or '').strip().upper()
+        if not normalized:
+            return WorkOrderTravelExpensesTable.DEFAULT_RATE_COUNTRY
+        valid_choices = {choice for choice, _label in WorkOrderTravelExpensesTable.RATE_CHOICES}
+        if normalized not in valid_choices:
+            raise serializers.ValidationError('Neispravna država dnevnice.')
+        return normalized
+
+    def validate(self, attrs):
+        instance = getattr(self, 'instance', None)
+        country = attrs.get(
+            'daily_rate_country',
+            getattr(instance, 'daily_rate_country', WorkOrderTravelExpensesTable.DEFAULT_RATE_COUNTRY),
+        )
+
+        if 'iznos_dnevnica' not in attrs or attrs.get('iznos_dnevnica') in (None, ''):
+            attrs['iznos_dnevnica'] = self.RATE_DEFAULTS.get(
+                country,
+                WorkOrderTravelExpensesTable.DEFAULT_RATE_AMOUNT,
+            )
+
+        if 'broj_sati' in attrs:
+            attrs['broj_sati'] = self._parse_decimal(attrs['broj_sati'])
+        if 'kolicina_dnevnica' in attrs:
+            attrs['kolicina_dnevnica'] = self._parse_decimal(attrs['kolicina_dnevnica'])
+        if 'iznos_dnevnica' in attrs:
+            attrs['iznos_dnevnica'] = self._parse_decimal(attrs['iznos_dnevnica'])
+
+        attrs['broj_sati'] = attrs.get(
+            'broj_sati',
+            getattr(instance, 'broj_sati', Decimal('0.00')),
+        ) or Decimal('0.00')
+        attrs['kolicina_dnevnica'] = attrs.get(
+            'kolicina_dnevnica',
+            getattr(instance, 'kolicina_dnevnica', Decimal('0.00')),
+        ) or Decimal('0.00')
+        attrs['iznos_dnevnica'] = attrs.get(
+            'iznos_dnevnica',
+            getattr(instance, 'iznos_dnevnica', self.RATE_DEFAULTS.get(country, WorkOrderTravelExpensesTable.DEFAULT_RATE_AMOUNT)),
+        ) or self.RATE_DEFAULTS.get(country, WorkOrderTravelExpensesTable.DEFAULT_RATE_AMOUNT)
+        attrs['daily_rate_country'] = country
+        return attrs
+
+    def _calculate_total_for_payout(self, validated_data):
+        quantity = validated_data.get('kolicina_dnevnica', Decimal('0.00'))
+        rate = validated_data.get('iznos_dnevnica', Decimal('0.00'))
+        if not isinstance(quantity, Decimal):
+            quantity = self._parse_decimal(quantity) or Decimal('0.00')
+        if not isinstance(rate, Decimal):
+            rate = self._parse_decimal(rate) or Decimal('0.00')
+        return (quantity * rate).quantize(Decimal('0.01'))
+
+    def create(self, validated_data):
+        validated_data['total_for_payout'] = self._calculate_total_for_payout(validated_data)
+        return super().create(validated_data)
+
+    def update(self, instance, validated_data):
+        merged = {
+            'kolicina_dnevnica': validated_data.get('kolicina_dnevnica', instance.kolicina_dnevnica),
+            'iznos_dnevnica': validated_data.get('iznos_dnevnica', instance.iznos_dnevnica),
+        }
+        validated_data['total_for_payout'] = self._calculate_total_for_payout(merged)
+        return super().update(instance, validated_data)
+
+
 class WorkOrderPhotoSerializer(serializers.ModelSerializer):
     class Meta:
         model = WorkOrderPhoto

backend/modules/fleet/tasks.py

@@ -5,6 +5,7 @@ from django.core.mail import EmailMessage
 from django.conf import settings
 from django.utils import timezone
 from django.core.files.base import ContentFile
+from django.core.files import File
 import logging
 from io import BytesIO
 from io import StringIO
@@ -13,6 +14,9 @@ import base64
 import re
 import csv
 import mimetypes
+import os
+import tempfile
+import zipfile
 from decimal import Decimal, InvalidOperation
 from smtplib import SMTPSenderRefused
 from datetime import timedelta
@@ -27,7 +31,7 @@ from pytesseract import TesseractNotFoundError
 from reportlab.lib.pagesizes import A4
 from reportlab.lib.utils import ImageReader
 from reportlab.pdfgen import canvas
-from .models import VehicleNotification, GeneratedWorkOrderPdf
+from .models import VehicleNotification, GeneratedWorkOrderPdf, GeneratedFleetArchive
 from .pdf_layout import register_unicode_fonts, draw_standard_header_footer
 from .email_utils import append_user_signature
 
@@ -835,6 +839,114 @@ def process_work_order_invoice_ocr(invoice_id):
     return {"status": "ok", "invoice_id": str(invoice.pk)}
 
 
+@shared_task
+def build_monthly_archive_cached_task(generated_archive_id):
+    from .models import GeneratedFleetArchive
+    from .views import (
+        _write_monthly_service_tasks_archive_entries,
+        _write_monthly_work_orders_archive_entries,
+        _notify_monthly_archive_request,
+    )
+
+    generated = (
+        GeneratedFleetArchive.objects
+        .select_related('requested_by')
+        .filter(pk=generated_archive_id, is_active=True)
+        .first()
+    )
+    if generated is None:
+        return {"status": "failed", "error": "Generated archive record not found"}
+
+    tmp_dir = str(getattr(settings, 'APP_TMP_CLEANUP_DIR', '/tmp'))
+    with tempfile.NamedTemporaryFile(
+        mode='w+b',
+        delete=False,
+        dir=tmp_dir if os.path.isdir(tmp_dir) else None,
+        prefix='erp-fleet-archive-',
+        suffix='.zip',
+    ) as temp_zip:
+        temp_zip_path = temp_zip.name
+    try:
+        with zipfile.ZipFile(temp_zip_path, mode='w', compression=zipfile.ZIP_DEFLATED) as archive:
+            if generated.archive_type == 'service_tasks':
+                entries_written = _write_monthly_service_tasks_archive_entries(
+                    archive,
+                    user=generated.requested_by,
+                    year=generated.year,
+                    month=generated.month,
+                )
+            else:
+                entries_written = _write_monthly_work_orders_archive_entries(
+                    archive,
+                    user=generated.requested_by,
+                    year=generated.year,
+                    month=generated.month,
+                )
+        if entries_written == 0:
+            raise ValueError('ZIP arhiva je prazna.')
+
+        if os.path.getsize(temp_zip_path) <= 0:
+            raise ValueError('ZIP arhiva je prazna.')
+        filename = generated.filename or f"{generated.archive_type}-{generated.year}-{generated.month}.zip"
+        with open(temp_zip_path, 'rb') as temp_file:
+            generated.file.save(filename, File(temp_file), save=False)
+        generated.status = 'ready'
+        generated.error_message = ''
+        generated.save(update_fields=['file', 'status', 'error_message', 'updated_at'])
+
+        if generated.requested_by:
+            _notify_monthly_archive_request(
+                user=generated.requested_by,
+                archive_type=generated.archive_type,
+                stage='completed',
+                year=generated.year,
+                month=generated.month,
+                generated_archive=generated,
+            )
+        return {"status": "ready", "generated_archive_id": str(generated.pk)}
+    except Exception as exc:
+        generated.status = 'failed'
+        generated.error_message = str(exc)
+        generated.save(update_fields=['status', 'error_message', 'updated_at'])
+        if generated.requested_by:
+            _notify_monthly_archive_request(
+                user=generated.requested_by,
+                archive_type=generated.archive_type,
+                stage='failed',
+                year=generated.year,
+                month=generated.month,
+                generated_archive=generated,
+            )
+        logger.exception("Greška kod build_monthly_archive_cached_task: %s", exc)
+        return {"status": "failed", "error": str(exc)}
+    finally:
+        try:
+            if os.path.exists(temp_zip_path):
+                os.remove(temp_zip_path)
+        except OSError:
+            logger.warning("Ne mogu obrisati privremenu ZIP datoteku: %s", temp_zip_path)
+
+
+@shared_task
+def cleanup_expired_generated_archives_task():
+    now = timezone.now()
+    expired = GeneratedFleetArchive.objects.filter(
+        is_active=True,
+        expires_at__isnull=False,
+        expires_at__lte=now,
+    )
+    deleted = 0
+    for item in expired:
+        if item.file:
+            item.file.delete(save=False)
+        item.is_active = False
+        item.status = 'failed'
+        item.error_message = 'ZIP arhiva je istekla.'
+        item.save(update_fields=['is_active', 'status', 'error_message', 'updated_at'])
+        deleted += 1
+    return {"deleted": deleted}
+
+
 @shared_task
 def cleanup_expired_generated_pdfs_task():
     now = timezone.now()
@@ -855,6 +967,46 @@ def cleanup_expired_generated_pdfs_task():
     return {"deleted": deleted}
 
 
+@shared_task
+def cleanup_tmp_files_task():
+    tmp_dir = str(getattr(settings, 'APP_TMP_CLEANUP_DIR', '/tmp'))
+    max_age_hours = int(getattr(settings, 'APP_TMP_CLEANUP_MAX_AGE_HOURS', 24))
+    prefixes = tuple(getattr(settings, 'APP_TMP_CLEANUP_PREFIXES', ['erp-fleet-archive-']))
+
+    if max_age_hours <= 0:
+        raise ValueError('APP_TMP_CLEANUP_MAX_AGE_HOURS mora biti > 0.')
+    if not prefixes:
+        raise ValueError('APP_TMP_CLEANUP_PREFIXES ne smije biti prazan.')
+    if not os.path.isdir(tmp_dir):
+        return {'deleted': 0, 'tmp_dir': tmp_dir, 'reason': 'tmp-dir-not-found'}
+
+    now = timezone.now().timestamp()
+    cutoff = now - (max_age_hours * 3600)
+    deleted = 0
+
+    for name in os.listdir(tmp_dir):
+        if not any(name.startswith(prefix) for prefix in prefixes):
+            continue
+        full_path = os.path.join(tmp_dir, name)
+        try:
+            stat_info = os.stat(full_path)
+        except FileNotFoundError:
+            continue
+        if stat_info.st_mtime > cutoff:
+            continue
+        if os.path.isdir(full_path):
+            try:
+                os.rmdir(full_path)
+            except OSError:
+                logger.warning("Preskačem %s: direktorij nije prazan ili je nedostupan.", full_path)
+                continue
+        else:
+            os.remove(full_path)
+        deleted += 1
+
+    return {'deleted': deleted, 'tmp_dir': tmp_dir, 'max_age_hours': max_age_hours}
+
+
 @shared_task
 def build_work_order_pdf_cached_task(generated_pdf_id):
     from .views import _build_work_order_pdf, _build_work_order_service_records_pdf

backend/modules/fleet/tests/test_service_context_notes.py

@@ -41,6 +41,13 @@ class ServiceContextNotesApiTests(TestCase):
             is_team_member=True,
             is_serviser=True,
         )
+        self.team_member_non_servicer = user_model.objects.create_user(
+            username=f'team-{suffix}',
+            email=f'team-{suffix}@example.test',
+            password='test1234',
+            is_team_member=True,
+            is_serviser=False,
+        )
 
         self.vehicle = Vehicle.objects.create(
             asset_type='crane',
@@ -132,3 +139,31 @@ class ServiceContextNotesApiTests(TestCase):
         )
         self.assertEqual(response.status_code, 201, response.content)
         self.assertEqual(int(response.data.get('created_count', 0)), 2)
+
+    def test_supervisor_can_create_member_note_for_non_servicer_team_member(self):
+        self.client.force_authenticate(user=self.supervisor)
+        response = self.client.post(
+            reverse('service-context-note-list'),
+            data={
+                'note': 'Bilješka za team člana koji nije serviser.',
+                'audience': 'member',
+                'target_users': [str(self.team_member_non_servicer.id)],
+            },
+            format='json',
+        )
+        self.assertEqual(response.status_code, 201, response.content)
+        self.assertEqual(int(response.data.get('created_count', 0)), 1)
+
+    def test_member_note_rejects_non_team_member_target(self):
+        self.client.force_authenticate(user=self.supervisor)
+        response = self.client.post(
+            reverse('service-context-note-list'),
+            data={
+                'note': 'Bilješka ne-smije ići van tima.',
+                'audience': 'member',
+                'target_users': [str(self.other.id)],
+            },
+            format='json',
+        )
+        self.assertEqual(response.status_code, 400, response.content)
+        self.assertIn('target_users', response.data)

backend/modules/fleet/tests/test_work_order_images_endpoint.py

@@ -1,4 +1,5 @@
 from django.contrib.auth import get_user_model
+from django.core.files.base import ContentFile
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.test import TestCase
 from django.urls import reverse
@@ -6,10 +7,31 @@ from django.utils import timezone
 from rest_framework.test import APIClient
 import uuid
 from io import BytesIO
-from datetime import timedelta
+from datetime import date, timedelta
+import zipfile
+from unittest.mock import patch
 from PIL import Image
+from pypdf import PdfReader
+from kombu.exceptions import OperationalError as KombuOperationalError
 
-from modules.fleet.models import Vehicle, WorkOrder, WorkOrderInvoice, VehicleServiceRecord, VehicleServicePhoto, GeneratedWorkOrderPdf
+from modules.fleet.models import (
+    Vehicle,
+    WorkOrder,
+    WorkOrderInvoice,
+    VehicleServiceRecord,
+    VehicleServicePhoto,
+    GeneratedWorkOrderPdf,
+    GeneratedFleetArchive,
+    VehicleNotification,
+)
+from modules.task_management.models import Task, TaskWorkHoursTable
+from modules.fleet.tasks import build_monthly_archive_cached_task
+from modules.fleet.views import (
+    _build_monthly_servicer_report_rows,
+    _calculate_daily_quantity_from_hours,
+    _compress_image_for_docx,
+    _work_order_related_tasks_queryset,
+)
 
 
 def create_test_image(filename='test.jpg', size=(40, 40), color='red'):
@@ -48,16 +70,32 @@ class WorkOrderImagesEndpointTests(TestCase):
         self.vehicle = Vehicle.objects.create(
             asset_type='crane',
             registration_number='WO-IMG-001',
+            make='Liebherr',
+            model='LTM 1090',
             crane_serial_number='123456',
+            superstructure_working_hours=111,
+            chassis_working_hours=222,
+            current_mileage=33344,
         )
         self.work_order = WorkOrder.objects.create(
             vehicle=self.vehicle,
             creator=self.user,
+            display_code='MT150726',
             purpose='kontrola',
+            notes='Napomena iz putnog naloga',
+        )
+        self.task = Task.objects.create(
+            title='Test servisni zadatak',
+            assigned_to=self.user,
+            vehicle=self.vehicle,
+            work_order=self.work_order,
+            scheduled_date=date(2033, 12, 24),
+            service_report_note='Napomena iz taska',
         )
 
         self.service_record = VehicleServiceRecord.objects.create(
             vehicle=self.vehicle,
+            task=self.task,
             performed_by=self.user,
             description='Servisni zapis za test izolacije fotografija.',
             service_title='Test servis',
@@ -203,6 +241,58 @@ class WorkOrderImagesEndpointTests(TestCase):
         self.assertIn('additional_costs_table', payload)
         self.assertEqual(payload['additional_costs_table']['total_for_payout'], '5.00')
 
+    def test_compress_image_for_docx_keeps_standard_phone_photos(self):
+        file = BytesIO()
+        Image.new('RGB', (4000, 3000), color='blue').save(file, format='JPEG', quality=85)
+        file.seek(0)
+        uploaded = SimpleUploadedFile('phone-12mp.jpg', file.getvalue(), content_type='image/jpeg')
+
+        result = _compress_image_for_docx(uploaded)
+
+        self.assertIsNotNone(result)
+        self.assertGreater(len(result.getvalue()), 0)
+
+    def test_compress_image_for_docx_handles_exif_orientation(self):
+        exif = Image.Exif()
+        exif[0x0112] = 6
+
+        file = BytesIO()
+        Image.new('RGB', (3000, 2000), color='green').save(file, format='JPEG', quality=85, exif=exif.tobytes())
+        file.seek(0)
+        uploaded = SimpleUploadedFile('rotated-phone.jpg', file.getvalue(), content_type='image/jpeg')
+
+        result = _compress_image_for_docx(uploaded)
+
+        self.assertIsNotNone(result)
+        self.assertGreater(len(result.getvalue()), 0)
+
+    def test_work_order_related_tasks_queryset_excludes_other_work_orders_for_same_vehicle(self):
+        other_work_order = WorkOrder.objects.create(
+            vehicle=self.vehicle,
+            creator=self.user,
+            display_code='MT160726',
+            purpose='kontrola',
+        )
+        other_task = Task.objects.create(
+            title='Drugi nalog isti stroj',
+            assigned_to=self.user,
+            vehicle=self.vehicle,
+            work_order=other_work_order,
+            scheduled_date=date(2033, 12, 25),
+        )
+        VehicleServiceRecord.objects.create(
+            vehicle=self.vehicle,
+            task=other_task,
+            performed_by=self.user,
+            description='Ne smije se pojaviti u prvom nalogu.',
+            service_title='Krivi nalog',
+        )
+
+        resolved_ids = list(_work_order_related_tasks_queryset(self.work_order).values_list('id', flat=True))
+
+        self.assertIn(self.task.pk, resolved_ids)
+        self.assertNotIn(other_task.pk, resolved_ids)
+
     def test_invoice_upload_immediately_appears_in_additional_costs_table(self):
         create_response = self.client.post(
             reverse('work-order-invoice-list'),
@@ -240,3 +330,566 @@ class WorkOrderImagesEndpointTests(TestCase):
         cached.refresh_from_db()
         self.assertFalse(cached.is_active)
         self.assertEqual(cached.status, 'failed')
+
+    def test_travel_expenses_update_invalidates_work_order_pdf_cache(self):
+        cached = GeneratedWorkOrderPdf.objects.create(
+            work_order=self.work_order,
+            requested_by=self.user,
+            pdf_type='work_order',
+            status='ready',
+            filename='MT150726.work-order.pdf',
+            expires_at=timezone.now() + timedelta(hours=1),
+        )
+        response = self.client.put(
+            f"/api/fleet/work-orders/{self.work_order.pk}/travel-expenses-table/",
+            data={
+                'broj_sati': '9.5',
+                'kolicina_dnevnica': '0.5',
+                'iznos_dnevnica': '30',
+                'daily_rate_country': 'HR',
+            },
+            format='json',
+        )
+        self.assertEqual(response.status_code, 200, response.content)
+        cached.refresh_from_db()
+        self.assertFalse(cached.is_active)
+        self.assertEqual(cached.status, 'failed')
+
+    def test_service_record_delete_invalidates_service_records_pdf_cache(self):
+        cached = GeneratedWorkOrderPdf.objects.create(
+            work_order=self.work_order,
+            requested_by=self.user,
+            pdf_type='service_records',
+            status='ready',
+            filename='MT150726.work-order-service-records.pdf',
+            expires_at=timezone.now() + timedelta(hours=1),
+        )
+        cached.file.save(
+            'MT150726.work-order-service-records.pdf',
+            ContentFile(b'%PDF-1.4 cached service records'),
+            save=True,
+        )
+
+        VehicleServiceRecord.objects.filter(pk=self.service_record.pk).delete()
+
+        cached.refresh_from_db()
+        self.assertFalse(cached.is_active)
+        self.assertEqual(cached.status, 'failed')
+        self.assertFalse(cached.file.name)
+
+    def test_service_records_pdf_rebuilds_when_cached_file_is_missing(self):
+        cached = GeneratedWorkOrderPdf.objects.create(
+            work_order=self.work_order,
+            requested_by=self.user,
+            pdf_type='service_records',
+            status='ready',
+            filename='MT150726.work-order-service-records.pdf',
+            expires_at=timezone.now() + timedelta(hours=1),
+        )
+        cached.file.save(
+            'MT150726.work-order-service-records.pdf',
+            ContentFile(b'%PDF-1.4 cached service records'),
+            save=True,
+        )
+        cached.file.storage.delete(cached.file.name)
+
+        response = self.client.get(f"/api/fleet/work-orders/{self.work_order.pk}/service-records-pdf/")
+        self.assertEqual(response.status_code, 200, response.content)
+        self.assertEqual(response['Content-Type'], 'application/pdf')
+
+        cached.refresh_from_db()
+        self.assertFalse(cached.is_active)
+        self.assertEqual(cached.status, 'failed')
+
+    def test_service_records_docx_contains_embedded_service_photos(self):
+        VehicleServicePhoto.objects.create(
+            service_record=self.service_record,
+            image=create_test_image('service-record-docx.jpg', size=(320, 200), color='blue'),
+            description='DOCX photo',
+            uploaded_by=self.user,
+        )
+
+        response = self.client.get(f"/api/fleet/work-orders/{self.work_order.pk}/service-records-docx/")
+        self.assertEqual(response.status_code, 200, response.content)
+        self.assertEqual(
+            response['Content-Type'],
+            'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+        )
+
+        archive = zipfile.ZipFile(BytesIO(response.content))
+        media_files = [name for name in archive.namelist() if name.startswith('word/media/')]
+        self.assertTrue(media_files, archive.namelist())
+        settings_xml = archive.read('word/settings.xml').decode('utf-8')
+        self.assertNotIn('documentProtection', settings_xml)
+        self.assertNotIn('writeProtection', settings_xml)
+
+    def test_task_specific_service_records_docx_uses_task_note_and_scheduled_date(self):
+        response = self.client.get(
+            f"/api/fleet/work-orders/{self.work_order.pk}/service-records-docx/?task_id={self.task.pk}"
+        )
+        self.assertEqual(response.status_code, 200, response.content)
+        content_disposition = response.get('Content-Disposition', '')
+        self.assertIn('MT150726.SN-Test_servisni_zadatak.docx', content_disposition)
+
+        archive = zipfile.ZipFile(BytesIO(response.content))
+        document_xml = archive.read('word/document.xml').decode('utf-8')
+        self.assertIn('Napomena iz taska', document_xml)
+        self.assertNotIn('Napomena iz putnog naloga', document_xml)
+        self.assertIn('24.12.2033', document_xml)
+        self.assertEqual(document_xml.count('w:type="page"'), 1)
+
+    def test_task_specific_service_records_docx_uses_dynamic_docx_header_values(self):
+        response = self.client.get(
+            f"/api/fleet/work-orders/{self.work_order.pk}/service-records-docx/?task_id={self.task.pk}"
+        )
+        self.assertEqual(response.status_code, 200, response.content)
+
+        archive = zipfile.ZipFile(BytesIO(response.content))
+        header_xml = archive.read('word/header1.xml').decode('utf-8')
+        self.assertIn('Liebherr LTM 1090', header_xml)
+        self.assertIn('123456', header_xml)
+        self.assertIn('111', header_xml)
+        self.assertIn('222', header_xml)
+        self.assertIn('33344', header_xml)
+        self.assertIn('MT150726', header_xml)
+        self.assertNotIn('MT250226', header_xml)
+        self.assertNotIn('LTM-1350', header_xml)
+
+    def test_task_specific_service_records_pdf_uses_task_header_values(self):
+        vehicle_two = Vehicle.objects.create(
+            asset_type='crane',
+            registration_number='WO-IMG-003',
+            make='Tadano',
+            model='ATF 120',
+            crane_serial_number='SN-456',
+            superstructure_working_hours=777,
+            chassis_working_hours=888,
+            current_mileage=99911,
+        )
+        work_order_two = WorkOrder.objects.create(
+            vehicle=vehicle_two,
+            creator=self.user,
+            display_code='MT170726',
+            purpose='kontrola',
+        )
+        task_two = Task.objects.create(
+            title='PDF kontekst task',
+            assigned_to=self.user,
+            vehicle=vehicle_two,
+            work_order=work_order_two,
+            scheduled_date=date(2033, 12, 27),
+        )
+
+        response = self.client.get(
+            f"/api/fleet/work-orders/{work_order_two.pk}/service-records-pdf/?task_id={task_two.pk}"
+        )
+        self.assertEqual(response.status_code, 200, response.content)
+        self.assertEqual(response['Content-Type'], 'application/pdf')
+
+        reader = PdfReader(BytesIO(response.content))
+        text = "\n".join((page.extract_text() or '') for page in reader.pages)
+        self.assertIn('Tadano', text)
+        self.assertIn('ATF 120', text)
+        self.assertIn('SN-456', text)
+        self.assertIn('777', text)
+        self.assertIn('888', text)
+        self.assertIn('99911', text)
+        self.assertIn('MT170726', text)
+        self.assertNotIn('MT150726', text)
+
+    def test_monthly_service_tasks_archive_returns_zip_with_task_docx(self):
+        response = self.client.get('/api/fleet/reports/monthly-service-tasks-archive/?year=2033&month=12')
+        self.assertEqual(response.status_code, 200, response.content)
+        self.assertEqual(response['Content-Type'], 'application/zip')
+
+        archive = zipfile.ZipFile(BytesIO(response.content))
+        names = archive.namelist()
+        self.assertIn('MT150726.SN-Test_servisni_zadatak.docx', names)
+
+    def test_monthly_service_tasks_archive_docx_uses_dynamic_header_values(self):
+        response = self.client.get('/api/fleet/reports/monthly-service-tasks-archive/?year=2033&month=12')
+        self.assertEqual(response.status_code, 200, response.content)
+
+        archive = zipfile.ZipFile(BytesIO(response.content))
+        docx_name = 'MT150726.SN-Test_servisni_zadatak.docx'
+        self.assertIn(docx_name, archive.namelist())
+
+        docx_bytes = archive.read(docx_name)
+        docx_archive = zipfile.ZipFile(BytesIO(docx_bytes))
+        header_xml = docx_archive.read('word/header1.xml').decode('utf-8', errors='ignore')
+        self.assertIn('Liebherr LTM 1090', header_xml)
+        self.assertIn('123456', header_xml)
+        self.assertIn('111', header_xml)
+        self.assertIn('222', header_xml)
+        self.assertIn('33344', header_xml)
+        self.assertIn('MT150726', header_xml)
+        self.assertNotIn('MT250226', header_xml)
+        self.assertNotIn('LTM-1350', header_xml)
+
+    def test_monthly_service_tasks_archive_uses_task_specific_headers_for_each_docx(self):
+        vehicle_two = Vehicle.objects.create(
+            asset_type='crane',
+            registration_number='WO-IMG-002',
+            make='Tadano',
+            model='ATF 90',
+            crane_serial_number='SN-999',
+            superstructure_working_hours=444,
+            chassis_working_hours=555,
+            current_mileage=66677,
+        )
+        work_order_two = WorkOrder.objects.create(
+            vehicle=vehicle_two,
+            creator=self.user,
+            display_code='MT160726',
+            purpose='kontrola',
+        )
+        Task.objects.create(
+            title='Drugi zadatak',
+            assigned_to=self.user,
+            vehicle=vehicle_two,
+            work_order=work_order_two,
+            scheduled_date=date(2033, 12, 26),
+            service_report_note='Napomena drugog taska',
+        )
+
+        response = self.client.get('/api/fleet/reports/monthly-service-tasks-archive/?year=2033&month=12')
+        self.assertEqual(response.status_code, 200, response.content)
+
+        archive = zipfile.ZipFile(BytesIO(response.content))
+        first_docx = 'MT150726.SN-Test_servisni_zadatak.docx'
+        second_docx = 'MT160726.SN-Drugi_zadatak.docx'
+        self.assertIn(first_docx, archive.namelist())
+        self.assertIn(second_docx, archive.namelist())
+
+        first_header = zipfile.ZipFile(BytesIO(archive.read(first_docx))).read('word/header1.xml').decode('utf-8', errors='ignore')
+        second_header = zipfile.ZipFile(BytesIO(archive.read(second_docx))).read('word/header1.xml').decode('utf-8', errors='ignore')
+
+        self.assertIn('Liebherr LTM 1090', first_header)
+        self.assertIn('MT150726', first_header)
+        self.assertNotIn('Tadano ATF 90', first_header)
+        self.assertNotIn('MT160726', first_header)
+
+        self.assertIn('Tadano ATF 90', second_header)
+        self.assertIn('SN-999', second_header)
+        self.assertIn('444', second_header)
+        self.assertIn('555', second_header)
+        self.assertIn('66677', second_header)
+        self.assertIn('MT160726', second_header)
+        self.assertNotIn('Liebherr LTM 1090', second_header)
+        self.assertNotIn('MT150726', second_header)
+
+    def test_monthly_work_orders_archive_contains_work_orders_and_invoices_folder(self):
+        WorkOrderInvoice.objects.create(
+            work_order=self.work_order,
+            naziv_racuna='Prosinac račun',
+            datum='2033-12-10',
+            image=create_test_pdf('racun-prosinac.pdf'),
+            created_by=self.user,
+        )
+        response = self.client.get('/api/fleet/reports/monthly-work-orders-archive/?year=2033&month=12')
+        self.assertEqual(response.status_code, 200, response.content)
+        self.assertEqual(response['Content-Type'], 'application/zip')
+
+        archive = zipfile.ZipFile(BytesIO(response.content))
+        names = archive.namelist()
+        self.assertIn('MT150726.work-order.pdf', names)
+        self.assertTrue(any(name.startswith('Racuni/MT150726/') for name in names), names)
+
+    def test_work_order_pdf_travel_expense_uses_task_work_hours_table(self):
+        TaskWorkHoursTable.objects.create(
+            task=self.task,
+            data={
+                'rows': [
+                    {
+                        'date': '24.12.2033',
+                        'work_time_from': '08:00',
+                        'work_time_to': '16:00',
+                        'travel_hours': '1',
+                        'work_hours': '6',
+                    },
+                    {
+                        'date': '25.12.2033',
+                        'work_time_from': '09:00',
+                        'work_time_to': '15:00',
+                        'travel_hours': '0,5',
+                        'work_hours': '2',
+                    },
+                ]
+            },
+        )
+
+        save_response = self.client.put(
+            f'/api/fleet/work-orders/{self.work_order.pk}/travel-expenses-table/',
+            data={
+                'broj_sati': '9.5',
+                'kolicina_dnevnica': '0.5',
+                'iznos_dnevnica': '80',
+                'daily_rate_country': 'SI',
+            },
+            format='json',
+        )
+        self.assertEqual(save_response.status_code, 200, save_response.content)
+        self.assertEqual(save_response.data['total_for_payout'], '40.00')
+
+        response = self.client.get(f'/api/fleet/work-orders/{self.work_order.pk}/pdf/')
+        self.assertEqual(response.status_code, 200, response.content)
+        self.assertEqual(response['Content-Type'], 'application/pdf')
+
+        reader = PdfReader(BytesIO(response.content))
+        text = '\n'.join((page.extract_text() or '') for page in reader.pages)
+        self.assertIn('24.12.2033.', text)
+        self.assertIn('25.12.2033.', text)
+        self.assertIn('9,5', text)
+        self.assertIn('0,5', text)
+        self.assertIn('80.00 €', text)
+        self.assertIn('40.00 €', text)
+
+    def test_work_order_travel_expenses_table_defaults_to_hr_rate_and_calculates_total(self):
+        TaskWorkHoursTable.objects.create(
+            task=self.task,
+            data={
+                'rows': [
+                    {
+                        'date': '24.12.2033',
+                        'work_time_from': '08:00',
+                        'work_time_to': '16:00',
+                        'travel_hours': '1',
+                        'work_hours': '6',
+                    },
+                    {
+                        'date': '25.12.2033',
+                        'work_time_from': '09:00',
+                        'work_time_to': '15:00',
+                        'travel_hours': '0,5',
+                        'work_hours': '2',
+                    },
+                ]
+            },
+        )
+
+        response = self.client.get(f'/api/fleet/work-orders/{self.work_order.pk}/travel-expenses-table/')
+        self.assertEqual(response.status_code, 200, response.content)
+        self.assertEqual(response.data['broj_sati'], '9.50')
+        self.assertEqual(response.data['kolicina_dnevnica'], '0.50')
+        self.assertEqual(response.data['daily_rate_country'], 'HR')
+        self.assertEqual(response.data['iznos_dnevnica'], '30.00')
+        self.assertEqual(response.data['total_for_payout'], '15.00')
+
+    def test_calculate_daily_quantity_from_hours_follows_business_rules(self):
+        self.assertEqual(_calculate_daily_quantity_from_hours(0), 0.0)
+        self.assertEqual(_calculate_daily_quantity_from_hours(7), 0.0)
+        self.assertEqual(_calculate_daily_quantity_from_hours(8), 0.5)
+        self.assertEqual(_calculate_daily_quantity_from_hours(10.5), 0.5)
+        self.assertEqual(_calculate_daily_quantity_from_hours(12), 1.0)
+        self.assertEqual(_calculate_daily_quantity_from_hours(13.5), 1.0)
+
+    def test_monthly_servicer_report_rows_use_task_work_hours_table_hours(self):
+        TaskWorkHoursTable.objects.create(
+            task=self.task,
+            data={
+                'rows': [
+                    {
+                        'date': '24.12.2033',
+                        'work_time_from': '08:00',
+                        'work_time_to': '16:00',
+                        'travel_hours': '2',
+                        'work_hours': '6',
+                    },
+                    {
+                        'date': '25.12.2033',
+                        'work_time_from': '09:00',
+                        'work_time_to': '15:00',
+                        'travel_hours': '1,5',
+                        'work_hours': '4',
+                    },
+                ]
+            },
+        )
+
+        rows = _build_monthly_servicer_report_rows(self.user, 2033, 12)
+        row_by_date = {row['date']: row for row in rows if row['source'] == 'task'}
+        self.assertIn(date(2033, 12, 24), row_by_date)
+        self.assertIn(date(2033, 12, 25), row_by_date)
+        self.assertEqual(row_by_date[date(2033, 12, 24)]['redovan_rad'], '8')
+        self.assertEqual(row_by_date[date(2033, 12, 24)]['prekovremeni'], '8')
+        self.assertEqual(row_by_date[date(2033, 12, 25)]['redovan_rad'], '8')
+        self.assertEqual(row_by_date[date(2033, 12, 25)]['prekovremeni'], '5.5')
+
+
+    def test_monthly_service_tasks_archive_request_creates_ready_download_with_notification(self):
+        response = self.client.post(
+            '/api/fleet/reports/monthly-service-tasks-archive-request/',
+            data={'year': 2033, 'month': 12},
+            format='json',
+        )
+        self.assertIn(response.status_code, [200, 202], response.content)
+        payload = response.json()
+        self.assertIn('generated_archive_id', payload)
+
+        generated = GeneratedFleetArchive.objects.filter(
+            pk=payload['generated_archive_id'],
+            requested_by=self.user,
+            archive_type='service_tasks',
+        ).first()
+        self.assertIsNotNone(generated)
+        if generated.status != 'ready':
+            build_monthly_archive_cached_task.apply(args=[str(generated.pk)]).get()
+            generated.refresh_from_db()
+        self.assertEqual(generated.status, 'ready')
+
+        download_response = self.client.get(f"/api/fleet/reports/generated-archives/{generated.pk}/download/")
+        self.assertEqual(download_response.status_code, 200)
+        self.assertEqual(download_response['Content-Type'], 'application/zip')
+        archive_bytes = download_response.content if hasattr(download_response, 'content') else b''.join(download_response.streaming_content)
+
+        archive = zipfile.ZipFile(BytesIO(archive_bytes))
+        self.assertIn('MT150726.SN-Test_servisni_zadatak.docx', archive.namelist())
+
+        notifications = VehicleNotification.objects.filter(recipient=self.user).order_by('created_at')
+        self.assertTrue(notifications.filter(metadata__entity_type='fleet_archive', metadata__stage='requested').exists())
+        self.assertTrue(notifications.filter(metadata__entity_type='fleet_archive', metadata__stage='completed').exists())
+        requested_notification = notifications.filter(metadata__entity_type='fleet_archive', metadata__stage='requested').last()
+        completed_notification = notifications.filter(metadata__entity_type='fleet_archive', metadata__stage='completed').last()
+        self.assertEqual(str(requested_notification.metadata.get('generated_archive_id')), str(generated.pk))
+        self.assertEqual(str(completed_notification.metadata.get('generated_archive_id')), str(generated.pk))
+
+    def test_monthly_service_tasks_archive_request_ignores_stale_cached_archive(self):
+        stale = GeneratedFleetArchive.objects.create(
+            requested_by=self.user,
+            archive_type='service_tasks',
+            year=2033,
+            month=12,
+            status='ready',
+            filename='stale-archive.zip',
+            expires_at=timezone.now() + timedelta(days=2),
+        )
+        stale.file.save('stale-archive.zip', ContentFile(b'OLD-ARCHIVE'), save=True)
+        stale_updated_at = timezone.now() - timedelta(days=1)
+        GeneratedFleetArchive.objects.filter(pk=stale.pk).update(updated_at=stale_updated_at)
+        self.task.service_report_note = 'Nova napomena nakon cache-a'
+        self.task.save()
+
+        response = self.client.post(
+            '/api/fleet/reports/monthly-service-tasks-archive-request/',
+            data={'year': 2033, 'month': 12},
+            format='json',
+        )
+        self.assertIn(response.status_code, [200, 202], response.content)
+        payload = response.json()
+        self.assertIn('generated_archive_id', payload)
+        self.assertNotEqual(str(stale.pk), str(payload['generated_archive_id']))
+
+        stale.refresh_from_db()
+        self.assertFalse(stale.is_active)
+        self.assertEqual(stale.status, 'failed')
+
+    def test_monthly_service_tasks_archive_request_uses_async_local_fallback_when_broker_unavailable(self):
+        with (
+            patch('modules.fleet.views.build_monthly_archive_cached_task.delay', side_effect=KombuOperationalError('broker-down')),
+            patch('modules.fleet.views._schedule_monthly_archive_local_fallback') as fallback_mock,
+        ):
+            response = self.client.post(
+                '/api/fleet/reports/monthly-service-tasks-archive-request/',
+                data={'year': 2033, 'month': 12},
+                format='json',
+            )
+        self.assertEqual(response.status_code, 202, response.content)
+        fallback_mock.assert_called_once()
+
+        generated = (
+            GeneratedFleetArchive.objects
+            .filter(
+                requested_by=self.user,
+                archive_type='service_tasks',
+                year=2033,
+                month=12,
+            )
+            .order_by('-created_at')
+            .first()
+        )
+        self.assertIsNotNone(generated)
+        self.assertEqual(generated.status, 'pending')
+
+
+    def test_monthly_service_tasks_archive_request_replaces_stale_pending_archive(self):
+        stale_pending = GeneratedFleetArchive.objects.create(
+            requested_by=self.user,
+            archive_type='service_tasks',
+            year=2033,
+            month=12,
+            status='pending',
+            filename='pending-archive.zip',
+            expires_at=timezone.now() + timedelta(days=2),
+        )
+        stale_created_at = timezone.now() - timedelta(minutes=10)
+        GeneratedFleetArchive.objects.filter(pk=stale_pending.pk).update(created_at=stale_created_at)
+
+        response = self.client.post(
+            '/api/fleet/reports/monthly-service-tasks-archive-request/',
+            data={'year': 2033, 'month': 12},
+            format='json',
+        )
+        self.assertIn(response.status_code, [200, 202], response.content)
+        payload = response.json()
+        self.assertIn('generated_archive_id', payload)
+        self.assertNotEqual(str(stale_pending.pk), str(payload['generated_archive_id']))
+
+        stale_pending.refresh_from_db()
+        self.assertFalse(stale_pending.is_active)
+        self.assertEqual(stale_pending.status, 'failed')
+        self.assertIn('pending statusu', stale_pending.error_message)
+
+    def test_monthly_work_orders_archive_request_creates_ready_download_with_notification(self):
+        WorkOrderInvoice.objects.create(
+            work_order=self.work_order,
+            naziv_racuna='Prosinac račun',
+            datum='2033-12-10',
+            image=create_test_pdf('racun-prosinac.pdf'),
+            created_by=self.user,
+        )
+
+        response = self.client.post(
+            '/api/fleet/reports/monthly-work-orders-archive-request/',
+            data={'year': 2033, 'month': 12},
+            format='json',
+        )
+        self.assertIn(response.status_code, [200, 202], response.content)
+        payload = response.json()
+        self.assertIn('generated_archive_id', payload)
+
+        generated = GeneratedFleetArchive.objects.filter(
+            pk=payload['generated_archive_id'],
+            requested_by=self.user,
+            archive_type='work_orders',
+        ).first()
+        self.assertIsNotNone(generated)
+        if generated.status != 'ready':
+            build_monthly_archive_cached_task.apply(args=[str(generated.pk)]).get()
+            generated.refresh_from_db()
+        self.assertEqual(generated.status, 'ready')
+
+        download_response = self.client.get(f"/api/fleet/reports/generated-archives/{generated.pk}/download/")
+        self.assertEqual(download_response.status_code, 200)
+        self.assertEqual(download_response['Content-Type'], 'application/zip')
+        archive_bytes = download_response.content if hasattr(download_response, 'content') else b''.join(download_response.streaming_content)
+
+        archive = zipfile.ZipFile(BytesIO(archive_bytes))
+        names = archive.namelist()
+        self.assertIn('MT150726.work-order.pdf', names)
+        self.assertTrue(any(name.startswith('Racuni/MT150726/') for name in names), names)
+
+        self.assertTrue(
+            VehicleNotification.objects.filter(
+                recipient=self.user,
+                metadata__entity_type='fleet_archive',
+                metadata__archive_type='work_orders',
+                metadata__stage='completed',
+            ).exists()
+        )
+        requested_notification = VehicleNotification.objects.filter(
+            recipient=self.user,
+            metadata__entity_type='fleet_archive',
+            metadata__archive_type='work_orders',
+            metadata__stage='requested',
+        ).order_by('created_at').last()
+        self.assertEqual(str(requested_notification.metadata.get('generated_archive_id')), str(generated.pk))

backend/modules/fleet/urls.py

@@ -3,6 +3,10 @@ from django.urls import path
 from .views import (
     CraneViewSet, VehicleViewSet, WorkOrderViewSet, VehicleServiceRecordViewSet,
     WorkOrderInvoiceViewSet, ServiceContextNoteViewSet, VehicleNotificationViewSet, VehicleServicePhotoViewSet, VehicleServiceAttachmentViewSet, pusher_auth,
+    monthly_servicer_report_docx, monthly_costs_report_docx, MonthlyServicerDayEntryViewSet,
+    monthly_service_tasks_archive, monthly_service_tasks_archive_request,
+    monthly_work_orders_archive, monthly_work_orders_archive_request,
+    generated_archive_download,
 )
 
 router = DefaultRouter()
@@ -15,9 +19,17 @@ router.register(r'service-records', VehicleServiceRecordViewSet, basename='servi
 router.register(r'notifications', VehicleNotificationViewSet, basename='vehicle-notification')
 router.register(r'service-photos', VehicleServicePhotoViewSet, basename='service-photo')
 router.register(r'service-attachments', VehicleServiceAttachmentViewSet, basename='service-attachment')
+router.register(r'monthly-servicer-day-entries', MonthlyServicerDayEntryViewSet, basename='monthly-servicer-day-entry')
 
 urlpatterns = router.urls
 
 urlpatterns += [
     path('pusher-auth/', pusher_auth, name='pusher-auth'),
+    path('reports/monthly-servicer/', monthly_servicer_report_docx, name='monthly-servicer-report'),
+    path('reports/monthly-costs/', monthly_costs_report_docx, name='monthly-costs-report'),
+    path('reports/monthly-service-tasks-archive/', monthly_service_tasks_archive, name='monthly-service-tasks-archive'),
+    path('reports/monthly-service-tasks-archive-request/', monthly_service_tasks_archive_request, name='monthly-service-tasks-archive-request'),
+    path('reports/monthly-work-orders-archive/', monthly_work_orders_archive, name='monthly-work-orders-archive'),
+    path('reports/monthly-work-orders-archive-request/', monthly_work_orders_archive_request, name='monthly-work-orders-archive-request'),
+    path('reports/generated-archives/<str:archive_id>/download/', generated_archive_download, name='generated-archive-download'),
 ]

backend/modules/task_management/migrations/0012_task_service_report_note.py

@@ -0,0 +1,21 @@
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('task_management', '0011_taskcalendar'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='task',
+            name='service_report_note',
+            field=models.TextField(
+                blank=True,
+                default='',
+                verbose_name='Napomena izvještaja servisera',
+                help_text='Tekst napomene za PDF izvještaj servisera za ovaj zadatak.',
+            ),
+        ),
+    ]

backend/modules/task_management/models.py

@@ -54,6 +54,12 @@ class Task(BaseModel):
         verbose_name=_("Planirani datum izvršenja"),
         help_text=_("Datum kada je planirano izvršenje radnog zadatka."),
     )
+    service_report_note = models.TextField(
+        blank=True,
+        default='',
+        verbose_name=_("Napomena izvještaja servisera"),
+        help_text=_("Tekst napomene za PDF izvještaj servisera za ovaj zadatak."),
+    )
 
     class Meta:
         ordering = ['-created_at']

backend/modules/task_management/serializers.py

@@ -91,6 +91,7 @@ class TaskSerializer(serializers.ModelSerializer):
     vehicle_owner_name = serializers.SerializerMethodField()
     vehicle_asset_type = serializers.SerializerMethodField()
     crane_serial_number = serializers.SerializerMethodField()
+    work_hours_table = serializers.SerializerMethodField()
     template_id = serializers.UUIDField(write_only=True, required=False, allow_null=True)
     auto_close_work_order = serializers.BooleanField(write_only=True, required=False)
 
@@ -100,9 +101,10 @@ class TaskSerializer(serializers.ModelSerializer):
             'id', 'title', 'description', 'status',
             'assigned_to', 'assigned_to_name',
             'vehicle', 'vehicle_registration', 'vehicle_make', 'vehicle_model',
-            'vehicle_owner_name', 'vehicle_asset_type', 'crane_serial_number',
+            'vehicle_owner_name', 'vehicle_asset_type', 'crane_serial_number', 'work_hours_table',
             'work_order', 'work_order_label',
             'scheduled_date',
+            'service_report_note',
             'template_id', 'auto_close_work_order',
             'created_at',
         ]
@@ -114,6 +116,7 @@ class TaskSerializer(serializers.ModelSerializer):
             'work_order': {'required': False, 'allow_null': True},
             'vehicle': {'required': False, 'allow_null': True},
             'scheduled_date': {'required': False, 'allow_null': True},
+            'service_report_note': {'required': False, 'allow_blank': True},
         }
 
     def validate_title(self, value):
@@ -146,13 +149,12 @@ class TaskSerializer(serializers.ModelSerializer):
                 'title': "Naslov zadatka je obavezan ako se task ne kreira iz templatea."
             })
 
+        # If task has no crane yet, auto-derive it from the work order's crane (backward compat).
+        # Cross-crane assignment is intentionally allowed: a servicer can share one work order
+        # across tasks for multiple cranes on the same day.
         if work_order and not vehicle:
             vehicle = work_order.vehicle
             attrs['vehicle'] = vehicle
-        if work_order and vehicle and work_order.vehicle_id != vehicle.id:
-            raise serializers.ValidationError({
-                'work_order': "Putni nalog mora pripadati istoj dizalici kao task."
-            })
 
         if status_value in {'neaktivan', 'zavrsen'} and not work_order:
             raise serializers.ValidationError({
@@ -211,3 +213,9 @@ class TaskSerializer(serializers.ModelSerializer):
         if not obj.vehicle_id:
             return None
         return obj.vehicle.crane_serial_number or None
+
+    def get_work_hours_table(self, obj):
+        table = getattr(obj, 'work_hours_table', None)
+        if not table:
+            return None
+        return TaskWorkHoursTableSerializer(table).data

backend/modules/task_management/tests/test_serializers.py

@@ -2,7 +2,7 @@ from django.test import TestCase
 from modules.task_management.serializers import TaskSerializer
 from rest_framework.exceptions import ValidationError
 from django.contrib.auth import get_user_model
-from modules.task_management.models import Task
+from modules.task_management.models import Task, TaskWorkHoursTable
 from modules.fleet.models import Vehicle, WorkOrder
 from modules.crm.models import Client
 
@@ -86,6 +86,22 @@ class TaskSerializerTests(TestCase):
         assert serializer.data['vehicle_owner_name'] == 'Klijent zadatka'
         assert serializer.data['vehicle_asset_type'] == 'crane'
 
+    def test_work_hours_table_is_included_in_serialized_output(self):
+        task = Task.objects.create(title="Task work hours", assigned_to=self.user, vehicle=self.vehicle)
+        TaskWorkHoursTable.objects.create(
+            task=task,
+            data={
+                'rows': [
+                    {'date': '12.07.2026', 'work_hours': '8', 'travel_hours': '2'},
+                ]
+            },
+        )
+
+        serializer = TaskSerializer(instance=task)
+        assert serializer.data['work_hours_table']['data']['rows'][0]['date'] == '12.07.2026'
+        assert serializer.data['work_hours_table']['data']['rows'][0]['work_hours'] == '8'
+        assert serializer.data['work_hours_table']['data']['rows'][0]['travel_hours'] == '2'
+
     def test_scheduled_date_accepts_valid_date(self):
         serializer = TaskSerializer(
             data={"title": "Task mit datum", "status": "aktivan",
@@ -99,4 +115,58 @@ class TaskSerializerTests(TestCase):
                   "vehicle": str(self.vehicle.id), "scheduled_date": "not-a-date"}
         )
         assert not serializer.is_valid()
-        assert 'scheduled_date' in serializer.errors
+        assert 'scheduled_date' in serializer.errors
+
+    def test_can_assign_work_order_from_different_crane(self):
+        """Task može dobiti putni nalog koji pripada drugoj dizalici (cross-crane dijeljenje naloga)."""
+        other_vehicle = Vehicle.objects.create(
+            registration_number="ZG-TSK-02",
+            asset_type='crane',
+            make='Manitowoc',
+            model='Grove',
+            client=self.client,
+            is_company_vehicle=False,
+        )
+        work_order = WorkOrder.objects.create(vehicle=other_vehicle, creator=self.user, purpose='kontrola')
+        task = Task.objects.create(title="Cross-crane task", status="servis", assigned_to=self.user, vehicle=self.vehicle)
+
+        serializer = TaskSerializer(instance=task, data={"work_order": str(work_order.id)}, partial=True)
+        assert serializer.is_valid(), serializer.errors
+        updated_task = serializer.save()
+        assert updated_task.work_order_id == work_order.id
+        assert updated_task.vehicle_id == self.vehicle.id  # task zadržava svoju dizalicu
+
+    def test_can_close_task_with_cross_crane_work_order(self):
+        """Task se može zatvoriti putnim nalogom koji pripada drugoj dizalici."""
+        other_vehicle = Vehicle.objects.create(
+            registration_number="ZG-TSK-03",
+            asset_type='crane',
+            make='Tadano',
+            model='GR',
+            client=self.client,
+            is_company_vehicle=False,
+        )
+        work_order = WorkOrder.objects.create(vehicle=other_vehicle, creator=self.user, purpose='popravak')
+        task = Task.objects.create(title="Task for close", status="servis", assigned_to=self.user, vehicle=self.vehicle)
+
+        serializer = TaskSerializer(
+            instance=task,
+            data={"status": "zavrsen", "work_order": str(work_order.id)},
+            partial=True
+        )
+        assert serializer.is_valid(), serializer.errors
+        updated_task = serializer.save()
+        assert updated_task.status == 'zavrsen'
+        assert updated_task.work_order_id == work_order.id
+
+    def test_work_order_auto_derives_vehicle_when_task_has_none(self):
+        """Ako task nema dizalicu a dobiva WO, dizalica se preuzima iz WO (backward compat)."""
+        work_order = WorkOrder.objects.create(vehicle=self.vehicle, creator=self.user, purpose='defektaza')
+        serializer = TaskSerializer(
+            data={"title": "Auto-vehicle task", "status": "aktivan", "work_order": str(work_order.id)},
+        )
+        # vehicle je obavezan pri kreiranju, ali ako task nije instanca ovo bi trebalo failati
+        # Provjeri da vehicle derivation iz WO radi samo ako task već postoji (partial update)
+        task = Task.objects.create(title="Temp task", status="aktivan", assigned_to=self.user, vehicle=self.vehicle)
+        serializer2 = TaskSerializer(instance=task, data={"work_order": str(work_order.id)}, partial=True)
+        assert serializer2.is_valid(), serializer2.errors

backend/modules/task_management/views.py

@@ -30,6 +30,9 @@ class TaskViewSet(viewsets.ModelViewSet):
         scheduled_date = self.request.query_params.get('scheduled_date')
         if scheduled_date:
             qs = qs.filter(scheduled_date=scheduled_date)
+        work_order_id = self.request.query_params.get('work_order')
+        if work_order_id:
+            qs = qs.filter(work_order_id=work_order_id)
         return qs
 
     def perform_create(self, serializer):

backend/scripts/cleanup_tmp_files.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+set -eu
+
+TMP_DIR="${APP_TMP_CLEANUP_DIR:-/tmp}"
+MAX_AGE_DAYS="${APP_TMP_CLEANUP_MAX_AGE_DAYS:-1}"
+PREFIXES="${APP_TMP_CLEANUP_PREFIXES:-erp-fleet-archive-}"
+
+if [ ! -d "$TMP_DIR" ]; then
+  echo "TMP dir ne postoji: $TMP_DIR"
+  exit 0
+fi
+
+OLD_IFS="$IFS"
+IFS=','
+for prefix in $PREFIXES; do
+  prefix_trimmed="$(echo "$prefix" | xargs)"
+  if [ -z "$prefix_trimmed" ]; then
+    continue
+  fi
+  find "$TMP_DIR" -maxdepth 1 -mindepth 1 -name "${prefix_trimmed}*" -mtime "+${MAX_AGE_DAYS}" -print -delete
+done
+IFS="$OLD_IFS"
+
+echo "TMP cleanup dovršen za $TMP_DIR (older than ${MAX_AGE_DAYS} day(s))."

docker-compose.prod.yml

@@ -37,7 +37,13 @@ services:
     environment:
       DEBUG: "False"
       DJANGO_SETTINGS_MODULE: core.settings.production
-    command: celery -A core worker --loglevel=info
+      CELERY_WORKER_PREFETCH_MULTIPLIER: "1"
+      CELERY_WORKER_MAX_TASKS_PER_CHILD: "20"
+      CELERY_WORKER_MAX_MEMORY_PER_CHILD: "350000"
+      APP_TMP_CLEANUP_DIR: "/tmp"
+      APP_TMP_CLEANUP_MAX_AGE_HOURS: "24"
+      APP_TMP_CLEANUP_PREFIXES: "erp-fleet-archive-"
+    command: celery -A core worker --loglevel=info --concurrency=${CELERY_WORKER_CONCURRENCY:-2}
     volumes:
       - media_volume:/app/media
     depends_on:

docs/production-db-local-setup.md

@@ -0,0 +1,237 @@
+# Preuzimanje produkcijske baze podataka na lokalni PC
+
+Vodič za lokalni razvoj s kopijom produkcijskog PostgreSQL-a bez mijenjanja produkcijske baze.
+
+---
+
+## Preduvjeti
+
+- SSH pristup produkcijskom serveru
+- Docker Desktop instaliran lokalno
+- `scp` dostupan u PowerShell / terminalu
+- Lokalni `.env` s `DEBUG=True` i **drugačijim** `SECRET_KEY` od produkcije
+
+---
+
+## Korak 1 — Na produkcijskom serveru: napravi dump
+
+SSH-aj na produkcijski server, zatim pokreni:
+
+```bash
+docker exec 004erpdb pg_dump \
+  -U $POSTGRES_USER \
+  -d $POSTGRES_DB \
+  --no-owner \
+  --no-acl \
+  -Fc \
+  -f /tmp/prod_dump.dump
+```
+
+> **`-Fc`** — custom format (komprimiran, pogodniji za `pg_restore`)  
+> **`--no-owner --no-acl`** — izostavlja produkcijske usere i privilegije
+
+Ako env varijable nisu dostupne u shell sesiji, napiši vrijednosti direktno:
+
+```bash
+docker exec 004erpdb sh -c \
+  "pg_dump -U TVOJ_USER TVOJA_BAZA --no-owner --no-acl -Fc -f /tmp/prod_dump.dump"
+```
+
+Ako baza ima desetke gigabajta, pg_dump može opteretiti disk produkcije. U tom slučaju, dumpaj u komprimirani format **--exclude-table-data='log_*'**:
+
+```bash
+docker exec 004erpdb pg_dump \
+  -U $POSTGRES_USER \
+  -d $POSTGRES_DB \
+  --no-owner \
+  --no-acl \
+  --exclude-table-data='log_*' \
+  -Fc \
+  -f /tmp/prod_dump.dump
+```
+
+```bash
+docker exec 004erpdb sh -c 'pg_dump
+  -U "$TVOJ_USER"
+  -d "$TVOJA_BAZA"
+  --no-owner
+  --no-acl
+  --exclude-table-data='log_*'
+  -Fc
+  -f /tmp/prod_dump.dump'
+```
+
+---
+
+## Korak 2 — Kopiraj dump na lokalni PC
+
+Iz docker servera na host server:
+
+```bash
+docker cp 004erpdb:/tmp/prod_dump.dump /tmp/prod_dump.dump
+```
+
+```bash
+
+Iz lokalnog PowerShell terminala:
+
+```powershell
+scp tvoj_user@IP_SERVERA:/tmp/prod_dump.dump C:\Users\mario.tkalac\Downloads\prod_dump.dump
+```
+
+S SSH ključem:
+
+```powershell
+scp -i C:\Users\mario.tkalac\.ssh\id_rsa `
+  tvoj_user@IP_SERVERA:/tmp/prod_dump.dump `
+  C:\Users\mario.tkalac\Downloads\prod_dump.dump
+```
+
+Brisanje dump-a s produkcijskog servera (opcionalno):
+
+```powershell
+ssh tvoj_user@IP_SERVERA "rm /tmp/prod_dump.dump"
+```
+
+---
+
+## Korak 3 — Pokreni lokalnu bazu
+
+```powershell
+cd C:\Users\mario.tkalac\workspace\aplikacija\004.erp.generic
+
+docker compose -f docker-compose.yml up -d db
+```
+
+Pričekaj dok container postane `healthy`:
+
+```powershell
+docker ps --filter "name=004erpdb"
+```
+
+---
+
+## Korak 4 — Restoriraj dump u lokalnu bazu
+
+```powershell
+# Kopiraj dump file u container
+docker cp C:\Users\mario.tkalac\Downloads\prod_dump.dump 004erpdb:/tmp/prod_dump.dump
+
+# Dropaj lokalnu bazu i kreiraj novu praznu (BRIŠE lokalne podatke!)
+docker exec 004erpdb dropdb -U TVOJ_USER TVOJA_BAZA --if-exists
+docker exec 004erpdb createdb -U TVOJ_USER TVOJA_BAZA
+
+# Restoriraj
+docker exec 004erpdb sh -c 'pg_restore
+  -U "$TVOJ_USER"
+  -d "$TVOJA_BAZA"
+  --no-owner
+  --no-acl
+  -Fc
+  -f /tmp/prod_dump.dump'
+```
+
+> ⚠️ Zamijeni `TVOJ_USER` i `TVOJA_BAZA` s vrijednostima iz lokalnog `.env` fajla:  
+> `POSTGRES_USER` i `POSTGRES_DB`.
+
+---
+
+## Korak 5 — Primijeni nove migracije
+
+Pokrenuti odmah nakon restore-a kako bi lokalna shema bila u sinkronizaciji s kodom:
+
+```powershell
+docker compose -f docker-compose.yml -f docker-compose.dev.yml `
+  run --rm backend python manage.py migrate
+```
+
+Migracije na postojećim podacima su sigurne — dodaju tablice/stupce, ne brišu podatke.
+
+---
+
+## Korak 6 — Postavi lokalnog admin korisnika
+
+Produkcijske lozinke su hashirane i ne mogu se koristiti direktno. Kreiraj novog superusera:
+
+```powershell
+docker compose -f docker-compose.yml -f docker-compose.dev.yml `
+  run --rm backend python manage.py createsuperuser
+```
+
+Ili resetiraj lozinku postojećem accountu:
+
+```powershell
+docker compose -f docker-compose.yml -f docker-compose.dev.yml `
+  run --rm backend python manage.py changepassword tvoj@email.com
+```
+
+---
+
+## Korak 7 — Pokreni cijeli dev stack
+
+```powershell
+docker compose -f docker-compose.yml -f docker-compose.dev.yml up -d backend frontend
+```
+
+Provjeri:
+- Backend: `http://localhost:8001/api/`
+- Frontend: `http://localhost:4321/`
+
+---
+
+## Napomene o sigurnosti
+
+| Tema | Akcija |
+|------|--------|
+| **Produkcijska baza** | `pg_dump` je read-only operacija — produkcijska baza nije dirnuta |
+| **SECRET_KEY** | Lokalni `.env` **mora** imati drugačiji `SECRET_KEY` od produkcije |
+| **DEBUG** | Lokalni `.env` mora imati `DEBUG=True` |
+| **Media fajlovi** | Dump ne uključuje fajlove iz `media_volume`; kopirati ručno ako su potrebni |
+| **Osobni podaci** | Baza može sadržavati osobne podatke klijenata — koristiti samo na zaštićenom lokalnom stroju |
+
+---
+
+## Media fajlovi (opcionalno)
+
+Ako trebaju priloženi fajlovi (slike, PDF-ovi):
+
+```bash
+# Na produkcijskom serveru — arhiviraj media
+docker run --rm \
+  -v media_volume:/data \
+  alpine tar czf /tmp/media.tar.gz -C /data .
+
+# Kopiraj lokalno
+scp tvoj_user@IP_SERVERA:/tmp/media.tar.gz C:\Users\mario.tkalac\Downloads\media.tar.gz
+```
+
+Raspakiraj u lokalni Docker volume:
+
+```powershell
+# Kopiraj arhivu u privremeni container
+docker run --rm `
+  -v 004erpgeneric_media_volume:/data `
+  -v C:\Users\mario.tkalac\Downloads:/backup `
+  alpine sh -c "tar xzf /backup/media.tar.gz -C /data"
+```
+
+---
+
+## Brzi pregled naredbi (cheat sheet)
+
+```bash
+# 1. Dump na serveru
+docker exec 004erpdb pg_dump -U USER DB --no-owner --no-acl -Fc -f /tmp/prod_dump.dump
+
+# 2. Kopiraj lokalno
+scp user@IP:/tmp/prod_dump.dump ~/Downloads/prod_dump.dump
+
+# 3. Restore lokalno
+docker cp ~/Downloads/prod_dump.dump 004erpdb:/tmp/prod_dump.dump
+docker exec 004erpdb dropdb -U USER DB --if-exists
+docker exec 004erpdb createdb -U USER DB
+docker exec 004erpdb pg_restore -U USER -d DB --no-owner --no-acl -Fc /tmp/prod_dump.dump
+
+# 4. Migracije
+docker compose -f docker-compose.yml -f docker-compose.dev.yml run --rm backend python manage.py migrate
+```

frontend/public/service-worker.js

@@ -1,10 +1,10 @@
-const CACHE_NAME = 'erp-shell-v2';
+const CACHE_NAME = 'erp-shell-v3';
 const API_CACHE_NAME = 'erp-api-v1';
 const WRITE_QUEUE_DB_NAME = 'erp-write-queue-db';
 const WRITE_QUEUE_STORE = 'requests';
 const WRITE_QUEUE_SYNC_TAG = 'erp-write-queue-sync';
 const OFFLINE_URL = '/offline.html';
-const PRECACHE_URLS = ['/', '/index.html', '/manifest.webmanifest', '/pwa-icon.svg', OFFLINE_URL];
+const PRECACHE_URLS = ['/', '/manifest.webmanifest', '/pwa-icon.svg', OFFLINE_URL];
 
 const API_CACHE_BLOCKLIST = [
   '/api/token/',
@@ -142,10 +142,26 @@ async function replayQueuedRequests() {
   }
 }
 
-self.addEventListener('install', (event) => {
+async function precacheShell() {
-  event.waitUntil(
+  const cache = await caches.open(CACHE_NAME);
-    caches.open(CACHE_NAME).then((cache) => cache.addAll(PRECACHE_URLS))
+  await Promise.all(
+    PRECACHE_URLS.map(async (url) => {
+      try {
+        const response = await fetch(url, { cache: 'reload' });
+        if (!response || !response.ok) {
+          console.warn('Skipping precache for non-OK response:', url, response && response.status);
+          return;
+        }
+        await cache.put(url, response);
+      } catch (error) {
+        console.warn('Skipping precache for failed request:', url, error);
+      }
+    })
   );
+}
+
+self.addEventListener('install', (event) => {
+  event.waitUntil(precacheShell());
   self.skipWaiting();
 });
 

frontend/src/components/Navbar.jsx

@@ -4,7 +4,7 @@ import AuthWidget from './AuthWidget';
 import UserDisplay from './ui/UserDisplay';
 import { useEffect, useRef, useState } from 'preact/hooks';
 import { useSpring, animated } from '@react-spring/web';
-import { hydrateAuthFromStorage } from '../stores/authStore';
+import { hydrateAuthFromStorage, loadCurrentUser, $user, $accessToken } from '../stores/authStore';
 
 const ITEMS = [
     { id: 'dashboard',       label: 'Dashboard',        href: '/' },
@@ -21,8 +21,12 @@ function normalizePath(p) {
 }
 
 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 }) {
@@ -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
     useEffect(() => {
         hydrateAuthFromStorage();
+        // Učitaj korisnika ako token postoji ali $user još nije popunjen
+        if (!$user.get() && $accessToken.get()) {
+            loadCurrentUser();
+        }
 
         const timer = setTimeout(() => {
             measureIndicator();
@@ -92,7 +100,7 @@ export default function Navbar({ minimal = false }) {
     const currentItem = ITEMS[activeIndex];
 
     return (
-        <nav className="sticky top-0 z-30 mb-4 rounded-lg border border-border-hairline bg-canvas-elevated/95 px-4 py-3 backdrop-blur">
+        <nav className="sticky top-0 z-30 mb-4 rounded-lg border border-border-hairline bg-canvas-elevated/95 px-4 py-3 backdrop-blur overflow-visible">
             <div className="flex flex-wrap items-center justify-between gap-2">
                 {/* Logo + korisnik */}
                 <a href="/" className="flex flex-col hover:opacity-80">
@@ -135,10 +143,11 @@ export default function Navbar({ minimal = false }) {
                 <div className="flex items-center gap-2">
                     {/* Mobilni dropdown */}
                     <details className="relative sm:hidden">
-                        <summary className="list-none cursor-pointer rounded-lg border border-border-hairline px-2 py-1 text-xs text-text-main hover:bg-canvas-deep">
+                        <summary className="list-none cursor-pointer rounded-lg border border-border-hairline bg-canvas-base px-3 py-1.5 text-xs font-medium text-text-main hover:bg-canvas-deep select-none">
-                            {currentItem?.label || 'Izbornik'} ▾
+                            ☰ {currentItem?.label || 'Izbornik'}
                         </summary>
-                        <div className="absolute right-0 mt-2 min-w-44 rounded-lg border border-border-hairline bg-canvas-elevated shadow-lg">
+                        {/* Dropdown je positioniran fixed-like kroz visoki z-index kako ne bi bio odsječen */}
+                        <div className="absolute left-0 top-full mt-1 z-50 min-w-52 rounded-lg border border-border-hairline bg-canvas-elevated shadow-xl">
                             <div className="border-b border-border-hairline px-3 py-2 text-[11px] uppercase tracking-wide text-text-muted">
                                 Navigacija
                             </div>
@@ -149,10 +158,11 @@ export default function Navbar({ minimal = false }) {
                                             href={item.href}
                                             className={
                                                 pathname === item.href
-                                                    ? 'block bg-indigo-50 px-3 py-2 text-sm font-medium text-indigo-700'
+                                                    ? 'flex items-center gap-2 bg-indigo-50 px-3 py-2.5 text-sm font-medium text-indigo-700'
-                                                    : 'block px-3 py-2 text-sm text-text-main hover:bg-canvas-deep'
+                                                    : 'flex items-center gap-2 px-3 py-2.5 text-sm text-text-main hover:bg-canvas-deep'
                                             }
                                         >
+                                            {pathname === item.href && <span className="h-1.5 w-1.5 rounded-full bg-indigo-500" />}
                                             {item.label}
                                         </a>
                                     </li>

frontend/src/components/ToastTrigger.jsx

@@ -1,13 +0,0 @@
-import { showToast } from '../stores/toastStore';
-
-export default function ToastTrigger() {
-    return (
-        <button
-            type="button"
-            onClick={() => showToast('Sustav je spreman za rad.', 'info', 2500)}
-            className="fixed bottom-4 right-4 z-50 rounded-full border border-border-hairline bg-canvas-elevated px-4 py-2 text-xs font-semibold text-text-main shadow-sm hover:bg-canvas-deep"
-        >
-            Test Toast
-        </button>
-    );
-}

frontend/src/components/dashboard/DashboardTopbar.jsx

@@ -1,32 +1,18 @@
-import { showToast } from '../../stores/toastStore';
 import ServiceContextSelector from './ServiceContextSelector';
 
-const NAV_ITEMS = [
-    { key: 'dashboard',       label: 'Dashboard' },
-    { key: 'work-orders',     label: 'Putni nalozi' },
-    { key: 'service-records', label: 'Servisni zapisi' },
-    { key: 'cranes',          label: 'Dizalice' },
-    { key: 'clients',         label: 'Klijenti' },
-];
-
 export default function DashboardTopbar({
-    activeSection,
-    onSectionChange,
     onOpenWorkOrderModal,
     onOpenTaskModal,
     pendingSyncCount,
     onNewServiceRecord,
-    showSectionNav = true,
 }) {
-    const sectionTitle = NAV_ITEMS.find((item) => item.key === activeSection)?.label || 'Dashboard';
-
     return (
         <header className="sticky top-0 z-20 border-b border-border-hairline bg-canvas-elevated/95 backdrop-blur">
             {/* ── Gornji red ───────────────────────────────────────── */}
             <div className="flex flex-wrap items-center justify-between gap-3 px-4 py-3 sm:px-6">
                 <div>
                     <p className="text-xs uppercase tracking-wide text-text-muted">Pregled sustava</p>
-                    <h2 className="text-xl font-semibold text-text-main">{sectionTitle}</h2>
+                    <h2 className="text-xl font-semibold text-text-main">ERP</h2>
                 </div>
                 <div className="flex items-center gap-3">
                     {pendingSyncCount > 0 && (
@@ -53,31 +39,6 @@ export default function DashboardTopbar({
 
             {/* ── Selector bar: Kupac + Dizalica ───────────────────── */}
             <ServiceContextSelector onNewServiceRecord={onNewServiceRecord} />
-
-            {/* ── Navigacijski tabovi ──────────────────────────────── */}
-            {showSectionNav && (
-                <nav className="overflow-x-auto border-t border-border-hairline px-4 sm:px-6">
-                    <ul className="flex min-w-max items-center gap-1 py-2 text-sm">
-                        {NAV_ITEMS.map((item) => (
-                            <li key={item.key}>
-                                <button
-                                    type="button"
-                                    onClick={() => {
-                                        onSectionChange(item.key);
-                                    }}
-                                    className={
-                                        activeSection === item.key
-                                            ? 'rounded-lg bg-indigo-50 px-3 py-2 font-medium text-indigo-700'
-                                            : 'rounded-lg px-3 py-2 text-text-main hover:bg-canvas-deep'
-                                    }
-                                >
-                                    {item.label}
-                                </button>
-                            </li>
-                        ))}
-                    </ul>
-                </nav>
-            )}
         </header>
     );
 }

frontend/src/components/dashboard/FleetDashboardShell.jsx

@@ -1,4 +1,4 @@
-import { useStore } from '@nanostores/preact';
+import { useStore } from '@nanostores/preact';
 import { useEffect, useMemo, useState } from 'preact/hooks';
 import { animated, useSpring, useTransition } from '@react-spring/web';
 import DashboardTopbar from './DashboardTopbar';
@@ -136,17 +136,7 @@ function SortableCodeLabel({ title, direction, onToggle }) {
     );
 }
 
-const PAGE_MODE_TO_SECTION = {
+export default function FleetDashboardShell({ pageMode = 'dashboard' }) {
-    dashboard: 'dashboard',
-    'work-orders': 'work-orders',
-    'service-records': 'service-records',
-    vehicles: 'cranes',
-    clients: 'clients',
-};
-
-export default function FleetDashboardShell({ initialSection = 'dashboard', pageMode = 'dashboard' }) {
-    const resolvedInitialSection = initialSection || PAGE_MODE_TO_SECTION[pageMode] || 'dashboard';
-    const [activeSection, setActiveSection] = useState(resolvedInitialSection);
     const [isWorkOrderModalOpen, setIsWorkOrderModalOpen] = useState(false);
     const [isTaskModalOpen, setIsTaskModalOpen] = useState(false);
     const [selectedWorkOrder, setSelectedWorkOrder] = useState(null);
@@ -175,6 +165,7 @@ export default function FleetDashboardShell({ initialSection = 'dashboard', page
     const selectedClientId = useStore($selectedClientId);
     const selectedVehicleId = useStore($selectedVehicleId);
     const [currentPage, setCurrentPage] = useState(1);
+    const [serviceRecordsPage, setServiceRecordsPage] = useState(1);
     const [taskFilter, setTaskFilter] = useState('active');
     const [taskScope, setTaskScope] = useState('all');
     const [supervisorServicers, setSupervisorServicers] = useState([]);
@@ -185,6 +176,7 @@ export default function FleetDashboardShell({ initialSection = 'dashboard', page
     const [selectedCraneRowId, setSelectedCraneRowId] = useState(null);
     const [expandedServiceTaskId, setExpandedServiceTaskId] = useState(null);
     const [hasMounted, setHasMounted] = useState(false);
+    const [taskCraneFilter, setTaskCraneFilter] = useState('all');
 
     useEffect(() => {
         setHasMounted(true);
@@ -270,26 +262,9 @@ export default function FleetDashboardShell({ initialSection = 'dashboard', page
         };
     }, [authReady]);
 
-    useEffect(() => {
-        function handleNavbarNavigate(event) {
-            const section = event?.detail;
-            if (typeof section === 'string' && section.length > 0) {
-                setActiveSection(section);
-            }
-        }
-
-        window.addEventListener('navbar:navigate', handleNavbarNavigate);
-        return () => window.removeEventListener('navbar:navigate', handleNavbarNavigate);
-    }, []);
-
     useEffect(() => {
         function handleNotificationOpenEntity(event) {
             const detail = event?.detail || {};
-            const section = detail.section;
-            if (typeof section === 'string' && section.length > 0) {
-                setActiveSection(section);
-            }
-
             if (detail.entityType === 'work_order' && detail.entityId) {
                 if (detail.vehicleId) {
                     const targetCrane = cranes.find((item) => String(item.id) === String(detail.craneId || detail.vehicleId));
@@ -352,6 +327,51 @@ export default function FleetDashboardShell({ initialSection = 'dashboard', page
         if (serial) return `SN ${serial}`;
         return hydratedContextCrane.registration_number || '-';
     }, [hydratedContextCrane]);
+    // KPI: context-aware counts (null kad kontekst nije postavljen)
+    const contextStats = useMemo(() => {
+        if (!hydratedSelectedVehicleId) return null;
+        const ctxWoIds = new Set(
+            tasks
+                .filter((t) => String(t.vehicle || '') === String(hydratedSelectedVehicleId) && t.work_order)
+                .map((t) => String(t.work_order))
+        );
+        const ctxWorkOrders = workOrders.filter(
+            (o) => String(o.vehicle) === String(hydratedSelectedVehicleId) || ctxWoIds.has(String(o.id))
+        );
+        const today = new Date().toISOString().slice(0, 10);
+        return {
+            openWorkOrders: ctxWorkOrders.filter((o) => o.status !== 'closed').length,
+            servicesToday: tasks.filter(
+                (t) => String(t.vehicle || '') === String(hydratedSelectedVehicleId)
+                    && t.scheduled_date === today
+                    && (t.status === 'aktivan' || t.status === 'servis')
+            ).length,
+        };
+    }, [tasks, workOrders, hydratedSelectedVehicleId]);
+    // KPI: moji zadaci planirani danas
+    const myTasksToday = useMemo(() => {
+        if (!user?.id || !hasMounted) return 0;
+        const today = new Date().toISOString().slice(0, 10);
+        return tasks.filter(
+            (t) => String(t.assigned_to || '') === String(user.id)
+                && t.scheduled_date === today
+                && isTaskActive(t)
+        ).length;
+    }, [tasks, user?.id, hasMounted]);
+    // Zadnji servisni zapisi za fallback prikaz (kad kontekst nije postavljen)
+    const recentServiceRecords = useMemo(() => (
+        [...serviceRecords]
+            .sort((a, b) => String(b.service_date || '').localeCompare(String(a.service_date || '')))
+    ), [serviceRecords]);
+    const serviceRecordsPageSize = 10;
+    const serviceRecordsTotalPages = Math.max(1, Math.ceil(recentServiceRecords.length / serviceRecordsPageSize));
+    const paginatedRecentServiceRecords = useMemo(
+        () => recentServiceRecords.slice(
+            (serviceRecordsPage - 1) * serviceRecordsPageSize,
+            serviceRecordsPage * serviceRecordsPageSize
+        ),
+        [recentServiceRecords, serviceRecordsPage]
+    );
     const serviceRecordsForContext = useMemo(() => {
         if (!selectedVehicleId) return [];
         return [...serviceRecords]
@@ -423,19 +443,44 @@ export default function FleetDashboardShell({ initialSection = 'dashboard', page
         if (!hydratedSelectedVehicleId) {
             return [];
         }
-        return codeSorted.filter((order) => String(order.vehicle) === String(hydratedSelectedVehicleId));
+        // Collect work order IDs that are directly assigned to tasks of the context crane.
-    }, [workOrders, workOrderScope, hydratedSelectedVehicleId, user?.id, user?.is_serviser, user?.is_team_member, workOrderCodeSortDirection]);
+        // 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.
+        const contextTaskWorkOrderIds = new Set(
+            tasks
+                .filter((t) => String(t.vehicle || '') === String(hydratedSelectedVehicleId) && t.work_order)
+                .map((t) => String(t.work_order))
+        );
+        return codeSorted.filter(
+            (order) => String(order.vehicle) === String(hydratedSelectedVehicleId)
+                || contextTaskWorkOrderIds.has(String(order.id))
+        );
+    }, [workOrders, tasks, workOrderScope, hydratedSelectedVehicleId, user?.id, user?.is_serviser, user?.is_team_member, workOrderCodeSortDirection]);
     const pageSize = 10;
     const totalPages = Math.max(1, Math.ceil(scopedWorkOrders.length / pageSize));
     const latestWorkOrders = useMemo(
         () => scopedWorkOrders.slice((currentPage - 1) * pageSize, currentPage * pageSize),
         [scopedWorkOrders, currentPage]
     );
+
+    // Map: workOrderId → array of unique crane objects (own + cross-crane task links)
+    const workOrderSharedCranes = useMemo(() => {
+        const craneById = new Map(cranes.map((c) => [String(c.id), c]));
+        const map = new Map();
+        tasks.forEach((task) => {
+            if (!task.work_order || !task.vehicle) return;
+            const woId = String(task.work_order);
+            if (!map.has(woId)) map.set(woId, new Map());
+            const craneObj = craneById.get(String(task.vehicle));
+            if (craneObj) map.get(woId).set(String(task.vehicle), craneObj);
+        });
+        return map;
+    }, [tasks, cranes]);
     const serviceRecordWorkOrders = useMemo(() => {
-        const craneId = serviceRecordCrane?.id || contextCrane?.id;
+        // Show ALL open work orders so a task can be linked to any work order regardless of crane.
-        if (!craneId) return [];
+        // Cross-crane sharing is intentional: a servicer may use one travel order for multiple cranes.
-        return workOrders
+        return [...workOrders]
-            .filter((order) => String(order.vehicle) === String(craneId))
+            .filter((order) => String(order.status || '').toLowerCase() !== 'closed')
             .sort((a, b) => String(b.date || '').localeCompare(String(a.date || '')));
     }, [workOrders, serviceRecordCrane, contextCrane]);
     const serviceRecordTasks = useMemo(() => {
@@ -525,14 +570,23 @@ export default function FleetDashboardShell({ initialSection = 'dashboard', page
             return filteredByServicer;
         })();
 
-        return [...filteredByStatus].sort((left, right) => (
+        const filteredByCrane = (() => {
+            if (taskCraneFilter !== 'context' || !hydratedSelectedVehicleId) {
+                return filteredByStatus;
+            }
+            return filteredByStatus.filter(
+                (task) => String(task.vehicle || '') === String(hydratedSelectedVehicleId)
+            );
+        })();
+
+        return [...filteredByCrane].sort((left, right) => (
             compareWorkOrderCodesByDate(
                 left?.work_order_label || '',
                 right?.work_order_label || '',
                 taskWorkOrderSortDirection
             )
         ));
-    }, [tasks, taskFilter, canViewAllTasks, canToggleTaskScope, taskScope, user?.id, isSupervisorNotServiser, selectedServicerId, taskWorkOrderSortDirection]);
+    }, [tasks, taskFilter, canViewAllTasks, canToggleTaskScope, taskScope, user?.id, isSupervisorNotServiser, selectedServicerId, taskWorkOrderSortDirection, taskCraneFilter, hydratedSelectedVehicleId]);
     const selectedTaskServiceRecords = useMemo(() => {
         if (!selectedTask?.id) return [];
         return [...serviceRecords]
@@ -541,10 +595,18 @@ export default function FleetDashboardShell({ initialSection = 'dashboard', page
     }, [serviceRecords, selectedTask?.id]);
     const selectedTaskWorkOrders = useMemo(() => {
         if (!selectedTask) return [];
-        const byVehicle = selectedTask.vehicle
+        // Keep dropdown focused on open work orders, but preserve the task's already assigned
-            ? workOrders.filter((order) => String(order.vehicle) === String(selectedTask.vehicle))
+        // work order even when it is closed so the reference remains visible/editable in task details.
-            : workOrders;
+        // Cross-crane sharing allowed: no vehicle filter.
-        return [...byVehicle].sort((a, b) => String(b.date || '').localeCompare(String(a.date || '')));
+        const selectedWorkOrderId = String(selectedTask.work_order || '');
+        return [...workOrders]
+            .filter((order) => {
+                const orderId = String(order.id || '');
+                const isClosed = String(order.status || '').toLowerCase() === 'closed';
+                if (!isClosed) return true;
+                return selectedWorkOrderId && orderId === selectedWorkOrderId;
+            })
+            .sort((a, b) => String(b.date || '').localeCompare(String(a.date || '')));
     }, [selectedTask, workOrders]);
 
     useEffect(() => {
@@ -553,10 +615,20 @@ export default function FleetDashboardShell({ initialSection = 'dashboard', page
         }
     }, [currentPage, totalPages]);
 
+    useEffect(() => {
+        if (serviceRecordsPage > serviceRecordsTotalPages) {
+            setServiceRecordsPage(serviceRecordsTotalPages);
+        }
+    }, [serviceRecordsPage, serviceRecordsTotalPages]);
+
     useEffect(() => {
         setCurrentPage(1);
     }, [workOrderScope, hydratedSelectedVehicleId]);
 
+    useEffect(() => {
+        setServiceRecordsPage(1);
+    }, [hydratedSelectedVehicleId]);
+
     useEffect(() => {
         if (!expandedServiceTaskId) return;
         const exists = serviceTaskGroups.some((group) => String(group.id) === String(expandedServiceTaskId));
@@ -588,7 +660,7 @@ export default function FleetDashboardShell({ initialSection = 'dashboard', page
             await updateWorkOrder(workOrder.id, changes);
             showToast('Nalog je uspješno ažuriran.', 'success');
             await fetchFleetDashboardData({ silent: true });
-            await fetchTasks();
+            await fetchTasks({ force: true });
         } catch (error) {
             showToast(error?.message || 'Ažuriranje naloga nije uspjelo.', 'error');
         }
@@ -701,9 +773,6 @@ export default function FleetDashboardShell({ initialSection = 'dashboard', page
         <AnimatedPage className="min-h-screen">
             <main className="min-w-0">
                 <DashboardTopbar
-                    activeSection={activeSection}
-                    onSectionChange={setActiveSection}
-                    showSectionNav={false}
                     onOpenWorkOrderModal={async () => {
                         try {
                             const availableCranes = await ensureVehiclesCatalog();
@@ -736,30 +805,92 @@ export default function FleetDashboardShell({ initialSection = 'dashboard', page
                     )}
 
                     {isDashboardPage && (
-                        <div id="section-dashboard" className="grid gap-4 md:grid-cols-2 xl:grid-cols-4">
+                        <div id="section-dashboard" className="grid grid-cols-2 gap-3 sm:grid-cols-3 xl:grid-cols-5">
-                            <article className="rounded-xl border border-border-hairline bg-canvas-elevated p-4 shadow-sm">
+                            {/* Otvoreni nalozi */}
-                                <p className="text-sm text-text-muted">Otvoreni nalozi</p>
+                            <a
-                                <p className="mt-2 text-2xl font-semibold text-text-main">{stats.openWorkOrders}</p>
+                                href="/putni-nalozi"
+                                className="group flex flex-col gap-0.5 rounded-xl border border-border-hairline bg-canvas-elevated px-3 py-2.5 shadow-sm transition-all hover:border-indigo-300 hover:bg-indigo-50/60 hover:shadow-md"
+                            >
+                                <p className="text-xs text-text-muted group-hover:text-indigo-700">Otvoreni nalozi</p>
+                                <p className="text-xl font-semibold text-text-main">{stats.openWorkOrders}</p>
+                                {hydratedSelectedVehicleId && contextStats !== null && (
+                                    <p className="text-[10px] text-indigo-600">{contextStats.openWorkOrders} u kontekstu</p>
+                                )}
+                            </a>
+
+                            {/* Servisi danas */}
+                            <a
+                                href="/servisni-zapisi"
+                                className="group flex flex-col gap-0.5 rounded-xl border border-border-hairline bg-canvas-elevated px-3 py-2.5 shadow-sm transition-all hover:border-indigo-300 hover:bg-indigo-50/60 hover:shadow-md"
+                            >
+                                <p className="text-xs text-text-muted group-hover:text-indigo-700">Servisi danas</p>
+                                <p className="text-xl font-semibold text-text-main">{stats.servicesToday}</p>
+                                {hydratedSelectedVehicleId && contextStats !== null && (
+                                    <p className="text-[10px] text-indigo-600">{contextStats.servicesToday} u kontekstu</p>
+                                )}
+                            </a>
+
+                            {/* Bez putnog naloga */}
+                            <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">Bez put. naloga</p>
+                                <p className={`text-xl font-semibold ${stats.tasksWithoutWorkOrder > 0 ? 'text-amber-600' : 'text-text-main'}`}>
+                                    {stats.tasksWithoutWorkOrder}
+                                </p>
+                                <p className="text-[10px] text-text-muted">aktivnih zadataka</p>
                             </article>
-                            <article className="rounded-xl border border-border-hairline bg-canvas-elevated p-4 shadow-sm">
+
-                                <p className="text-sm text-text-muted">Servisi danas</p>
+                            {/* Dovršeni nalozi */}
-                                <p className="mt-2 text-2xl font-semibold text-text-main">{stats.servicesToday}</p>
+                            <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-xl font-semibold text-emerald-600">{stats.closedWorkOrders}</p>
+                                {stats.totalWorkOrders > 0 && (
+                                    <p className="text-[10px] text-text-muted">
+                                        {Math.round((stats.closedWorkOrders / stats.totalWorkOrders) * 100)}% / {stats.totalWorkOrders} ukupno
+                                    </p>
+                                )}
                             </article>
-                            <article className="rounded-xl border border-border-hairline bg-canvas-elevated p-4 shadow-sm">
+
-                                <p className="text-sm text-text-muted">Upozorenja</p>
+                            {/* Moji zadaci danas */}
-                                <p className="mt-2 text-2xl font-semibold text-amber-600">{stats.warnings}</p>
+                            <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>
+                                <p className="text-xs text-text-muted">Moji danas</p>
-                            <article className="rounded-xl border border-border-hairline bg-canvas-elevated p-4 shadow-sm">
+                                <p className={`text-xl font-semibold ${myTasksToday > 0 ? 'text-indigo-600' : 'text-text-main'}`}>
-                                <p className="text-sm text-text-muted">Dovršeni nalozi</p>
+                                    {hasMounted ? myTasksToday : '—'}
-                                <p className="mt-2 text-2xl font-semibold text-emerald-600">{stats.closedWorkOrders}</p>
+                                </p>
+                                <p className="text-[10px] text-text-muted">planirani na mene</p>
                             </article>
                         </div>
                     )}
                     {isDashboardPage && (
                         <article className="overflow-hidden rounded-xl border border-border-hairline bg-canvas-elevated shadow-sm">
-                            <div className="flex items-center justify-between border-b border-border-hairline px-4 py-3">
+                            <div className="flex flex-wrap items-center justify-between gap-2 border-b border-border-hairline px-4 py-3">
                                 <h3 className="font-semibold text-text-main">Radni zadaci</h3>
-                                <div className="flex items-center gap-2 text-xs">
+                                <div className="flex flex-wrap items-center gap-2 text-xs">
+                                    {/* Crane context filter */}
+                                    {hasMounted && hydratedSelectedVehicleId && (
+                                        <>
+                                            <span className="text-text-muted">|</span>
+                                            <button
+                                                type="button"
+                                                onClick={() => setTaskCraneFilter('all')}
+                                                className={taskCraneFilter === 'all'
+                                                    ? 'rounded-md bg-emerald-50 px-2.5 py-1 font-semibold text-emerald-700'
+                                                    : 'rounded-md px-2.5 py-1 text-text-main hover:bg-canvas-deep'}
+                                            >
+                                                Sve dizalice
+                                            </button>
+                                            <button
+                                                type="button"
+                                                onClick={() => setTaskCraneFilter('context')}
+                                                className={taskCraneFilter === 'context'
+                                                    ? 'rounded-md bg-emerald-50 px-2.5 py-1 font-semibold text-emerald-700'
+                                                    : 'rounded-md px-2.5 py-1 text-text-main hover:bg-canvas-deep'}
+                                                title={contextCraneLabel ?? undefined}
+                                            >
+                                                Odabrani kontekst
+                                            </button>
+                                            <span className="text-text-muted">|</span>
+                                        </>
+                                    )}
                                     {hasMounted && isSupervisorNotServiser && (
                                         <label className="flex items-center gap-2 text-text-main">
                                             <span>Serviser</span>
@@ -884,9 +1015,15 @@ export default function FleetDashboardShell({ initialSection = 'dashboard', page
                         </article>
                     )}
                     {isDashboardPage && (
-                        <div>
+                        <details className="overflow-hidden rounded-xl border border-border-hairline bg-canvas-elevated shadow-sm">
-                            <SyncLogPanel />
+                            <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">
-                        </div>
+                                <span>Sync log</span>
+                                <span className="text-xs opacity-60">▾</span>
+                            </summary>
+                            <div className="border-t border-border-hairline">
+                                <SyncLogPanel />
+                            </div>
+                        </details>
                     )}
 
                     {showWorkOrders && (
@@ -947,7 +1084,7 @@ export default function FleetDashboardShell({ initialSection = 'dashboard', page
                                 workOrderScope === 'context'
                                     ? (!hydratedSelectedVehicleId
                                         ? 'Odaberite dizalicu za prikaz putnih naloga iz servisnog konteksta.'
-                                        : 'Nema dostupnih putnih naloga za odabrani servisni kontekst.')
+                                        : 'Nema dostupnih putnih naloga za odabrani servisni kontekst. Možete prebaciti na prikaz svih naloga.')
                                     : 'Nema dostupnih putnih naloga.'
                             }
                             renderRow={(workOrder) => (
@@ -961,10 +1098,51 @@ export default function FleetDashboardShell({ initialSection = 'dashboard', page
                                     <td
                                         className="px-4 py-3"
                                     >
-                                        {[workOrder.craneInfo?.make, workOrder.craneInfo?.model].filter(Boolean).join(' ') || workOrder.craneLabel || workOrder.craneInfo?.registration_number || `#${workOrder.crane || workOrder.vehicle}`}
+                                        {(() => {
+                                            const sharedCranes = workOrderSharedCranes.get(String(workOrder.id));
+                                            if (sharedCranes && sharedCranes.size > 0) {
+                                                return (
+                                                    <div className="flex flex-col gap-0.5">
+                                                        {[...sharedCranes.values()].map((c) => {
+                                                                            const craneName = [c.make, c.model].filter(Boolean).join(' ') || c.registration_number || `#${c.id}`;
+                                                                            return (
+                                                                                <span key={c.id}>
+                                                                                    {craneName}
+                                                                                    {c.client_name && (
+                                                                                        <span className="text-text-muted text-xs ml-1">({c.client_name})</span>
+                                                                                    )}
+                                                                                </span>
+                                                                            );
+                                                                        })}
+                                                    </div>
+                                                );
+                                            }
+                                            return (
+                                                <span>
+                                                    {[workOrder.craneInfo?.make, workOrder.craneInfo?.model].filter(Boolean).join(' ')
+                                                        || workOrder.craneLabel
+                                                        || workOrder.craneInfo?.registration_number
+                                                        || `#${workOrder.crane || workOrder.vehicle}`}
+                                                    {workOrder.craneInfo?.client_name && (
+                                                        <span className="text-text-muted text-xs ml-1">({workOrder.craneInfo.client_name})</span>
+                                                    )}
+                                                </span>
+                                            );
+                                        })()}
                                     </td>
                                     <td className="px-4 py-3 font-mono text-xs text-text-muted">
-                                        {workOrder.craneInfo?.crane_serial_number || '-'}
+                                        {(() => {
+                                            const sharedCranes = workOrderSharedCranes.get(String(workOrder.id));
+                                            if (sharedCranes && sharedCranes.size > 0) {
+                                                const sns = [...sharedCranes.values()].map((c) => c.crane_serial_number || '-');
+                                                return (
+                                                    <div className="flex flex-col gap-0.5">
+                                                        {sns.map((sn, i) => <span key={i}>{sn}</span>)}
+                                                    </div>
+                                                );
+                                            }
+                                            return workOrder.craneInfo?.crane_serial_number || '-';
+                                        })()}
                                     </td>
                                     <td className="px-4 py-3">
                                         {formatDate(workOrder.date)}
@@ -988,7 +1166,7 @@ export default function FleetDashboardShell({ initialSection = 'dashboard', page
                                             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"
                                         >
-                                            📷
+                                            Foto
                                         </button>
                                     </td>
                                 </>
@@ -1057,9 +1235,80 @@ export default function FleetDashboardShell({ initialSection = 'dashboard', page
                             </div>
                         </div>
                         {!hydratedSelectedVehicleId && (
-                            <p className="px-4 py-6 text-center text-sm text-text-muted">
+                            <div>
-                                Odaberite dizalicu za prikaz servisnih zapisa.
+                                <p className="border-b border-border-hairline px-4 py-3 text-xs text-text-muted">
-                            </p>
+                                    Odaberite dizalicu u servisnom kontekstu za prikaz zapisa po radnim zadacima.
+                                    Ispod su prikazani svi servisni zapisi.
+                                </p>
+                                {recentServiceRecords.length === 0 ? (
+                                    <p className="px-4 py-6 text-center text-sm text-text-muted">Nema servisnih zapisa.</p>
+                                ) : (
+                                    <>
+                                        <AnimatedDataTable
+                                            columns={[
+                                                { key: 'date', label: 'Datum', className: 'px-4 py-3' },
+                                                { key: 'crane', label: 'Dizalica', 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: 'actions', label: 'Akcije', className: 'px-4 py-3' },
+                                            ]}
+                                            rows={paginatedRecentServiceRecords}
+                                            rowKey={(r) => r.id}
+                                            rowClassName="hover:bg-canvas-deep"
+                                            renderRow={(record) => (
+                                                <>
+                                                    <td className="px-4 py-3">{formatDate(record.service_date)}</td>
+                                                    <td className="px-4 py-3">{formatServiceRecordCraneLabel(record, cranes)}</td>
+                                                    <td className="max-w-xs truncate px-4 py-3" title={record.description || ''}>
+                                                        {record.description || '-'}
+                                                    </td>
+                                                    <td className="px-4 py-3">{formatCost(record.cost)}</td>
+                                                    <td className="px-4 py-3">
+                                                        <button
+                                                            type="button"
+                                                            onClick={() => {
+                                                                setServiceRecordBackTask(null);
+                                                                setSelectedServiceRecord(record);
+                                                            }}
+                                                            className="rounded border border-border-hairline px-2 py-1 text-xs text-text-main hover:bg-canvas-base"
+                                                        >
+                                                            Detalji
+                                                        </button>
+                                                    </td>
+                                                </>
+                                            )}
+                                        />
+                                        <div className="flex items-center justify-between border-t border-border-hairline px-4 py-3 text-sm">
+                                            <span className="text-text-muted">
+                                                Prikaz {recentServiceRecords.length ? (serviceRecordsPage - 1) * serviceRecordsPageSize + 1 : 0}
+                                                -
+                                                {recentServiceRecords.length ? Math.min(serviceRecordsPage * serviceRecordsPageSize, recentServiceRecords.length) : 0} od {recentServiceRecords.length}
+                                            </span>
+                                            <div className="flex items-center gap-2">
+                                                <button
+                                                    type="button"
+                                                    onClick={() => setServiceRecordsPage((page) => Math.max(1, page - 1))}
+                                                    disabled={serviceRecordsPage <= 1}
+                                                    className="rounded border border-border-hairline px-2 py-1 text-text-main hover:bg-canvas-deep disabled:opacity-50"
+                                                >
+                                                    Prethodna
+                                                </button>
+                                                <span className="text-text-muted">
+                                                    {serviceRecordsPage}/{serviceRecordsTotalPages}
+                                                </span>
+                                                <button
+                                                    type="button"
+                                                    onClick={() => setServiceRecordsPage((page) => Math.min(serviceRecordsTotalPages, page + 1))}
+                                                    disabled={serviceRecordsPage >= serviceRecordsTotalPages}
+                                                    className="rounded border border-border-hairline px-2 py-1 text-text-main hover:bg-canvas-deep disabled:opacity-50"
+                                                >
+                                                    Sljedeća
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </>
+                                )}
+                            </div>
                         )}
                         {hydratedSelectedVehicleId && loading && (
                             <p className="px-4 py-6 text-center text-sm text-text-muted">
@@ -1077,22 +1326,33 @@ export default function FleetDashboardShell({ initialSection = 'dashboard', page
                                     const isOpen = String(expandedServiceTaskId || '') === String(group.id);
                                     return (
                                         <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 && (
                                                 <div className="border-t border-border-hairline bg-canvas-base/50 px-4 py-3">
                                                     {group.records.length === 0 ? (
@@ -1140,7 +1400,7 @@ export default function FleetDashboardShell({ initialSection = 'dashboard', page
                                                                             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"
                                                                         >
-                                                                            📎 Dodaj datoteke
+                                                                            Dodaj datoteke
                                                                         </button>
                                                                     </td>
                                                                 </>
@@ -1159,7 +1419,7 @@ export default function FleetDashboardShell({ initialSection = 'dashboard', page
 
                     {showClients && (
                         <>
-                            {/* ── Tablica klijenata i njihovih dizalica ───────── */}
+                            {/* Tablica klijenata i njihovih dizalica */}
                             <div id="section-clients">
                                 <ClientsSection
                                     onSetServiceContext={handleSetServiceContextForCraneId}

frontend/src/components/dashboard/TaskCreateModal.jsx

@@ -2,6 +2,7 @@
 import { createTask, fetchTaskTemplates, getStatusLabel } from '../../stores/taskStore';
 import { formatPurposeLabel, formatWorkOrderDisplayCode } from '../../lib/displayIds';
 import ModalShell from '../ui/ModalShell';
+import { updateVehicle } from '../../stores/fleetDashboardStore';
 
 const STATUS_OPTIONS = ['aktivan', 'servis', 'zavrsen', 'neaktivan'];
 
@@ -13,6 +14,17 @@ const INITIAL_FORM = {
     scheduled_date: '',
 };
 
+function todayIso() {
+    return new Date().toISOString().slice(0, 10);
+}
+
+function formatWODate(dateStr) {
+    if (!dateStr) return '';
+    const d = new Date(dateStr);
+    if (Number.isNaN(d.getTime())) return '';
+    return d.toLocaleDateString('hr-HR');
+}
+
 export default function TaskCreateModal({ open, workOrders = [], contextCrane = null, onClose, onSuccess }) {
     const [form, setForm] = useState(INITIAL_FORM);
     const [submitting, setSubmitting] = useState(false);
@@ -21,6 +33,10 @@ export default function TaskCreateModal({ open, workOrders = [], contextCrane =
     const [templateLoading, setTemplateLoading] = useState(false);
     const [templateId, setTemplateId] = 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(
         () => templates.find((template) => String(template.id) === String(templateId)) || null,
@@ -40,8 +56,22 @@ export default function TaskCreateModal({ open, workOrders = [], contextCrane =
             setTemplateId('');
             setTemplates([]);
             setTemplateLoading(false);
+            setCraneDataModalOpen(false);
+            setCraneDataForm({ superstructure_working_hours: '', chassis_working_hours: '', current_mileage: '' });
+            setSavingCraneData(false);
+            setCraneDataError('');
+            return;
         }
-    }, [open]);
+        // Auto-pre-select today's open work order if exactly one exists for this crane
+        const today = todayIso();
+        const todayOpen = workOrders.filter(
+            (wo) => String(wo?.status || '').toLowerCase() !== 'closed'
+                && String(wo?.date || '').slice(0, 10) === today
+        );
+        if (todayOpen.length === 1) {
+            setForm((prev) => ({ ...prev, work_order: String(todayOpen[0].id) }));
+        }
+    }, [open]); // eslint-disable-line react-hooks/exhaustive-deps
 
     useEffect(() => {
         if (!selectedTemplate) return;
@@ -55,6 +85,60 @@ export default function TaskCreateModal({ open, workOrders = [], contextCrane =
         }));
     }, [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;
 
     function setField(name, value) {
@@ -135,6 +219,7 @@ export default function TaskCreateModal({ open, workOrders = [], contextCrane =
     }
 
     return (
+        <>
         <ModalShell
             onClose={onClose}
             overlayClassName="z-50 overflow-y-auto p-4 pt-20"
@@ -194,6 +279,39 @@ export default function TaskCreateModal({ open, workOrders = [], contextCrane =
                         </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">
                         <span className="font-medium text-text-main">Naslov zadatka *</span>
                         <input
@@ -254,12 +372,18 @@ export default function TaskCreateModal({ open, workOrders = [], contextCrane =
                                 className="rounded-lg border border-border-hairline bg-canvas-base px-3 py-2 text-text-main disabled:opacity-50"
                             >
                                 <option value="">— Bez povezanog naloga —</option>
-                                {availableWorkOrders.map((workOrder) => (
+                                {availableWorkOrders.map((workOrder) => {
-                                    <option key={workOrder.id} value={String(workOrder.id)}>
+                                    const isToday = String(workOrder.date || '').slice(0, 10) === todayIso();
-                                        {formatWorkOrderDisplayCode(workOrder)} • {workOrder.craneLabel || workOrder.craneInfo?.registration_number || '-'} • {formatPurposeLabel(workOrder.purpose) || '-'}
+                                    return (
-                                    </option>
+                                        <option key={workOrder.id} value={String(workOrder.id)}>
-                                ))}
+                                            {isToday ? '★ ' : ''}{formatWorkOrderDisplayCode(workOrder)} • {formatWODate(workOrder.date)} • {workOrder.craneLabel || workOrder.craneInfo?.registration_number || '-'} • {formatPurposeLabel(workOrder.purpose) || '-'}
+                                        </option>
+                                    );
+                                })}
                             </select>
+                            <span className="text-[11px] text-text-muted">
+                                Više zadataka može dijeliti isti putni nalog. Danas kreiran nalog označen je s ★.
+                            </span>
                             {templateMode && (
                                 <span className="text-[11px] text-text-muted">
                                     Kod template unosa nalog nije obavezan i backend ga neće automatski povezati.
@@ -299,5 +423,84 @@ export default function TaskCreateModal({ open, workOrders = [], contextCrane =
                 </form>
             </div>
         </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>
+            )}
+        </>
     );
 }
+

frontend/src/components/dashboard/TaskServiceRecordsModal.jsx

@@ -1,11 +1,16 @@
-import { useEffect, useMemo, useState } from 'preact/hooks';
+import { useEffect, useMemo, useState } from 'preact/hooks';
 import ModalShell from '../ui/ModalShell';
 import { formatWorkOrderDisplayCode } from '../../lib/displayIds';
 import { getStatusLabel } from '../../stores/taskStore';
 import { getTaskCraneDisplay, getTaskCraneOwner } from '../../lib/taskCraneDisplay';
+import { updateVehicle, $vehicles } from '../../stores/fleetDashboardStore';
 
 const STATUS_OPTIONS = ['aktivan', 'servis', 'spreman_za_zavrsetak', 'zavrsen', 'neaktivan'];
 
+function todayIso() {
+    return new Date().toISOString().slice(0, 10);
+}
+
 function formatDate(value) {
     if (!value) return '-';
     const parsed = new Date(value);
@@ -51,6 +56,10 @@ export default function TaskServiceRecordsModal({
         status: 'aktivan',
         scheduled_date: '',
     });
+    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('');
 
     useEffect(() => {
         if (!open || typeof window === 'undefined') return;
@@ -72,17 +81,79 @@ export default function TaskServiceRecordsModal({
             status: String(task.status || 'aktivan'),
             scheduled_date: String(task.scheduled_date || ''),
         });
+        setCraneDataModalOpen(false);
+        setCraneDataError('');
+        setSavingCraneData(false);
     }, [task?.id, task?.work_order]);
 
+    const openCraneDataModal = () => {
+        const craneVehicleId = task?.vehicle;
+        if (!craneVehicleId) return;
+        const craneVehicle = ($vehicles?.get?.() || []).find((v) => String(v.id) === String(craneVehicleId)) || null;
+        setCraneDataForm({
+            superstructure_working_hours: String(craneVehicle?.superstructure_working_hours ?? ''),
+            chassis_working_hours: String(craneVehicle?.chassis_working_hours ?? ''),
+            current_mileage: String(craneVehicle?.current_mileage ?? ''),
+        });
+        setCraneDataError('');
+        setCraneDataModalOpen(true);
+    };
+
+    const handleSaveCraneData = async () => {
+        const craneVehicleId = task?.vehicle;
+        if (!craneVehicleId) {
+            setCraneDataError('Dizalica nije pronađena.');
+            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 superstrukture 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('Kilometraža 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('Nije unesena niti jedna vrijednost za ažuriranje.');
+            return;
+        }
+        setSavingCraneData(true);
+        setCraneDataError('');
+        try {
+            await updateVehicle(craneVehicleId, payload);
+            setCraneDataModalOpen(false);
+        } catch (err) {
+            setCraneDataError(err?.message || 'Ažuriranje podataka dizalice nije uspjelo.');
+        } finally {
+            setSavingCraneData(false);
+        }
+    };
+
     const currentWorkOrder = useMemo(
         () => workOrders.find((item) => String(item.id) === String(task?.work_order || selectedWorkOrderId)) || null,
         [workOrders, task?.work_order, selectedWorkOrderId]
     );
 
-    const sortedWorkOrders = useMemo(
+    const sortedWorkOrders = useMemo(() => {
-        () => [...workOrders].sort((a, b) => String(b.date || '').localeCompare(String(a.date || ''))),
+        const today = todayIso();
-        [workOrders]
+        return [...workOrders].sort((a, b) => {
-    );
+            const aToday = String(a.date || '').slice(0, 10) === today ? 1 : 0;
+            const bToday = String(b.date || '').slice(0, 10) === today ? 1 : 0;
+            if (bToday !== aToday) return bToday - aToday;
+            return String(b.date || '').localeCompare(String(a.date || ''));
+        });
+    }, [workOrders]);
 
     const effectiveWorkOrderId = task?.work_order ? String(task.work_order) : String(selectedWorkOrderId || '');
 
@@ -157,6 +228,7 @@ export default function TaskServiceRecordsModal({
     if (!open || !task) return null;
 
     return (
+        <>
         <ModalShell
             onClose={onClose}
             overlayClassName="z-50 overflow-y-auto p-4 pt-2"
@@ -179,6 +251,15 @@ export default function TaskServiceRecordsModal({
                             >
                                 Postavi servisni kontekst
                             </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
                                 type="button"
                                 onClick={onClose}
@@ -228,7 +309,19 @@ export default function TaskServiceRecordsModal({
                                         </div>
                                         <div>
                                             <dt className="text-xs text-text-muted">Dizalica</dt>
-                                            <dd className="text-text-main">{getTaskCraneDisplay(task)}</dd>
+                                            <dd className="flex items-center gap-2 text-text-main">
+                                                <span>{getTaskCraneDisplay(task)}</span>
+                                                {task?.vehicle && (
+                                                    <button
+                                                        type="button"
+                                                        onClick={openCraneDataModal}
+                                                        className="rounded border border-border-hairline px-2 py-1 text-xs text-text-main hover:bg-canvas-base"
+                                                        title="Izmijeni radne sate i kilometrazu dizalice"
+                                                    >
+                                                        Uredi podatke
+                                                    </button>
+                                                )}
+                                            </dd>
                                         </div>
                                         <div>
                                             <dt className="text-xs text-text-muted">Putni nalog</dt>
@@ -355,7 +448,7 @@ export default function TaskServiceRecordsModal({
                                 {currentWorkOrder && !showWorkOrderEditor ? (
                                     <div className="flex flex-wrap items-center justify-between gap-2 rounded border border-border-hairline bg-canvas-elevated px-3 py-2">
                                         <p className="text-sm text-text-main">
-                                            {formatWorkOrderDisplayCode(currentWorkOrder)} • {currentWorkOrder.craneLabel || currentWorkOrder.craneInfo?.registration_number || '-'} • {currentWorkOrder.status || '-'}
+                                            {formatWorkOrderDisplayCode(currentWorkOrder)} • {formatDate(currentWorkOrder.date)} • {currentWorkOrder.craneLabel || currentWorkOrder.craneInfo?.registration_number || '-'} • {currentWorkOrder.status || '-'}
                                         </p>
                                         <button
                                             type="button"
@@ -374,14 +467,19 @@ export default function TaskServiceRecordsModal({
                                             className="w-full rounded-lg border border-border-hairline bg-canvas-elevated px-3 py-2 text-sm text-text-main disabled:opacity-60"
                                         >
                                             <option value="">— Odaberi putni nalog —</option>
-                                            {sortedWorkOrders.map((workOrder) => (
+                                            {sortedWorkOrders.map((workOrder) => {
-                                                <option key={workOrder.id} value={String(workOrder.id)}>
+                                                const isToday = String(workOrder.date || '').slice(0, 10) === todayIso();
-                                                    {formatWorkOrderDisplayCode(workOrder)} • {workOrder.craneLabel || workOrder.craneInfo?.registration_number || '-'} • {workOrder.status || '-'}
+                                                return (
-                                                </option>
+                                                    <option key={workOrder.id} value={String(workOrder.id)}>
-                                            ))}
+                                                        {isToday ? '★ ' : ''}{formatWorkOrderDisplayCode(workOrder)} • {formatDate(workOrder.date)} • {workOrder.craneLabel || workOrder.craneInfo?.registration_number || '-'} • {workOrder.status || '-'}
+                                                    </option>
+                                                );
+                                            })}
                                         </select>
                                         <p className="text-xs text-text-muted">
-                                            {assigningWorkOrder ? 'Spremanje odabira putnog naloga...' : 'Odabir se automatski sprema u bazu.'}
+                                            {assigningWorkOrder
+                                                ? 'Spremanje odabira putnog naloga...'
+                                                : 'Isti putni nalog možete dodijeliti više zadataka. Danas (★) su prikazani prvo.'}
                                         </p>
                                     </div>
                                 )}
@@ -448,5 +546,81 @@ export default function TaskServiceRecordsModal({
                     </div>
                 </div>
             </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="p-4 space-y-4">
+                        <p className="text-sm text-text-muted">
+                            Ažurirajte radne sate i kilometražu za dizalicu: <strong>{getTaskCraneDisplay(task)}</strong>
+                        </p>
+                        <label className="flex flex-col gap-1 text-sm">
+                            <span className="text-xs text-text-muted">Radni sati superstrukture</span>
+                            <input
+                                type="number"
+                                min="0"
+                                step="0.01"
+                                value={craneDataForm.superstructure_working_hours}
+                                onInput={(e) => setCraneDataForm((p) => ({ ...p, superstructure_working_hours: e.currentTarget.value }))}
+                                disabled={savingCraneData}
+                                className="rounded-lg border border-border-hairline bg-canvas-elevated px-3 py-2 text-text-main disabled:opacity-60"
+                                placeholder="npr. 1250.5"
+                            />
+                        </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={(e) => setCraneDataForm((p) => ({ ...p, chassis_working_hours: e.currentTarget.value }))}
+                                disabled={savingCraneData}
+                                className="rounded-lg border border-border-hairline bg-canvas-elevated px-3 py-2 text-text-main disabled:opacity-60"
+                                placeholder="npr. 980.0"
+                            />
+                        </label>
+                        <label className="flex flex-col gap-1 text-sm">
+                            <span className="text-xs text-text-muted">Trenutna kilometraža (km)</span>
+                            <input
+                                type="number"
+                                min="0"
+                                step="1"
+                                value={craneDataForm.current_mileage}
+                                onInput={(e) => setCraneDataForm((p) => ({ ...p, current_mileage: e.currentTarget.value }))}
+                                disabled={savingCraneData}
+                                className="rounded-lg border border-border-hairline bg-canvas-elevated px-3 py-2 text-text-main disabled:opacity-60"
+                                placeholder="npr. 45000"
+                            />
+                        </label>
+                        {craneDataError && (
+                            <p className="rounded-lg border border-red-200 bg-red-50 px-3 py-2 text-sm text-red-700">{craneDataError}</p>
+                        )}
+                        <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 text-text-main hover:bg-canvas-base disabled:opacity-50"
+                            >
+                                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-50"
+                            >
+                                {savingCraneData ? 'Spremam…' : 'Spremi podatke'}
+                            </button>
+                        </div>
+                    </div>
+                </ModalShell>
+            )}
+        </>
     );
 }

frontend/src/components/dashboard/TaskWorkHoursTableModal.jsx

@@ -116,6 +116,7 @@ const FIELD_CONFIGS = [
 ];
 
 const DAY_OPTIONS = ['', 'PON', 'UTO', 'SRI', 'ČET', 'PET', 'SUB', 'NED'];
+const DAY_LABELS_BY_INDEX = ['NED', 'PON', 'UTO', 'SRI', 'ČET', 'PET', 'SUB'];
 
 const FB_INPUT = [
     'block w-full rounded-lg border border-gray-300 bg-gray-50 px-2.5 py-2 text-xs',
@@ -137,6 +138,7 @@ const FB_MUTED = [
 export default function TaskWorkHoursTableModal({
     open,
     task,
+    workOrder = null,
     defaultLocation = '',
     saving = false,
     onClose,
@@ -144,15 +146,45 @@ export default function TaskWorkHoursTableModal({
 }) {
     const [rows, setRows] = useState([]);
 
+    const getDefaultDayDate = (fallbackToToday = false) => {
+        const raw = String(task?.scheduled_date || '').trim();
+        const match = raw.match(/^(\d{4})-(\d{2})-(\d{2})$/);
+        if (match) {
+            const year = Number(match[1]);
+            const month = Number(match[2]);
+            const day = Number(match[3]);
+            const date = new Date(year, month - 1, day);
+            if (!Number.isNaN(date.getTime())) {
+                return {
+                    day: DAY_LABELS_BY_INDEX[date.getDay()] || '',
+                    date: `${String(day).padStart(2, '0')}.${String(month).padStart(2, '0')}.${year}`,
+                };
+            }
+        }
+        if (!fallbackToToday) {
+            return { day: '', date: '' };
+        }
+        const today = new Date();
+        return {
+            day: DAY_LABELS_BY_INDEX[today.getDay()] || '',
+            date: `${String(today.getDate()).padStart(2, '0')}.${String(today.getMonth() + 1).padStart(2, '0')}.${today.getFullYear()}`,
+        };
+    };
+
     useEffect(() => {
         if (!open) { setRows([]); return; }
         const incoming = Array.isArray(task?.work_hours_table?.rows) ? task.work_hours_table.rows : [];
+        const defaultDayDate = getDefaultDayDate(false);
         setRows(
             incoming.length > 0
                 ? incoming.map((r) => ({ ...EMPTY_ROW, ...(r || {}) }))
-                : [{ ...EMPTY_ROW }, { ...EMPTY_ROW }, { ...EMPTY_ROW }],
+                : [
+                    { ...EMPTY_ROW, ...defaultDayDate },
+                    { ...EMPTY_ROW, ...defaultDayDate },
+                    { ...EMPTY_ROW, ...defaultDayDate },
+                ],
         );
-    }, [open, task?.id, task?.work_hours_table]);
+    }, [open, task?.id, task?.scheduled_date, task?.work_hours_table]);
 
     if (!open || !task) return null;
 
@@ -251,20 +283,15 @@ export default function TaskWorkHoursTableModal({
     const addRow = () => setRows((prev) => [...prev, { ...EMPTY_ROW }]);
 
     const addThreeRows = () => {
-        const today     = new Date();
+        const defaults = getDefaultDayDate(true);
-        const dd        = String(today.getDate()).padStart(2, '0');
-        const mm        = String(today.getMonth() + 1).padStart(2, '0');
-        const dateStr   = `${dd}.${mm}.${today.getFullYear()}`;
-        const dayLabels = ['NED', 'PON', 'UTO', 'SRI', 'ČET', 'PET', 'SUB'];
-        const dayLabel  = dayLabels[today.getDay()];
         const gid       = newGroupId();
         const loc       = defaultLocation || '';
 
         setRows((prev) => [
             ...prev,
-            { ...EMPTY_ROW, day: dayLabel, date: dateStr, departure_place: 'Zagreb', arrival_place: loc, _groupId: gid, _role: 'departure' },
+            { ...EMPTY_ROW, day: defaults.day, date: defaults.date, departure_place: 'Zagreb', arrival_place: loc, _groupId: gid, _role: 'departure' },
-            { ...EMPTY_ROW, day: dayLabel, date: dateStr,                                                                 _groupId: gid, _role: 'work'      },
+            { ...EMPTY_ROW, day: defaults.day, date: defaults.date,                                                       _groupId: gid, _role: 'work'      },
-            { ...EMPTY_ROW, day: dayLabel, date: dateStr, departure_place: loc,       arrival_place: 'Zagreb',            _groupId: gid, _role: 'return'    },
+            { ...EMPTY_ROW, day: defaults.day, date: defaults.date, departure_place: loc,       arrival_place: 'Zagreb', _groupId: gid, _role: 'return'    },
         ]);
     };
 
@@ -337,6 +364,39 @@ export default function TaskWorkHoursTableModal({
 
                 <div className="space-y-4 overflow-y-auto px-5 py-4">
 
+                    {/* ── read-only work order travel data ── */}
+                    {workOrder && (
+                        <div className="rounded-lg border border-amber-200 bg-amber-50 px-3 py-2.5 text-xs dark:border-amber-800 dark:bg-amber-900/20">
+                            <p className="mb-1.5 font-semibold text-amber-800 dark:text-amber-300">Podaci iz putnog naloga (samo za prikaz)</p>
+                            <div className="grid grid-cols-2 gap-x-4 gap-y-1 text-amber-900 dark:text-amber-200 sm:grid-cols-3">
+                                {workOrder.origin_location && (
+                                    <div><span className="font-medium">Ishodište:</span> {workOrder.origin_location}</div>
+                                )}
+                                {workOrder.location && (
+                                    <div><span className="font-medium">Odredište:</span> {workOrder.location}</div>
+                                )}
+                                {workOrder.travel_start_at && (
+                                    <div><span className="font-medium">Polazak:</span> {new Date(workOrder.travel_start_at).toLocaleString('hr-HR', { dateStyle: 'short', timeStyle: 'short' })}</div>
+                                )}
+                                {workOrder.travel_end_at && (
+                                    <div><span className="font-medium">Povratak:</span> {new Date(workOrder.travel_end_at).toLocaleString('hr-HR', { dateStyle: 'short', timeStyle: 'short' })}</div>
+                                )}
+                                {workOrder.start_mileage != null && (
+                                    <div><span className="font-medium">KM početak:</span> {workOrder.start_mileage}</div>
+                                )}
+                                {workOrder.end_mileage != null && (
+                                    <div><span className="font-medium">KM kraj:</span> {workOrder.end_mileage}</div>
+                                )}
+                                {workOrder.distance != null && (
+                                    <div><span className="font-medium">Prijeđeno km:</span> {workOrder.distance}</div>
+                                )}
+                                {workOrder.servicer_vehicle_registration && (
+                                    <div><span className="font-medium">Vozilo servisera:</span> {workOrder.servicer_vehicle_registration} {workOrder.servicer_vehicle_make_model || ''}</div>
+                                )}
+                            </div>
+                        </div>
+                    )}
+
                     {/* ── info banner ── */}
                     <div className="flex flex-wrap gap-x-4 gap-y-1 rounded-lg border border-blue-200 bg-blue-50 px-3 py-2 text-xs text-blue-800 dark:border-blue-800 dark:bg-blue-900/20 dark:text-blue-300">
                         <span><span className="font-semibold">Put (od–do):</span> unesi Put od/do → Sati puta se računaju automatski; Km vozila se popunjava ručno; polja Vr. rada su blokirana.</span>

frontend/src/components/dashboard/WorkOrderDetailModal.jsx

@@ -2,15 +2,19 @@ import { useEffect, useMemo, useState } from 'preact/hooks';
 import { useStore } from '@nanostores/preact';
 import WorkOrderImageCarousel from './WorkOrderImageCarousel';
 import WorkOrderPhotoUpload from '../fleet/WorkOrderPhotoUpload';
+import TaskCreateModal from './TaskCreateModal';
 import ModalShell from '../ui/ModalShell';
 import {
     createWorkOrderInvoice,
+    fetchTasksByWorkOrder,
     fetchTeamMembers,
     fetchWorkOrderInvoices,
     fetchWorkOrderImages,
     openWorkOrderInvoicesPdfPage,
     sendWorkOrderEmail,
+    updateVehicle,
 } from '../../stores/fleetDashboardStore';
+import { getStatusLabel } from '../../stores/taskStore';
 import { showToast } from '../../stores/toastStore';
 import { formatWorkOrderDisplayCode } from '../../lib/displayIds';
 import { $serviceNotes, $serviceNotesLoading, fetchServiceNotes } from '../../stores/serviceNotesStore';
@@ -81,6 +85,12 @@ export default function WorkOrderDetailModal({ open, workOrder, onClose, onSubmi
     const [selectedLocation, setSelectedLocation] = useState(null);
     const [searchingLocation, setSearchingLocation] = useState(false);
     const [mapError, setMapError] = useState('');
+    const [workOrderTasks, setWorkOrderTasks] = useState([]);
+    const [addTaskModalOpen, setAddTaskModalOpen] = useState(false);
+    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 craneLabel = useMemo(() => {
         if (!workOrder) return '-';
@@ -168,6 +178,12 @@ export default function WorkOrderDetailModal({ open, workOrder, onClose, onSubmi
         setSelectedLocation(null);
         setSearchingLocation(false);
         setMapError('');
+        setWorkOrderTasks([]);
+        setAddTaskModalOpen(false);
+        setCraneDataModalOpen(false);
+        setCraneDataForm({ superstructure_working_hours: '', chassis_working_hours: '', current_mileage: '' });
+        setSavingCraneData(false);
+        setCraneDataError('');
     }, [open, workOrder]);
 
     useEffect(() => {
@@ -251,6 +267,23 @@ export default function WorkOrderDetailModal({ open, workOrder, onClose, onSubmi
         };
     }, [open, workOrder?.id]);
 
+    useEffect(() => {
+        if (!open || !workOrder?.id) {
+            setWorkOrderTasks([]);
+            return;
+        }
+        let cancelled = false;
+        (async () => {
+            try {
+                const tasks = await fetchTasksByWorkOrder(workOrder.id);
+                if (!cancelled) setWorkOrderTasks(tasks);
+            } catch {
+                if (!cancelled) setWorkOrderTasks([]);
+            }
+        })();
+        return () => { cancelled = true; };
+    }, [open, workOrder?.id]);
+
     const selectedMapEmbedUrl = (() => {
         if (!selectedLocation) return null;
         const lat = Number(selectedLocation.lat);
@@ -265,6 +298,60 @@ export default function WorkOrderDetailModal({ open, workOrder, onClose, onSubmi
         return null;
     }
 
+    const craneVehicleId = workOrder.vehicle || workOrder.crane;
+    const craneVehicle = workOrder.craneInfo || null;
+
+    const openCraneDataModal = () => {
+        setCraneDataForm({
+            superstructure_working_hours: String(craneVehicle?.superstructure_working_hours ?? ''),
+            chassis_working_hours: String(craneVehicle?.chassis_working_hours ?? ''),
+            current_mileage: String(craneVehicle?.current_mileage ?? ''),
+        });
+        setCraneDataError('');
+        setCraneDataModalOpen(true);
+    };
+
+    const handleSaveCraneData = async () => {
+        if (!craneVehicleId) {
+            setCraneDataError('Dizalica nije pronađena.');
+            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 superstrukture 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('Kilometraža 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('Nije unesena niti jedna vrijednost za ažuriranje.');
+            return;
+        }
+        setSavingCraneData(true);
+        setCraneDataError('');
+        try {
+            await updateVehicle(craneVehicleId, payload);
+            showToast('Podaci dizalice su uspješno ažurirani.', 'success');
+            setCraneDataModalOpen(false);
+        } catch (err) {
+            setCraneDataError(err?.message || 'Ažuriranje podataka dizalice nije uspjelo.');
+        } finally {
+            setSavingCraneData(false);
+        }
+    };
+
     const searchLocation = async () => {
         const query = locationQuery.trim();
         if (!query) {
@@ -540,6 +627,33 @@ export default function WorkOrderDetailModal({ open, workOrder, onClose, onSubmi
                         )}
                     </div>
 
+                    <div className="rounded-xl border border-border-hairline bg-canvas-base p-3">
+                        <div className="mb-2 flex items-center justify-between">
+                            <h4 className="text-sm font-semibold text-text-main">Zadaci putnog naloga ({workOrderTasks.length})</h4>
+                            <button
+                                type="button"
+                                onClick={() => setAddTaskModalOpen(true)}
+                                className="rounded-md border border-border-hairline px-2 py-1 text-xs font-medium text-text-main hover:bg-canvas-deep"
+                            >
+                                + Dodaj zadatak
+                            </button>
+                        </div>
+                        {workOrderTasks.length === 0 ? (
+                            <p className="text-xs text-text-muted">Nema zadataka za ovaj putni nalog.</p>
+                        ) : (
+                            <ul className="space-y-1">
+                                {workOrderTasks.map((task) => (
+                                    <li key={task.id} className="flex items-center justify-between rounded-lg bg-canvas-deep px-3 py-2 text-sm">
+                                        <span className="font-medium text-text-main">{task.title}</span>
+                                        <span className="rounded-full bg-canvas-base px-2 py-0.5 text-[11px] text-text-muted border border-border-hairline">
+                                            {getStatusLabel(task.status)}
+                                        </span>
+                                    </li>
+                                ))}
+                            </ul>
+                        )}
+                    </div>
+
                     <div className="rounded-xl border border-border-hairline bg-canvas-base p-3">
                         <h4 className="mb-2 text-sm font-semibold text-text-main">Status</h4>
                         <label className="mb-3 flex flex-col gap-1 text-sm">
@@ -1165,6 +1279,99 @@ export default function WorkOrderDetailModal({ open, workOrder, onClose, onSubmi
                     }
                 }}
             />
+            <TaskCreateModal
+                open={addTaskModalOpen}
+                workOrders={[workOrder]}
+                contextCrane={craneVehicle || { id: craneVehicleId, registration_number: craneLabel }}
+                onClose={() => setAddTaskModalOpen(false)}
+                onSuccess={async () => {
+                    const tasks = await fetchTasksByWorkOrder(workOrder.id).catch(() => []);
+                    setWorkOrderTasks(tasks);
+                }}
+            />
+            {craneDataModalOpen && (
+                <ModalShell
+                    onClose={() => setCraneDataModalOpen(false)}
+                    overlayClassName="z-[60] overflow-y-auto p-4 pt-16"
+                    contentClassName="flex items-start justify-center min-h-full"
+                    panelClassName="w-full max-w-md rounded-xl border border-border-hairline bg-canvas-elevated shadow-xl"
+                >
+                    <div>
+                        <div className="flex items-center justify-between border-b border-border-hairline px-4 py-3">
+                            <div>
+                                <h4 className="text-sm font-semibold text-text-main">Izmijeni podatke dizalice</h4>
+                                <p className="text-xs text-text-muted">{craneLabel}</p>
+                            </div>
+                            <button
+                                type="button"
+                                onClick={() => setCraneDataModalOpen(false)}
+                                className="rounded-md px-2 py-1 text-sm text-text-muted hover:bg-canvas-deep"
+                                aria-label="Zatvori"
+                            >
+                                ✕
+                            </button>
+                        </div>
+                        <div className="space-y-4 px-4 py-4">
+                            <label className="flex flex-col gap-1 text-sm">
+                                <span className="font-medium text-text-main">Radni sati superstrukture</span>
+                                <input
+                                    type="number"
+                                    min="0"
+                                    value={craneDataForm.superstructure_working_hours}
+                                    onInput={(e) => setCraneDataForm((p) => ({ ...p, superstructure_working_hours: e.currentTarget.value }))}
+                                    className="rounded-lg border border-border-hairline bg-canvas-base px-3 py-2 text-text-main"
+                                    placeholder={String(craneVehicle?.superstructure_working_hours ?? '0')}
+                                />
+                            </label>
+                            <label className="flex flex-col gap-1 text-sm">
+                                <span className="font-medium text-text-main">Radni sati podvozja</span>
+                                <input
+                                    type="number"
+                                    min="0"
+                                    value={craneDataForm.chassis_working_hours}
+                                    onInput={(e) => setCraneDataForm((p) => ({ ...p, chassis_working_hours: e.currentTarget.value }))}
+                                    className="rounded-lg border border-border-hairline bg-canvas-base px-3 py-2 text-text-main"
+                                    placeholder={String(craneVehicle?.chassis_working_hours ?? '0')}
+                                />
+                            </label>
+                            <label className="flex flex-col gap-1 text-sm">
+                                <span className="font-medium text-text-main">Prijeđeni kilometri dizalice</span>
+                                <input
+                                    type="number"
+                                    min="0"
+                                    value={craneDataForm.current_mileage}
+                                    onInput={(e) => setCraneDataForm((p) => ({ ...p, current_mileage: e.currentTarget.value }))}
+                                    className="rounded-lg border border-border-hairline bg-canvas-base px-3 py-2 text-text-main"
+                                    placeholder={String(craneVehicle?.current_mileage ?? '0')}
+                                />
+                            </label>
+                            {craneDataError && (
+                                <div className="rounded-lg border border-red-200 bg-red-50 px-3 py-2 text-sm text-red-700">
+                                    {craneDataError}
+                                </div>
+                            )}
+                        </div>
+                        <div className="flex justify-end gap-2 border-t border-border-hairline px-4 py-3">
+                            <button
+                                type="button"
+                                onClick={() => setCraneDataModalOpen(false)}
+                                className="rounded-md border border-border-hairline px-3 py-2 text-xs font-medium text-text-main hover:bg-canvas-deep"
+                                disabled={savingCraneData}
+                            >
+                                Odustani
+                            </button>
+                            <button
+                                type="button"
+                                onClick={handleSaveCraneData}
+                                disabled={savingCraneData}
+                                className="rounded-md bg-indigo-600 px-3 py-2 text-xs font-semibold text-white hover:bg-indigo-700 disabled:opacity-60"
+                            >
+                                {savingCraneData ? 'Spremam…' : 'Spremi podatke'}
+                            </button>
+                        </div>
+                    </div>
+                </ModalShell>
+            )}
         </>
     );
 }

frontend/src/components/dashboard/WorkOrderInvoicesPdfPage.jsx

@@ -10,18 +10,20 @@ import {
     fetchWorkOrderAdditionalCostsTable,
     fetchWorkOrderById,
     fetchWorkOrderInvoices,
+    fetchWorkOrderTravelExpensesTable,
     fetchWorkOrderTaskServiceContext,
     updateTaskWorkHoursTable,
-    updateWorkOrder,
+    updateTaskServiceReportNote,
     updateWorkOrderAdditionalCostsTable,
+    updateWorkOrderTravelExpensesTable,
 } from '../../stores/fleetDashboardStore';
 import { $accessToken, $authReady, hydrateAuthFromStorage } from '../../stores/authStore';
 import { fetchNotifications, connectNotifications } from '../../stores/notificationStore';
 import { formatWorkOrderDisplayCode } from '../../lib/displayIds';
-import { showToast } from '../../stores/toastStore';
 import { useAuthenticatedMediaSources } from './WorkOrderImageCarousel';
 import TaskWorkHoursTableModal from './TaskWorkHoursTableModal';
 import WorkOrderAdditionalCostsModal from './WorkOrderAdditionalCostsModal';
+import WorkOrderTravelExpensesModal from './WorkOrderTravelExpensesModal';
 import WorkOrderServiceNotesModal from './WorkOrderServiceNotesModal';
 
 function readWorkOrderIdFromQuery() {
@@ -148,6 +150,7 @@ export default function WorkOrderInvoicesPdfPage() {
     const [workOrder, setWorkOrder] = useState(null);
     const [invoices, setInvoices] = useState([]);
     const [taskContext, setTaskContext] = useState({ tasks: [] });
+    const [travelExpensesTable, setTravelExpensesTable] = useState({ broj_sati: '0.00', kolicina_dnevnica: '0.00', iznos_dnevnica: '30.00', daily_rate_country: 'HR', total_for_payout: '0.00' });
     const [loading, setLoading] = useState(true);
     const [error, setError] = useState('');
     const [editingTask, setEditingTask] = useState(null);
@@ -155,9 +158,11 @@ export default function WorkOrderInvoicesPdfPage() {
     const [additionalCostsTable, setAdditionalCostsTable] = useState({ data: { rows: [] }, total_for_payout: '0.00' });
     const [editingAdditionalCosts, setEditingAdditionalCosts] = useState(false);
     const [savingAdditionalCosts, setSavingAdditionalCosts] = useState(false);
-    const [editingServiceReportNote, setEditingServiceReportNote] = useState(false);
+    const [editingTravelExpenses, setEditingTravelExpenses] = useState(false);
-    const [savingServiceReportNote, setSavingServiceReportNote] = useState(false);
+    const [savingTravelExpenses, setSavingTravelExpenses] = useState(false);
-    const [serviceReportNoteError, setServiceReportNoteError] = useState('');
+    const [editingTaskNote, setEditingTaskNote] = useState(null);
+    const [savingTaskNote, setSavingTaskNote] = useState(false);
+    const [taskNoteError, setTaskNoteError] = useState('');
     const [invoiceDetailModal, setInvoiceDetailModal] = useState(null);
 
     useEffect(() => {
@@ -193,11 +198,12 @@ export default function WorkOrderInvoicesPdfPage() {
 
         (async () => {
             try {
-                const [contextPayload, order, invoiceItems, additionalCostsPayload] = await Promise.all([
+                const [contextPayload, order, invoiceItems, additionalCostsPayload, travelExpensesPayload] = await Promise.all([
                     fetchWorkOrderTaskServiceContext(workOrderId),
                     fetchWorkOrderById(workOrderId),
                     fetchWorkOrderInvoices(workOrderId),
                     fetchWorkOrderAdditionalCostsTable(workOrderId),
+                    fetchWorkOrderTravelExpensesTable(workOrderId),
                 ]);
                 if (cancelled) {
                     return;
@@ -206,6 +212,13 @@ export default function WorkOrderInvoicesPdfPage() {
                 setWorkOrder(order);
                 setInvoices(invoiceItems);
                 setAdditionalCostsTable(additionalCostsPayload || contextPayload?.additional_costs_table || { data: { rows: [] }, total_for_payout: '0.00' });
+                setTravelExpensesTable(travelExpensesPayload || contextPayload?.travel_expenses_table || {
+                    broj_sati: '0.00',
+                    kolicina_dnevnica: '0.00',
+                    iznos_dnevnica: '30.00',
+                    daily_rate_country: 'HR',
+                    total_for_payout: '0.00',
+                });
             } catch (err) {
                 if (!cancelled) {
                     setError(err?.message || 'Neuspješno dohvaćanje podataka o računima.');
@@ -277,6 +290,29 @@ export default function WorkOrderInvoicesPdfPage() {
         }
     };
 
+    const handleSaveTaskServiceReportNote = async (note) => {
+        if (!editingTaskNote?.id) return;
+        setSavingTaskNote(true);
+        setTaskNoteError('');
+        try {
+            const updated = await updateTaskServiceReportNote(editingTaskNote.id, note);
+            setTaskContext((prev) => ({
+                ...prev,
+                tasks: (Array.isArray(prev.tasks) ? prev.tasks : []).map((task) => (
+                    String(task.id) === String(editingTaskNote.id)
+                        ? { ...task, service_report_note: updated?.service_report_note ?? note }
+                        : task
+                )),
+            }));
+            setEditingTaskNote(null);
+        } catch (err) {
+            const message = err?.message || 'Spremanje napomene nije uspjelo.';
+            setTaskNoteError(message);
+        } finally {
+            setSavingTaskNote(false);
+        }
+    };
+
     const handleSaveAdditionalCostsTable = async (tableData) => {
         if (!workOrderId) return;
         setSavingAdditionalCosts(true);
@@ -289,21 +325,21 @@ export default function WorkOrderInvoicesPdfPage() {
         }
     };
 
-    const handleSaveServiceReportNote = async (notes) => {
+    const handleSaveTravelExpensesTable = async (tableData) => {
         if (!workOrderId) return;
-        setSavingServiceReportNote(true);
+        setSavingTravelExpenses(true);
-        setServiceReportNoteError('');
         try {
-            const updated = await updateWorkOrder(workOrderId, { notes: String(notes || '') });
+            const response = await updateWorkOrderTravelExpensesTable(workOrderId, tableData);
-            setWorkOrder(updated);
+            setTravelExpensesTable(response || {
-            setEditingServiceReportNote(false);
+                broj_sati: '0.00',
-            showToast('Napomena za izvještaj servisera je spremljena.', 'success');
+                kolicina_dnevnica: '0.00',
-        } catch (err) {
+                iznos_dnevnica: '30.00',
-            const message = err?.message || 'Spremanje napomene nije uspjelo.';
+                daily_rate_country: 'HR',
-            setServiceReportNoteError(message);
+                total_for_payout: '0.00',
-            showToast(message, 'error');
+            });
+            setEditingTravelExpenses(false);
         } finally {
-            setSavingServiceReportNote(false);
+            setSavingTravelExpenses(false);
         }
     };
 
@@ -317,22 +353,32 @@ export default function WorkOrderInvoicesPdfPage() {
                             {workOrder ? `Dizalica: ${workOrder.crane_label || workOrder.crane || '-'}` : 'Pregled računa prije kreiranja PDF-a.'}
                         </p>
                     </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>
+                        <button
+                            type="button"
+                            onClick={() => setEditingTravelExpenses(true)}
+                            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"
+                        >
+                            Uredi obračun putnih troškova
+                        </button>
+                    </div>
                 </div>
             </div>
 
@@ -340,33 +386,13 @@ export default function WorkOrderInvoicesPdfPage() {
                 <div className="mb-3 flex flex-wrap items-center justify-between gap-2">
                     <h2 className="text-lg font-semibold text-text-main">Servisni zapisi</h2>
                     <div className="flex flex-wrap items-center gap-2">
-                        <button
-                            type="button"
-                            onClick={() => {
-                                const firstTask = Array.isArray(taskContext.tasks) ? taskContext.tasks[0] : null;
-                                if (!firstTask) return;
-                                setEditingTask(firstTask);
-                            }}
-                            disabled={!Array.isArray(taskContext.tasks) || taskContext.tasks.length === 0}
-                            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"
-                        >
-                            Uredi tablicu radnih sati
-                        </button>
-                        <button
-                            type="button"
-                            onClick={() => setEditingServiceReportNote(true)}
-                            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"
-                        >
-                            Uredi tekst napomene
-                        </button>
                         <button
                             type="button"
                             onClick={() => downloadWorkOrderServiceRecordsPdf(workOrderId)}
                             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 servisnih zapisa
+                            Preuzmi PDF svih servisnih zapisa
                         </button>
                         <button
                             type="button"
@@ -374,7 +400,7 @@ export default function WorkOrderInvoicesPdfPage() {
                             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 servisnih zapisa
+                            Preuzmi DOCX svih servisnih zapisa
                         </button>
                     </div>
                 </div>
@@ -386,13 +412,66 @@ export default function WorkOrderInvoicesPdfPage() {
                     <div className="space-y-4">
                         {taskContext.tasks.map((task) => (
                             <article key={task.id} className="rounded-lg border border-border-hairline bg-canvas-base p-3">
-                                <div className="space-y-1 text-sm text-text-main">
+                                <div className="mb-3 flex flex-wrap items-start justify-between gap-2">
-                                    <div><span className="font-semibold">Radni zadatak:</span> {task.title || '-'}</div>
+                                    <div className="space-y-1 text-sm text-text-main">
-                                    <div><span className="font-semibold">Status:</span> {task.status || '-'}</div>
+                                        <div><span className="font-semibold">Radni zadatak:</span> {task.title || '-'}</div>
-                                    <div><span className="font-semibold">Dodijeljeno:</span> {task.assigned_to_name || '-'}</div>
+                                        <div><span className="font-semibold">Status:</span> {task.status || '-'}</div>
-                                    <div><span className="font-semibold">Dizalica:</span> {task.vehicle_registration || '-'}</div>
+                                        <div><span className="font-semibold">Dodijeljeno:</span> {task.assigned_to_name || '-'}</div>
+                                        <div><span className="font-semibold">Dizalica:</span> {task.vehicle_registration || '-'}</div>
+                                        {task.service_report_note && (
+                                            <div className="mt-1 rounded bg-canvas-deep px-2 py-1 text-xs text-text-muted">
+                                                <span className="font-semibold">Napomena:</span> {task.service_report_note}
+                                            </div>
+                                        )}
+                                    </div>
+                                    <div className="flex flex-wrap gap-2">
+                                        <button
+                                            type="button"
+                                            onClick={() => setEditingTask(task)}
+                                            className="rounded-lg border border-border-hairline px-3 py-1.5 text-xs font-semibold text-text-main hover:bg-canvas-deep"
+                                        >
+                                            Uredi tablicu radnih sati
+                                        </button>
+                                        <button
+                                            type="button"
+                                            onClick={() => { setTaskNoteError(''); setEditingTaskNote(task); }}
+                                            className="rounded-lg border border-border-hairline px-3 py-1.5 text-xs font-semibold text-text-main hover:bg-canvas-deep"
+                                        >
+                                            Uredi tekst napomene
+                                        </button>
+                                        <button
+                                            type="button"
+                                            onClick={() => downloadWorkOrderServiceRecordsPdf(
+                                                workOrderId,
+                                                task.id,
+                                                {
+                                                    workOrderDisplayCode: workOrder?.display_code,
+                                                    taskTitle: task.title,
+                                                },
+                                            )}
+                                            disabled={!workOrderId || !task.id}
+                                            className="rounded-lg bg-indigo-600 px-3 py-1.5 text-xs font-semibold text-white hover:bg-indigo-700 disabled:opacity-60"
+                                        >
+                                            PDF za ovaj task
+                                        </button>
+                                        <button
+                                            type="button"
+                                            onClick={() => downloadWorkOrderServiceRecordsDocx(
+                                                workOrderId,
+                                                task.id,
+                                                {
+                                                    workOrderDisplayCode: workOrder?.display_code,
+                                                    taskTitle: task.title,
+                                                },
+                                            )}
+                                            disabled={!workOrderId || !task.id}
+                                            className="rounded-lg border border-border-hairline px-3 py-1.5 text-xs font-semibold text-text-main hover:bg-canvas-deep disabled:opacity-60"
+                                        >
+                                            DOCX za ovaj task
+                                        </button>
+                                    </div>
                                 </div>
-                                <div className="mt-3 space-y-3">
+                                <div className="space-y-3">
                                     {!Array.isArray(task.service_records) || task.service_records.length === 0 ? (
                                         <p className="text-xs text-text-muted">Nema povezanih servisnih zapisa.</p>
                                     ) : (
@@ -517,7 +596,8 @@ export default function WorkOrderInvoicesPdfPage() {
             <TaskWorkHoursTableModal
                 open={!!editingTask}
                 task={editingTask}
-                defaultLocation={workOrder?.location || ''}
+                workOrder={editingTask?.task_work_order ?? null}
+                defaultLocation={editingTask?.task_work_order?.location ?? ''}
                 saving={savingWorkHours}
                 onClose={() => setEditingTask(null)}
                 onSave={handleSaveWorkHoursTable}
@@ -530,16 +610,24 @@ export default function WorkOrderInvoicesPdfPage() {
                 onClose={() => setEditingAdditionalCosts(false)}
                 onSave={handleSaveAdditionalCostsTable}
             />
-            <WorkOrderServiceNotesModal
+            <WorkOrderTravelExpensesModal
-                open={editingServiceReportNote}
+                open={editingTravelExpenses}
                 workOrder={workOrder}
-                saving={savingServiceReportNote}
+                tableData={travelExpensesTable}
-                error={serviceReportNoteError}
+                saving={savingTravelExpenses}
+                onClose={() => setEditingTravelExpenses(false)}
+                onSave={handleSaveTravelExpensesTable}
+            />
+            <WorkOrderServiceNotesModal
+                open={!!editingTaskNote}
+                task={editingTaskNote}
+                saving={savingTaskNote}
+                error={taskNoteError}
                 onClose={() => {
-                    setEditingServiceReportNote(false);
+                    setEditingTaskNote(null);
-                    setServiceReportNoteError('');
+                    setTaskNoteError('');
                 }}
-                onSave={handleSaveServiceReportNote}
+                onSave={handleSaveTaskServiceReportNote}
             />
             {invoiceDetailModal && (
                 <InvoiceDetailModal

frontend/src/components/dashboard/WorkOrderServiceNotesModal.jsx

@@ -3,7 +3,7 @@ import ModalShell from '../ui/ModalShell';
 
 export default function WorkOrderServiceNotesModal({
     open,
-    workOrder,
+    task,
     saving = false,
     error = '',
     onClose,
@@ -16,8 +16,8 @@ export default function WorkOrderServiceNotesModal({
             setNotes('');
             return;
         }
-        setNotes(String(workOrder?.notes || ''));
+        setNotes(String(task?.service_report_note || ''));
-    }, [open, workOrder?.id, workOrder?.notes]);
+    }, [open, task?.id, task?.service_report_note]);
 
     if (!open) return null;
 
@@ -37,7 +37,9 @@ export default function WorkOrderServiceNotesModal({
                     <div>
                         <h3 className="text-base font-semibold text-text-main">UREDI TEKST NAPOMENE</h3>
                         <p className="text-xs text-text-muted">
-                            Tekst se prikazuje u PDF-u "Izvještaj servisera" na prvoj stranici.
+                            {task?.title
+                                ? `Zadatak: ${task.title}`
+                                : 'Tekst se prikazuje u PDF-u "Izvještaj servisera".'}
                         </p>
                     </div>
                     <button
@@ -56,11 +58,11 @@ export default function WorkOrderServiceNotesModal({
                             {error}
                         </div>
                     ) : null}
-                    <label htmlFor="work-order-notes" className="text-sm font-medium text-text-main">
+                    <label htmlFor="task-service-report-note" className="text-sm font-medium text-text-main">
                         Napomena
                     </label>
                     <textarea
-                        id="work-order-notes"
+                        id="task-service-report-note"
                         value={notes}
                         onInput={(event) => setNotes(event.currentTarget.value)}
                         rows={8}

frontend/src/components/dashboard/WorkOrderTravelExpensesModal.jsx

@@ -0,0 +1,203 @@
+import { useEffect, useMemo, useState } from 'preact/hooks';
+import ModalShell from '../ui/ModalShell';
+
+const RATE_OPTIONS = [
+    { value: 'HR', label: 'Hrvatska', amount: '30.00' },
+    { value: 'BIH', label: 'BiH', amount: '50.00' },
+    { value: 'SI', label: 'Slovenija', amount: '80.00' },
+    { value: 'CG', label: 'Crna Gora', amount: '50.00' },
+];
+
+const DEFAULT_ROW = {
+    broj_sati: '0.00',
+    kolicina_dnevnica: '0.00',
+    iznos_dnevnica: '30.00',
+    daily_rate_country: 'HR',
+};
+
+function parseAmount(value) {
+    const normalized = String(value || '').trim().replace('€', '').replace(/\s+/g, '').replace(',', '.');
+    const parsed = Number(normalized);
+    return Number.isFinite(parsed) ? parsed : 0;
+}
+
+function toDisplayValue(value) {
+    if (value == null || value === '') return '0.00';
+    const numeric = Number(String(value).replace(',', '.'));
+    return Number.isFinite(numeric) ? numeric.toFixed(2) : String(value);
+}
+
+function getRateAmount(country) {
+    const option = RATE_OPTIONS.find((item) => item.value === country);
+    return option ? option.amount : DEFAULT_ROW.iznos_dnevnica;
+}
+
+export default function WorkOrderTravelExpensesModal({
+    open,
+    workOrder,
+    tableData,
+    saving = false,
+    onClose,
+    onSave,
+}) {
+    const [row, setRow] = useState(DEFAULT_ROW);
+
+    useEffect(() => {
+        if (!open) {
+            setRow(DEFAULT_ROW);
+            return;
+        }
+        const incoming = tableData && typeof tableData === 'object' ? tableData : {};
+        const country = String(incoming.daily_rate_country || DEFAULT_ROW.daily_rate_country).toUpperCase();
+        const amount = incoming.iznos_dnevnica != null && incoming.iznos_dnevnica !== ''
+            ? incoming.iznos_dnevnica
+            : getRateAmount(country);
+        setRow({
+            broj_sati: toDisplayValue(incoming.broj_sati),
+            kolicina_dnevnica: toDisplayValue(incoming.kolicina_dnevnica),
+            iznos_dnevnica: toDisplayValue(amount),
+            daily_rate_country: country,
+        });
+    }, [open, tableData]);
+
+    const total = useMemo(() => (
+        (parseAmount(row.kolicina_dnevnica) * parseAmount(row.iznos_dnevnica)).toFixed(2)
+    ), [row]);
+
+    if (!open) return null;
+
+    const updateField = (field, value) => {
+        setRow((prev) => ({ ...prev, [field]: value }));
+    };
+
+    const updateCountry = (country) => {
+        setRow((prev) => ({
+            ...prev,
+            daily_rate_country: country,
+            iznos_dnevnica: getRateAmount(country),
+        }));
+    };
+
+    const handleSave = async () => {
+        await onSave?.({
+            broj_sati: String(row.broj_sati || '').trim(),
+            kolicina_dnevnica: String(row.kolicina_dnevnica || '').trim(),
+            iznos_dnevnica: String(row.iznos_dnevnica || '').trim(),
+            daily_rate_country: String(row.daily_rate_country || '').trim(),
+        });
+    };
+
+    return (
+        <ModalShell
+            onClose={onClose}
+            overlayClassName="z-[70] overflow-y-auto p-4 pt-16"
+            contentClassName="flex min-h-full items-start justify-center"
+            panelClassName="w-full max-w-4xl rounded-xl border border-border-hairline bg-canvas-elevated shadow-xl overflow-hidden max-h-[calc(100vh-2rem)]"
+        >
+            <div className="flex w-full flex-col">
+                <div className="flex items-center justify-between border-b border-border-hairline px-5 py-3">
+                    <div>
+                        <h3 className="text-base font-semibold text-text-main">OBRAČUN PUTNIH TROŠKOVA</h3>
+                        <p className="text-xs text-text-muted">{workOrder?.display_code || workOrder?.id || '-'}</p>
+                    </div>
+                    <button
+                        type="button"
+                        onClick={onClose}
+                        aria-label="Zatvori"
+                        className="ml-4 rounded-lg p-1.5 text-gray-400 hover:bg-gray-100 hover:text-gray-600 dark:hover:bg-gray-700"
+                    >
+                        ✕
+                    </button>
+                </div>
+
+                <div className="space-y-4 overflow-y-auto px-5 py-4">
+                    <div className="rounded-lg border border-gray-200 bg-white p-4 text-xs text-gray-600 dark:border-gray-700 dark:bg-gray-900 dark:text-gray-300">
+                        <p className="font-semibold text-gray-800 dark:text-gray-100">Brzi odabir dnevnice</p>
+                        <p>Odabir države automatski postavlja iznos dnevnice. Po potrebi iznos možete ručno izmijeniti.</p>
+                    </div>
+
+                    <div className="overflow-auto rounded-xl border border-gray-200 shadow-sm dark:border-gray-700">
+                        <table className="min-w-[900px] w-full bg-white text-xs dark:bg-gray-900">
+                            <thead>
+                                <tr className="border-b border-gray-200 bg-gray-50 text-left dark:border-gray-700 dark:bg-gray-800">
+                                    <th className="w-8 px-2 py-2.5 text-center text-gray-400">#</th>
+                                    <th className="px-2 py-2.5 font-semibold text-gray-700 dark:text-gray-200">Broj sati</th>
+                                    <th className="px-2 py-2.5 font-semibold text-gray-700 dark:text-gray-200">Količina dnevnica</th>
+                                    <th className="px-2 py-2.5 font-semibold text-gray-700 dark:text-gray-200">Država</th>
+                                    <th className="px-2 py-2.5 font-semibold text-gray-700 dark:text-gray-200">Iznos dnevnice</th>
+                                    <th className="px-2 py-2.5 font-semibold text-gray-700 dark:text-gray-200">Ukupan iznos</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <tr className="border-t border-gray-100 dark:border-gray-700">
+                                    <td className="px-2 py-1.5 text-center text-[11px] text-gray-400">1</td>
+                                    <td className="px-1 py-1">
+                                        <input
+                                            type="text"
+                                            value={row.broj_sati}
+                                            onInput={(event) => updateField('broj_sati', event.currentTarget.value)}
+                                            className="block w-full rounded-lg border border-gray-300 bg-gray-50 px-2.5 py-2 text-xs text-gray-900"
+                                        />
+                                    </td>
+                                    <td className="px-1 py-1">
+                                        <input
+                                            type="text"
+                                            value={row.kolicina_dnevnica}
+                                            onInput={(event) => updateField('kolicina_dnevnica', event.currentTarget.value)}
+                                            className="block w-full rounded-lg border border-gray-300 bg-gray-50 px-2.5 py-2 text-xs text-gray-900"
+                                        />
+                                    </td>
+                                    <td className="px-1 py-1">
+                                        <select
+                                            value={row.daily_rate_country}
+                                            onChange={(event) => updateCountry(event.currentTarget.value)}
+                                            className="block w-full rounded-lg border border-gray-300 bg-gray-50 px-2.5 py-2 text-xs text-gray-900"
+                                        >
+                                            {RATE_OPTIONS.map((option) => (
+                                                <option key={option.value} value={option.value}>
+                                                    {option.label}
+                                                </option>
+                                            ))}
+                                        </select>
+                                    </td>
+                                    <td className="px-1 py-1">
+                                        <input
+                                            type="text"
+                                            value={row.iznos_dnevnica}
+                                            onInput={(event) => updateField('iznos_dnevnica', event.currentTarget.value)}
+                                            className="block w-full rounded-lg border border-gray-300 bg-gray-50 px-2.5 py-2 text-xs text-gray-900"
+                                        />
+                                    </td>
+                                    <td className="px-1 py-1">
+                                        <div className="rounded-lg border border-gray-300 bg-gray-100 px-2.5 py-2 text-right text-xs font-semibold text-gray-800">
+                                            {total} €
+                                        </div>
+                                    </td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+
+                <div className="flex items-center justify-end gap-3 border-t border-border-hairline px-5 py-3">
+                    <button
+                        type="button"
+                        onClick={onClose}
+                        disabled={saving}
+                        className="rounded-lg border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50 disabled:opacity-50"
+                    >
+                        Odustani
+                    </button>
+                    <button
+                        type="button"
+                        onClick={handleSave}
+                        disabled={saving}
+                        className="rounded-lg bg-blue-600 px-5 py-2 text-sm font-semibold text-white hover:bg-blue-700 disabled:opacity-60"
+                    >
+                        {saving ? 'Spremam…' : 'Spremi obračun'}
+                    </button>
+                </div>
+            </div>
+        </ModalShell>
+    );
+}

frontend/src/components/layout/ServiceNotesWidget.jsx

@@ -24,7 +24,7 @@ export default function ServiceNotesWidget({
     canManageRecipients = false,
     activeTasks = [],
     activeWorkOrders = [],
-    servicers = [],
+    teamMembers = [],
     onCreate,
     onClose,
 }) {
@@ -156,7 +156,7 @@ export default function ServiceNotesWidget({
                     className="w-full rounded-md border border-border-hairline bg-canvas-base px-2 py-1.5 text-xs text-text-main"
                 >
                     <option value="self">Notifikacija samo meni</option>
-                    {canManageRecipients && <option value="member">Notifikacija serviserima</option>}
+                    {canManageRecipients && <option value="member">Notifikacija odabranim članovima tima</option>}
                     {canManageRecipients && <option value="team">Notifikacija svim članovima tima</option>}
                 </select>
                 {canManageRecipients && audience === 'member' && (
@@ -167,10 +167,10 @@ export default function ServiceNotesWidget({
                             const selected = Array.from(event.currentTarget.selectedOptions).map((option) => option.value);
                             setTargetUsers(selected);
                         }}
-                        size={Math.min(6, Math.max(3, servicers.length || 3))}
+                        size={Math.min(6, Math.max(3, teamMembers.length || 3))}
                         className="w-full rounded-md border border-border-hairline bg-canvas-base px-2 py-1.5 text-xs text-text-main"
                     >
-                        {servicers.map((member) => (
+                        {teamMembers.map((member) => (
                             <option key={member.id} value={member.id}>
                                 {member.full_name || member.email}
                             </option>
@@ -179,7 +179,7 @@ export default function ServiceNotesWidget({
                 )}
                 {canManageRecipients && audience === 'member' && (
                     <p className="text-[10px] text-text-muted">
-                        Držite Ctrl (ili Cmd) za odabir više servisera.
+                        Držite Ctrl (ili Cmd) za odabir više članova tima.
                     </p>
                 )}
                 <button

frontend/src/components/layout/TaskCalendarPortal.jsx

@@ -2,7 +2,7 @@ import { useEffect, useMemo, useState } from 'preact/hooks';
 import { useStore } from '@nanostores/preact';
 import { $tasks } from '../../stores/taskStore';
 import { $user } from '../../stores/authStore';
-import { $workOrdersWithVehicle, fetchServicers } from '../../stores/fleetDashboardStore';
+import { $workOrdersWithVehicle, fetchTeamMembers } from '../../stores/fleetDashboardStore';
 import {
     $serviceNotes,
     $serviceNotesLoading,
@@ -30,7 +30,7 @@ export default function TaskCalendarPortal() {
     const notes = useStore($serviceNotes);
     const notesLoading = useStore($serviceNotesLoading);
     const user = useStore($user);
-    const [servicers, setServicers] = useState([]);
+    const [teamMembers, setTeamMembers] = useState([]);
 
     const isServiser = Boolean(user?.is_serviser);
     const isTeamMember = Boolean(user?.is_team_member);
@@ -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(() => {});
@@ -71,18 +82,18 @@ export default function TaskCalendarPortal() {
 
     useEffect(() => {
         if (!canManageRecipients) {
-            setServicers([]);
+            setTeamMembers([]);
             return;
         }
         let active = true;
-        fetchServicers()
+        fetchTeamMembers()
             .then((rows) => {
                 if (!active) return;
-                setServicers(Array.isArray(rows) ? rows : []);
+                setTeamMembers(Array.isArray(rows) ? rows : []);
             })
             .catch(() => {
                 if (!active) return;
-                setServicers([]);
+                setTeamMembers([]);
             });
         return () => {
             active = false;
@@ -103,6 +114,7 @@ export default function TaskCalendarPortal() {
             <TaskCalendarWidget
                 tasks={tasks}
                 notes={notes}
+                workOrders={calendarWorkOrders}
                 onTaskClick={handleTaskClick}
             />
             <ServiceNotesWidget
@@ -111,7 +123,7 @@ export default function TaskCalendarPortal() {
                 canManageRecipients={canManageRecipients}
                 activeTasks={activeTasks}
                 activeWorkOrders={activeWorkOrders}
-                servicers={servicers}
+                teamMembers={teamMembers}
                 onCreate={createServiceNote}
                 onClose={closeServiceNote}
             />

frontend/src/components/notifications/NotificationDetailModal.jsx

@@ -1,6 +1,7 @@
 import { useMemo } from 'preact/hooks';
 import ModalShell from '../ui/ModalShell';
 import {
+    downloadGeneratedArchiveByUrl,
     downloadGeneratedPdfByUrl,
     downloadWorkOrderInvoicesPdf,
     downloadWorkOrderPdf,
@@ -21,6 +22,7 @@ function formatTimestamp(value) {
 }
 
 function detectNotificationKind(notification) {
+    if (notification?.metadata?.entity_type === 'fleet_archive') return 'fleet_archive';
     const title = String(notification?.title || '').toLowerCase();
     if (title.includes('servisni kontekst')) return 'service_context';
     if (title.includes('pdf')) return 'work_order_pdf';
@@ -79,6 +81,28 @@ function getEntityAction(notification, meta) {
             },
         };
     }
+    if (metadata.entity_type === 'fleet_archive') {
+        const archiveType = metadata.archive_type === 'work_orders' ? 'work_order' : 'service_tasks';
+        if (metadata.stage === 'completed' && metadata.download_url) {
+            return {
+                label: archiveType === 'work_order'
+                    ? 'Preuzmi ZIP putnih naloga + računa'
+                    : 'Preuzmi ZIP servisnih taskova',
+                run() {
+                    return downloadGeneratedArchiveByUrl(
+                        metadata.download_url,
+                        metadata.filename || `MT-${String(metadata.month || '').padStart(2, '0')}-${metadata.year || ''}-${archiveType === 'work_order' ? 'PN' : 'SN'}.zip`,
+                    );
+                },
+            };
+        }
+        return {
+            label: 'Otvori servisne zapise',
+            run() {
+                window.dispatchEvent(new CustomEvent('navbar:navigate', { detail: 'service-records' }));
+            },
+        };
+    }
     if (metadata.entity_type === 'work_order' && metadata.work_order_id) {
         return {
             label: 'Otvori detalje naloga',
@@ -125,6 +149,13 @@ function getNotificationTypeMeta(kind) {
             recommendation: 'Možete odmah preuzeti generirani PDF dokument.',
         };
     }
+    if (kind === 'fleet_archive') {
+        return {
+            category: 'ZIP arhive',
+            section: 'service-records',
+            recommendation: 'Pričekajte završetak generiranja, zatim preuzmite ZIP iz notifikacije.',
+        };
+    }
     if (kind.startsWith('work_order')) {
         return {
             category: 'Putni nalozi',
@@ -168,6 +199,11 @@ export default function NotificationDetailModal({ open, notification, onClose })
         notification?.metadata?.stage === 'completed' &&
         notification?.metadata?.work_order_id
     );
+    const showArchiveLink = Boolean(
+        notification?.metadata?.entity_type === 'fleet_archive' &&
+        notification?.metadata?.stage === 'completed' &&
+        notification?.metadata?.download_url
+    );
     const failedEmailCachedPdfs = Array.isArray(notification?.metadata?.cached_pdfs)
         ? notification.metadata.cached_pdfs
         : [];
@@ -212,7 +248,7 @@ export default function NotificationDetailModal({ open, notification, onClose })
                     <div className="rounded-lg border border-border-hairline bg-canvas-base p-3">
                         <p className="text-sm font-semibold text-text-main">{notification.title || 'Obavijest'}</p>
                         <p className="mt-2 text-sm text-text-muted">{notification.message || '-'}</p>
-                        {showPdfLink && (
+                        {(showPdfLink || showArchiveLink) && (
                             <button
                                 type="button"
                                 onClick={() => action.run()}

frontend/src/components/ui/AnimatedDataTable.jsx

@@ -1,5 +1,17 @@
 import { animated, useTransition } from '@react-spring/web';
-import { useEffect, useState } from 'preact/hooks';
+import { useEffect, useRef, useState } from 'preact/hooks';
+
+function SkeletonRows({ columns, rows = 4 }) {
+    return Array.from({ length: rows }).map((_, rowIdx) => (
+        <tr key={rowIdx} className="animate-pulse">
+            {columns.map((col) => (
+                <td key={col.key} className={col.className}>
+                    <div className="h-3 rounded bg-canvas-deep" style={{ width: `${55 + ((rowIdx * 17 + col.key.length * 7) % 30)}%` }} />
+                </td>
+            ))}
+        </tr>
+    ));
+}
 
 export default function AnimatedDataTable({
     columns = [],
@@ -14,17 +26,43 @@ export default function AnimatedDataTable({
     bodyClassName = 'divide-y divide-border-hairline',
     rowClassName = 'hover:bg-canvas-deep',
     isRowSelected = () => false,
-    wrapperClassName = 'overflow-x-auto',
+    wrapperClassName = '',
     trail = 35,
+    ariaLabel,
 }) {
     const [mounted, setMounted] = useState(false);
+    const scrollRef = useRef(null);
+    const [scrollState, setScrollState] = useState({ left: false, right: false });
+
     useEffect(() => {
         setMounted(true);
     }, []);
 
+    // Prati scroll poziciju da bi se prikazali fade indikatori s lijeva/desna
+    useEffect(() => {
+        const el = scrollRef.current;
+        if (!el) return;
+
+        function updateScrollState() {
+            setScrollState({
+                left: el.scrollLeft > 4,
+                right: el.scrollLeft + el.clientWidth < el.scrollWidth - 4,
+            });
+        }
+
+        updateScrollState();
+        el.addEventListener('scroll', updateScrollState, { passive: true });
+        const ro = new ResizeObserver(updateScrollState);
+        ro.observe(el);
+        return () => {
+            el.removeEventListener('scroll', updateScrollState);
+            ro.disconnect();
+        };
+    }, [mounted, rows.length]);
+
     const transitions = useTransition(rows, {
         keys: (row) => rowKey(row),
-        from: { opacity: 0, transform: 'translate3d(0,8px,0)', boxShadow: 'inset 0 0 0 0px rgba(16,185,129,0)' },
+        from: { opacity: 0, transform: 'translate3d(0,6px,0)', boxShadow: 'inset 0 0 0 0px rgba(16,185,129,0)' },
         enter: (row) => ({
             opacity: 1,
             transform: 'translate3d(0,0,0)',
@@ -37,58 +75,71 @@ export default function AnimatedDataTable({
                 ? 'inset 0 0 0 2px rgba(16,185,129,0.75)'
                 : 'inset 0 0 0 0px rgba(16,185,129,0)',
         }),
-        leave: { opacity: 0, transform: 'translate3d(0,-8px,0)', boxShadow: 'inset 0 0 0 0px rgba(16,185,129,0)' },
+        leave: { opacity: 0, transform: 'translate3d(0,-4px,0)', boxShadow: 'inset 0 0 0 0px rgba(16,185,129,0)' },
         trail,
-        config: { tension: 230, friction: 26 },
+        config: { tension: 260, friction: 28 },
     });
 
     const colSpan = Math.max(1, columns.length);
 
     return (
-        <div className={wrapperClassName}>
+        <div className={`relative ${wrapperClassName}`}>
-            <table className={tableClassName}>
+            {/* Fade gradijent — lijeva strana (kad se može scrollati ulijevo) */}
-                <thead className={headClassName}>
+            {scrollState.left && (
-                    <tr>
+                <div
-                        {columns.map((column) => (
+                    aria-hidden="true"
-                            <th key={column.key} className={column.className}>
+                    className="pointer-events-none absolute inset-y-0 left-0 z-10 w-8 bg-gradient-to-r from-canvas-elevated to-transparent"
-                                {column.label}
+                />
-                            </th>
+            )}
+            {/* Fade gradijent — desna strana (kad postoji sadržaj desno) */}
+            {scrollState.right && (
+                <div
+                    aria-hidden="true"
+                    className="pointer-events-none absolute inset-y-0 right-0 z-10 w-8 bg-gradient-to-l from-canvas-elevated to-transparent"
+                />
+            )}
+
+            <div
+                ref={scrollRef}
+                className="overflow-x-auto"
+                style={{ WebkitOverflowScrolling: 'touch', scrollbarWidth: 'thin' }}
+            >
+                <table
+                    className={tableClassName}
+                    aria-label={ariaLabel}
+                    aria-busy={loading ? 'true' : undefined}
+                >
+                    <thead className={headClassName}>
+                        <tr>
+                            {columns.map((column) => (
+                                <th key={column.key} scope="col" className={column.className}>
+                                    {column.label}
+                                </th>
+                            ))}
+                        </tr>
+                    </thead>
+                    <tbody className={bodyClassName}>
+                        {!mounted && <SkeletonRows columns={columns} rows={3} />}
+                        {mounted && loading && <SkeletonRows columns={columns} rows={3} />}
+                        {mounted && !loading && rows.length === 0 && (
+                            <tr>
+                                <td colSpan={colSpan} className="px-4 py-8 text-center text-sm text-text-muted">
+                                    {emptyMessage}
+                                </td>
+                            </tr>
+                        )}
+                        {mounted && !loading && transitions((style, row) => (
+                            <animated.tr
+                                key={rowKey(row)}
+                                style={style}
+                                className={typeof rowClassName === 'function' ? rowClassName(row) : rowClassName}
+                            >
+                                {renderRow(row)}
+                            </animated.tr>
                         ))}
-                    </tr>
+                    </tbody>
-                </thead>
+                </table>
-                <tbody className={bodyClassName}>
+            </div>
-                    {!mounted && (
-                        <tr>
-                            <td colSpan={colSpan} className="px-4 py-6 text-center text-sm text-text-muted">
-                                {loadingMessage}
-                            </td>
-                        </tr>
-                    )}
-                    {mounted && loading && (
-                        <tr>
-                            <td colSpan={colSpan} className="px-4 py-6 text-center text-sm text-text-muted">
-                                {loadingMessage}
-                            </td>
-                        </tr>
-                    )}
-                    {mounted && !loading && rows.length === 0 && (
-                        <tr>
-                            <td colSpan={colSpan} className="px-4 py-6 text-center text-sm text-text-muted">
-                                {emptyMessage}
-                            </td>
-                        </tr>
-                    )}
-                    {mounted && !loading && transitions((style, row) => (
-                        <animated.tr
-                            key={rowKey(row)}
-                            style={style}
-                            className={typeof rowClassName === 'function' ? rowClassName(row) : rowClassName}
-                        >
-                            {renderRow(row)}
-                        </animated.tr>
-                    ))}
-                </tbody>
-            </table>
         </div>
     );
 }

frontend/src/layouts/Layout.astro

@@ -5,7 +5,6 @@ import '../styles/global.css';
 import ThemeToggle from '../components/ui/ThemeToggle.jsx';
 import ButtonDisplayCounter from '../components/atom/ButtonDisplayCounter.jsx';
 import Toast from '../components/ui/Toast.jsx';
-import ToastTrigger from '../components/ToastTrigger.jsx';
 import NetworkGuard from '../components/ui/NetworkGuard.jsx';
 import Navbar from '../components/Navbar.jsx';
 import TaskCalendarPortal from '../components/layout/TaskCalendarPortal.jsx';
@@ -18,7 +17,6 @@ interface Props {
 
 const { title, isAuthPage = false, minimalNav = false } = Astro.props as Props;
 const isProd = import.meta.env.PROD;
-const isDev = import.meta.env.DEV;
 ---
 
 <!DOCTYPE html>
@@ -57,7 +55,6 @@ const isDev = import.meta.env.DEV;
 
     {!isAuthPage && <NetworkGuard client:only="preact" transition:persist="network-guard" />}
     <Toast client:only="preact" transition:persist="toast" />
-    {!isAuthPage && isDev && <ToastTrigger client:load />}
     {!isAuthPage && <Navbar client:only="preact" transition:persist="navbar" minimal={minimalNav} />}
     {!isAuthPage && <TaskCalendarPortal client:only="preact" transition:persist="calendar-portal" />}
 

frontend/src/stores/fleetDashboardStore.js

@@ -28,6 +28,9 @@ const DASHBOARD_FETCH_TTL_MS = 30_000; // 30 sekundi
 let dbPromise = null;
 let syncListenerStarted = false;
 let isSyncInProgress = false;
+const archiveNotificationPollers = new Map();
+const ARCHIVE_NOTIFICATION_POLL_INTERVAL_MS = 10_000;
+const ARCHIVE_NOTIFICATION_POLL_TIMEOUT_MS = 15 * 60 * 1000;
 
 function isBrowser() {
     return typeof window !== 'undefined';
@@ -464,16 +467,19 @@ export const $dashboardStats = computed(
         const servicesToday = tasks.filter(
             (t) => t.scheduled_date === today && (t.status === 'aktivan' || t.status === 'servis')
         ).length;
-        const warnings = serviceRecords.filter((record) => {
+        const totalWorkOrders = workOrders.length;
-            if (record.next_service_due_at == null || record.mileage == null) return false;
+        // Aktivni taskovi bez dodijeljenog putnog naloga
-            return Number(record.next_service_due_at) - Number(record.mileage) <= 1000;
+        const tasksWithoutWorkOrder = tasks.filter(
-        }).length;
+            (t) => (t.status === 'aktivan' || t.status === 'servis' || t.status === 'spreman_za_zavrsetak')
+                && !t.work_order
+        ).length;
 
         return {
             openWorkOrders,
             closedWorkOrders,
+            totalWorkOrders,
             servicesToday,
-            warnings,
+            tasksWithoutWorkOrder,
         };
     }
 );
@@ -721,12 +727,22 @@ export async function fetchWorkOrderById(workOrderId) {
     return await api.get(`fleet/work-orders/${encodeURIComponent(workOrderId)}/`);
 }
 
+export async function fetchTasksByWorkOrder(workOrderId) {
+    if (!workOrderId) {
+        return [];
+    }
+    const data = await api.get(`tasks/tasks/?work_order=${encodeURIComponent(workOrderId)}`);
+    return Array.isArray(data) ? data : (data?.results ?? []);
+}
+
 export async function fetchWorkOrderTaskServiceContext(workOrderId) {
     if (!workOrderId) {
-        return { tasks: [], additional_costs_table: null };
+        return { tasks: [], additional_costs_table: null, travel_expenses_table: null };
     }
     const payload = await api.get(`fleet/work-orders/${encodeURIComponent(workOrderId)}/task-service-context/`);
-    return payload && typeof payload === 'object' ? payload : { tasks: [], additional_costs_table: null };
+    return payload && typeof payload === 'object'
+        ? payload
+        : { tasks: [], additional_costs_table: null, travel_expenses_table: null };
 }
 
 export async function fetchWorkOrderAdditionalCostsTable(workOrderId) {
@@ -751,6 +767,42 @@ export async function updateWorkOrderAdditionalCostsTable(workOrderId, data) {
     return payload;
 }
 
+export async function fetchWorkOrderTravelExpensesTable(workOrderId) {
+    if (!workOrderId) {
+        return {
+            work_order: null,
+            broj_sati: '0.00',
+            kolicina_dnevnica: '0.00',
+            iznos_dnevnica: '30.00',
+            daily_rate_country: 'HR',
+            total_for_payout: '0.00',
+        };
+    }
+    const payload = await api.get(`fleet/work-orders/${encodeURIComponent(workOrderId)}/travel-expenses-table/`);
+    return payload && typeof payload === 'object'
+        ? payload
+        : {
+            work_order: null,
+            broj_sati: '0.00',
+            kolicina_dnevnica: '0.00',
+            iznos_dnevnica: '30.00',
+            daily_rate_country: 'HR',
+            total_for_payout: '0.00',
+        };
+}
+
+export async function updateWorkOrderTravelExpensesTable(workOrderId, data) {
+    if (!workOrderId) {
+        throw new Error('Work order ID je obavezan.');
+    }
+    const payload = await api.put(
+        `fleet/work-orders/${encodeURIComponent(workOrderId)}/travel-expenses-table/`,
+        data ?? {},
+    );
+    showToast('Obračun putnih troškova je uspješno spremljen.', 'success');
+    return payload;
+}
+
 export async function updateTaskWorkHoursTable(taskId, data) {
     if (!taskId) {
         throw new Error('Task ID je obavezan.');
@@ -760,6 +812,17 @@ export async function updateTaskWorkHoursTable(taskId, data) {
     return payload;
 }
 
+export async function updateTaskServiceReportNote(taskId, note) {
+    if (!taskId) {
+        throw new Error('Task ID je obavezan.');
+    }
+    const payload = await api.patch(`tasks/tasks/${encodeURIComponent(taskId)}/`, {
+        service_report_note: String(note ?? ''),
+    });
+    showToast('Napomena servisnog izvještaja je uspješno spremljena.', 'success');
+    return payload;
+}
+
 export async function createWorkOrderInvoice(workOrderId, data = {}, signal = null) {
     if (!workOrderId) {
         throw new Error('Work order ID je obavezan.');
@@ -809,6 +872,70 @@ function _schedulePdfNotificationPolling() {
     });
 }
 
+function _findCompletedArchiveNotification(notifications, generatedArchiveId) {
+    if (!generatedArchiveId || !Array.isArray(notifications)) {
+        return null;
+    }
+    return notifications.find((notification) => {
+        const metadata = notification?.metadata || {};
+        return metadata.entity_type === 'fleet_archive'
+            && String(metadata.generated_archive_id || '') === String(generatedArchiveId)
+            && ['completed', 'failed'].includes(String(metadata.stage || ''));
+    }) || null;
+}
+
+function _clearArchiveNotificationPoller(generatedArchiveId) {
+    const key = String(generatedArchiveId || '');
+    const handles = archiveNotificationPollers.get(key);
+    if (!handles) {
+        return;
+    }
+    window.clearInterval(handles.intervalId);
+    window.clearTimeout(handles.timeoutId);
+    archiveNotificationPollers.delete(key);
+}
+
+function _scheduleArchiveNotificationPolling(generatedArchiveId = null) {
+    if (!isBrowser()) return;
+    if (!generatedArchiveId) {
+        [5000, 20000, 60000].forEach((delay) => {
+            setTimeout(() => _refreshNotificationsAsync(), delay);
+        });
+        return;
+    }
+
+    const key = String(generatedArchiveId);
+    if (archiveNotificationPollers.has(key)) {
+        return;
+    }
+
+    const pollOnce = async () => {
+        try {
+            const notificationModule = await import('./notificationStore.js');
+            await notificationModule.fetchNotifications();
+            const resolvedNotification = _findCompletedArchiveNotification(
+                notificationModule.$notifications.get(),
+                key
+            );
+            if (resolvedNotification) {
+                _clearArchiveNotificationPoller(key);
+            }
+        } catch (_) {
+            // silent — korisnik će i dalje vidjeti toast ili ručno osvježiti notifikacije
+        }
+    };
+
+    const intervalId = window.setInterval(() => {
+        void pollOnce();
+    }, ARCHIVE_NOTIFICATION_POLL_INTERVAL_MS);
+    const timeoutId = window.setTimeout(() => {
+        _clearArchiveNotificationPoller(key);
+    }, ARCHIVE_NOTIFICATION_POLL_TIMEOUT_MS);
+
+    archiveNotificationPollers.set(key, { intervalId, timeoutId });
+    void pollOnce();
+}
+
 export async function downloadWorkOrderPdf(workOrderId) {
     if (!workOrderId) {
         throw new Error('Work order ID je obavezan.');
@@ -843,10 +970,30 @@ export async function downloadWorkOrderInvoicesPdf(workOrderId) {
     return payload;
 }
 
-export async function downloadWorkOrderServiceRecordsPdf(workOrderId) {
+export async function downloadWorkOrderServiceRecordsPdf(workOrderId, taskId = null, taskOptions = {}) {
     if (!workOrderId) {
         throw new Error('Work order ID je obavezan.');
     }
+    if (taskId) {
+        try {
+            const blob = await api.get(
+                `fleet/work-orders/${encodeURIComponent(workOrderId)}/service-records-pdf/?task_id=${encodeURIComponent(taskId)}`,
+                { responseType: 'blob' },
+            );
+            const workOrderDisplayCode = String(taskOptions?.workOrderDisplayCode || '').trim().toUpperCase() || String(workOrderId);
+            const taskTitle = String(taskOptions?.taskTitle || '').trim()
+                .replace(/\s+/g, '_')
+                .replace(/[^A-Za-z0-9_-]+/g, '')
+                .replace(/^[_\-.]+|[_\-.]+$/g, '') || `task-${taskId}`;
+            saveBlobToFile(blob, `${workOrderDisplayCode}.SN-${taskTitle}.pdf`);
+            showToast('PDF servisnih zapisa za odabrani task je preuzet.', 'success');
+            return;
+        } catch (err) {
+            const msg = err?.message || 'Preuzimanje PDF-a servisnih zapisa za task nije uspjelo.';
+            showToast(msg, 'error');
+            throw err;
+        }
+    }
     showToast('Kreiran je zahtjev za PDF servisnih zapisa putnog naloga.', 'info');
     const payload = await api.post(`fleet/work-orders/${encodeURIComponent(workOrderId)}/service-records-pdf-request/`, {});
     if (payload?.status === 'ready' && payload?.download_url) {
@@ -875,14 +1022,28 @@ export async function downloadWorkOrderDocx(workOrderId) {
     }
 }
 
-export async function downloadWorkOrderServiceRecordsDocx(workOrderId) {
+export async function downloadWorkOrderServiceRecordsDocx(workOrderId, taskId = null, taskOptions = {}) {
     if (!workOrderId) {
         throw new Error('Work order ID je obavezan.');
     }
+    const query = taskId ? `?task_id=${encodeURIComponent(taskId)}` : '';
     try {
-        const blob = await api.get(`fleet/work-orders/${encodeURIComponent(workOrderId)}/service-records-docx/`, { responseType: 'blob' });
+        const blob = await api.get(
-        saveBlobToFile(blob, `${workOrderId}.work-order-service-records.docx`);
+            `fleet/work-orders/${encodeURIComponent(workOrderId)}/service-records-docx/${query}`,
-        showToast('DOCX servisnih zapisa je preuzet.', 'success');
+            { responseType: 'blob' },
+        );
+        if (taskId) {
+            const workOrderDisplayCode = String(taskOptions?.workOrderDisplayCode || '').trim().toUpperCase() || String(workOrderId);
+            const taskTitle = String(taskOptions?.taskTitle || '').trim()
+                .replace(/\s+/g, '_')
+                .replace(/[^A-Za-z0-9_-]+/g, '')
+                .replace(/^[_\-.]+|[_\-.]+$/g, '') || `task-${taskId}`;
+            saveBlobToFile(blob, `${workOrderDisplayCode}.SN-${taskTitle}.docx`);
+            showToast('DOCX servisnih zapisa za odabrani task je preuzet.', 'success');
+        } else {
+            saveBlobToFile(blob, `${workOrderId}.work-order-service-records.docx`);
+            showToast('DOCX servisnih zapisa je preuzet.', 'success');
+        }
     } catch (err) {
         const msg = err?.message || 'Preuzimanje DOCX servisnih zapisa nije uspjelo.';
         showToast(msg, 'error');
@@ -905,6 +1066,99 @@ 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 fetchMonthlyCostInvoices(year, month) {
+    const payload = await api.get(
+        `fleet/work-order-invoices/?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(
+            `fleet/reports/monthly-servicer/?year=${year}&month=${month}`,
+            { responseType: 'blob' },
+        );
+        saveBlobToFile(blob, `izvjestaj-servisera-${year}-${String(month).padStart(2, '0')}.docx`);
+        showToast('Izvještaj servisera je preuzet.', 'success');
+    } catch (err) {
+        showToast(err?.message || 'Preuzimanje izvještaja servisera nije uspjelo.', 'error');
+        throw err;
+    }
+}
+
+export async function downloadMonthlyCostsReport(year, month) {
+    try {
+        const blob = await api.get(
+            `fleet/reports/monthly-costs/?year=${year}&month=${month}`,
+            { responseType: 'blob' },
+        );
+        saveBlobToFile(blob, `troskovi-servisera-${year}-${String(month).padStart(2, '0')}.docx`);
+        showToast('Izvještaj troškova je preuzet.', 'success');
+    } catch (err) {
+        showToast(err?.message || 'Preuzimanje izvještaja troškova nije uspjelo.', 'error');
+        throw err;
+    }
+}
+
+export async function downloadMonthlyServiceTasksArchive(year, month) {
+    try {
+        const payload = await api.post('fleet/reports/monthly-service-tasks-archive-request/', { year, month });
+        await _refreshNotificationsAsync();
+        if (payload?.status === 'ready' && payload?.download_url) {
+            showToast('ZIP arhiva servisnih taskova je spremna. Preuzmite je kroz notifikaciju.', 'success');
+            return payload;
+        }
+        showToast('ZIP arhiva servisnih taskova se generira u pozadini. Preuzimanje je dostupno kroz notifikaciju.', 'info');
+        _scheduleArchiveNotificationPolling(payload?.generated_archive_id || null);
+        return payload;
+    } catch (err) {
+        showToast(err?.message || 'Pokretanje generiranja ZIP arhive servisnih taskova nije uspjelo.', 'error');
+        throw err;
+    }
+}
+
+export async function downloadMonthlyWorkOrdersArchive(year, month) {
+    try {
+        const payload = await api.post('fleet/reports/monthly-work-orders-archive-request/', { year, month });
+        await _refreshNotificationsAsync();
+        if (payload?.status === 'ready' && payload?.download_url) {
+            showToast('ZIP arhiva putnih naloga je spremna. Preuzmite je kroz notifikaciju.', 'success');
+            return payload;
+        }
+        showToast('ZIP arhiva putnih naloga se generira u pozadini. Preuzimanje je dostupno kroz notifikaciju.', 'info');
+        _scheduleArchiveNotificationPolling(payload?.generated_archive_id || null);
+        return payload;
+    } catch (err) {
+        showToast(err?.message || 'Pokretanje generiranja ZIP arhive putnih naloga nije uspjelo.', 'error');
+        throw err;
+    }
+}
+
 export async function downloadGeneratedPdfByUrl(downloadUrl, filename = 'document.pdf') {
     if (!downloadUrl) {
         showToast('Nedostaje URL za preuzimanje PDF-a.', 'error');
@@ -921,6 +1175,22 @@ export async function downloadGeneratedPdfByUrl(downloadUrl, filename = 'documen
     }
 }
 
+export async function downloadGeneratedArchiveByUrl(downloadUrl, filename = 'archive.zip') {
+    if (!downloadUrl) {
+        showToast('Nedostaje URL za preuzimanje ZIP arhive.', 'error');
+        throw new Error('Nedostaje URL za preuzimanje ZIP arhive.');
+    }
+    try {
+        const blob = await api.get(downloadUrl, { responseType: 'blob' });
+        saveBlobToFile(blob, filename);
+        return true;
+    } catch (err) {
+        const msg = err?.message || 'Preuzimanje ZIP arhive nije uspjelo.';
+        showToast(msg, 'error');
+        throw err;
+    }
+}
+
 export function openWorkOrderInvoicesPdfPage(workOrderId) {
     if (!isBrowser() || !workOrderId) {
         return;

frontend/src/stores/notificationStore.js

@@ -3,6 +3,7 @@ import Pusher from 'pusher-js';
 import { api } from '../services/apiClient';
 import { $accessToken, $user } from './authStore';
 import { showToast } from './toastStore';
+import { fetchServiceNotes } from './serviceNotesStore';
 
 export const $notifications = atom([]);
 export const $isRealtimeConnected = atom(false);
@@ -84,6 +85,9 @@ function attachChannelHandlers(channel) {
         }
 
         $notifications.set([next, ...existing]);
+        if (next?.metadata?.entity_type === 'service_note') {
+            fetchServiceNotes().catch(() => {});
+        }
         showToast(next.title, next.level === 'warning' || next.level === 'critical' ? 'error' : 'success');
     });
 }

frontend/src/stores/serviceNotesStore.js

@@ -23,7 +23,7 @@ export async function fetchServiceNotes() {
 export async function createServiceNote(data) {
     const payload = await api.post('fleet/service-notes/', data ?? {});
     const nextNotes = Array.isArray(payload?.notes) ? payload.notes : null;
-    if (nextNotes) {
+    if (nextNotes && nextNotes.length > 0) {
         $serviceNotes.set(nextNotes);
     } else {
         await fetchServiceNotes();