Merge pull request 'Make dropdowns (selects) searchable feature/91-searchable_dropdowns' (#97) from feature/91-searchable_dropdowns into dev

Reviewed-on: #97

src/components/donations/AddDonationModal.svelte

@@ -7,9 +7,15 @@
     DonorService,
     RunnerService,
   } from "@odit/lfk-client-js";
+  import Select from "svelte-select";
   import Toastify from "toastify-js";
   export let modal_open;
   export let current_donations;
+  const getDonorLabel = (option) =>
+    option.firstname + " " + (option.middlename || "") + " " + option.lastname;
+  const filterDonors = (label, filterText, option) =>
+    label.toLowerCase().includes(filterText.toLowerCase()) ||
+    option.id.toString().startsWith(filterText.toLowerCase());
   function focus(el) {
     el.focus();
   }
@@ -158,7 +164,7 @@
         class="hidden sm:inline-block sm:align-middle sm:h-screen"
         aria-hidden="true">&#8203;</span>
       <div
-        class="inline-block align-bottom bg-white rounded-lg text-left overflow-hidden shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full"
+        class="inline-block align-bottom bg-white rounded-lg text-left shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full"
         role="dialog"
         aria-modal="true"
         aria-labelledby="modal-headline">
@@ -179,7 +185,9 @@
             <div class="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
               <h3 class="text-lg leading-6 font-medium text-gray-900">
                 <!-- TODO: -->
-                {#if is_fixed}{$_('create-a-new-fixed-donation')}{:else}{$_('create-a-new-distance-donation')}{/if}
+                {#if is_fixed}
+                  {$_('create-a-new-fixed-donation')}
+                {:else}{$_('create-a-new-distance-donation')}{/if}
               </h3>
               <label class="content-center align-middle object-center">
                 <span
@@ -203,41 +211,43 @@
                   <label
                     for="donor"
                     class="block text-sm font-medium text-gray-700">{$_('donor')}</label>
-                  <select
+                  <Select
-                    bind:value={donor}
+                    containerClasses="rounded-l-md 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"
-                    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">
+                    getSelectionLabel={(option) => getDonorLabel(option)}
-                    {#each donors as d}
+                    getOptionLabel={(option) => getDonorLabel(option)}
-                      <option value={d.id}>
+                    itemFilter={(label, filterText, option) => filterDonors(label, filterText, option)}
-                        {d.firstname}
+                    items={donors}
-                        {d.middlename || ''}
+                    showChevron={true}
-                        {d.lastname}
+                    placeholder={$_('search-for-donor-name-or-id')}
-                      </option>
+                    noOptionsMessage={$_('no-donors-found')}
-                    {/each}
+                    on:select={(selectedValue) => (donor = selectedValue.detail.id)}
-                  </select>
+                    on:clear={()=>(donors = null)} />
                 </div>
                 {#if !is_fixed}
                   <div class="col-span-6">
                     <label
                       for="donor"
                       class="block text-sm font-medium text-gray-700">{$_('runner')}</label>
-                    <select
+                    <Select
-                      bind:value={runner}
+                      containerClasses="rounded-l-md 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"
-                      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">
+                      getSelectionLabel={(option) => getDonorLabel(option)}
-                      {#each runners as r}
+                      getOptionLabel={(option) => getDonorLabel(option)}
-                        <option value={r.id}>
+                      itemFilter={(label, filterText, option) => filterDonors(label, filterText, option)}
-                          {r.firstname}
+                      items={runners}
-                          {r.middlename || ''}
+                      showChevron={true}
-                          {r.lastname}
+                      placeholder={$_('search-for-runner-by-name-or-id')}
-                        </option>
+                      noOptionsMessage={$_('no-runners-found')}
-                      {/each}
+                      on:select={(selectedValue) => (runner = selectedValue.detail.id)}
-                    </select>
+                      on:clear={()=>(runner = null)} />
                   </div>
                 {/if}
                 <div class="col-span-6">
                   <label
                     for="donation_amount_eur"
                     class="block text-sm font-medium text-gray-700">
-                    {#if !is_fixed}{$_('amount-per-kilometer')}{:else}{$_('donation-amount')}{/if}</label>
+                    {#if !is_fixed}
+                      {$_('amount-per-kilometer')}
+                    {:else}{$_('donation-amount')}{/if}</label>
                   <div class="mt-1 flex rounded-md shadow-sm">
                     <input
                       autocomplete="off"

src/components/donations/DonationDetail.svelte

@@ -8,23 +8,28 @@
   } from "@odit/lfk-client-js";
   import Toastify from "toastify-js";
   import PromiseError from "../base/PromiseError.svelte";
+  import Select from "svelte-select";
   let data_loaded = false;
   export let params;
   $: delete_triggered = false;
   $: original_data = {};
-  $: original_comparison_string = "";
   $: editable = {};
   $: current_donors = [];
   $: 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 =
-    !(original_comparison_string === JSON.stringify(editable)) ||
+    !(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;
   });
@@ -37,15 +42,17 @@
     data_loaded = true;
     original_data = Object.assign(original_data, data);
     editable = Object.assign(editable, original_data);
-    editable.donor = data.donor.id;
     if (data.responseType == "DISTANCEDONATION") {
-      editable.runner = data.runner.id;
       amount_input = data.amountPerDistance / 100;
     } else {
       amount_input = data.amount / 100;
     }
-    original_comparison_string = JSON.stringify(editable);
   });
+  const getDonorLabel = (option) =>
+    option.firstname + " " + (option.middlename || "") + " " + option.lastname;
+  const filterDonors = (label, filterText, option) =>
+    label.toLowerCase().includes(filterText.toLowerCase()) ||
+    option.id.toString().startsWith(filterText.toLowerCase());
 
   function submit() {
     if (data_loaded === true && save_enabled) {
@@ -53,14 +60,18 @@
         text: "Donation is being updated",
         duration: 2500,
       }).showToast();
+      let postdata = {};
       if (original_data.responseType === "DISTANCEDONATION") {
         editable.amountPerDistance = Math.floor(amount_input * 100);
+        postdata = Object.assign(postdata, editable);
+        postdata.runner = postdata.runner.id;
+        postdata.donor = postdata.donor.id;
         DonationService.donationControllerPutDistance(
           original_data.id,
-          editable
+          postdata
         )
           .then((resp) => {
-            Object.assign(original_data, resp);
+            Object.assign(original_data, editable);
             original_data = original_data;
             Toastify({
               text: "updated donation",
@@ -71,7 +82,9 @@
           .catch((err) => {});
       } else {
         editable.amount = Math.floor(amount_input * 100);
-        DonationService.donationControllerPutFixed(original_data.id, editable)
+        postdata = Object.assign(postdata, editable);
+        postdata.donor = postdata.donor.id;
+        DonationService.donationControllerPutFixed(original_data.id, postdata)
           .then((resp) => {
             Object.assign(original_data, editable);
             original_data = original_data;
@@ -192,7 +205,8 @@
     </div>
     <!--  -->
     <div>
-      <span class="font-medium text-gray-700">{$_('total-donation-amount')}:</span>
+      <span
+        class="font-medium text-gray-700">{$_('total-donation-amount')}:</span>
       <span>{(editable.amount / 100)
           .toFixed(2)
           .toLocaleString('de-DE', { valute: 'EUR' })}€</span>
@@ -201,34 +215,34 @@
       <label
         for="donor"
         class="block  font-medium text-gray-700">{$_('donor')}</label>
-      <select
+      <Select
-        bind:value={editable.donor}
+        containerClasses="rounded-l-md 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"
-        class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm: border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2">
+        getSelectionLabel={(option) => getDonorLabel(option)}
-        {#each current_donors as d}
+        getOptionLabel={(option) => getDonorLabel(option)}
-          <option value={d.id}>
+        itemFilter={(label, filterText, option) => filterDonors(label, filterText, option)}
-            {d.firstname}
+        items={current_donors}
-            {d.middlename || ''}
+        showChevron={true}
-            {d.lastname}
+        placeholder={$_('search-for-donor-name-or-id')}
-          </option>
+        noOptionsMessage={$_('no-donors-found')}
-        {/each}
+        bind:selectedValue={editable.donor}
-      </select>
+        on:clear={() => (editable.donor = null)} />
     </div>
     {#if original_data.responseType == 'DISTANCEDONATION'}
       <div class=" w-full">
         <label
           for="donor"
           class="block  font-medium text-gray-700">{$_('runner')}</label>
-        <select
+        <Select
-          bind:value={editable.runner}
+          containerClasses="rounded-l-md 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"
-          class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm: border-gray-300 border bg-gray-50 text-gray-500 rounded-md p-2">
+          getSelectionLabel={(option) => getDonorLabel(option)}
-          {#each current_runners as r}
+          getOptionLabel={(option) => getDonorLabel(option)}
-            <option value={r.id}>
+          itemFilter={(label, filterText, option) => filterDonors(label, filterText, option)}
-              {r.firstname}
+          items={current_runners}
-              {r.middlename || ''}
+          showChevron={true}
-              {r.lastname}
+          placeholder={$_('search-for-runner-by-name-or-id')}
-            </option>
+          noOptionsMessage={$_('no-runners-found')}
-          {/each}
+          bind:selectedValue={editable.runner}
-        </select>
+          on:clear={() => (editable.runner = null)} />
       </div>
     {/if}
     <div class=" w-full">

src/components/groups/GroupPermissions.svelte

@@ -67,7 +67,6 @@ UserGroupService,
       delete p.responseType;
       grantedPermissions = grantedPermissions.concat([p]);
     });
-    console.log(grantedPermissions)
     grantedPermissions_initial = grantedPermissions;
   });
 </script>

src/components/orgs/OrgDetail.svelte

@@ -9,6 +9,7 @@
   import ConfirmOrgDeletion from "./ConfirmOrgDeletion.svelte";
   import ImportRunnerModal from "../runners/ImportRunnerModal.svelte";
   import PromiseError from "../base/PromiseError.svelte";
+  import Select from "svelte-select";
   $: delete_triggered = false;
   $: address_valid_or_none =
     (isAddress1Valid && iszipcodevalid && iscityvalid) ||
@@ -25,16 +26,12 @@
   $: iszipcodevalid = editable.address?.postalcode?.trim().length !== 0;
   $: iscityvalid = editable.address?.city?.trim().length !== 0;
   $: sponsoring_contracts_download_open = false;
-  
+  const getContactLabel = (option) =>
+    option.firstname + " " + (option.middlename || "") + " " + option.lastname;
   const promise = RunnerOrganizationService.runnerOrganizationControllerGetOne(
     params.orgid
   ).then((value) => {
     data_loaded = true;
-    if (value.contact) {
-      if (value.contact !== "null") {
-        value.contact = value.contact.id;
-      }
-    }
     value.address_checked = value.address.address1 !== null;
     if (value.address_checked === false) {
       value.address = {
@@ -57,8 +54,8 @@
   let delete_org = {};
   document.addEventListener("click", function (e) {
     if (
-      e.target.parentNode.parentNode.id != "sponsoring:dropdown" &&
+      e.target.parentNode?.parentNode?.id != "sponsoring:dropdown" &&
-      e.target.parentNode.parentNode.id != "sponsoring:dropdown:menu"
+      e.target.parentNode?.parentNode?.id != "sponsoring:dropdown:menu"
     ) {
       sponsoring_contracts_download_open = false;
     }
@@ -91,13 +88,14 @@
       if (postdata.address_checked === false) {
         postdata.address = null;
       }
-      postdata.contact = postdata.contact === "null" ? null : postdata.contact;
+      postdata.contact = postdata.contact?.id;
       RunnerOrganizationService.runnerOrganizationControllerPut(
         original_object.id,
         postdata
       )
         .then((resp) => {
-          original = JSON.stringify(editable);
+          original_object = Object.assign({}, editable);
+          original = JSON.stringify(original_object);
           Toastify({
             text: $_("updated-organization"),
             duration: 2500,
@@ -188,7 +186,17 @@
               aria-haspopup="true"
               aria-expanded="true">
               {$_('generate-sponsoring-contracts')}
-              <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" class="-mr-1 ml-2 h-5 w-5"><path fill="none" d="M0 0h24v24H0z"/><path fill="currentColor" d="M3 19h18v2H3v-2zm10-5.83l6.07-6.07 1.42 1.41L12 17 3.52 8.52l1.4-1.42L11 13.17V2h2v11.17z"/></svg>
+              <svg
+                xmlns="http://www.w3.org/2000/svg"
+                width="24"
+                height="24"
+                viewBox="0 0 24 24"
+                class="-mr-1 ml-2 h-5 w-5"><path
+                  fill="none"
+                  d="M0 0h24v24H0z" />
+                <path
+                  fill="currentColor"
+                  d="M3 19h18v2H3v-2zm10-5.83l6.07-6.07 1.42 1.41L12 17 3.52 8.52l1.4-1.42L11 13.17V2h2v11.17z" /></svg>
             </button>
           </div>
           {#if sponsoring_contracts_download_open}
@@ -349,19 +357,21 @@
       <label
         for="contact"
         class="font-medium text-gray-700">{$_('contact')}</label>
-      <select
+      <Select
-        name="contact"
+        containerClasses="rounded-l-md 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"
-        bind:value={editable.contact}
+        getSelectionLabel={(option) => getContactLabel(option)}
-        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">
+        getOptionLabel={(option) => getContactLabel(option)}
-        <option value="null">no contact</option>
+        itemFilter={(label, filterText, option) => label
-        {#each contacts as c}
+            .toLowerCase()
-          <option value={c.id}>
+            .includes(
-            {c.firstname}
+              filterText.toLowerCase()
-            {c.middlename || ''}
+            ) || option.id.toString().startsWith(filterText.toLowerCase())}
-            {c.lastname}
+        items={contacts}
-          </option>
+        showChevron={true}
-        {/each}
+        placeholder={$_('no-contact-selected')}
-      </select>
+        noOptionsMessage={$_('no-contact-found')}
+        bind:selectedValue={editable.contact}
+        on:clear={() => (editable.contact = null)} />
     </div>
     <!--  -->
     <div class="flex items-start mt-2">

src/components/orgs/OrgOverview.svelte

@@ -20,8 +20,8 @@
 
   document.addEventListener("click", function (e) {
     if (
-      e.target.parentNode.parentNode.id != "sponsoring:dropdown" &&
+      e.target.parentNode?.parentNode?.id != "sponsoring:dropdown" &&
-      e.target.parentNode.parentNode.id != "sponsoring:dropdown:menu"
+      e.target.parentNode?.parentNode?.id != "sponsoring:dropdown:menu"
     ) {
       sponsoring_contracts_download_open = false;
     }

src/components/runners/AddRunnerModal.svelte

@@ -10,6 +10,8 @@
   import isEmail from "validator/es/lib/isEmail";
   import isMobilePhone from "validator/es/lib/isMobilePhone";
   import Toastify from "toastify-js";
+  import Select from "svelte-select";
+  import AddDonationModal from "../donations/AddDonationModal.svelte";
   export let modal_open;
   export let current_runners;
   $: selected_team = undefined;
@@ -136,7 +138,7 @@
         class="hidden sm:inline-block sm:align-middle sm:h-screen"
         aria-hidden="true">&#8203;</span>
       <div
-        class="inline-block align-bottom bg-white rounded-lg text-left overflow-hidden shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full"
+        class="inline-block align-bottom bg-white rounded-lg text-left shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full"
         role="dialog"
         aria-modal="true"
         aria-labelledby="modal-headline">
@@ -206,7 +208,7 @@
                     class="block text-sm font-medium text-gray-700">{$_('last-name')}</label>
                   <input
                     autocomplete="off"
-                    placeholder="{$_('last-name')}"
+                    placeholder={$_('last-name')}
                     class:border-red-500={!isLastnameValid}
                     class:focus:border-red-500={!isLastnameValid}
                     class:focus:ring-red-500={!isLastnameValid}
@@ -226,21 +228,33 @@
                   <label
                     for="team"
                     class="block text-sm font-medium text-gray-700">{$_('team')}</label>
-                  <select
+                  <Select
-                    name="team"
+                    containerClasses="rounded-l-md 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"
-                    bind:value={selected_team}
+                    getSelectionLabel={(option) => {
-                    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">
+                      if (option.responseType == 'RUNNERORGANIZATION') {
-                    {#each teams as team}
+                        return option.name;
-                      <option value={team.id}>
+                      }
-                        {team.parentGroup.name}
+                      return `${option.parentGroup.name} &gt; ${option.name}`;
-                        &gt;
+                    }}
-                        {team.name}
+                    getOptionLabel={(option) => {
-                      </option>
+                      if (option.responseType == 'RUNNERORGANIZATION') {
-                    {/each}
+                        return option.name;
-                    {#each orgs as org}
+                      }
-                      <option value={org.id}>{org.name}</option>
+                      return `${option.parentGroup.name} &gt; ${option.name}`;
-                    {/each}
+                    }}
-                  </select>
+                    itemFilter={(label, filterText, option) => label
+                        .toLowerCase()
+                        .includes(
+                          filterText.toLowerCase()
+                        ) || option.id
+                        .toString()
+                        .startsWith(filterText.toLowerCase())}
+                    items={orgs.concat(teams)}
+                    showChevron={true}
+                    placeholder={$_('search-for-an-organization-or-team-by-name-or-id')}
+                    noOptionsMessage={$_('no-organization-or-team-found')}
+                    on:select={(selectedValue) => (selected_team = selectedValue.detail.id)}
+                    on:clear={() => (selected_team = null)} />
                 </div>
                 <div class="col-span-6">
                   <label
@@ -248,7 +262,7 @@
                     class="block text-sm font-medium text-gray-700">{$_('phone')}</label>
                   <input
                     autocomplete="off"
-                    placeholder="{$_('phone')}"
+                    placeholder={$_('phone')}
                     class:border-red-500={!isPhoneValidOrEmpty}
                     class:focus:border-red-500={!isPhoneValidOrEmpty}
                     class:focus:ring-red-500={!isPhoneValidOrEmpty}

src/components/runners/RunnerDetail.svelte

@@ -10,6 +10,7 @@
   import Toastify from "toastify-js";
   import PromiseError from "../base/PromiseError.svelte";
   import isEmail from "validator/es/lib/isEmail";
+  import Select from "svelte-select";
   let data_loaded = false;
   export let params;
   const runner_promise = RunnerService.runnerControllerGetOne(params.runnerid);
@@ -25,18 +26,17 @@
   $: 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);
     original_data = Object.assign(original_data, data);
-    original_data.group = original_data.group.id;
     editable = Object.assign(editable, original_data);
   });
   document.addEventListener("click", function (e) {
     if (
-      e.target.parentNode.parentNode.id != "sponsoring:dropdown" &&
+      e.target.parentNode?.parentNode?.id != "sponsoring:dropdown" &&
-      e.target.parentNode.parentNode.id != "sponsoring:dropdown:menu"
+      e.target.parentNode?.parentNode?.id != "sponsoring:dropdown:menu"
     ) {
       sponsoring_contracts_download_open = false;
     }
@@ -55,11 +55,13 @@
         text: $_("updating-runner"),
         duration: 2500,
       }).showToast();
-      RunnerService.runnerControllerPut(original_data.id, editable)
+      let postdata = {};
+      postdata = Object.assign(postdata, editable);
+      postdata.group = postdata.group.id;
+      RunnerService.runnerControllerPut(original_data.id, postdata)
         .then((resp) => {
           Object.assign(original_data, editable);
-          original_data = editable;
+          original_data = original_data;
-          Object.assign(original_data, editable);
           Toastify({
             text: $_("runner-updated"),
             duration: 2500,
@@ -206,7 +208,17 @@
                 aria-haspopup="true"
                 aria-expanded="true">
                 {$_('generate-sponsoring-contract')}
-                <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" class="-mr-1 ml-2 h-5 w-5"><path fill="none" d="M0 0h24v24H0z"/><path fill="currentColor" d="M3 19h18v2H3v-2zm10-5.83l6.07-6.07 1.42 1.41L12 17 3.52 8.52l1.4-1.42L11 13.17V2h2v11.17z"/></svg>
+                <svg
+                  xmlns="http://www.w3.org/2000/svg"
+                  width="24"
+                  height="24"
+                  viewBox="0 0 24 24"
+                  class="-mr-1 ml-2 h-5 w-5"><path
+                    fill="none"
+                    d="M0 0h24v24H0z" />
+                  <path
+                    fill="currentColor"
+                    d="M3 19h18v2H3v-2zm10-5.83l6.07-6.07 1.42 1.41L12 17 3.52 8.52l1.4-1.42L11 13.17V2h2v11.17z" /></svg>
               </button>
             </div>
             {#if sponsoring_contracts_download_open}
@@ -349,21 +361,31 @@
     </div>
     <div class="text-sm w-full">
       <span class="font-medium text-gray-700">{$_('group')}</span>
-      <select
+      <Select
-        bind:value={editable.group}
+        containerClasses="rounded-l-md 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"
-        name="team"
+        getSelectionLabel={(option) => {
-        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">
+          if (option.responseType == 'RUNNERORGANIZATION') {
-        {#each teams as team}
+            return option.name;
-          <option value={team.id}>
+          }
-            {team.parentGroup.name}
+          return `${option.parentGroup.name} &gt; ${option.name}`;
-            &gt;
+        }}
-            {team.name}
+        getOptionLabel={(option) => {
-          </option>
+          if (option.responseType == 'RUNNERORGANIZATION') {
-        {/each}
+            return option.name;
-        {#each orgs as org}
+          }
-          <option value={org.id}>{org.name}</option>
+          return `${option.parentGroup.name} &gt; ${option.name}`;
-        {/each}
+        }}
-      </select>
+        itemFilter={(label, filterText, option) => label
+            .toLowerCase()
+            .includes(
+              filterText.toLowerCase()
+            ) || option.id.toString().startsWith(filterText.toLowerCase())}
+        items={orgs.concat(orgs, teams)}
+        showChevron={true}
+        placeholder={$_('search-for-an-organization-or-team-by-name-or-id')}
+        noOptionsMessage={$_('no-organization-or-team-found')}
+        bind:selectedValue={editable.group}
+        on:clear={() => (editable.group = null)} />
     </div>
     <div class="text-sm w-full">
       <span class="font-medium text-gray-700">{$_('distance')}</span>

src/components/runners/RunnersOverview.svelte

@@ -33,8 +33,8 @@
     .concat(mappedteams);
   document.addEventListener("click", function (e) {
     if (
-      e.target.parentNode.parentNode.id != "sponsoring:dropdown" &&
+      e.target.parentNode?.parentNode?.id != "sponsoring:dropdown" &&
-      e.target.parentNode.parentNode.id != "sponsoring:dropdown:menu"
+      e.target.parentNode?.parentNode?.id != "sponsoring:dropdown:menu"
     ) {
       sponsoring_contracts_download_open = false;
     }

src/components/scanstations/AddScanStationModal.svelte

@@ -95,7 +95,7 @@
         class="hidden sm:inline-block sm:align-middle sm:h-screen"
         aria-hidden="true">&#8203;</span>
       <div
-        class="inline-block align-bottom bg-white rounded-lg text-left overflow-hidden shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full"
+        class="inline-block align-bottom bg-white rounded-lg text-left shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full"
         role="dialog"
         aria-modal="true"
         aria-labelledby="modal-headline">

src/components/teams/AddTeamModal.svelte

@@ -6,6 +6,7 @@
     RunnerOrganizationService,
     RunnerTeamService,
   } from "@odit/lfk-client-js";
+  import Select from "svelte-select";
   import Toastify from "toastify-js";
   export let modal_open;
   export let current_teams;
@@ -90,7 +91,7 @@
         class="hidden sm:inline-block sm:align-middle sm:h-screen"
         aria-hidden="true">&#8203;</span>
       <div
-        class="inline-block align-bottom bg-white rounded-lg text-left overflow-hidden shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full"
+        class="inline-block align-bottom bg-white rounded-lg text-left shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full"
         role="dialog"
         aria-modal="true"
         aria-labelledby="modal-headline">
@@ -145,13 +146,33 @@
                   <label
                     for="firstname"
                     class="block text-sm font-medium text-gray-700">{$_('organization')}</label>
-                  <select
+                  <Select
-                    bind:value={parentGroup}
+                    containerClasses="rounded-l-md 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"
-                    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">
+                    getSelectionLabel={(option) => {
-                    {#each orgs as t}
+                      return option.name;
-                      <option value={t.id}>{t.name}</option>
+                    }}
-                    {/each}
+                    getOptionLabel={(option) => {
-                  </select>
+                      return option.name;
+                    }}
+                    itemFilter={(label, filterText, option) => label
+                        .toLowerCase()
+                        .includes(
+                          filterText.toLowerCase()
+                        ) || option.id
+                        .toString()
+                        .startsWith(filterText.toLowerCase())}
+                    items={orgs}
+                    showChevron={true}
+                    placeholder={$_('search-for-an-organization-by-name-or-id')}
+                    noOptionsMessage={$_('no-organizations-found')}
+                    on:select={(selectedValue) => (parentGroup = selectedValue.detail.id)}
+                    on:clear={() => (parentGroup = null)} />
+                  {#if !parentGroup}
+                    <span
+                      class="flex items-center font-medium tracking-wide text-red-500 text-xs mt-1 ml-1">
+                      {$_('you-have-to-provide-an-organization')}
+                    </span>
+                  {/if}
                 </div>
               </div>
             </div>

src/components/teams/TeamDetail.svelte

@@ -7,6 +7,7 @@
   import { getLocaleFromNavigator, _ } from "svelte-i18n";
   import Toastify from "toastify-js";
   import store from "../../store";
+  import Select from "svelte-select";
   import ImportRunnerModal from "../runners/ImportRunnerModal.svelte";
   import PromiseError from "../base/PromiseError.svelte";
   import ConfirmTeamDeletion from "./ConfirmTeamDeletion.svelte";
@@ -21,20 +22,17 @@
   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;
   //
+  const getContactLabel = (option) =>
+    option.firstname + " " + (option.middlename || "") + " " + option.lastname;
   const promise = RunnerTeamService.runnerTeamControllerGetOne(
     params.teamid
   ).then((value) => {
     data_loaded = true;
-    if (value.contact) {
-      if (value.contact !== "null") {
-        value.contact = value.contact.id;
-      }
-    }
     teamdata = Object.assign(teamdata, value);
     original = Object.assign(original, value);
   });
@@ -46,8 +44,8 @@
   });
   document.addEventListener("click", function (e) {
     if (
-      e.target.parentNode.parentNode.id != "sponsoring:dropdown" &&
+      e.target.parentNode?.parentNode?.id != "sponsoring:dropdown" &&
-      e.target.parentNode.parentNode.id != "sponsoring:dropdown:menu"
+      e.target.parentNode?.parentNode?.id != "sponsoring:dropdown:menu"
     ) {
       sponsoring_contracts_download_open = false;
     }
@@ -73,15 +71,13 @@
         text: "updating team",
         duration: 2500,
       }).showToast();
-      teamdata.parentGroup = teamdata.parentGroup.id;
       let postdata = teamdata;
-      postdata.contact = postdata.contact === "null" ? null : postdata.contact;
+      postdata.parentGroup = teamdata.parentGroup.id;
+      postdata.contact = teamdata.contact?.id;
       RunnerTeamService.runnerTeamControllerPut(original.id, postdata)
         .then((resp) => {
           Object.assign(original, teamdata);
-          original = teamdata;
+          original = original;
-          Object.assign(original, teamdata);
-          //
           Toastify({
             text: "updated team",
             duration: 2500,
@@ -170,7 +166,17 @@
               aria-haspopup="true"
               aria-expanded="true">
               {$_('generate-sponsoring-contracts')}
-              <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" class="-mr-1 ml-2 h-5 w-5"><path fill="none" d="M0 0h24v24H0z"/><path fill="currentColor" d="M3 19h18v2H3v-2zm10-5.83l6.07-6.07 1.42 1.41L12 17 3.52 8.52l1.4-1.42L11 13.17V2h2v11.17z"/></svg>
+              <svg
+                xmlns="http://www.w3.org/2000/svg"
+                width="24"
+                height="24"
+                viewBox="0 0 24 24"
+                class="-mr-1 ml-2 h-5 w-5"><path
+                  fill="none"
+                  d="M0 0h24v24H0z" />
+                <path
+                  fill="currentColor"
+                  d="M3 19h18v2H3v-2zm10-5.83l6.07-6.07 1.42 1.41L12 17 3.52 8.52l1.4-1.42L11 13.17V2h2v11.17z" /></svg>
             </button>
           </div>
           {#if sponsoring_contracts_download_open}
@@ -333,32 +339,45 @@
       <label
         for="contact"
         class="font-medium text-gray-700">{$_('contact')}</label>
-      <select
+      <Select
-        name="contact"
+        containerClasses="rounded-l-md 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"
-        bind:value={teamdata.contact}
+        getSelectionLabel={(option) => getContactLabel(option)}
-        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">
+        getOptionLabel={(option) => getContactLabel(option)}
-        <option value="null">no contact</option>
+        itemFilter={(label, filterText, option) => label
-        {#each contacts as c}
+            .toLowerCase()
-          <option value={c.id}>
+            .includes(
-            {c.firstname}
+              filterText.toLowerCase()
-            {c.middlename || ''}
+            ) || option.id.toString().startsWith(filterText.toLowerCase())}
-            {c.lastname}
+        items={contacts}
-          </option>
+        showChevron={true}
-        {/each}
+        placeholder={$_('no-contact-selected')}
-      </select>
+        noOptionsMessage={$_('no-contact-found')}
+        bind:selectedValue={teamdata.contact}
+        on:clear={() => (teamdata.contact = null)} />
     </div>
     <div class="text-sm w-full">
       <label
         for="org"
         class="font-medium text-gray-700">{$_('organization')}</label>
-      <select
+      <Select
-        name="org"
+        containerClasses="rounded-l-md 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"
-        bind:value={teamdata.parentGroup}
+        getSelectionLabel={(option) => {
-        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">
+          return option.name;
-        {#each orgs as o}
+        }}
-          <option value={o.id}>{o.name}</option>
+        getOptionLabel={(option) => {
-        {/each}
+          return option.name;
-      </select>
+        }}
+        itemFilter={(label, filterText, option) => label
+            .toLowerCase()
+            .includes(
+              filterText.toLowerCase()
+            ) || option.id.toString().startsWith(filterText.toLowerCase())}
+        items={orgs}
+        showChevron={true}
+        placeholder={$_('search-for-an-organization-by-name-or-id')}
+        noOptionsMessage={$_('no-organizations-found')}
+        bind:selectedValue={teamdata.parentGroup}
+        on:clear={() => (teamdata.parentGroup = null)} />
     </div>
   </section>
 {:else}

src/components/teams/TeamsOverview.svelte

@@ -6,6 +6,7 @@
   import store, { users as usersstore } from "../../store.js";
   import TeamsEmptyState from "./TeamsEmptyState.svelte";
   import ConfirmTeamDeletion from "./ConfirmTeamDeletion.svelte";
+  import { clickOutside } from "../base/outsideclick";
   $: searchvalue = "";
   $: active_deletes = [];
   $: sponsoring_contracts_download_open = false;
@@ -20,8 +21,8 @@
   });
   document.addEventListener("click", function (e) {
       if (
-      e.target.parentNode.parentNode.id != "sponsoring:dropdown" &&
+        e.target.parentNode?.parentNode?.id != "sponsoring:dropdown" &&
-      e.target.parentNode.parentNode.id != "sponsoring:dropdown:menu"
+        e.target.parentNode?.parentNode?.id != "sponsoring:dropdown:menu"
       ) {
         sponsoring_contracts_download_open = false;
       }
@@ -123,13 +124,26 @@
                 aria-haspopup="true"
                 aria-expanded="true">
                 {$_('generate-sponsoring-contracts')}
-              <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" class="-mr-1 ml-2 h-5 w-5"><path fill="none" d="M0 0h24v24H0z"/><path fill="currentColor" d="M3 19h18v2H3v-2zm10-5.83l6.07-6.07 1.42 1.41L12 17 3.52 8.52l1.4-1.42L11 13.17V2h2v11.17z"/></svg>
+                <svg
+                  xmlns="http://www.w3.org/2000/svg"
+                  width="24"
+                  height="24"
+                  viewBox="0 0 24 24"
+                  class="-mr-1 ml-2 h-5 w-5"><path
+                    fill="none"
+                    d="M0 0h24v24H0z" />
+                  <path
+                    fill="currentColor"
+                    d="M3 19h18v2H3v-2zm10-5.83l6.07-6.07 1.42 1.41L12 17 3.52 8.52l1.4-1.42L11 13.17V2h2v11.17z" /></svg>
               </button>
             </div>
             {#if sponsoring_contracts_download_open}
               <div
                 class="origin-top-right absolute right-0 mt-2 w-56 rounded-md shadow-lg bg-white ring-1 ring-black ring-opacity-5"
-              id="sponsoring:dropdown:menu">
+                id="sponsoring:dropdown:menu"
+                on:click_outside={() => {
+                  sponsoring_contracts_download_open = false;
+                }}>
                 <div
                   class="py-1"
                   role="menu"

src/locales/de.json

@@ -6,7 +6,6 @@
     "active": "Aktiv",
     "add-donation": "Sponsoring erstellen",
     "add-donor": "Sponsor:in erstellen",
-  "add-the-first-scanstation": "Erstelle die erste Scannerstation",
     "add-user-group": "Neue Gruppe erstellen",
     "add-your-first-contact": "Erstelle den ersten Kontakt",
     "add-your-first-donor": "Erstelle die erste Sponsor:in",
@@ -20,7 +19,6 @@
     "address-is-required": "Du musst eine Adresse angeben",
     "all-associated-donations-will-get-deleted-as-well": "Alle Sponsorings dieser Sponsor:in werden ebenfalls gelöscht",
     "all-associated-runners-will-be-deleted-too": "Alle zugehörigen Läufer:innen werden auch gelöscht!",
-  "all-associated-scans-will-get-deleted-as-well": "Alle assoziierten Scans werden ebenfalls gelöscht",
     "all-associated-teams-and-runners-will-be-deleted-too": "Alle assoziierten Teams und Läufer:innen werden auch gelöscht!",
     "amount-per-kilometer": "Betrag pro Kilometer",
     "apartment-suite-etc": "Apartment, Wohnung, etc.",
@@ -34,18 +32,15 @@
     "cancel-delete": "Löschen abbrechen",
     "cancel-keep-donor": "Abbrechen, Sponsor:in behalten",
     "cancel-keep-organization": "Abbrechen und Organisation bearbeiten",
-  "cancel-keep-station": "Abbrechen, Scannerstation behalten",
     "cancel-keep-team": "Abbrechen, Team behalten",
     "cannot-reset-your-password-directly": "Schade. \nWir können das Passwort leider nicht direkt zurücksetzen.\nBitte sende uns eine Mail in der du deine Identität bestätigst.",
     "city": "Stadt",
-  "click-to-copy-token-to-clipboard": "Klick auf den Token, um ihn in die Zwischenablage zu kopieren.",
     "close": "Schließen",
     "configure-the-tracks-and-minimum-lap-times": "Bearbeite die Tracks und ihre minimale Rundenzeit",
     "confirm": "Bestätigen",
     "confirm-delete": "Löschung Bestätigen",
     "confirm-delete-donor-with-all-donations": "Bestätigen, Sponsor:in mit allen Sponsorings löschen",
     "confirm-delete-organization-and-associated-teams-runners": "Bestätugung, lösche die Organisation und alle zugehörigen Teams und Läufer:innen.",
-  "confirm-delete-station-with-all-scans": "Bestätigung, die Scannerstation mit allen Scans löschen",
     "confirm-delete-team-and-associated-runners": "Bestätigung, lösche das Team mitsamt seinen Läufer:innen.",
     "confirm-deletion": "Löschung Bestätigen",
     "contact": "Kontakt",
@@ -55,7 +50,6 @@
     "contact-is-not-a-member-in-any-group": "Kontakt gehört zu keiner Gruppe",
     "contacts": "Kontakte",
     "contacts-are-being-loaded": "Kontakte werden geladen ...",
-  "copied-token-to-clipboard": "Token wurde in die Zwischenablage kopiert.",
     "count_organizations": "Organisationen (Anzahl)",
     "count_teams": "Teams (Anzahl)",
     "create": "Erstellen",
@@ -66,7 +60,6 @@
     "create-a-new-fixed-donation": "Erstelle eine neue Festbetragsspende",
     "create-a-new-organization": "Neue Organisation anlegen",
     "create-a-new-runner": "Neue Läufer:in erstellen",
-  "create-a-new-scanstation": "Neue Scannerstation erstellen",
     "create-a-new-team": "Erstelle ein neues Team",
     "create-a-new-track": "Neuen Track erstellen",
     "create-a-new-user": "Neue Benutzer:in anlegen",
@@ -105,7 +98,6 @@
     "delete-group": "Gruppe löschen",
     "delete-organization": "Organisation löschen",
     "delete-runner": "Läufer:in löschen",
-  "delete-station": "Scannerstation löschen",
     "delete-team": "Team Löschen",
     "delete-user": "Benutzer:in löschen",
     "dependency_name": "Name",
@@ -113,7 +105,6 @@
     "description-optional": "Beschreibung (optional)",
     "deselect-all": "Alle abwählen",
     "details": "Details",
-  "disabled": "deaktiviert",
     "distance": "Distanz",
     "distance-donation": "Sponsoring",
     "distance-in-km": "Distanz (in KM)",
@@ -137,9 +128,7 @@
     "edit": "Bearbeiten",
     "edit-permissions": "Berechtigungen bearbeiten",
     "email_address_or_username": "E-Mail-Adresse/ Benutzername",
-  "enabled": "aktiviert",
     "english": "Englisch",
-  "error-whyile-copying-to-clipboard": "Beim kopieren des Token in die Zwischenablage ist ein Fehler aufgetreten",
     "error_on_login": "😢Fehler beim Login",
     "erteilte": "Direkt erteilte",
     "everything-is-more-fun-together": "Im Team macht's mehr Spaß 🏃‍♂️🏃‍♀️🏃‍♂️",
@@ -189,7 +178,6 @@
     "loading-donation-details": "Lade Sponsoringdetails",
     "loading-donor-details": "Lade Details",
     "loading-runners": "Läufer:innen werden geladen...",
-  "loading-station-details": "Lade die Scannerstation-Details",
     "log_in": "Anmelden",
     "log_in_to_your_account": "Bitte melde dich an",
     "login_is_checked": "Login wird überprüft",
@@ -202,9 +190,15 @@
     "name": "Name",
     "name-is-required": "Der Gruppenname muss angegeben werden",
     "new-password": "Neues Passwort",
+    "no-contact-found": "Keine Kontakte gefunden",
+    "no-contact-selected": "Kein Kontakt ausgewählt",
     "no-contact-specified": "Kein Kontakt angegeben",
+    "no-donors-found": "Keine Spender:innen gefunden",
     "no-license-text-could-be-found": "Kein Lizenz-Text gefunden 😢",
+    "no-organization-or-team-found": "Keine Organisationen oder Teams gefunden",
     "no-organization-specified": "Keine Organisation angegeben",
+    "no-organizations-found": "Keine Organisationen gefunden",
+    "no-runners-found": "Keine Läufer:innen gefunden",
     "no-tracks-added-yet": "Es wurden noch keine Tracks erstellt.",
     "organization": "Organisation",
     "organization-added": "Organisation hinzugefügt",
@@ -214,7 +208,7 @@
     "organization-name-is-required": "Der Name muss angegeben werden",
     "organizations": "Organisationen",
     "organizations-are-being-loaded": "Organisationen werden geladen ...",
-  "orgs": "Orgs",
+    "orgs": "Organisationen",
     "oss_credit_description": "Wir verwenden eine Menge Open Source-Software bei diesen Projekten und möchten uns bei den folgenden Projekten und Mitwirkenden bedanken, die dazu beitragen, Open Source großartig zu machen!",
     "password": "Passwort",
     "password-is-required": "Passwort muss angegeben werden",
@@ -229,7 +223,6 @@
     "permissions": "Berechtigungen",
     "permissions-updated": "Berechtigungen aktualisiert!",
     "phone": "Telefon",
-  "please-copy-the-token-and-store-it-somewhere-save": "Bitte kopiere den Token und bewahre ihn sicher auf!",
     "please-provide-a-password": "Bitte gebe ein Passwort an...",
     "please-provide-the-nessecary-information-to-add-a-new-donor": "Bitte mach die Notwendigen Angaben, um eine neue Sponsor:in zu erstellen",
     "please-provide-the-nessecary-information-to-create-a-new-donation": "Bitte gebe alle für das Sponsoring notwendigen Daten an.",
@@ -241,7 +234,6 @@
     "please-provide-the-required-information-to-add-a-new-team": "Bitte gebe alle nötigen Informationen an, im das neue Team zu erstellen.",
     "please-provide-the-required-information-to-add-a-new-track": "Bitte die benötigten Informationen angeben.",
     "please-provide-the-required-information-to-add-a-new-user": "Bitte gebe alle nötigen Informationen an, im die neue Benutzer:in zu erstellen.",
-  "please-provide-the-required-information-to-create-a-new-scanstation": "Bitte gebe alle Informationen an, die für die neue Scannerstation benötigt werden",
     "please-request-a-new-reset-mail": "Bitte eine neue Passwortreset-Mail anfordern...",
     "privacy": "Datenschutz",
     "privacy-loading": "Datenschutzerklärung lädt...",
@@ -263,20 +255,17 @@
     "runners-are-being-loaded": "Läufer:innen werden geladen ...",
     "save": "Speichern",
     "save-changes": "Änderungen speichern",
-  "scanstation": "Scannerstation",
+    "search-for-an-organization-by-name-or-id": "Suche eine Organisation (via Name oder Id)",
-  "scanstation-added": "Scannerstation hinzugefügt",
+    "search-for-an-organization-or-team-by-name-or-id": "Suche eine Organisation oder ein Team (via Name oder Id)",
-  "scanstation-is-being-added": "Scannerstation wird angelegt...",
+    "search-for-donor-name-or-id": "Suche eine Spender:in (via Name oder Id)",
-  "scanstations": "Scannerstationen",
-  "scanstations-are-being-loaded": "Scannerstationen werden geladen",
     "search-for-permission": "Berechtigungen durchsuchen",
+    "search-for-runner-by-name-or-id": "Suche eine Läufer:in (via Name oder Id)",
     "select-all": "Alle auswählen",
     "select-language": "Sprache auswählen",
     "send-a-mail-to-lfk-odit-services": "Sende eine Mail an lfk@odit.services",
     "set-the-user-active-inactive": "Den Benutzer auf (in)aktiv setzen",
     "settings": "Einstellungen",
     "something-about-the-group": "Infos zur Gruppe",
-  "station-deleted": "Scannerstation wurde gelöscht",
-  "station-is-being-updated": "Scannerstation wird aktualisiert",
     "stats-are-being-loaded": "Die Statistiken werden geladen...",
     "status": "Status",
     "successful-password-reset": "Passwort erfolgreich zurückgesetzt!",
@@ -287,7 +276,6 @@
     "teams": "Teams",
     "teams-are-being-loaded": "Teams werden geladen ...",
     "the-provided-phone-number-is-invalid-less-than-br-greater-than-please-enter-a-valid-international-number": "Die angegebene Telefonnummer ist nicht korrekt. <br /> Bitte gebe eine Telefonnummer im internationalen Format an...",
-  "the-scanstations-api-token-will-only-get-displayed-once-you-wont-be-able-to-change-or-view-it-again": "Der Token der Scannerstation wird nur einmal angezeigt - du kannst den Token nicht erneut anzeigen oder ändern!",
     "there-are-no-contacts-added-yet": "Es wurden noch keine Kontakte hinzugefügt.",
     "there-are-no-donors-yet": "Es gibt noch keine Sponsor:innen",
     "there-are-no-groups-yet": "Es gibt noch keine Gruppen",
@@ -296,13 +284,10 @@
     "there-are-no-teams-added-yet": "Es wurden noch keine Teams hinzugefügt.",
     "there-are-no-users-added-yet": "Es wurden noch keine Benutzer hinzugefügt.",
     "this-might-take-a-moment": "Das könnte einen kleinen Moment dauern",
-  "this-scanstation-is": "Diese Scannerstation ist ",
-  "token": "Token",
     "total-distance": "gelaufene Strecke",
     "total-donation-amount": "Gesamtbetrag",
     "total-donations": "Spendensumme",
     "total-scans": "gesamte Scans",
-  "track": "Track",
     "track-added": "Track hinzugefügt",
     "track-data-is-being-loaded": "Trackdaten werden geladen",
     "track-is-being-added": "Track wird hinzugefügt...",
@@ -314,7 +299,6 @@
     "updated-contact": "Kontakt aktualisiert!",
     "updated-donor": "Sponsor:in wurde aktualisiert",
     "updated-organization": "Organisation wurde aktualisiert",
-  "updated-station": "Scannerstation wurde aktualisiert",
     "updateing-group": "Gruppe wird aktualisiert...",
     "updating-organization": "Organisation wird aktualisiert",
     "updating-permissions": "Berechtigungen werden aktualisiert...",
@@ -332,9 +316,7 @@
     "valid-zipcode-postal-code-is-required": "Du musst eine valide Postleitzahl angeben",
     "verfuegbare": "Verfügbar",
     "welcome_wavinghand": "Willkommen 👋",
-  "yes-i-copied-the-token": "Ja, ich habe den Token kopiert.",
     "you-can-now-use-your-new-password-to-log-in-to-your-account": "Du kannst dich jetzt mit deinem neuen Passwort anmelden! 🎉",
-  "you-dont-have-any-scanstations-yet": "Es gibt noch keine Scannerstationen",
+    "you-have-to-provide-an-organization": "Du musst eine Organisation angeben",
-  "zip-postal-code": "Postleitzahl",
+    "zip-postal-code": "Postleitzahl"
-  "enabled_large": "Aktiviert"
 }

src/locales/en.json

@@ -6,7 +6,6 @@
     "active": "Active",
     "add-donation": "Add donation",
     "add-donor": "add donor",
-  "add-the-first-scanstation": "Add the first scanstation",
     "add-user-group": "Add User Group",
     "add-your-first-contact": "Add your first contact",
     "add-your-first-donor": "add your first donor",
@@ -20,7 +19,6 @@
     "address-is-required": "Address is required",
     "all-associated-donations-will-get-deleted-as-well": "All associated donations will get deleted as well",
     "all-associated-runners-will-be-deleted-too": "All associated runners will be deleted too!",
-  "all-associated-scans-will-get-deleted-as-well": "All associated scans will get deleted as well",
     "all-associated-teams-and-runners-will-be-deleted-too": "All associated teams and runners will be deleted too!",
     "amount-per-kilometer": "Amount per kilometer",
     "apartment-suite-etc": "Apartment, suite, etc.",
@@ -34,18 +32,15 @@
     "cancel-delete": "Cancel Delete",
     "cancel-keep-donor": "Cancel, keep donor",
     "cancel-keep-organization": "Cancel, keep organization",
-  "cancel-keep-station": "Cancel, keep station",
     "cancel-keep-team": "Cancel, keep team",
     "cannot-reset-your-password-directly": "Bummer. We unfortunately cannot reset your password directly. Please send us a mail and confirm your identity",
     "city": "City",
-  "click-to-copy-token-to-clipboard": "Click to copy token to clipboard.",
     "close": "Close",
     "configure-the-tracks-and-minimum-lap-times": "configure the tracks & minimum lap times",
     "confirm": "Confirm",
     "confirm-delete": "Confirm Delete",
     "confirm-delete-donor-with-all-donations": "Confirm, delete donor with all donations",
     "confirm-delete-organization-and-associated-teams-runners": "Confirm, delete organization and associated teams+runners.",
-  "confirm-delete-station-with-all-scans": "Confirm, delete station with all scans",
     "confirm-delete-team-and-associated-runners": "Confirm, delete team and associated runners.",
     "confirm-deletion": "Confirm Deletion",
     "contact": "Contact",
@@ -55,7 +50,6 @@
     "contact-is-not-a-member-in-any-group": "Contact is not a member in any group",
     "contacts": "Contacts",
     "contacts-are-being-loaded": "contacts are being loaded...",
-  "copied-token-to-clipboard": "Copied token to clipboard",
     "count_organizations": "# Organizations",
     "count_teams": "# Teams",
     "create": "Create",
@@ -66,7 +60,6 @@
     "create-a-new-fixed-donation": "Create a new fixed donation",
     "create-a-new-organization": "Create a new Organization",
     "create-a-new-runner": "Create a new Runner",
-  "create-a-new-scanstation": "Create a new scanstation",
     "create-a-new-team": "Create a new team",
     "create-a-new-track": "Create a new Track",
     "create-a-new-user": "Create a new User",
@@ -105,7 +98,6 @@
     "delete-group": "Delete Group",
     "delete-organization": "Delete Organization",
     "delete-runner": "Delete Runner",
-  "delete-station": "Delete station",
     "delete-team": "Delete Team",
     "delete-user": "Delete User",
     "dependency_name": "Name",
@@ -113,7 +105,6 @@
     "description-optional": "Description (optional)",
     "deselect-all": "deselect all",
     "details": "Details",
-  "disabled": "disabled",
     "distance": "Distance",
     "distance-donation": "distance donation",
     "distance-in-km": "Distance in km",
@@ -137,9 +128,7 @@
     "edit": "Edit",
     "edit-permissions": "edit permissions",
     "email_address_or_username": "Email / username",
-  "enabled": "enabled",
     "english": "English",
-  "error-whyile-copying-to-clipboard": "Error whyile copying to clipboard",
     "error_on_login": "Error on login",
     "erteilte": "Directly granted",
     "everything-is-more-fun-together": "everything is more fun together 🏃‍♂️🏃‍♀️🏃‍♂️",
@@ -189,7 +178,6 @@
     "loading-donation-details": "Loading donation details",
     "loading-donor-details": "Loading donor details",
     "loading-runners": "loading runners...",
-  "loading-station-details": "Loading station details",
     "log_in": "Log in",
     "log_in_to_your_account": "Log in to your account",
     "login_is_checked": "Login is being checked...",
@@ -202,9 +190,15 @@
     "name": "Name",
     "name-is-required": "Name is required",
     "new-password": "New password",
+    "no-contact-found": "No contacts found",
+    "no-contact-selected": "No contact selected",
     "no-contact-specified": "no contact specified",
+    "no-donors-found": "No donors found",
     "no-license-text-could-be-found": "No license text could be found 😢",
+    "no-organization-or-team-found": "No organization or team found",
     "no-organization-specified": "no organization specified",
+    "no-organizations-found": "No organizations found",
+    "no-runners-found": "No runners found",
     "no-tracks-added-yet": "there are no tracks added yet.",
     "organization": "Organization",
     "organization-added": "Organization added",
@@ -214,7 +208,7 @@
     "organization-name-is-required": "Organization name is required",
     "organizations": "Organizations",
     "organizations-are-being-loaded": "organizations are being loaded...",
-  "orgs": "Orgs",
+    "orgs": "Organizations",
     "oss_credit_description": "We use a lot of open source software on these projects, and would like to thank the following projects and contributors who help make open source great!",
     "password": "Password",
     "password-is-required": "Password is required",
@@ -229,7 +223,6 @@
     "permissions": "Permissions",
     "permissions-updated": "Permissions updated!",
     "phone": "Phone",
-  "please-copy-the-token-and-store-it-somewhere-save": "Please copy the token and store it somewhere save!",
     "please-provide-a-password": "Please provide a password...",
     "please-provide-the-nessecary-information-to-add-a-new-donor": "Please provide the nessecary information to add a new donor",
     "please-provide-the-nessecary-information-to-create-a-new-donation": "Please provide the nessecary information to create a new donation",
@@ -241,7 +234,6 @@
     "please-provide-the-required-information-to-add-a-new-team": "Please provide the required information to add a new team.",
     "please-provide-the-required-information-to-add-a-new-track": "Please provide the required information to add a new track.",
     "please-provide-the-required-information-to-add-a-new-user": "Please provide the required information to add a new user.",
-  "please-provide-the-required-information-to-create-a-new-scanstation": "Please provide the required information to create a new scanstation",
     "please-request-a-new-reset-mail": "Please request a new reset mail...",
     "privacy": "Privacy",
     "privacy-loading": "Privacy loading...",
@@ -263,20 +255,17 @@
     "runners-are-being-loaded": "runners are being loaded...",
     "save": "Save",
     "save-changes": "Save Changes",
-  "scanstation": "Scanstation",
+    "search-for-an-organization-by-name-or-id": "Search for an organization (by name or id)",
-  "scanstation-added": "Scanstation added",
+    "search-for-an-organization-or-team-by-name-or-id": "Search for an organization or team (by name or id)",
-  "scanstation-is-being-added": "Scanstation is being added...",
+    "search-for-donor-name-or-id": "Search for donor (by name or id)",
-  "scanstations": "Scanstations",
-  "scanstations-are-being-loaded": "Scanstations are being loaded",
     "search-for-permission": "Search for permission",
+    "search-for-runner-by-name-or-id": "Search for runner (by name or id)",
     "select-all": "select all",
     "select-language": "Select language",
     "send-a-mail-to-lfk-odit-services": "send a mail to lfk@odit.services",
     "set-the-user-active-inactive": "set the user active/ inactive",
     "settings": "Settings",
     "something-about-the-group": "Something about the group...",
-  "station-deleted": "Station deleted",
-  "station-is-being-updated": "Station is being updated",
     "stats-are-being-loaded": "stats are being loaded...",
     "status": "Status",
     "successful-password-reset": "Successful password reset!",
@@ -287,7 +276,6 @@
     "teams": "Teams",
     "teams-are-being-loaded": "teams are being loaded...",
     "the-provided-phone-number-is-invalid-less-than-br-greater-than-please-enter-a-valid-international-number": "the provided phone number is invalid.<br />please enter a valid international number...",
-  "the-scanstations-api-token-will-only-get-displayed-once-you-wont-be-able-to-change-or-view-it-again": "The scanstation's api token will only get displayed once - you won't be able to change or view it again!",
     "there-are-no-contacts-added-yet": "There are no contacts added yet.",
     "there-are-no-donors-yet": "There are no donors yet",
     "there-are-no-groups-yet": "There are no groups yet",
@@ -296,13 +284,10 @@
     "there-are-no-teams-added-yet": "There are no teams added yet.",
     "there-are-no-users-added-yet": "There are no users added yet.",
     "this-might-take-a-moment": "This might take a moment 👀",
-  "this-scanstation-is": "This scanstation is",
-  "token": "Token",
     "total-distance": "total distance",
     "total-donation-amount": "total donation amount",
     "total-donations": "total donations",
     "total-scans": "total scans",
-  "track": "Track",
     "track-added": "Track added",
     "track-data-is-being-loaded": "Track data is being loaded",
     "track-is-being-added": "Track is being added...",
@@ -314,7 +299,6 @@
     "updated-contact": "Updated contact!",
     "updated-donor": "updated donor",
     "updated-organization": "updated organization",
-  "updated-station": "Updated station",
     "updateing-group": "updateing group...",
     "updating-organization": "updating organization",
     "updating-permissions": "updating permissions...",
@@ -332,9 +316,7 @@
     "valid-zipcode-postal-code-is-required": "Valid zipcode/ postal code is required",
     "verfuegbare": "availdable",
     "welcome_wavinghand": "Welcome 👋",
-  "yes-i-copied-the-token": "Yes, i copied the token.",
     "you-can-now-use-your-new-password-to-log-in-to-your-account": "You can now use your new password to log in to your account! 🎉",
-  "you-dont-have-any-scanstations-yet": "You don't have any scanstations yet",
+    "you-have-to-provide-an-organization": "You have to provide an organization",
-  "zip-postal-code": "ZIP/ postal code",
+    "zip-postal-code": "ZIP/ postal code"
-  "enabled_large": "Enabled"
 }