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

feat: integritet zatvaranja taska i putnog naloga

Browse Source 
Dodaje status 'spreman_za_zavrsetak' i backend provjeru koja blokira zatvaranje taska kada je povezani putni nalog otvoren, uz 409 odgovor i opcionalni auto-close flow.\n\nPri zatvaranju putnog naloga taskovi u statusu 'servis' automatski prelaze u 'spreman_za_zavrsetak'. Frontend modal sada podržava potvrdu i retry s auto_close_work_order=true.\n\nUključeni su i ciljani testovi za novi behavior, te ažuriran prikaz statusa u dashboardu.\n\nCo-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
mariomitte
2026-07-17 19:20:33 +02:00
parent e14665d8ec
commit 7acaef941f
14 changed files with 408 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
backend/modules/task_management/tests/test_services.py
View File

@@ -2,6 +2,7 @@ from django.test import TestCase
from django.contrib.auth import get_user_model
from rest_framework.exceptions import ValidationError
from modules.task_management.services import TaskService
from modules.task_management.exceptions import OpenWorkOrderBlockingTaskClose
from modules.task_management.models import Task, TaskTemplate, TaskTemplateEntry, TaskWorkEntry
from modules.fleet.models import Vehicle, WorkOrder, VehicleServiceRecord
@@ -42,7 +43,14 @@ class TaskServiceTests(TestCase):
def test_update_task_entry_allows_closing_with_work_order(self):
vehicle = Vehicle.objects.create(registration_number="ZG-TASK-01", asset_type='crane')
work_order = WorkOrder.objects.create(vehicle=vehicle, creator=self.user, purpose='defektaza')
work_order = WorkOrder.objects.create(
vehicle=vehicle,
creator=self.user,
purpose='defektaza',
status='closed',
start_mileage=100,
end_mileage=120,
)
task = Task.objects.create(title="Za zatvaranje", description="", assigned_to=self.user, status='servis')
updated = TaskService.update_task_entry(
instance=task,
@@ -59,7 +67,14 @@ class TaskServiceTests(TestCase):
def test_update_task_entry_allows_finished_with_work_order(self):
vehicle = Vehicle.objects.create(registration_number="ZG-TASK-01A", asset_type='crane')
work_order = WorkOrder.objects.create(vehicle=vehicle, creator=self.user, purpose='kontrola')
work_order = WorkOrder.objects.create(
vehicle=vehicle,
creator=self.user,
purpose='kontrola',
status='closed',
start_mileage=100,
end_mileage=150,
)
task = Task.objects.create(title="Za završetak", description="", assigned_to=self.user, status='servis', vehicle=vehicle)
updated = TaskService.update_task_entry(
instance=task,
@@ -69,6 +84,53 @@ class TaskServiceTests(TestCase):
assert updated.status == "zavrsen"
assert updated.work_order == work_order
def test_update_task_entry_blocks_closing_when_work_order_open(self):
vehicle = Vehicle.objects.create(registration_number="ZG-TASK-01B", asset_type='crane')
work_order = WorkOrder.objects.create(vehicle=vehicle, creator=self.user, purpose='kontrola', status='open')
task = Task.objects.create(
title="Integritet",
description="",
assigned_to=self.user,
status='servis',
vehicle=vehicle,
work_order=work_order,
)
with self.assertRaises(OpenWorkOrderBlockingTaskClose):
TaskService.update_task_entry(
instance=task,
data={"status": "zavrsen"},
user=self.user,
)
def test_update_task_entry_can_auto_close_open_work_order(self):
vehicle = Vehicle.objects.create(registration_number="ZG-TASK-01C", asset_type='crane')
work_order = WorkOrder.objects.create(
vehicle=vehicle,
creator=self.user,
purpose='kontrola',
status='open',
start_mileage=100,
end_mileage=150,
)
task = Task.objects.create(
title="Auto close",
description="",
assigned_to=self.user,
status='servis',
vehicle=vehicle,
work_order=work_order,
)
updated = TaskService.update_task_entry(
instance=task,
data={"status": "zavrsen"},
user=self.user,
auto_close_work_order=True,
)
work_order.refresh_from_db()
self.assertEqual(updated.status, "zavrsen")
self.assertEqual(work_order.status, "closed")
def test_create_task_entry_from_template_creates_service_records(self):
vehicle = Vehicle.objects.create(registration_number="ZG-TASK-02", asset_type='crane')
template = TaskTemplate.objects.create(