diff --git a/atdb/docs/ATDB-LDV Workflow Diagram.png b/atdb/docs/ATDB-LDV Workflow Diagram.png index 98aff9e99489be16e269b65a204bcf2d15754e73..b0fd387cf41b9b563da4d8638d7f2fa2f5797e73 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/templates/taskdatabase/quality/headers.html b/atdb/taskdatabase/templates/taskdatabase/quality/headers.html index fc98c2dcb3dd8d407585ab59e0a6a2defb54b7ea..58f7ff480bc05e1610902addf5d127db5d9855e2 100644 --- a/atdb/taskdatabase/templates/taskdatabase/quality/headers.html +++ b/atdb/taskdatabase/templates/taskdatabase/quality/headers.html @@ -29,7 +29,6 @@ <th>Sensitivity</th> <th>Conditions</th> <th>Plots</th> - <th>Annotate</th> <th>Calc Q</th> <th>Quality</th> <th>Validate</th> diff --git a/atdb/taskdatabase/templates/taskdatabase/quality/tasks.html b/atdb/taskdatabase/templates/taskdatabase/quality/tasks.html index 81b85f74a2b26c5884c88102cd306a24fa4ac4b0..e46c587bb37c15007e184efabc654cb1268651db 100644 --- a/atdb/taskdatabase/templates/taskdatabase/quality/tasks.html +++ b/atdb/taskdatabase/templates/taskdatabase/quality/tasks.html @@ -52,22 +52,6 @@ <td>-</td><td>-</td><td>-</td><td>-</td> {% endif %} - <td>{% if user.is_authenticated %} - {% if task.get_quality_remarks_taskid %} - <a class="open-modal btn btn-warning btn-sm" - href="{% url 'annotate-quality-taskid' task.id my_tasks.number %}" - data-popup-url="{% url 'annotate-quality-taskid' task.id my_tasks.number %}"> - <i class="fas fa-pen-alt"></i> - </a> - {% else %} - <a class="open-modal btn btn-secondary btn-sm" - href="{% url 'annotate-quality-taskid' task.id my_tasks.number %}" - data-popup-url="{% url 'annotate-quality-taskid' task.id my_tasks.number %}"> - <i class="fas fa-pen-alt"></i> - </a> - {% endif %} - {% endif %} - </td> <td class="{{ task.calculated_qualities.per_task }}">{{ task.calculated_qualities.per_task|default_if_none:"-" }}</td> <td class="{{ task.quality }}">{{ task.quality|default_if_none:"-" }}</td> <td> diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py index fc87edc123cb2fbd94ed14526b8fbc591664c565..0ef41c979f061cc4640d432783c492431e871c05 100644 --- a/atdb/taskdatabase/views.py +++ b/atdb/taskdatabase/views.py @@ -656,12 +656,6 @@ def AnnotateQualitySasId(request, id=0, page=0): for task in tasks: try: remark_per_sasid = request.POST.get("annotation", "") - try: - remark_per_taskid = task.remarks['quality_taskid'] - except: - remark_per_taskid = '' - new_remark_per_taskid = remark_per_taskid + "\n\n" + remark_per_sasid - task.remarks['quality_taskid'] = new_remark_per_taskid task.remarks['quality_sasid'] = remark_per_sasid except: task.remarks = {}