MM revamp, save prompt, upload fix

deployment/client/client-launch.sh

@@ -9,9 +9,9 @@ if [ $rmserver = "y" -o $rmserver = "Y" ]; then
 read -p "Enter the protocol, server host/ip, and port like "https://ip_or_host:8443" w/o quotes: " serveraddr
 read -p "Paste in (Ctrl + Shift + V on most terminal emulators) or enter the api key you generated for your server: " serverapi
 if [ -x "$(command -v docker)" ]; then
-docker run -d --name=tam3-webclient --restart=always -v ~/.config/TAM3/data:/data:rw,z -e TAM3_REMOTE=$serveraddr -e TAM3_REMOTE_KEY=$serverapi -e NODE_TLS_REJECT_UNAUTHORIZED=0 -e PUBLIC_TAM3_VENUE="$venuename" -p 127.0.0.1:8300:3000 docker.io/dbob16/tam3-webclient:0.1.0
+docker run -d --name=tam3-webclient --restart=always -v ~/.config/TAM3/data:/data:rw,z -e TAM3_REMOTE=$serveraddr -e TAM3_REMOTE_KEY=$serverapi -e NODE_TLS_REJECT_UNAUTHORIZED=0 -e PUBLIC_TAM3_VENUE="$venuename" -p 127.0.0.1:8300:3000 docker.io/dbob16/tam3-webclient:0.1.1
 elif [ -x "$(command -v podman)" ]; then
-podman run -d --name=tam3-webclient --restart=always -v ~/.config/TAM3/data:/data:rw,z -e TAM3_REMOTE=$serveraddr -e TAM3_REMOTE_KEY=$serverapi -e NODE_TLS_REJECT_UNAUTHORIZED=0 -e PUBLIC_TAM3_VENUE="$venuename" -p 127.0.0.1:8300:3000 docker.io/dbob16/tam3-webclient:0.1.0
+podman run -d --name=tam3-webclient --restart=always -v ~/.config/TAM3/data:/data:rw,z -e TAM3_REMOTE=$serveraddr -e TAM3_REMOTE_KEY=$serverapi -e NODE_TLS_REJECT_UNAUTHORIZED=0 -e PUBLIC_TAM3_VENUE="$venuename" -p 127.0.0.1:8300:3000 docker.io/dbob16/tam3-webclient:0.1.1
 runin_podman="true"
 else
 echo "Neither Docker nor Podman are installed. Please install whichever you prefer and try again."
@@ -19,9 +19,9 @@ exit 1
 fi
 else
 if [ -x "$(command -v docker)" ]; then
-docker run -d --name=tam3-webclient --restart=always -v ~/.config/TAM3/data:/data:rw,z -e PUBLIC_TAM3_VENUE="$venuename" -p 127.0.0.1:8300:3000 docker.io/dbob16/tam3-webclient:0.1.0
+docker run -d --name=tam3-webclient --restart=always -v ~/.config/TAM3/data:/data:rw,z -e PUBLIC_TAM3_VENUE="$venuename" -p 127.0.0.1:8300:3000 docker.io/dbob16/tam3-webclient:0.1.1
 elif [ -x "$(command -v podman )" ]; then
-podman run -d --name=tam3-webclient --restart=always -v ~/.config/TAM3/data:/data:rw,z -e PUBLIC_TAM3_VENUE="$venuename" -p 127.0.0.1:8300:3000 docker.io/dbob16/tam3-webclient:0.1.0
+podman run -d --name=tam3-webclient --restart=always -v ~/.config/TAM3/data:/data:rw,z -e PUBLIC_TAM3_VENUE="$venuename" -p 127.0.0.1:8300:3000 docker.io/dbob16/tam3-webclient:0.1.1
 runin_podman="true"
 else
 echo "Neither Docker nor Podman are installed. Please install whichever you prefer and try again."

deployment/remote_server/compose.yml

@@ -1,6 +1,6 @@
 services:
   tam3-db:
-    image: docker.io/dbob16/tam3-db:0.1.0
+    image: docker.io/dbob16/tam3-db:0.1.1
     restart: always
     environment:
       MARIADB_RANDOM_ROOT_PASSWORD: 1
@@ -16,7 +16,7 @@ services:
       timeout: 5s
       retries: 3
   tam3-api:
-    image: docker.io/dbob16/tam3-api:0.1.0
+    image: docker.io/dbob16/tam3-api:0.1.1
     restart: always
     environment:
       TAM3_DATA_PATH: /data

deployment/remote_server/start-server.sh

@@ -7,7 +7,7 @@ echo "DB_PASSWORD=${gen_password}" >> .env
 
 if [ -x "$(command -v docker)" ]; then
 docker compose up -d
-elif [ -x "$(command -v podman)"]; then
+elif [ -x "$(command -v podman)" ]; then
 podman compose up -d
 else
 echo "Neither Docker nor Podman are installed. Please install whichever you prefer and try again."

deployment/remote_server_secure/compose.yml

@@ -1,6 +1,6 @@
 services:
   tam3-db:
-    image: docker.io/dbob16/tam3-db:0.1.0
+    image: docker.io/dbob16/tam3-db:0.1.1
     restart: always
     environment:
       MARIADB_RANDOM_ROOT_PASSWORD: 1
@@ -16,7 +16,7 @@ services:
       timeout: 5s
       retries: 3
   tam3-api:
-    image: docker.io/dbob16/tam3-api:0.1.0
+    image: docker.io/dbob16/tam3-api:0.1.1
     restart: always
     environment:
       TAM3_DATA_PATH: /data

deployment/remote_server_secure/start-server.sh

@@ -11,7 +11,7 @@ echo "DB_PASSWORD=${gen_password}" >> .env
 
 if [ -x "$(command -v docker)" ]; then
 docker compose up -d
-elif [ -x "$(command -v podman)"]; then
+elif [ -x "$(command -v podman)" ]; then
 podman compose up -d
 else
 echo "Neither Docker nor Podman are installed. Please install whichever you prefer and try again."

webapp/Dockerfile

@@ -7,6 +7,8 @@ COPY . .
 RUN npm install && npm run build
 
 ENV DATABASE_URL=file:/data/local.db
+ENV BODY_SIZE_LIMIT=100M
+ENV NODE_TLS_REJECT_UNAUTHORIZED=0
 
 COPY deploy/start-server.sh start-server.sh
 

webapp/src/lib/components/FormHeader.svelte

@@ -28,7 +28,12 @@
             <input type="number" bind:value={pagerForm.id_from}>
             <div style="font-size: 22pt">-</div>
             <input type="number" bind:value={pagerForm.id_to}>
-            <button class="styled" onclick={functions.refreshPage}>Refresh</button>
+            <button class="styled" onclick={() => {
+                if (Math.abs(pagerForm.id_to - pagerForm.id_from) > 800) {
+                    pagerForm.id_to = pagerForm.id_from + 799;
+                }
+                setTimeout(functions.refreshPage, 50);
+            }}>Refresh</button>
         </div>
         <div class="flex-row">
             <button class="styled" title="Alt + B" tabindex="-1" onclick={functions.prevPage}>Prev Page</button>

webapp/src/lib/css/main.css

@@ -15,6 +15,15 @@ a.styled, button.styled {
     border-radius: 0.25rem;
 }
 
+.p025 {
+    padding: 0.25rem;
+}
+
+.active {
+    border: 1px solid #000000;
+    border-radius: 0.13rem;
+}
+
 a.styled:hover, button.styled:hover {
     text-decoration: underline;
     cursor: pointer;

webapp/src/routes/+page.svelte

@@ -36,18 +36,24 @@
     <img src="{favicon}" alt="TAM3 Icon - Red ticket with TAM3 on it" class="icon">
     <h1>{venue} - Main Menu</h1>
   </div>
+  {#if prefix_name !== ""}
   <div class="universal-reports flex-row tb-margin">
     <a href="/counts" target="_blank" class="styled">Counts</a>
   </div>
   <div>
-    <h2>Select Prefix:</h2>
+    <h2>Current Prefix: {current_prefix.name}</h2>
   </div>
-  <div class="prefix-selector">
-    <select style="width: 100%; box-sizing: border-box;" bind:value={prefix_name}>
-      {#each all_prefixes as prefix}
-      <option value={prefix.name}>{prefix.name}</option>
-      {/each}
-    </select>
+  <div class="change_title">
+    <h2>Change Prefix:</h2>
+  </div>
+  <div class="prefix-selector flex-row">
+    {#each all_prefixes as prefix}
+    <div class="{prefix.color} p025{prefix.name === prefix_name ? " active" : ""}">
+      <button class="styled" onclick={() => {
+        prefix_name = prefix.name;
+      }}>{prefix.name}</button>
+    </div>
+    {/each}
   </div>
   <div><h2>Forms:</h2></div>
   <div class="flex-row {current_prefix.color}">
@@ -60,14 +66,15 @@
     <a href="/reports/byname/{current_prefix.name}/" target="_blank" class="styled">By Name</a>
     <a href="/reports/bybasket/{current_prefix.name}/" target="_blank" class="styled">By Basket ID</a>
   </div>
-  {#if admin_mode}
-  <div><h2>Admin Mode:</h2></div>
-  <div class="flex-row {current_prefix.color}">
-    <a href="/prefixes" target="_blank" class="styled">Prefix Editor</a>
-    <a href="/backuprestore" target="_blank" class="styled">Backup/Restore</a>
-  </div>
   {/if}
 </div>
+{#if admin_mode}
+<div><h2>Admin Mode:</h2></div>
+  <div class="flex-row">
+    <a href="/prefixes" target="_blank" class="styled">Prefix Editor</a>
+    <a href="/backuprestore" target="_blank" class="styled">Backup/Restore</a>
+</div>
+{/if}
 
 <div class="status tb-margin">
   {data.status}

webapp/src/routes/api/backuprestore/+server.js

@@ -1,6 +1,15 @@
 import { env } from "$env/dynamic/private";
 import { db } from "$lib/server/db";
 import { prefixes, tickets, baskets } from "$lib/server/db/schema";
+import { sql } from "drizzle-orm";
+
+function chunkArray(arr, chunkSize) {
+    const chunks = [];
+    for (let i = 0; i < arr.length; i += chunkSize) {
+        chunks.push(arr.slice(i, i + chunkSize));
+    }
+    return chunks;
+}
 
 export async function GET() {
     if (env.TAM3_REMOTE) {
@@ -20,16 +29,16 @@ export async function GET() {
 
 export async function POST({ request }) {
     const req = await request.json();
-    for (let prefix of req.prefixes) {
-        await db.insert(prefixes).values({name: prefix.name, color: prefix.color, weight: prefix.weight}).onConflictDoUpdate({target: prefixes.name, set: {color: prefix.color, weight: prefix.weight}});
+    for (let prefixChunk of chunkArray(req.prefixes, 300)) {
+        await db.insert(prefixes).values(prefixChunk).onConflictDoUpdate({target: prefixes.name, set: {color: sql`excluded.color`, weight: sql`excluded.weight`}});
     };
-    for (let ticket of req.tickets) {
-            await db.insert(tickets).values({prefix: ticket.prefix, t_id: ticket.t_id, first_name: ticket.first_name, last_name: ticket.last_name, phone_number: ticket.phone_number, preference: ticket.preference})
-                .onConflictDoUpdate({target: [tickets.prefix, tickets.t_id], set: {first_name: ticket.first_name, last_name: ticket.last_name, phone_number: ticket.phone_number, preference: ticket.preference}});
+    for (let ticketChunk of chunkArray(req.tickets, 300)) {
+            await db.insert(tickets).values(ticketChunk)
+                .onConflictDoUpdate({target: [tickets.prefix, tickets.t_id], set: {first_name: sql`excluded.first_name`, last_name: sql`excluded.last_name`, phone_number: sql`excluded.phone_number`, preference: sql`excluded.preference`}});
     };
-    for (let basket of req.baskets) {
-            await db.insert(baskets).values({prefix: basket.prefix, b_id: basket.b_id, description: basket.description, donors: basket.donors, winning_ticket: basket.winning_ticket})
-                .onConflictDoUpdate({target: [baskets.prefix, baskets.b_id], set: {description: basket.description, donors: basket.donors, winning_ticket: basket.winning_ticket}})
+    for (let basketChunk of chunkArray(req.baskets, 300)) {
+            await db.insert(baskets).values(basketChunk)
+                .onConflictDoUpdate({target: [baskets.prefix, baskets.b_id], set: {description: sql`excluded.description`, donors: sql`excluded.donors`, winning_ticket: sql`excluded.winning_ticket`}})
     };
     if (env.TAM3_REMOTE) {
         const res = await fetch(`${env.TAM3_REMOTE}/api/backuprestore/?api_key=${env.TAM3_REMOTE_KEY}`, {

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

@@ -14,6 +14,7 @@
         const focusDe = document.getElementById(`${idx}_de`);
         if (focusDe) {
             focusDe.select();
+            focusDe.scrollIntoView({block: "center"});
         }
     }
 
@@ -93,6 +94,11 @@
 
     if (browser) {
         document.title = `${prefix.name} Basket Entry`
+        window.addEventListener("beforeunload", function(e) {
+            if (current_baskets.filter(basket => basket.changed === true).length > 0) {
+                e.preventDefault();
+            }
+        })
     }
 </script>
 

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

@@ -13,6 +13,7 @@
         const focusWt = document.getElementById(`${idx}_wt`);
         if (focusWt) {
             focusWt.select();
+            focusWt.scrollIntoView({block: "center"});
         }
     }
 
@@ -92,6 +93,11 @@
 
     if (browser) {
         document.title = `${prefix.name} Drawing Form`
+        window.addEventListener("beforeunload", function(e) {
+            if (current_drawings.filter(drawing => drawing.changed === true).length > 0) {
+                e.preventDefault();
+            }
+        });
     }
 </script>
 

webapp/src/routes/reports/bybasket/[prefix]/+page.svelte

@@ -9,7 +9,7 @@
     let report_subject = $state("All Preferences");
 
     if (browser) {
-        document.title = `${prefix.name} Report By Name`
+        document.title = `${prefix.name} Report By Basket ID`
     }
 </script>
 

webapp/src/routes/tickets/[prefix]/+page.svelte

@@ -13,6 +13,7 @@
         const focusFn = document.getElementById(`${idx}_fn`);
         if (focusFn) {
             focusFn.select();
+            focusFn.scrollIntoView({block: "center"});
         }
     }
 
@@ -94,6 +95,11 @@
     
     if (browser) {
         document.title = `${prefix.name} Ticket Entry`;
+        window.addEventListener("beforeunload", function(e) {
+            if (current_tickets.filter(ticket => ticket.changed === true).length > 0) {
+                e.preventDefault();
+            }
+        });
     }
 </script>