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

Note UI - centers - edit/read mode fix with new segments

Vijayakrishnan пре 3 година
родитељ
комит
7bd8070641

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

@@ -149,7 +149,10 @@ function isFavoriteAllergy($_allergy, $_favorites) {
                     </div>
                 </td>
                 <td>
-                    <?php $segment = $note->getSegmentByInternalName('intake_allergies'); ?>
+                    <?php
+                    $segment = $note->getSegmentByInternalName('intake_allergies');
+                    if(!$segment) $segment = $note->getSegmentByInternalName('allergies');
+                    ?>
                     <div if-read-mode>
                         <div class="d-flex align-items-start">
                             <div class="flex-grow-1">
@@ -184,7 +187,10 @@ function isFavoriteAllergy($_allergy, $_favorites) {
                     </div>
                 </td>
                 <td>
-                    <?php $segment = $note->getSegmentByInternalName('plan_allergies'); ?>
+                    <?php
+                    $segment = $note->getSegmentByInternalName('plan_allergies');
+                    if(!$segment) $segment = $note->getSegmentByInternalName('allergies');
+                    ?>
                     <div if-read-mode>
                         <div class="d-flex align-items-start position-relative">
                             <div class="flex-grow-1">

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

@@ -54,6 +54,7 @@ $points = [
                         <div if-edit-mode>
                             <?php
                             $segment = $note->getSegmentByInternalName('intake_behavior');
+                            if(!$segment) $segment = $note->getSegmentByInternalName('behavior');
                             if($segment) {
                                 $currentValue = '';
                                 $previousValue = '';
@@ -129,6 +130,7 @@ $points = [
                         <div if-edit-mode>
                             <?php
                             $segment = $note->getSegmentByInternalName('plan_behavior');
+                            if(!$segment) $segment = $note->getSegmentByInternalName('behavior');
                             if($segment) {
                                 $currentValue = '';
                                 $previousValue = '';

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

@@ -153,7 +153,10 @@ list($careTeamMembers, $counts) = Point::getPointsOfCategoryExtended($patient, '
                     </div>
                 </td>
                 <td>
-                    <?php $segment = $note->getSegmentByInternalName('intake_care_team'); ?>
+                    <?php
+                    $segment = $note->getSegmentByInternalName('intake_care_team');
+                    if(!$segment) $segment = $note->getSegmentByInternalName('care_team');
+                    ?>
                     <div if-read-mode>
                         <div class="d-flex align-items-start">
                             <div class="flex-grow-1">
@@ -184,11 +187,17 @@ list($careTeamMembers, $counts) = Point::getPointsOfCategoryExtended($patient, '
                         if($segment) {
                             include resource_path('views/app/patient/segment-templates/_child_review/edit-review-in-place.php');
                         }
+                        else {
+                            echo "pling!";
+                        }
                         ?>
                     </div>
                 </td>
                 <td>
-                    <?php $segment = $note->getSegmentByInternalName('plan_care_team'); ?>
+                    <?php
+                    $segment = $note->getSegmentByInternalName('plan_care_team');
+                    if(!$segment) $segment = $note->getSegmentByInternalName('care_team');
+                    ?>
                     <div if-read-mode>
                         <div class="d-flex align-items-start position-relative">
                             <div class="flex-grow-1">
@@ -376,6 +385,7 @@ list($careTeamMembers, $counts) = Point::getPointsOfCategoryExtended($patient, '
             button
                 .off('click.toggle-edit')
                 .on('click.toggle-edit', function () {
+                    debugger
                     if (mode === 'read') {
                         mode = 'edit';
                         $(this).text('Back to Read Mode');

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

@@ -50,6 +50,7 @@ $points = [
                         <div if-edit-mode>
                             <?php
                             $segment = $note->getSegmentByInternalName('intake_exercise');
+                            if(!$segment) $segment = $note->getSegmentByInternalName('exercise');
                             if($segment) {
                             $currentValue = '';
                             $previousValue = '';
@@ -126,6 +127,7 @@ $points = [
                         <div if-edit-mode>
                             <?php
                             $segment = $note->getSegmentByInternalName('plan_exercise');
+                            if(!$segment) $segment = $note->getSegmentByInternalName('exercise');
                             if($segment) {
                             $currentValue = '';
                             $previousValue = '';

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

@@ -96,7 +96,10 @@ list($goals, $counts) = Point::getPointsOfCategoryExtended($patient, 'GOAL', $no
                     </div>
                 </td>
                 <td>
-                    <?php $segment = $note->getSegmentByInternalName('intake_goals'); ?>
+                    <?php
+                    $segment = $note->getSegmentByInternalName('intake_goals');
+                    if(!$segment) $segment = $note->getSegmentByInternalName('goals');
+                    ?>
                     <div if-read-mode>
                         <div class="d-flex align-items-start">
                             <div class="flex-grow-1">
@@ -131,7 +134,10 @@ list($goals, $counts) = Point::getPointsOfCategoryExtended($patient, 'GOAL', $no
                     </div>
                 </td>
                 <td>
-                    <?php $segment = $note->getSegmentByInternalName('plan_goals'); ?>
+                    <?php
+                    $segment = $note->getSegmentByInternalName('plan_goals');
+                    if(!$segment) $segment = $note->getSegmentByInternalName('goals');
+                    ?>
                     <div if-read-mode>
                         <div class="d-flex align-items-start position-relative">
                             <div class="flex-grow-1">

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

@@ -147,7 +147,10 @@ function isFavoriteMedication($_medication, $_favorites) {
                         </div>
                     </td>
                     <td>
-                        <?php $segment = $note->getSegmentByInternalName('intake_medications'); ?>
+                        <?php
+                        $segment = $note->getSegmentByInternalName('intake_medications');
+                        if(!$segment) $segment = $note->getSegmentByInternalName('medications');
+                        ?>
                         <div if-read-mode>
                             <div class="d-flex align-items-start">
                                 <div class="flex-grow-1">
@@ -182,7 +185,10 @@ function isFavoriteMedication($_medication, $_favorites) {
                         </div>
                     </td>
                     <td>
-                        <?php $segment = $note->getSegmentByInternalName('plan_medications'); ?>
+                        <?php
+                        $segment = $note->getSegmentByInternalName('plan_medications');
+                        if(!$segment) $segment = $note->getSegmentByInternalName('medications');
+                        ?>
                         <div if-read-mode>
                             <div class="d-flex align-items-start position-relative">
                                 <div class="flex-grow-1">

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

@@ -81,6 +81,7 @@ $points = [
                         <div if-edit-mode>
                             <?php
                             $segment = $note->getSegmentByInternalName('intake_nutrition');
+                            if(!$segment) $segment = $note->getSegmentByInternalName('nutrition');
                             if($segment) {
                                 include resource_path('views/app/patient/segment-templates/_child_review/nutrition/' . $p['category'] . '/edit-review.php');
                             }
@@ -100,6 +101,7 @@ $points = [
                         <div if-edit-mode>
                             <?php
                             $segment = $note->getSegmentByInternalName('plan_nutrition');
+                            if(!$segment) $segment = $note->getSegmentByInternalName('nutrition');
                             if($segment) {
                                 include resource_path('views/app/patient/segment-templates/_child_plan/nutrition/' . $p['category'] . '/edit-plan.php');
                             }

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

@@ -186,7 +186,10 @@ function isFavoriteProblem($_problem, $_favorites) {
                     </div>
                 </td>
                 <td>
-                    <?php $segment = $note->getSegmentByInternalName('intake_problems'); ?>
+                    <?php
+                    $segment = $note->getSegmentByInternalName('intake_problems');
+                    if(!$segment) $segment = $note->getSegmentByInternalName('problems');
+                    ?>
                     <div if-read-mode>
                         <div class="d-flex align-items-start">
                             <div class="flex-grow-1">
@@ -221,7 +224,10 @@ function isFavoriteProblem($_problem, $_favorites) {
                     </div>
                 </td>
                 <td>
-                    <?php $segment = $note->getSegmentByInternalName('plan_problems'); ?>
+                    <?php
+                    $segment = $note->getSegmentByInternalName('plan_problems');
+                    if(!$segment) $segment = $note->getSegmentByInternalName('problems');
+                    ?>
                     <div if-read-mode>
                         <div class="d-flex align-items-start position-relative">
                             <div class="flex-grow-1">