src/components/cards/AddCardModal.svelte

@@ -11,37 +11,22 @@
   import Toastify from "toastify-js";
   export let modal_open;
   export let current_cards;
-
+  const getRunnerLabel = (option) =>
-  const getRunnerLabel = (option) => {
+    option.firstname + " " + (option.middlename || "") + " " + option.lastname;
-    if (option.middlename) {
+  const filterRunners = (label, filterText, option) =>
-      return option.firstname + " " + option.middlename + " " + option.lastname;
+    label.toLowerCase().includes(filterText.toLowerCase()) ||
-    }
+    option.value.toString().startsWith(filterText.toLowerCase());
-    return option.firstname + " " + option.lastname;
-  };
-
-  const filterRunners = (label, filterText, option) => {
-    if (filterText.startsWith("#")) {
-      return option.value.id == parseInt(filterText.replace("#",""))
-    }
-    return (
-      label.toLowerCase().includes(filterText.toLowerCase()) ||
-      option.value.toString().startsWith(filterText.toLowerCase())
-    );
-  };
   function focus(el) {
     el.focus();
   }
   $: runner = 0;
+  $: runners = [];
   $: enabled = true;
   $: processed_last_submit = true;
-
-  let loading = true;
-  let runners = [];
   RunnerService.runnerControllerGetAll().then((val) => {
     runners = val.map((r) => {
       return { label: getRunnerLabel(r), value: r };
     });
-    loading = false;
   });
   $: createbtnenabled = true;
   (() => {
@@ -101,78 +86,61 @@
     use:clickOutside
     on:click_outside={() => {
       modal_open = false;
-    }}
+    }}>
-  >
     <div
-      class="flex items-end justify-center min-h-screen pt-4 px-4 pb-20 text-center sm:block sm:p-0"
+      class="flex items-end justify-center min-h-screen pt-4 px-4 pb-20 text-center sm:block sm:p-0">
-    >
       <div class="fixed inset-0 transition-opacity" aria-hidden="true">
         <div
           class="absolute inset-0 bg-gray-500 opacity-75"
-          data-id="modal_backdrop"
+          data-id="modal_backdrop" />
-        />
       </div>
       <span
         class="hidden sm:inline-block sm:align-middle sm:h-screen"
-        aria-hidden="true">&#8203;</span
+        aria-hidden="true">&#8203;</span>
-      >
       <div
         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"
+        aria-labelledby="modal-headline">
-      >
         <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
           <div class="sm:flex sm:items-start">
             <div
-              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
+              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10">
-            >
               <svg
                 class="h-6 w-6 text-blue-600"
                 fill="currentColor"
                 xmlns="http://www.w3.org/2000/svg"
                 viewBox="0 0 24 24"
                 width="24"
-                height="24"
+                height="24"><path fill="none" d="M0 0h24v24H0z" />
-                ><path fill="none" d="M0 0h24v24H0z" />
                 <path
                   fill="currentColor"
-                  d="M22 10v10a1 1 0 01-1 1H3a1 1 0 01-1-1V10h20zm0-2H2V4a1 1 0 011-1h18a1 1 0 011 1v4zm-7 8v2h4v-2h-4z"
+                  d="M22 10v10a1 1 0 01-1 1H3a1 1 0 01-1-1V10h20zm0-2H2V4a1 1 0 011-1h18a1 1 0 011 1v4zm-7 8v2h4v-2h-4z" /></svg>
-                /></svg
-              >
             </div>
             <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">
-                {$_("create-a-new-card")}
+                {$_('create-a-new-card')}
               </h3>
               <div class="mt-2 mb-6">
                 <p class="text-sm text-gray-500">
-                  {$_("you-can-provide-a-runner-but-you-dont-have-to")}
+                  {$_('you-can-provide-a-runner-but-you-dont-have-to')}
-                  {$_(
+                  {$_('if-you-want-to-create-multiple-blanco-cards-try-the-add-bulk-button')}
-                    "if-you-want-to-create-multiple-blanco-cards-try-the-add-bulk-button"
-                  )}
                 </p>
               </div>
               <div class="grid grid-cols-6 gap-6">
                 <div class="col-span-6">
                   <label
                     for="donor"
-                    class="block text-sm font-medium text-gray-700"
+                    class="block text-sm font-medium text-gray-700">{$_('runner')}</label>
-                    >{$_("runner")}</label
-                  >
                   <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"
-                    itemFilter={(label, filterText, option) =>
+                    itemFilter={(label, filterText, option) => filterRunners(label, filterText, option)}
-                      filterRunners(label, filterText, option)}
                     items={runners}
-                    bind:loading
+                    showChevron={true}
-                    showChevron={!loading}
+                    placeholder={$_('search-for-runner-by-name-or-id')}
-                    placeholder={$_("search-for-runner-by-name-or-id")}
+                    noOptionsMessage={$_('no-runners-found')}
-                    noOptionsMessage={$_("no-runners-found")}
+                    on:select={(selectedValue) => (runner = selectedValue.detail.value.id)}
-                    on:select={(selectedValue) =>
+                    on:clear={() => (runner = null)} />
-                      (runner = selectedValue.detail.value.id)}
-                    on:clear={() => (runner = null)}
-                  />
                 </div>
               </div>
             </div>
@@ -184,18 +152,16 @@
             class:opacity-50={!createbtnenabled}
             on:click={submit}
             type="button"
-            class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:ml-3 sm:w-auto sm:text-sm"
+            class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:ml-3 sm:w-auto sm:text-sm">
-          >
+            {$_('create')}
-            {$_("create")}
           </button>
           <button
             on:click={() => {
               modal_open = false;
             }}
             type="button"
-            class="mt-3 w-full inline-flex justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 sm:mt-0 sm:ml-3 sm:w-auto sm:text-sm"
+            class="mt-3 w-full inline-flex justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 sm:mt-0 sm:ml-3 sm:w-auto sm:text-sm">
-          >
+            {$_('cancel')}
-            {$_("cancel")}
           </button>
         </div>
       </div>