diff options
Diffstat (limited to 'maconomy')
| -rw-r--r-- | maconomy/models.py | 2 | ||||
| -rw-r--r-- | maconomy/utils.py | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/maconomy/models.py b/maconomy/models.py index 7f4fcd4..e9044ab 100644 --- a/maconomy/models.py +++ b/maconomy/models.py @@ -36,6 +36,8 @@ class Timesheet: return self.submitted is None def is_approved(self): return self.approved == 1 + def is_done(self): + return self.is_submitted() and self.is_approved() def __str__(self): return self.__unicode__() def status_summary(self): diff --git a/maconomy/utils.py b/maconomy/utils.py index e22239b..3cfeb2d 100644 --- a/maconomy/utils.py +++ b/maconomy/utils.py @@ -3,13 +3,10 @@ from collections import defaultdict def per_manager(timesheets): per_manager = defaultdict(list) # filter timesheets per manager - for timesheet in [t for t in timesheets if need_manager_mail(t)]: + for timesheet in [t for t in timesheets if not t.is_done()]: manager_id = timesheet.approver per_manager[manager_id].append(timesheet) return per_manager -def need_manager_mail(timesheet): - return not timesheet.is_submitted() or not timesheet.is_approved() - def employees(timesheets): return dict([(t.employee.id, t.employee) for t in timesheets]) |