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

public/css/style.css

@@ -321,6 +321,9 @@ body>nav.navbar {
 .mcp-theme-1 .min-width-unset>.form-control.form-control-sm {
     min-width: unset !important;
 }
+.mcp-theme-1 .width-auto {
+  width: auto !important;
+}
 .mcp-theme-1 [large] .form-control.form-control-sm {
     min-width: unset;
 }

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

@@ -1023,6 +1023,10 @@ use App\Models\Handout;
                                     if (bmi >= 30) {
                                         bmiCategory = '(Obese)';
                                     }
+                                    bmiCategoryElem.show();
+                                    if (bmiCategory == '') {
+                                      bmiCategoryElem.hide();
+                                    }
                                     bmiCategoryElem.val(bmiCategory);
                                 } catch (e) {
                                     return false;

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

@@ -72,6 +72,10 @@
                     if (bmi >= 30) {
                         bmiCategory = '(Obese)';
                     }
+                    bmiCategoryElem.show();
+                    if (bmiCategory == '') {
+                      bmiCategoryElem.hide();
+                    }
                     bmiCategoryElem.val(bmiCategory);
                 } catch (e) {
                     return false;

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

@@ -5,7 +5,7 @@
         <p class="text-secondary font-weight-bold font-size-14">BMI/Weight Management</p>
 
         <div class="mb-3 d-flex align-items-center">
-            <span class="text-secondary min-width-140px">Current Height:</span>
+            <span class="text-secondary mr-2">Current Height:</span>
             <div class="width-50px mr-1">
                 <input type="text" name="current_height_FT" class="form-control form-control-sm min-width-unset rounded-0"
                        heightFeetInput
@@ -36,16 +36,16 @@
               <tr>
                 <td>Usual</td>
                 <td>
-                  <div class="width-100px"><?= vsElement('usual_weight_in_pounds_min', 'number', 'usualWeightInPoundsMin', $patient) ?></div>
+                  <div class="width-70px"><?= vsElement('usual_weight_in_pounds_min', 'number', 'usualWeightInPoundsMin', $patient) ?></div>
                 </td>
                 <td>
                   <div class="d-flex align-items-center">
-                    <div class="width-100px"><?= vsRoElement('usual_bmi_min', 'number', 'usualBmiMin', $patient) ?></div>
+                    <div class="width-70px"><?= vsRoElement('usual_bmi_min', 'number', 'usualBmiMin', $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"
+                      class="border-0 bg-transparent width-90px ml-2"
                       name="usualBmiMinCategory"
-                      value="{{$patient->usual_bmi_min_category ?: ''}}">
+                      value="{{$patient->usual_bmi_min_category ?? ''}}">
                     </span>
                   </div>
                 </td>
@@ -53,16 +53,16 @@
               <tr>
                 <td>Target</td>
                 <td>
-                  <div class="width-100px"><?= vsElement('ideal_weight_in_pounds', 'number', 'idealWeightInPounds', $patient) ?></div>
+                  <div class="width-70px"><?= vsElement('ideal_weight_in_pounds', 'number', 'idealWeightInPounds', $patient) ?></div>
                 </td>
                 <td>
                   <div class="d-flex align-items-center">
-                  <div class="width-100px"><?= vsRoElement('ideal_bmi', 'number', 'idealBmi', $patient) ?></div>
+                  <div class="width-70px"><?= vsRoElement('ideal_bmi', 'number', 'idealBmi', $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"
+                             class="border-0 bg-transparent width-90px ml-2"
                              name="idealBmiCategory"
-                             value="{{$patient->ideal_bmi_category ?: ''}}">
+                             value="{{$patient->ideal_bmi_category ?? ''}}">
                   </span>
                 </div>
                 </td>

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

@@ -3,7 +3,7 @@
       <fieldset disabled>
         <input type="hidden" name="uid" value="{{$patient->uid}}">
         <div class="mb-3 d-flex align-items-center">
-            <span class="text-secondary min-width-140px">Current Height:</span>
+            <span class="text-secondary mr-2">Current Height:</span>
             <div class="width-50px mr-1">
                 <input type="text" name="current_height_FT" class="form-control form-control-sm min-width-unset rounded-0"
                        heightFeetInput
@@ -34,16 +34,18 @@
               <tr>
                 <td>Usual</td>
                 <td>
-                  <div class="width-100px"><?= vsElement('usual_weight_in_pounds_min', 'number', 'usualWeightInPoundsMin', $patient) ?></div>
+                  <div class="width-70px"><?= vsElement('usual_weight_in_pounds_min', 'number', 'usualWeightInPoundsMin', $patient) ?></div>
                 </td>
                 <td>
                   <div class="d-flex align-items-center">
-                    <div class="width-100px"><?= vsRoElement('usual_bmi_min', 'number', 'usualBmiMin', $patient) ?></div>
+                    <div class="width-70px"><?= vsRoElement('usual_bmi_min', 'number', 'usualBmiMin', $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"
-                      name="usualBmiMinCategory"
-                      value="{{$patient->usual_bmi_min_category ?: ''}}">
+                      @if($patient->usual_bmi_min_category)
+                        <input type="text" readonly=""
+                        class="border-0 bg-transparent width-90px ml-1"
+                        name="usualBmiMinCategory"
+                        value="{{$patient->usual_bmi_min_category ?? ''}}">
+                      @endif
                     </span>
                   </div>
                 </td>
@@ -51,16 +53,18 @@
               <tr>
                 <td>Target</td>
                 <td>
-                  <div class="width-100px"><?= vsElement('ideal_weight_in_pounds', 'number', 'idealWeightInPounds', $patient) ?></div>
+                  <div class="width-70px"><?= vsElement('ideal_weight_in_pounds', 'number', 'idealWeightInPounds', $patient) ?></div>
                 </td>
                 <td>
                   <div class="d-flex align-items-center">
-                  <div class="width-100px"><?= vsRoElement('ideal_bmi', 'number', 'idealBmi', $patient) ?></div>
+                  <div class="width-70px"><?= vsRoElement('ideal_bmi', 'number', 'idealBmi', $patient) ?></div>
                   <span class="text-secondary">
+                    @if($patient->ideal_bmi_category)
                       <input type="text" readonly=""
-                             class="form-control form-control-sm min-width-unset rounded-0 border-0 bg-transparent"
+                             class="border-0 bg-transparent width-90px ml-1"
                              name="idealBmiCategory"
                              value="{{$patient->ideal_bmi_category ?: ''}}">
+                    @endif
                   </span>
                 </div>
                 </td>