Skip to content
Snippets Groups Projects
Commit 955df77d authored by Nico Vermaas's avatar Nico Vermaas
Browse files

hooking up the GUI

parent 4aedc2e9
No related branches found
No related tags found
1 merge request!341SDC-1188 - final merge
Pipeline #72569 passed
......@@ -14,7 +14,7 @@ DATABASES = {
'USER': 'atdb_admin',
'PASSWORD': 'atdb123',
#'NAME': 'atdb_ldv_19jan2024',
'NAME': 'atdb_ldv_16feb2024',
'NAME': 'atdb_ldv_17feb2024',
'HOST': 'localhost',
'PORT': '5432',
},
......
......@@ -53,7 +53,7 @@
</td>
<td>
<!-- keep the old mechanism in comments to test/evaluate, remove later when it works -->
<!-- keep the old mechanism in comments to test/evaluate, remove later when it works
{% if task.sas_id_archived != None %}
<a href={{ task.path_to_lta }} target="_blank">
......@@ -63,8 +63,8 @@
{% else %}
-
{% endif %}
<!-- new activity mechanism, to enable SDC-1188
-->
<!-- new activity mechanism, to enable SDC-1188 -->
{% if task.activity.archive.sas_id_archived != None %}
<a href={{ task.path_to_lta }} target="_blank">
<img src="{% static 'taskdatabase/ldvlogo_small.png' %}" height="20" alt="link to LTA">
......@@ -73,7 +73,7 @@
{% else %}
-
{% endif %}
-->
</td>
<td>
......
......@@ -36,15 +36,15 @@
<td>{{ task.sas_id }}</td>
<td>{{ task.filter }} </td>
<!-- keep the old mechanism in comments to test/evaluate, remove later when it works -->
<!-- keep the old mechanism in comments to test/evaluate, remove later when it works
<td>{{ task.sasid_finished_fraction.fraction }}% of {{ task.sasid_finished_fraction.total_size|filesizeformat }}</td>
<td>{{ task.size_to_process|filesizeformat }} / {{ task.sasid_finished_fraction.remaining|filesizeformat }}</td>
<!-- new activity mechanism, to enable SDC-1188
-->
<!-- new activity mechanism, to enable SDC-1188 -->
<td>{{ task.activity.finished_fraction }}% of {{ task.activity.total_size|filesizeformat }}</td>
<td>{{ task.size_to_process|filesizeformat }} / {{ task.activity.remaining|filesizeformat }}</td>
-->
<td>
{% include "taskdatabase/failures/retry_buttons.html" %}
......
......@@ -31,7 +31,7 @@
{% include 'taskdatabase/pagination.html' %}
</div>
</div>
<p class="footer"> Version 16 Feb 2024 (13:30)
<p class="footer"> Version 17 Feb 2024
</div>
{% include 'taskdatabase/refresh.html' %}
......
......@@ -24,7 +24,7 @@
{% endif %}
</td>
<!-- keep the old mechanism in comments to test/evaluate, remove later when it works -->
<!-- keep the old mechanism in comments to test/evaluate, remove later when it works
<td>{{ task.sasid_ingested_fraction.status }}</td>
......@@ -39,8 +39,8 @@
-
{% endif %}
</td>
<!-- new activity mechanism, to enable SDC-1188
-->
<!-- new activity mechanism, to enable SDC-1188 -->
<td>{{ task.activity.ingestq_status }}</td>
<td>{{ task.activity.ingested_fraction }}%</td>
<td>
......@@ -53,7 +53,7 @@
-
{% endif %}
</td>
-->
</tr>
</div>
{% endif %}
......
......@@ -69,13 +69,13 @@
{% endif %}
</td>
<!-- keep the old mechanism in comments to test/evaluate, remove later when it works -->
<!-- keep the old mechanism in comments to test/evaluate, remove later when it works
<td class="{{ task.calculated_qualities.per_sasid }}">{{ task.calculated_qualities.per_sasid|default_if_none:"-" }}</td>
<!-- new activity mechanism, to enable SDC-1188
<td class="{{ task.activity.calculated_quality }}">{{ task.activity.calculated_quality|default_if_none:"-" }}</td>
-->
<!-- new activity mechanism, to enable SDC-1188 -->
<td class="{{ task.activity.calculated_quality }}">{{ task.activity.calculated_quality|default_if_none:"-" }}</td>
<td class="{{ task.quality }}">{{ task.quality|default_if_none:"-" }}</td>
<td>{% include "taskdatabase/validation/validation_buttons.html" %}</td>
<td><a href="{% url 'task-discard-view-sasid' task.pk 'discard' my_tasks.number %}" class="btn btn-danger btn-sm" role="button"><i class="fas fa-trash-alt"></i></a></td>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment