Vijayakrishnan 3 лет назад
Родитель
Сommit
43a842b599

+ 19 - 17
resources/views/app/patient/care-month/_matrix.blade.php

@@ -206,7 +206,7 @@ foreach ($days as $k => $day) {
                                     $autoCheckEntry = false;
                                     $autoCheckEntry = ($dayTotalMinutes < 2 && $patient->is_enrolled_in_rm);
                                     ?>
-                                    <div class="p-2 border border-info bg-light mb-2">
+                                    <div class="mb-2">
                                         <div class="mb-2">
                                             <label class="mb-1 text-secondary text-sm">Memo</label>
                                             <textarea class="form-control form-control-sm" name="entryMemo">measurements within range</textarea>
@@ -218,28 +218,30 @@ foreach ($days as $k => $day) {
                                             </label>
                                         </div>
                                         <div class="if-adding-time-entry pt-2 d-none">
-                                            <div class="mb-2">
-                                                <label class="mb-1 text-secondary text-sm">Seconds</label>
-                                                <input type="number" min="75" max="300"
-                                                       class="form-control form-control-sm w-100" name="entryNumberOfSeconds"
-                                                       value="75" placeholder="Time (seconds.)">
-                                            </div>
-                                            <div class="mb-2">
-                                                <label class="mb-1 text-secondary text-sm">Date</label>
-                                                <input type="date" class="form-control form-control-sm w-100"
-                                                       name="entryDate"
-                                                       value="{{date('Y-m-d', strtotime($k))}}">
+                                            <div class="mb-2 d-flex align-items-start">
+                                                <div class="width-70px mr-2">
+                                                    <label class="mb-1 text-secondary text-sm">Seconds</label>
+                                                    <input type="number" min="75" max="300"
+                                                           class="form-control min-width-unset form-control-sm w-100" name="entryNumberOfSeconds"
+                                                           value="75" placeholder="Time (seconds.)">
+                                                </div>
+                                                <div class="flex-grow-1">
+                                                    <label class="mb-1 text-secondary text-sm">Date</label>
+                                                    <input type="date" class="form-control min-width-unset form-control-sm w-100"
+                                                           name="entryDate"
+                                                           value="{{date('Y-m-d', strtotime($k))}}">
+                                                </div>
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="mb-2 border border-info p-2 mt-2 bg-light">
-                                        <span>I have had interactive communication with <b>{{$patient->displayName()}}</b>.</span>
-                                        <div class="d-flex border-top mt-2">
-                                            <label class="mt-2 mb-0 d-inline-flex align-items-center mr-3">
+                                    <div class="my-3">
+                                        <span><i class="fa fa-phone rotateh text-dark mr-1"></i>This time entry involved interactive communication (audio, video, or in-person) with the patient and/or caretaker.</span>
+                                        <div class="d-flex pt-1">
+                                            <label class="mb-0 d-inline-flex align-items-center mr-3">
                                                 <input type="radio" class="mr-2" name="didProInteractWithClientAboutRm" value="true" required {{$careMonth->has_mcp_interacted_with_client_about_rm ? 'checked' : ''}}>
                                                 <span>Yes</span>
                                             </label>
-                                            <label class="mt-2 mb-0 d-inline-flex align-items-center">
+                                            <label class="mb-0 d-inline-flex align-items-center">
                                                 <input type="radio" class="mr-2" name="didProInteractWithClientAboutRm" value="false" required {{!$careMonth->has_mcp_interacted_with_client_about_rm ? 'checked' : ''}}>
                                                 <span>No</span>
                                             </label>

+ 19 - 17
resources/views/app/patient/care-month/_work_matrix.blade.php

@@ -231,7 +231,7 @@ $days = $daysWithUnstamped;
                                         $autoCheckEntry = false;
                                         $autoCheckEntry = ($dayTotalMinutes < 2 && $patient->is_enrolled_in_rm);
                                         ?>
-                                        <div class="p-2 border border-info bg-light mb-2">
+                                        <div class="mb-2">
                                             <div class="mb-2">
                                                 <label class="mb-1 text-secondary text-sm">Memo</label>
                                                 <textarea class="form-control form-control-sm" name="entryMemo">measurements within range</textarea>
@@ -243,28 +243,30 @@ $days = $daysWithUnstamped;
                                                 </label>
                                             </div>
                                             <div class="if-adding-time-entry pt-2 d-none">
-                                                <div class="mb-2">
-                                                    <label class="mb-1 text-secondary text-sm">Seconds</label>
-                                                    <input type="number" min="75" max="300"
-                                                           class="form-control form-control-sm w-100" name="entryNumberOfSeconds"
-                                                           value="75" placeholder="Time (secs.)">
-                                                </div>
-                                                <div class="mb-2">
-                                                    <label class="mb-1 text-secondary text-sm">Date</label>
-                                                    <input type="date" class="form-control form-control-sm w-100"
-                                                           name="entryDate"
-                                                           value="{{date('Y-m-d', strtotime($k))}}">
+                                                <div class="mb-2 d-flex align-items-start">
+                                                    <div class="width-70px mr-2">
+                                                        <label class="mb-1 text-secondary text-sm">Seconds</label>
+                                                        <input type="number" min="75" max="300"
+                                                               class="form-control min-width-unset form-control-sm w-100" name="entryNumberOfSeconds"
+                                                               value="75" placeholder="Time (secs.)">
+                                                    </div>
+                                                    <div class="flex-grow-1">
+                                                        <label class="mb-1 text-secondary text-sm">Date</label>
+                                                        <input type="date" class="form-control min-width-unset form-control-sm w-100"
+                                                               name="entryDate"
+                                                               value="{{date('Y-m-d', strtotime($k))}}">
+                                                    </div>
                                                 </div>
                                             </div>
                                         </div>
-                                        <div class="mb-2 border border-info p-2 mt-2 bg-light">
-                                            <span>I have had interactive communication with <b>{{$patient->displayName()}}</b>.</span>
-                                            <div class="d-flex border-top mt-2">
-                                                <label class="mt-2 mb-0 d-inline-flex align-items-center mr-3">
+                                        <div class="my-3">
+                                            <span><i class="fa fa-phone rotateh text-dark mr-1"></i>This time entry involved interactive communication (audio, video, or in-person) with the patient and/or caretaker.</span>
+                                            <div class="d-flex pt-1">
+                                                <label class="mb-0 d-inline-flex align-items-center mr-3">
                                                     <input type="radio" class="mr-2" name="didProInteractWithClientAboutRm" value="true" required {{$careMonth->has_mcp_interacted_with_client_about_rm ? 'checked' : ''}}>
                                                     <span>Yes</span>
                                                 </label>
-                                                <label class="mt-2 mb-0 d-inline-flex align-items-center">
+                                                <label class="mb-0 d-inline-flex align-items-center">
                                                     <input type="radio" class="mr-2" name="didProInteractWithClientAboutRm" value="false" required {{!$careMonth->has_mcp_interacted_with_client_about_rm ? 'checked' : ''}}>
                                                     <span>No</span>
                                                 </label>