Issue 544: allow show Unknowns in filtered Term listing.

- change filter status ranges, defaults
- simplify query to use new filter values

Author: jzohrab

lute/templates/term/index.html

@@ -38,23 +38,23 @@
       <td>Status range</td>
       <td>
         <select id="filtStatusMin">
-          <option value=0>(all)</option>
-          <option value=1>New (1)</option>
-          <option value=2>New (2)</option>
-          <option value=3>Learn (3)</option>
-          <option value=4>Learn (4)</option>
-          <option value=5>Learned</option>
-          <option value=99>Well Known</option>
+          <option value="0" selected>Unknown</option>
+          <option value="1">New (1)</option>
+          <option value="2">New (2)</option>
+          <option value="3">Learn (3)</option>
+          <option value="4">Learn (4)</option>
+          <option value="5">Learned</option>
+          <option value="99">Well Known</option>
         </select>
         to
         <select id="filtStatusMax">
-          <option value=0>(all)</option>
-          <option value=1>New (1)</option>
-          <option value=2>New (2)</option>
-          <option value=3>Learn (3)</option>
-          <option value=4>Learn (4)</option>
-          <option value=5>Learned</option>
-          <option value=99>Well Known</option>
+          <option value="0">Unknown</option>
+          <option value="1">New (1)</option>
+          <option value="2">New (2)</option>
+          <option value="3">Learn (3)</option>
+          <option value="4">Learn (4)</option>
+          <option value="5">Learned</option>
+          <option value="99" selected>Well Known</option>
         </select>
       </td>
     </tr>
@@ -351,8 +351,8 @@
       $('#filtAgeMin').val(parseInt(store.filtAgeMin));
     if ((store.filtAgeMax ?? '') != '')
     $('#filtAgeMax').val(parseInt(store.filtAgeMax));
-    $('#filtStatusMin').val(parseInt(store.filtStatusMin));
-    $('#filtStatusMax').val(parseInt(store.filtStatusMax));
+    $('#filtStatusMin').val(parseInt(store.filtStatusMin ?? '1'));
+    $('#filtStatusMax').val(parseInt(store.filtStatusMax ?? '99'));
     $('#filtIncludeIgnored').prop('checked', store.filtIncludeIgnored);
   };
 
@@ -371,8 +371,8 @@
     $('#filtParentsOnly').prop('checked', false);
     $('#filtAgeMin').val('');
     $('#filtAgeMax').val('');
-    $('#filtStatusMin').val(0);
-    $('#filtStatusMax').val(0);
+    $('#filtStatusMin').val(1);
+    $('#filtStatusMax').val(99);
     $('#filtIncludeIgnored').prop('checked', false);
     handle_filter_update();
   };

lute/term/datatables.py

@@ -78,17 +78,15 @@ def get_data_tables_list(parameters, session):
     if age_max:
         wheres.append(f"{sql_age_calc} <= {int(age_max)}")
 
-    status_wheres = ["StID not in (0, 98)"]
-    status_min = int(parameters["filtStatusMin"])
-    status_max = int(parameters["filtStatusMax"])
-    if status_min > 0:
-        status_wheres.append(f"StID >= {status_min}")
-    if status_max > 0:
-        status_wheres.append(f"StID <= {status_max}")
-    status_wheres = " AND ".join(status_wheres)
+    st_range = ["StID != 98"]
+    status_min = int(parameters.get("filtStatusMin", "0"))
+    status_max = int(parameters.get("filtStatusMax", "99"))
+    st_range.append(f"StID >= {status_min}")
+    st_range.append(f"StID <= {status_max}")
+    st_where = " AND ".join(st_range)
     if parameters["filtIncludeIgnored"] == "true":
-        status_wheres = f"({status_wheres} OR StID = 98)"
-    wheres.append(status_wheres)
+        st_where = f"({st_where} OR StID = 98)"
+    wheres.append(st_where)
 
     # Phew.
     return DataTablesSqliteQuery.get_data(