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

resources/views/app/patient/allergies-center.blade.php

@@ -225,7 +225,7 @@ list($allergies, $counts) = Point::getPointsOfCategoryExtended($patient, 'ALLERG
 
                 });
 
-            @include('app.patient.wizard-partials.common-script', ['label' => 'allergy'])
+            @include('app.patient.wizard-partials.common-script', ['label' => 'allergy', 'segment_part' => 'allergies'])
 
             initSegmentMoes($('#allergies-center-{{$note->id}}'));
             __initRTEs(parentSegment.find('[note-rte]:not(.ql-container)'));

resources/views/app/patient/careteam-center.blade.php

@@ -271,7 +271,7 @@ list($careTeamMembers, $counts) = Point::getPointsOfCategoryExtended($patient, '
                 })
                 .trigger('change');
 
-            @include('app.patient.wizard-partials.common-script', ['label' => 'care-team-member'])
+            @include('app.patient.wizard-partials.common-script', ['label' => 'care-team-member', 'segment_part' => 'care_team'])
 
             initSegmentMoes($('#careteam-center-{{$note->id}}'));
             __initRTEs(parentSegment.find('[note-rte]:not(.ql-container)'));

resources/views/app/patient/goals-center.blade.php

@@ -211,7 +211,7 @@ list($goals, $counts) = Point::getPointsOfCategoryExtended($patient, 'GOAL', $no
                 })
                 .trigger('change');
 
-            @include('app.patient.wizard-partials.common-script', ['label' => 'goal'])
+            @include('app.patient.wizard-partials.common-script', ['label' => 'goal', 'segment_part' => 'goals'])
 
             initSegmentMoes($('#goals-center-{{$note->id}}'));
             __initRTEs(parentSegment.find('[note-rte]:not(.ql-container)'));

resources/views/app/patient/medications-center.blade.php

@@ -262,7 +262,7 @@ list($medications, $counts) = Point::getPointsOfCategoryExtended($patient, 'MEDI
                 return false;
             });
 
-        @include('app.patient.wizard-partials.common-script', ['label' => 'medication'])
+        @include('app.patient.wizard-partials.common-script', ['label' => 'medication', 'segment_part' => 'medications'])
 
         // custom buttons on title bar
         $('.button-container').remove();

resources/views/app/patient/note/dashboard.blade.php

@@ -682,10 +682,14 @@
                         (function () {
                             function calculateUsualBmi() {
                                 let h = $('#bmi-management-settings [name="currentHeightInInches"]').val(),
-                                    w = $('#bmi-management-settings [name="usualWeightInPounds"]').val();
-                                let bmiElem = $('#bmi-management-settings [name="usualBmi"]').val(''),
-                                    bmiCategoryElem = $('#bmi-management-settings [name="usualBmiCategory"]').val('');
-                                calculateBmi(h, w, bmiElem, bmiCategoryElem);
+                                    wMin = $('#bmi-management-settings [name="usualWeightInPoundsMin"]').val(),
+                                    wMax = $('#bmi-management-settings [name="usualWeightInPoundsMax"]').val();
+                                let bmiMinElem = $('#bmi-management-settings [name="usualBmiMin"]').val(''),
+                                    bmiMinCategoryElem = $('#bmi-management-settings [name="usualBmiMinCategory"]').val(''),
+                                    bmiMaxElem = $('#bmi-management-settings [name="usualBmiMax"]').val(''),
+                                    bmiMaxCategoryElem = $('#bmi-management-settings [name="usualBmiMaxCategory"]').val('');
+                                calculateBmi(h, wMin, bmiMinElem, bmiMinCategoryElem);
+                                calculateBmi(h, wMax, bmiMaxElem, bmiMaxCategoryElem);
                                 return false;
                             }
 
@@ -727,9 +731,9 @@
                             function init() {
                                 $(document)
                                     .off('change input paste keyup',
-                                        '#bmi-management-settings [name="currentHeightInInches"], #bmi-management-settings [name="usualWeightInPounds"]')
+                                        '#bmi-management-settings [name="currentHeightInInches"], #bmi-management-settings [name="usualWeightInPoundsMin"],  #bmi-management-settings [name="usualWeightInPoundsMax"]')
                                     .on('change input paste keyup',
-                                        '#bmi-management-settings [name="currentHeightInInches"], #bmi-management-settings [name="usualWeightInPounds"]', function () {
+                                        '#bmi-management-settings [name="currentHeightInInches"], #bmi-management-settings [name="usualWeightInPoundsMin"],  #bmi-management-settings [name="usualWeightInPoundsMax"]', function () {
                                             return calculateUsualBmi();
                                         });
                                 $(document)

resources/views/app/patient/problems-center.blade.php

@@ -309,7 +309,7 @@ $ccSegment = $note->getSegmentByInternalName('chief_complaint');
                     }, 'json');
                 });
 
-            @include('app.patient.wizard-partials.common-script', ['label' => 'problem'])
+            @include('app.patient.wizard-partials.common-script', ['label' => 'problem', 'segment_part' => 'problems'])
 
             @if($patient->core_note_id !== $note->id)
             parentSegment.find('.regenerate-cc')

resources/views/app/patient/segment-templates/intake_problems/summary.blade.php

@@ -41,7 +41,7 @@ $numRelevant = 0;
             <?php if(!!$review): ?>
             <div class="pl-3 mt-1">
                 <div class="text-secondary font-weight-bold">Review</div>
-                <div>{!! $review->data->value !!}</div>
+                <div>{!! @$review->data->value !!}</div>
             </div>
             <?php elseif($rel): ?>
             <div class="relevant-without-review block-signing text-danger mt-1 text-sm" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Review missing</div>

resources/views/app/patient/segment-templates/plan_problems/summary.blade.php

@@ -61,7 +61,7 @@ $numRelevantWithICD = 0;
             <?php if(!!$hpi): ?>
             <div class="pl-3 mt-1">
                 <div class="text-secondary font-weight-bold">HPI</div>
-                <div>{!! $hpi->data->value !!}</div>
+                <div>{!! @$hpi->data->value !!}</div>
             </div>
             <?php elseif($rel): ?>
             <div class="relevant-without-review block-signing text-danger text-sm mt-1" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>">
@@ -71,7 +71,7 @@ $numRelevantWithICD = 0;
             <?php if(!!$review): ?>
             <div class="pl-3 mt-1">
                 <div class="text-secondary font-weight-bold">Plan</div>
-                <div>{!! $review->data->value !!}</div>
+                <div>{!! @$review->data->value !!}</div>
             </div>
             <?php elseif($rel && !$problem->is_removed): ?>
             <div class="relevant-without-plan block-signing text-danger text-sm mt-1" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>">

resources/views/app/patient/settings.blade.php

@@ -122,6 +122,76 @@
                     </div>
                 </div>
 
+                <hr class="m-negator-3 my-3">
+                <div class="mt-3 mb-2">
+                    <div class="font-weight-bold mb-2">Name</div>
+                    <div class="mb-1">
+                        <div class="mb-1">
+                            Name Prefix: <b>{{$patient->name_prefix}}</b>
+                        </div>
+                        <div class="mb-1">
+                            Name First: <b>{{$patient->name_first}}</b>
+                        </div>
+                        <div class="mb-1">
+                            Name Middle: <b>{{$patient->name_middle}}</b>
+                        </div>
+                        <div class="mb-1">
+                            Name Last: <b>{{$patient->name_last}}</b>
+                        </div>
+                        <div class="mb-1">
+                            Name Suffix: <b>{{$patient->name_suffix}}</b>
+                        </div>
+                        <div class="mb-1">
+                            Name Credential: <b>{{$patient->name_credential}}</b>
+                        </div>
+                        <div class="mb-1">
+                            Name Nickname: <b>{{$patient->name_nickname}}</b>
+                        </div>
+                        <div class="mb-1">
+                            Name Maiden: <b>{{$patient->name_maiden}}</b>
+                        </div>
+                        <div class="mb-1">
+                            Name Previous: <b>{{$patient->name_previous}}</b>
+                        </div>
+                        <div moe wide>
+                            <a start show><i class="fa fa-edit"></i></a>
+                            <form url="/api/client/editName" class="mcp-theme-1">
+                                <input type="hidden" name="uid" value="{{$patient->uid}}">
+                                <div class="mb-2">
+                                    <input type="text" class="form-control form-control-sm" name="namePrefix" placeholder="Name Prefix" value="{{$patient->name_prefix}}">
+                                </div>
+                                <div class="mb-2">
+                                    <input type="text" class="form-control form-control-sm" name="nameFirst" placeholder="Name First" value="{{$patient->name_first}}">
+                                </div>
+                                <div class="mb-2">
+                                    <input type="text" class="form-control form-control-sm" name="nameMiddle" placeholder="Name Middle" value="{{$patient->name_middle}}">
+                                </div>
+                                <div class="mb-2">
+                                    <input type="text" class="form-control form-control-sm" name="nameLast" placeholder="Name Last" value="{{$patient->name_last}}">
+                                </div>
+                                <div class="mb-2">
+                                    <input type="text" class="form-control form-control-sm" name="nameSuffix" placeholder="Name Suffix" value="{{$patient->name_suffix}}">
+                                </div>
+                                <div class="mb-2">
+                                    <input type="text" class="form-control form-control-sm" name="nameCredential" placeholder="Name Credential" value="{{$patient->name_credential}}">
+                                </div>
+                                <div class="mb-2">
+                                    <input type="text" class="form-control form-control-sm" name="nameNickname" placeholder="Name Nickname" value="{{$patient->name_nickname}}">
+                                </div>
+                                <div class="mb-2">
+                                    <input type="text" class="form-control form-control-sm" name="nameMaiden" placeholder="Name Maiden" value="{{$patient->name_maiden}}">
+                                </div>
+                                <div class="mb-2">
+                                    <input type="text" class="form-control form-control-sm" name="namePrevious" placeholder="Name Previous" value="{{$patient->name_previous}}">
+                                </div>
+                                <div>
+                                    <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                                    <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                                </div>
+                            </form>
+                        </div>
+                    </div>
+
                 <hr class="m-negator-3 my-3">
                 <div class="mt-3 mb-2">
                     <div class="font-weight-bold mb-2">Basic Info</div>
@@ -488,7 +558,7 @@
                     @if($patient->is_enrolled_in_cm == 'YES')
                         <p>Cm Enrollment Consent Method Memo: {{$patient->cm_enrollment_consent_method}}</p>
                         <p>Cm Enrollment Consent Method Memo: {{$patient->cm_enrollment_consent_method_memo}}</p>
-                    @else 
+                    @else
                         <p>Why Not Enrolled In Cm Category:   {{$patient->why_not_enrolled_in_cm_category}}</p>
 		                <p>Why Not Enrolled In Cm Memo:   {{$patient->why_not_enrolled_in_cm_memo}}</p>
                     @endif
@@ -515,7 +585,7 @@
                         </div>
                     </form>
                 </div>
-                
+
                 <div moe class="ml-2">
                     <a start show><i class="fa fa-edit"></i>Update CM Enrollemnt Consent Info</a>
                     <form url="/api/client/updateCmEnrollmentConsentInfo" class="mcp-theme-1">
@@ -537,7 +607,7 @@
                         </div>
                     </form>
                 </div>
-                
+
                 @else
                 <div moe class="ml-2">
                     <a start show><i class="fa fa-edit"></i>Set is enrolled to CM to YES</a>
@@ -650,7 +720,7 @@
                         </div>
                     </form>
                 </div>
-                
+
                 @else
                 <div moe class="ml-2">
                     <a start show><i class="fa fa-edit"></i>Set is enrolled to RM to YES</a>
@@ -659,7 +729,7 @@
                         <div class="form-group">
                             <label class="control-label">Are you sure?</label>
                         </div>
-                        
+
                         <div>
                             <button submit class="btn btn-sm btn-primary mr-1">Submit
                             </button>
@@ -708,14 +778,14 @@
                         <div class="form-group">
                             <label class="control-label">Category </label>
                             <select name="category" class="form-control">
-                                <option value="NULL">--</option> 
-                                <option value="ACTIVE">ACTIVE</option> 
-                                <option value="INACTIVE">INACTIVE</option> 
-                                <option value="ENTRY_ERROR">ENTRY_ERROR</option> 
-                                <option value="DUMMY">DUMMY</option> 
+                                <option value="NULL">--</option>
+                                <option value="ACTIVE">ACTIVE</option>
+                                <option value="INACTIVE">INACTIVE</option>
+                                <option value="ENTRY_ERROR">ENTRY_ERROR</option>
+                                <option value="DUMMY">DUMMY</option>
                                 <option value="DECEASED">DECEASED</option>
-	                            <option value="DUPLICATE">DUPLICATE</option> 
-                                <option value="NO_LONGER_INTERESTED">NO_LONGER_INTERESTED</option> 
+	                            <option value="DUPLICATE">DUPLICATE</option>
+                                <option value="NO_LONGER_INTERESTED">NO_LONGER_INTERESTED</option>
                                 <option value="BAD_RECORD">BAD_RECORD</option>
                             </select>
                         </div>
@@ -753,14 +823,14 @@
                         <div class="form-group">
                             <label class="control-label">Category </label>
                             <select name="category" class="form-control">
-                                <option value="NULL">--</option> 
-                                <option value="ACTIVE">ACTIVE</option> 
-                                <option value="INACTIVE">INACTIVE</option> 
-                                <option value="ENTRY_ERROR">ENTRY_ERROR</option> 
-                                <option value="DUMMY">DUMMY</option> 
+                                <option value="NULL">--</option>
+                                <option value="ACTIVE">ACTIVE</option>
+                                <option value="INACTIVE">INACTIVE</option>
+                                <option value="ENTRY_ERROR">ENTRY_ERROR</option>
+                                <option value="DUMMY">DUMMY</option>
                                 <option value="DECEASED">DECEASED</option>
-	                            <option value="DUPLICATE">DUPLICATE</option> 
-                                <option value="NO_LONGER_INTERESTED">NO_LONGER_INTERESTED</option> 
+	                            <option value="DUPLICATE">DUPLICATE</option>
+                                <option value="NO_LONGER_INTERESTED">NO_LONGER_INTERESTED</option>
                                 <option value="BAD_RECORD">BAD_RECORD</option>
                             </select>
                         </div>
@@ -797,14 +867,14 @@
                         <div class="form-group">
                             <label class="control-label">Category </label>
                             <select name="category" class="form-control">
-                                <option value="NULL">--</option> 
-                                <option value="ACTIVE">ACTIVE</option> 
-                                <option value="INACTIVE">INACTIVE</option> 
-                                <option value="ENTRY_ERROR">ENTRY_ERROR</option> 
-                                <option value="DUMMY">DUMMY</option> 
+                                <option value="NULL">--</option>
+                                <option value="ACTIVE">ACTIVE</option>
+                                <option value="INACTIVE">INACTIVE</option>
+                                <option value="ENTRY_ERROR">ENTRY_ERROR</option>
+                                <option value="DUMMY">DUMMY</option>
                                 <option value="DECEASED">DECEASED</option>
-	                            <option value="DUPLICATE">DUPLICATE</option> 
-                                <option value="NO_LONGER_INTERESTED">NO_LONGER_INTERESTED</option> 
+	                            <option value="DUPLICATE">DUPLICATE</option>
+                                <option value="NO_LONGER_INTERESTED">NO_LONGER_INTERESTED</option>
                                 <option value="BAD_RECORD">BAD_RECORD</option>
                             </select>
                         </div>

resources/views/app/patient/vitals-settings.blade.php

@@ -33,10 +33,14 @@
         (function () {
             function calculateUsualBmi() {
                 let h = $('#bmi-management-settings [name="currentHeightInInches"]').val(),
-                    w = $('#bmi-management-settings [name="usualWeightInPounds"]').val();
-                let bmiElem = $('#bmi-management-settings [name="usualBmi"]').val(''),
-                    bmiCategoryElem = $('#bmi-management-settings [name="usualBmiCategory"]').val('');
-                calculateBmi(h, w, bmiElem, bmiCategoryElem);
+                    wMin = $('#bmi-management-settings [name="usualWeightInPoundsMin"]').val(),
+                    wMax = $('#bmi-management-settings [name="usualWeightInPoundsMax"]').val();
+                let bmiMinElem = $('#bmi-management-settings [name="usualBmiMin"]').val(''),
+                    bmiMinCategoryElem = $('#bmi-management-settings [name="usualBmiMinCategory"]').val(''),
+                    bmiMaxElem = $('#bmi-management-settings [name="usualBmiMax"]').val(''),
+                    bmiMaxCategoryElem = $('#bmi-management-settings [name="usualBmiMaxCategory"]').val('');
+                calculateBmi(h, wMin, bmiMinElem, bmiMinCategoryElem);
+                calculateBmi(h, wMax, bmiMaxElem, bmiMaxCategoryElem);
                 return false;
             }
 
@@ -78,9 +82,9 @@
             function init() {
                 $(document)
                     .off('change input paste keyup',
-                        '#bmi-management-settings [name="currentHeightInInches"], #bmi-management-settings [name="usualWeightInPounds"]')
+                        '#bmi-management-settings [name="currentHeightInInches"], #bmi-management-settings [name="usualWeightInPoundsMin"],  #bmi-management-settings [name="usualWeightInPoundsMax"]')
                     .on('change input paste keyup',
-                        '#bmi-management-settings [name="currentHeightInInches"], #bmi-management-settings [name="usualWeightInPounds"]', function () {
+                        '#bmi-management-settings [name="currentHeightInInches"], #bmi-management-settings [name="usualWeightInPoundsMin"],  #bmi-management-settings [name="usualWeightInPoundsMax"]', function () {
                             return calculateUsualBmi();
                         });
                 $(document)

resources/views/app/patient/vitals-settings/bmi-management-form.blade.php

@@ -1,4 +1,4 @@
-<div moe large id="bmi-management-settings">
+<div moe wide id="bmi-management-settings">
     <a href="#" start show>Update</a>
     <form url="/api/client/updateBmiManagementSettingsValue">
         <input type="hidden" name="uid" value="{{$patient->uid}}">
@@ -14,20 +14,29 @@
 
         <div class="mb-1 d-flex align-items-center">
             <span class="text-secondary min-width-140px">Weight (usual):</span>
-            <span class="text-secondary">Ranging between: </span>
-            <div class="width-100px"><?= vsElement('usual_weight_in_pounds_min', 'number', 'usualWeightInPoundsMin', $patient) ?></div>
-            <span class="text-secondary mx-2">and</span>
-            <div class="width-100px"><?= vsElement('usual_weight_in_pounds_max', 'number', 'usualWeightInPoundsMax', $patient) ?></div>
+            <span class="text-secondary mr-2 text-center text-sm">ranging between</span>
+            <div class="width-70px"><?= vsElement('usual_weight_in_pounds_min', 'number', 'usualWeightInPoundsMin', $patient) ?></div>
+            <span class="text-secondary mx-2 text-center text-sm">and</span>
+            <div class="width-70px"><?= vsElement('usual_weight_in_pounds_max', 'number', 'usualWeightInPoundsMax', $patient) ?></div>
         </div>
         <div class="mb-3 d-flex align-items-center">
-            <span class="text-secondary min-width-140px">BMI (usual):</span>
+            {{--<span class="text-secondary min-width-140px">BMI (usual):</span>
             <div class="width-100px mr-2"><?= vsRoElement('usual_bmi', 'number', 'usualBmi', $patient) ?></div>
             <span class="text-secondary">
                 <input type="text" readonly=""
                        class="form-control form-control-sm min-width-unset rounded-0 border-0 bg-transparent font-weight-bold"
                        name="usualBmiCategory"
                        value="{{$patient->usual_bmi_category ?: ''}}">
-            </span>
+            </span>--}}
+
+            <span class="text-secondary min-width-140px">BMI (usual):</span>
+            <span class="text-secondary mr-2 text-center text-sm">ranging between</span>
+            <div class="width-70px"><?= vsRoElement('usual_bmi_min', 'number', 'usualBmiMin', $patient) ?></div>
+            <?= vsRoElement('usual_bmi_min_category', 'hidden', 'usualBmiMinCategory', $patient) ?>
+            <span class="text-secondary mx-2 text-center text-sm">and</span>
+            <div class="width-70px"><?= vsRoElement('usual_bmi_max', 'number', 'usualBmiMax', $patient) ?></div>
+            <?= vsRoElement('usual_bmi_max_category', 'hidden', 'usualBmiMaxCategory', $patient) ?>
+
         </div>
 
         <hr class="my-3">
@@ -73,6 +82,8 @@
             </div>
         </div>
 
+        <hr class="my-3">
+
         <div class="mb-3 d-flex align-items-center">
             <span class="text-secondary min-width-140px mr-2"><b>Monitoring prescribed?</b> </span>
             <div class="width-150px">

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

@@ -239,8 +239,8 @@ parentSegment.find('#frm-add-{{$label}}')
             if(!hasResponseError(_data)) {
                 hideMask();
                 refreshDynamicStagPopup();
-                $('.visit-segment[data-segment-template-name="intake_{{$label}}s"]').find('.refresh-segment').trigger('click');
-                $('.visit-segment[data-segment-template-name="plan_{{$label}}s"]').find('.refresh-segment').trigger('click');
+                $('.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');
             }
         }, 'json');
         return false;