diff --git a/atdb/atdb/settings/dev.py b/atdb/atdb/settings/dev.py index fbbded20d0fe15e2470edb5ca18ffbb6513f50a3..7174497c1ebde58462fdc3d3c038df2d89103804 100644 --- a/atdb/atdb/settings/dev.py +++ b/atdb/atdb/settings/dev.py @@ -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', }, diff --git a/atdb/taskdatabase/templates/taskdatabase/archived/tasks.html b/atdb/taskdatabase/templates/taskdatabase/archived/tasks.html index 53433d5239ee985357a5584419d73ce235e5a7e8..47a695b9bbfd590db8e2dbe234bc0521f35c5cae 100644 --- a/atdb/taskdatabase/templates/taskdatabase/archived/tasks.html +++ b/atdb/taskdatabase/templates/taskdatabase/archived/tasks.html @@ -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> diff --git a/atdb/taskdatabase/templates/taskdatabase/failures/tasks.html b/atdb/taskdatabase/templates/taskdatabase/failures/tasks.html index 21ba2ddbe3ef45ce6cc134941126931bdcdddfce..09d0c101550914249ba7315045d2f184567f39d1 100644 --- a/atdb/taskdatabase/templates/taskdatabase/failures/tasks.html +++ b/atdb/taskdatabase/templates/taskdatabase/failures/tasks.html @@ -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" %} diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html index 3013df41cded23ab6d804581e86b449018ce1842..2ff025176d1211476436c7549bd937d7aa967fc3 100644 --- a/atdb/taskdatabase/templates/taskdatabase/index.html +++ b/atdb/taskdatabase/templates/taskdatabase/index.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' %} diff --git a/atdb/taskdatabase/templates/taskdatabase/ingest/tasks.html b/atdb/taskdatabase/templates/taskdatabase/ingest/tasks.html index 79a13d9f9c7dcf656f7d49d1feec2111a1ed8bfb..2e455aabefa89189bd51e07f90dea9dfe8d8f33f 100644 --- a/atdb/taskdatabase/templates/taskdatabase/ingest/tasks.html +++ b/atdb/taskdatabase/templates/taskdatabase/ingest/tasks.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 %} diff --git a/atdb/taskdatabase/templates/taskdatabase/validation/tasks.html b/atdb/taskdatabase/templates/taskdatabase/validation/tasks.html index 160703f6831a4b627396d0091a5817947b70752e..7de02e650723aa65585f6a536bdf32ce6ad71e8a 100644 --- a/atdb/taskdatabase/templates/taskdatabase/validation/tasks.html +++ b/atdb/taskdatabase/templates/taskdatabase/validation/tasks.html @@ -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>