diff --git a/atdb/atdb/static/taskdatabase/style.css b/atdb/atdb/static/taskdatabase/style.css index f202fa5b32346138c21c0403786f0e31791d3adf..732e15e57371642c892022edb0baf63c642d5540 100644 --- a/atdb/atdb/static/taskdatabase/style.css +++ b/atdb/atdb/static/taskdatabase/style.css @@ -34,7 +34,7 @@ TD { -.processing { +.processing,.processing_copying { font-weight: bold; background-color: lightyellow; } diff --git a/atdb/docs/ATDB-LDV - Deployment Diagram.png b/atdb/docs/ATDB-LDV - Deployment Diagram.png index 82b05b38616c8da7d20aefca21454f6e0292bbf8..88d60db1f98c2ccbc2b5be45ef5b2d4609e0c6d2 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/admin.py b/atdb/taskdatabase/admin.py index 544cc5c42904d86267e966cbe496be68c9dedec2..65e870bebeedbc9f94f1d1b0542da3d4511fa211 100644 --- a/atdb/taskdatabase/admin.py +++ b/atdb/taskdatabase/admin.py @@ -1,8 +1,9 @@ from django.contrib import admin -from .models import Status, Task, Workflow, LogEntry, Configuration +from .models import Status, Task, Workflow, LogEntry, Configuration, Job admin.site.register(Status) admin.site.register(Task) admin.site.register(Workflow) admin.site.register(LogEntry) -admin.site.register(Configuration) \ No newline at end of file +admin.site.register(Configuration) +admin.site.register(Job) \ No newline at end of file diff --git a/atdb/taskdatabase/static/taskdatabase/style.css b/atdb/taskdatabase/static/taskdatabase/style.css index 39be572d6f6939ed89678e2d2a6201910597e0df..4257d86ef0589ce67382125841c8e012532ee3f7 100644 --- a/atdb/taskdatabase/static/taskdatabase/style.css +++ b/atdb/taskdatabase/static/taskdatabase/style.css @@ -34,7 +34,7 @@ TD { -.processing { +.processing,.processing_copying { font-weight: bold; background-color: lightyellow; } diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html index b6a0bc2c4e86d85142449d72dc391ae9277ca0f4..f64d39036503e1836b00594aefda89375ce33b94 100644 --- a/atdb/taskdatabase/templates/taskdatabase/index.html +++ b/atdb/taskdatabase/templates/taskdatabase/index.html @@ -80,7 +80,7 @@ {% include 'taskdatabase/pagination.html' %} </div> </div> - <p class="footer"> Version 1.0.0 (1 apr 2021 - 17:00) + <p class="footer"> Version 1.0.0 (6 apr 2021 - 14:00) </div> diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py index 55ee183c9dcf698cbd567d13d27fd39375c4994c..4a0fee72945562055bb69a9df031d685ffd14222 100644 --- a/atdb/taskdatabase/views.py +++ b/atdb/taskdatabase/views.py @@ -135,6 +135,10 @@ class QueryView(SingleTableMixin, FilterView): self.request.session['query_list_of_ids'] = query_list_of_ids return self.object_list + + + + # ---------- GUI Views ----------- class IndexView(ListView): @@ -395,6 +399,7 @@ class LogEntryListViewAPI(generics.ListCreateAPIView): task.new_status = log_entry.status task.save() + # example: /atdb/workflows/5/ # calling this view serializes a task in the REST API class LogEntryDetailsViewAPI(generics.RetrieveUpdateDestroyAPIView): @@ -531,6 +536,7 @@ def TaskSetStatusTables2(request,pk,new_status,page): task.save() return redirect('/atdb/query/?page='+page) + @login_required def TaskMultiStatus(request, new_status): # get the list of id's from the session