Merge branch 'master' of rav.triplestart.com:jmudaka/stagfe2

resources/views/app/patient/canvas-sections/lifestyle_rx_review/summary.php

@@ -294,17 +294,17 @@ else {
                                 <?= @$exercise['reps'] ? ' / ' . $exercise['reps'] . ' reps' : '' ?>
                                 <?= @$exercise['days_per_week'] ? ' / ' . $exercise['days_per_week'] . ' days/wk' : '' ?>
                             </td>
-                            <td class="px-2 align-middle py-1 bg-white"><?= $exercise['memo'] ?></td>
-                            <td class="px-2 align-middle py-1 bg-white"><?= $exercise['adherence'] ?></td>
-                            <td class="px-2 align-middle py-1 bg-white"><?= $exercise['adherence_memo'] ?></td>
+                            <td class="px-2 align-middle py-1 bg-white"><?= @$exercise['memo'] ? $exercise['memo'] : '-' ?></td>
+                            <td class="px-2 align-middle py-1 bg-white"><?= @$exercise['adherence'] ? $exercise['adherence'] : '-' ?></td>
+                            <td class="px-2 align-middle py-1 bg-white"><?= @$exercise['adherence_memo'] ? $exercise['adherence_memo'] : '-' ?></td>
                         </tr>
                     <?php endforeach; ?>
                     </tbody>
                 <?php endif; ?>
 
-                <?php if ($contentData['adherence']['neat']['active']): ?>
+                <?php if (@$contentData['adherence']['neat']['active']): ?>
                     <tbody class="border-0">
-                    <?php if ($contentData['adherence']['neat']['recommendations']['park_farther']): ?>
+                    <?php if (@$contentData['adherence']['neat']['recommendations']['park_farther']): ?>
                         <tr>
                             <td class="px-2 align-middle py-1 bg-white" colspan="2">
                                 NEAT → Park farther away from entrances
@@ -313,7 +313,7 @@ else {
                             <td class="px-2 align-middle py-1 bg-white"><?= @$contentData['adherence']['neat']['recommendations']['park_farther_adherence_memo'] ?></td>
                         </tr>
                     <?php endif; ?>
-                    <?php if ($contentData['adherence']['neat']['recommendations']['steps_instead_of_elevator']): ?>
+                    <?php if (@$contentData['adherence']['neat']['recommendations']['steps_instead_of_elevator']): ?>
                         <tr>
                             <td class="px-2 align-middle py-1 bg-white" colspan="2">
                                 NEAT → Take the stairs instead of escalator/elevator
@@ -322,7 +322,7 @@ else {
                             <td class="px-2 align-middle py-1 bg-white"><?= @$contentData['adherence']['neat']['recommendations']['steps_instead_of_elevator_adherence_memo'] ?></td>
                         </tr>
                     <?php endif; ?>
-                    <?php if ($contentData['adherence']['neat']['recommendations']['stand_instead_of_sit']): ?>
+                    <?php if (@$contentData['adherence']['neat']['recommendations']['stand_instead_of_sit']): ?>
                         <tr>
                             <td class="px-2 align-middle py-1 bg-white" colspan="2">
                                 NEAT → Stand instead of sit
@@ -331,7 +331,7 @@ else {
                             <td class="px-2 align-middle py-1 bg-white"><?= @$contentData['adherence']['neat']['recommendations']['stand_instead_of_sit_adherence_memo'] ?></td>
                         </tr>
                     <?php endif; ?>
-                    <?php if ($contentData['adherence']['neat']['recommendations']['steps_goal_per_day']): ?>
+                    <?php if (@$contentData['adherence']['neat']['recommendations']['steps_goal_per_day']): ?>
                         <tr>
                             <td class="px-2 align-middle py-1 bg-white" colspan="2">
                                 NEAT → Steps goal / day:
@@ -341,7 +341,7 @@ else {
                             <td class="px-2 align-middle py-1 bg-white"><?= @$contentData['adherence']['neat']['recommendations']['steps_goal_per_day_adherence_memo'] ?></td>
                         </tr>
                     <?php endif; ?>
-                    <?php if ($contentData['adherence']['neat']['recommendations']['other']): ?>
+                    <?php if (@$contentData['adherence']['neat']['recommendations']['other']): ?>
                         <tr>
                             <td class="px-2 align-middle py-1 bg-white" colspan="2">
                                 NEAT → Other: <b><?= @$contentData['adherence']['neat']['recommendations']['other'] ?></b>