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

feat: dodaj scheduled_date na Task i kalendar widget

Browse Source 
- Novo polje Task.scheduled_date (DateField, nullable, db_index) za planiranje
- Migracija 0009_task_scheduled_date
- Celery task notify_upcoming_tasks: dnevno u 08:00 šalje Pusher + email za sutrašnje zadatke
- TaskCalendarWidget: react-spring slide panel s lijeve strane, grid prikaz mjeseca, dot indikatori, klik otvara TaskServiceRecordsModal
- FleetDashboardShell: import + render kalendara, Planirano stupac u tablici zadataka
- TaskCreateModal + TaskServiceRecordsModal: scheduled_date input i prikaz
- Admin + serializer + views: scheduled_date filter i prikaz
- 47 backend testova prolaze (uključuje 8 novih za notify_upcoming_tasks)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
mariomitte
2026-07-19 14:52:10 +02:00
parent bf8e25efe7
commit 0c9e1b7d50
17 changed files with 610 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
backend/modules/task_management/tests/__init__.py Normal file
View File

24
backend/modules/task_management/tests/test_models.py
View File

@@ -1,5 +1,6 @@
from django.test import TestCase
from django.contrib.auth import get_user_model
import datetime
from modules.task_management.models import Task
@@ -9,4 +10,25 @@ class TaskModelTests(TestCase):
user = get_user_model().objects.create_user(username="u1", email="u1@example.test", password="pass")
task = Task.objects.create(title="My Task", description="Desc", assigned_to=user)
assert str(task).startswith("My Task")
assert "aktivan" in str(task) or "(" in str(task) # basic sanity
assert "aktivan" in str(task) or "(" in str(task)
def test_scheduled_date_defaults_to_null(self):
user = get_user_model().objects.create_user(username="u2", email="u2@example.test", password="pass")
task = Task.objects.create(title="Task bez datuma", assigned_to=user)
assert task.scheduled_date is None
def test_scheduled_date_is_saved_and_retrieved(self):
user = get_user_model().objects.create_user(username="u3", email="u3@example.test", password="pass")
target = datetime.date(2026, 8, 15)
task = Task.objects.create(title="Planirani task", assigned_to=user, scheduled_date=target)
task.refresh_from_db()
assert task.scheduled_date == target
def test_scheduled_date_can_be_updated_to_null(self):
user = get_user_model().objects.create_user(username="u4", email="u4@example.test", password="pass")
target = datetime.date(2026, 8, 15)
task = Task.objects.create(title="Task s datumom", assigned_to=user, scheduled_date=target)
task.scheduled_date = None
task.save()
task.refresh_from_db()
assert task.scheduled_date is None

39
backend/modules/task_management/tests/test_serializers.py
View File

@@ -43,4 +43,41 @@ class TaskSerializerTests(TestCase):
task = Task.objects.create(title="Task 4", description="", 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
assert serializer.is_valid(), serializer.errors
def test_scheduled_date_is_optional_on_create(self):
serializer = TaskSerializer(data={"title": "Task planned", "status": "aktivan", "vehicle": str(self.vehicle.id)})
assert serializer.is_valid(), serializer.errors
assert 'scheduled_date' not in serializer.errors
def test_scheduled_date_is_included_in_serialized_output(self):
import datetime
task = Task.objects.create(
title="Task with date",
assigned_to=self.user,
vehicle=self.vehicle,
scheduled_date=datetime.date(2026, 9, 1),
)
serializer = TaskSerializer(instance=task)
assert 'scheduled_date' in serializer.data
assert str(serializer.data['scheduled_date']) == '2026-09-01'
def test_scheduled_date_can_be_null_in_serialized_output(self):
task = Task.objects.create(title="Task no date", assigned_to=self.user, vehicle=self.vehicle)
serializer = TaskSerializer(instance=task)
assert serializer.data['scheduled_date'] is None
def test_scheduled_date_accepts_valid_date(self):
serializer = TaskSerializer(
data={"title": "Task mit datum", "status": "aktivan",
"vehicle": str(self.vehicle.id), "scheduled_date": "2026-12-25"}
)
assert serializer.is_valid(), serializer.errors
def test_scheduled_date_rejects_invalid_date_string(self):
serializer = TaskSerializer(
data={"title": "Task bad date", "status": "aktivan",
"vehicle": str(self.vehicle.id), "scheduled_date": "not-a-date"}
)
assert not serializer.is_valid()
assert 'scheduled_date' in serializer.errors

133
backend/modules/task_management/tests/test_upcoming_notifications.py Normal file
View File

@@ -0,0 +1,133 @@
import datetime
from unittest.mock import patch
from django.test import TestCase
from django.contrib.auth import get_user_model
from modules.task_management.tasks import notify_upcoming_tasks
from modules.task_management.models import Task
from modules.fleet.models import Vehicle, WorkOrder
class NotifyUpcomingTasksTests(TestCase):
def setUp(self):
User = get_user_model()
self.user = User.objects.create_user(
username="serviser-notif",
email="serviser@example.test",
password="pass",
)
self.vehicle = Vehicle.objects.create(
registration_number="ZG-NOTIF-01",
asset_type='crane',
)
@patch('modules.fleet.services.NotificationService.create_notification')
def test_notifies_for_task_scheduled_tomorrow(self, mock_notify):
tomorrow = datetime.date.today() + datetime.timedelta(days=1)
Task.objects.create(
title="Sutrašnji zadatak",
assigned_to=self.user,
vehicle=self.vehicle,
status='aktivan',
scheduled_date=tomorrow,
)
result = notify_upcoming_tasks()
self.assertEqual(result['notified'], 1)
mock_notify.assert_called_once()
call_kwargs = mock_notify.call_args.kwargs
self.assertEqual(call_kwargs['recipient'], self.user)
self.assertIn('Sutrašnji zadatak', call_kwargs['title'])
self.assertEqual(call_kwargs['level'], 'info')
self.assertTrue(call_kwargs.get('send_email'))
@patch('modules.fleet.services.NotificationService.create_notification')
def test_notifies_multiple_upcoming_tasks(self, mock_notify):
tomorrow = datetime.date.today() + datetime.timedelta(days=1)
Task.objects.create(title="Task A", assigned_to=self.user, vehicle=self.vehicle,
status='aktivan', scheduled_date=tomorrow)
Task.objects.create(title="Task B", assigned_to=self.user, vehicle=self.vehicle,
status='servis', scheduled_date=tomorrow)
result = notify_upcoming_tasks()
self.assertEqual(result['notified'], 2)
self.assertEqual(mock_notify.call_count, 2)
@patch('modules.fleet.services.NotificationService.create_notification')
def test_skips_task_without_scheduled_date(self, mock_notify):
Task.objects.create(
title="Bez datuma", assigned_to=self.user, vehicle=self.vehicle,
status='aktivan', scheduled_date=None,
)
result = notify_upcoming_tasks()
self.assertEqual(result['notified'], 0)
mock_notify.assert_not_called()
@patch('modules.fleet.services.NotificationService.create_notification')
def test_skips_task_scheduled_today(self, mock_notify):
today = datetime.date.today()
Task.objects.create(
title="Danas", assigned_to=self.user, vehicle=self.vehicle,
status='aktivan', scheduled_date=today,
)
result = notify_upcoming_tasks()
self.assertEqual(result['notified'], 0)
mock_notify.assert_not_called()
@patch('modules.fleet.services.NotificationService.create_notification')
def test_skips_task_scheduled_in_past(self, mock_notify):
yesterday = datetime.date.today() - datetime.timedelta(days=1)
Task.objects.create(
title="Jučer", assigned_to=self.user, vehicle=self.vehicle,
status='aktivan', scheduled_date=yesterday,
)
result = notify_upcoming_tasks()
self.assertEqual(result['notified'], 0)
mock_notify.assert_not_called()
@patch('modules.fleet.services.NotificationService.create_notification')
def test_skips_finished_task(self, mock_notify):
tomorrow = datetime.date.today() + datetime.timedelta(days=1)
vehicle2 = Vehicle.objects.create(registration_number="ZG-NOTIF-02", asset_type='crane')
work_order = WorkOrder.objects.create(
vehicle=vehicle2, creator=self.user, purpose='defektaza',
status='closed', start_mileage=100, end_mileage=200,
)
Task.objects.create(
title="Završeni", assigned_to=self.user, vehicle=vehicle2,
status='zavrsen', scheduled_date=tomorrow, work_order=work_order,
)
result = notify_upcoming_tasks()
self.assertEqual(result['notified'], 0)
mock_notify.assert_not_called()
@patch('modules.fleet.services.NotificationService.create_notification')
def test_skips_cancelled_task(self, mock_notify):
tomorrow = datetime.date.today() + datetime.timedelta(days=1)
vehicle3 = Vehicle.objects.create(registration_number="ZG-NOTIF-03", asset_type='crane')
work_order = WorkOrder.objects.create(
vehicle=vehicle3, creator=self.user, purpose='kontrola',
status='closed', start_mileage=50, end_mileage=100,
)
Task.objects.create(
title="Otkazani", assigned_to=self.user, vehicle=vehicle3,
status='neaktivan', scheduled_date=tomorrow, work_order=work_order,
)
result = notify_upcoming_tasks()
self.assertEqual(result['notified'], 0)
mock_notify.assert_not_called()
@patch('modules.fleet.services.NotificationService.create_notification')
def test_skips_task_without_assigned_user(self, mock_notify):
tomorrow = datetime.date.today() + datetime.timedelta(days=1)
Task.objects.create(
title="Bez servisera", assigned_to=None, vehicle=self.vehicle,
status='aktivan', scheduled_date=tomorrow,
)
result = notify_upcoming_tasks()
self.assertEqual(result['notified'], 0)
mock_notify.assert_not_called()
@patch('modules.fleet.services.NotificationService.create_notification')
def test_result_includes_date_string(self, mock_notify):
result = notify_upcoming_tasks()
tomorrow = datetime.date.today() + datetime.timedelta(days=1)
self.assertEqual(result['date'], tomorrow.isoformat())
self.assertEqual(result['notified'], 0)