feat: dodaj bilješke widget i admin kalendar/notifikacije
Uveden je novi Notes drawer s kalendar integracijom, zajednički DRY left-slide mehanizam te međusobno isključivo prikazivanje s Kalendar widgetom. Backend i frontend su prošireni za servisne bilješke (uključujući slanje na više servisera), dodan je users/servicers endpoint, te su uvedene warning notifikacije kada serviser ima više od 2 zadatka isti dan. U admin su dodane stavke za Bilješke i zaseban Kalendar zadataka (proxy TaskCalendar) radi lakšeg operativnog pregleda. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
|
||||
from django.contrib import admin
|
||||
|
||||
from .models import Task, TaskTemplate, TaskTemplateEntry, TaskWorkEntry, TaskWorkHoursTable
|
||||
from .models import Task, TaskCalendar, TaskTemplate, TaskTemplateEntry, TaskWorkEntry, TaskWorkHoursTable
|
||||
|
||||
|
||||
class TaskWorkEntryInline(admin.TabularInline):
|
||||
@@ -33,6 +33,19 @@ class TaskAdmin(admin.ModelAdmin):
|
||||
inlines = (TaskWorkHoursTableInline, TaskWorkEntryInline)
|
||||
|
||||
|
||||
@admin.register(TaskCalendar)
|
||||
class TaskCalendarAdmin(admin.ModelAdmin):
|
||||
list_display = ('scheduled_date', 'title', 'status', 'assigned_to', 'vehicle', 'work_order')
|
||||
list_filter = ('scheduled_date', 'status', 'assigned_to')
|
||||
search_fields = ('title', 'assigned_to__email', 'vehicle__registration_number', 'work_order__display_code')
|
||||
readonly_fields = ('id', 'created_at', 'updated_at')
|
||||
ordering = ('scheduled_date', 'assigned_to__first_name', 'assigned_to__last_name')
|
||||
|
||||
def get_queryset(self, request):
|
||||
queryset = super().get_queryset(request)
|
||||
return queryset.filter(is_active=True, scheduled_date__isnull=False)
|
||||
|
||||
|
||||
@admin.register(TaskTemplate)
|
||||
class TaskTemplateAdmin(admin.ModelAdmin):
|
||||
list_display = ('code', 'title', 'status', 'is_active', 'created_at')
|
||||
|
||||
@@ -69,6 +69,13 @@ class Task(BaseModel):
|
||||
})
|
||||
|
||||
|
||||
class TaskCalendar(Task):
|
||||
class Meta:
|
||||
proxy = True
|
||||
verbose_name = _("Kalendar zadatka")
|
||||
verbose_name_plural = _("Kalendar zadataka")
|
||||
|
||||
|
||||
class TaskWorkHoursTable(BaseModel):
|
||||
"""Interaktivna tablica radnih sati povezana s radnim zadatkom."""
|
||||
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
# backend/modules/task_management/services.py
|
||||
|
||||
from django.db import transaction
|
||||
from django.db import transaction, models
|
||||
from rest_framework.exceptions import ValidationError
|
||||
from django.core.exceptions import ValidationError as DjangoValidationError
|
||||
from django.contrib.auth import get_user_model
|
||||
import logging
|
||||
|
||||
from .models import Task, TaskTemplate, TaskWorkEntry
|
||||
@@ -10,6 +11,21 @@ from .exceptions import OpenWorkOrderBlockingTaskClose
|
||||
from modules.fleet.models import VehicleServiceRecord
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
User = get_user_model()
|
||||
|
||||
|
||||
def _task_overload_recipients(task):
|
||||
recipients = []
|
||||
if task.assigned_to_id:
|
||||
recipients.append(task.assigned_to)
|
||||
supervisors = User.objects.filter(is_active=True).filter(
|
||||
models.Q(is_staff=True) | (models.Q(is_team_member=True) & models.Q(is_serviser=False))
|
||||
)
|
||||
recipients.extend(supervisors)
|
||||
unique = {}
|
||||
for recipient in recipients:
|
||||
unique[str(recipient.id)] = recipient
|
||||
return list(unique.values())
|
||||
|
||||
|
||||
class TaskService:
|
||||
@@ -53,6 +69,7 @@ class TaskService:
|
||||
|
||||
with transaction.atomic():
|
||||
entry.save()
|
||||
TaskService._notify_if_servicer_overloaded(entry)
|
||||
if template:
|
||||
TaskService._create_work_entries_from_template(task=entry, template=template)
|
||||
TaskService._create_service_records_from_template(task=entry, template=template, user=user)
|
||||
@@ -60,6 +77,49 @@ class TaskService:
|
||||
logger.info(f"Zadatak uspješno kreiran: {entry.id}")
|
||||
return entry
|
||||
|
||||
@staticmethod
|
||||
def _notify_if_servicer_overloaded(entry: Task):
|
||||
if not entry.assigned_to_id or not entry.scheduled_date:
|
||||
return
|
||||
if not getattr(entry.assigned_to, 'is_serviser', False):
|
||||
return
|
||||
|
||||
task_count = Task.objects.filter(
|
||||
is_active=True,
|
||||
assigned_to=entry.assigned_to,
|
||||
scheduled_date=entry.scheduled_date,
|
||||
status__in=('aktivan', 'servis', 'spreman_za_zavrsetak'),
|
||||
).count()
|
||||
if task_count <= 2:
|
||||
return
|
||||
|
||||
from modules.fleet.services import NotificationService
|
||||
|
||||
schedule_label = entry.scheduled_date.strftime('%d.%m.%Y')
|
||||
title = f"Preopterećenje rasporeda: {entry.assigned_to.get_full_name() or entry.assigned_to.email}"
|
||||
message = (
|
||||
f"Serviseru {entry.assigned_to.get_full_name() or entry.assigned_to.email} "
|
||||
f"je dodijeljeno {task_count} zadatka za {schedule_label}. "
|
||||
f"Sustav je dopustio i dodatni zadatak."
|
||||
)
|
||||
metadata = {
|
||||
"entity_type": "task_overload",
|
||||
"assigned_to_id": str(entry.assigned_to_id),
|
||||
"task_id": str(entry.id),
|
||||
"scheduled_date": entry.scheduled_date.isoformat(),
|
||||
"task_count": task_count,
|
||||
"section": "dashboard",
|
||||
}
|
||||
for recipient in _task_overload_recipients(entry):
|
||||
NotificationService.create_notification(
|
||||
recipient=recipient,
|
||||
title=title,
|
||||
message=message,
|
||||
level='warning',
|
||||
send_email=False,
|
||||
metadata=metadata,
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def _create_work_entries_from_template(*, task: Task, template: TaskTemplate):
|
||||
template_entries = list(template.entries.filter(is_active=True).order_by('sort_order', 'created_at')[:10])
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
from django.test import TestCase
|
||||
from django.contrib.auth import get_user_model
|
||||
from unittest.mock import patch
|
||||
from datetime import date
|
||||
from rest_framework.exceptions import ValidationError
|
||||
from modules.task_management.services import TaskService
|
||||
from modules.task_management.exceptions import OpenWorkOrderBlockingTaskClose
|
||||
@@ -192,4 +194,76 @@ class TaskServiceTests(TestCase):
|
||||
)
|
||||
|
||||
self.assertEqual(TaskWorkEntry.objects.filter(task=created).count(), 10)
|
||||
self.assertEqual(VehicleServiceRecord.objects.filter(task=created).count(), 10)
|
||||
self.assertEqual(VehicleServiceRecord.objects.filter(task=created).count(), 10)
|
||||
|
||||
@patch('modules.fleet.services.NotificationService.create_notification')
|
||||
def test_create_task_entry_sends_overload_notifications_after_two_tasks(self, mock_notify):
|
||||
servicer = get_user_model().objects.create_user(
|
||||
username='servicer-overload',
|
||||
email='servicer-overload@example.test',
|
||||
password='test1234',
|
||||
is_serviser=True,
|
||||
is_team_member=True,
|
||||
)
|
||||
supervisor = get_user_model().objects.create_user(
|
||||
username='supervisor-overload',
|
||||
email='supervisor-overload@example.test',
|
||||
password='test1234',
|
||||
is_team_member=True,
|
||||
is_serviser=False,
|
||||
)
|
||||
vehicle = Vehicle.objects.create(registration_number="ZG-TASK-OVER1", asset_type='crane')
|
||||
scheduled = date(2026, 7, 21)
|
||||
|
||||
Task.objects.create(title="Postojeći 1", assigned_to=servicer, vehicle=vehicle, status='aktivan', scheduled_date=scheduled)
|
||||
Task.objects.create(title="Postojeći 2", assigned_to=servicer, vehicle=vehicle, status='servis', scheduled_date=scheduled)
|
||||
|
||||
TaskService.create_task_entry(
|
||||
data={
|
||||
"title": "Treći task",
|
||||
"status": "aktivan",
|
||||
"assigned_to": servicer,
|
||||
"vehicle": vehicle,
|
||||
"scheduled_date": scheduled,
|
||||
},
|
||||
user=self.staff,
|
||||
)
|
||||
|
||||
recipients = [call.kwargs.get('recipient') for call in mock_notify.call_args_list]
|
||||
recipient_ids = {str(recipient.id) for recipient in recipients if recipient}
|
||||
self.assertIn(str(servicer.id), recipient_ids)
|
||||
self.assertIn(str(supervisor.id), recipient_ids)
|
||||
|
||||
@patch('modules.fleet.services.NotificationService.create_notification')
|
||||
def test_create_task_entry_does_not_send_overload_notifications_when_two_or_less(self, mock_notify):
|
||||
servicer = get_user_model().objects.create_user(
|
||||
username='servicer-normal-load',
|
||||
email='servicer-normal-load@example.test',
|
||||
password='test1234',
|
||||
is_serviser=True,
|
||||
is_team_member=True,
|
||||
)
|
||||
vehicle = Vehicle.objects.create(registration_number="ZG-TASK-OVER2", asset_type='crane')
|
||||
scheduled = date(2026, 7, 21)
|
||||
|
||||
TaskService.create_task_entry(
|
||||
data={
|
||||
"title": "Prvi task",
|
||||
"status": "aktivan",
|
||||
"assigned_to": servicer,
|
||||
"vehicle": vehicle,
|
||||
"scheduled_date": scheduled,
|
||||
},
|
||||
user=self.staff,
|
||||
)
|
||||
TaskService.create_task_entry(
|
||||
data={
|
||||
"title": "Drugi task",
|
||||
"status": "aktivan",
|
||||
"assigned_to": servicer,
|
||||
"vehicle": vehicle,
|
||||
"scheduled_date": scheduled,
|
||||
},
|
||||
user=self.staff,
|
||||
)
|
||||
self.assertEqual(mock_notify.call_count, 0)
|
||||
Reference in New Issue
Block a user