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

Merge exclusion conditions for time_spent calculation

Browse Source
This commit is contained in:
Sam Splunks 2024-02-14 14:52:23 +00:00
parent b3cbfdbe09
commit b1759520d8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
helpdesk/models.py
View File

@ -1047,10 +1047,10 @@ class FollowUp(models.Model):
start_day_time = middle_day_time.replace(hour=0, minute=0, second=0)
end_day_time = middle_day_time.replace(hour=23, minute=59, second=59)
if start_day_time.strftime("%m-%d") not in holidays:
if (self.ticket.status not in exclude_statuses and
self.ticket.queue.slug not in exclude_queues):
time_spent_seconds += daily_time_spent_calculation(start_day_time, end_day_time, open_hours)
if (start_day_time.strftime("%m-%d") not in holidays and
self.ticket.status not in exclude_statuses and
self.ticket.queue.slug not in exclude_queues):
time_spent_seconds += daily_time_spent_calculation(start_day_time, end_day_time, open_hours)
return datetime.timedelta(seconds=time_spent_seconds)