diff --git a/atdb/logs/atdb.log b/atdb/logs/atdb.log index 26d48cd953d7cd8c69c017571562df4388eadcd1..0622ae9937cc012e3f5bea6a98b43f8b55ff42df 100644 --- a/atdb/logs/atdb.log +++ b/atdb/logs/atdb.log @@ -1 +1,4 @@ -logging \ No newline at end of file +logging[14/Apr/2023 14:17:24,827] unsupported operand type(s) for +=: 'NoneType' and 'str' +[14/Apr/2023 14:17:24,828] task 25485 - (regular) - 146233 has no plots, skipped. +[14/Apr/2023 14:17:26,041] unsupported operand type(s) for +=: 'NoneType' and 'str' +[14/Apr/2023 14:17:26,042] task 25485 - (regular) - 146233 has no plots, skipped. diff --git a/atdb/taskdatabase/migrations/0022_workflow_tag.py b/atdb/taskdatabase/migrations/0022_workflow_tag.py new file mode 100644 index 0000000000000000000000000000000000000000..95f081c87586e2c60428546a2b613ab64f698ed5 --- /dev/null +++ b/atdb/taskdatabase/migrations/0022_workflow_tag.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.4 on 2023-05-01 09:17 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('taskdatabase', '0021_auto_20230331_1151'), + ] + + operations = [ + migrations.AddField( + model_name='workflow', + name='tag', + field=models.CharField(blank=True, max_length=30, null=True), + ), + ] diff --git a/atdb/taskdatabase/models.py b/atdb/taskdatabase/models.py index 85c2d5d7cafe4cad8b22a9593427b2e8cb2fa2f7..4c0661303500578aa38c996a77412d872e097ee4 100644 --- a/atdb/taskdatabase/models.py +++ b/atdb/taskdatabase/models.py @@ -14,6 +14,7 @@ verified_statusses = ['stored','validated','scrubbed','archived','finished','sus class Workflow(models.Model): description = models.CharField(max_length=500, blank=True, null=True) + tag = models.CharField(max_length=30, blank=True, null=True) workflow_uri = models.CharField(unique=True, max_length=30, blank=True, null=True) repository = models.CharField(max_length=100, blank=True, null=True) commit_id = models.CharField(max_length=100, blank=True, null=True) diff --git a/atdb/taskdatabase/templates/taskdatabase/details/workflow_details.html b/atdb/taskdatabase/templates/taskdatabase/details/workflow_details.html index ecc7517ebed14fe429d0426114b49d8630fb3370..4fcd58019722c932c007cc18925250b564a81031 100644 --- a/atdb/taskdatabase/templates/taskdatabase/details/workflow_details.html +++ b/atdb/taskdatabase/templates/taskdatabase/details/workflow_details.html @@ -9,6 +9,7 @@ <tbody> <tr><td><b>id</b></td><td><a href="{% url 'workflow-detail-view-api' workflow.pk %}" target="_blank">{{ workflow.id }} </a></td></tr> <tr><td><b>description</b></td><td>{{ workflow.description }}</td></tr> + <tr><td><b>tag</b></td><td>{{ workflow.tag }}</td></tr> <tr><td><b>uri</b></td><td>{{ workflow.workflow_uri }}</td></tr> <tr><td><b>repository</b></td><td><a href="{{ workflow.repository }}" target="_blank">{{ workflow.repository }} </a></td></tr> <tr><td><b>commit_id</b></td><td>{{ workflow.commit_id }}</td></tr> diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html index f516f91ee4be24970e52b181d6cc252b628bc7bf..053b0544010fa37b997c657ae4c9ffb3275f2287 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 14 April 2023 + <p class="footer"> Version 1 May 2023 </div>