Merge branch 'dev' into feature/92-scan_mgnt

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
-                    bind:value={donor}
-                    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 donors as d}
-                      <option value={d.id}>
-                        {d.firstname}
-                        {d.middlename || ''}
-                        {d.lastname}
-                      </option>
-                    {/each}
-                  </select>
+                  <Select
+                    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"
+                    getSelectionLabel={(option) => getDonorLabel(option)}
+                    getOptionLabel={(option) => getDonorLabel(option)}
+                    itemFilter={(label, filterText, option) => filterDonors(label, filterText, option)}
+                    items={donors}
+                    showChevron={true}
+                    placeholder={$_('search-for-donor-name-or-id')}
+                    noOptionsMessage={$_('no-donors-found')}
+                    on:select={(selectedValue) => (donor = selectedValue.detail.id)}
+                    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
-                      bind:value={runner}
-                      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 runners as r}
-                        <option value={r.id}>
-                          {r.firstname}
-                          {r.middlename || ''}
-                          {r.lastname}
-                        </option>
-                      {/each}
-                    </select>
+                    <Select
+                      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"
+                      getSelectionLabel={(option) => getDonorLabel(option)}
+                      getOptionLabel={(option) => getDonorLabel(option)}
+                      itemFilter={(label, filterText, option) => filterDonors(label, filterText, option)}
+                      items={runners}
+                      showChevron={true}
+                      placeholder={$_('search-for-runner-by-name-or-id')}
+                      noOptionsMessage={$_('no-runners-found')}
+                      on:select={(selectedValue) => (runner = selectedValue.detail.id)}
+                      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
-        bind:value={editable.donor}
-        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">
-        {#each current_donors as d}
-          <option value={d.id}>
-            {d.firstname}
-            {d.middlename || ''}
-            {d.lastname}
-          </option>
-        {/each}
-      </select>
+      <Select
+        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"
+        getSelectionLabel={(option) => getDonorLabel(option)}
+        getOptionLabel={(option) => getDonorLabel(option)}
+        itemFilter={(label, filterText, option) => filterDonors(label, filterText, option)}
+        items={current_donors}
+        showChevron={true}
+        placeholder={$_('search-for-donor-name-or-id')}
+        noOptionsMessage={$_('no-donors-found')}
+        bind:selectedValue={editable.donor}
+        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
-          bind:value={editable.runner}
-          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">
-          {#each current_runners as r}
-            <option value={r.id}>
-              {r.firstname}
-              {r.middlename || ''}
-              {r.lastname}
-            </option>
-          {/each}
-        </select>
+        <Select
+          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"
+          getSelectionLabel={(option) => getDonorLabel(option)}
+          getOptionLabel={(option) => getDonorLabel(option)}
+          itemFilter={(label, filterText, option) => filterDonors(label, filterText, option)}
+          items={current_runners}
+          showChevron={true}
+          placeholder={$_('search-for-runner-by-name-or-id')}
+          noOptionsMessage={$_('no-runners-found')}
+          bind:selectedValue={editable.runner}
+          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:menu"
+      e.target.parentNode?.parentNode?.id != "sponsoring:dropdown" &&
+      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
-        name="contact"
-        bind:value={editable.contact}
-        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">
-        <option value="null">no contact</option>
-        {#each contacts as c}
-          <option value={c.id}>
-            {c.firstname}
-            {c.middlename || ''}
-            {c.lastname}
-          </option>
-        {/each}
-      </select>
+      <Select
+        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"
+        getSelectionLabel={(option) => getContactLabel(option)}
+        getOptionLabel={(option) => getContactLabel(option)}
+        itemFilter={(label, filterText, option) => label
+            .toLowerCase()
+            .includes(
+              filterText.toLowerCase()
+            ) || option.id.toString().startsWith(filterText.toLowerCase())}
+        items={contacts}
+        showChevron={true}
+        placeholder={$_('no-contact-selected')}
+        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:menu"
+      e.target.parentNode?.parentNode?.id != "sponsoring:dropdown" &&
+      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
-                    name="team"
-                    bind:value={selected_team}
-                    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 teams as team}
-                      <option value={team.id}>
-                        {team.parentGroup.name}
-                        &gt;
-                        {team.name}
-                      </option>
-                    {/each}
-                    {#each orgs as org}
-                      <option value={org.id}>{org.name}</option>
-                    {/each}
-                  </select>
+                  <Select
+                    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"
+                    getSelectionLabel={(option) => {
+                      if (option.responseType == 'RUNNERORGANIZATION') {
+                        return option.name;
+                      }
+                      return `${option.parentGroup.name} &gt; ${option.name}`;
+                    }}
+                    getOptionLabel={(option) => {
+                      if (option.responseType == 'RUNNERORGANIZATION') {
+                        return option.name;
+                      }
+                      return `${option.parentGroup.name} &gt; ${option.name}`;
+                    }}
+                    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:menu"
+      e.target.parentNode?.parentNode?.id != "sponsoring:dropdown" &&
+      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;
-          Object.assign(original_data, editable);
+          original_data = original_data;
           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
-        bind:value={editable.group}
-        name="team"
-        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 teams as team}
-          <option value={team.id}>
-            {team.parentGroup.name}
-            &gt;
-            {team.name}
-          </option>
-        {/each}
-        {#each orgs as org}
-          <option value={org.id}>{org.name}</option>
-        {/each}
-      </select>
+      <Select
+        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"
+        getSelectionLabel={(option) => {
+          if (option.responseType == 'RUNNERORGANIZATION') {
+            return option.name;
+          }
+          return `${option.parentGroup.name} &gt; ${option.name}`;
+        }}
+        getOptionLabel={(option) => {
+          if (option.responseType == 'RUNNERORGANIZATION') {
+            return option.name;
+          }
+          return `${option.parentGroup.name} &gt; ${option.name}`;
+        }}
+        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:menu"
+      e.target.parentNode?.parentNode?.id != "sponsoring:dropdown" &&
+      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
-                    bind:value={parentGroup}
-                    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 orgs as t}
-                      <option value={t.id}>{t.name}</option>
-                    {/each}
-                  </select>
+                  <Select
+                    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"
+                    getSelectionLabel={(option) => {
+                      return option.name;
+                    }}
+                    getOptionLabel={(option) => {
+                      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:menu"
+      e.target.parentNode?.parentNode?.id != "sponsoring:dropdown" &&
+      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;
-          Object.assign(original, teamdata);
-          //
+          original = original;
           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
-        name="contact"
-        bind:value={teamdata.contact}
-        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">
-        <option value="null">no contact</option>
-        {#each contacts as c}
-          <option value={c.id}>
-            {c.firstname}
-            {c.middlename || ''}
-            {c.lastname}
-          </option>
-        {/each}
-      </select>
+      <Select
+        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"
+        getSelectionLabel={(option) => getContactLabel(option)}
+        getOptionLabel={(option) => getContactLabel(option)}
+        itemFilter={(label, filterText, option) => label
+            .toLowerCase()
+            .includes(
+              filterText.toLowerCase()
+            ) || option.id.toString().startsWith(filterText.toLowerCase())}
+        items={contacts}
+        showChevron={true}
+        placeholder={$_('no-contact-selected')}
+        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
-        name="org"
-        bind:value={teamdata.parentGroup}
-        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 orgs as o}
-          <option value={o.id}>{o.name}</option>
-        {/each}
-      </select>
+      <Select
+        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"
+        getSelectionLabel={(option) => {
+          return option.name;
+        }}
+        getOptionLabel={(option) => {
+          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')}
+        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;
@@ -19,12 +20,12 @@
     usersstore.set(data);
   });
   document.addEventListener("click", function (e) {
-    if (
-      e.target.parentNode.parentNode.id != "sponsoring:dropdown" &&
-      e.target.parentNode.parentNode.id != "sponsoring:dropdown:menu"
-    ) {
-      sponsoring_contracts_download_open = false;
-    }
+      if (
+        e.target.parentNode?.parentNode?.id != "sponsoring:dropdown" &&
+        e.target.parentNode?.parentNode?.id != "sponsoring:dropdown:menu"
+      ) {
+        sponsoring_contracts_download_open = false;
+      }
   });
   async function generateSponsoringContract(locale) {
     sponsoring_contracts_download_open = false;
@@ -111,54 +112,67 @@
         class="gridjs-input gridjs-search-input mb-4" />
       <div class="h-12">
         {#if current_teams.some((r) => r.is_selected === true)}
-        <div id="sponsoring:dropdown" class="relative inline-block">
-          <div>
-            <button
-              on:click={() => {
-                sponsoring_contracts_download_open = !sponsoring_contracts_download_open;
-              }}
-              type="button"
-              class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-gray-600 text-base font-medium text-white hover:bg-gray-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-500 sm:ml-3 sm:w-auto sm:text-sm inline-flex"
-              id="options-menu"
-              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>
-            </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">
-              <div
-                class="py-1"
-                role="menu"
-                aria-orientation="vertical"
-                aria-labelledby="options-menu">
-                <span
-                  class="block w-full text-left px-4 py-2 text-sm text-gray-700">{$_('select-language')}</span>
-                <button
-                  on:click={() => {
-                    generateSponsoringContract('de');
-                  }}
-                  type="submit"
-                  class="block w-full text-left px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:outline-none focus:bg-gray-100 focus:text-gray-900 inline-flex"
-                  role="menuitem">
-                  {$_('german')}
-                </button>
-                <button
-                  on:click={() => {
-                    generateSponsoringContract('en');
-                  }}
-                  type="submit"
-                  class="block w-full text-left px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:outline-none focus:bg-gray-100 focus:text-gray-900 inline-flex"
-                  role="menuitem">
-                  {$_('english')}
-                </button>
-              </div>
+          <div id="sponsoring:dropdown" class="relative inline-block">
+            <div>
+              <button
+                on:click={() => {
+                  sponsoring_contracts_download_open = !sponsoring_contracts_download_open;
+                }}
+                type="button"
+                class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-gray-600 text-base font-medium text-white hover:bg-gray-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-500 sm:ml-3 sm:w-auto sm:text-sm inline-flex"
+                id="options-menu"
+                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>
+              </button>
             </div>
-          {/if}
-        </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"
+                on:click_outside={() => {
+                  sponsoring_contracts_download_open = false;
+                }}>
+                <div
+                  class="py-1"
+                  role="menu"
+                  aria-orientation="vertical"
+                  aria-labelledby="options-menu">
+                  <span
+                    class="block w-full text-left px-4 py-2 text-sm text-gray-700">{$_('select-language')}</span>
+                  <button
+                    on:click={() => {
+                      generateSponsoringContract('de');
+                    }}
+                    type="submit"
+                    class="block w-full text-left px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:outline-none focus:bg-gray-100 focus:text-gray-900 inline-flex"
+                    role="menuitem">
+                    {$_('german')}
+                  </button>
+                  <button
+                    on:click={() => {
+                      generateSponsoringContract('en');
+                    }}
+                    type="submit"
+                    class="block w-full text-left px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:outline-none focus:bg-gray-100 focus:text-gray-900 inline-flex"
+                    role="menuitem">
+                    {$_('english')}
+                  </button>
+                </div>
+              </div>
+            {/if}
+          </div>
         {/if}
       </div>
       <div