From c33dfcfddddfed0902f3fa9b1d8a1d3e1560262f Mon Sep 17 00:00:00 2001
From: Nicolai Ort <info@nicolai-ort.com>
Date: Tue, 18 Apr 2023 20:38:01 +0200
Subject: [PATCH 1/5] Implemented Async loading of cards via pagination (500
 cards per request) ref #175

---
 src/components/cards/CardsOverview.svelte | 33 +++++++++++++++++------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/components/cards/CardsOverview.svelte b/src/components/cards/CardsOverview.svelte
index 287df51f..49f96d04 100644
--- a/src/components/cards/CardsOverview.svelte
+++ b/src/components/cards/CardsOverview.svelte
@@ -32,7 +32,7 @@
   export let original_data = {};
   export let current_cards = [];
   export const addCards = (cards) => {
-    console.log(cards)
+    console.log(cards);
     current_cards = current_cards.concat(...cards);
     options.update((options) => ({
       ...options,
@@ -155,15 +155,29 @@
     }).showToast();
   }
 
-  onMount(() => {
-    RunnerCardService.runnerCardControllerGetAll().then((val) => {
-      current_cards = val;
+  onMount(async () => {
+    let page = 0;
+    while (page >= 0) {
+      const cards = await RunnerCardService.runnerCardControllerGetAll(
+        page,
+        500
+      );
+      if (cards.length == 0) {
+        page = -2;
+      }
+
+      current_cards = current_cards.concat(...cards);
       options.update((options) => ({
         ...options,
         data: current_cards,
       }));
-      dataLoaded = true;
-    });
+
+      if (page == 0) {
+        dataLoaded = true;
+      }
+      page++;
+    }
+    console.log("All cards loaded");
   });
 </script>
 
@@ -229,7 +243,7 @@
               ...options,
               data: current_cards,
             }));
-            $table.resetRowSelection()
+            $table.resetRowSelection();
           }}
         >
           {$_("delete-cards")}
@@ -249,7 +263,10 @@
           </svg>
         </button>
       {/if}
-      <GenerateRunnerCards cards_show={selected.length>0} bind:generate_cards={selectedCards} />
+      <GenerateRunnerCards
+        cards_show={selected.length > 0}
+        bind:generate_cards={selectedCards}
+      />
     </div>
     <div class="overflow-x-auto">
       <table class="w-full">
-- 
2.47.2


From faf3893180bb735bea6f1ea58c896686b89949fe Mon Sep 17 00:00:00 2001
From: Nicolai Ort <info@nicolai-ort.com>
Date: Tue, 18 Apr 2023 20:40:28 +0200
Subject: [PATCH 2/5] Paginated runner loading (1000 per page) ref #175

---
 src/components/runners/RunnersOverview.svelte | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/components/runners/RunnersOverview.svelte b/src/components/runners/RunnersOverview.svelte
index 3c2cf750..3665bb12 100644
--- a/src/components/runners/RunnersOverview.svelte
+++ b/src/components/runners/RunnersOverview.svelte
@@ -50,7 +50,6 @@
     }));
   };
 
-
   //Section table
   const columns = [
     {
@@ -157,16 +156,7 @@
     }).showToast();
   }
 
-  onMount(() => {
-    RunnerService.runnerControllerGetAll().then((val) => {
-      current_runners = val;
-      dataLoaded = true;
-
-      options.update((options) => ({
-        ...options,
-        data: current_runners,
-      }));
-    });
+  onMount(async () => {
     RunnerTeamService.runnerTeamControllerGetAll().then((val) => {
       teams = val;
     });
@@ -175,6 +165,26 @@
         orgs = val;
       }
     );
+
+    let page = 0;
+    while (page >= 0) {
+      const runners = await RunnerService.runnerControllerGetAll(page, 1000);
+      if (runners.length == 0) {
+        page = -2;
+      }
+
+      current_runners = current_runners.concat(...runners);
+      options.update((options) => ({
+        ...options,
+        data: current_runners,
+      }));
+
+      if (page == 0) {
+        dataLoaded = true;
+      }
+      page++;
+    }
+    console.log("All runners loaded");
   });
 </script>
 
-- 
2.47.2


From cac34db1fd3bf5dc7c7be64b3a76ca4c8c77938d Mon Sep 17 00:00:00 2001
From: Nicolai Ort <info@nicolai-ort.com>
Date: Tue, 18 Apr 2023 20:43:04 +0200
Subject: [PATCH 3/5] Paginated scan loading ref #175

---
 src/components/scans/ScansOverview.svelte | 222 +++++++++++-----------
 1 file changed, 114 insertions(+), 108 deletions(-)

diff --git a/src/components/scans/ScansOverview.svelte b/src/components/scans/ScansOverview.svelte
index f19f5e1a..35b05bc6 100644
--- a/src/components/scans/ScansOverview.svelte
+++ b/src/components/scans/ScansOverview.svelte
@@ -30,6 +30,7 @@
     $table?.getSelectedRowModel().rows.map((row) => row.index) || [];
 
   $: active_delete = undefined;
+  $: dataLoaded = false;
   export let current_scans = [];
   export const addScans = (scans) => {
     current_scans = current_scans.concat(...scans);
@@ -39,15 +40,6 @@
     }));
   };
 
-  const scans_promise = ScanService.scanControllerGetAll().then((val) => {
-    current_scans = val;
-    // handler.setRows(val);
-    current_scans = val;
-    options.update((options) => ({
-      ...options,
-      data: current_scans,
-    }));
-  });
   let allTracks = [];
   TrackService.trackControllerGetAll().then((val) => {
     allTracks = val;
@@ -99,7 +91,7 @@
       accessorKey: "timestamp",
       header: () => $_("timestamp"),
       cell: (info) => {
-        return (new Date(parseInt(info.getValue())*1000)).toLocaleString()
+        return new Date(parseInt(info.getValue()) * 1000).toLocaleString();
       },
       enableColumnFilter: false,
     },
@@ -183,6 +175,29 @@
       backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
     }).showToast();
   }
+
+  onMount(async () => {
+    let page = 0;
+    while (page >= 0) {
+      const scans = await ScanService.scanControllerGetAll(page, 500);
+      if (scans.length == 0) {
+        page = -2;
+        dataLoaded = true;
+      }
+
+      current_scans = current_scans.concat(...scans);
+      options.update((options) => ({
+        ...options,
+        data: current_scans,
+      }));
+
+      if (page == 0) {
+        dataLoaded = true;
+      }
+      page++;
+    }
+    console.log("All scans loaded");
+  });
 </script>
 
 <DeleteScanModal
@@ -193,7 +208,7 @@
   }}
 />
 {#if store.state.jwtinfo.userdetails.permissions.includes("SCAN:GET")}
-  {#await scans_promise}
+  {#if !dataLoaded}
     <div
       class="bg-teal-lightest border-t-4 border-teal rounded-b text-teal-darkest px-4 py-3 shadow-md my-2"
       role="alert"
@@ -201,105 +216,96 @@
       <p class="font-bold">{$_("scans-are-being-loaded")}</p>
       <p class="text-sm">{$_("this-might-take-a-moment")}</p>
     </div>
-  {:then}
-    {#if current_scans.length === 0}
-      <ScansEmptyState />
-    {:else}
-      {#if selected.length > 0}
-        <button
-          type="button"
-          class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:ml-3 sm:w-auto sm:text-sm inline-flex"
-          id="options-menu"
-          on:click={async () => {
-            const prom = [];
-            for (const scan of selectedScans) {
-              prom.push(ScanService.scanControllerRemove(scan.id, true));
-            }
-            await Promise.all(prom);
-            for (const scan of selectedScans) {
-              current_scans = current_scans.filter((r) => r.id !== scan.id);
-            }
-            options.update((options) => ({
-              ...options,
-              data: current_scans,
-            }));
-            $table.resetRowSelection();
-            Toastify({
-              text: $_("scan-deleted"),
-              duration: 3500,
-              backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
-            }).showToast();
-          }}
+  {:else if current_scans.length === 0}
+    <ScansEmptyState />
+  {:else}
+    {#if selected.length > 0}
+      <button
+        type="button"
+        class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:ml-3 sm:w-auto sm:text-sm inline-flex"
+        id="options-menu"
+        on:click={async () => {
+          const prom = [];
+          for (const scan of selectedScans) {
+            prom.push(ScanService.scanControllerRemove(scan.id, true));
+          }
+          await Promise.all(prom);
+          for (const scan of selectedScans) {
+            current_scans = current_scans.filter((r) => r.id !== scan.id);
+          }
+          options.update((options) => ({
+            ...options,
+            data: current_scans,
+          }));
+          $table.resetRowSelection();
+          Toastify({
+            text: $_("scan-deleted"),
+            duration: 3500,
+            backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
+          }).showToast();
+        }}
+      >
+        {$_("delete-scans")}
+        <svg
+          xmlns="http://www.w3.org/2000/svg"
+          fill="none"
+          viewBox="0 0 24 24"
+          stroke-width="1.5"
+          stroke="currentColor"
+          class="w-5 h-5"
         >
-          {$_("delete-scans")}
-          <svg
-            xmlns="http://www.w3.org/2000/svg"
-            fill="none"
-            viewBox="0 0 24 24"
-            stroke-width="1.5"
-            stroke="currentColor"
-            class="w-5 h-5"
-          >
-            <path
-              stroke-linecap="round"
-              stroke-linejoin="round"
-              d="M14.74 9l-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 01-2.244 2.077H8.084a2.25 2.25 0 01-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 00-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 013.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 00-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 00-7.5 0"
-            />
-          </svg>
-        </button>
-      {/if}
-      <div class="overflow-x-auto">
-        <table class="w-full">
-          <thead>
-            {#each $table.getHeaderGroups() as headerGroup}
-              <tr class="select-none">
-                <th class="inset-y-0 left-0 px-4 py-2 text-left w-px">
-                  <InputElement
-                    type="checkbox"
-                    checked={$table.getIsAllRowsSelected()}
-                    indeterminate={$table.getIsSomeRowsSelected()}
-                    on:change={() => $table.toggleAllRowsSelected()}
-                  />
-                </th>
-                {#each headerGroup.headers as header}
-                  <TableHeader {header} />
-                {/each}
-              </tr>
-            {/each}
-          </thead>
-          <tbody>
-            {#each $table.getRowModel().rows as row}
-              <tr>
-                <td class="inset-y-0 left-0 px-4 py-2 text-center w-px">
-                  <InputElement
-                    type="checkbox"
-                    checked={row.getIsSelected()}
-                    on:change={() => row.toggleSelected()}
+          <path
+            stroke-linecap="round"
+            stroke-linejoin="round"
+            d="M14.74 9l-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 01-2.244 2.077H8.084a2.25 2.25 0 01-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 00-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 013.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 00-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 00-7.5 0"
+          />
+        </svg>
+      </button>
+    {/if}
+    <div class="overflow-x-auto">
+      <table class="w-full">
+        <thead>
+          {#each $table.getHeaderGroups() as headerGroup}
+            <tr class="select-none">
+              <th class="inset-y-0 left-0 px-4 py-2 text-left w-px">
+                <InputElement
+                  type="checkbox"
+                  checked={$table.getIsAllRowsSelected()}
+                  indeterminate={$table.getIsSomeRowsSelected()}
+                  on:change={() => $table.toggleAllRowsSelected()}
+                />
+              </th>
+              {#each headerGroup.headers as header}
+                <TableHeader {header} />
+              {/each}
+            </tr>
+          {/each}
+        </thead>
+        <tbody>
+          {#each $table.getRowModel().rows as row}
+            <tr>
+              <td class="inset-y-0 left-0 px-4 py-2 text-center w-px">
+                <InputElement
+                  type="checkbox"
+                  checked={row.getIsSelected()}
+                  on:change={() => row.toggleSelected()}
+                />
+              </td>
+              {#each row.getVisibleCells() as cell}
+                <td>
+                  <svelte:component
+                    this={flexRender(
+                      cell.column.columnDef.cell,
+                      cell.getContext()
+                    )}
                   />
                 </td>
-                {#each row.getVisibleCells() as cell}
-                  <td>
-                    <svelte:component
-                      this={flexRender(
-                        cell.column.columnDef.cell,
-                        cell.getContext()
-                      )}
-                    />
-                  </td>
-                {/each}
-              </tr>
-            {/each}
-          </tbody>
-        </table>
-      </div>
-      <TableBottom {table} {selected} />
-    {/if}
-  {:catch error}
-    <div class="text-white px-6 py-4 border-0 rounded relative mb-4 bg-red-500">
-      <span class="inline-block align-middle mr-8">
-        <b class="capitalize">{$_("general_promise_error")}</b>
-        {error}
-      </span>
+              {/each}
+            </tr>
+          {/each}
+        </tbody>
+      </table>
     </div>
-  {/await}
+    <TableBottom {table} {selected} />
+  {/if}
 {/if}
-- 
2.47.2


From ccf865687b34016931a702c0a9b98a0a18e2b03a Mon Sep 17 00:00:00 2001
From: Nicolai Ort <info@nicolai-ort.com>
Date: Tue, 18 Apr 2023 20:46:18 +0200
Subject: [PATCH 4/5] Donation paginated loading ref #175

---
 .../donations/DonationsOverview.svelte        | 434 ++++++++++--------
 1 file changed, 237 insertions(+), 197 deletions(-)

diff --git a/src/components/donations/DonationsOverview.svelte b/src/components/donations/DonationsOverview.svelte
index c509f98f..c989a6d5 100644
--- a/src/components/donations/DonationsOverview.svelte
+++ b/src/components/donations/DonationsOverview.svelte
@@ -5,18 +5,16 @@
   import Toastify from "toastify-js";
   import DonationsEmptyState from "./DonationsEmptyState.svelte";
   import AddDonationPaymentModal from "./AddDonationPaymentModal.svelte";
+  import { onMount } from "svelte";
   $: searchvalue = "";
   $: active_deletes = [];
+  $: dataLoaded = false;
   export let current_donations = [];
   export let payment_modal_open = false;
   export let editable = {};
   export let original_data = {};
   export let paid_amount_input = 0;
-  const donations_promise = DonationService.donationControllerGetAll().then(
-    (val) => {
-      current_donations = val;
-    }
-  );
+
   function should_display_based_on_id(id) {
     if (searchvalue.toString().slice(-1) === "*") {
       return id.toString().startsWith(searchvalue.replace("*", ""));
@@ -26,210 +24,252 @@
   function open_payment_modal(donation) {
     editable = Object.assign({}, donation);
     original_data = Object.assign({}, donation);
-    paid_amount_input = (donation.paidAmount/100).toFixed(2);
+    paid_amount_input = (donation.paidAmount / 100).toFixed(2);
     payment_modal_open = true;
   }
+
+  onMount(async () => {
+    let page = 0;
+    while (page >= 0) {
+      const donations = await DonationService.donationControllerGetAll(
+        page,
+        500
+      );
+      if (donations.length == 0) {
+        page = -2;
+      }
+
+      current_donations = current_donations.concat(...donations);
+
+      if (page == 0) {
+        dataLoaded = true;
+      }
+      page++;
+    }
+    console.log("All donations loaded");
+  });
 </script>
 
-<AddDonationPaymentModal bind:current_donations bind:original_data bind:editable bind:paid_amount_input bind:payment_modal_open />
-{#if store.state.jwtinfo.userdetails.permissions.includes('DONATION:GET')}
-  {#await donations_promise}
+<AddDonationPaymentModal
+  bind:current_donations
+  bind:original_data
+  bind:editable
+  bind:paid_amount_input
+  bind:payment_modal_open
+/>
+{#if store.state.jwtinfo.userdetails.permissions.includes("DONATION:GET")}
+  {#if !dataLoaded}
     <div
       class="bg-teal-lightest border-t-4 border-teal rounded-b text-teal-darkest px-4 py-3 shadow-md my-2"
-      role="alert">
+      role="alert"
+    >
       <p class="font-bold">donations are being loaded</p>
-      <p class="text-sm">{$_('this-might-take-a-moment')}</p>
+      <p class="text-sm">{$_("this-might-take-a-moment")}</p>
     </div>
-  {:then}
-    {#if current_donations.length === 0}
-      <DonationsEmptyState />
-    {:else}
-      <input
-        type="search"
-        bind:value={searchvalue}
-        placeholder={$_('datatable.search')}
-        aria-label={$_('datatable.search')}
-        class="mb-4" />
-      <div
-        class="shadow border-b border-gray-200 sm:rounded-lg overflow-x-scroll">
-        <table class="divide-y divide-gray-200 w-full">
-          <thead class="bg-gray-50">
-            <tr>
-              <th
-                scope="col"
-                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
-                {$_('donor')}
-              </th>
-              <th
-                scope="col"
-                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
-                {$_('runner')}
-              </th>
-              <th
-                scope="col"
-                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
-                {$_('amount-per-kilometer')}
-              </th>
-              <th
-                scope="col"
-                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
-                {$_('donation-amount')}
-              </th>
-              <th
-                scope="col"
-                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
-                {$_('paid-amount')}
-              </th>
-              <th
-                scope="col"
-                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
-                {$_('status')}
-              </th>
-              <th scope="col" class="relative px-6 py-3">
-                <span class="sr-only">{$_('action')}</span>
-              </th>
-            </tr>
-          </thead>
-          <tbody class="divide-y divide-gray-200">
-            {#each current_donations as donation}
-              {#if donation.donor.firstname
+  {:else if current_donations.length === 0}
+    <DonationsEmptyState />
+  {:else}
+    <input
+      type="search"
+      bind:value={searchvalue}
+      placeholder={$_("datatable.search")}
+      aria-label={$_("datatable.search")}
+      class="mb-4"
+    />
+    <div
+      class="shadow border-b border-gray-200 sm:rounded-lg overflow-x-scroll"
+    >
+      <table class="divide-y divide-gray-200 w-full">
+        <thead class="bg-gray-50">
+          <tr>
+            <th
+              scope="col"
+              class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider"
+            >
+              {$_("donor")}
+            </th>
+            <th
+              scope="col"
+              class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider"
+            >
+              {$_("runner")}
+            </th>
+            <th
+              scope="col"
+              class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider"
+            >
+              {$_("amount-per-kilometer")}
+            </th>
+            <th
+              scope="col"
+              class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider"
+            >
+              {$_("donation-amount")}
+            </th>
+            <th
+              scope="col"
+              class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider"
+            >
+              {$_("paid-amount")}
+            </th>
+            <th
+              scope="col"
+              class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider"
+            >
+              {$_("status")}
+            </th>
+            <th scope="col" class="relative px-6 py-3">
+              <span class="sr-only">{$_("action")}</span>
+            </th>
+          </tr>
+        </thead>
+        <tbody class="divide-y divide-gray-200">
+          {#each current_donations as donation}
+            {#if donation.donor.firstname
+              .toLowerCase()
+              .includes(searchvalue.toLowerCase()) || donation.donor.lastname
                 .toLowerCase()
-                .includes(
-                  searchvalue.toLowerCase()
-                ) ||  donation.donor.lastname
-                  .toLowerCase()
-                  .includes(
-                    searchvalue.toLowerCase()
-                  ) || donation.runner?.firstname
-                  .toLowerCase()
-                  .includes(
-                    searchvalue.toLowerCase()
-                  ) || donation.runner?.lastname
-                  .toLowerCase()
-                  .includes(
-                    searchvalue.toLowerCase()
-                  ) || should_display_based_on_id(donation.id)}
-                <tr data-rowid="donation_{donation.id}">
-                  <td class="px-6 py-4 whitespace-nowrap">
-                    <div class="flex items-center">
+                .includes(searchvalue.toLowerCase()) || donation.runner?.firstname
+                .toLowerCase()
+                .includes(searchvalue.toLowerCase()) || donation.runner?.lastname
+                .toLowerCase()
+                .includes(searchvalue.toLowerCase()) || should_display_based_on_id(donation.id)}
+              <tr data-rowid="donation_{donation.id}">
+                <td class="px-6 py-4 whitespace-nowrap">
+                  <div class="flex items-center">
+                    <a
+                      href="../donors/{donation.donor.id}"
+                      class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800"
+                      >{donation.donor.firstname}
+                      {donation.donor.middlename || ""}
+                      {donation.donor.lastname}</a
+                    >
+                  </div>
+                </td>
+                <td class="px-6 py-4 whitespace-nowrap">
+                  {#if donation.runner}
+                    <div class="text-sm font-medium text-gray-900">
                       <a
-                        href="../donors/{donation.donor.id}"
-                        class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800">{donation.donor.firstname}
-                        {donation.donor.middlename || ''}
-                        {donation.donor.lastname}</a>
+                        href="../runners/{donation.runner.id}"
+                        class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800"
+                        >{donation.runner.firstname}
+                        {donation.runner.middlename || ""}
+                        {donation.runner.lastname}</a
+                      >
                     </div>
-                  </td>
-                  <td class="px-6 py-4 whitespace-nowrap">
-                    {#if donation.runner}
-                      <div class="text-sm font-medium text-gray-900">
-                        <a
-                          href="../runners/{donation.runner.id}"
-                          class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800">{donation.runner.firstname}
-                          {donation.runner.middlename || ''}
-                          {donation.runner.lastname}</a>
-                      </div>
-                    {:else}
-                      <div class="text-sm font-medium text-gray-900">
-                        {$_('fixed-donation')}
-                      </div>
-                    {/if}
-                  </td>
-                  <td class="px-6 py-4 whitespace-nowrap">
-                    {#if donation.amountPerDistance}
-                      <div class="text-sm font-medium text-gray-900">
-                        {(donation.amountPerDistance / 100)
-                          .toFixed(2)
-                          .toLocaleString('de-DE', { valute: 'EUR' })}€
-                      </div>
-                    {:else}
-                      <div class="text-sm font-medium text-gray-900">
-                        {$_('fixed-donation')}
-                      </div>
-                    {/if}
-                  </td>
-                  <td class="px-6 py-4 whitespace-nowrap">
-                    <div class="text-sm font-medium text-gray-900">
-                      {(donation.amount / 100)
-                        .toFixed(2)
-                        .toLocaleString('de-DE', { valute: 'EUR' })}€
-                    </div>
-                  </td>
-                  <td class="px-6 py-4 whitespace-nowrap">
-                    <div class="text-sm font-medium text-gray-900">
-                      {(donation.paidAmount / 100)
-                        .toFixed(2)
-                        .toLocaleString('de-DE', { valute: 'EUR' })}€
-                    </div>
-                  </td>
-                  <td class="px-6 py-4 whitespace-nowrap">
-                    {#if donation.status =="PAID"}
-                      <span
-                        class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-green-100 text-green-800">{$_('paid')}</span>
-                    {:else}
-                      <span
-                        class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-red-100 text-red-800">{$_('open')}</span>
-                    {/if}
-                  </td>
-                  {#if active_deletes[donation.id] === true}
-                    <td
-                      class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
-                      <button
-                        on:click={() => {
-                          active_deletes[donation.id] = false;
-                        }}
-                        tabindex="0"
-                        class="ml-4 text-indigo-600 hover:text-indigo-900 cursor-pointer">{$_('cancel-delete')}</button>
-                      <button
-                        on:click={() => {
-                          DonationService.donationControllerRemove(donation.id, false).then(
-                            (resp) => {
-                              current_donations = current_donations.filter(
-                                (obj) => obj.id !== donation.id
-                              );
-                              Toastify({
-                                text: $_('donation-deleted'),
-                                duration: 500,
-                                backgroundColor:
-                                  'linear-gradient(to right, #00b09b, #96c93d)',
-                              }).showToast();
-                            }
-                          );
-                        }}
-                        tabindex="0"
-                        class="ml-4 text-red-600 hover:text-red-900 cursor-pointer">{$_('confirm-delete')}</button>
-                    </td>
                   {:else}
-                    <td
-                      class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
-                      <button
-                        on:click={() => {open_payment_modal(donation);}}
-                        class="text-[#025a21] hover:text-green-900 mr-4">{$_('enter-payment')}</button>
-                      <a
-                        href="./{donation.id}"
-                        class="text-indigo-600 hover:text-indigo-900">{$_('details')}</a>
-                      {#if store.state.jwtinfo.userdetails.permissions.includes('DONATION:DELETE')}
-                        <button
-                          on:click={() => {
-                            active_deletes[donation.id] = true;
-                          }}
-                          tabindex="0"
-                          class="ml-4 text-red-600 hover:text-red-900 cursor-pointer">{$_('delete')}</button>
-                      {/if}
-                    </td>
+                    <div class="text-sm font-medium text-gray-900">
+                      {$_("fixed-donation")}
+                    </div>
                   {/if}
-                </tr>
-              {/if}
-            {/each}
-          </tbody>
-        </table>
-      </div>
-    {/if}
-  {:catch error}
-    <div class="text-white px-6 py-4 border-0 rounded relative mb-4 bg-red-500">
-      <span class="inline-block align-middle mr-8">
-        <b class="capitalize">{$_('general_promise_error')}</b>
-        {error}
-      </span>
+                </td>
+                <td class="px-6 py-4 whitespace-nowrap">
+                  {#if donation.amountPerDistance}
+                    <div class="text-sm font-medium text-gray-900">
+                      {(donation.amountPerDistance / 100)
+                        .toFixed(2)
+                        .toLocaleString("de-DE", { valute: "EUR" })}€
+                    </div>
+                  {:else}
+                    <div class="text-sm font-medium text-gray-900">
+                      {$_("fixed-donation")}
+                    </div>
+                  {/if}
+                </td>
+                <td class="px-6 py-4 whitespace-nowrap">
+                  <div class="text-sm font-medium text-gray-900">
+                    {(donation.amount / 100)
+                      .toFixed(2)
+                      .toLocaleString("de-DE", { valute: "EUR" })}€
+                  </div>
+                </td>
+                <td class="px-6 py-4 whitespace-nowrap">
+                  <div class="text-sm font-medium text-gray-900">
+                    {(donation.paidAmount / 100)
+                      .toFixed(2)
+                      .toLocaleString("de-DE", { valute: "EUR" })}€
+                  </div>
+                </td>
+                <td class="px-6 py-4 whitespace-nowrap">
+                  {#if donation.status == "PAID"}
+                    <span
+                      class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-green-100 text-green-800"
+                      >{$_("paid")}</span
+                    >
+                  {:else}
+                    <span
+                      class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-red-100 text-red-800"
+                      >{$_("open")}</span
+                    >
+                  {/if}
+                </td>
+                {#if active_deletes[donation.id] === true}
+                  <td
+                    class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium"
+                  >
+                    <button
+                      on:click={() => {
+                        active_deletes[donation.id] = false;
+                      }}
+                      tabindex="0"
+                      class="ml-4 text-indigo-600 hover:text-indigo-900 cursor-pointer"
+                      >{$_("cancel-delete")}</button
+                    >
+                    <button
+                      on:click={() => {
+                        DonationService.donationControllerRemove(
+                          donation.id,
+                          false
+                        ).then((resp) => {
+                          current_donations = current_donations.filter(
+                            (obj) => obj.id !== donation.id
+                          );
+                          Toastify({
+                            text: $_("donation-deleted"),
+                            duration: 500,
+                            backgroundColor:
+                              "linear-gradient(to right, #00b09b, #96c93d)",
+                          }).showToast();
+                        });
+                      }}
+                      tabindex="0"
+                      class="ml-4 text-red-600 hover:text-red-900 cursor-pointer"
+                      >{$_("confirm-delete")}</button
+                    >
+                  </td>
+                {:else}
+                  <td
+                    class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium"
+                  >
+                    <button
+                      on:click={() => {
+                        open_payment_modal(donation);
+                      }}
+                      class="text-[#025a21] hover:text-green-900 mr-4"
+                      >{$_("enter-payment")}</button
+                    >
+                    <a
+                      href="./{donation.id}"
+                      class="text-indigo-600 hover:text-indigo-900"
+                      >{$_("details")}</a
+                    >
+                    {#if store.state.jwtinfo.userdetails.permissions.includes("DONATION:DELETE")}
+                      <button
+                        on:click={() => {
+                          active_deletes[donation.id] = true;
+                        }}
+                        tabindex="0"
+                        class="ml-4 text-red-600 hover:text-red-900 cursor-pointer"
+                        >{$_("delete")}</button
+                      >
+                    {/if}
+                  </td>
+                {/if}
+              </tr>
+            {/if}
+          {/each}
+        </tbody>
+      </table>
     </div>
-  {/await}
+  {/if}
 {/if}
-- 
2.47.2


From 52439aa5bc8cfb1d78d5dfce55b1a0df640ad8f5 Mon Sep 17 00:00:00 2001
From: Nicolai Ort <info@nicolai-ort.com>
Date: Tue, 18 Apr 2023 20:47:42 +0200
Subject: [PATCH 5/5] Allways set loaded to true ref #175

---
 src/components/cards/CardsOverview.svelte         | 4 +---
 src/components/donations/DonationsOverview.svelte | 4 +---
 src/components/runners/RunnersOverview.svelte     | 4 +---
 src/components/scans/ScansOverview.svelte         | 5 +----
 4 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/components/cards/CardsOverview.svelte b/src/components/cards/CardsOverview.svelte
index 49f96d04..d511c445 100644
--- a/src/components/cards/CardsOverview.svelte
+++ b/src/components/cards/CardsOverview.svelte
@@ -172,9 +172,7 @@
         data: current_cards,
       }));
 
-      if (page == 0) {
-        dataLoaded = true;
-      }
+      dataLoaded = true;
       page++;
     }
     console.log("All cards loaded");
diff --git a/src/components/donations/DonationsOverview.svelte b/src/components/donations/DonationsOverview.svelte
index c989a6d5..44c674c1 100644
--- a/src/components/donations/DonationsOverview.svelte
+++ b/src/components/donations/DonationsOverview.svelte
@@ -41,9 +41,7 @@
 
       current_donations = current_donations.concat(...donations);
 
-      if (page == 0) {
-        dataLoaded = true;
-      }
+      dataLoaded = true;
       page++;
     }
     console.log("All donations loaded");
diff --git a/src/components/runners/RunnersOverview.svelte b/src/components/runners/RunnersOverview.svelte
index 3665bb12..b0d33670 100644
--- a/src/components/runners/RunnersOverview.svelte
+++ b/src/components/runners/RunnersOverview.svelte
@@ -179,9 +179,7 @@
         data: current_runners,
       }));
 
-      if (page == 0) {
-        dataLoaded = true;
-      }
+      dataLoaded = true;
       page++;
     }
     console.log("All runners loaded");
diff --git a/src/components/scans/ScansOverview.svelte b/src/components/scans/ScansOverview.svelte
index 35b05bc6..c6b118e2 100644
--- a/src/components/scans/ScansOverview.svelte
+++ b/src/components/scans/ScansOverview.svelte
@@ -182,7 +182,6 @@
       const scans = await ScanService.scanControllerGetAll(page, 500);
       if (scans.length == 0) {
         page = -2;
-        dataLoaded = true;
       }
 
       current_scans = current_scans.concat(...scans);
@@ -191,9 +190,7 @@
         data: current_scans,
       }));
 
-      if (page == 0) {
-        dataLoaded = true;
-      }
+      dataLoaded = true;
       page++;
     }
     console.log("All scans loaded");
-- 
2.47.2