From 47b913ba4441683cc43e729d734c42f83781a306 Mon Sep 17 00:00:00 2001
From: bashmak <nerosketch@gmail.com>
Date: Tue, 18 Apr 2017 15:18:37 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=BB=20=D0=BF=D0=BE=D0=B4=D1=81=D0=B2=D0=B5=D1=82=D0=BA?=
 =?UTF-8?q?=D1=83=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87,=20=D1=82=D0=B5=D0=BF?=
 =?UTF-8?q?=D0=B5=D1=80=D1=8C=20=D0=B1=D0=BB=D0=B5=D0=B4=D0=BD=D1=8B=D0=B5?=
 =?UTF-8?q?=20=D0=B8=20=D0=B2=D1=8B=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=BD=D1=8B=D0=B5=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 taskapp/models.py                              | 4 ++--
 taskapp/templates/taskapp/tasklist.html        | 2 +-
 taskapp/templates/taskapp/tasklist_active.html | 2 +-
 taskapp/templates/taskapp/tasklist_all.html    | 2 +-
 taskapp/templates/taskapp/tasklist_finish.html | 2 +-
 taskapp/templates/taskapp/tasklist_own.html    | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/taskapp/models.py b/taskapp/models.py
index b755fca..e484e04 100644
--- a/taskapp/models.py
+++ b/taskapp/models.py
@@ -101,8 +101,8 @@ class Task(models.Model):
     def get_attachment_fname(self):
         return os.path.basename(self.attachment.name)
 
-    def is_outdated(self):
-        return self.out_date < timezone.now().date()
+    def is_relevant(self):
+        return self.out_date < timezone.now().date() or self.state == 'F'
 
 
 def task_handler(sender, instance, **kwargs):
diff --git a/taskapp/templates/taskapp/tasklist.html b/taskapp/templates/taskapp/tasklist.html
index 92f79e3..d4a0002 100644
--- a/taskapp/templates/taskapp/tasklist.html
+++ b/taskapp/templates/taskapp/tasklist.html
@@ -20,7 +20,7 @@
             <tbody>
             {% for task in tasks %}
 
-                {% if task.is_outdated %}
+                {% if task.is_relevant %}
                     <tr class="text-muted">
                 {% else %}
                     {% if task.priority == 'E' %}
diff --git a/taskapp/templates/taskapp/tasklist_active.html b/taskapp/templates/taskapp/tasklist_active.html
index 531a318..43672a0 100644
--- a/taskapp/templates/taskapp/tasklist_active.html
+++ b/taskapp/templates/taskapp/tasklist_active.html
@@ -20,7 +20,7 @@
             <tbody>
             {% for task in tasks %}
 
-                {% if task.is_outdated %}
+                {% if task.is_relevant %}
                     <tr class="text-muted">
                 {% else %}
                     {% if task.priority == 'E' %}
diff --git a/taskapp/templates/taskapp/tasklist_all.html b/taskapp/templates/taskapp/tasklist_all.html
index ce4209c..1a49d87 100644
--- a/taskapp/templates/taskapp/tasklist_all.html
+++ b/taskapp/templates/taskapp/tasklist_all.html
@@ -32,7 +32,7 @@
             <tbody>
             {% for task in tasks %}
 
-                {% if task.is_outdated %}
+                {% if task.is_relevant %}
                     <tr class="text-muted">
                 {% else %}
                     {% if task.priority == 'E' %}
diff --git a/taskapp/templates/taskapp/tasklist_finish.html b/taskapp/templates/taskapp/tasklist_finish.html
index c2ba0e3..8400fe4 100644
--- a/taskapp/templates/taskapp/tasklist_finish.html
+++ b/taskapp/templates/taskapp/tasklist_finish.html
@@ -20,7 +20,7 @@
             <tbody>
             {% for task in tasks %}
 
-                {% if task.is_outdated %}
+                {% if task.is_relevant %}
                     <tr class="text-muted">
                 {% else %}
                     {% if task.priority == 'E' %}
diff --git a/taskapp/templates/taskapp/tasklist_own.html b/taskapp/templates/taskapp/tasklist_own.html
index 04c953d..baaa3fe 100644
--- a/taskapp/templates/taskapp/tasklist_own.html
+++ b/taskapp/templates/taskapp/tasklist_own.html
@@ -19,7 +19,7 @@
             <tbody>
             {% for task in tasks %}
 
-                {% if task.is_outdated %}
+                {% if task.is_relevant %}
                     <tr class="text-muted">
                 {% else %}
                     {% if task.priority == 'E' %}