From ca9c390bb265e5c1b1f8752e118c5f3c560ddc82 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Wed, 10 Mar 2021 16:41:29 +0100 Subject: [PATCH 01/31] Now routing scan statins overview ref #93 --- src/App.svelte | 7 + .../scanstations/ScanStations.svelte | 29 +++ .../ScanStationsEmptyState.svelte | 17 ++ .../scanstations/ScanStationsOverview.svelte | 177 ++++++++++++++++++ .../scanstations/scanstations_empty.svg | 1 + 5 files changed, 231 insertions(+) create mode 100644 src/components/scanstations/ScanStations.svelte create mode 100644 src/components/scanstations/ScanStationsEmptyState.svelte create mode 100644 src/components/scanstations/ScanStationsOverview.svelte create mode 100644 src/components/scanstations/scanstations_empty.svg diff --git a/src/App.svelte b/src/App.svelte index 3e30b8ad..251f083e 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -69,6 +69,7 @@ import Donations from "./components/donations/Donations.svelte"; import DonationDetail from "./components/donations/DonationDetail.svelte"; import GroupDetail from "./components/groups/GroupDetail.svelte"; +import ScanStationsOverview from "./components/scanstations/ScanStationsOverview.svelte"; store.init(); registerSW(); @@ -180,6 +181,12 @@ + + + + + + diff --git a/src/components/scanstations/ScanStations.svelte b/src/components/scanstations/ScanStations.svelte new file mode 100644 index 00000000..11905d88 --- /dev/null +++ b/src/components/scanstations/ScanStations.svelte @@ -0,0 +1,29 @@ + + +
+ + Scanstations + {#if store.state.jwtinfo.userdetails.permissions.includes('CONTACT:CREATE')} + + {/if} + + +
+ + diff --git a/src/components/scanstations/ScanStationsEmptyState.svelte b/src/components/scanstations/ScanStationsEmptyState.svelte new file mode 100644 index 00000000..39ced265 --- /dev/null +++ b/src/components/scanstations/ScanStationsEmptyState.svelte @@ -0,0 +1,17 @@ + + +
+

+ + You don't have any scanstations yet.
+ Add the first scanstation +

+
+ + diff --git a/src/components/scanstations/ScanStationsOverview.svelte b/src/components/scanstations/ScanStationsOverview.svelte new file mode 100644 index 00000000..9d27551d --- /dev/null +++ b/src/components/scanstations/ScanStationsOverview.svelte @@ -0,0 +1,177 @@ + + +{#if store.state.jwtinfo.userdetails.permissions.includes('TEAM:GET')} + {#await promise} + + {:then} + {#if current_contacts.length === 0} + + {:else} + +
+ + + + + + + + + + + {#each current_contacts as t} + {#if Object.values(t) + .toString() + .toLowerCase() + .includes(searchvalue)} + + + + + {#if active_deletes[t.id] === true} + + {:else} + + {/if} + + {/if} + {/each} + +
+ {$_('name')} + + {$_('groups')} + + {$_('address')} + + {$_('action')} +
+
+
+
+ {t.firstname} + {t.middlename || ''} + {t.lastname} +
+
+
+ 		+
+
+
+ {#if t.groups.length > 0} + {#each t.groups as g} + {#if g.responseType === 'RUNNERORGANIZATION'} + {g.name} + {:else} + {g.parentGroup.name} + > + {g.name} + {/if} + {/each} + {:else} + {$_('contact-is-not-a-member-in-any-group')} + {/if} +
+
+
+ 		+
+
+
+ {#if t.address.address1 !== null} + {t.address.address1}
+ {t.address.address2 || ''}
+ {t.address.postalcode} + {t.address.city} + {t.address.country} + {/if} +
+
+
+ 		+ + + + {$_('details')} + {#if store.state.jwtinfo.userdetails.permissions.includes('TEAM:DELETE')} + + {/if} +
+
+ {/if} + {:catch error} +
+ + {$_('general_promise_error')} + {error} + +
+ {/await} +{/if} diff --git a/src/components/scanstations/scanstations_empty.svg b/src/components/scanstations/scanstations_empty.svg new file mode 100644 index 00000000..e0b01c81 --- /dev/null +++ b/src/components/scanstations/scanstations_empty.svg @@ -0,0 +1 @@ + \ No newline at end of file From c53b579fca6f65b8d34ab63a8ec8321100e563bd Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Wed, 10 Mar 2021 16:51:57 +0100 Subject: [PATCH 02/31] Added basic table for scanstations ref #93 --- .../scanstations/ScanStationsOverview.svelte | 95 ++++++++----------- 1 file changed, 37 insertions(+), 58 deletions(-) diff --git a/src/components/scanstations/ScanStationsOverview.svelte b/src/components/scanstations/ScanStationsOverview.svelte index 9d27551d..fc5e8a0a 100644 --- a/src/components/scanstations/ScanStationsOverview.svelte +++ b/src/components/scanstations/ScanStationsOverview.svelte @@ -1,29 +1,29 @@ -{#if store.state.jwtinfo.userdetails.permissions.includes('TEAM:GET')} +{#if store.state.jwtinfo.userdetails.permissions.includes('STATION:GET')} {#await promise} {:then} - {#if current_contacts.length === 0} + {#if current_stations.length === 0} {:else} - {$_('name')} + Description - {$_('groups')} + Track - {$_('address')} + Enabled {$_('action')} @@ -58,19 +58,17 @@ - {#each current_contacts as t} - {#if Object.values(t) + {#each current_stations as s} + {#if Object.values(s) .toString() .toLowerCase() .includes(searchvalue)} - +
- {t.firstname} - {t.middlename || ''} - {t.lastname} + {s.description}
@@ -79,23 +77,9 @@
- {#if t.groups.length > 0} - {#each t.groups as g} - {#if g.responseType === 'RUNNERORGANIZATION'} - {g.name} - {:else} - {g.parentGroup.name} - > - {g.name} - {/if} - {/each} - {:else} - {$_('contact-is-not-a-member-in-any-group')} - {/if} + {s.track.name || s.track.distance + "m"}
@@ -104,41 +88,36 @@
- {#if t.address.address1 !== null} - {t.address.address1}
- {t.address.address2 || ''}
- {t.address.postalcode} - {t.address.city} - {t.address.country} - {/if} + {s.enabled.toString()}
- {#if active_deletes[t.id] === true} + {#if active_deletes[s.id] === true} @@ -147,12 +126,12 @@ {$_('details')} - {#if store.state.jwtinfo.userdetails.permissions.includes('TEAM:DELETE')} + {#if store.state.jwtinfo.userdetails.permissions.includes('STATION:DELETE')} From 5e417f0714c3aa0189d9a7148d81d48ca922802b Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Wed, 10 Mar 2021 16:52:08 +0100 Subject: [PATCH 03/31] Fixed nameing ref #93 --- src/components/scanstations/ScanStationsOverview.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/scanstations/ScanStationsOverview.svelte b/src/components/scanstations/ScanStationsOverview.svelte index fc5e8a0a..b4831950 100644 --- a/src/components/scanstations/ScanStationsOverview.svelte +++ b/src/components/scanstations/ScanStationsOverview.svelte @@ -8,7 +8,7 @@ } ); import store from "../../store"; - import ContactsEmptyState from "./ScanStationsEmptyState.svelte"; + import ScanStationsEmptyState from "./ScanStationsEmptyState.svelte"; $: searchvalue = ""; $: active_deletes = []; export let current_stations = []; @@ -24,7 +24,7 @@ {:then} {#if current_stations.length === 0} - + {:else} Date: Wed, 10 Mar 2021 17:05:59 +0100 Subject: [PATCH 04/31] Fixed routing ref #93 --- src/App.svelte | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/App.svelte b/src/App.svelte index 251f083e..8d2eb92b 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -70,6 +70,7 @@ import DonationDetail from "./components/donations/DonationDetail.svelte"; import GroupDetail from "./components/groups/GroupDetail.svelte"; import ScanStationsOverview from "./components/scanstations/ScanStationsOverview.svelte"; +import ScanStations from "./components/scanstations/ScanStations.svelte"; store.init(); registerSW(); @@ -183,7 +184,7 @@ import ScanStationsOverview from "./components/scanstations/ScanStationsOverview - + From e45f8fa9efabcb18f69577a368235ee568dc16cb Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Wed, 10 Mar 2021 17:06:22 +0100 Subject: [PATCH 05/31] You can now add scanstations ref #93 --- src/components/scanstations/ScanStationsEmptyState.svelte | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/scanstations/ScanStationsEmptyState.svelte b/src/components/scanstations/ScanStationsEmptyState.svelte index 39ced265..72aa4bdc 100644 --- a/src/components/scanstations/ScanStationsEmptyState.svelte +++ b/src/components/scanstations/ScanStationsEmptyState.svelte @@ -1,9 +1,10 @@
@@ -14,4 +15,4 @@

- + From 9ee768551f0d617257452f7a89992f25927de02a Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Wed, 10 Mar 2021 17:10:51 +0100 Subject: [PATCH 06/31] Basic scanstation creation ref #93 --- .../scanstations/AddScanStationModal.svelte | 187 ++++++++++++++++++ 1 file changed, 187 insertions(+) create mode 100644 src/components/scanstations/AddScanStationModal.svelte diff --git a/src/components/scanstations/AddScanStationModal.svelte b/src/components/scanstations/AddScanStationModal.svelte new file mode 100644 index 00000000..3b628584 --- /dev/null +++ b/src/components/scanstations/AddScanStationModal.svelte @@ -0,0 +1,187 @@ + + +{#if modal_open} +
{ + modal_open = false; + }}> +
+ +
+{/if} From 83e782c7c567d3747eb4e0a4313f6e7de6f2355f Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Wed, 10 Mar 2021 17:16:14 +0100 Subject: [PATCH 07/31] Finished scanstationmodal (without i18n) ref #93 --- .../scanstations/AddScanStationModal.svelte | 39 +++++++++++-------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/src/components/scanstations/AddScanStationModal.svelte b/src/components/scanstations/AddScanStationModal.svelte index 3b628584..f340388a 100644 --- a/src/components/scanstations/AddScanStationModal.svelte +++ b/src/components/scanstations/AddScanStationModal.svelte @@ -48,8 +48,9 @@ ScanStationService.scanStationControllerPost(postdata) .then((result) => { description = ""; - track = null; + track = tracks[0].id; enabled = true; + modal_open = false; // Toastify({ text: "Scanstation added", @@ -114,7 +115,8 @@

- Please provide the required information to create a new scanstation + Please provide the required information to create a new + scanstation

@@ -127,9 +129,7 @@ bind:value={track} class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2"> {#each tracks as t} - + {/each}
@@ -146,19 +146,24 @@ name="description" class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2" />
- + for="enabled" + class="ml-1 font-medium text-gray-700">Enabled +
+

+ { + enabled = !enabled; + }} + name="enabled" + type="checkbox" + checked={enabled} + class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300 rounded" /> + This scanstation is {#if enabled}enabled{:else}disabled{/if} +

+ From 85fa9d942ea8e8d636509bf0db79b56f4c1a20b8 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Wed, 10 Mar 2021 17:16:50 +0100 Subject: [PATCH 08/31] Finished scanstations base view ref #93 --- src/components/scanstations/ScanStations.svelte | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/scanstations/ScanStations.svelte b/src/components/scanstations/ScanStations.svelte index 11905d88..f1518604 100644 --- a/src/components/scanstations/ScanStations.svelte +++ b/src/components/scanstations/ScanStations.svelte @@ -1,16 +1,16 @@
Scanstations - {#if store.state.jwtinfo.userdetails.permissions.includes('CONTACT:CREATE')} + {#if store.state.jwtinfo.userdetails.permissions.includes('STATION:CREATE')} {/if} - +
- +{#if store.state.jwtinfo.userdetails.permissions.includes('STATION:CREATE')} + +{/if} From 773fbfc579014dcf67c87b43ab0a0d9d11ea23d6 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Wed, 10 Mar 2021 17:18:45 +0100 Subject: [PATCH 09/31] Changed row order ref #93 --- .../scanstations/ScanStationsOverview.svelte | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/scanstations/ScanStationsOverview.svelte b/src/components/scanstations/ScanStationsOverview.svelte index b4831950..1d158768 100644 --- a/src/components/scanstations/ScanStationsOverview.svelte +++ b/src/components/scanstations/ScanStationsOverview.svelte @@ -40,12 +40,12 @@ - Description + Track - Track + Description
- {s.description} + {s.track.name || s.track.distance + "m"}
@@ -77,9 +79,7 @@
- {s.track.name || s.track.distance + "m"} + {s.description}
From 9f754ef0e98ab78548391796db96e69b15fcd20e Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Wed, 10 Mar 2021 17:24:51 +0100 Subject: [PATCH 10/31] Added station deletion confirmation dialog ref #93 --- .../ConfirmScanStationDeletion.svelte | 92 +++++++++++++++++++ .../scanstations/ScanStationsOverview.svelte | 42 +++++---- 2 files changed, 118 insertions(+), 16 deletions(-) create mode 100644 src/components/scanstations/ConfirmScanStationDeletion.svelte diff --git a/src/components/scanstations/ConfirmScanStationDeletion.svelte b/src/components/scanstations/ConfirmScanStationDeletion.svelte new file mode 100644 index 00000000..f69a059f --- /dev/null +++ b/src/components/scanstations/ConfirmScanStationDeletion.svelte @@ -0,0 +1,92 @@ + + +{#if modal_open} +
+
+ +
+{/if} diff --git a/src/components/scanstations/ScanStationsOverview.svelte b/src/components/scanstations/ScanStationsOverview.svelte index 1d158768..8e02afa0 100644 --- a/src/components/scanstations/ScanStationsOverview.svelte +++ b/src/components/scanstations/ScanStationsOverview.svelte @@ -9,11 +9,21 @@ ); import store from "../../store"; import ScanStationsEmptyState from "./ScanStationsEmptyState.svelte"; +import ConfirmScanStationDeletion from "./ConfirmScanStationDeletion.svelte"; $: searchvalue = ""; $: active_deletes = []; + let delete_station = {}; + let modal_open = false; export let current_stations = []; + { + modal_open = false; + active_deletes[event.detail.id] = false; + }} + bind:modal_open + bind:delete_station /> {#if store.state.jwtinfo.userdetails.permissions.includes('STATION:GET')} {#await promise}
{$_('cancel-delete')} From a3daa2d24f5ed76fbde5d073360b2ca0a98fa9ac Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Wed, 10 Mar 2021 17:38:56 +0100 Subject: [PATCH 11/31] Now routing scan station detail ref #93 --- src/App.svelte | 5 ++++- src/components/scanstations/ScanStationsOverview.svelte | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/App.svelte b/src/App.svelte index 8d2eb92b..9871981e 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -71,6 +71,7 @@ import GroupDetail from "./components/groups/GroupDetail.svelte"; import ScanStationsOverview from "./components/scanstations/ScanStationsOverview.svelte"; import ScanStations from "./components/scanstations/ScanStations.svelte"; +import ScanStationDetail from "./components/scanstations/ScanStationDetail.svelte"; store.init(); registerSW(); @@ -186,7 +187,9 @@ import ScanStations from "./components/scanstations/ScanStations.svelte"; - + + + diff --git a/src/components/scanstations/ScanStationsOverview.svelte b/src/components/scanstations/ScanStationsOverview.svelte index 8e02afa0..dc987f4e 100644 --- a/src/components/scanstations/ScanStationsOverview.svelte +++ b/src/components/scanstations/ScanStationsOverview.svelte @@ -136,7 +136,7 @@ import ConfirmScanStationDeletion from "./ConfirmScanStationDeletion.svelte"; {$_('details')} {#if store.state.jwtinfo.userdetails.permissions.includes('STATION:DELETE')} + + {/if} + {#if !delete_triggered} + + {/if} + {/if} + {#if !delete_triggered} + + {/if} + +
+ +
+ + +
+
+ + +
+
+ +
+

+ { + editable.enabled = !editable.enabled; + }} + name="enabled" + type="checkbox" + checked={editable.enabled} + class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300 rounded" /> + This scanstation is + {#if editable.enabled}enabled{:else}disabled{/if} +

+
+ +{:catch error} + +{/await} From 7ff1d5007935946423d49eb559cb9e15f7dbb023 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Wed, 10 Mar 2021 17:43:59 +0100 Subject: [PATCH 13/31] Spelling+Formatting ref #93 --- .../scanstations/AddScanStationModal.svelte | 2 +- .../scanstations/ScanStationsOverview.svelte | 39 ++++++++++--------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/src/components/scanstations/AddScanStationModal.svelte b/src/components/scanstations/AddScanStationModal.svelte index f340388a..3fd61824 100644 --- a/src/components/scanstations/AddScanStationModal.svelte +++ b/src/components/scanstations/AddScanStationModal.svelte @@ -123,7 +123,7 @@
+ class="block text-sm font-medium text-gray-700">Track + class="ml-1 font-medium text-gray-700">{$_('enabled')}

- This scanstation is {#if enabled}enabled{:else}disabled{/if} + {$_('this-scanstation-is')} {#if enabled}{$_('enabled')}{:else}{$_('disabled')}{/if}

diff --git a/src/components/scanstations/ConfirmScanStationDeletion.svelte b/src/components/scanstations/ConfirmScanStationDeletion.svelte index f69a059f..9dbd8b8e 100644 --- a/src/components/scanstations/ConfirmScanStationDeletion.svelte +++ b/src/components/scanstations/ConfirmScanStationDeletion.svelte @@ -19,7 +19,7 @@ ) .then((resp) => { Toastify({ - text: "Station deleted", + text: $_('station-deleted'), duration: 500, backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)", }).showToast(); @@ -66,7 +66,7 @@ 'do-you-want-to-delete-this-donor-with-all-related-donations' )}
- All associated scans will get deleted as well + {$_('all-associated-scans-will-get-deleted-as-well')}

@@ -77,13 +77,13 @@ on:click={deleteStation} type="button" class="w-full inline-flex 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"> - Confirm, delete station with all scans + {$_('confirm-delete-station-with-all-scans')} diff --git a/src/components/scanstations/ScanStationDetail.svelte b/src/components/scanstations/ScanStationDetail.svelte index 44f10a6c..f8585749 100644 --- a/src/components/scanstations/ScanStationDetail.svelte +++ b/src/components/scanstations/ScanStationDetail.svelte @@ -4,8 +4,7 @@ import { ScanStationService, TrackService } from "@odit/lfk-client-js"; import Toastify from "toastify-js"; import PromiseError from "../base/PromiseError.svelte"; - import { edit } from "marked/src/helpers"; -import ConfirmScanStationDeletion from "./ConfirmScanStationDeletion.svelte"; + import ConfirmScanStationDeletion from "./ConfirmScanStationDeletion.svelte"; let data_loaded = false; let modal_open; let delete_station; @@ -32,7 +31,7 @@ import ConfirmScanStationDeletion from "./ConfirmScanStationDeletion.svelte"; function submit() { if (data_loaded === true && save_enabled) { Toastify({ - text: "Station is being updated", + text: $_('station-is-being-updated'), duration: 2500, }).showToast(); ScanStationService.scanStationControllerPut(original_data.id, editable) @@ -40,7 +39,7 @@ import ConfirmScanStationDeletion from "./ConfirmScanStationDeletion.svelte"; Object.assign(original_data, editable); original_data = original_data; Toastify({ - text: "Updated station", + text: $_('updated-station'), duration: 2500, backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)", }).showToast(); @@ -53,7 +52,7 @@ import ConfirmScanStationDeletion from "./ConfirmScanStationDeletion.svelte"; ScanStationService.scanStationControllerRemove(original_data.id, false) .then((resp) => { Toastify({ - text: "Station deleted", + text: $_('station-deleted'), duration: 500, backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)", }).showToast(); @@ -68,7 +67,7 @@ import ConfirmScanStationDeletion from "./ConfirmScanStationDeletion.svelte"; {#await promise} - Loading station details + {$_('loading-station-details')} {:then}
@@ -86,7 +85,7 @@ import ConfirmScanStationDeletion from "./ConfirmScanStationDeletion.svelte"; d="M2 22a8 8 0 1 1 16 0H2zm8-9c-3.315 0-6-2.685-6-6s2.685-6 6-6 6 2.685 6 6-2.685 6-6 6zm10 4h4v2h-4v-2zm-3-5h7v2h-7v-2zm2-5h5v2h-5V7z" />
  • - Scanstation{$_('scanstation')}Delete - station + 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">{$_('delete-station')} {/if} {/if} {#if !delete_triggered} @@ -161,10 +159,10 @@ import ConfirmScanStationDeletion from "./ConfirmScanStationDeletion.svelte";
    + class="font-medium text-gray-700">{$_('description')} + class="ml-1 font-medium text-gray-700">{$_('enabled')}

    - This scanstation is - {#if editable.enabled}enabled{:else}disabled{/if} + {$_('this-scanstation-is')} + {#if editable.enabled}{$_('enabled')}{:else}{$_('disabled')}{/if}

    • diff --git a/src/components/scanstations/ScanStations.svelte b/src/components/scanstations/ScanStations.svelte index f1518604..882f03d3 100644 --- a/src/components/scanstations/ScanStations.svelte +++ b/src/components/scanstations/ScanStations.svelte @@ -9,7 +9,7 @@
    - Scanstations + {$_('scanstations')} {#if store.state.jwtinfo.userdetails.permissions.includes('STATION:CREATE')} {/if} diff --git a/src/components/scanstations/ScanStationsEmptyState.svelte b/src/components/scanstations/ScanStationsEmptyState.svelte index 72aa4bdc..3d34d5b5 100644 --- a/src/components/scanstations/ScanStationsEmptyState.svelte +++ b/src/components/scanstations/ScanStationsEmptyState.svelte @@ -1,7 +1,6 @@ + +{#if copy_modal_open} + {#if valueCopy != null} + + {/if} +
    +
    + +
    +{/if} diff --git a/src/components/scanstations/ScanStations.svelte b/src/components/scanstations/ScanStations.svelte index 882f03d3..74b636af 100644 --- a/src/components/scanstations/ScanStations.svelte +++ b/src/components/scanstations/ScanStations.svelte @@ -2,8 +2,11 @@ import { _ } from "svelte-i18n"; import store from "../../store"; import AddScanStationModal from "./AddScanStationModal.svelte"; +import CopyScanStationTokenModal from "./CopyScanStationTokenModal.svelte"; import ScanStationsOverview from "./ScanStationsOverview.svelte"; export let modal_open = false; + export let copy_modal_open = false; + export let new_station = {}; let current_stations = []; @@ -21,9 +24,10 @@ {/if} - +
    {#if store.state.jwtinfo.userdetails.permissions.includes('STATION:CREATE')} - + + {/if} diff --git a/src/components/scanstations/ScanStationsEmptyState.svelte b/src/components/scanstations/ScanStationsEmptyState.svelte index 3d34d5b5..5a1baec6 100644 --- a/src/components/scanstations/ScanStationsEmptyState.svelte +++ b/src/components/scanstations/ScanStationsEmptyState.svelte @@ -1,8 +1,11 @@ @@ -14,4 +17,5 @@ import AddScanStationModal from "./AddScanStationModal.svelte";

    - + + \ No newline at end of file From 1aa2b3b065816f82c85b5320261a10b9c4d1879c Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Wed, 10 Mar 2021 19:57:36 +0100 Subject: [PATCH 22/31] =?UTF-8?q?Added=20new=20translation=20keys=20?= =?UTF-8?q?=F0=9F=8C=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ref #93 --- .../CopyScanStationTokenModal.svelte | 15 +- src/locales/en.json | 668 +++++++++--------- 2 files changed, 343 insertions(+), 340 deletions(-) diff --git a/src/components/scanstations/CopyScanStationTokenModal.svelte b/src/components/scanstations/CopyScanStationTokenModal.svelte index 7ef8d3e1..d227f8aa 100644 --- a/src/components/scanstations/CopyScanStationTokenModal.svelte +++ b/src/components/scanstations/CopyScanStationTokenModal.svelte @@ -1,8 +1,6 @@