holm/django-helpdeskmig
1
0
Fork 0
mirror of https://gitea.mueller.network/extern/django-helpdesk.git synced 2024-12-27 17:18:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Precise selection of previous status

Browse Source
This commit is contained in:
Sam Splunks 2024-02-15 09:55:57 +00:00
parent ae89d182a9
commit 02e333cf52
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
helpdesk/models.py
View File

@ -1007,16 +1007,17 @@ class FollowUp(models.Model):
def time_spent_calculation(self): def time_spent_calculation(self):
"Returns timedelta according to rules settings." "Returns timedelta according to rules settings."
# extract earliest time from previous follow-up # extract parameters from previous follow-up or ticket
# or ticket creation time
try: try:
prev_fup_qs = self.ticket.followup_set.all() prev_fup_qs = self.ticket.followup_set.all()
if self.id: if self.id:
prev_fup_qs = prev_fup_qs.filter(id__lt=self.id) prev_fup_qs = prev_fup_qs.filter(id__lt=self.id)
prev_fup = prev_fup_qs.latest("date") prev_fup = prev_fup_qs.latest("date")
earliest = prev_fup.date earliest = prev_fup.date
prev_status = prev_fup.new_status
except ObjectDoesNotExist: except ObjectDoesNotExist:
earliest = self.ticket.created earliest = self.ticket.created
prev_status = self.ticket.status
# latest time is current follow-up date # latest time is current follow-up date
latest = self.date latest = self.date
@ -1046,7 +1047,7 @@ class FollowUp(models.Model):
end_day_time = middle_day_time.replace(hour=23, minute=59, second=59) end_day_time = middle_day_time.replace(hour=23, minute=59, second=59)
if (start_day_time.strftime("%m-%d") not in holidays and if (start_day_time.strftime("%m-%d") not in holidays and
self.ticket.status not in exclude_statuses and prev_status not in exclude_statuses and
self.ticket.queue.slug not in exclude_queues): self.ticket.queue.slug not in exclude_queues):
time_spent_seconds += daily_time_spent_calculation(start_day_time, end_day_time, open_hours) time_spent_seconds += daily_time_spent_calculation(start_day_time, end_day_time, open_hours)