Client dashboard ESC to close popups fix

app/Http/Controllers/NoteController.php

@@ -342,7 +342,8 @@ class NoteController extends Controller
         return view("app.patient.segment-templates.{$segmentInternalName}.{$view}", [
             'patient' => $patient,
             'note' => $patient->coreNote,
-            'segmentInternalName' => $segmentInternalName
+            'segmentInternalName' => $segmentInternalName,
+            'closeOnSave' => true
         ]);
     }
 

resources/views/app/patient/point-based-partials/fhx.blade.php

@@ -20,7 +20,7 @@
 </div>
 <script>
     if(!window.segmentInitializers) window.segmentInitializers = {};
-    /*addMCInitializer('history_family_{{$patient->id}}', function() {
+    addMCInitializer('history_family_{{$patient->id}}', function() {
         window.segmentInitializers['history_family'].call(window);
-    }, '.fhx-trigger');*/
+    }, '.fhx-trigger');
 </script>

resources/views/app/patient/point-based-partials/pmhx.blade.php

@@ -20,7 +20,7 @@
 </div>
 <script>
     if(!window.segmentInitializers) window.segmentInitializers = {};
-    /*addMCInitializer('past_medical_history_{{$patient->id}}', function() {
+    addMCInitializer('past_medical_history_{{$patient->id}}', function() {
         window.segmentInitializers['past_medical_history'].call(window);
-    }, '.pmhx-trigger');*/
+    }, '.pmhx-trigger');
 </script>

resources/views/app/patient/point-based-partials/shx.blade.php

@@ -20,7 +20,7 @@
 </div>
 <script>
     if(!window.segmentInitializers) window.segmentInitializers = {};
-    /*addMCInitializer('history_surgical_{{$patient->id}}', function() {
+    addMCInitializer('history_surgical_{{$patient->id}}', function() {
         window.segmentInitializers['history_surgical'].call(window);
-    }, '.shx-trigger');*/
+    }, '.shx-trigger');
 </script>

resources/views/app/patient/point-based-partials/sochx.blade.php

@@ -20,7 +20,7 @@
 </div>
 <script>
     if(!window.segmentInitializers) window.segmentInitializers = {};
-    /*addMCInitializer('history_social_{{$patient->id}}', function() {
+    addMCInitializer('history_social_{{$patient->id}}', function() {
         window.segmentInitializers['history_social'].call(window);
-    }, '.sochx-trigger');*/
+    }, '.sochx-trigger');
 </script>

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

@@ -279,7 +279,7 @@ if(!$contentData) {
 
             <div>
                 <button submit class="btn btn-sm btn-primary mr-2">Submit</button>
-                <button cancel class="btn btn-sm btn-default border">Close</button>
+                <button cancel class="btn btn-sm btn-default border" {!! @$closeOnSave ? 'onmousedown="return closeStagPopup()"' : '' !!}>Close</button>
             </div>
 
         </form>

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

@@ -176,7 +176,7 @@ for ($i = 0; $i < count($fields); $i++) {
 
             <div>
                 <button submit class="btn btn-sm btn-primary mr-2">Submit</button>
-                <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                <button cancel class="btn btn-sm btn-default border" {!! @$closeOnSave ? 'onmousedown="return closeStagPopup()"' : '' !!}>Close</button>
             </div>
 
         </form>

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

@@ -174,7 +174,7 @@ for ($i = 0; $i < count($fields); $i++) {
 
             <div>
                 <button submit class="btn btn-sm btn-primary mr-2">Submit</button>
-                <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                <button class="btn btn-sm btn-default border" {!! @$closeOnSave ? 'onmousedown="return closeStagPopup()"' : 'cancel' !!}>Close</button>
             </div>
 
         </form>

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

@@ -216,7 +216,7 @@ for ($i = 0; $i < count($fields); $i++) {
 
             <div>
                 <button submit class="btn btn-sm btn-primary mr-2">Submit</button>
-                <button cancel class="btn btn-sm btn-default border">Close</button>
+                <button cancel class="btn btn-sm btn-default border" {!! @$closeOnSave ? 'onmousedown="return closeStagPopup()"' : '' !!}>Close</button>
             </div>
 
         </form>