diff --git a/atdb/taskdatabase/services/algorithms.py b/atdb/taskdatabase/services/algorithms.py index 0016fef157a24d96f30930f6f352246ee5e29c53..4e79ba3a1706b91035a26386b59e103caffe7996 100644 --- a/atdb/taskdatabase/services/algorithms.py +++ b/atdb/taskdatabase/services/algorithms.py @@ -115,11 +115,30 @@ def convert_quality_to_html(task): results += "<tr><td><b>SAS_ID</b></td><td>" + str(task.sas_id) + "</td></tr>" results += "<tr><td><b>Project</b></td><td>" + str(task.project) + "</td></tr>" results += "<tr><td><b>ATDB Filter</b></td><td>" + str(task.filter) + "</td></tr>" - results += "<tr><td><b>Input Type</b></td><td>" + "???" + "</td></tr>" - results += "<tr><td><b>NrJobs (MSs)</b></td><td>" + "???" + "</td></tr>" results += "<tr><td><b>QA uv-coverage</b></td><td>" + str(task.quality_json['uv-coverage']) + "</td></tr>" results += "<tr><td><b>QA sensitivity</b></td><td>" + str(task.quality_json['sensitivity']) + "</td></tr>" results += "<tr><td><b>QA observing-conditions</b></td><td>" + str(task.quality_json['observing-conditions']) + "</td></tr>" + + try: + results += "<tr><td><b>high_flagging</b></td><td>" + str(task.quality_json['details']['high_flagging']) + "</td></tr>" + results += "<tr><td><b>elevation_score</b></td><td>" + str(task.quality_json['details']['elevation_score']) + "</td></tr>" + results += "<tr><td><b>sun_interference</b></td><td>" + str(task.quality_json['details']['sun_interference']) + "</td></tr>" + results += "<tr><td><b>moon_interference</b></td><td>" + str(task.quality_json['details']['moon_interference']) + "</td></tr>" + results += "<tr><td><b>jupiter_interference</b></td><td>" + str(task.quality_json['details']['jupiter_interference']) + "</td></tr>" + results += "<tr><td><b>full_array_incomplete</b></td><td>" + str(task.quality_json['details']['full_array_incomplete']) + "</td></tr>" + results += "<tr><td><b>dutch_array_incomplete</b></td><td>" + str(task.quality_json['details']['dutch_array_incomplete']) + "</td></tr>" + results += "<tr><td><b>full_array_incomplete_is</b></td><td>" + str(task.quality_json['details']['full_array_incomplete_is']) + "</td></tr>" + results += "<tr><td><b>dutch_array_flag_data_loss</b></td><td>" + str(task.quality_json['details']['dutch_array_flag_data_loss']) + "</td></tr>" + results += "<tr><td><b>dutch_array_high_data_loss</b></td><td>" + str(task.quality_json['details']['dutch_array_high_data_loss']) + "</td></tr>" + results += "<tr><td><b>fill_array_missing_is_pair</b></td><td>" + str(task.quality_json['details']['fill_array_missing_is_pair']) + "</td></tr>" + results += "<tr><td><b>full_array_missing_important_pair</b></td><td>" + str(task.quality_json['details']['full_array_missing_important_pair']) + "</td></tr>" + results += "<tr><td><b>dutch_array_missing_important_pair</b></td><td>" + str(task.quality_json['details']['dutch_array_missing_important_pair']) + "</td></tr>" + results += "<tr><td><b>dutch_array_high_data_loss_on_important_pair</b></td><td>" + str(task.quality_json['details']['dutch_array_high_data_loss_on_important_pair']) + "</td></tr>" + except: + pass + + + results += "<tr><td><b>QA diagnostic plots</b></td><td>" + "-" + "</td></tr>" results += "<tr><td><b>Workflow summary parset</b></td><td>" + "-" + "</td></tr>" results += "<tr><td><b>Summary logs</b></td><td>" + "-" + "</td></tr>" diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html index 0e2c23da9e97ddd297c95589df15a6642e7f2eb8..acc10b2221c9fbe22c4239d1cfa89715d7213dd5 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 (1 apr 2021 - 12:00) + <p class="footer"> Version 1.0.0 (1 apr 2021 - 15:00) </div> diff --git a/atdb/taskdatabase/templates/taskdatabase/quality/tasks_quality.html b/atdb/taskdatabase/templates/taskdatabase/quality/tasks_quality.html index 75c461e2296df90e3092b03e3231195942ff4ff4..e665307f1ab36c2332ebfdcfc6acc0e83e6a5ef7 100644 --- a/atdb/taskdatabase/templates/taskdatabase/quality/tasks_quality.html +++ b/atdb/taskdatabase/templates/taskdatabase/quality/tasks_quality.html @@ -16,6 +16,13 @@ ><i class="fas fa-list"></i> Details </a> {% endif %} + {% if task.has_quality %} + <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 + </a> + {% endif %} </td> {% if task.resume %} diff --git a/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation.html b/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation.html index e589a047527954e808536924de8af1ec615e0e1e..8de0b96ffcaac0c319837e4deda0434330b46c29 100644 --- a/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation.html +++ b/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation.html @@ -38,6 +38,7 @@ <td>-</td><td>-</td><td>-</td> {% endif %} + <td>{{ task.quality|default_if_none:"-" }}</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> Poor</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> Moderate</a> diff --git a/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation_headers.html b/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation_headers.html index bb346737bf9c7a53182045cb295e7ce74b87df17..50e8cb882c9222775dd2f7a566523bec741a8cbe 100644 --- a/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation_headers.html +++ b/atdb/taskdatabase/templates/taskdatabase/validation/tasks_validation_headers.html @@ -8,5 +8,6 @@ <th>uv-coverage</th> <th>Sensitivity</th> <th>Conditions</th> + <th>Current Quality</th> <th>Choose a Quality</th> </tr> \ No newline at end of file diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py index f3ccb8cafb601b5121f12cbe912f543e23941fbe..7e7ac65ae422ff7f939a0fa64292cdb0ffba04cd 100644 --- a/atdb/taskdatabase/views.py +++ b/atdb/taskdatabase/views.py @@ -912,9 +912,7 @@ def TaskValidate(request, pk, quality, new_status, page=0): model = Task task = Task.objects.get(pk=pk) task.new_status = new_status - - #todo: database change - #task.quality = quality + task.quality = quality task.save()