diff --git a/atdb/docs/ATDB-LDV - Deployment Diagram.png b/atdb/docs/ATDB-LDV - Deployment Diagram.png index 94370d9e9bffe85dee25c32c1f46632f28af68ac..28daea63de9b3d737f1f4b67f174d26bc705a4b3 100644 Binary files a/atdb/docs/ATDB-LDV - Deployment Diagram.png and b/atdb/docs/ATDB-LDV - Deployment Diagram.png differ diff --git a/atdb/taskdatabase/services/algorithms.py b/atdb/taskdatabase/services/algorithms.py index b35619c139bba142c579e8d2deaf189ab69a9661..0fa1fce7ed1fe033353a16efb482646959a2845c 100644 --- a/atdb/taskdatabase/services/algorithms.py +++ b/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 diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html index a1c245eae103e4f1db9ab8a42cee8e80eab97e66..36cbd2dd4c658906d7831f7b8a455375c496df71 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 (12 apr 2021 - 20:00) + <p class="footer"> Version 1.0.0 (14 apr 2021 - 13:00) </div> diff --git a/atdb/taskdatabase/templates/taskdatabase/validation/inspection_plots.html b/atdb/taskdatabase/templates/taskdatabase/validation/inspection_plots.html index ec082788b377d234e71fcdd700865fe2bfee897e..096b8466d32181ed02c414b141ad15164d1701bb 100644 --- a/atdb/taskdatabase/templates/taskdatabase/validation/inspection_plots.html +++ b/atdb/taskdatabase/templates/taskdatabase/validation/inspection_plots.html @@ -1,11 +1,13 @@ - +{% 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> diff --git a/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation.html b/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation.html index 9f0ea11c5c7421070d82086bd97621b807143290..12dc69c383415919be83579c0dd9d8016664b91f 100644 --- a/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation.html +++ b/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> {% endif %} {% endif %}