Updated for new acs_database structure

Woedenaz · Oct 17, 2023 · f922d5c · f922d5c
1 parent 837af95
commit f922d5c
Show file tree

Hide file tree

Showing 4 changed files with 21,569 additions and 19,910 deletions.
diff --git a/src/app.d.ts b/src/app.d.ts
@@ -9,7 +9,8 @@ declare global {
 		disrupt: string;
 		fragment: boolean;
 		name: string;    
-		number: string;
+		actual_number: string;
+		display_number: string;
 		risk: string; 
 		secondary: string; 
 		url: string;

diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
@@ -17,7 +17,7 @@
 	const fragmentValues: string[] = ['yes', 'no'];
 
 	let headers: Header[] = [
-		{ label: 'Item #', orderBy: 'number', filterBy: 'number' },
+		{ label: 'Item #', orderBy: 'actual_number', filterBy: 'display_number' },
 		{ label: 'Title', orderBy: 'name', filterBy: 'name' },
 		{ label: 'Fragment?', orderBy: 'fragment', filterBy: 'fragment', values: fragmentValues },
 		{ label: 'Clearance', orderBy: 'clearance', filterBy: 'clearance', values: clearanceValues },
@@ -43,7 +43,7 @@
 			</tr>
 			<tr>
 				{#each headers as { filterBy, values }}
-					{#if filterBy === 'number' || filterBy === 'name'}
+					{#if filterBy === 'display_number' || filterBy === 'name'}
 						<ThTextFilter {handler} align="center" {filterBy} />
 					{:else}
 						<ThDropFilter {handler} align="center" {filterBy} {values} />
@@ -54,8 +54,8 @@
 		<tbody>
 			{#each $rows as row}
 				<tr>
-					<td class={cellStyle(row.number)}>
-						{@html linkFormatter(row.url, row.name, row.number)}
+					<td class={cellStyle(row.actual_number)}>
+						{@html linkFormatter(row.url, row.name, row.actual_number)}
 					</td>
 					<td class={cellStyle(row.name)}>{@html row.name}</td>
 					<td class={cellStyle(row.fragment)}>{row.fragment}</td>

diff --git a/src/routes/+page.ts b/src/routes/+page.ts
@@ -57,7 +57,8 @@ export const load: PageLoad = async ({ fetch }) => {
 		disrupt: lowerFormatter(scp.disrupt),
 		fragment: fragmentFormatter(scp.fragment),  
 		name: titleFormatter(scp.name),
-		number: scp.number, 
+		actual_number: scp.actual_number, 
+		display_number: scp.display_number, 
 		risk: lowerFormatter(scp.risk),
 		secondary: lowerFormatter(scp.secondary),
 		url: scp.url