remove need_manager_mailv1.1

3 files changed, 5 insertions, 6 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])
diff --git a/maconomy_hours.py b/maconomy_hours.py
index e11eed9..61fa6ee 100644
--- a/maconomy_hours.py
+++ b/maconomy_hours.py
@@ -64,7 +64,7 @@ def manager(timesheets, config, mailer):
 def ceo(timesheets, config, mailer):
     to = config.get("mail", "ceo")
     # Filter only "bad" entries
-    relevant = [t for t in timesheets if utils.need_manager_mail(t)]
+    relevant = [t for t in timesheets if not t.is_done()]
     view = CEOEmailView()
     mail = view.render(relevant)
     subject = "Warning: Timesheet overdue for {} employees".format(len(relevant))
@@ -75,7 +75,7 @@ def ceo(timesheets, config, mailer):
 
 
 def summary(timesheets):
-    affected = [t for t in timesheets if utils.need_manager_mail(t)]
+    affected = [t for t in timesheets if not t.is_done()]
     for timesheet in affected:
         print timesheet.status_summary()
     print "Number of overdue timesheets: {}".format(len(affected))