From eb0910be575f4d83ab4f81a75a76cdfac46db19b Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Wed, 17 Mar 2021 13:49:51 +0100 Subject: [PATCH] Added basic scan overview ref #92 --- src/components/scans/Scans.svelte | 8 +- src/components/scans/ScansOverview.svelte | 154 ++++++++++++---------- 2 files changed, 90 insertions(+), 72 deletions(-) diff --git a/src/components/scans/Scans.svelte b/src/components/scans/Scans.svelte index 8084ae82..27263eaf 100644 --- a/src/components/scans/Scans.svelte +++ b/src/components/scans/Scans.svelte @@ -2,8 +2,8 @@ import { _ } from "svelte-i18n"; import store from "../../store"; // import AddDonationModal from "./AddDonationModal.svelte"; - // import DonationsOverview from "./DonationsOverview.svelte"; - $: current_donations = []; + import ScansOverview from "./ScansOverview.svelte"; + $: current_scans = []; export let modal_open = false; @@ -21,9 +21,9 @@ {/if} - + {#if store.state.jwtinfo.userdetails.permissions.includes('SCAN:CREATE')} - + {/if} diff --git a/src/components/scans/ScansOverview.svelte b/src/components/scans/ScansOverview.svelte index 49a1fca3..9c218aca 100644 --- a/src/components/scans/ScansOverview.svelte +++ b/src/components/scans/ScansOverview.svelte @@ -1,15 +1,15 @@ -{#if store.state.jwtinfo.userdetails.permissions.includes('DONATION:GET')} - {#await donations_promise} +{#if store.state.jwtinfo.userdetails.permissions.includes('SCAN:GET')} + {#await scans_promise} {:then} - {#if current_donations.length === 0} + {#if current_scans.length === 0} {:else} - - {$_('donor')} - @@ -56,12 +51,22 @@ - {$_('amount-per-kilometer')} + Distance - {$_('donation-amount')} + Status + + + Track + + + Station {$_('action')} @@ -69,95 +74,108 @@ - {#each current_donations as donation} - {#if donation.donor.firstname + {#each current_scans as scan} + + {#if scan.donor.firstname .toLowerCase() .includes( searchvalue.toLowerCase() - ) || donation.donor.middlename + ) || scan.donor.middlename .toLowerCase() .includes( searchvalue.toLowerCase() - ) || donation.donor.lastname + ) || scan.donor.lastname .toLowerCase() .includes( searchvalue.toLowerCase() - ) || donation.runner?.firstname + ) || scan.runner?.firstname .toLowerCase() .includes( searchvalue.toLowerCase() - ) || donation.runner?.middlename + ) || scan.runner?.middlename .toLowerCase() .includes( searchvalue.toLowerCase() - ) || donation.runner?.lastname + ) || scan.runner?.lastname .toLowerCase() .includes( searchvalue.toLowerCase() - ) || should_display_based_on_id(donation.id)} - + ) || should_display_based_on_id(scan.id)} +
{donation.donor.firstname} - {donation.donor.middlename || ''} - {donation.donor.lastname} + href="../runners/{scan.runner.id}" + class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800">{scan.runner.firstname} + {scan.runner.middlename || ''} + {scan.runner.lastname}
- - {#if donation.runner} - - {:else} -
- {$_('fixed-donation')} -
- {/if} - - - {#if donation.amountPerDistance} -
- {(donation.amountPerDistance / 100) - .toFixed(2) - .toLocaleString('de-DE', { valute: 'EUR' })}€ -
- {:else} -
- {$_('fixed-donation')} -
- {/if} -
- {(donation.amount / 100) - .toFixed(2) - .toLocaleString('de-DE', { valute: 'EUR' })}€ + {#if scan.distance < 1000} + {scan.distance}m + {:else} + {(scan.distance / 1000)}km + {/if}
- {#if active_deletes[donation.id] === true} + +
+ {#if scan.valid} + Valid + {:else} + Invalid + {/if} +
+ + + {#if scan.track} + + {:else} +
+ Scan with fixed distance +
+ {/if} + + + {#if scan.station} +
+ {:else} +
+ Scan with fixed distance +
+ {/if} + + + {#if active_deletes[scan.id] === true}