From 5a2172bb9b878c77c4f09e65237ce1a179c95b8c Mon Sep 17 00:00:00 2001
From: Nicolai Ort <info@nicolai-ort.com>
Date: Wed, 17 Mar 2021 11:09:32 +0100
Subject: [PATCH] Now checking selectables for not being null

ref #91
---
 src/components/donations/DonationDetail.svelte | 7 ++++++-
 src/components/runners/RunnerDetail.svelte     | 2 +-
 src/components/teams/TeamDetail.svelte         | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/donations/DonationDetail.svelte b/src/components/donations/DonationDetail.svelte
index a5df950b..d5081d00 100644
--- a/src/components/donations/DonationDetail.svelte
+++ b/src/components/donations/DonationDetail.svelte
@@ -18,13 +18,18 @@
   $: current_runners = [];
   $: amount_input = 0;
   $: is_amount_valid = amount_input > 0;
+  $: is_everything_set =
+    editable.donor != null &&
+    ((original_data.responseType == "DISTANCEDONATION" &&
+      editable?.runner != null) ||
+      original_data.responseType !== "DISTANCEDONATION");
   $: changes_performed =
     !(JSON.stringify(original_data) === JSON.stringify(editable)) ||
     (original_data.responseType == "DISTANCEDONATION" &&
       !(Math.floor(amount_input * 100) === original_data.amountPerDistance)) ||
     (original_data.responseType !== "DISTANCEDONATION" &&
       !(Math.floor(amount_input * 100) === original_data.amount));
-  $: save_enabled = changes_performed && is_amount_valid;
+  $: save_enabled = changes_performed && is_amount_valid && is_everything_set;
   const donor_promise = DonorService.donorControllerGetAll().then((val) => {
     current_donors = val;
   });
diff --git a/src/components/runners/RunnerDetail.svelte b/src/components/runners/RunnerDetail.svelte
index c842a2e6..2fa6b275 100644
--- a/src/components/runners/RunnerDetail.svelte
+++ b/src/components/runners/RunnerDetail.svelte
@@ -26,7 +26,7 @@
   $: isFirstnameValid = editable.firstname !== "";
   $: isLastnameValid = editable.lastname !== "";
   $: save_enabled =
-    changes_performed && isFirstnameValid && isLastnameValid && isEmailValid;
+    changes_performed && isFirstnameValid && isLastnameValid && isEmailValid && (editable.group != null);
   runner_promise.then((data) => {
     data_loaded = true;
     original_data_pdf = Object.assign(original_data_pdf, data);
diff --git a/src/components/teams/TeamDetail.svelte b/src/components/teams/TeamDetail.svelte
index 3c1ea30f..1491ce98 100644
--- a/src/components/teams/TeamDetail.svelte
+++ b/src/components/teams/TeamDetail.svelte
@@ -22,7 +22,7 @@
   export let params;
   export let import_modal_open = false;
   $: delete_triggered = false;
-  $: save_enabled = !data_changed;
+  $: save_enabled = !data_changed && (teamdata.parentGroup != null);
   $: data_loaded = false;
   $: data_changed = JSON.stringify(teamdata) === JSON.stringify(original);
   $: sponsoring_contracts_download_open = false;