From fb0f2092ed5caa10625aec30f2b511c881568d5f Mon Sep 17 00:00:00 2001 From: NSUWAL123 Date: Wed, 13 Nov 2024 12:14:04 +0545 Subject: [PATCH 1/4] fix(dialog-task-actions): add keyboard listener event --- .../lib/components/dialog-task-actions.svelte | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/src/mapper/src/lib/components/dialog-task-actions.svelte b/src/mapper/src/lib/components/dialog-task-actions.svelte index 577c47d6c0..6f2db67c52 100644 --- a/src/mapper/src/lib/components/dialog-task-actions.svelte +++ b/src/mapper/src/lib/components/dialog-task-actions.svelte @@ -24,6 +24,13 @@ name="close" class="!text-[1.5rem] text-[#52525B] cursor-pointer hover:text-red-600 duration-200" onclick={() => toggleTaskActionModal(false)} + onkeydown={(e: KeyboardEvent) => { + if (e.key === 'Enter') { + toggleTaskActionModal(false); + } + }} + role="button" + tabindex="0" > @@ -36,6 +43,13 @@ class="secondary" onclick={() => toggleTaskActionModal(false)} outline + onkeydown={(e: KeyboardEvent) => { + if (e.key === 'Enter') { + toggleTaskActionModal(false); + } + }} + role="button" + tabindex="0" > CANCEL @@ -44,6 +58,13 @@ size="small" class="primary" onclick={() => mapTask(projectId, taskStore.selectedTaskId)} + onkeydown={(e: KeyboardEvent) => { + if (e.key === 'Enter') { + mapTask(projectId, taskStore.selectedTaskId); + } + }} + role="button" + tabindex="0" > @@ -59,6 +80,13 @@ outline size="small" class="secondary" + onkeydown={(e: KeyboardEvent) => { + if (e.key === 'Enter') { + resetTask(projectId, taskStore.selectedTaskId); + } + }} + role="button" + tabindex="0" > { + if (e.key === 'Enter') { + finishTask(projectId, taskStore.selectedTaskId); + } + }} + role="button" + tabindex="0" > COMPLETE MAPPING From e9c0d4a11efd4b0f7ded4a65d0cc40673d1f6e2b Mon Sep 17 00:00:00 2001 From: NSUWAL123 Date: Wed, 13 Nov 2024 13:50:54 +0545 Subject: [PATCH 2/4] feat(icon): icon add --- src/mapper/static/assets/icons/new-window.svg | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/mapper/static/assets/icons/new-window.svg diff --git a/src/mapper/static/assets/icons/new-window.svg b/src/mapper/static/assets/icons/new-window.svg new file mode 100644 index 0000000000..9fbfa97cb7 --- /dev/null +++ b/src/mapper/static/assets/icons/new-window.svg @@ -0,0 +1 @@ + \ No newline at end of file From adf8b5c4684b068dfcf6c59eda8b46fa762280bc Mon Sep 17 00:00:00 2001 From: NSUWAL123 Date: Wed, 13 Nov 2024 13:54:51 +0545 Subject: [PATCH 3/4] fix(+page): change dialogTaskActions prop type --- src/mapper/src/routes/[projectId]/+page.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mapper/src/routes/[projectId]/+page.svelte b/src/mapper/src/routes/[projectId]/+page.svelte index ab4b09de8b..abd292a64d 100644 --- a/src/mapper/src/routes/[projectId]/+page.svelte +++ b/src/mapper/src/routes/[projectId]/+page.svelte @@ -144,7 +144,7 @@ isTaskActionModalOpen = value; }} {selectedTab} - projectId={data.projectId} + projectData={data?.project} /> {#if selectedTab !== 'map'} @@ -203,7 +203,7 @@ class="z-9999 fixed bottom-0 left-0 right-0" placement="bottom" no-scroll-controls - onsl-tab-show={(e: CustomEvent<{ name: string }>) => { + onsl-tab-show={(e: CustomEvent<{ name: string }>) => { selectedTab = e.detail.name; if ( e.detail.name !== 'qrcode' && From 042b458e16c17f38769fea10cdbc7a9a64d85a94 Mon Sep 17 00:00:00 2001 From: NSUWAL123 Date: Wed, 13 Nov 2024 13:59:56 +0545 Subject: [PATCH 4/4] feat(dialog-task-actions): mapNewFeature btn add to open ODK --- .../lib/components/dialog-task-actions.svelte | 62 ++++++++++++++++--- 1 file changed, 52 insertions(+), 10 deletions(-) diff --git a/src/mapper/src/lib/components/dialog-task-actions.svelte b/src/mapper/src/lib/components/dialog-task-actions.svelte index 6f2db67c52..cf5813cef3 100644 --- a/src/mapper/src/lib/components/dialog-task-actions.svelte +++ b/src/mapper/src/lib/components/dialog-task-actions.svelte @@ -1,16 +1,37 @@ {#if taskStore.selectedTaskId && selectedTab === 'map' && isTaskActionModalOpen && (taskStore.selectedTaskState === 'UNLOCKED_TO_MAP' || taskStore.selectedTaskState === 'LOCKED_FOR_MAPPING')} @@ -18,8 +39,7 @@
-
-

Task #{taskStore.selectedTaskId}

+
+
+

Task #{taskStore.selectedTaskId}

+
{ + mapNewFeature(); + }} + onkeydown={(e: KeyboardEvent) => { + if (e.key === 'Enter') { + mapNewFeature(); + } + }} + role="button" + tabindex="0" + class="flex items-center gap-1 cursor-pointer group" + > + +

map new feature

+
+
{#if taskStore.selectedTaskState === 'UNLOCKED_TO_MAP'}

Do you want to start mapping task #{taskStore.selectedTaskId}?

@@ -57,10 +99,10 @@ variant="default" size="small" class="primary" - onclick={() => mapTask(projectId, taskStore.selectedTaskId)} + onclick={() => mapTask(projectData?.id, taskStore.selectedTaskId)} onkeydown={(e: KeyboardEvent) => { if (e.key === 'Enter') { - mapTask(projectId, taskStore.selectedTaskId); + mapTask(projectData?.id, taskStore.selectedTaskId); } }} role="button" @@ -75,14 +117,14 @@

Task #{taskStore.selectedTaskId} has been locked. Is the task completely mapped?

resetTask(projectId, taskStore.selectedTaskId)} + onclick={() => resetTask(projectData?.id, taskStore.selectedTaskId)} variant="default" outline size="small" class="secondary" onkeydown={(e: KeyboardEvent) => { if (e.key === 'Enter') { - resetTask(projectId, taskStore.selectedTaskId); + resetTask(projectData?.id, taskStore.selectedTaskId); } }} role="button" @@ -96,13 +138,13 @@ CANCEL MAPPING finishTask(projectId, taskStore.selectedTaskId)} + onclick={() => finishTask(projectData?.id, taskStore.selectedTaskId)} variant="default" size="small" class="green" onkeydown={(e: KeyboardEvent) => { if (e.key === 'Enter') { - finishTask(projectId, taskStore.selectedTaskId); + finishTask(projectData?.id, taskStore.selectedTaskId); } }} role="button"