From 25718970b6793bc907f17d137d16a01b3a728f45 Mon Sep 17 00:00:00 2001
From: Peter Stockings <pstockings@jadeworld.com>
Date: Mon, 7 Aug 2023 10:29:41 +1000
Subject: [PATCH] When redirecting from workout overview(modal) to person list
 filter view dont refresh page on modal close

---
 templates/partials/topset.html            | 3 ++-
 templates/partials/workout_modal.html     | 7 ++++++-
 templates/partials/workout_tags_list.html | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/templates/partials/topset.html b/templates/partials/topset.html
index 2870648..3c8388d 100644
--- a/templates/partials/topset.html
+++ b/templates/partials/topset.html
@@ -3,7 +3,8 @@
         {% if is_edit|default(false, true) == false %}
         <span class="cursor-pointer" hx-get="{{ url_for('goto_tag') }}"
             hx-vals='{"filter": "?exercise_id={{ exercise_id }}", "person_id" : "{{ person_id }}" }'
-            hx-target="#container" hx-push-url="true" _='on click trigger closeModal'>{{ exercise_name }}</span>
+            hx-target="#container" hx-push-url="true" _='on click trigger closeModalWithoutRefresh'>{{ exercise_name
+            }}</span>
         {% else %}
         <div class="w-full">
             <select id="topset-exercise-select-{{ topset_id }}" data-te-select-init data-te-select-filter="true"
diff --git a/templates/partials/workout_modal.html b/templates/partials/workout_modal.html
index ea364e7..f6b2ed3 100644
--- a/templates/partials/workout_modal.html
+++ b/templates/partials/workout_modal.html
@@ -3,7 +3,12 @@
 					then wait for animationend 
 					then remove me
 					then toggle .hide-scrollbar on document.body
-                    then send refreshView to #refreshViewElement'>
+                    then send refreshView to #refreshViewElement
+                on closeModalWithoutRefresh
+					add .closing
+					then wait for animationend 
+					then remove me
+					then toggle .hide-scrollbar on document.body'>
     <div class='modal-underlay' _='on click trigger closeModal'></div>
     <div class='modal-content m-4 sm:mt-24 max-h-[95%]' _='init toggle .hide-scrollbar on document.body'>
         <div class="relative w-full h-full max-w-2xl md:h-auto overflow-auto">
diff --git a/templates/partials/workout_tags_list.html b/templates/partials/workout_tags_list.html
index 8e3c24c..d760fea 100644
--- a/templates/partials/workout_tags_list.html
+++ b/templates/partials/workout_tags_list.html
@@ -2,7 +2,7 @@
 <span
     class="text-xs font-semibold inline-block py-1 px-2 uppercase rounded text-pink-600 bg-pink-200 uppercase last:mr-0 mr-1 max-h-fit cursor-pointer"
     hx-get="{{ url_for('goto_tag') }}" hx-vals='{"filter": "{{ tag.tag_filter }}", "person_id": "{{ tag.person_id }}"}'
-    hx-target="#container" hx-push-url="true" _='on click trigger closeModal'>{{
+    hx-target="#container" hx-push-url="true" _='on click trigger closeModalWithoutRefresh'>{{
     tag.tag_name }}
 </span>
 {% endfor%}
\ No newline at end of file