add search field for icao hex

Author: wiedehopf

acarshub-typescript/src/interfaces.ts

@@ -136,6 +136,7 @@ export interface current_search {
   label: string;
   msgno: string;
   tail: string;
+  icao: string;
   msg_text: string;
   station_id: string;
 }

acarshub-typescript/src/pages/search.ts

@@ -37,6 +37,7 @@ export class SearchPage extends ACARSHubPage {
     label: "",
     msgno: "",
     tail: "",
+    icao: "",
     msg_text: "",
     station_id: "",
   } as current_search;
@@ -48,6 +49,7 @@ export class SearchPage extends ACARSHubPage {
     label: "",
     msgno: "",
     tail: "",
+    icao: "",
     msg_text: "",
     station_id: "",
   } as current_search;
@@ -148,6 +150,7 @@ export class SearchPage extends ACARSHubPage {
       label: $("#search_msglbl").val(),
       msgno: $("#search_msgno").val(),
       tail: $("#search_tail").val(),
+      icao: $("#search_icao").val(),
       msg_text: $("#search_text").val(),
       station_id: $("#search_station_id").val(),
     } as current_search;
@@ -161,6 +164,7 @@ export class SearchPage extends ACARSHubPage {
     $("#search_msglbl").val(this.#typed_searches.label);
     $("#search_msgno").val(this.#typed_searches.msgno);
     $("#search_tail").val(this.#typed_searches.tail);
+    $("#search_icao").val(this.#typed_searches.icao);
     $("#search_text").val(this.#typed_searches.msg_text);
     $("#search_station_id").val(this.#typed_searches.station_id);
   }
@@ -180,6 +184,7 @@ export class SearchPage extends ACARSHubPage {
     $("#search_msglbl").val("");
     $("#search_msgno").val("");
     $("#search_tail").val("");
+    $("#search_icao").val("");
     $("#search_text").val("");
     $("#search_station_id").val("");
   }
@@ -451,6 +456,15 @@ export class SearchPage extends ACARSHubPage {
           </td>
         </tr>
 
+        <tr class="search_label">
+          <td>
+            <label>Icao:</label>
+          </td>
+          <td class="search_term">
+            <input type="text" id="search_icao">
+          </td>
+        </tr>
+
         <tr class="search_label">
           <td>
             <label>Text:</label>

rootfs/webapp/acarshub_database.py

@@ -642,6 +642,15 @@ def database_search(search_term, page=0):
         session = db_session()
         match_string = ""
 
+        icao_hex = search_term["icao"]
+        if icao_hex and len(icao_hex) == 6:
+            try:
+                search_term["icao"] = int(icao_hex, 16)
+            except Exception as e:
+                acarshub_logging.log(
+                    f"can't convert icao from hex to decimal: {icao_hex} ({str(e)})", "database", level=LOG_LEVEL["DEBUG"]
+                )
+
         if "station_id" in search_term and search_term["station_id"] != "":
             # we need to search outside of FTS
             conditions = []
@@ -661,6 +670,8 @@ def database_search(search_term, page=0):
                     conditions.append(messages.label.contains(search_term[key]))
                 elif key == "tail":
                     conditions.append(messages.tail.contains(search_term[key]))
+                elif key == "icao":
+                    conditions.append(messages.icao.contains(search_term[key]))
                 elif key == "msg_text":
                     conditions.append(messages.text.contains(search_term[key]))
                 elif key == "station_id":