chore(release): 1.10.1

feat: runner list filtered by created_via
chore(release): 1.10.0
2025-04-09 11:57:16 +02:00 · 2025-04-09 11:56:59 +02:00 · 2025-04-09 10:39:06 +02:00 · 2025-04-09 10:38:45 +02:00 · 2025-04-08 22:17:04 +02:00 · 2025-04-08 22:16:46 +02:00
16 changed files with 160 additions and 31 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,30 @@

 All notable changes to this project will be documented in this file. Dates are displayed in UTC.

+#### [1.10.1](https://git.odit.services/lfk/frontend/compare/1.10.0...1.10.1)
+
+- feat: runner list filtered by created_via [`991716a`](https://git.odit.services/lfk/frontend/commit/991716a7f55d0414111ad264ad1e93de9e82971a)
+
+#### [1.10.0](https://git.odit.services/lfk/frontend/compare/1.9.11...1.10.0)
+
+> 9 April 2025
+
+- feat: working CardAssignment [`ac4ef8f`](https://git.odit.services/lfk/frontend/commit/ac4ef8fb6ded5c5d5678a651420e356b3ef45399)
+- chore(release): 1.10.0 [`aa720f2`](https://git.odit.services/lfk/frontend/commit/aa720f2460079e35eed9d87a2ac580a3305efbd5)
+
+#### [1.9.11](https://git.odit.services/lfk/frontend/compare/1.9.10...1.9.11)
+
+> 8 April 2025
+
+- feat(dash): add runnersViaKiosk [`5291f8a`](https://git.odit.services/lfk/frontend/commit/5291f8a4d1721cd0c745191ebc85f221c34a23c8)
+- chore(release): 1.9.11 [`eae0afd`](https://git.odit.services/lfk/frontend/commit/eae0afda23a54020e25821c0188d8cbec3139593)
+
 #### [1.9.10](https://git.odit.services/lfk/frontend/compare/1.9.9...1.9.10)

+> 8 April 2025
+
 - feat: add experimental ui for mobile card assignment [`d7c9c27`](https://git.odit.services/lfk/frontend/commit/d7c9c27ec7a1fea1cbaf26914843d044bbae32fe)
+- chore(release): 1.9.10 [`e2d7de1`](https://git.odit.services/lfk/frontend/commit/e2d7de1e9e1fd134f54876fa80f19f94fbea3672)

 #### [1.9.9](https://git.odit.services/lfk/frontend/compare/1.9.8...1.9.9)

--- a/index.html
+++ b/index.html
@@ -13,7 +13,7 @@

  <body>
    <span style="display: none; visibility: hidden" id="buildinfo"
-      >RELEASE_INFO-1.9.10-RELEASE_INFO</span
+      >RELEASE_INFO-1.10.1-RELEASE_INFO</span
    >
    <noscript>You need to enable JavaScript to run this app.</noscript>
    <script src="/env.js"></script>
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@odit/lfk-frontend",
-  "version": "1.9.10",
+  "version": "1.10.1",
  "type": "module",
  "scripts": {
    "i18n-order": "node order.js",
@@ -43,7 +43,7 @@
  },
  "dependencies": {
    "@fontsource/athiti": "^5.2.5",
-    "@odit/lfk-client-js": "1.2.0",
+    "@odit/lfk-client-js": "1.2.3",
    "@paralleldrive/cuid2": "2.2.2",
    "@tanstack/svelte-table": "8.9.1",
    "bwip-js": "3.4.0",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -12,8 +12,8 @@ importers:
        specifier: ^5.2.5
        version: 5.2.5
      '@odit/lfk-client-js':
-        specifier: 1.2.0
-        version: 1.2.0
+        specifier: 1.2.3
+        version: 1.2.3
      '@paralleldrive/cuid2':
        specifier: 2.2.2
        version: 2.2.2
@@ -355,8 +355,8 @@ packages:
  '@octokit/types@13.6.1':
    resolution: {integrity: sha512-PHZE9Z+kWXb23Ndik8MKPirBPziOc0D2/3KH1P+6jK5nGWe96kadZuE4jev2/Jq7FvIfTlT2Ltg8Fv2x1v0a5g==}

-  '@odit/lfk-client-js@1.2.0':
-    resolution: {integrity: sha512-RR/Ij3PDMF840VJtphO51k+3voJcTlvRIxzTFBkvrwriBmLJwchBQxq40K4/kyVIFH7lLwO3uJy0PaxgEoTbFQ==}
+  '@odit/lfk-client-js@1.2.3':
+    resolution: {integrity: sha512-QXJUVfH57iwykKNHQQC4z18/f7rnpCNCjvxijrOmuBMLsBNuYSzvrrqXyno4ce1rr5f0PD4IYtKmhcgJsk49wQ==}

  '@odit/license-exporter@0.2.0':
    resolution: {integrity: sha512-RRyfQzDLoyLQlGSd8ThJQ3h0fiCe4tkmm935AUvSVQWP+p88FcnI4iaktKBJJVBnIpDhkv/7sDSA5dFc/QMM5w==}
@@ -2176,7 +2176,7 @@ snapshots:
    dependencies:
      '@octokit/openapi-types': 22.2.0

-  '@odit/lfk-client-js@1.2.0': {}
+  '@odit/lfk-client-js@1.2.3': {}

  '@odit/license-exporter@0.2.0':
    dependencies:
--- a/public/beep.mp3
+++ b/public/beep.mp3
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -136,9 +136,15 @@
        </Route>
        <Route path="/runners/*">
          <Route path="/">
-            <Runners />
+            <Runners created_via="all" />
          </Route>
-          <Route path="/:runnerid" let:params>
+          <Route path="/selfservice/">
+            <Runners created_via="selfservice" />
+          </Route>
+          <Route path="/kiosk/">
+            <Runners created_via="kiosk" />
+          </Route>
+          <Route path="/detail/:runnerid" let:params>
            <RunnerDetail {params} />
          </Route>
        </Route>
--- a/src/components/cards/CardRunner.svelte
+++ b/src/components/cards/CardRunner.svelte
@@ -6,7 +6,7 @@
 {#if !runner}
  {$_("non-blanko")}
 {:else}
-  <a href={`/runners/${runner.id}`}>
+  <a href={`/runners/detail/${runner.id}`}>
    {#if runner.middlename}
      {runner.firstname} {runner.middlename} {runner.lastname}
    {:else}
--- a/src/components/dashboard/Dashboard.svelte
+++ b/src/components/dashboard/Dashboard.svelte
@@ -41,7 +41,27 @@
 				</svg>
 				<span>{$_("dashboard-title")}</span>
 			</a>
-			{#if store.state.jwtinfo.userdetails.permissions.includes("RUNNER:GET")}
+			{#if store.state.jwtinfo.userdetails.permissions.includes("RUNNER:GET") && store.state.jwtinfo.userdetails.permissions.includes("CARD:GET")}
+				<a
+					class:activenav={$router.path.includes("/cardassignment/")}
+					class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-200 hover:text-gray-900 w-full font-semibold"
+					href="/cardassignment/"
+				>
+					<svg
+						xmlns="http://www.w3.org/2000/svg"
+						viewBox="0 0 24 24"
+						fill="currentColor"
+						class="flex-shrink-0 w-5 h-5 mr-2 transition group-hover:text-gray-600"
+					>
+						<path
+							fill-rule="evenodd"
+							d="M14.615 1.595a.75.75 0 0 1 .359.852L12.982 9.75h7.268a.75.75 0 0 1 .548 1.262l-10.5 11.25a.75.75 0 0 1-1.272-.71l1.992-7.302H3.75a.75.75 0 0 1-.548-1.262l10.5-11.25a.75.75 0 0 1 .913-.143Z"
+							clip-rule="evenodd"
+						/>
+					</svg>
+
+					<span>Card Assignment</span>
+				</a>
 				<a
 					class:activenav={$router.path.includes("/runners/")}
 					class="flex items-center px-4 py-3 transition cursor-pointer group hover:bg-gray-200 hover:text-gray-900 w-full font-semibold"
--- a/src/components/dashboard/MainDashContent.svelte
+++ b/src/components/dashboard/MainDashContent.svelte
@@ -220,7 +220,24 @@
 			<StatCard
 				title={$_("runner_via_selfservice")}
 				value={stats.runnersViaSelfservice}
-				href="/runners/"
+				href="/runners/selfservice/"
+			>
+				<svg
+					height="24"
+					width="24"
+					fill="currentColor"
+					xmlns="http://www.w3.org/2000/svg"
+					viewBox="0 0 24 24"
+					><path d="M0 0h24v24H0z" fill="none" />
+					<path
+						d="M13.49 5.48c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm-3.6 13.9l1-4.4 2.1 2v6h2v-7.5l-2.1-2 .6-3c1.3 1.5 3.3 2.5 5.5 2.5v-2c-1.9 0-3.5-1-4.3-2.4l-1-1.6c-.4-.6-1-1-1.7-1-.3 0-.5.1-.8.1l-5.2 2.2v4.7h2v-3.4l1.8-.7-1.6 8.1-4.9-1-.4 2 7 1.4z"
+					/></svg
+				>
+			</StatCard>
+			<StatCard
+				title={$_('runners_via_kiosk')}
+				value={stats.runnersViaKiosk}
+				href="/runners/kiosk/"
 			>
 				<svg
 					height="24"
--- a/src/components/donations/DonationRunner.svelte
+++ b/src/components/donations/DonationRunner.svelte
@@ -8,7 +8,7 @@
 {:else}
  <div class="text-sm font-medium text-gray-900">
    <a
-      href="../runners/{runner.id}"
+      href="../runners/detail/{runner.id}"
      class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800 border border-current"
      >{runner.firstname}
      {#if runner.middlename}{runner.middlename}{/if}
--- a/src/components/general/CardAssignment.svelte
+++ b/src/components/general/CardAssignment.svelte
@@ -1,26 +1,30 @@
 <script>
+	import { RunnerCardService, RunnerService } from "@odit/lfk-client-js";
 	import QrCodeScanner from "./QrCodeScanner.svelte";
 	let state = "scan_runner";
-	let runnerID = undefined;
-	let cardInfo = "";
+	let runnerinfo = { id: 0, firstname: "", lastname: "" };
+	let cardCode = "";
+	$: scannerActive = state.includes("scan");
 </script>

 <div class="p-4">
 	<h3 class="text-3xl font-bold">Card Assignment for Mobile</h3>
-	{#if state === "done"}
-		<p>Assigned Card {cardInfo} ✅</p>
-		<p>(not really, needs to be implemented)</p>
-	{:else}
+	<!-- <p>state</p>
+	<p>{state}</p>
+	<p>scannerActive</p>
+	<p>{scannerActive}</p> -->
+	{#if state.includes("scan_")}
 		<!--  -->
 		{#if state === "scan_runner"}
 			<h3 class="text-xl font-bold">Scan Runner (Selfservice QR)</h3>
 		{/if}
 		{#if state === "scan_card"}
 			<h3 class="text-xl font-bold">Runner Scanned</h3>
-			<p>{runnerID}</p>
+			<p>{runnerinfo.firstname} {runnerinfo.lastname} [#{runnerinfo.id}]</p>
 			<h3 class="text-xl font-bold">Scan Card (Code 128 Barcode)</h3>
 		{/if}
 		<QrCodeScanner
+			paused={!scannerActive}
 			on:detect={(e) => {
 				console.log({ type: "DETECT", code: e.detail.decodedText });
 				if (state === "scan_runner") {
@@ -29,13 +33,18 @@
 							"https://portal.lauf-fuer-kaya.de/profile/"
 						)
 					) {
-						runnerID = JSON.parse(
+						const runnerID = JSON.parse(
 							atob(
 								e.detail.decodedText
 									.replace("https://portal.lauf-fuer-kaya.de/profile/", "")
 									.split(".")[1]
 							)
 						).id;
+						new Audio("/beep.mp3").play();
+						RunnerService.runnerControllerGetOne(runnerID).then((runner) => {
+							console.log(runner);
+							runnerinfo = runner;
+						});
 						state = "scan_card";
 					}
 				}
@@ -45,8 +54,25 @@
 							"https://portal.lauf-fuer-kaya.de/profile/"
 						)
 					) {
-						cardInfo = e.detail.decodedText;
-						state = "done";
+						cardCode = e.detail.decodedText;
+						new Audio("/beep.mp3").play();
+						state = "assigning";
+						RunnerCardService.runnerCardControllerGetAll().then((cards) => {
+							console.log(cards);
+							const card = cards.find((c) => c.code === cardCode);
+							if (card) {
+								console.log("card found", card);
+								RunnerCardService.runnerCardControllerPut(card.id, {
+									enabled: true,
+									id: card.id,
+									runner: runnerinfo.id,
+								}).then(() => {
+									state = "done";
+								});
+							} else {
+								state = "error_card_404";
+							}
+						});
 					}
 				}
 			}}
@@ -58,8 +84,8 @@
 			<button
 				on:click={() => {
 					state = "scan_runner";
-					runnerID = undefined;
-					cardInfo = "";
+					runnerinfo = { id: 0, firstname: "", lastname: "" };
+					cardCode = "";
 				}}
 				type="button"
 				class="py-3 px-4 inline-flex items-center gap-x-2 text-sm font-medium rounded-lg border border-transparent bg-red-100 text-red-800 hover:bg-red-200 focus:outline-hidden focus:bg-red-200 disabled:opacity-50 disabled:pointer-events-none dark:text-red-500 dark:bg-red-800/30 dark:hover:bg-red-800/20 dark:focus:bg-red-800/20 w-full mt-2"
@@ -68,5 +94,30 @@
 			</button>
 		{/if}
 		<!--  -->
+	{:else}
+		<!--  -->
+		{#if state === "assigning"}
+			<p>Assigning Card {cardCode} ⌛</p>
+			<p>Please wait a moment while we assign the card...</p>
+		{/if}
+		{#if state === "done"}
+			<p>
+				Assigned Card {cardCode} to {runnerinfo.firstname}
+				{runnerinfo.lastname} [#{runnerinfo.id}] ✅
+			</p>
+			<button
+				on:click={() => {
+					// state = "scan_runner";
+					// runnerinfo = { id: 0, firstname: "", lastname: "" };
+					// cardCode = "";
+					location.reload();
+				}}
+				type="button"
+				class="py-3 px-4 inline-flex items-center gap-x-2 text-sm font-medium rounded-lg border border-transparent bg-blue-100 text-blue-800 hover:bg-blue-200 focus:outline-hidden focus:bg-blue-200 disabled:opacity-50 disabled:pointer-events-none dark:text-blue-500 dark:bg-blue-800/30 dark:hover:bg-blue-800/20 dark:focus:bg-blue-800/20 w-full mt-2"
+			>
+				Done
+			</button>
+		{/if}
+		<!--  -->
 	{/if}
 </div>
--- a/src/components/general/QrCodeScanner.svelte
+++ b/src/components/general/QrCodeScanner.svelte
@@ -14,12 +14,16 @@
 	const dispatch = createEventDispatcher();

 	function onScanSuccess(decodedText, decodedResult) {
-		dispatch("detect", { decodedText });
+		if (!paused) {
+			dispatch("detect", { decodedText });
+		}
 	}

 	// usually better to ignore and keep scanning
 	function onScanFailure(message) {
-		dispatch("error", { message });
+		if (!paused) {
+			dispatch("error", { message });
+		}
 	}

 	let scanner;
--- a/src/components/runners/RunnerDetail.svelte
+++ b/src/components/runners/RunnerDetail.svelte
@@ -100,7 +100,7 @@
 				<nav class="w-full flex">
 					<ol class="list-none flex flex-row items-center justify-start">
 						<li class="flex items-center">
-							<a class="mr-2" href="./"
+							<a class="mr-2" href="/runners/"
 								><svg
 									xmlns="http://www.w3.org/2000/svg"
 									width="24"
--- a/src/components/runners/Runners.svelte
+++ b/src/components/runners/Runners.svelte
@@ -32,6 +32,7 @@

 	$: active_delete = undefined;
 	let dataLoaded = false;
+	export let created_via = "all";
 	export let current_runners = [];
 	$: sponsoring_contracts_show = selected.length > 0;
 	$: cards_show = selected.length > 0;
@@ -103,7 +104,7 @@
 			header: () => $_("action"),
 			cell: (info) => {
 				return renderComponent(TableActions, {
-					detailsLink: `./${info.row.original.id}`,
+					detailsLink: `/runners/detail/${info.row.original.id}`,
 					deleteAction: () => {
 						active_delete =
 							current_runners[
@@ -161,7 +162,11 @@

 		let page = 0;
 		while (page >= 0) {
-			const runners = await RunnerService.runnerControllerGetAll(page, 500);
+			const runners = await RunnerService.runnerControllerGetAll(
+				page,
+				500,
+				created_via
+			);
 			if (runners.length == 0) {
 				page = -2;
 			}
@@ -190,6 +195,9 @@
 	<h4 class="mb-1 text-3xl font-extrabold leading-tight">
 		{$_("runners")}
 	</h4>
+	{#if created_via !== "all"}
+		<p>created_via={created_via}</p>
+	{/if}
 	{#if store.state.jwtinfo.userdetails.permissions.includes("RUNNER:CREATE")}
 		<button
 			on:click={() => {
--- a/src/locales/de.json
+++ b/src/locales/de.json
@@ -382,6 +382,7 @@
    "runners": "Läufer",
    "runners-are-being-imported": "Läufer werden importiert ...",
    "runners-are-being-loaded": "Läufer werden geladen ...",
+    "runners_via_kiosk": "Läufer via Kiosk",
    "save": "Speichern",
    "save-changes": "Änderungen speichern",
    "scan-added": "Scan hinzugefügt",
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -382,6 +382,7 @@
    "runners": "Runners",
    "runners-are-being-imported": "Runners are being imported...",
    "runners-are-being-loaded": "runners are being loaded...",
+    "runners_via_kiosk": "Runners via Kiosk",
    "save": "Save",
    "save-changes": "Save Changes",
    "scan-added": "Scan added",
Author	SHA1	Message	Date
Philipp Dormann	fce2bc645e	chore(release): 1.10.1 All checks were successful Build release images / build-container (push) Successful in 1m1s Details	2025-04-09 11:57:16 +02:00
Philipp Dormann	991716a7f5	feat: runner list filtered by created_via	2025-04-09 11:56:59 +02:00
Philipp Dormann	aa720f2460	chore(release): 1.10.0 All checks were successful Build release images / build-container (push) Successful in 1m1s Details	2025-04-09 10:39:06 +02:00
Philipp Dormann	ac4ef8fb6d	feat: working CardAssignment	2025-04-09 10:38:45 +02:00
Philipp Dormann	eae0afda23	chore(release): 1.9.11 All checks were successful Build release images / build-container (push) Successful in 57s Details	2025-04-08 22:17:04 +02:00
Philipp Dormann	5291f8a4d1	feat(dash): add runnersViaKiosk	2025-04-08 22:16:46 +02:00