From ed4b0f515d4f45d5d6a5cf2878233a5fac6b499f Mon Sep 17 00:00:00 2001
From: Nico Vermaas <vermaas@astron.nl>
Date: Fri, 8 Apr 2022 11:23:52 +0200
Subject: [PATCH] working on annotation added Retry button to Task page
---
atdb/atdb/static/taskdatabase/style.css | 4 +++
atdb/taskdatabase/forms.py | 2 +-
atdb/taskdatabase/models.py | 3 --
.../static/taskdatabase/style.css | 4 +++
.../taskdatabase/failures/retry_buttons.html | 18 ++++++++++
.../taskdatabase/failures/tasks_failures.html | 33 ++-----------------
.../templates/taskdatabase/index.html | 2 +-
.../quality/tasks_quality_headers.html | 3 --
.../templates/taskdatabase/refresh.html | 2 +-
.../templates/taskdatabase/tasks.html | 6 ++--
.../validation/annotate_quality.html | 13 +++-----
.../validation/tasks_validation.html | 8 ++---
atdb/taskdatabase/urls.py | 2 +-
13 files changed, 45 insertions(+), 55 deletions(-)
create mode 100644 atdb/taskdatabase/templates/taskdatabase/failures/retry_buttons.html
diff --git a/atdb/atdb/static/taskdatabase/style.css b/atdb/atdb/static/taskdatabase/style.css
index b8cd66eb..37d988b1 100644
--- a/atdb/atdb/static/taskdatabase/style.css
+++ b/atdb/atdb/static/taskdatabase/style.css
@@ -118,4 +118,8 @@ p.title {
.modal-content {
overflow: scroll !important;
+}
+
+.form-flex {
+ display: flex;
}
\ No newline at end of file
diff --git a/atdb/taskdatabase/forms.py b/atdb/taskdatabase/forms.py
index c015e1d7..6354a3c5 100644
--- a/atdb/taskdatabase/forms.py
+++ b/atdb/taskdatabase/forms.py
@@ -1,5 +1,5 @@
from django import forms
class QualityAnnotationForm(forms.Form):
- annotation = forms.CharField(label='', widget=forms.Textarea, max_length=255)
+ annotation = forms.CharField(label='', widget=forms.Textarea, max_length=1000)
return_to_page = forms.IntegerField(widget=forms.HiddenInput)
\ No newline at end of file
diff --git a/atdb/taskdatabase/models.py b/atdb/taskdatabase/models.py
index 9556bd8a..48b8e59f 100644
--- a/atdb/taskdatabase/models.py
+++ b/atdb/taskdatabase/models.py
@@ -26,9 +26,6 @@ def convert_quality_to_list_for_template(task):
list.append(str(task.quality_json['sensitivity']))
list.append(str(task.quality_json['observing-conditions']))
list.append("-")
- list.append("-")
- list.append("-")
- list.append("-")
except Exception as err:
pass
diff --git a/atdb/taskdatabase/static/taskdatabase/style.css b/atdb/taskdatabase/static/taskdatabase/style.css
index b8cd66eb..37d988b1 100644
--- a/atdb/taskdatabase/static/taskdatabase/style.css
+++ b/atdb/taskdatabase/static/taskdatabase/style.css
@@ -118,4 +118,8 @@ p.title {
.modal-content {
overflow: scroll !important;
+}
+
+.form-flex {
+ display: flex;
}
\ No newline at end of file
diff --git a/atdb/taskdatabase/templates/taskdatabase/failures/retry_buttons.html b/atdb/taskdatabase/templates/taskdatabase/failures/retry_buttons.html
new file mode 100644
index 00000000..3a82fed5
--- /dev/null
+++ b/atdb/taskdatabase/templates/taskdatabase/failures/retry_buttons.html
@@ -0,0 +1,18 @@
+ {% if task.status == "staged_failed" or task.status == "staging_failed" %}
+ <a href="{% url 'task-retry-view' task.pk 'defined' my_tasks.number %}" class="btn btn-warning btn-sm" role="button"><b><i class="fas fa-sync-alt"></i> Retry</b></a>
+ {% endif %}
+ {% if task.status == "fetched_failed" or task.status == "fetching_failed" %}
+ <a href="{% url 'task-retry-view' task.pk 'staged' my_tasks.number %}" class="btn btn-warning btn-sm" role="button"><b><i class="fas fa-sync-alt"></i> Retry</b></a>
+ {% endif %}
+ {% if task.status == "processed_failed" or task.status == "processing_failed" %}
+ <a href="{% url 'task-retry-view' task.pk 'fetched' my_tasks.number %}" class="btn btn-warning btn-sm" role="button"><b><i class="fas fa-sync-alt"></i> Retry</b></a>
+ {% endif %}
+ {% if task.status == "stored_failed" or task.status == "storing_failed" %}
+ <a href="{% url 'task-retry-view' task.pk 'processed' my_tasks.number %}" class="btn btn-warning btn-sm" role="button"><b><i class="fas fa-sync-alt"></i> Retry</b></a>
+ {% endif %}
+ {% if task.status == "scrubbed_failed" or task.status == "scrubbing_failed" %}
+ <a href="{% url 'task-retry-view' task.pk 'validated' my_tasks.number %}" class="btn btn-warning btn-sm" role="button"><b><i class="fas fa-sync-alt"></i> Retry</b></a>
+ {% endif %}
+ {% if task.status == "archived_failed" or task.status == "archiving_failed" %}
+ <a href="{% url 'task-retry-view' task.pk 'scrubbed' my_tasks.number %}" class="btn btn-warning btn-sm" role="button"><b><i class="fas fa-sync-alt"></i> Retry</b></a>
+ {% endif %}
\ No newline at end of file
diff --git a/atdb/taskdatabase/templates/taskdatabase/failures/tasks_failures.html b/atdb/taskdatabase/templates/taskdatabase/failures/tasks_failures.html
index 817f4405..51bd7cab 100644
--- a/atdb/taskdatabase/templates/taskdatabase/failures/tasks_failures.html
+++ b/atdb/taskdatabase/templates/taskdatabase/failures/tasks_failures.html
@@ -37,37 +37,8 @@
<td>{{ task.filter }} </td>
- {% if task.status == "staged_failed" or task.status == "staging_failed" %}
- <td>
- <a href="{% url 'task-retry-view' task.pk 'defined' my_tasks.number %}" class="btn btn-warning btn-sm" role="button"><b><i class="fas fa-sync-alt"></i> Retry</b></a>
- </td>
- {% endif %}
- {% if task.status == "fetched_failed" or task.status == "fetching_failed" %}
- <td>
- <a href="{% url 'task-retry-view' task.pk 'staged' my_tasks.number %}" class="btn btn-warning btn-sm" role="button"><b><i class="fas fa-sync-alt"></i> Retry</b></a>
- </td>
- {% endif %}
- {% if task.status == "processed_failed" or task.status == "processing_failed" %}
- <td>
- <a href="{% url 'task-retry-view' task.pk 'fetched' my_tasks.number %}" class="btn btn-warning btn-sm" role="button"><b><i class="fas fa-sync-alt"></i> Retry</b></a>
- </td>
- {% endif %}
- {% if task.status == "stored_failed" or task.status == "storing_failed" %}
- <td>
- <a href="{% url 'task-retry-view' task.pk 'processed' my_tasks.number %}" class="btn btn-warning btn-sm" role="button"><b><i class="fas fa-sync-alt"></i> Retry</b></a>
- </td>
- {% endif %}
- {% if task.status == "scrubbed_failed" or task.status == "scrubbing_failed" %}
- <td>
- <a href="{% url 'task-retry-view' task.pk 'validated' my_tasks.number %}" class="btn btn-warning btn-sm" role="button"><b><i class="fas fa-sync-alt"></i> Retry</b></a>
- </td>
- {% endif %}
- {% if task.status == "archived_failed" or task.status == "archiving_failed" %}
- <td>
- <a href="{% url 'task-retry-view' task.pk 'scrubbed' my_tasks.number %}" class="btn btn-warning btn-sm" role="button"><b><i class="fas fa-sync-alt"></i> Retry</b></a>
- </td>
- {% endif %}
- <td>
+
+ <td>{% include "taskdatabase/failures/retry_buttons.html" %}</td>
</tr>
</div>
diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html
index 7a8652a3..9f5636ed 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 (4 apr 2021 - 13:00)
+ <p class="footer"> Version 1.0.0 (8 apr 2021 - 11:00)
</div>
diff --git a/atdb/taskdatabase/templates/taskdatabase/quality/tasks_quality_headers.html b/atdb/taskdatabase/templates/taskdatabase/quality/tasks_quality_headers.html
index cd699a59..98901d30 100644
--- a/atdb/taskdatabase/templates/taskdatabase/quality/tasks_quality_headers.html
+++ b/atdb/taskdatabase/templates/taskdatabase/quality/tasks_quality_headers.html
@@ -10,7 +10,4 @@
<th>Sensitivity</th>
<th>Conditions</th>
<th>Diagnostic plots</th>
- <th>Summary parset</th>
- <th>Summary logs</th>
- <th>Summary hf5</th>
</tr>
\ No newline at end of file
diff --git a/atdb/taskdatabase/templates/taskdatabase/refresh.html b/atdb/taskdatabase/templates/taskdatabase/refresh.html
index 6e558ab3..f0a067e6 100644
--- a/atdb/taskdatabase/templates/taskdatabase/refresh.html
+++ b/atdb/taskdatabase/templates/taskdatabase/refresh.html
@@ -12,5 +12,5 @@
$(document).on('keypress click', function() { intvrefresh() });
intvrefresh();
- }(5));
+ }(30));
</script>
diff --git a/atdb/taskdatabase/templates/taskdatabase/tasks.html b/atdb/taskdatabase/templates/taskdatabase/tasks.html
index 2ecdfa5d..6aacb705 100644
--- a/atdb/taskdatabase/templates/taskdatabase/tasks.html
+++ b/atdb/taskdatabase/templates/taskdatabase/tasks.html
@@ -72,9 +72,11 @@
<a href="{% url 'task-setstatus-view' task.pk 'validated' my_tasks.number %}" class="btn btn-success btn-sm" role="button"><i class="fas fa-check"></i> validate</a>
{% endif %}
{% endif %}
- </td>
- </tr>
+ {% include "taskdatabase/failures/retry_buttons.html" %}
+
+ </td>
+ </tr>
</div>
{% endif %}
{% endfor %}
diff --git a/atdb/taskdatabase/templates/taskdatabase/validation/annotate_quality.html b/atdb/taskdatabase/templates/taskdatabase/validation/annotate_quality.html
index 2cb020d1..dd0fc8cb 100644
--- a/atdb/taskdatabase/templates/taskdatabase/validation/annotate_quality.html
+++ b/atdb/taskdatabase/templates/taskdatabase/validation/annotate_quality.html
@@ -7,17 +7,14 @@
<div class="card-body">
<h4>Quality Annotation</h4>
- <form action="{% url 'annotate-quality' task.id %}" method="POST">
+ <form class="post-form" action="{% url 'annotate-quality' task.id %}" method="POST">
{% csrf_token %}
- <table>
- <tr>
+ <div>
{{ form }}
- </tr>
- <tr>
- <button class="btn btn-success btn-sm" type="submit"><i class="fas fa-check"></i> OK</button>
+ </div>
+ <div><button class="btn btn-success btn-sm" type="submit"><i class="fas fa-check"></i> OK</button>
<a href="{% url 'validation' %}" class="btn btn-warning btn-sm" role="button"><i class="fas fa-times-circle"></i> Cancel</a> 
- </tr>
- </table>
+ </div>
</form>
</div>
diff --git a/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation.html b/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation.html
index 77075fc6..cf376f17 100644
--- a/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation.html
+++ b/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation.html
@@ -48,14 +48,14 @@
<td>
{% if task.has_quality_remarks %}
<a class="open-modal btn btn-warning btn-sm"
- href="{% url 'annotate-quality' task.id my_tasks.number task.has_quality_remarks %}"
- data-popup-url="{% url 'annotate-quality' task.id my_tasks.number task.has_quality_remarks %}">
+ 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 task.has_quality_remarks %}"
- data-popup-url="{% url 'annotate-quality' task.id my_tasks.number task.has_quality_remarks %}">
+ 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 %}
diff --git a/atdb/taskdatabase/urls.py b/atdb/taskdatabase/urls.py
index f0a12c98..9d0a5aaa 100644
--- a/atdb/taskdatabase/urls.py
+++ b/atdb/taskdatabase/urls.py
@@ -23,7 +23,7 @@ urlpatterns = [
path('task_details/', views.TaskDetails, name='task-details'),
path('task_quality/<int:id>/<page>', views.ShowTaskQuality, name='task-quality'),
path('task_quality/', views.ShowTaskQuality, name='task-quality'),
- path('annotate_quality/<int:id>/<page>/<new_remark>', views.AnnotateQuality, name='annotate-quality'),
+ path('annotate_quality/<int:id>/<page>', views.AnnotateQuality, name='annotate-quality'),
path('annotate_quality/<int:id>', views.AnnotateQuality, name='annotate-quality'),
path('annotate_quality/', views.AnnotateQuality, name='annotate-quality'),
--
GitLab