diff --git a/atdb/docs/ATDB-LDV Data Model.png b/atdb/docs/ATDB-LDV Data Model.png index 63080e2b4a8ee77fde265f7c52d8c3d0402d8da7..2cb5d5ba14cc4cb74d94a9bb26ee581ee8a90e3b 100644 Binary files a/atdb/docs/ATDB-LDV Data Model.png and b/atdb/docs/ATDB-LDV Data Model.png differ diff --git a/atdb/docs/ATDB-LDV GUI.png b/atdb/docs/ATDB-LDV GUI.png index 0b9c98a9d0a8fc781eca59ee7918d39a957a2044..fdeaf2e5ff4a6bb0856e4016ace4de329e89ff8f 100644 Binary files a/atdb/docs/ATDB-LDV GUI.png and b/atdb/docs/ATDB-LDV GUI.png differ diff --git a/atdb/docs/ATDB-LDV Workflow Diagram.png b/atdb/docs/ATDB-LDV Workflow Diagram.png index 2ef5b467bffbb3b10197899e0bcbbf8ffa66c6dc..126fb1ebdfd4d5918e37f6f90a10ecc1b3123932 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/logs/atdb.log b/atdb/logs/atdb.log index 06ea631700c580a41acd0b847a83c52ebef045a9..c47e73e3ebb4a84d419fdd911fc3fa88fe26c51e 100644 --- a/atdb/logs/atdb.log +++ b/atdb/logs/atdb.log @@ -54,3 +54,19 @@ logging[14/Apr/2023 14:17:24,827] unsupported operand type(s) for +=: 'NoneType' [04/May/2023 14:35:52,193] task 25378 - (regular) - 116876 has no plots, skipped. [04/May/2023 14:35:52,294] 'NoneType' object is not subscriptable [04/May/2023 14:35:52,294] task 25378 - (regular) - 116876 has no plots, skipped. +[09/May/2023 08:47:20,610] 'NoneType' object is not subscriptable +[09/May/2023 08:47:20,610] task 25378 - (regular) - 116876 has no plots, skipped. +[09/May/2023 08:47:20,725] 'NoneType' object is not subscriptable +[09/May/2023 08:47:20,725] task 25378 - (regular) - 116876 has no plots, skipped. +[09/May/2023 08:47:20,822] 'NoneType' object is not subscriptable +[09/May/2023 08:47:20,823] task 25378 - (regular) - 116876 has no plots, skipped. +[09/May/2023 08:47:20,932] 'NoneType' object is not subscriptable +[09/May/2023 08:47:20,933] task 25378 - (regular) - 116876 has no plots, skipped. +[09/May/2023 08:47:32,444] 'NoneType' object is not subscriptable +[09/May/2023 08:47:32,445] task 25378 - (regular) - 116876 has no plots, skipped. +[09/May/2023 08:47:33,063] 'NoneType' object is not subscriptable +[09/May/2023 08:47:33,064] task 25378 - (regular) - 116876 has no plots, skipped. +[09/May/2023 08:47:33,649] 'NoneType' object is not subscriptable +[09/May/2023 08:47:33,650] task 25378 - (regular) - 116876 has no plots, skipped. +[09/May/2023 08:47:34,165] 'NoneType' object is not subscriptable +[09/May/2023 08:47:34,165] task 25378 - (regular) - 116876 has no plots, skipped. diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py index 43041f1a7e028f5fd5c38be5c51975892eb03bf6..27a14e36b2060afc58622205d28af32323aa5b09 100644 --- a/atdb/taskdatabase/views.py +++ b/atdb/taskdatabase/views.py @@ -486,9 +486,14 @@ class ShowFinishedPage(ListView): # this provides a broad range of filters for the search_box in the GUI def get_filtered_tasks(request, pre_filtered_tasks=None, distinct=None): - filtered_tasks_as_list = None + # there was an attempt to pre_filter tasks, but it has yielded no results. + # further filtering is then useless, return an empty queryset + if pre_filtered_tasks is not None: + if pre_filtered_tasks.count() == 0: + return pre_filtered_tasks + try: my_sort = request.session['sort'] except: