Преглед изворни кода

Fix broken 'back to read mode'

Vijayakrishnan пре 3 година
родитељ
комит
483beaa392

+ 4 - 2
resources/views/app/patient/allergies-center.blade.php

@@ -411,7 +411,9 @@ if(!@$summaryView) {
                         $(this).text('Back to Read Mode');
                         $('#allergies-center-{{$note->id}} .point-table').removeClass('read').addClass('edit');
                     } else {
-                        refreshDynamicStagPopup();
+                        let url = $(this).closest('.stag-popup').attr('stag-popup-key');
+                        if(url.indexOf('forceReadMode') === -1) url += '&forceReadMode=1';
+                        refreshDynamicStagPopup(url);
                     }
                     return false;
                 });
@@ -419,7 +421,7 @@ if(!@$summaryView) {
             buttonContainer.insertAfter(titleElem);
 
             <?php
-            if(@$note && !$note->is_signed_by_hcp) { // auto-open edit mode
+            if(@$note && !$note->is_signed_by_hcp && !request()->input('forceReadMode')) { // auto-open edit mode
                 ?>
                 button.trigger('click');
                 <?php

+ 4 - 2
resources/views/app/patient/behavior-center.blade.php

@@ -252,7 +252,9 @@ $points = [
                         $(this).text('Back to Read Mode');
                         $('#behavior-center-{{$note->id}} .point-table').removeClass('read').addClass('edit');
                     } else {
-                        refreshDynamicStagPopup();
+                        let url = $(this).closest('.stag-popup').attr('stag-popup-key');
+                        if(url.indexOf('forceReadMode') === -1) url += '&forceReadMode=1';
+                        refreshDynamicStagPopup(url);
                     }
                     return false;
                 });
@@ -290,7 +292,7 @@ $points = [
                 <?php
             }
             else {
-                if(@$note && !$note->is_signed_by_hcp) { // auto-open edit mode
+                if(@$note && !$note->is_signed_by_hcp && !request()->input('forceReadMode')) { // auto-open edit mode
                     ?>
                     button.trigger('click');
                     <?php

+ 4 - 2
resources/views/app/patient/careteam-center.blade.php

@@ -405,7 +405,9 @@ list($careTeamMembers, $counts) = Point::getPointsOfCategoryExtended($patient, '
                         $(this).text('Back to Read Mode');
                         $('#careteam-center-{{$note->id}} .point-table').removeClass('read').addClass('edit');
                     } else {
-                        refreshDynamicStagPopup();
+                        let url = $(this).closest('.stag-popup').attr('stag-popup-key');
+                        if(url.indexOf('forceReadMode') === -1) url += '&forceReadMode=1';
+                        refreshDynamicStagPopup(url);
                     }
                     return false;
                 });
@@ -413,7 +415,7 @@ list($careTeamMembers, $counts) = Point::getPointsOfCategoryExtended($patient, '
             buttonContainer.insertAfter(titleElem);
 
             <?php
-            if(@$note && !$note->is_signed_by_hcp) { // auto-open edit mode
+            if(@$note && !$note->is_signed_by_hcp && !request()->input('forceReadMode')) { // auto-open edit mode
                 ?>
                 button.trigger('click');
                 <?php

+ 4 - 2
resources/views/app/patient/exercise-center.blade.php

@@ -249,7 +249,9 @@ $points = [
                         $(this).text('Back to Read Mode');
                         $('#exercise-center-{{$note->id}} .point-table').removeClass('read').addClass('edit');
                     } else {
-                        refreshDynamicStagPopup();
+                        let url = $(this).closest('.stag-popup').attr('stag-popup-key');
+                        if(url.indexOf('forceReadMode') === -1) url += '&forceReadMode=1';
+                        refreshDynamicStagPopup(url);
                     }
                     return false;
                 });
@@ -287,7 +289,7 @@ $points = [
                 <?php
             }
             else {
-                if(@$note && !$note->is_signed_by_hcp) { // auto-open edit mode
+                if(@$note && !$note->is_signed_by_hcp && !request()->input('forceReadMode')) { // auto-open edit mode
                     ?>
                     button.trigger('click');
                     <?php

+ 4 - 2
resources/views/app/patient/goals-center.blade.php

@@ -297,7 +297,9 @@ list($goals, $counts) = Point::getPointsOfCategoryExtended($patient, 'GOAL', $no
                         $(this).text('Back to Read Mode');
                         $('#goals-center-{{$note->id}} .point-table').removeClass('read').addClass('edit');
                     } else {
-                        refreshDynamicStagPopup();
+                        let url = $(this).closest('.stag-popup').attr('stag-popup-key');
+                        if(url.indexOf('forceReadMode') === -1) url += '&forceReadMode=1';
+                        refreshDynamicStagPopup(url);
                     }
                     return false;
                 });
@@ -305,7 +307,7 @@ list($goals, $counts) = Point::getPointsOfCategoryExtended($patient, 'GOAL', $no
             buttonContainer.insertAfter(titleElem);
 
             <?php
-            if(@$note && !$note->is_signed_by_hcp) { // auto-open edit mode
+            if(@$note && !$note->is_signed_by_hcp && !request()->input('forceReadMode')) { // auto-open edit mode
                 ?>
                 button.trigger('click');
                 <?php

+ 4 - 2
resources/views/app/patient/medications-center.blade.php

@@ -458,7 +458,9 @@ if(!@$summaryView) {
                     $(this).text('Back to Read Mode');
                     $('#medications-center-{{$note->id}} .point-table').removeClass('read').addClass('edit');
                 } else {
-                    refreshDynamicStagPopup();
+                    let url = $(this).closest('.stag-popup').attr('stag-popup-key');
+                    if(url.indexOf('forceReadMode') === -1) url += '&forceReadMode=1';
+                    refreshDynamicStagPopup(url);
                 }
                 return false;
             });
@@ -466,7 +468,7 @@ if(!@$summaryView) {
         buttonContainer.insertAfter(titleElem);
 
         <?php
-        if(@$note && !$note->is_signed_by_hcp) { // auto-open edit mode
+        if(@$note && !$note->is_signed_by_hcp && !request()->input('forceReadMode')) { // auto-open edit mode
             ?>
             button.trigger('click');
             <?php

+ 4 - 2
resources/views/app/patient/nutrition-center.blade.php

@@ -166,7 +166,9 @@ $points = [
                         $(this).text('Back to Read Mode');
                         $('#nutrition-center-{{$note->id}} .point-table').removeClass('read').addClass('edit');
                     } else {
-                        refreshDynamicStagPopup();
+                        let url = $(this).closest('.stag-popup').attr('stag-popup-key');
+                        if(url.indexOf('forceReadMode') === -1) url += '&forceReadMode=1';
+                        refreshDynamicStagPopup(url);
                     }
                     return false;
                 });
@@ -204,7 +206,7 @@ $points = [
                 <?php
             }
             else {
-                if(@$note && !$note->is_signed_by_hcp) { // auto-open edit mode
+                if(@$note && !$note->is_signed_by_hcp && !request()->input('forceReadMode')) { // auto-open edit mode
                     ?>
                     button.trigger('click');
                     <?php

+ 4 - 2
resources/views/app/patient/problems-center.blade.php

@@ -490,7 +490,9 @@ if(!@$summaryView) {
                         $(this).text('Back to Read Mode');
                         $('#problems-center-{{$note->id}} .point-table').removeClass('read').addClass('edit');
                     } else {
-                        refreshDynamicStagPopup();
+                        let url = $(this).closest('.stag-popup').attr('stag-popup-key');
+                        if(url.indexOf('forceReadMode') === -1) url += '&forceReadMode=1';
+                        refreshDynamicStagPopup(url);
                     }
                     return false;
                 });
@@ -508,7 +510,7 @@ if(!@$summaryView) {
             }, 1000);
 
             <?php
-            if(@$note && !$note->is_signed_by_hcp) { // auto-open edit mode
+            if(@$note && !$note->is_signed_by_hcp && !request()->input('forceReadMode')) { // auto-open edit mode
                 ?>
                 button.trigger('click');
                 <?php