Selaa lähdekoodia

BMI management UI updates

Vijayakrishnan 3 vuotta sitten
vanhempi
commit
f27daaeed6

+ 10 - 6
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)

+ 10 - 6
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)

+ 18 - 7
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">