src/lib/ldb/staff/fetch.ts

@@ -25,7 +25,6 @@ export async function fetchStaffLdb(station: string): Promise<ApiResponse<StaffL
   return parseFormat(JSON.stringify(resJs));
 }
 
-// Parse dates within the JSON response
 function parseFormat(jsonString: any): ApiResponse<StaffLdb> {
   return JSON.parse(jsonString, (key, value) => {
     if (typeof value === 'string') {

src/lib/ldb/staff/staff-ldb.svelte

@@ -5,14 +5,12 @@
   import { detailInit, defineDetail } from './train-detail';
   import TrainDetail from './train-detail.svelte';
   import { fetchStaffLdb } from './fetch';
-  import { error } from '@sveltejs/kit';
 
   export let station: string;
   export let title: string | undefined = 'Loading...';
-
+  export let error = {
-  let errorDetail = {
+    state: false,
-    code: '',
+    name: 'none'
-    message: '',
   };
 
   let detail = detailInit();
@@ -31,8 +29,6 @@
       title = data.data.locationName;
       return data.data;
     }
-    errorDetail.code = data.obStatus.toString() || "UNKNOWN";
-    errorDetail.message = data.obMsg || "An unknown error occoured";
     throw new Error('Unable to Fetch Data');
   }
 </script>
@@ -63,17 +59,11 @@
     {/if}
   {/if}
 {:catch}
-  <h2>Error</h2>
+  Error Loading Data
-  <p>ERR-CODE: {errorDetail.code}</p>
-  <p>Message:<br>{errorDetail.message}</p>
 {/await}
 
-<style>
+{#if error.state}
-  .transport-mode {
+  {#if error.name === 'unauthorized'}
-    padding-top: 20px;
+    <p>Error: {error.name.toLocaleUpperCase()}</p>
-    height: 17px;
+  {/if}
-  }
+{/if}
-  .table-head-text {
-    color: white;
-  }
-</style>

src/lib/ldb/staff/train-detail.ts

@@ -1,4 +1,3 @@
-// Contains the details required to lookup train details
 export interface Detail {
   show: boolean;
   headcode: string;
@@ -6,7 +5,6 @@ export interface Detail {
   uid: string;
 }
 
-// Initiates/Resets a `Detail` interface
 export function detailInit(): Detail {
   const detail: Detail = {
     show: false,
@@ -17,7 +15,6 @@ export function detailInit(): Detail {
   return detail;
 }
 
-// Initiates/Updates a `Detail` interface using the given values
 export function defineDetail(rid: string, uid: string, tid: string) {
   const detail: Detail = {
     rid: rid,