Exercise segments (wip)

resources/views/app/patient/segment-templates/_child_plan/exercise/AEROBIC_ACTIVITY/edit-plan.php

@@ -1,21 +1,56 @@
 <?php
+
+/*
+Format:
+{
+    active: true/false,
+    walk: {
+        active: true/false,
+        frequency: 1..7,
+        intensity: light/moderate/vigorous,
+        time: number,
+    },
+    jog: {
+        active: true/false,
+        frequency: 1..7,
+        intensity: light/moderate/vigorous,
+        time: number,
+    },
+    elliptical: {
+        active: true/false,
+        frequency: 1..7,
+        intensity: light/moderate/vigorous,
+        time: number,
+    },
+    swim: {
+        active: true/false,
+        frequency: 1..7,
+        intensity: light/moderate/vigorous,
+        time: number,
+    },
+    bike: {
+        active: true/false,
+        frequency: 1..7,
+        intensity: light/moderate/vigorous,
+        time: number,
+    },
+    memo: text
+}
+ */
+
 $currentValue = '';
 $previousValue = '';
 $previousChildPlan = null;
 if (@$point) {
     if ($point->lastChildPlan && $point->last_child_plan_point_scoped_note_id === $note->id) {
-        $parsedPlan = json_decode($point->lastChildPlan->data);
-        if(@$parsedPlan->value) {
-            $currentValue = $parsedPlan->value;
-            $previousChildPlan = \App\Models\Point::where('id', '<', $point->lastChildPlan->id)
-                ->where('category', 'PLAN')
-                ->where('parent_point_id', $point->id)
-                ->orderBy('id', 'DESC')
-                ->first();
-            if($previousChildPlan && $previousChildPlan->data) {
-                $parsedPlan = json_decode($previousChildPlan->data);
-                $previousValue = $parsedPlan->value;
-            }
+        $currentValue = json_decode($point->lastChildPlan->data);
+        $previousChildPlan = \App\Models\Point::where('id', '<', $point->lastChildPlan->id)
+            ->where('category', 'PLAN')
+            ->where('parent_point_id', $point->id)
+            ->orderBy('id', 'DESC')
+            ->first();
+        if($previousChildPlan && $previousChildPlan->data) {
+            $previousValue = json_decode($previousChildPlan->data);
         }
     }
     else {
@@ -24,79 +59,240 @@ if (@$point) {
             ->orderBy('id', 'DESC')
             ->first();
         if($previousChildPlan && $previousChildPlan->data) {
-            $parsedPlan = json_decode($previousChildPlan->data);
-            if(@$parsedPlan->value) {
-                $previousValue = $parsedPlan->value;
-            }
+            $previousValue = json_decode($previousChildPlan->data);
         }
     }
 }
 ?>
-<div moe wide class="d-inline">
+<div visit-moe fixed-center largest relative class="d-inline">
     <a start show href="#" class="px-1 text-center d-block" title="<?= !empty($currentValue) ? 'Edit Plan' : 'Add Plan'?>">
         <i class="fa <?= !empty($currentValue) ? 'fa-pencil-alt' : 'fa-plus-square'?>"></i>
     </a>
-    <?php if($point): ?>
-        <form url="/api/visitPoint/upsertChildPlan" class="mcp-theme-1 w-100 frm-upsert-review-plan-nutrition" left>
+    <form url="/api/visitPoint/<?= $point ? 'upsertChildPlan' : 'addTopLevel' ?>"
+          class="mcp-theme-1 frm-review-plan-exercise" right>
+
+        <?php if($point): ?>
             <input type="hidden" name="uid" value="<?= $point->uid ?>">
             <input type="hidden" name="segmentUid" value="<?= $segment->uid ?>">
-            <input type="hidden" name="data">
+        <?php else: ?>
+            <input type="hidden" name="noteUid" value="<?= $note->uid ?>">
+            <input type="hidden" name="category" value="<?= $p['category'] ?>">
+            <input type="hidden" name="additionReasonCategory" value="DURING_VISIT">
+        <?php endif; ?>
 
-            <?php if($segment->segmentTemplate->internal_name === 'intake_problems' && $previousValue): ?>
-                <div class="d-none disallow-if-value-same-as"><?= str_compact($previousValue) ?></div>
-            <?php endif; ?>
+        <?php if ($point): ?>
+            <input type="hidden" name="data">
+        <?php else: ?>
+            <input type="hidden" name="childPlanData">
+        <?php endif; ?>
 
-            <?php if($previousValue): ?>
-                <div class="mb-2">
-                    <div class="d-flex align-items-baseline mb-1">
-                        <span class="text-sm text-secondary">Previous Plan / <?= friendlier_date($previousChildPlan->created_at) ?>) (click to copy)</span>
-                    </div>
-                    <div class="p-2 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
+        <?php if($previousValue): ?>
+            <div class="mb-2">
+                <div class="d-flex align-items-baseline mb-1">
+                    <span class="text-sm text-secondary">Previous Plan / <?= friendlier_date($previousChildPlan->created_at) ?>)</span>
+                </div>
+                <div class="p-2 bg-light border inline-html-container">
+                    <?php $plan = $previousValue; ?>
+                    <?php include(resource_path('views/app/patient/segment-templates/_child_plan/exercise/' . $p['category'] . '/view-plan.php')); ?>
                 </div>
-            <?php endif; ?>
+            </div>
+        <?php endif; ?>
 
-            <p class="mb-2"><b>Change goal:</b></p>
+        <p class="mb-2"><b>Change Goal:</b></p>
 
-            <div class="mb-2">
-                <div note-rte
-                    <?= $segment->segmentTemplate->internal_name === 'intake_problems' ? 'use-shortcuts="hpi,user"' : '' ?>
-                     class="form-group mb-2 border-left border-right rte-holder"
-                     data-field-name="value"><?= $currentValue ?></div>
-            </div>
-            <div>
-                <button type="submit"  class="btn btn-sm btn-primary mr-2">Save</button>
-                <button cancel class="btn btn-sm btn-default border">Cancel</button>
-            </div>
-        </form>
-    <?php else: ?>
-        <form url="/api/visitPoint/addTopLevel" class="mcp-theme-1 frm-add-review-plan-nutrition w-100" left>
-            <input type="hidden" name="noteUid" value="<?= $note->uid ?>">
-            <input type="hidden" name="category" value="<?= $p['category'] ?>">
-            <input type="hidden" name="additionReasonCategory" value="ON_INTAKE">
-            <input type="hidden" name="data">
+        <label class="mb-2 d-flex align-items-center">
+            <input type="checkbox" data-name="active" <?= @($currentValue->active) ? 'checked' : ''?>>
+            <span class="ml-2">Prescribe aerobic activities?</span>
+        </label>
 
-            <?php if($previousValue): ?>
-                <div class="mb-2">
-                    <div class="d-flex align-items-baseline mb-1">
-                        <span class="text-sm text-secondary">Previous Plan / <?= friendlier_date($previousChildPlan->created_at) ?>) (click to copy)</span>
+        <table if-active class="table table-sm table-bordered" style="table-layout: fixed">
+            <tbody>
+            <tr>
+                <td class="align-middle">Activity</td>
+                <td class="text-left">
+                    <div class="d-flex align-items-center">
+                        <input type="checkbox" class="d-none" data-name="walk->active" <?= @($currentValue->walk->active) ? 'checked' : '' ?>>
+                        <img src="/img/exercise-rx/walk.png" class="icon-nutrition-rx-row mx-1 <?= @($currentValue->walk->active) ? '' : 'opacity-35' ?>">
+                        <button data-type="walk" class="btn-toggle-activity flex-grow-1 shadow-none btn btn-sm <?= @($currentValue->walk->active) ? 'btn-info' : 'btn-default border' ?>">
+                            Walk
+                        </button>
                     </div>
-                    <div class="p-2 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
-                </div>
-            <?php endif; ?>
-
-            <p class="mb-2"><b>Change goal:</b></p>
+                </td>
+                <td class="text-left">
+                    <div class="d-flex align-items-center">
+                        <input type="checkbox" class="d-none" data-name="jog->active" <?= @($currentValue->jog->active) ? 'checked' : '' ?>>
+                        <img src="/img/exercise-rx/jog.png" class="icon-nutrition-rx-row mx-1 <?= @($currentValue->jog->active) ? '' : 'opacity-35' ?>">
+                        <button data-type="jog" class="btn-toggle-activity flex-grow-1 shadow-none btn btn-sm <?= @($currentValue->jog->active) ? 'btn-info' : 'btn-default border' ?>">
+                            Jog
+                        </button>
+                    </div>
+                </td>
+                <td class="text-left">
+                    <div class="d-flex align-items-center">
+                        <input type="checkbox" class="d-none" data-name="elliptical->active" <?= @($currentValue->elliptical->active) ? 'checked' : '' ?>>
+                        <img src="/img/exercise-rx/elliptical.png" class="icon-nutrition-rx-row mx-1 <?= @($currentValue->elliptical->active) ? '' : 'opacity-35' ?>">
+                        <button data-type="elliptical" class="btn-toggle-activity flex-grow-1 shadow-none btn btn-sm <?= @($currentValue->elliptical->active) ? 'btn-info' : 'btn-default border' ?>">
+                            Elliptical
+                        </button>
+                    </div>
+                </td>
+                <td class="text-left">
+                    <div class="d-flex align-items-center">
+                        <input type="checkbox" class="d-none" data-name="swim->active" <?= @($currentValue->swim->active) ? 'checked' : '' ?>>
+                        <img src="/img/exercise-rx/swim.png" class="icon-nutrition-rx-row mx-1 <?= @($currentValue->swim->active) ? '' : 'opacity-35' ?>">
+                        <button data-type="swim" class="btn-toggle-activity flex-grow-1 shadow-none btn btn-sm <?= @($currentValue->swim->active) ? 'btn-info' : 'btn-default border' ?>">
+                            Swim
+                        </button>
+                    </div>
+                </td>
+                <td class="text-left">
+                    <div class="d-flex align-items-center">
+                        <input type="checkbox" class="d-none" data-name="bike->active" <?= @($currentValue->bike->active) ? 'checked' : '' ?>>
+                        <img src="/img/exercise-rx/bike.png" class="icon-nutrition-rx-row mx-1 <?= @($currentValue->bike->active) ? '' : 'opacity-35' ?>">
+                        <button data-type="bike" class="btn-toggle-activity flex-grow-1 shadow-none btn btn-sm <?= @($currentValue->bike->active) ? 'btn-info' : 'btn-default border' ?>">
+                            Bike
+                        </button>
+                    </div>
+                </td>
+            </tr>
+            <tr>
+                <td>Frequency (days/wk)</td>
+                <td>
+                    <select if-walk-active class="form-control form-control-sm min-width-unset px-0" data-name="walk->frequency">
+                        <option value="">-- select --</option>
+                        <option value="1" <?= @($currentValue->walk->frequency) == 1 ? 'selected' : ''?>>1 day</option>
+                        <option value="2" <?= @($currentValue->walk->frequency) == 2 ? 'selected' : ''?>>2 days</option>
+                        <option value="3" <?= @($currentValue->walk->frequency) == 3 ? 'selected' : ''?>>3 days</option>
+                        <option value="4" <?= @($currentValue->walk->frequency) == 4 ? 'selected' : ''?>>4 days</option>
+                        <option value="5" <?= @($currentValue->walk->frequency) == 5 ? 'selected' : ''?>>5 days</option>
+                        <option value="6" <?= @($currentValue->walk->frequency) == 6 ? 'selected' : ''?>>6 days</option>
+                        <option value="7" <?= @($currentValue->walk->frequency) == 7 ? 'selected' : ''?>>7 days</option>
+                    </select>
+                </td>
+                <td>
+                    <select if-jog-active class="form-control form-control-sm min-width-unset px-0" data-name="jog->frequency">
+                        <option value="">-- select --</option>
+                        <option value="1" <?= @($currentValue->jog->frequency) == 1 ? 'selected' : ''?>>1 day</option>
+                        <option value="2" <?= @($currentValue->jog->frequency) == 2 ? 'selected' : ''?>>2 days</option>
+                        <option value="3" <?= @($currentValue->jog->frequency) == 3 ? 'selected' : ''?>>3 days</option>
+                        <option value="4" <?= @($currentValue->jog->frequency) == 4 ? 'selected' : ''?>>4 days</option>
+                        <option value="5" <?= @($currentValue->jog->frequency) == 5 ? 'selected' : ''?>>5 days</option>
+                        <option value="6" <?= @($currentValue->jog->frequency) == 6 ? 'selected' : ''?>>6 days</option>
+                        <option value="7" <?= @($currentValue->jog->frequency) == 7 ? 'selected' : ''?>>7 days</option>
+                    </select>
+                </td>
+                <td>
+                    <select if-elliptical-active class="form-control form-control-sm min-width-unset px-0" data-name="elliptical->frequency">
+                        <option value="">-- select --</option>
+                        <option value="1" <?= @($currentValue->elliptical->frequency) == 1 ? 'selected' : ''?>>1 day</option>
+                        <option value="2" <?= @($currentValue->elliptical->frequency) == 2 ? 'selected' : ''?>>2 days</option>
+                        <option value="3" <?= @($currentValue->elliptical->frequency) == 3 ? 'selected' : ''?>>3 days</option>
+                        <option value="4" <?= @($currentValue->elliptical->frequency) == 4 ? 'selected' : ''?>>4 days</option>
+                        <option value="5" <?= @($currentValue->elliptical->frequency) == 5 ? 'selected' : ''?>>5 days</option>
+                        <option value="6" <?= @($currentValue->elliptical->frequency) == 6 ? 'selected' : ''?>>6 days</option>
+                        <option value="7" <?= @($currentValue->elliptical->frequency) == 7 ? 'selected' : ''?>>7 days</option>
+                    </select>
+                </td>
+                <td>
+                    <select if-swim-active class="form-control form-control-sm min-width-unset px-0" data-name="swim->frequency">
+                        <option value="">-- select --</option>
+                        <option value="1" <?= @($currentValue->swim->frequency) == 1 ? 'selected' : ''?>>1 day</option>
+                        <option value="2" <?= @($currentValue->swim->frequency) == 2 ? 'selected' : ''?>>2 days</option>
+                        <option value="3" <?= @($currentValue->swim->frequency) == 3 ? 'selected' : ''?>>3 days</option>
+                        <option value="4" <?= @($currentValue->swim->frequency) == 4 ? 'selected' : ''?>>4 days</option>
+                        <option value="5" <?= @($currentValue->swim->frequency) == 5 ? 'selected' : ''?>>5 days</option>
+                        <option value="6" <?= @($currentValue->swim->frequency) == 6 ? 'selected' : ''?>>6 days</option>
+                        <option value="7" <?= @($currentValue->swim->frequency) == 7 ? 'selected' : ''?>>7 days</option>
+                    </select>
+                </td>
+                <td>
+                    <select if-bike-active class="form-control form-control-sm min-width-unset px-0" data-name="bike->frequency">
+                        <option value="">-- select --</option>
+                        <option value="1" <?= @($currentValue->bike->frequency) == 1 ? 'selected' : ''?>>1 day</option>
+                        <option value="2" <?= @($currentValue->bike->frequency) == 2 ? 'selected' : ''?>>2 days</option>
+                        <option value="3" <?= @($currentValue->bike->frequency) == 3 ? 'selected' : ''?>>3 days</option>
+                        <option value="4" <?= @($currentValue->bike->frequency) == 4 ? 'selected' : ''?>>4 days</option>
+                        <option value="5" <?= @($currentValue->bike->frequency) == 5 ? 'selected' : ''?>>5 days</option>
+                        <option value="6" <?= @($currentValue->bike->frequency) == 6 ? 'selected' : ''?>>6 days</option>
+                        <option value="7" <?= @($currentValue->bike->frequency) == 7 ? 'selected' : ''?>>7 days</option>
+                    </select>
+                </td>
+            </tr>
+            <tr>
+                <td>Intensity</td>
+                <td>
+                    <select if-walk-active class="form-control form-control-sm min-width-unset px-0" data-name="walk->intensity">
+                        <option value="">-- select --</option>
+                        <option value="Light" <?= @($currentValue->walk->intensity) == 'Light' ? 'selected' : ''?>>Light</option>
+                        <option value="Moderate" <?= @($currentValue->walk->intensity) == 'Moderate' ? 'selected' : ''?>>Moderate</option>
+                        <option value="Vigorous" <?= @($currentValue->walk->intensity) == 'Vigorous' ? 'selected' : ''?>>Vigorous</option>
+                    </select>
+                </td>
+                <td>
+                    <select if-jog-active class="form-control form-control-sm min-width-unset px-0" data-name="jog->intensity">
+                        <option value="">-- select --</option>
+                        <option value="Light" <?= @($currentValue->jog->intensity) == 'Light' ? 'selected' : ''?>>Light</option>
+                        <option value="Moderate" <?= @($currentValue->jog->intensity) == 'Moderate' ? 'selected' : ''?>>Moderate</option>
+                        <option value="Vigorous" <?= @($currentValue->jog->intensity) == 'Vigorous' ? 'selected' : ''?>>Vigorous</option>
+                    </select>
+                </td>
+                <td>
+                    <select if-elliptical-active class="form-control form-control-sm min-width-unset px-0" data-name="elliptical->intensity">
+                        <option value="">-- select --</option>
+                        <option value="Light" <?= @($currentValue->elliptical->intensity) == 'Light' ? 'selected' : ''?>>Light</option>
+                        <option value="Moderate" <?= @($currentValue->elliptical->intensity) == 'Moderate' ? 'selected' : ''?>>Moderate</option>
+                        <option value="Vigorous" <?= @($currentValue->elliptical->intensity) == 'Vigorous' ? 'selected' : ''?>>Vigorous</option>
+                    </select>
+                </td>
+                <td>
+                    <select if-swim-active class="form-control form-control-sm min-width-unset px-0" data-name="swim->intensity">
+                        <option value="">-- select --</option>
+                        <option value="Light" <?= @($currentValue->swim->intensity) == 'Light' ? 'selected' : ''?>>Light</option>
+                        <option value="Moderate" <?= @($currentValue->swim->intensity) == 'Moderate' ? 'selected' : ''?>>Moderate</option>
+                        <option value="Vigorous" <?= @($currentValue->swim->intensity) == 'Vigorous' ? 'selected' : ''?>>Vigorous</option>
+                    </select>
+                </td>
+                <td>
+                    <select if-bike-active class="form-control form-control-sm min-width-unset px-0" data-name="bike->intensity">
+                        <option value="">-- select --</option>
+                        <option value="Light" <?= @($currentValue->bike->intensity) == 'Light' ? 'selected' : ''?>>Light</option>
+                        <option value="Moderate" <?= @($currentValue->bike->intensity) == 'Moderate' ? 'selected' : ''?>>Moderate</option>
+                        <option value="Vigorous" <?= @($currentValue->bike->intensity) == 'Vigorous' ? 'selected' : ''?>>Vigorous</option>
+                    </select>
+                </td>
+            </tr>
+            <tr>
+                <td>Time (mins/day)</td>
+                <td>
+                    <input if-walk-active class="form-control form-control-sm min-width-unset px-1" type="text" data-name="walk->time" value="<?= @($currentValue->walk->time) ?>">
+                </td>
+                <td>
+                    <input if-jog-active class="form-control form-control-sm min-width-unset px-1" type="text" data-name="jog->time" value="<?= @($currentValue->jog->time) ?>">
+                </td>
+                <td>
+                    <input if-elliptical-active class="form-control form-control-sm min-width-unset px-1" type="text" data-name="elliptical->time" value="<?= @($currentValue->elliptical->time) ?>">
+                </td>
+                <td>
+                    <input if-swim-active class="form-control form-control-sm min-width-unset px-1" type="text" data-name="swim->time" value="<?= @($currentValue->swim->time) ?>">
+                </td>
+                <td>
+                    <input if-bike-active class="form-control form-control-sm min-width-unset px-1" type="text" data-name="bike->time" value="<?= @($currentValue->bike->time) ?>">
+                </td>
+            </tr>
+            </tbody>
+        </table>
 
-            <div class="mb-2">
-                <div note-rte
-                     class="form-group mb-2 border-left border-right rte-holder"
-                     data-field-name="planValue"><?= $currentValue ?></div>
-            </div>
-            <div>
-                <button type="submit" class="btn btn-sm btn-primary mr-2">Save</button>
-                <button cancel class="btn btn-sm btn-default border">Cancel</button>
-            </div>
-        </form>
-    <?php endif; ?>
+        <div if-active class="mb-2">
+            <label for="" class="mb-1">Memo</label>
+            <div note-rte slim-rte
+                 class="form-group mb-2 border-left border-right rte-holder"
+                 data-field-name="memo"><?= @($currentValue->memo) ?></div>
+        </div>
+        <div>
+            <button type="submit"  class="btn btn-sm btn-primary mr-2">Save</button>
+            <button cancel class="btn btn-sm btn-default border">Cancel</button>
+        </div>
+    </form>
 </div>
 <?php if(!empty($currentValue)): ?>
     <div visit-moe relative class="d-inline">

resources/views/app/patient/segment-templates/_child_plan/exercise/AEROBIC_ACTIVITY/last-plan.php

@@ -2,8 +2,10 @@
 <?php if ($point->lastChildPlan): ?>
     <?php $parsedPlan = json_decode($point->lastChildPlan->data); ?>
     <div class="<?= $point->last_child_plan_point_scoped_note_id === $note->id ? 'bg-warning-mellow p-2 rounded' : '' ?>">
-        <div class="inline-html-container"><?= $parsedPlan->value ?></div>
-        <div class="text-secondary text-sm"></div>
+        <div class="inline-html-container">
+            <?php $plan = $parsedPlan; ?>
+            <?php include(resource_path('views/app/patient/segment-templates/_child_plan/exercise/' . $p['category'] . '/view-plan.php')); ?>
+        </div>
 
         <?php if ($point->last_child_plan_point_scoped_note_id === $patient->core_note_id): ?>
             <span class="text-sm">(updated on the patient's chart)</span>

resources/views/app/patient/segment-templates/_child_plan/exercise/AEROBIC_ACTIVITY/view-plan.php

@@ -0,0 +1,56 @@
+<?php
+if(@$plan && @($plan->active)) {
+    if (@($plan->walk->active)) {
+    ?>
+        <div class="mb-1 d-flex align-items-baseline">
+            <span><?= @($plan->walk->intensity) ?: '-' ?> Walk</span>
+            <span class="ml-2 text-sm"><?= @($plan->walk->frequency) ?: '-' ?> day(s)/week</span>
+            <span class="ml-2 text-sm"><?= @($plan->walk->time) ?: '-' ?> min(s)/day</span>
+        </div>
+    <?php
+    }
+    if (@($plan->jog->active)) {
+        ?>
+        <div class="mb-1 d-flex align-items-baseline">
+            <span><?= @($plan->jog->intensity) ?: '-' ?> Jog</span>
+            <span class="ml-2 text-sm"><?= @($plan->jog->frequency) ?: '-' ?> day(s)/week</span>
+            <span class="ml-2 text-sm"><?= @($plan->jog->time) ?: '-' ?> min(s)/day</span>
+        </div>
+        <?php
+    }
+    if (@($plan->elliptical->active)) {
+        ?>
+        <div class="mb-1 d-flex align-items-baseline">
+            <span><?= @($plan->elliptical->intensity) ?: '-' ?> Elliptical</span>
+            <span class="ml-2 text-sm"><?= @($plan->elliptical->frequency) ?: '-' ?> day(s)/week</span>
+            <span class="ml-2 text-sm"><?= @($plan->elliptical->time) ?: '-' ?> min(s)/day</span>
+        </div>
+        <?php
+    }
+    if (@($plan->swim->active)) {
+        ?>
+        <div class="mb-1 d-flex align-items-baseline">
+            <span><?= @($plan->swim->intensity) ?: '-' ?> Swim</span>
+            <span class="ml-2 text-sm"><?= @($plan->swim->frequency) ?: '-' ?> day(s)/week</span>
+            <span class="ml-2 text-sm"><?= @($plan->swim->time) ?: '-' ?> min(s)/day</span>
+        </div>
+        <?php
+    }
+    if (@($plan->bike->active)) {
+        ?>
+        <div class="mb-1 d-flex align-items-baseline">
+            <span><?= @($plan->bike->intensity) ?: '-' ?> Bike</span>
+            <span class="ml-2 text-sm"><?= @($plan->bike->frequency) ?: '-' ?> day(s)/week</span>
+            <span class="ml-2 text-sm"><?= @($plan->bike->time) ?: '-' ?> min(s)/day</span>
+        </div>
+        <?php
+    }
+    ?>
+    <div class="text-secondary"><?= @($plan->memo) ?: '' ?></div>
+    <?php
+}
+else {
+    ?> - <?php
+}
+?>
+

resources/views/app/patient/segment-templates/_child_review/exercise/AEROBIC_ACTIVITY/view-review.php

@@ -12,7 +12,7 @@ if(@$review && @($review->active)) {
     if (@($review->jog->active)) {
         ?>
         <div class="mb-1 d-flex align-items-baseline">
-            <span><?= @($review->jog->intensity) ?: '-' ?> Walk</span>
+            <span><?= @($review->jog->intensity) ?: '-' ?> Jog</span>
             <span class="ml-2 text-sm"><?= @($review->jog->frequency) ?: '-' ?> day(s)/week</span>
             <span class="ml-2 text-sm"><?= @($review->jog->time) ?: '-' ?> min(s)/day</span>
         </div>
@@ -21,7 +21,7 @@ if(@$review && @($review->active)) {
     if (@($review->elliptical->active)) {
         ?>
         <div class="mb-1 d-flex align-items-baseline">
-            <span><?= @($review->elliptical->intensity) ?: '-' ?> Walk</span>
+            <span><?= @($review->elliptical->intensity) ?: '-' ?> Elliptical</span>
             <span class="ml-2 text-sm"><?= @($review->elliptical->frequency) ?: '-' ?> day(s)/week</span>
             <span class="ml-2 text-sm"><?= @($review->elliptical->time) ?: '-' ?> min(s)/day</span>
         </div>
@@ -30,7 +30,7 @@ if(@$review && @($review->active)) {
     if (@($review->swim->active)) {
         ?>
         <div class="mb-1 d-flex align-items-baseline">
-            <span><?= @($review->swim->intensity) ?: '-' ?> Walk</span>
+            <span><?= @($review->swim->intensity) ?: '-' ?> Swim</span>
             <span class="ml-2 text-sm"><?= @($review->swim->frequency) ?: '-' ?> day(s)/week</span>
             <span class="ml-2 text-sm"><?= @($review->swim->time) ?: '-' ?> min(s)/day</span>
         </div>
@@ -39,7 +39,7 @@ if(@$review && @($review->active)) {
     if (@($review->bike->active)) {
         ?>
         <div class="mb-1 d-flex align-items-baseline">
-            <span><?= @($review->bike->intensity) ?: '-' ?> Walk</span>
+            <span><?= @($review->bike->intensity) ?: '-' ?> Bike</span>
             <span class="ml-2 text-sm"><?= @($review->bike->frequency) ?: '-' ?> day(s)/week</span>
             <span class="ml-2 text-sm"><?= @($review->bike->time) ?: '-' ?> min(s)/day</span>
         </div>

resources/views/app/patient/wizard-partials/common-script.blade.php

@@ -643,7 +643,14 @@ parentSegment.find('.frm-review-plan-exercise')
             form[0].reportValidity();
             return false;
         }
-        fillJsonDataField(form, form.find('[name="childReviewData"]').length ? 'childReviewData' : 'data');
+        let dataField = 'data';
+        if(form.find('[name="childReviewData"]').length) {
+            dataField = 'childReviewData';
+        }
+        else if(form.find('[name="childPlanData"]').length) {
+            dataField = 'childPlanData';
+        }
+        fillJsonDataField(form, dataField);
         showMask();
         $.post(form.attr('url'), form.serialize(), _data => {
             if(!hasResponseError(_data)) {