Ver código fonte

split RTM msk and lung tables

= 2 anos atrás
pai
commit
4b477eb41a

+ 85 - 42
resources/views/app/patient/care-month/dashboard.blade.php

@@ -729,53 +729,96 @@
             {{-- rtm time entries --}}
             <hr class="m-negator my-3">
 
-            <div class="screen-only">
-                <div class="d-flex align-items-center">
-                    <h6 class="font-weight-bold text-secondary m-0 font-size-14">RTM Time Entries</h6>
-                    @if($careMonth->is_enrolled_in_rtm_msk)
+            @if($careMonth->is_enrolled_in_rtm_msk)
+                <div class="screen-only">
+                    <div class="d-flex align-items-center">
+                        <h6 class="font-weight-bold text-secondary m-0 font-size-14">MSK RTM Time Entries</h6>
                         <span class="mx-2 text-secondary">|</span>
                         @include('app.practice-management.care_month_add_rtm_entry_form', ['right' => false, 'type' => 'MSK', 'label' => 'Add for MSK'])
-                    @endif
-                    @if($careMonth->is_enrolled_in_rtm_lung)
+                    </div>
+                    <table class="table table-striped table-sm table-bordered mt-2 mb-0 table-hover">
+                        <thead>
+                        <tr>
+                            <th class="px-2 text-secondary border-bottom-0">Effective Date</th>
+                            <th class="px-2 text-secondary border-bottom-0">Time</th>
+                            <th class="px-2 text-secondary border-bottom-0">Created</th>
+                            <th class="px-2 text-secondary border-bottom-0 w-50">Comments</th>
+                            <th class="px-2 text-secondary border-bottom-0 delete-column">&nbsp;</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        @foreach($careMonth->rtmEntries as $entry)
+                            @if(!$entry->is_removed && $entry->cm_or_rm_or_rtm_msk_or_rtm_lung == 'RTM_MSK')
+                                <tr>
+                                    <td class="px-2">
+                                        <div class="font-weight-bold">{{friendly_date_time($entry->effective_date, false)}}</div>
+                                    </td>
+                                    <td class="px-2">
+                                        {{time_in_hrminsec($entry->time_in_seconds)}}
+                                    </td>
+                                    <td class="px-2">
+                                        {{friendly_date_time($entry->created_at)}}
+                                    </td>
+                                    <td class="px-2">
+                                        <div class="text-secondary in-table-markup">{!! $entry->content_text !!}</div>
+                                    </td>
+                                    <td class="px-2">
+                                        @include('app.practice-management.care_month_add_rtm_entry_form', ['right' => true, 'type' => ($entry->cm_or_rm_or_rtm_msk_or_rtm_lung === 'RTM_MSK' ? 'MSK' : 'LUNG'), 'entry' => $entry])
+                                    </td>
+                                </tr>
+                            @endif
+                        @endforeach
+                        @php $entry = null; @endphp
+                        </tbody>
+                    </table>
+                </div>
+            @endif
+
+            <hr class="m-negator my-3">
+
+            @if($careMonth->is_enrolled_in_rtm_lung)
+                <div class="screen-only">
+                    <div class="d-flex align-items-center">
+                        <h6 class="font-weight-bold text-secondary m-0 font-size-14">Lung RTM Time Entries</h6>
                         <span class="mx-2 text-secondary">|</span>
                         @include('app.practice-management.care_month_add_rtm_entry_form', ['right' => false, 'type' => 'LUNG', 'label' => 'Add for Lung'])
-                    @endif
+                    </div>
+                    <table class="table table-striped table-sm table-bordered mt-2 mb-0 table-hover">
+                        <thead>
+                        <tr>
+                            <th class="px-2 text-secondary border-bottom-0">Effective Date</th>
+                            <th class="px-2 text-secondary border-bottom-0">Time</th>
+                            <th class="px-2 text-secondary border-bottom-0">Created</th>
+                            <th class="px-2 text-secondary border-bottom-0 w-50">Comments</th>
+                            <th class="px-2 text-secondary border-bottom-0 delete-column">&nbsp;</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        @foreach($careMonth->rtmEntries as $entry )
+                            @if(!$entry->is_removed && $entry->cm_or_rm_or_rtm_msk_or_rtm_lung == 'RTM_LUNG' )
+                                <tr>
+                                    <td class="px-2">
+                                        <div class="font-weight-bold">{{friendly_date_time($entry->effective_date, false)}}</div>
+                                    </td>
+                                    <td class="px-2">
+                                        {{time_in_hrminsec($entry->time_in_seconds)}}
+                                    </td>
+                                    <td class="px-2">
+                                        {{friendly_date_time($entry->created_at)}} 
+                                    </td>
+                                    <td class="px-2">
+                                        <div class="text-secondary in-table-markup">{!! $entry->content_text !!}</div>
+                                    </td>
+                                    <td class="px-2">
+                                        @include('app.practice-management.care_month_add_rtm_entry_form', ['right' => true, 'type' => ($entry->cm_or_rm_or_rtm_msk_or_rtm_lung === 'RTM_MSK' ? 'MSK' : 'LUNG'), 'entry' => $entry])
+                                    </td>
+                                </tr>
+                            @endif
+                        @endforeach
+                        </tbody>
+                    </table>
                 </div>
-                <table class="table table-striped table-sm table-bordered mt-2 mb-0 table-hover">
-                    <thead>
-                    <tr>
-                        <th class="px-2 text-secondary border-bottom-0">Effective Date</th>
-                        <th class="px-2 text-secondary border-bottom-0">Time</th>
-                        <th class="px-2 text-secondary border-bottom-0">Created</th>
-                        <th class="px-2 text-secondary border-bottom-0 w-50">Comments</th>
-                        <th class="px-2 text-secondary border-bottom-0 delete-column">&nbsp;</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    @foreach($careMonth->rtmEntries as $entry)
-                        @if(!$entry->is_removed)
-                            <tr>
-                                <td class="px-2">
-                                    <div class="font-weight-bold">{{friendly_date_time($entry->effective_date, false)}}</div>
-                                </td>
-                                <td class="px-2">
-                                    {{time_in_hrminsec($entry->time_in_seconds)}}
-                                </td>
-                                <td class="px-2">
-                                    {{friendly_date_time($entry->created_at)}}
-                                </td>
-                                <td class="px-2">
-                                    <div class="text-secondary in-table-markup">{!! $entry->content_text !!}</div>
-                                </td>
-                                <td class="px-2">
-                                    @include('app.practice-management.care_month_add_rtm_entry_form', ['right' => true, 'type' => ($entry->cm_or_rm_or_rtm_msk_or_rtm_lung === 'RTM_MSK' ? 'MSK' : 'LUNG'), 'entry' => $entry])
-                                </td>
-                            </tr>
-                        @endif
-                    @endforeach
-                    </tbody>
-                </table>
-            </div>
+            @endif
 
         @endif