holm/django-helpdeskmig
1
0
Fork 0
mirror of https://gitea.mueller.network/extern/django-helpdesk.git synced 2024-11-21 23:43:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'django-helpdesk:main' into followup_queue_change

Browse Source
This commit is contained in:
Sam Splunks 2024-04-09 12:01:12 +02:00 committed by GitHub
commit 33b3216d38
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
helpdesk/lib.py
View File

@ -234,8 +234,6 @@ def daily_time_spent_calculation(earliest, latest, open_hours):
latest = latest.replace(hour=end_hour, minute=end_minute, second=end_second)
day_delta = latest - earliest
# returns up to 86399 seconds, add one second if full day
time_spent_seconds += day_delta.seconds
return time_spent_seconds

8
helpdesk/tests/test_time_spent_auto.py
View File

@ -3,7 +3,6 @@ from datetime import datetime, timedelta
from django.contrib.auth.hashers import make_password
from django.contrib.auth.models import User
from django.test import TestCase, override_settings
from django.test.client import Client
from helpdesk.models import FollowUp, Queue, Ticket
from helpdesk import settings as helpdesk_settings
import uuid
@ -25,8 +24,6 @@ class TimeSpentAutoTestCase(TestCase):
title='test ticket',
description='test ticket description')
self.client = Client()
self.user = User.objects.create(
username='staff',
email='staff@example.com',
@ -72,7 +69,6 @@ class TimeSpentAutoTestCase(TestCase):
message_id=uuid.uuid4().hex,
time_spent=None
)
followup1.save()
self.assertEqual(followup1.time_spent.total_seconds(), assertion_delta.total_seconds())
self.assertEqual(ticket.time_spent.total_seconds(), assertion_delta.total_seconds())
@ -91,7 +87,6 @@ class TimeSpentAutoTestCase(TestCase):
message_id=uuid.uuid4().hex,
time_spent=None
)
followup2.save()
self.assertEqual(followup2.time_spent.total_seconds(), delta.total_seconds())
self.assertEqual(ticket.time_spent.total_seconds(), assertion_delta.total_seconds() + delta.total_seconds())
@ -175,7 +170,6 @@ class TimeSpentAutoTestCase(TestCase):
message_id=uuid.uuid4().hex,
time_spent=None
)
followup1.save()
self.assertEqual(followup1.time_spent.total_seconds(), assertion_delta.total_seconds())
self.assertEqual(ticket.time_spent.total_seconds(), assertion_delta.total_seconds())
@ -213,7 +207,6 @@ class TimeSpentAutoTestCase(TestCase):
message_id=uuid.uuid4().hex,
time_spent=None
)
followup1.save()
# The Follow-up time_spent should be zero as the default OPEN_STATUS was excluded from calculation
self.assertEqual(followup1.time_spent.total_seconds(), 0.0)
@ -252,7 +245,6 @@ class TimeSpentAutoTestCase(TestCase):
message_id=uuid.uuid4().hex,
time_spent=None
)
followup1.save()
# The Follow-up time_spent should be zero as the default queue was excluded from calculation
self.assertEqual(followup1.time_spent.total_seconds(), 0.0)