Nutrition segments - when point exists adding plan/review not refreshing summary html - fix

resources/views/app/patient/segment-templates/_child_plan/nutrition/DAILY_INTAKE_CALORIES/edit-plan.php

@@ -37,7 +37,7 @@ if (@$point) {
         <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" left>
+        <form url="/api/visitPoint/upsertChildPlan" class="mcp-theme-1 w-100 frm-upsert-review-plan-nutrition" left>
             <input type="hidden" name="uid" value="<?= $point->uid ?>">
             <input type="hidden" name="segmentUid" value="<?= $segment->uid ?>">
             <input type="hidden" name="data">
@@ -64,7 +64,7 @@ if (@$point) {
                      data-field-name="value"><?= $currentValue ?></div>
             </div>
             <div>
-                <button submit class="btn btn-sm btn-primary mr-2">Save</button>
+                <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>

resources/views/app/patient/segment-templates/_child_plan/nutrition/DAILY_INTAKE_CARBOHYDRATES/edit-plan.php

@@ -37,7 +37,7 @@ if (@$point) {
         <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" left>
+        <form url="/api/visitPoint/upsertChildPlan" class="mcp-theme-1 w-100 frm-upsert-review-plan-nutrition" left>
             <input type="hidden" name="uid" value="<?= $point->uid ?>">
             <input type="hidden" name="segmentUid" value="<?= $segment->uid ?>">
             <input type="hidden" name="data">
@@ -64,7 +64,7 @@ if (@$point) {
                      data-field-name="value"><?= $currentValue ?></div>
             </div>
             <div>
-                <button submit class="btn btn-sm btn-primary mr-2">Save</button>
+                <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>

resources/views/app/patient/segment-templates/_child_plan/nutrition/FAST_FOOD/edit-plan.php

@@ -37,7 +37,7 @@ if (@$point) {
         <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" left>
+        <form url="/api/visitPoint/upsertChildPlan" class="mcp-theme-1 w-100 frm-upsert-review-plan-nutrition" left>
             <input type="hidden" name="uid" value="<?= $point->uid ?>">
             <input type="hidden" name="segmentUid" value="<?= $segment->uid ?>">
             <input type="hidden" name="data">
@@ -64,7 +64,7 @@ if (@$point) {
                      data-field-name="value"><?= $currentValue ?></div>
             </div>
             <div>
-                <button submit class="btn btn-sm btn-primary mr-2">Save</button>
+                <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>

resources/views/app/patient/segment-templates/_child_plan/nutrition/HIGH_SUGAR_BEVERAGES/edit-plan.php

@@ -37,7 +37,7 @@ if (@$point) {
         <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" left>
+        <form url="/api/visitPoint/upsertChildPlan" class="mcp-theme-1 w-100 frm-upsert-review-plan-nutrition" left>
             <input type="hidden" name="uid" value="<?= $point->uid ?>">
             <input type="hidden" name="segmentUid" value="<?= $segment->uid ?>">
             <input type="hidden" name="data">
@@ -64,7 +64,7 @@ if (@$point) {
                      data-field-name="value"><?= $currentValue ?></div>
             </div>
             <div>
-                <button submit class="btn btn-sm btn-primary mr-2">Save</button>
+                <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>

resources/views/app/patient/segment-templates/_child_plan/nutrition/PORTION_SIZES/edit-plan.php

@@ -37,7 +37,7 @@ if (@$point) {
         <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" left>
+        <form url="/api/visitPoint/upsertChildPlan" class="mcp-theme-1 w-100 frm-upsert-review-plan-nutrition" left>
             <input type="hidden" name="uid" value="<?= $point->uid ?>">
             <input type="hidden" name="segmentUid" value="<?= $segment->uid ?>">
             <input type="hidden" name="data">
@@ -64,7 +64,7 @@ if (@$point) {
                      data-field-name="value"><?= $currentValue ?></div>
             </div>
             <div>
-                <button submit class="btn btn-sm btn-primary mr-2">Save</button>
+                <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>

resources/views/app/patient/segment-templates/_child_plan/nutrition/SNACKS/edit-plan.php

@@ -37,7 +37,7 @@ if (@$point) {
         <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" left>
+        <form url="/api/visitPoint/upsertChildPlan" class="mcp-theme-1 w-100 frm-upsert-review-plan-nutrition" left>
             <input type="hidden" name="uid" value="<?= $point->uid ?>">
             <input type="hidden" name="segmentUid" value="<?= $segment->uid ?>">
             <input type="hidden" name="data">
@@ -64,7 +64,7 @@ if (@$point) {
                      data-field-name="value"><?= $currentValue ?></div>
             </div>
             <div>
-                <button submit class="btn btn-sm btn-primary mr-2">Save</button>
+                <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>

resources/views/app/patient/segment-templates/_child_plan/nutrition/VEGETABLES/edit-plan.php

@@ -37,7 +37,7 @@ if (@$point) {
         <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" left>
+        <form url="/api/visitPoint/upsertChildPlan" class="mcp-theme-1 w-100 frm-upsert-review-plan-nutrition" left>
             <input type="hidden" name="uid" value="<?= $point->uid ?>">
             <input type="hidden" name="segmentUid" value="<?= $segment->uid ?>">
             <input type="hidden" name="data">
@@ -64,7 +64,7 @@ if (@$point) {
                      data-field-name="value"><?= $currentValue ?></div>
             </div>
             <div>
-                <button submit class="btn btn-sm btn-primary mr-2">Save</button>
+                <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>

resources/views/app/patient/segment-templates/_child_plan/nutrition/WATER_INTAKE/edit-plan.php

@@ -37,7 +37,7 @@ if (@$point) {
         <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" left>
+        <form url="/api/visitPoint/upsertChildPlan" class="mcp-theme-1 w-100 frm-upsert-review-plan-nutrition" left>
             <input type="hidden" name="uid" value="<?= $point->uid ?>">
             <input type="hidden" name="segmentUid" value="<?= $segment->uid ?>">
             <input type="hidden" name="data">
@@ -64,7 +64,7 @@ if (@$point) {
                      data-field-name="value"><?= $currentValue ?></div>
             </div>
             <div>
-                <button submit class="btn btn-sm btn-primary mr-2">Save</button>
+                <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>

resources/views/app/patient/segment-templates/_child_review/nutrition/DAILY_INTAKE_CALORIES/edit-review.php

@@ -37,7 +37,7 @@ if (@$point) {
         <i class="fa <?= !empty($currentValue) ? 'fa-pencil-alt' : 'fa-plus-square'?>"></i>
     </a>
     <?php if($point): ?>
-        <form url="/api/visitPoint/upsertChildReview" class="mcp-theme-1 w-100" left>
+        <form url="/api/visitPoint/upsertChildReview" class="mcp-theme-1 w-100 frm-upsert-review-plan-nutrition" left>
             <input type="hidden" name="uid" value="<?= $point->uid ?>">
             <input type="hidden" name="segmentUid" value="<?= $segment->uid ?>">
             <input type="hidden" name="data">
@@ -64,7 +64,7 @@ if (@$point) {
                      data-field-name="value"><?= $currentValue ?></div>
             </div>
             <div>
-                <button submit class="btn btn-sm btn-primary mr-2">Save</button>
+                <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>

resources/views/app/patient/segment-templates/_child_review/nutrition/DAILY_INTAKE_CARBOHYDRATES/edit-review.php

@@ -37,7 +37,7 @@ if (@$point) {
         <i class="fa <?= !empty($currentValue) ? 'fa-pencil-alt' : 'fa-plus-square'?>"></i>
     </a>
     <?php if($point): ?>
-        <form url="/api/visitPoint/upsertChildReview" class="mcp-theme-1 w-100" left>
+        <form url="/api/visitPoint/upsertChildReview" class="mcp-theme-1 w-100 frm-upsert-review-plan-nutrition" left>
             <input type="hidden" name="uid" value="<?= $point->uid ?>">
             <input type="hidden" name="segmentUid" value="<?= $segment->uid ?>">
             <input type="hidden" name="data">
@@ -64,7 +64,7 @@ if (@$point) {
                      data-field-name="value"><?= $currentValue ?></div>
             </div>
             <div>
-                <button submit class="btn btn-sm btn-primary mr-2">Save</button>
+                <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>

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

@@ -37,7 +37,7 @@ if (@$point) {
         <i class="fa <?= !empty($currentMealsPerWeek) || !empty($currentSelfPreparedMealsPerWeek) ? 'fa-pencil-alt' : 'fa-plus-square'?>"></i>
     </a>
     <?php if($point): ?>
-        <form url="/api/visitPoint/upsertChildReview" class="mcp-theme-1 w-100" left>
+        <form url="/api/visitPoint/upsertChildReview" class="mcp-theme-1 w-100 frm-upsert-review-plan-nutrition" left>
             <input type="hidden" name="uid" value="<?= $point->uid ?>">
             <input type="hidden" name="segmentUid" value="<?= $segment->uid ?>">
             <input type="hidden" name="data">
@@ -70,7 +70,7 @@ if (@$point) {
             </div>
 
             <div>
-                <button submit class="btn btn-sm btn-primary mr-2">Save</button>
+                <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>

resources/views/app/patient/segment-templates/_child_review/nutrition/HIGH_SUGAR_BEVERAGES/edit-review.php

@@ -37,7 +37,7 @@ if (@$point) {
         <i class="fa <?= !empty($currentValue) ? 'fa-pencil-alt' : 'fa-plus-square'?>"></i>
     </a>
     <?php if($point): ?>
-        <form url="/api/visitPoint/upsertChildReview" class="mcp-theme-1 w-100" left>
+        <form url="/api/visitPoint/upsertChildReview" class="mcp-theme-1 w-100 frm-upsert-review-plan-nutrition" left>
             <input type="hidden" name="uid" value="<?= $point->uid ?>">
             <input type="hidden" name="segmentUid" value="<?= $segment->uid ?>">
             <input type="hidden" name="data">
@@ -64,7 +64,7 @@ if (@$point) {
                      data-field-name="value"><?= $currentValue ?></div>
             </div>
             <div>
-                <button submit class="btn btn-sm btn-primary mr-2">Save</button>
+                <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>

resources/views/app/patient/segment-templates/_child_review/nutrition/PORTION_SIZES/edit-review.php

@@ -37,7 +37,7 @@ if (@$point) {
         <i class="fa <?= !empty($currentValue) ? 'fa-pencil-alt' : 'fa-plus-square'?>"></i>
     </a>
     <?php if($point): ?>
-        <form url="/api/visitPoint/upsertChildReview" class="mcp-theme-1 w-100" left>
+        <form url="/api/visitPoint/upsertChildReview" class="mcp-theme-1 w-100 frm-upsert-review-plan-nutrition" left>
             <input type="hidden" name="uid" value="<?= $point->uid ?>">
             <input type="hidden" name="segmentUid" value="<?= $segment->uid ?>">
             <input type="hidden" name="data">
@@ -64,7 +64,7 @@ if (@$point) {
                      data-field-name="value"><?= $currentValue ?></div>
             </div>
             <div>
-                <button submit class="btn btn-sm btn-primary mr-2">Save</button>
+                <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>

resources/views/app/patient/segment-templates/_child_review/nutrition/SNACKS/edit-review.php

@@ -37,7 +37,7 @@ if (@$point) {
         <i class="fa <?= !empty($currentUnhealthySnacks) || !empty($currentHealthySnacks) ? 'fa-pencil-alt' : 'fa-plus-square'?>"></i>
     </a>
     <?php if($point): ?>
-        <form url="/api/visitPoint/upsertChildReview" class="mcp-theme-1 w-100" left>
+        <form url="/api/visitPoint/upsertChildReview" class="mcp-theme-1 w-100 frm-upsert-review-plan-nutrition" left>
             <input type="hidden" name="uid" value="<?= $point->uid ?>">
             <input type="hidden" name="segmentUid" value="<?= $segment->uid ?>">
             <input type="hidden" name="data">
@@ -70,7 +70,7 @@ if (@$point) {
             </div>
 
             <div>
-                <button submit class="btn btn-sm btn-primary mr-2">Save</button>
+                <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>

resources/views/app/patient/segment-templates/_child_review/nutrition/VEGETABLES/edit-review.php

@@ -37,7 +37,7 @@ if (@$point) {
         <i class="fa <?= !empty($currentValue) ? 'fa-pencil-alt' : 'fa-plus-square'?>"></i>
     </a>
     <?php if($point): ?>
-        <form url="/api/visitPoint/upsertChildReview" class="mcp-theme-1 w-100" left>
+        <form url="/api/visitPoint/upsertChildReview" class="mcp-theme-1 w-100 frm-upsert-review-plan-nutrition" left>
             <input type="hidden" name="uid" value="<?= $point->uid ?>">
             <input type="hidden" name="segmentUid" value="<?= $segment->uid ?>">
             <input type="hidden" name="data">
@@ -64,7 +64,7 @@ if (@$point) {
                      data-field-name="value"><?= $currentValue ?></div>
             </div>
             <div>
-                <button submit class="btn btn-sm btn-primary mr-2">Save</button>
+                <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>

resources/views/app/patient/segment-templates/_child_review/nutrition/WATER_INTAKE/edit-review.php

@@ -37,7 +37,7 @@ if (@$point) {
         <i class="fa <?= !empty($currentValue) ? 'fa-pencil-alt' : 'fa-plus-square'?>"></i>
     </a>
     <?php if($point): ?>
-        <form url="/api/visitPoint/upsertChildReview" class="mcp-theme-1 w-100" left>
+        <form url="/api/visitPoint/upsertChildReview" class="mcp-theme-1 w-100 frm-upsert-review-plan-nutrition" left>
             <input type="hidden" name="uid" value="<?= $point->uid ?>">
             <input type="hidden" name="segmentUid" value="<?= $segment->uid ?>">
             <input type="hidden" name="data">
@@ -64,7 +64,7 @@ if (@$point) {
                      data-field-name="value"><?= $currentValue ?></div>
             </div>
             <div>
-                <button submit class="btn btn-sm btn-primary mr-2">Save</button>
+                <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>

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

@@ -551,6 +551,23 @@ parentSegment.find('.frm-add-review-plan-{{$label}}')
         return false;
     });
 
+parentSegment.find('.frm-upsert-review-plan-{{$label}}')
+    .off('submit')
+    .on('submit', function () {
+        let form = $(this);
+        showMask();
+        $.post(form.attr('url'), form.serialize(), _data => {
+            if(!hasResponseError(_data)) {
+                $('.visit-segment[data-segment-template-name="intake_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
+                $('.visit-segment[data-segment-template-name="plan_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
+                refreshDynamicStagPopup();
+            }
+        }).then(() => {
+            hideMask();
+        });
+        return false;
+    });
+
 parentSegment.find('.toggle-relevance')
     .off('click.toggle-relevance')
     .on('click.toggle-relevance', function () {