diff --git a/README.md b/README.md index 946e9ba8d7c4f3b5abae14fe7a91343c4d86ea53..d155f2d4614211600d1c7bf1a3de58ecb399a61b 100644 --- a/README.md +++ b/README.md @@ -102,9 +102,8 @@ This is the procedure for that. > docker exec atdb-ldv-postgres psql --command "grant ALL ON DATABASE atdbldv TO dbadmin;" -## Original ATDB diagrams -These diagrams can be used as inspiration and guidance to the original ATDB services, which can be harvested for functionality. +## Original ATDB Context diagrams +Similar diagram for ATDB-LDV will follow, showing the relationships with external services  - diff --git a/atdb/atdb/static/taskdatabase/style.css b/atdb/atdb/static/taskdatabase/style.css index 8473fcd2bf2c1c651970d6387ba04a5ff952838f..eb280be90a7814e5876f620c0da1384993176a86 100644 --- a/atdb/atdb/static/taskdatabase/style.css +++ b/atdb/atdb/static/taskdatabase/style.css @@ -37,7 +37,7 @@ TD { .removed { color: darkgray; } -.invalid,.error,.aborted,.incomplete,.failed,.Failed { +.invalid,.error,.aborted,.incomplete,.failed,.Failed,.scrub { color: red; } .ingesting { diff --git a/atdb/docs/ATDB-LDV Workflow Diagram.png b/atdb/docs/ATDB-LDV Workflow Diagram.png index 2fe105bfdfb754bc858704ed791576188cc05460..24d1b2748239283f7685e958af6755b2ee4b59b0 100644 Binary files a/atdb/docs/ATDB-LDV Workflow Diagram.png and b/atdb/docs/ATDB-LDV Workflow Diagram.png differ diff --git a/atdb/taskdatabase/static/taskdatabase/style.css b/atdb/taskdatabase/static/taskdatabase/style.css index ea6d7cf84d1936e109d95580206c05cc2381cb8b..6e34c4ffcf92d5a11ded5b510879ee31dfa46f4a 100644 --- a/atdb/taskdatabase/static/taskdatabase/style.css +++ b/atdb/taskdatabase/static/taskdatabase/style.css @@ -35,7 +35,7 @@ TD { .removed, .bye { color: darkgray; } -.invalid,.error,.aborted,.incomplete,.failed,.Failed { +.invalid,.error,.aborted,.incomplete,.failed,.Failed,.scrub { color: red; } diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html index 28fd2c10ca2c63a6f331ce45cfff470d1993892a..25ea767648ddf355a0479a9f924451af3d3691fd 100644 --- a/atdb/taskdatabase/templates/taskdatabase/index.html +++ b/atdb/taskdatabase/templates/taskdatabase/index.html @@ -44,7 +44,7 @@ </div> {% include 'taskdatabase/pagination.html' %} </div> - <p class="footer"> Version 1.0.0 (4 feb 2021 - 10:00) + <p class="footer"> Version 1.0.0 (4 feb 2021 - 12:00) <script type="text/javascript"> (function(seconds) { var refresh, diff --git a/atdb/taskdatabase/templates/taskdatabase/tasks.html b/atdb/taskdatabase/templates/taskdatabase/tasks.html index 9ade686b4efc7233bea558bcbd48a93668f9ff7d..13651e25a533a3ba1b696f73c22ef947f4c04383 100644 --- a/atdb/taskdatabase/templates/taskdatabase/tasks.html +++ b/atdb/taskdatabase/templates/taskdatabase/tasks.html @@ -29,14 +29,17 @@ <a href="{% url 'task-setstatus-view' task.pk 'staged' my_tasks.number %}" class="btn btn-primary btn-sm" role="button">staged</a> <a href="{% url 'task-setstatus-view' task.pk 'processed' my_tasks.number %}" class="btn btn-primary btn-sm" role="button">processed</a> <a href="{% url 'task-setstatus-view' task.pk 'validated' my_tasks.number %}" class="btn btn-primary btn-sm" role="button">validated</a> - <a href="{% url 'task-setstatus-view' task.pk 'ingested' my_tasks.number %}" class="btn btn-primary btn-sm" role="button">ingested</a> + <a href="{% url 'task-setstatus-view' task.pk 'scrub' my_tasks.number %}" class="btn btn-warning btn-sm" role="button">scrub</a> + <a href="{% url 'task-setstatus-view' task.pk 'scrubbed' my_tasks.number %}" class="btn btn-primary btn-sm" role="button">scrubbed</a> + <a href="{% url 'task-setstatus-view' task.pk 'archived' my_tasks.number %}" class="btn btn-primary btn-sm" role="button">archived</a> + <a href="{% url 'task-setstatus-view' task.pk 'finished' my_tasks.number %}" class="btn btn-primary btn-sm" role="button">finished</a> {% if task.status == "processed" %} - <a href="{% url 'task-setstatus-view' task.pk 'validated' my_tasks.number %}" class="btn btn-success btn-sm" role="button">Accept</a> + <a href="{% url 'task-setstatus-view' task.pk 'accepted' my_tasks.number %}" class="btn btn-success btn-sm" role="button">Accept</a> {% endif %} {% if task.status == "processed" %} - <a href="{% url 'task-setstatus-view' task.pk 'accepted' my_tasks.number %}" class="btn btn-success btn-sm" role="button">Validate</a> + <a href="{% url 'task-setstatus-view' task.pk 'validated' my_tasks.number %}" class="btn btn-success btn-sm" role="button">Validate</a> {% endif %} </td>