From 5ef68e5ed7dc940f3624491004673ba5ddd1b4e5 Mon Sep 17 00:00:00 2001
From: Nico Vermaas <vermaas@astron.nl>
Date: Mon, 4 Apr 2022 15:26:32 +0200
Subject: [PATCH] add annotation button and 'has_quality_remarks' field

---
 atdb/taskdatabase/models.py                     |  7 +++++++
 .../validation/tasks_validation.html            | 17 +++++++++++++++++
 .../validation/tasks_validation_headers.html    |  5 +++--
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/atdb/taskdatabase/models.py b/atdb/taskdatabase/models.py
index 88e892af..9556bd8a 100644
--- a/atdb/taskdatabase/models.py
+++ b/atdb/taskdatabase/models.py
@@ -126,6 +126,13 @@ class Task(models.Model):
             except:
                 return None
 
+    @property
+    def has_quality_remarks(self):
+        try:
+            return self.remarks['quality']
+        except:
+            return None
+
     @property
     def quality_as_list(self):
         try:
diff --git a/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation.html b/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation.html
index 01be4de3..0485f26a 100644
--- a/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation.html
+++ b/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation.html
@@ -44,7 +44,24 @@
 
 
                 <td>{{ task.quality|default_if_none:"-" }}</td>
+
                 <td>
+                    {% if task.has_quality_remarks %}
+                        <a class="open-modal btn btn-primary btn-sm"
+                               href="{% url 'task-quality' task.id my_tasks.number %}"
+                               data-popup-url="{% url 'task-quality' task.id my_tasks.number %}">
+                            <i class="fas fa-pen-alt"></i>
+                        </a>&nbsp;
+                    {% else %}
+                        <a class="open-modal btn btn-secondary btn-sm"
+                               href="{% url 'task-quality' task.id my_tasks.number %}"
+                               data-popup-url="{% url 'task-quality' task.id my_tasks.number %}">
+                            <i class="fas fa-pen-alt"></i>
+                        </a>&nbsp;
+                    {% endif %}
+                </td>
+                <td>
+
                     <a href="{% url 'task-validate-view' task.pk 'poor' 'validated' my_tasks.number %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-check"></i> P</a>
                     <a href="{% url 'task-validate-view' task.pk 'moderate' 'validated' my_tasks.number %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-check"></i> M</a>
                     <a href="{% url 'task-validate-view' task.pk 'good' 'validated' my_tasks.number %}" class="btn btn-success btn-sm" role="button"><i class="fas fa-check"></i> G</a>
diff --git a/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation_headers.html b/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation_headers.html
index e6911c18..88d6dc47 100644
--- a/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation_headers.html
+++ b/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation_headers.html
@@ -25,6 +25,7 @@
     <th>Sensitivity</th>
     <th>Conditions</th>
     <th>Plots</th>
-    <th>Current Q</th>
-    <th>Choose</th>
+    <th>Quality</th>
+    <th>Edit</th>
+    <th>Poor/Moderate/Good</th>
 </tr>
\ No newline at end of file
-- 
GitLab