Fix: Save button on FHx should not flicker the screen (save btn click - ensure for pmhx, sochx, surghx)

resources/views/app/patient/note/segment_script.blade.php

@@ -327,14 +327,13 @@
             };
 
             let debouncedSaver = debounce(function(_trigger) {
-                $(_trigger).closest('.visit-segment').find('.autosave-indicator').removeClass('show');
-                $(_trigger).closest('.visit-segment').find('.autosave-indicator.saving').addClass('show');
+                let parent = $(_trigger).closest('.visit-segment');
+                if(!parent.length) parent = $(_trigger).closest('form');
+                parent.find('.autosave-indicator').removeClass('show');
+                parent.find('.autosave-indicator.saving').addClass('show');
                 saveVisitForm(_trigger, true, false, () => {
-                    $(_trigger).closest('.visit-segment').find('.autosave-indicator').removeClass('show');
-                    $(_trigger).closest('.visit-segment').find('.autosave-indicator.saved').addClass('show');
-                    /*window.setTimeout(() => {
-                        $('.autosave-indicator').removeClass('show');
-                    }, 1000);*/
+                    parent.find('.autosave-indicator').removeClass('show');
+                    parent.find('.autosave-indicator.saved').addClass('show');
                 });
             }, 500);
 

resources/views/app/patient/segment-templates/history_family/edit.blade.php

@@ -315,7 +315,7 @@ if(!$contentData) {
 
             @if(!!$segment)
                 <div>
-                    <button submit class="btn btn-sm btn-primary mr-2"><i class="fa fa-save"></i></button>
+                    <button onclick="return saveVisitForm(this, false, false)" type="button" class="btn btn-sm btn-primary mr-2"><i class="fa fa-save"></i></button>
                     <div class="d-inline-flex align-self-stretch align-items-center">
                         <span class="autosave-indicator saving text-sm text-secondary">Saving changes &hellip;</span>
                         <span class="autosave-indicator saved text-sm text-secondary">
@@ -326,8 +326,8 @@ if(!$contentData) {
                 </div>
             @else
                 <div>
-                    <button submit class="btn btn-sm btn-primary mr-2">Submit</button>
-                    <button cancel class="btn btn-sm btn-default border" {!! @$closeOnSave ? 'onmousedown="return closeStagPopup()"' : '' !!}>Close</button>
+                    <button submit type="button" class="btn btn-sm btn-primary mr-2">Submit</button>
+                    <button cancel type="button" class="btn btn-sm btn-default border" {!! @$closeOnSave ? 'onmousedown="return closeStagPopup()"' : '' !!}>Close</button>
                 </div>
             @endif
 

resources/views/app/patient/segment-templates/history_social/edit.blade.php

@@ -134,7 +134,7 @@ for ($i = 0; $i < count($fields); $i++) {
 
             @if(!!$segment)
                 <div>
-                    <button submit class="btn btn-sm btn-primary mr-2"><i class="fa fa-save"></i></button>
+                    <button onclick="return saveVisitForm(this, false, false)" type="button" class="btn btn-sm btn-primary mr-2"><i class="fa fa-save"></i></button>
                     <div class="d-inline-flex align-self-stretch align-items-center">
                         <span class="autosave-indicator saving text-sm text-secondary">Saving changes &hellip;</span>
                         <span class="autosave-indicator saved text-sm text-secondary">

resources/views/app/patient/segment-templates/history_surgical/edit.blade.php

@@ -135,7 +135,7 @@ for ($i = 0; $i < count($fields); $i++) {
 
             @if(!!$segment)
                 <div>
-                    <button submit class="btn btn-sm btn-primary mr-2"><i class="fa fa-save"></i></button>
+                    <button onclick="return saveVisitForm(this, false, false)" type="button" class="btn btn-sm btn-primary mr-2"><i class="fa fa-save"></i></button>
                     <div class="d-inline-flex align-self-stretch align-items-center">
                         <span class="autosave-indicator saving text-sm text-secondary">Saving changes &hellip;</span>
                         <span class="autosave-indicator saved text-sm text-secondary">

resources/views/app/patient/segment-templates/omega_history_family/edit.blade.php

@@ -315,7 +315,7 @@ if(!$contentData) {
 
             @if(!!$segment)
                 <div>
-                    <button submit class="btn btn-sm btn-primary mr-2"><i class="fa fa-save"></i></button>
+                    <button onclick="return saveVisitForm(this, false, true)" type="button" class="btn btn-sm btn-primary mr-2"><i class="fa fa-save"></i></button>
                     <div class="d-inline-flex align-self-stretch align-items-center">
                         <span class="autosave-indicator saving text-sm text-secondary">Saving changes &hellip;</span>
                         <span class="autosave-indicator saved text-sm text-secondary">
@@ -326,8 +326,8 @@ if(!$contentData) {
                 </div>
             @else
                 <div>
-                    <button submit class="btn btn-sm btn-primary mr-2">Submit</button>
-                    <button cancel class="btn btn-sm btn-default border" {!! @$closeOnSave ? 'onmousedown="return closeStagPopup()"' : '' !!}>Close</button>
+                    <button submit type="button" class="btn btn-sm btn-primary mr-2">Submit</button>
+                    <button cancel type="button" class="btn btn-sm btn-default border" {!! @$closeOnSave ? 'onmousedown="return closeStagPopup()"' : '' !!}>Close</button>
                 </div>
             @endif
 

resources/views/app/patient/segment-templates/past_medical_history/edit.blade.php

@@ -174,7 +174,7 @@ for ($i = 0; $i < count($fields); $i++) {
 
             @if(!!$segment)
                 <div>
-                    <button submit class="btn btn-sm btn-primary mr-2"><i class="fa fa-save"></i></button>
+                    <button onclick="return saveVisitForm(this, false, false)" type="button" class="btn btn-sm btn-primary mr-2"><i class="fa fa-save"></i></button>
                     <div class="d-inline-flex align-self-stretch align-items-center">
                         <span class="autosave-indicator saving text-sm text-secondary">Saving changes &hellip;</span>
                         <span class="autosave-indicator saved text-sm text-secondary">