From fac059f02cae84261443ee95448ec8db06dd755a Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Wed, 24 Mar 2021 16:58:06 +0100 Subject: [PATCH] Now w/working editing ref #94 --- src/components/cards/CardDetailModal.svelte | 42 +++++++++++---------- src/locales/de.json | 4 +- src/locales/en.json | 4 +- 3 files changed, 29 insertions(+), 21 deletions(-) diff --git a/src/components/cards/CardDetailModal.svelte b/src/components/cards/CardDetailModal.svelte index feade63b..77d4128d 100644 --- a/src/components/cards/CardDetailModal.svelte +++ b/src/components/cards/CardDetailModal.svelte @@ -2,10 +2,7 @@ import { _ } from "svelte-i18n"; import { clickOutside } from "../base/outsideclick"; import { focusTrap } from "svelte-focus-trap"; - import { - RunnerCardService, - RunnerService, - } from "@odit/lfk-client-js"; + import { RunnerCardService, RunnerService } from "@odit/lfk-client-js"; import Select from "svelte-select"; import Toastify from "toastify-js"; export let edit_modal_open; @@ -22,7 +19,7 @@ $: runner = {}; $: runners = []; $: editable = {}; - $: original_date = {}; + $: original_data = {}; $: enabled = true; $: processed_last_submit = true; RunnerService.runnerControllerGetAll().then((val) => { @@ -31,12 +28,17 @@ }); }); RunnerCardService.runnerCardControllerGetOne(edit_card_id).then((val) => { - runner = Object.assign({ runner }, {label: getRunnerLabel(val.runner), value: val.runner}); + runner = Object.assign( + { runner }, + { label: getRunnerLabel(val.runner), value: val.runner } + ); val.runner = val.runner?.id; editable = Object.assign(editable, val); - original_date = Object.assign(original_date, val); + original_data = Object.assign(original_data, val); }); - $: createbtnenabled = !(JSON.stringify(editable) === JSON.stringify(original_date)); + $: createbtnenabled = !( + JSON.stringify(editable) === JSON.stringify(original_data) + ); (() => { document.onkeydown = (e) => { e = e || window.event; @@ -55,24 +57,24 @@ if (processed_last_submit === true) { processed_last_submit = false; const toast = Toastify({ - text: $_("adding-card"), + text: $_("updating-card"), duration: -1, }).showToast(); - let postdata = { - runner, - enabled, - }; - RunnerCardService.runnerCardControllerPost(postdata) + RunnerCardService.runnerCardControllerPut(original_data.id, editable) .then((result) => { - runner = 0; + runner = {}; + editable = {}; + original_data = {}; edit_modal_open = false; // Toastify({ - text: $_("card-added"), + text: $_("card-updated"), duration: 500, backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)", - }).showToast(); - current_cards.push(result); + }).showToast(); + current_cards[ + current_cards.findIndex((c) => c.id === edit_card_id) + ] = result; current_cards = current_cards; }) .catch((err) => { @@ -162,7 +164,9 @@ checked={editable.enabled} class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300 rounded" /> {$_('this-card-is')} - {#if editable.enabled}{$_('enabled')}{:else}{$_('disabled')}{/if} + {#if editable.enabled} + {$_('enabled')} + {:else}{$_('disabled')}{/if}

diff --git a/src/locales/de.json b/src/locales/de.json index c1ac1637..3f0b6904 100644 --- a/src/locales/de.json +++ b/src/locales/de.json @@ -400,5 +400,7 @@ "creating-blanco-cards": "Erstelle Blankokarten", "created-blanco-cards": "Blankokarten wurden erstellt", "edit-a-card": "Läuferkarte bearbeiten", - "this-card-is": "Diese Karte ist" + "this-card-is": "Diese Karte ist", + "updating-card": "Karte wird aktualisiert", + "card-updated": "Karte aktualisiert" } diff --git a/src/locales/en.json b/src/locales/en.json index 01824685..7d8dad39 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -401,5 +401,7 @@ "created-blanco-cards": "Created blanco cards", "edit-a-card": "Edit a card", "this-card-is": "This card is", - "update-card": "Update Card" + "update-card": "Update Card", + "updating-card": "Updating card", + "card-updated": "Card updated" }