From 018ddf8c4772ff6b09776d91d806d5051e87de69 Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Mon, 23 Jan 2023 20:11:23 +0000
Subject: [PATCH] Frontend: Further refactoring find-code.js

Signed-off-by: Fred Boniface <fred@fjla.uk>
---
 static/js/find-code.js | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/static/js/find-code.js b/static/js/find-code.js
index 62a005c..e599133 100644
--- a/static/js/find-code.js
+++ b/static/js/find-code.js
@@ -1,4 +1,4 @@
-clearLoading();
+hideLoading();
 
 async function fetchEntry(){  // This can be condensed
     showLoading();
@@ -35,22 +35,20 @@ async function parseData(values){
         setLoadingDesc(`Searching\n${values.name}`)
         var data = await getData("name", values.name)
     } else {
-        log("No Data", "INFO")
+        log("find-code.parseData: No data entered", "WARN")
         await clearForm();
         document.getElementById("name").value = "No data entered"
         hideLoading();
         return;
     }
-
     displayData(data);
 }
 
 async function getData(type, value){
-    console.log(`Looking for: ${type} ${value}`)
+    log(`find-code.getData: Looking for: ${type} '${value}'`, "INFO")
     try {
         var url = `${window.location.origin}/api/v1/find/${type}/${value}`;
         var resp = await fetch(url);
-        console.log(`Response: ${resp.json}`)
         return await resp.json()
     } catch (err) {
         log(`find-code.getData: Error getting data: ${err}`, "WARN")
@@ -61,16 +59,27 @@ async function getData(type, value){
 async function displayData(data){
     hideLoading();
     if (data.status === "failed" || data == ""){
-        log(`Unable to find data`, "WARN")
+        log(`find-code.displayData: Unable to find data`, "WARN")
         clearForm();
         document.getElementById("name").value = "Not Found";
+    } else {
+        log(`find-code.displayData: Inserting data`, "INFO")
+        try {
+            document.getElementById("name").value = data['0']['NLCDESC']
+        } catch (err) {}
+        try {
+            document.getElementById("3alpha").value = data['0']['3ALPHA']
+        } catch (err) {}
+        try {
+            document.getElementById("nlc").value = data['0']['NLC']
+        } catch (err) {}
+        try {
+            document.getElementById("tiploc").value = data['0']['TIPLOC']
+        } catch (err) {}
+        try {
+            document.getElementById("stanox").value = data['0']['STANOX']
+        } catch (err) {}
     }
-    document.getElementById("name").value = data['0']['NLCDESC']
-    document.getElementById("3alpha").value = data['0']['3ALPHA']
-    document.getElementById("nlc").value = data['0']['NLC']
-    document.getElementById("tiploc").value = data['0']['TIPLOC']
-    document.getElementById("stanox").value = data['0']['STANOX']
-//    document.getElementById("stanme").value = data['0']['STANME']  // NOT PRESENT IN CORPUS
 }
 
 async function clearForm(){