(add): Drawing Form

api/app/data/drawing.py

@@ -0,0 +1,66 @@
+from dataclasses import dataclass
+from db import RepoTemplate
+from .baskets import Basket
+from system.auth import AuthRepo
+from fastapi import APIRouter, Header
+
+@dataclass
+class DrawingLine:
+    prefix: str
+    b_id: int
+    description: str = ""
+    winning_ticket: int = 0
+    last_name: str = ""
+    first_name: str = ""
+    phone_number: str = ""
+
+class DrawingRepo(RepoTemplate):
+    def get_all_drawing_lines(self):
+        self.cur.execute("SELECT * FROM drawing ORDER BY prefix, b_id")
+        results = self.cur.fetchall()
+        return [DrawingLine(*r) for r in results]
+    def get_prefix_drawing_lines(self, prefix: str):
+        self.cur.execute("SELECT * FROM drawing WHERE prefix = ? ORDER BY prefix, b_id", (prefix,))
+        results = self.cur.fetchall()
+        return [DrawingLine(*r) for r in results]
+    def get_single_drawing_line(self, prefix: str, b_id: int):
+        self.cur.execute("SELECT * FROM drawing WHERE prefix = ? AND b_id = ? ORDER BY prefix, b_id", (prefix, b_id))
+        results = self.cur.fetchall()
+        return [DrawingLine(*r) for r in results]
+    def get_range_drawing_lines(self, prefix: str, id_from: int, id_to: int):
+        self.cur.execute("SELECT * FROM drawing WHERE prefix = ? AND b_id BETWEEN ? AND ? ORDER BY prefix, b_id", (prefix, id_from, id_to))
+        results = self.cur.fetchall()
+        return [DrawingLine(*r) for r in results]
+    def post_drawing_lines(self, ds: list[Basket]):
+        for d in ds:
+            self.cur.execute("""INSERT INTO baskets (prefix, b_id, winning_ticket) VALUES (?, ?, ?) ON CONFLICT (prefix, b_id) DO UPDATE SET
+                winning_ticket = EXCLUDED.winning_ticket""", (d.prefix, d.b_id, d.winning_ticket))
+        self.conn.commit()
+        return ds
+
+drawing_router = APIRouter(prefix="/api/drawing")
+
+@drawing_router.get("")
+def get_all_drawing_lines(tam_key: str = Header("")):
+    AuthRepo().verify_key(tam_key)
+    return DrawingRepo().get_all_drawing_lines()
+
+@drawing_router.get("/{prefix}")
+def get_prefix_drawing_lines(prefix: str, tam_key: str = Header("")):
+    AuthRepo().verify_key(tam_key)
+    return DrawingRepo().get_prefix_drawing_lines(prefix)
+
+@drawing_router.get("/{prefix}/{b_id}")
+def get_single_drawing_line(prefix: str, b_id: int, tam_key: str = Header("")):
+    AuthRepo().verify_key(tam_key)
+    return DrawingRepo().get_single_drawing_line(prefix, b_id)
+
+@drawing_router.get("/{prefix}/{id_from}/{id_to}")
+def get_range_drawing_lines(prefix: str, id_from: int, id_to: int, tam_key: str = Header("")):
+    AuthRepo().verify_key(tam_key)
+    return DrawingRepo().get_range_drawing_lines(prefix, id_from, id_to)
+
+@drawing_router.post("")
+def post_drawing_lines(ds: list[Basket], tam_key: str = Header("")):
+    AuthRepo().verify_key(tam_key)
+    return DrawingRepo().post_drawing_lines(ds)

api/app/db.py

@@ -21,6 +21,10 @@ def init_db():
         phone_number TEXT, pref TEXT, PRIMARY KEY (prefix, t_id))""")
     cur.execute("""CREATE TABLE IF NOT EXISTS baskets (prefix TEXT, b_id INTEGER, description TEXT, donors TEXT,
         winning_ticket INTEGER, PRIMARY KEY (prefix, b_id))""")
+    cur.execute("""CREATE VIEW IF NOT EXISTS drawing AS
+        SELECT b.prefix, b.b_id, b.description, b.winning_ticket, t.last_name, t.first_name, t.phone_number
+        FROM baskets b LEFT JOIN tickets t ON b.prefix = t.prefix AND b.winning_ticket = t.t_id
+        ORDER BY b.prefix, b.b_id""")
     conn.commit()
     conn.close()
 

api/app/routers.py

@@ -3,9 +3,11 @@ from system.auth import auth_router
 from system.prefixes import prefix_router
 from data.tickets import tickets_router
 from data.baskets import basket_router
+from data.drawing import drawing_router
 
 def imp_routers(app: FastAPI):
     app.include_router(auth_router)
     app.include_router(prefix_router)
     app.include_router(tickets_router)
     app.include_router(basket_router)
+    app.include_router(drawing_router)

client/src/lib/server/db/schema.js

@@ -1,4 +1,5 @@
-import { integer, sqliteTable, text, primaryKey } from 'drizzle-orm/sqlite-core';
+import { sql } from 'drizzle-orm';
+import { integer, sqliteTable, text, primaryKey, sqliteView } from 'drizzle-orm/sqlite-core';
 
 export const prefixes = sqliteTable('prefixes', {
 	prefix: text('prefix').primaryKey(),
@@ -30,3 +31,15 @@ export const baskets = sqliteTable(
 	},
 	(b) => [primaryKey({ columns: [b.prefix, b.b_id] })]
 );
+
+export const drawing = sqliteView('drawing', {
+  prefix: text('prefix'),
+  b_id: integer('b_id'),
+  description: text('description'),
+  winning_ticket: integer('winning_ticket'),
+  last_name: text('last_name'),
+  first_name: text('first_name'),
+  phone_number: text('phone_number')
+}).as(sql`SELECT b.prefix, b.b_id, b.description, b.winning_ticket, t.last_name, t.first_name, t.phone_number
+  FROM baskets b LEFT JOIN tickets t ON b.prefix = t.prefix AND b.winning_ticket = t.t_id
+  ORDER BY b.prefix, b.b_id`)

client/src/routes/+page.svelte

@@ -64,13 +64,14 @@
 		{#if curPrefix}
 			<div class="flex flex-col gap-1 items-center border border-black rounded">
 				<h2 class="text-lg font-bold">Forms:</h2>
-				<div class="grid grid-cols-2 gap-1 p-1 min-w-2xs">
+				<div class="grid grid-cols-2 gap-1 p-1 min-w-2xs text-center">
 					<a href={resolve('/tickets/[prefix]', { prefix: curPrefix })} class={bS[pColor]}
 						>Tickets</a
 					>
 					<a href={resolve('/baskets/[prefix]', { prefix: curPrefix })} class={bS[pColor]}
 						>Baskets</a
 					>
+					<a href={resolve('/drawing/[prefix]', {prefix: curPrefix})} class="{bS[pColor]} col-span-2">Drawing Form</a>
 				</div>
 			</div>
 		{:else}

client/src/routes/api/drawing/+server.js

@@ -0,0 +1,39 @@
+import { db } from "$lib/server/db";
+import { baskets, drawing } from "$lib/server/db/schema";
+import { getPath, getSettings } from "$lib/server/settings"
+import { error, json } from "@sveltejs/kit";
+import { sql } from "drizzle-orm";
+
+export const GET = async () => {
+  const s = getSettings();
+  if (s.remote_server) {
+    const connStr = getPath(s);
+    try {
+      const res = await fetch(`${connStr}/api/drawing`, {headers: {'TAM-KEY': s.remote_key}});
+      if (!res.ok) throw error(res.status);
+      const data = await res.json();
+      return json(data);
+    } catch {
+      return json([]);
+    }
+  } else {
+    const data = await db.select().from(drawing).orderBy(drawing.prefix, drawing.b_id);
+    return json(data);
+  }
+}
+
+export const POST = async ({ request }) => {
+  const reqData = await request.json();
+  const s = getSettings();
+  if (s.remote_server) {
+    const connStr = getPath(s);
+    const res = await fetch(`${connStr}/api/drawing`, {
+      method: 'POST',
+      headers: {'TAM-KEY': s.remote_key, 'Content-Type': 'application/json'},
+      body: JSON.stringify(reqData)
+    });
+    if (!res.ok) throw error(res.status);
+  }
+  await db.insert(baskets).values(reqData).onConflictDoUpdate({target: [baskets.prefix, baskets.b_id], set: {winning_ticket: sql`EXCLUDED.winning_ticket`}});
+  return json(reqData);
+}

client/src/routes/api/drawing/[prefix]/+server.js

@@ -0,0 +1,24 @@
+import { db } from '$lib/server/db/index.js';
+import { drawing } from '$lib/server/db/schema.js';
+import { getPath, getSettings } from '$lib/server/settings';
+import { error, json } from '@sveltejs/kit';
+import { eq } from 'drizzle-orm';
+
+export const GET = async ({ params }) => {
+  const { prefix } = params;
+  const s = getSettings();
+  if (s.remote_server) {
+    const connStr = getPath(s);
+    try {
+      const res = await fetch(`${connStr}/api/drawing/${prefix}`, {headers: {'TAM-KEY': s.remote_key}});
+      if (!res.ok) throw error(res.status);
+      const data = await res.json();
+      return json(data);
+    } catch {
+      return json([]);
+    }
+  } else {
+    const data = await db.select().from(drawing).where(eq(drawing.prefix, prefix)).orderBy(drawing.prefix, drawing.b_id);
+    return json(data);
+  }
+}

client/src/routes/api/drawing/[prefix]/[b_id]/+server.js

@@ -0,0 +1,44 @@
+import { db } from '$lib/server/db/index.js';
+import { drawing } from '$lib/server/db/schema.js';
+import { getPath, getSettings } from '$lib/server/settings';
+import { error, json } from '@sveltejs/kit';
+import { and, eq } from 'drizzle-orm';
+
+const placeholder_data = (prefix, b_id) => {
+  return {
+    prefix,
+    b_id,
+    description: "",
+    winning_ticket: 0,
+    last_name: "",
+    first_name: "",
+    phone_number: ""
+  }
+}
+
+export const GET = async ({ params }) => {
+  const [prefix, b_id] = [params.prefix, parseInt(params.b_id)];
+  const s = getSettings();
+  if (s.remote_server) {
+    const connStr = getPath(s);
+    try {
+      const res = await fetch(`${connStr}/api/drawing/${prefix}/${b_id}`, {headers: {'TAM-KEY': s.remote_key}});
+      if (!res.ok) throw error(res.status);
+      const [data] = await res.json();
+      if (data) {
+        return json(data);
+      } else {
+        return json(placeholder_data(prefix, b_id));
+      };
+    } catch {
+      return json(placeholder_data(prefix, b_id));
+    }
+  } else {
+    const [data] = await db.select().from(drawing).where(and(eq(drawing.prefix, prefix), eq(drawing.b_id, b_id))).orderBy(drawing.prefix, drawing.b_id);
+    if (data) {
+      return json(data);
+    } else {
+      return json(placeholder_data(prefix, b_id));
+    }
+  }
+}

client/src/routes/api/drawing/[prefix]/[id_from]/[id_to]/+server.js

@@ -0,0 +1,41 @@
+import { db } from '$lib/server/db/index.js';
+import { drawing } from '$lib/server/db/schema.js';
+import { getPath, getSettings } from '$lib/server/settings';
+import { error, json } from '@sveltejs/kit';
+import { and, between, eq } from 'drizzle-orm';
+
+const placeholder_data = (prefix, b_id) => {
+  return {
+    prefix,
+    b_id,
+    description: "",
+    winning_ticket: 0,
+    last_name: "",
+    first_name: "",
+    phone_number: ""
+  };
+};
+
+export const GET = async ({ params }) => {
+  const [prefix, id_from, id_to] = [params.prefix, parseInt(params.id_from), parseInt(params.id_to)];
+  const s = getSettings();
+  const rtnData = {};
+  for (let i = id_from; i <= id_to; i++) {
+    rtnData[i] = {...placeholder_data(prefix, i)};
+  };
+  if (s.remote_server) {
+    const connStr = getPath(s);
+    try {
+      const res = await fetch(`${connStr}/api/drawing/${prefix}/${id_from}/${id_to}`, {headers: {'TAM-KEY': s.remote_key}});
+      if (!res.ok) throw error(res.status);
+      const data = Array.from(await res.json());
+      data.forEach((b) => rtnData[b.b_id] = b);
+    } catch {
+      return json([]);
+    }
+  } else {
+    const data = await db.select().from(drawing).where(and(eq(drawing.prefix, prefix), between(drawing.b_id, id_from, id_to))).orderBy(drawing.prefix, drawing.b_id);
+    data.forEach((b) => rtnData[b.b_id] = b);
+  };
+  return json(Object.values(rtnData));
+}

client/src/routes/baskets/[prefix]/+page.svelte

@@ -95,7 +95,7 @@
 		dupDown: () => {
 			if (items[nextIdx]) {
 				const buffer = { ...items[curIdx] };
-				['prefix', 't_id'].forEach((key) => delete buffer[key]);
+				['prefix', 'b_id'].forEach((key) => delete buffer[key]);
 				items[nextIdx] = { ...items[nextIdx], ...buffer, changed: true };
 				functions.nextLine();
 			} else {
@@ -105,7 +105,7 @@
 		dupUp: () => {
 			if (curIdx > 0) {
 				const buffer = { ...items[curIdx] };
-				['prefix', 't_id'].forEach((key) => delete buffer[key]);
+				['prefix', 'b_id'].forEach((key) => delete buffer[key]);
 				items[prevIdx] = { ...items[prevIdx], ...buffer, changed: true };
 				functions.prevLine();
 			} else {
@@ -116,13 +116,13 @@
 			if (items[curIdx]) {
 				const buffer = { ...items[curIdx] };
 				['prefix', 't_id'].forEach((key) => delete buffer[key]);
-				window.localStorage.setItem('tam-ticket', JSON.stringify(buffer));
+				window.localStorage.setItem('tam-basket', JSON.stringify(buffer));
 			}
 			focusIdx(curIdx);
 		},
 		paste: () => {
 			if (items[curIdx]) {
-				const buffer = JSON.parse(window.localStorage.getItem('tam-ticket'));
+				const buffer = JSON.parse(window.localStorage.getItem('tam-basket'));
 				items[curIdx] = { ...items[curIdx], ...buffer, changed: true };
 			}
 			focusIdx(curIdx);

client/src/routes/drawing/[prefix]/+page.server.js

@@ -0,0 +1,7 @@
+export const load = async ({ params, fetch }) => {
+	const { prefix } = params;
+	const res = await fetch('/api/prefixes');
+	const prefixes = await res.json();
+	const prefixObj = Array.from(prefixes).find((p) => p.prefix == prefix);
+	return { prefix: prefixObj, prefixes };
+};

client/src/routes/drawing/[prefix]/+page.svelte

@@ -0,0 +1,224 @@
+<script>
+	import { resolve } from '$app/paths';
+	import { afterNavigate, beforeNavigate } from '$app/navigation';
+	import { browser } from '$app/environment';
+	import { bS, bAS, iS } from '$lib/client/styles';
+	import HeaderBar from '$lib/client/components/HeaderBar.svelte';
+	import PagerBar from '$lib/client/components/PagerBar.svelte';
+	import CommandBar from '$lib/client/components/CommandBar.svelte';
+
+	let { data } = $props();
+	let { prefix, prefixes } = $derived(data);
+
+	let pageTitle = $derived(`${prefix.prefix} Drawing Form | TAM`);
+
+	let curIdx = $state(0),
+		nextIdx = $derived(curIdx + 1),
+		prevIdx = $derived(curIdx - 1);
+	const changeIdx = (idx) => {
+		curIdx = idx;
+	};
+	const focusIdx = (idx) => {
+		curIdx = idx;
+		const elemIdx = document.getElementById(`${idx}_first`);
+		if (elemIdx) {
+			elemIdx.focus();
+		}
+	};
+
+	let pager = $state({ idFrom: 0, idTo: 0 });
+	let items = $state([]);
+	let itemsLength = $derived(items.length);
+	let itemsBuffer = $derived(items.filter((i) => i.changed));
+	const functions = {
+		getPage: async () => {
+			functions.save();
+			if (pager.idFrom > pager.idTo) {
+				[pager.idFrom, pager.idTo] = [pager.idTo, pager.idFrom];
+			}
+			if (pager.idTo - pager.idFrom > 300) {
+				pager.idTo = pager.idFrom + 300;
+			}
+			const res = await fetch(`/api/drawing/${prefix.prefix}/${pager.idFrom}/${pager.idTo}`);
+			const resData = await res.json();
+			resData.map((i) => (i.changed = false));
+			items = [...resData];
+			setTimeout(() => focusIdx(0));
+		},
+		save: async () => {
+			if (itemsBuffer.length > 0) {
+				const res = await fetch('/api/drawing', {
+					method: 'POST',
+					headers: { 'Content-Type': 'application/json' },
+					body: JSON.stringify(itemsBuffer)
+				});
+				if (res.ok) {
+					itemsBuffer.forEach((i) => (i.changed = false));
+				} else {
+					alert('Error saving items.');
+				}
+			}
+			setTimeout(() => {
+				focusIdx(0);
+			}, 1);
+		},
+		prevPage: () => {
+			((pager.idFrom -= itemsLength), (pager.idTo -= itemsLength));
+			functions.getPage();
+		},
+		nextPage: () => {
+			((pager.idFrom += itemsLength), (pager.idTo += itemsLength));
+			functions.getPage();
+		},
+		nextLine: () => {
+			if (items[nextIdx]) {
+				setTimeout(() => {
+					focusIdx(nextIdx);
+				}, 1);
+			} else {
+				setTimeout(() => {
+					focusIdx(curIdx);
+				}, 1);
+			}
+		},
+		prevLine: () => {
+			if (items[prevIdx]) {
+				setTimeout(() => {
+					focusIdx(prevIdx);
+				}, 1);
+			} else {
+				setTimeout(() => {
+					focusIdx(curIdx);
+				}, 1);
+			}
+		},
+		dupDown: () => {
+			if (items[nextIdx]) {
+				const buffer = { ...items[curIdx] };
+				['prefix', 'b_id'].forEach((key) => delete buffer[key]);
+				items[nextIdx] = { ...items[nextIdx], ...buffer, changed: true };
+				functions.nextLine();
+			} else {
+				focusIdx(curIdx);
+			}
+		},
+		dupUp: () => {
+			if (curIdx > 0) {
+				const buffer = { ...items[curIdx] };
+				['prefix', 'b_id'].forEach((key) => delete buffer[key]);
+				items[prevIdx] = { ...items[prevIdx], ...buffer, changed: true };
+				functions.prevLine();
+			} else {
+				focusIdx(curIdx);
+			}
+		},
+		copy: () => {
+			if (items[curIdx]) {
+				const buffer = { ...items[curIdx] };
+				['prefix', 'b_id'].forEach((key) => delete buffer[key]);
+				window.localStorage.setItem('tam-drawing', JSON.stringify(buffer));
+			}
+			focusIdx(curIdx);
+		},
+		paste: () => {
+			if (items[curIdx]) {
+				const buffer = JSON.parse(window.localStorage.getItem('tam-drawing'));
+				items[curIdx] = { ...items[curIdx], ...buffer, changed: true };
+			}
+			focusIdx(curIdx);
+		}
+	};
+	const headers = ['Basket ID', 'Description', 'Winning Ticket', 'Winner', 'Save?'];
+
+	beforeNavigate(({ cancel }) => {
+		if (itemsBuffer.length > 0) {
+			if (!confirm('Are you sure you want to leave this page? There are unsaved changes!'))
+				cancel();
+		}
+	});
+
+	afterNavigate(() => {
+		items = [];
+		pager = { idFrom: 0, idTo: 0 };
+		curIdx = 0;
+	});
+
+	if (browser) {
+		window.addEventListener('beforeunload', (e) => {
+			if (itemsBuffer.length > 0) e.preventDefault();
+		});
+	}
+</script>
+
+<svelte:head>
+	<title>{pageTitle}</title>
+</svelte:head>
+
+<table class="w-full box-border border-separate p-1">
+	<thead class="sticky top-1 bg-white">
+		<tr>
+			<td colspan="50">
+				<HeaderBar>
+					<div>Baskets:</div>
+					{#each prefixes as p (p.prefix)}
+						<a
+							href={resolve('/drawing/[prefix]', { prefix: p.prefix })}
+							class={prefix.prefix == p.prefix ? bAS[p.color] : bS[p.color]}>{p.prefix}</a
+						>
+					{/each}
+				</HeaderBar>
+				<h1 class="text-xl font-bold p-1">{pageTitle}</h1>
+				<PagerBar {prefix} {functions} bind:pager />
+				<CommandBar {prefix} {functions} /></td
+			>
+		</tr>
+		<tr>
+			{#each headers as header (header)}
+				<th class="border text-left p-0.5">{header}</th>
+			{/each}
+		</tr>
+	</thead>
+	<tbody>
+		{#each items as item, idx (item.b_id)}
+			<tr
+				class="focus-within:font-bold"
+				onfocusin={(e) => {
+					changeIdx(idx);
+					e.target.scrollIntoView({ block: 'center' });
+				}}
+			>
+				<td class="p-0.5 border">{item.b_id}</td>
+				<td class="p-0.5 border"
+					>{item.description}</td
+				>
+				<td class="p-0.5 border"
+					><input
+						type="number"
+						class="{iS.normal} w-full"
+						id="{idx}_first"
+						onchangecapture={async () => {
+						  item.changed = true;
+						  const res = await fetch(`/api/tickets/${prefix.prefix}/${item.winning_ticket}`);
+						  if (res.ok) {
+							const data = await res.json();
+							[item.last_name, item.first_name, item.phone_number] = [(data.last_name || ""), (data.first_name || ""), (data.phone_number || "")];
+						  }
+						}}
+						bind:value={item.winning_ticket}
+					/></td
+				>
+				<td class="p-0.5 border">
+				    {item.last_name || ""}, {item.first_name || ""}: {item.phone_number || ""}
+				</td>
+				<td class="p-0.5 border"
+					><button
+						class={bS[prefix.color]}
+						onclick={() => {
+							item.changed ? (item.changed = false) : (item.changed = true);
+						}}>{item.changed ? 'Yes' : 'No'}</button
+					></td
+				>
+			</tr>
+		{/each}
+	</tbody>
+</table>