From c0555c066227711aa4e50d6eb154b211e88c00bf Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Tue, 6 Apr 2021 18:00:05 +0200 Subject: [PATCH 1/6] Added valid/invalid logic ref #11 --- src/Scanner.svelte | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/Scanner.svelte b/src/Scanner.svelte index 3b92031..47f332d 100644 --- a/src/Scanner.svelte +++ b/src/Scanner.svelte @@ -9,6 +9,7 @@ let lastscan_time = ""; let lastscan_laptime = ""; let lastscan_totaldistance = ""; + let lastscan_valid = true; let card = ""; // live clock at the top let time = new Date(); @@ -83,6 +84,7 @@ ) + "s"; lastscan_laptime = response.data.lapTime; + lastscan_valid = response.data.valid; lastscan_totaldistance = Math.floor(response.data.runner.distance / 1000) + "km " + @@ -112,14 +114,19 @@ /> {#if lastscan_totaldistance} -

last scan

-

{lastscan_time}

+ {#if !lastscan_valid} + + {:else} + + {/if}

total distance

{lastscan_totaldistance}

lap time

{lastscan_laptime}

+

last scan

+

{lastscan_time}

{:else}

{$_("please_scan_a_card")} From be6974af20f1f6b3304e3066b0cd4ad71532fe70 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Tue, 6 Apr 2021 18:00:31 +0200 Subject: [PATCH 2/6] Added valid/invalid svg icons ref #11 --- src/Scanner.svelte | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/src/Scanner.svelte b/src/Scanner.svelte index 47f332d..78c7117 100644 --- a/src/Scanner.svelte +++ b/src/Scanner.svelte @@ -115,9 +115,32 @@ {#if lastscan_totaldistance} {#if !lastscan_valid} - + {:else} - + {/if}

total distance

From 379999e491093cb50e16da9b7207242d7ad333f2 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Tue, 6 Apr 2021 18:03:13 +0200 Subject: [PATCH 3/6] Changed test sizes to fit the page on smaller screens ref #11 --- src/Scanner.svelte | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Scanner.svelte b/src/Scanner.svelte index 78c7117..0b70b42 100644 --- a/src/Scanner.svelte +++ b/src/Scanner.svelte @@ -142,13 +142,13 @@ /> {/if} -

total distance

-

+

total distance

+

{lastscan_totaldistance}

-

lap time

-

{lastscan_laptime}

-

last scan

+

lap time

+

{lastscan_laptime}

+

last scan

{lastscan_time}

{:else}

From 838127cf72befe448d8bf0d6c7ed3b32c5d43fc1 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Tue, 6 Apr 2021 18:05:04 +0200 Subject: [PATCH 4/6] Added missing translations ref #11 --- src/Scanner.svelte | 6 +++--- src/locales/de.json | 3 +++ src/locales/en.json | 3 +++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/Scanner.svelte b/src/Scanner.svelte index 0b70b42..8432be1 100644 --- a/src/Scanner.svelte +++ b/src/Scanner.svelte @@ -142,13 +142,13 @@ /> {/if} -

total distance

+

{$_('total-distance')}

{lastscan_totaldistance}

-

lap time

+

{$_('lap-time')}

{lastscan_laptime}

-

last scan

+

{$_('last-scan')}

{lastscan_time}

{:else}

diff --git a/src/locales/de.json b/src/locales/de.json index f97b292..0121386 100644 --- a/src/locales/de.json +++ b/src/locales/de.json @@ -7,6 +7,8 @@ "configure": "Konfigurieren", "error": "Error!", "language": "Sprache", + "lap-time": "Rundenzeit", + "last-scan": "Letzter Scan um", "log_out_from_this_client": "Von diesem Scanner abmelden", "minimum_lap_time": "minimale Rundenzeit", "please_check_your_token_and_try_again": "Bitte überprüfe den Token und versuche es erneut...", @@ -22,6 +24,7 @@ "station_id": "Scanstations-ID", "the_provided_scan_station_is_disabled": "Die angegebene Scanstation ist deaktiviert.", "the_provided_scan_station_token_is_invalid": "Der angegebene Scanstation-Token ist ungültig.", + "total-distance": "Gesamtdistanz", "track_distance": "Länge des Tracks", "track_id": "Track ID", "track_name": "Track Name" diff --git a/src/locales/en.json b/src/locales/en.json index a07c7f4..7cc9a8b 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -7,6 +7,8 @@ "configure": "Configure", "error": "Error!", "language": "Language", + "lap-time": "lap time", + "last-scan": "last scan", "log_out_from_this_client": "Log Out from this Client", "minimum_lap_time": "minimum lap time", "please_check_your_token_and_try_again": "Please check your token and try again...", @@ -22,6 +24,7 @@ "station_id": "Scanstation ID", "the_provided_scan_station_is_disabled": "The provided scan station is disabled.", "the_provided_scan_station_token_is_invalid": "The provided scan station token is invalid.", + "total-distance": "total distance", "track_distance": "Track Distance", "track_id": "Track ID", "track_name": "Track Name" From a4d749cc3f876041b2f03a7e200c7f684144d79f Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Tue, 6 Apr 2021 18:07:13 +0200 Subject: [PATCH 5/6] Added svg titels ref #11 --- src/Scanner.svelte | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Scanner.svelte b/src/Scanner.svelte index 8432be1..a0b16b1 100644 --- a/src/Scanner.svelte +++ b/src/Scanner.svelte @@ -121,6 +121,7 @@ height="20rem" class="ml-auto mr-auto" version="1.0" + title="Invalid" viewBox="0 0 100 100" > {/if} -

{$_('total-distance')}

+

{$_("total-distance")}

{lastscan_totaldistance}

-

{$_('lap-time')}

+

{$_("lap-time")}

{lastscan_laptime}

-

{$_('last-scan')}

+

{$_("last-scan")}

{lastscan_time}

{:else}

From 64398cdd74209ef9540eca9b78301057ae0cc5cb Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Tue, 6 Apr 2021 20:53:21 +0200 Subject: [PATCH 6/6] =?UTF-8?q?Now=20also=20showing=20=E2=9D=8C=20for=20er?= =?UTF-8?q?rors?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ref #11 --- src/Scanner.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Scanner.svelte b/src/Scanner.svelte index a0b16b1..4afd6d4 100644 --- a/src/Scanner.svelte +++ b/src/Scanner.svelte @@ -114,7 +114,7 @@ /> {#if lastscan_totaldistance} - {#if !lastscan_valid} + {#if !lastscan_valid || lastscan_error}