Sfoglia il codice sorgente

Nutrition subj - don't show empty data

Vijayakrishnan 3 anni fa
parent
commit
7b5fa8bcf8

+ 14 - 4
resources/views/app/patient/segment-templates/_child_review/nutrition/FAST_FOOD/edit-review.php

@@ -15,8 +15,13 @@ if (@$point) {
             ->first();
         if($previousChildReview && $previousChildReview->data) {
             $parsedReview = json_decode($previousChildReview->data);
-            $previousValue = '<span class="text-sm">Meals per week:</span> ' . (@($parsedReview->mealsPerWeek) ? strip_tags($parsedReview->mealsPerWeek) : '-') . '<br>' .
-                '<span class="text-sm">Self-prepared meals per week:</span> ' . (@($parsedReview->selfPrepMealsPerWeek) ? strip_tags($parsedReview->selfPrepMealsPerWeek) : '-');
+            $previousValue = '';
+            if(@($parsedReview->mealsPerWeek)) {
+                $previousValue .= '<span class="text-sm">Meals per week: ' . strip_tags($parsedReview->mealsPerWeek) . '</span>';
+            }
+            if(@($parsedReview->selfPrepMealsPerWeek)) {
+                $previousValue .= '<span class="text-sm">Self-prepared meals per week: ' . strip_tags($parsedReview->selfPrepMealsPerWeek) . '</span>';
+            }
         }
     }
     else {
@@ -26,8 +31,13 @@ if (@$point) {
             ->first();
         if($previousChildReview && $previousChildReview->data) {
             $parsedReview = json_decode($previousChildReview->data);
-            $previousValue = '<span class="text-sm">Meals per week:</span> ' . (@($parsedReview->mealsPerWeek) ? strip_tags($parsedReview->mealsPerWeek) : '-') . '<br>' .
-                '<span class="text-sm">Self-prepared meals per week:</span> ' . (@($parsedReview->selfPrepMealsPerWeek) ? strip_tags($parsedReview->selfPrepMealsPerWeek) : '-');
+            $previousValue = '';
+            if(@($parsedReview->mealsPerWeek)) {
+                $previousValue .= '<span class="text-sm">Meals per week: ' . strip_tags($parsedReview->mealsPerWeek) . '</span>';
+            }
+            if(@($parsedReview->selfPrepMealsPerWeek)) {
+                $previousValue .= '<span class="text-sm">Self-prepared meals per week: ' . strip_tags($parsedReview->selfPrepMealsPerWeek) . '</span>';
+            }
         }
     }
 }

+ 4 - 0
resources/views/app/patient/segment-templates/_child_review/nutrition/FAST_FOOD/last-review.php

@@ -2,8 +2,12 @@
 <?php if ($point->lastChildReview): ?>
     <?php $parsedReview = json_decode($point->lastChildReview->data); ?>
     <div class="<?= !@$flat && $point->last_child_review_point_scoped_note_id === $note->id ? 'bg-warning-mellow p-2 rounded' : '' ?>">
+        <?php if(@$parsedReview->mealsPerWeek): ?>
         <div class="inline-html-container text-dark"><span class="text-sm">Meals per week:</span> <?= @$parsedReview->mealsPerWeek ? strip_tags($parsedReview->mealsPerWeek) : '' ?></div>
+        <?php endif; ?>
+        <?php if(@$parsedReview->selfPrepMealsPerWeek): ?>
         <div class="inline-html-container text-dark"><span class="text-sm">Self-prepared meals per week:</span> <?= @$parsedReview->selfPrepMealsPerWeek ? strip_tags($parsedReview->selfPrepMealsPerWeek) : '' ?></div>
+        <?php endif; ?>
         <span class="screen-only">
         <?php if ($point->last_child_review_point_scoped_note_id === $patient->core_note_id): ?>
             <span class="text-sm">(updated on the patient's chart)</span>