diff --git a/atdb/taskdatabase/forms.py b/atdb/taskdatabase/forms.py
index 6354a3c50d8c1d5109256c1de9d6238d3aa1421e..c6c3ec4eda3308820bb9627564f16b492443bef8 100644
--- a/atdb/taskdatabase/forms.py
+++ b/atdb/taskdatabase/forms.py
@@ -1,5 +1,9 @@
from django import forms
class QualityAnnotationForm(forms.Form):
- annotation = forms.CharField(label='', widget=forms.Textarea, max_length=1000)
- return_to_page = forms.IntegerField(widget=forms.HiddenInput)
\ No newline at end of file
+ annotation = forms.CharField(label='',
+ widget=forms.Textarea(
+ attrs={'rows': 12,'cols': 85}
+ ),
+ max_length=1000)
+ return_to_page = forms.IntegerField(widget=forms.HiddenInput)
diff --git a/atdb/taskdatabase/models.py b/atdb/taskdatabase/models.py
index 48b8e59f12c3724e9855328bfc9bb9e39ea6f348..6d78b2b92dff08a1f6d37b42fa2edfe8e3912a05 100644
--- a/atdb/taskdatabase/models.py
+++ b/atdb/taskdatabase/models.py
@@ -25,7 +25,7 @@ def convert_quality_to_list_for_template(task):
list.append(str(task.quality_json['uv-coverage']))
list.append(str(task.quality_json['sensitivity']))
list.append(str(task.quality_json['observing-conditions']))
- list.append("-")
+ #list.append("-")
except Exception as err:
pass
@@ -106,6 +106,7 @@ class Task(models.Model):
quality = self.outputs['quality']
return True
except:
+ return False
try:
quality = self.outputs[0]['quality']
return True
@@ -118,13 +119,14 @@ class Task(models.Model):
try:
return self.outputs['quality']
except:
+ return None
try:
return self.outputs[0]['quality']
except:
return None
@property
- def has_quality_remarks(self):
+ def get_quality_remarks(self):
try:
return self.remarks['quality']
except:
diff --git a/atdb/taskdatabase/templates/taskdatabase/filter/clear_filter_button.html b/atdb/taskdatabase/templates/taskdatabase/filter/clear_filter_button.html
index 3f103a32e3666bab3fa9eeb6ea0cf909298051f3..bcbe5e9e891f810fd3105f9ac01d4cde2fc9cb43 100644
--- a/atdb/taskdatabase/templates/taskdatabase/filter/clear_filter_button.html
+++ b/atdb/taskdatabase/templates/taskdatabase/filter/clear_filter_button.html
@@ -1 +1 @@
-<a href="{% url 'clear-filter' %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-window-close"></i> Clear Filter</a>
+<a href="{% url 'clear-filter' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-window-close"></i> Clear Filter</a>
diff --git a/atdb/taskdatabase/templates/taskdatabase/filter/filter_buttons.html b/atdb/taskdatabase/templates/taskdatabase/filter/filter_buttons.html
index cd5dcca5b893cf809a32256abc77da0d8e395298..0c20c6763060d10f62aa6155a090c639519b66d7 100644
--- a/atdb/taskdatabase/templates/taskdatabase/filter/filter_buttons.html
+++ b/atdb/taskdatabase/templates/taskdatabase/filter/filter_buttons.html
@@ -7,27 +7,25 @@
<tr>
<td>
{% include "taskdatabase/filter/clear_filter_button.html" %}
- <a href="{% url 'task-set-active-filter' %}" class="btn btn-success btn-sm" role="button"><i class="fas fa-layer-group"></i> Active</a>
- <a href="{% url 'task-set-filter' 'failed' %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-layer-group"></i> Failed</a>
- <a href="{% url 'task-set-onhold-filter' True %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-layer-group"></i> On Hold</a>
- <!--
- <a href="{% url 'task-set-filter' 'defining' %}" class="btn btn-secondary btn-sm" role="button">defining</a>
- -->
- <a href="{% url 'task-set-filter' 'defined' %}" class="btn btn-primary btn-sm" role="button">defined</a>
- <a href="{% url 'task-set-filter' 'staging' %}" class="btn btn-secondary btn-sm" role="button">staging</a>
- <a href="{% url 'task-set-filter' 'staged' %}" class="btn btn-primary btn-sm" role="button">staged</a>
- <a href="{% url 'task-set-filter' 'fetching' %}" class="btn btn-secondary btn-sm" role="button">fetching</a>
- <a href="{% url 'task-set-filter' 'fetched' %}" class="btn btn-primary btn-sm" role="button">fetched</a>
- <a href="{% url 'task-set-filter' 'processing' %}" class="btn btn-secondary btn-sm" role="button">processing</a>
- <a href="{% url 'task-set-filter' 'processed' %}" class="btn btn-primary btn-sm" role="button">processed</a>
- <a href="{% url 'task-set-filter' 'storing' %}" class="btn btn-secondary btn-sm" role="button">storing</a>
- <a href="{% url 'task-set-filter' 'stored' %}" class="btn btn-success btn-sm" role="button">stored</a>
- <a href="{% url 'task-set-filter' 'validated' %}" class="btn btn-primary btn-sm" role="button">validated</a>
- <a href="{% url 'task-set-filter' 'scrubbing' %}" class="btn btn-secondary btn-sm" role="button">scrubbing</a>
- <a href="{% url 'task-set-filter' 'scrubbed' %}" class="btn btn-primary btn-sm" role="button">scrubbed</a>
- <a href="{% url 'task-set-filter' 'archiving' %}" class="btn btn-secondary btn-sm" role="button">archiving</a>
- <a href="{% url 'task-set-filter' 'archived' %}" class="btn btn-primary btn-sm" role="button">archived</a>
- <a href="{% url 'task-set-filter' 'finished' %}" class="btn btn-primary btn-sm" role="button">finished</a>
+ <a href="{% url 'task-set-active-filter' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-layer-group"></i> Active</a>
+ <a href="{% url 'task-set-filter' 'failed' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-layer-group"></i> Failed</a>
+ <a href="{% url 'task-set-onhold-filter' True %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-layer-group"></i> On Hold</a>
+
+ <a href="{% url 'task-set-filter' 'defined' %}" class="btn btn-secondary btn-sm" role="button">defined</a>
+ <a href="{% url 'task-set-filter' 'staging' %}" class="btn btn-secondary btn-sm" role="button"><i>staging</i></a>
+ <a href="{% url 'task-set-filter' 'staged' %}" class="btn btn-secondary btn-sm" role="button">staged</a>
+ <a href="{% url 'task-set-filter' 'fetching' %}" class="btn btn-secondary btn-sm" role="button"><i>fetching</i></a>
+ <a href="{% url 'task-set-filter' 'fetched' %}" class="btn btn-secondary btn-sm" role="button">fetched</a>
+ <a href="{% url 'task-set-filter' 'processing' %}" class="btn btn-secondary btn-sm" role="button"><i>processing</i></a>
+ <a href="{% url 'task-set-filter' 'processed' %}" class="btn btn-secondary btn-sm" role="button">processed</a>
+ <a href="{% url 'task-set-filter' 'storing' %}" class="btn btn-secondary btn-sm" role="button"><i>storing</i></a>
+ <a href="{% url 'task-set-filter' 'stored' %}" class="btn btn-secondary btn-sm" role="button">stored</a>
+ <a href="{% url 'task-set-filter' 'validated' %}" class="btn btn-secondary btn-sm" role="button">validated</a>
+ <a href="{% url 'task-set-filter' 'scrubbing' %}" class="btn btn-secondary btn-sm" role="button"><i>scrubbing</i></a>
+ <a href="{% url 'task-set-filter' 'scrubbed' %}" class="btn btn-secondary btn-sm" role="button">scrubbed</a>
+ <a href="{% url 'task-set-filter' 'archiving' %}" class="btn btn-secondary btn-sm" role="button"><i>archiving</i></a>
+ <a href="{% url 'task-set-filter' 'archived' %}" class="btn btn-secondary btn-sm" role="button">archived</a>
+ <a href="{% url 'task-set-filter' 'finished' %}" class="btn btn-secondary btn-sm" role="button">finished</a>
</td>
<td>
diff --git a/atdb/taskdatabase/templates/taskdatabase/filter/filter_xxx.html b/atdb/taskdatabase/templates/taskdatabase/filter/filter_xxx.html
deleted file mode 100644
index 891cdf93906dc5916dd5ceb3a665b170b9cdfd9b..0000000000000000000000000000000000000000
--- a/atdb/taskdatabase/templates/taskdatabase/filter/filter_xxx.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<form action="/atdb/filter" method="get">
- {{ my_form }}
- <input type="submit" value="Filter">
-</form>
\ No newline at end of file
diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html
index 9f5636ed866590291c270f54bcb2e9a1b9e63b89..c6aab8e246ae48332c528e5b278316f936f35ebc 100644
--- a/atdb/taskdatabase/templates/taskdatabase/index.html
+++ b/atdb/taskdatabase/templates/taskdatabase/index.html
@@ -34,7 +34,7 @@
{% include 'taskdatabase/pagination.html' %}
</div>
</div>
- <p class="footer"> Version 1.0.0 (8 apr 2021 - 11:00)
+ <p class="footer"> Version 1.0.0 (8 apr 2021 - 14:00)
</div>
diff --git a/atdb/taskdatabase/templates/taskdatabase/quality/quality_page.html b/atdb/taskdatabase/templates/taskdatabase/quality/quality_page.html
index 00d5fdf24898b89d265787aca78440198695cd61..01c9c4c745b45dc14407811aa7655a6fed2972f6 100644
--- a/atdb/taskdatabase/templates/taskdatabase/quality/quality_page.html
+++ b/atdb/taskdatabase/templates/taskdatabase/quality/quality_page.html
@@ -7,10 +7,11 @@
<div class="card">
<div class="card-body">
<div class="row">
- <div class="col-8">
+ <div class="col-12">
<h3>Quality Diagnostics</h3>
This overview shows the Quality Diagnostics of all the task that have this information.
<hr>
+ {% include 'taskdatabase/filter/filter_buttons.html' %}
</div>
</div>
<div class="row">
diff --git a/atdb/taskdatabase/templates/taskdatabase/quality/tasks_quality.html b/atdb/taskdatabase/templates/taskdatabase/quality/tasks_quality.html
index 77cf0330ef08c95c1fad10b231f5fade70674f5b..cd46879c0006006c3276ceac1b53eba160d90c58 100644
--- a/atdb/taskdatabase/templates/taskdatabase/quality/tasks_quality.html
+++ b/atdb/taskdatabase/templates/taskdatabase/quality/tasks_quality.html
@@ -38,13 +38,33 @@
<td>{{ task.filter }} </td>
{% if task.has_quality %}
- {% for value in task.quality_as_list %}
- <td>{{value}}</td>
- {% endfor %}
+ {% for value in task.quality_as_list %}
+ <td>{{value}}</td>
+ {% endfor %}
+ <td>
+ <a href=""
+ class="btn btn-primary btn-sm" role="button" target="_blank"><img src="{% static 'taskdatabase/surfsara.jpg' %}" height="20" alt="this is a placeholder, links to plots will follow"></a>
+ </td>
+ {% else %}
+ <td>-</td><td>-</td><td>-</td><td>-</td>
{% endif %}
-
<td>
+ {% if task.get_quality_remarks %}
+ <a class="open-modal btn btn-warning btn-sm"
+ href="{% url 'annotate-quality' task.id my_tasks.number %}"
+ data-popup-url="{% url 'annotate-quality' task.id my_tasks.number %}">
+ <i class="fas fa-pen-alt"></i>
+ </a>
+ {% else %}
+ <a class="open-modal btn btn-secondary btn-sm"
+ href="{% url 'annotate-quality' task.id my_tasks.number %}"
+ data-popup-url="{% url 'annotate-quality' task.id my_tasks.number %}">
+ <i class="fas fa-pen-alt"></i>
+ </a>
+ {% endif %}
+ </td>
+ <td>{{ task.quality|default_if_none:"-" }}</td>
</tr>
</div>
diff --git a/atdb/taskdatabase/templates/taskdatabase/quality/tasks_quality_headers.html b/atdb/taskdatabase/templates/taskdatabase/quality/tasks_quality_headers.html
index 98901d30ac7a7dbfcdf551f5905c2b112ace3d8d..dfbaafffa00569caa3939019e38222b688f15b91 100644
--- a/atdb/taskdatabase/templates/taskdatabase/quality/tasks_quality_headers.html
+++ b/atdb/taskdatabase/templates/taskdatabase/quality/tasks_quality_headers.html
@@ -1,13 +1,34 @@
<tr>
- <th>ID</th>
+ <th>
+ <a href="{% url 'sort-tasks' '-pk' 'quality' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-up"></i></a>
+ ID
+ <a href="{% url 'sort-tasks' 'id' 'quality' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-down"></i></a>
+ </th>
<th>Details</th>
-
- <th>Status</th>
- <th>Project</th>
- <th>SAS_ID</th>
- <th>filter</th>
+ <th>
+ <a href="{% url 'sort-tasks' '-status' 'quality' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-up"></i></a>
+ Status
+ <a href="{% url 'sort-tasks' 'status' 'quality' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-down"></i></a>
+ </th>
+ <th>
+ <a href="{% url 'sort-tasks' '-project' 'quality' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-up"></i></a>
+ Project
+ <a href="{% url 'sort-tasks' 'project' 'quality' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-down"></i></a>
+ </th>
+ <th>
+ <a href="{% url 'sort-tasks' '-sas_id' 'quality' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-up"></i></a>
+ SAS_ID
+ <a href="{% url 'sort-tasks' 'sas_id' 'quality' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-down"></i></a>
+ </th>
+ <th>
+ <a href="{% url 'sort-tasks' '-filter' 'quality' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-up"></i></a>
+ Filter
+ <a href="{% url 'sort-tasks' 'filter' 'quality' %}" class="btn btn-light btn-sm" role="button"><i class="fas fa-sort-down"></i></a>
+ </th>
<th>uv-coverage</th>
<th>Sensitivity</th>
<th>Conditions</th>
- <th>Diagnostic plots</th>
+ <th>Plots</th>
+ <th>Annotate</th>
+ <th>Quality</th>
</tr>
\ No newline at end of file
diff --git a/atdb/taskdatabase/templates/taskdatabase/query/index.html b/atdb/taskdatabase/templates/taskdatabase/query/index.html
index b44c1011d092ed9ad4237679294ed475b5b2870e..de6aedab3d3926b07f06bf70007604ef3d2c6359 100644
--- a/atdb/taskdatabase/templates/taskdatabase/query/index.html
+++ b/atdb/taskdatabase/templates/taskdatabase/query/index.html
@@ -14,7 +14,7 @@
<div class="card">
<form action="" method="get" class="form form-inline">
{% bootstrap_form filter.form layout='inline' %}
- <button type="submit" class="btn-success btn-sm" title="Filter"><i class="fas fa-filter"></i> Filter</button>
+ <button type="submit" class="btn-secondary btn-sm" title="Filter"><i class="fas fa-filter"></i> Filter</button>
{% include "taskdatabase/filter/clear_filter_button.html" %}
</form>
</div>
diff --git a/atdb/taskdatabase/templates/taskdatabase/query/set_multi_status_panel.html b/atdb/taskdatabase/templates/taskdatabase/query/set_multi_status_panel.html
index f2606a3c328088c3d88c978de33e47d9fb3e93e6..212fba09695287bc1661a4be59e507dbc47e2cfc 100644
--- a/atdb/taskdatabase/templates/taskdatabase/query/set_multi_status_panel.html
+++ b/atdb/taskdatabase/templates/taskdatabase/query/set_multi_status_panel.html
@@ -12,9 +12,10 @@
<a href="{% url 'task-multi-hold' 'resume' request.GET %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-play"></i> start</a>
<a href="{% url 'task-multi-setstatus' 'defined' request.GET %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-sync-alt"></i> defined</a>
<a href="{% url 'task-multi-setstatus' 'staged' request.GET %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-sync-alt"></i> staged</a>
+ <a href="{% url 'task-multi-setstatus' 'fetched' request.GET %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-sync-alt"></i> fetched</a>
<a href="{% url 'task-multi-setstatus' 'processed' request.GET %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-sync-alt"></i> processed</a>
- <a href="{% url 'task-multi-setstatus' 'validated' request.GET %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-sync-alt"></i> validated</a>
<a href="{% url 'task-multi-setstatus' 'stored' request.GET %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-sync-alt"></i> stored</a>
+ <a href="{% url 'task-multi-setstatus' 'validated' request.GET %}" class="btn btn-success btn-sm" role="button"><i class="fas fa-sync-alt"></i> validated</a>
<a href="{% url 'task-multi-setstatus' 'scrubbed' request.GET %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-sync-alt"></i> scrubbed</a>
<a href="{% url 'task-multi-setstatus' 'archived' request.GET %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-sync-alt"></i> archived</a>
<a href="{% url 'task-multi-setstatus' 'finished' request.GET %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-sync-alt"></i> finished</a>
diff --git a/atdb/taskdatabase/templates/taskdatabase/query/status_buttons_per_row.html b/atdb/taskdatabase/templates/taskdatabase/query/status_buttons_per_row.html
index 72f2e697972bf3ef43bf1715f3de3a48eed023ca..a5f3852760f997115badeaf9369dac51bec64c50 100644
--- a/atdb/taskdatabase/templates/taskdatabase/query/status_buttons_per_row.html
+++ b/atdb/taskdatabase/templates/taskdatabase/query/status_buttons_per_row.html
@@ -1,13 +1,14 @@
+
{% if user.is_staff %}
- <a href="{% url 'task-setstatus' record.pk 'defined' request.GET %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> defined</a>
- <a href="{% url 'task-setstatus' record.pk 'staged' request.GET %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> staged</a>
- <a href="{% url 'task-setstatus' record.pk 'fetched' request.GET %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> fetched</a>
- <a href="{% url 'task-setstatus' record.pk 'processed' request.GET %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> processed</a>
- <a href="{% url 'task-setstatus' record.pk 'stored' request.GET %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> stored</a>
- <a href="{% url 'task-setstatus' record.pk 'validated' request.GET %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> validated</a>
- <a href="{% url 'task-setstatus' record.pk 'scrubbed' request.GET %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> scrubbed</a>
- <a href="{% url 'task-setstatus' record.pk 'archived' request.GET %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> archived</a>
- <a href="{% url 'task-setstatus' record.pk 'finished' request.GET %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> finished</a>
+ <a href="{% url 'task-setstatus' record.pk 'defined' request.GET %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> defined</a>
+ <a href="{% url 'task-setstatus' record.pk 'staged' request.GET %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> staged</a>
+ <a href="{% url 'task-setstatus' record.pk 'fetched' request.GET %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> fetched</a>
+ <a href="{% url 'task-setstatus' record.pk 'processed' request.GET %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> processed</a>
+ <a href="{% url 'task-setstatus' record.pk 'stored' request.GET %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> stored</a>
+ <a href="{% url 'task-setstatus' record.pk 'validated' request.GET %}" class="btn btn-success btn-sm" role="button"><i class="fas fa-sync-alt"></i> validated</a>
+ <a href="{% url 'task-setstatus' record.pk 'scrubbed' request.GET %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> scrubbed</a>
+ <a href="{% url 'task-setstatus' record.pk 'archived' request.GET %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> archived</a>
+ <a href="{% url 'task-setstatus' record.pk 'finished' request.GET %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> finished</a>
{% endif %}
diff --git a/atdb/taskdatabase/templates/taskdatabase/tasks/set_status_buttons.html b/atdb/taskdatabase/templates/taskdatabase/tasks/set_status_buttons.html
index 151f0117fd36690b2f633aef28310540a51ba0a8..b33c6262098380ddf27a7e850bf2a38249790f01 100644
--- a/atdb/taskdatabase/templates/taskdatabase/tasks/set_status_buttons.html
+++ b/atdb/taskdatabase/templates/taskdatabase/tasks/set_status_buttons.html
@@ -1,11 +1,11 @@
<a href="{% url 'task-details-setstatus' task.pk 'defining' %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-undo"></i> defining</a>
-<a href="{% url 'task-details-setstatus' task.pk 'defined' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> defined</a>
-<a href="{% url 'task-details-setstatus' task.pk 'staged' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> staged</a>
-<a href="{% url 'task-details-setstatus' task.pk 'fetched' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> fetched</a></td>
-<a href="{% url 'task-details-setstatus' task.pk 'processed' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> processed</a></td>
-<a href="{% url 'task-details-setstatus' task.pk 'stored' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> stored</a></td>
-<a href="{% url 'task-details-setstatus' task.pk 'validated' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> validated</a>
-<a href="{% url 'task-details-setstatus' task.pk 'scrubbed' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> scrubbed</a>
-<a href="{% url 'task-details-setstatus' task.pk 'archived' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> archived</a>
-<a href="{% url 'task-details-setstatus' task.pk 'finished' %}" class="btn btn-secondary btn-sm" role="button"><i class="fas fa-sync-alt"></i> finished</a>
-<a href="{% url 'task-details-setstatus' task.pk 'failed (manual)' %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-sync-alt"></i> failed (manual)</a>
+<a href="{% url 'task-details-setstatus' task.pk 'defined' %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> defined</a>
+<a href="{% url 'task-details-setstatus' task.pk 'staged' %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> staged</a>
+<a href="{% url 'task-details-setstatus' task.pk 'fetched' %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> fetched</a></td>
+<a href="{% url 'task-details-setstatus' task.pk 'processed' %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> processed</a></td>
+<a href="{% url 'task-details-setstatus' task.pk 'stored' %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> stored</a></td>
+<a href="{% url 'task-details-setstatus' task.pk 'validated' %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> validated</a>
+<a href="{% url 'task-details-setstatus' task.pk 'scrubbed' %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> scrubbed</a>
+<a href="{% url 'task-details-setstatus' task.pk 'archived' %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> archived</a>
+<a href="{% url 'task-details-setstatus' task.pk 'finished' %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> finished</a>
+<a href="{% url 'task-details-setstatus' task.pk 'failed (manual)' %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-sync-alt"></i> failed (manual)</a>
diff --git a/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation.html b/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation.html
index cf376f175f9a108e8819be7b76137058b6dd02d3..bb8927c18512d14cee2c54c5b126c3ec205e75d8 100644
--- a/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation.html
+++ b/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation.html
@@ -31,7 +31,7 @@
<td>{{ task.filter }} </td>
{% if task.has_quality %}
- {% for value in task.quality_as_shortlist %}
+ {% for value in task.quality_as_list %}
<td>{{value}}</td>
{% endfor %}
<td>
@@ -42,11 +42,8 @@
<td>-</td><td>-</td><td>-</td><td>-</td>
{% endif %}
-
- <td>{{ task.quality|default_if_none:"-" }}</td>
-
<td>
- {% if task.has_quality_remarks %}
+ {% if task.get_quality_remarks %}
<a class="open-modal btn btn-warning btn-sm"
href="{% url 'annotate-quality' task.id my_tasks.number %}"
data-popup-url="{% url 'annotate-quality' task.id my_tasks.number %}">
@@ -60,14 +57,11 @@
</a>
{% 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>
- </td>
+ <td>{{ task.quality|default_if_none:"-" }}</td>
+ <td>{% include "taskdatabase/validation/validation_buttons.html" %}</td>
- </tr>
- </div>
+ </tr>
+ </div>
{% endif %}
{% endfor %}
diff --git a/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation_headers.html b/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation_headers.html
index fbb2435a07b3ef6f45d3bf679b965989b70ce0b4..279efc63cf5d05183408bca39270087dd48b5943 100644
--- a/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation_headers.html
+++ b/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation_headers.html
@@ -25,7 +25,7 @@
<th>Sensitivity</th>
<th>Conditions</th>
<th>Plots</th>
- <th>Quality</th>
<th>Annotate</th>
- <th>Poor/Moderate/Good</th>
+ <th>Quality</th>
+ <th>Validate (choose a Q)</th>
</tr>
\ No newline at end of file
diff --git a/atdb/taskdatabase/templates/taskdatabase/validation/validation_buttons.html b/atdb/taskdatabase/templates/taskdatabase/validation/validation_buttons.html
new file mode 100644
index 0000000000000000000000000000000000000000..70b6c62fa718dc18bd557e7b7ff032953056c7c8
--- /dev/null
+++ b/atdb/taskdatabase/templates/taskdatabase/validation/validation_buttons.html
@@ -0,0 +1,3 @@
+ <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/validation_page.html b/atdb/taskdatabase/templates/taskdatabase/validation/validation_page.html
index 7663748135154eba4b1f06048e1a2669a0f333cf..904b6883c7111725eafd5d58ea7c9c2c95f671b8 100644
--- a/atdb/taskdatabase/templates/taskdatabase/validation/validation_page.html
+++ b/atdb/taskdatabase/templates/taskdatabase/validation/validation_page.html
@@ -4,13 +4,17 @@
{% block myBlock %}
<div class="container-fluid details-container">
+
<div class="card">
<div class="card-body">
<div class="row">
- <div class="col-8">
+ <div class="col-12">
<h3>Validation</h3>
- These are the tasks in status 'stored' that can be validated. Click one of the quality buttons to validate.
+
+ These are the tasks in status <b>stored</b> that can be validated. Click one of the quality buttons to validate.
+
<td>{% include 'taskdatabase/filter/search.html' %}</td>
+
<hr>
</div>
</div>
diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py
index 1008200196ecd1d671004b545fe0012e216b48fa..0fc33ba7a9836c4b4adcfc2dc68553caf270ae45 100644
--- a/atdb/taskdatabase/views.py
+++ b/atdb/taskdatabase/views.py
@@ -362,7 +362,6 @@ class ShowQualityPage(ListView):
tasks = get_filtered_tasks(search_box, sort)
# exclude the tasks without quality information
- #tasks = tasks.exclude(outputs__isnull=True)
tasks = tasks.exclude(outputs__quality__isnull=True)
#tasks = tasks.exclude(outputs__0__quality__isnull=True)
@@ -422,7 +421,7 @@ class ShowValidationPage(ListView):
if (search_box is not None):
tasks = get_filtered_tasks(search_box, sort, stored_tasks)
- # exclude the tasks without quality information
+ # exclude the failed tasks
tasks = tasks.exclude(status__icontains="failed")
paginator = Paginator(tasks, config.TASKS_PER_PAGE) # Show 50 tasks per page
@@ -582,9 +581,6 @@ def ShowTaskQuality(request, id=0, page=0):
def AnnotateQuality(request, id=0, page=0, new_remark=""):
- # store the current page on the session
- # request.session['page'] = page
-
# a POST means that the form is filled in and should be stored in the database
if request.method == "POST":
@@ -610,7 +606,6 @@ def AnnotateQuality(request, id=0, page=0, new_remark=""):
quality_remarks = ""
form = QualityAnnotationForm(initial={'annotation': quality_remarks, 'return_to_page': page})
-
return render(request, "taskdatabase/validation/annotate_quality.html", {'task': task, 'page': page, 'form':form})