fixes to bmi/weight monitoring fomrs

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

@@ -14,11 +14,7 @@
 
         <div class="mb-1 d-flex align-items-center">
             <span class="text-secondary min-width-140px">Weight (usual):</span>
-            <div class="width-100px mr-2"><?= vsElement('usual_weight_in_pounds', 'number', 'usualWeightInPounds', $patient) ?></div>
-            <span class="text-secondary">(lbs)</span>
-        </div>
-        <div class="mb-1 d-flex align-items-center">
-            <span class="text-secondary min-width-140px">Ranging between</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>
@@ -39,13 +35,6 @@
         <div class="mb-1 d-flex align-items-center">
             <span class="text-secondary min-width-140px">Weight (ideal):</span>
             <div class="width-100px mr-2"><?= vsElement('ideal_weight_in_pounds', 'number', 'idealWeightInPounds', $patient) ?></div>
-            <span class="text-secondary">(lbs)</span>
-        </div>
-        <div class="mb-1 d-flex align-items-center">
-            <span class="text-secondary min-width-140px">Ranging between</span>
-            <div class="width-100px"><?= vsElement('ideal_weight_in_pounds_min', 'number', 'idealWeightInPoundsMin', $patient) ?></div>
-            <span class="text-secondary mx-2">and</span>
-            <div class="width-100px"><?= vsElement('ideal_weight_in_pounds_max', 'number', 'idealWeightInPoundsMax', $patient) ?></div>
         </div>
         <div class="mb-3 d-flex align-items-center">
             <span class="text-secondary min-width-140px">BMI (ideal):</span>
@@ -85,7 +74,7 @@
         </div>
 
         <div class="mb-3 d-flex align-items-center">
-            <span class="text-secondary min-width-140px mr-2">Weight monitoring prescribed?</span>
+            <span class="text-secondary min-width-140px mr-2"><b>Monitoring prescribed?</b> </span>
             <div class="width-150px">
                 <select type="text" class="form-control form-control-sm min-width-unset" name="isWeightMonitoringNeeded">
                     <option value="">-- select --</option>
@@ -176,4 +165,4 @@
         addMCInitializer('bmi-management-settings', init, '#bmi-management-settings');
 
     }).call(window);
-</script>
+</script>

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

@@ -13,7 +13,6 @@
             <div class="pl-3">
                 <div class="mb-2 d-flex align-items-center">
                     <span class="text-secondary width-70px">SBP:</span>
-                    <div class="width-70px mr-2"><?= vsElement('usual_am_resting_sbp', 'number', 'usualAmRestingSbp', $patient) ?></div>
                     <span class="text-secondary mr-2 text-center text-sm">ranging between</span>
                     <div class="width-70px mr-2"><?= vsElement('usual_am_resting_sbp_min', 'number', 'usualAmRestingSbpMin', $patient) ?></div>
                     <span class="text-secondary mr-2">and</span>
@@ -21,7 +20,6 @@
                 </div>
                 <div class="mb-2 d-flex align-items-center">
                     <span class="text-secondary width-70px">DBP:</span>
-                    <div class="width-70px mr-2"><?= vsElement('usual_am_resting_dbp', 'number', 'usualAmRestingDbp', $patient) ?></div>
                     <span class="text-secondary mr-2 text-center text-sm">ranging between</span>
                     <div class="width-70px mr-2"><?= vsElement('usual_am_resting_dbp_min', 'number', 'usualAmRestingDbpMin', $patient) ?></div>
                     <span class="text-secondary mr-2">and</span>
@@ -29,7 +27,6 @@
                 </div>
                 <div class="mb-1 d-flex align-items-center">
                     <span class="text-secondary width-70px">Pulse:</span>
-                    <div class="width-70px mr-2"><?= vsElement('usual_am_resting_pulse', 'number', 'usualAmRestingPulse', $patient) ?></div>
                     <span class="text-secondary mr-2 text-center text-sm">ranging between</span>
                     <div class="width-70px mr-2"><?= vsElement('usual_am_resting_pulse_min', 'number', 'usualAmRestingPulseMin', $patient) ?></div>
                     <span class="text-secondary mr-2">and</span>
@@ -45,7 +42,6 @@
             <div class="pl-3">
                 <div class="mb-2 d-flex align-items-center">
                     <span class="text-secondary width-70px">SBP:</span>
-                    <div class="width-70px mr-2"><?= vsElement('usual_pm_resting_sbp', 'number', 'usualPmRestingSbp', $patient) ?></div>
                     <span class="text-secondary mr-2 text-center text-sm">ranging between</span>
                     <div class="width-70px mr-2"><?= vsElement('usual_pm_resting_sbp_min', 'number', 'usualPmRestingSbpMin', $patient) ?></div>
                     <span class="text-secondary mr-2">and</span>
@@ -53,7 +49,6 @@
                 </div>
                 <div class="mb-2 d-flex align-items-center">
                     <span class="text-secondary width-70px">DBP:</span>
-                    <div class="width-70px mr-2"><?= vsElement('usual_pm_resting_dbp', 'number', 'usualPmRestingDbp', $patient) ?></div>
                     <span class="text-secondary mr-2 text-center text-sm">ranging between</span>
                     <div class="width-70px mr-2"><?= vsElement('usual_pm_resting_dbp_min', 'number', 'usualPmRestingDbpMin', $patient) ?></div>
                     <span class="text-secondary mr-2">and</span>
@@ -61,7 +56,6 @@
                 </div>
                 <div class="mb-1 d-flex align-items-center">
                     <span class="text-secondary width-70px">Pulse:</span>
-                    <div class="width-70px mr-2"><?= vsElement('usual_pm_resting_pulse', 'number', 'usualPmRestingPulse', $patient) ?></div>
                     <span class="text-secondary mr-2 text-center text-sm">ranging between</span>
                     <div class="width-70px mr-2"><?= vsElement('usual_pm_resting_pulse_min', 'number', 'usualPmRestingPulseMin', $patient) ?></div>
                     <span class="text-secondary mr-2">and</span>
@@ -77,13 +71,7 @@
                 <div class="mb-1 d-flex align-items-center">
                     <span class="text-secondary min-width-70px">SBP:</span>
                     <div class="width-70px mr-2"><?= vsElement('ideal_am_resting_sbp', 'number', 'idealAmRestingSbp', $patient) ?></div>
-                    <span class="text-secondary mr-2 text-center text-sm">ranging between</span>
-                    <div class="width-70px mr-2"><?= vsElement('ideal_am_resting_sbp_min', 'number', 'idealAmRestingSbpMin', $patient) ?></div>
-                    <span class="text-secondary mr-2">and</span>
-                    <div class="width-70px"><?= vsElement('ideal_am_resting_sbp_max', 'number', 'idealAmRestingSbpMax', $patient) ?></div>
-                </div>
-                <div class="mb-3 d-flex align-items-center">
-                    <span class="text-secondary min-width-70px">Goal: &nbsp;</span>
+                    <span class="text-secondary">Goal: &nbsp;</span>
                     <div class="flex-grow-1">
                         <select class="form-control form-control-sm min-width-unset rounded-0" name="sbpManagementGoalCategory">
                             <option value="">-- select --</option>
@@ -96,13 +84,7 @@
                 <div class="mb-1 d-flex align-items-center">
                     <span class="text-secondary min-width-70px">DBP:</span>
                     <div class="width-70px mr-2"><?= vsElement('ideal_am_resting_dbp', 'number', 'idealAmRestingDbp', $patient) ?></div>
-                    <span class="text-secondary mr-2 text-center text-sm">ranging between</span>
-                    <div class="width-70px mr-2"><?= vsElement('ideal_am_resting_dbp_min', 'number', 'idealAmRestingDbpMin', $patient) ?></div>
-                    <span class="text-secondary mr-2">and</span>
-                    <div class="width-70px"><?= vsElement('ideal_am_resting_dbp_max', 'number', 'idealAmRestingDbpMax', $patient) ?></div>
-                </div>
-                <div class="mb-3 d-flex align-items-center">
-                    <span class="text-secondary min-width-70px">Goal: &nbsp;</span>
+                    <span class="text-secondary">Goal: &nbsp;</span>
                     <div class="flex-grow-1">
                         <select class="form-control form-control-sm min-width-unset rounded-0" name="dbpManagementGoalCategory">
                             <option value="">-- select --</option>
@@ -115,13 +97,7 @@
                 <div class="mb-1 d-flex align-items-center">
                     <span class="text-secondary min-width-70px">Pulse:</span>
                     <div class="width-70px mr-2"><?= vsElement('ideal_am_resting_pulse', 'number', 'idealAmRestingPulse', $patient) ?></div>
-                    <span class="text-secondary mr-2 text-center text-sm">ranging between</span>
-                    <div class="width-70px mr-2"><?= vsElement('ideal_am_resting_pulse_min', 'number', 'idealAmRestingPulseMin', $patient) ?></div>
-                    <span class="text-secondary mr-2">and</span>
-                    <div class="width-70px"><?= vsElement('ideal_am_resting_pulse_max', 'number', 'idealAmRestingPulseMax', $patient) ?></div>
-                </div>
-                <div class="mb-3 d-flex align-items-center">
-                    <span class="text-secondary min-width-70px">Goal: &nbsp;</span>
+                    <span class="text-secondary">Goal: &nbsp;</span>
                     <div class="flex-grow-1">
                         <select class="form-control form-control-sm min-width-unset rounded-0" name="pulseManagementGoalCategory">
                             <option value="">-- select --</option>
@@ -143,20 +119,20 @@
             </div>
             <div class="pl-3">
                 <div class="mb-2 d-flex align-items-center">
-                    <span class="text-secondary width-100px">SBP: above</span>
-                    <div class="width-70px mr-2"><?= vsElement('red_alert_when_sbp_above', 'number', 'redAlertWhenSbpAbove', $patient) ?></div>
+                    <span class="text-secondary width-100px">SBP: </span>
+                    <span class="text-secondary">above &nbsp;</span> <div class="width-70px mr-2"> <?= vsElement('red_alert_when_sbp_above', 'number', 'redAlertWhenSbpAbove', $patient) ?></div>
                     <span class="text-secondary mr-2 text-center">or below</span>
                     <div class="width-70px mr-2"><?= vsElement('red_alert_when_sbp_below', 'number', 'redAlertWhenSbpBelow', $patient) ?></div>
                 </div>
                 <div class="mb-2 d-flex align-items-center">
-                    <span class="text-secondary width-100px">DBP: above</span>
-                    <div class="width-70px mr-2"><?= vsElement('red_alert_when_dbp_above', 'number', 'redAlertWhenDbpAbove', $patient) ?></div>
+                    <span class="text-secondary width-100px">DBP: </span>
+                    <span class="text-secondary">above &nbsp;</span> <div class="width-70px mr-2"> <?= vsElement('red_alert_when_dbp_above', 'number', 'redAlertWhenDbpAbove', $patient) ?></div>
                     <span class="text-secondary mr-2 text-center">or below</span>
                     <div class="width-70px mr-2"><?= vsElement('red_alert_when_dbp_below', 'number', 'redAlertWhenDbpBelow', $patient) ?></div>
                 </div>
                 <div class="mb-2 d-flex align-items-center">
-                    <span class="text-secondary width-100px">Pulse: above</span>
-                    <div class="width-70px mr-2"><?= vsElement('red_alert_when_pulse_above', 'number', 'redAlertWhenPulseAbove', $patient) ?></div>
+                    <span class="text-secondary width-100px">Pulse: </span>
+                    <span class="text-secondary">above &nbsp;</span> <div class="width-70px mr-2"><?= vsElement('red_alert_when_pulse_above', 'number', 'redAlertWhenPulseAbove', $patient) ?></div>
                     <span class="text-secondary mr-2 text-center">or below</span>
                     <div class="width-70px mr-2"><?= vsElement('red_alert_when_pulse_below', 'number', 'redAlertWhenPulseBelow', $patient) ?></div>
                 </div>
@@ -169,20 +145,20 @@
             </div>
             <div class="pl-3">
                 <div class="mb-2 d-flex align-items-center">
-                    <span class="text-secondary width-100px">SBP: above</span>
-                    <div class="width-70px mr-2"><?= vsElement('yellow_alert_when_sbp_above', 'number', 'yellowAlertWhenSbpAbove', $patient) ?></div>
+                    <span class="text-secondary width-100px">SBP: </span>
+                    <span class="text-secondary">above &nbsp;</span> <div class="width-70px mr-2"><?= vsElement('yellow_alert_when_sbp_above', 'number', 'yellowAlertWhenSbpAbove', $patient) ?></div>
                     <span class="text-secondary mr-2 text-center">or below</span>
                     <div class="width-70px mr-2"><?= vsElement('yellow_alert_when_sbp_below', 'number', 'yellowAlertWhenSbpBelow', $patient) ?></div>
                 </div>
                 <div class="mb-2 d-flex align-items-center">
-                    <span class="text-secondary width-100px">DBP: above</span>
-                    <div class="width-70px mr-2"><?= vsElement('yellow_alert_when_dbp_above', 'number', 'yellowAlertWhenDbpAbove', $patient) ?></div>
+                    <span class="text-secondary width-100px">DBP: </span>
+                    <span class="text-secondary">above &nbsp;</span> <div class="width-70px mr-2"><?= vsElement('yellow_alert_when_dbp_above', 'number', 'yellowAlertWhenDbpAbove', $patient) ?></div>
                     <span class="text-secondary mr-2 text-center">or below</span>
                     <div class="width-70px mr-2"><?= vsElement('yellow_alert_when_dbp_below', 'number', 'yellowAlertWhenDbpBelow', $patient) ?></div>
                 </div>
                 <div class="mb-2 d-flex align-items-center">
-                    <span class="text-secondary width-100px">Pulse: above</span>
-                    <div class="width-70px mr-2"><?= vsElement('yellow_alert_when_pulse_above', 'number', 'yellowAlertWhenPulseAbove', $patient) ?></div>
+                    <span class="text-secondary width-100px">Pulse: </span>
+                    <span class="text-secondary">above &nbsp;</span> <div class="width-70px mr-2"><?= vsElement('yellow_alert_when_pulse_above', 'number', 'yellowAlertWhenPulseAbove', $patient) ?></div>
                     <span class="text-secondary mr-2 text-center">or below</span>
                     <div class="width-70px mr-2"><?= vsElement('yellow_alert_when_pulse_below', 'number', 'yellowAlertWhenPulseBelow', $patient) ?></div>
                 </div>
@@ -202,7 +178,7 @@
             </div>
         </div>
         <div class="mb-2 d-flex align-items-start">
-            <span class="text-secondary min-width-140px w-50">Reports hypertension?</span>
+            <span class="text-secondary min-width-140px w-50">Reports HTN?</span>
             <div class="w-50">
                 <select type="text" class="form-control form-control-sm min-width-unset" name="hasHypertensionDx">
                     <option value="">-- select --</option>
@@ -213,7 +189,7 @@
             </div>
         </div>
         <div class="mb-2 d-flex align-items-start">
-            <span class="text-secondary min-width-140px w-50">Reports hypertension medicine?</span>
+            <span class="text-secondary min-width-140px w-50">Reports HTN medicine?</span>
             <div class="w-50">
                 <select type="text" class="form-control form-control-sm min-width-unset" name="isPrescribedHypertensionMedicine">
                     <option value="">-- select --</option>
@@ -224,7 +200,7 @@
             </div>
         </div>
         <div class="mb-2 d-flex align-items-start">
-            <span class="text-secondary min-width-140px w-50">Is it a goal to reduce<br>hypertension medicine?</span>
+            <span class="text-secondary min-width-140px w-50">Goal to reduce HTN medicine?</span>
             <div class="w-50">
                 <select type="text" class="form-control form-control-sm min-width-unset" name="isGoalToReduceHypertensionMedicine">
                     <option value="">-- select --</option>
@@ -239,7 +215,9 @@
         <input type="text" class="form-control form-control-sm min-width-unset" name="goalToReduceHypertensionMedicineMemo" value="{{$patient->goal_to_reduce_hypertension_medicine_memo}}">
 
         <div class="my-3 d-flex align-items-center">
-            <span class="text-secondary min-width-140px w-50">BP monitoring prescribed?</span>
+            <span class="text-secondary min-width-140px w-50">
+                <strong>BP monitoring prescribed?</strong>
+            </span>
             <div class="w-50">
                 <select type="text" class="form-control form-control-sm min-width-unset" name="isBpMonitoringNeeded">
                     <option value="">-- select --</option>
@@ -329,4 +307,4 @@
         addMCInitializer('bp-management-settings', init, '#bp-management-settings');
 
     }).call(window);
-</script>
+</script>