Added queue archive filter for studies.

bookkeeping/query.py

@@ -164,10 +164,15 @@ async def get_task_process_logs(request) -> JSONResponse:
 @requires("authenticated")
 async def find_task(request) -> JSONResponse:
     search_term = request.query_params.get("search_term", "")
+    study_filter = request.query_params.get("study_filter", "false")
     filter_term = ""
     if search_term:
         filter_term = f"""and ((tag_accessionnumber ilike '{search_term}%') or (tag_patientid ilike '{search_term}%') or (tag_patientname ilike '%{search_term}%'))"""
 
+    study_filter_term = ""
+    if study_filter=="true":
+        study_filter_term = "and tasks.study_uid is not null"
+
     query = sqlalchemy.text(
         f""" select tasks.id as task_id, 
         tag_accessionnumber as acc, 
@@ -176,7 +181,7 @@ async def find_task(request) -> JSONResponse:
         tasks.time as time
         from tasks
         left join dicom_series on dicom_series.series_uid = tasks.series_uid 
-        where parent_id is null {filter_term}
+        where parent_id is null {filter_term} {study_filter_term}
         order by date_trunc('second', tasks.time) desc, tasks.id desc
         limit 256 """
     )

common/monitor.py

@@ -250,8 +250,8 @@ async def get_tests() -> Any:
     return await get("query/tests")
 
 
-async def find_tasks(search_term="") -> Any:
-    return await get("query/find_task", {"search_term": search_term})
+async def find_tasks(search_term="", study_filter="false") -> Any:
+    return await get("query/find_task", {"search_term": search_term, "study_filter": study_filter})
 
 
 async def task_process_logs(task_id="") -> Any:

webinterface/api.py

@@ -70,8 +70,9 @@ async def get_tests(request):
 @requires(["authenticated"])
 async def find_tasks(request):
     search_term = request.query_params.get("search_term", "")
+    study_filter = request.query_params.get("study_filter", "false")
     try:
-        return JSONResponse(await monitor.find_tasks(search_term))
+        return JSONResponse(await monitor.find_tasks(search_term, study_filter))
     except monitor.MonitorHTTPError as e:
         return JSONResponse({"error": e.status_code}, status_code=e.status_code)
 

webinterface/templates/base.html

@@ -11,7 +11,7 @@
   <script defer src="{{ url_for('static', path='/js/fontawesome-5.9.js') }}"></script>
   <script src="{{ url_for('static', path='/js/jquery-3.5.1.min.js') }}"></script>
   <script src="{{ url_for('static', path='/js/htmx.min.js') }}"></script>
-  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.9.0/css/all.min.css" integrity="sha512-q3eWabyZPc1XTCmF+8/LuE1ozpg5xxn7iO89yfSOd5/oKvyqLngoNGsx8jq92Y8eXJ/IRxQbEC+FGSYxtk2oiw==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+  <link href="{{ url_for('static', path='/css/all.min.css') }}" rel="stylesheet">
   <link rel="stylesheet" href="{{ url_for('static', path='/css/bulma-extensions.min.css') }}">
   <link href="{{ url_for('static', path='/css/tooltip.css') }}" rel="stylesheet">
   <script type="text/javascript" src="{{ url_for('static', path='/js/bulma-extensions.min.js') }}"></script>

webinterface/templates/queue.html

@@ -319,6 +319,8 @@ <h5 class="title is-5 configtitle" style="margin-top: 60px;"><i
 
 <script>
 
+    var archiveFilterQueue = false;
+
     function update() {
         update_status();
         update_jobs();
@@ -731,10 +733,6 @@ <h5 class="title is-5 configtitle" style="margin-top: 60px;"><i
                                 timeout: 3000
                             });
                         })
-
-
-
-
                     }
                 }
             ],
@@ -811,16 +809,19 @@ <h5 class="title is-5 configtitle" style="margin-top: 60px;"><i
             buttons: [
                 {
                     extend: 'collection',
+                    autoClose: true,
                     text: '<i class="fas fa-filter"></i>',
                     className: 'queueArchiveFilter',
                     buttons: [
                         {
                             text: 'Show only STUDY tasks',
                             className: 'queueArchiveFilterButton',
                             action: function (e, dt, node, config, cb) {
-                                        // Toggles class when pressed
-                                        $(e.currentTarget).toggleClass("queueArchiveFilterButton-Checked")                       
-                                    }
+                                // Toggles class when pressed
+                                $(e.currentTarget).toggleClass("queueArchiveFilterButton-Checked");                       
+                                archiveFilterQueue = !archiveFilterQueue;
+                                archiveSearch();
+                            }
                         }
                     ]
                 },
@@ -928,7 +929,7 @@ <h5 class="title is-5 configtitle" style="margin-top: 60px;"><i
             $.ajax({
                 type: 'GET',
                 url: '/api/find-tasks',
-                data: {'search_term': searchTerm },
+                data: {'search_term': searchTerm, 'study_filter': archiveFilterQueue },
                 dataType: 'json',
                 error: function () {
                     $('#erroralert').show();