Merge branch 'master' into 'release'

inspectionplots screen

See merge request !240

atdb/taskdatabase/services/algorithms.py

@@ -8,9 +8,15 @@ from datetime import datetime, timedelta
 from django.db.models import Q, Sum
 import logging
 from .common import timeit
+
+from urllib.request import urlopen
+from django.core.files import File
+from django.core.files.temp import NamedTemporaryFile
+
 from ..models import Task, LogEntry, Workflow, Configuration
 from django.conf import settings
 
+
 DATE_FORMAT = "%Y-%m-%d"
 TIME_FORMAT = "%Y-%m-%d %H:%M:%SZ"
 DJANGO_TIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ"
@@ -676,7 +682,6 @@ def construct_inspectionplots(task):
     # https://webdav.grid.surfsara.nl/pnfs/grid.sara.nl/data/lofar/ops/disk/ldv::https://webdav.grid.surfsara.nl
 
     token = str(Configuration.objects.get(key='dcache:token').value)
-    #token = "MDAxY2xvY2F0aW9uIE9wdGlvbmFsLmVtcHR5CjAwMThpZGVudGlmaWVyIDhSWm1md3ovCjAwMTVjaWQgaWlkOnJEWm1JL2VGCjAwMmFjaWQgaWQ6NTU1ODI7MzE4NTUsMzQ5ODMsNDM0ODU7bGR2b3BzCjAwMmJjaWQgYmVmb3JlOjIwMjItMDQtMThUMTM6MDc6MzkuNzg2NTU3WgowMDM4Y2lkIHJvb3Q6L3BuZnMvZ3JpZC5zYXJhLm5sL2RhdGEvbG9mYXIvb3BzL2Rpc2svbGR2CjAwMWZjaWQgYWN0aXZpdHk6RE9XTkxPQUQsTElTVAowMDE1Y2lkIGlwOjAuMC4wLjAvMAowMDJmc2lnbmF0dXJlIMlsLlm43VRA-uDXqAWTlS2A9HeYnSiUA2jFvKi7DwchCg"
     translation = srm_to_url.split("::")
 
     # find the plots in the quality json structure
@@ -688,5 +693,4 @@ def construct_inspectionplots(task):
         url = surl.replace(translation[0],translation[1])
         results += '<tr><td><a href="' + url + '" target="_blank">'+ basename + '</a></td></tr>'
 
-
     return results

atdb/taskdatabase/templates/taskdatabase/index.html

@@ -34,7 +34,7 @@
         {% include 'taskdatabase/pagination.html' %}
        </div>
     </div>
-    <p class="footer"> Version 1.0.0 (12 apr 2021 - 20:00)
+    <p class="footer"> Version 1.0.0 (14 apr 2021 - 13:00)
 
 </div>
 

atdb/taskdatabase/templates/taskdatabase/validation/inspection_plots.html

-
+{% load static %}
 {% block myBlock %}
 <div class="container-fluid details-container">
 
 
   <div class="card">
        <div class="card-body">
-           <h4>Inspection Plots</h4>
+           <h4><img src="{% static 'taskdatabase/surfsara.jpg' %}" height="30" alt="inspection plots">
+               Inspection Plots (sas_id {{ task.sas_id }}) </h4>
+           <p>Clicking a link will redirect to SURF SARA in a new browser window. </p>
            <table class="table table-striped">
              {{ my_plots | safe }}
            </table>

atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation.html

@@ -19,7 +19,7 @@
                             <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-balance-scale-right"></i> Quality
+                               ><i class="fas fa-balance-scale"></i> Quality
                             </a>&nbsp;
                         {% endif %}
                     {% endif %}