working on annotation

added Retry button to Task page

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

atdb/taskdatabase/forms.py

 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

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

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

atdb/taskdatabase/templates/taskdatabase/failures/retry_buttons.html

+            {% 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

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>

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>
 

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

atdb/taskdatabase/templates/taskdatabase/refresh.html

@@ -12,5 +12,5 @@
         $(document).on('keypress click', function() { intvrefresh() });
         intvrefresh();
 
-    }(5));
+    }(30));
 </script>

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 %}

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>&nbsp
-            </tr>
-            </table>
+            </div>
         </form>
 
        </div>

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>&nbsp;
                     {% 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>&nbsp;
                     {% endif %}

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'),