RTM Caremonth UI updates

app/Models/CareMonth.php

@@ -297,7 +297,15 @@ class CareMonth extends Model
 
     }
 
-    public function rtmTransmissions() {
-        return $this->hasMany(ClientRtmTransmission::class, 'care_month_id', 'id')->orderBy('effective_date', 'DESC');
+    public function rtmMskTransmissions() {
+        return $this->hasMany(ClientRtmTransmission::class, 'care_month_id', 'id')
+            ->where('msk_or_lung', 'MSK')
+            ->orderBy('effective_date', 'DESC');
+    }
+
+    public function rtmLungTransmissions() {
+        return $this->hasMany(ClientRtmTransmission::class, 'care_month_id', 'id')
+            ->where('msk_or_lung', 'LUNG')
+            ->orderBy('effective_date', 'DESC');
     }
 }

resources/views/app/patient/care-month/_stamp_client_rtm_transmission.blade.php

@@ -1,12 +1,11 @@
 <div>
     <span moe class="ml-2" relative>
-        <a href="#" start show>stamp</a>
+        <a href="#" start show>Stamp</a>
         <form url="/api/clientRtmTransmission/stamp" right>
             <input type="hidden" name="uid" value="{{ $clientRtmTransmission->uid }}">
             <div class="mb-2">
                <p>Are you sure?</p>
             </div>
-            
             <div class="d-flex align-items-center">
                 <button class="btn btn-sm btn-primary mr-2" submit>Stamp</button>
                 <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>

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

@@ -689,57 +689,54 @@
 
         @include('app.patient.rm-setup-form')
 
-        {{-- rtm --}}
-        @if($careMonth->is_enrolled_in_rtm_msk || $careMonth->is_enrolled_in_rtm_lung)
+        {{-- rtm msk --}}
+        @if($careMonth->is_enrolled_in_rtm_msk)
             <hr class="m-negator my-3">
 
-            <div class="screen-only">
-                <div class="d-flex align-items-center mb-2">
-                    <p class="font-weight-bold text-secondary m-0 font-size-14">RTM Transmissions</p>
-                </div>
-                <?php $transmissions = $careMonth->rtmTransmissions; ?>
-                <table class="table table-striped table-sm table-bordered mt-2 mb-0">
-                    <thead>
+            <p class="font-weight-bold text-secondary mb-2 font-size-14">RTM Musculoskeletal</p>
+
+            <div class="pl-3">
+                <div class="screen-only">
+        <div class="d-flex align-items-center mb-2">
+            <p class="font-weight-bold text-secondary m-0">Transmissions</p>
+        </div>
+        <?php $transmissions = $careMonth->rtmMskTransmissions; ?>
+        <table class="table table-striped table-sm table-bordered mt-2 mb-0">
+            <thead>
+            <tr>
+                <th class="text-secondary border-bottom-0">Effective Date</th>
+                <th class="text-secondary border-bottom-0">Instructions</th>
+                <th class="text-secondary border-bottom-0">Response</th>
+                <th class="text-secondary border-bottom-0">Stamp</th>
+            </tr>
+            </thead>
+            <tbody>
+            @if(!$transmissions || !count($transmissions))
+                <tr>
+                    <td class="text-secondary p-0 border-0" colspan="4">
+                        No items to show
+                    </td>
+                </tr>
+            @else
+                @foreach($transmissions as $transmission)
                     <tr>
-                        <th class="text-secondary border-bottom-0">Effective Date</th>
-                        <th class="text-secondary border-bottom-0">Category</th>
-                        <th class="text-secondary border-bottom-0">Instructions</th>
-                        <th class="text-secondary border-bottom-0">Response</th>
-                        <th class="text-secondary border-bottom-0">Stamp</th>
+                        <td>{{friendly_date($transmission->effective_date)}}</td>
+                        <td>{{$transmission->protocol_detail_json}}</td>
+                        <td>{{$transmission->feedback_detail_json}}</td>
+                        <td>
+                            @php $clientRtmTransmission = $transmission @endphp
+                            @include('app.patient.care-month._stamp_client_rtm_transmission')
+                        </td>
                     </tr>
-                    </thead>
-                    <tbody>
-                    @if(!$transmissions || !count($transmissions))
-                        <tr>
-                            <td class="text-secondary p-0 border-0">
-                                No items to show
-                            </td>
-                        </tr>
-                    @else
-                        @foreach($transmissions as $transmission)
-                            <tr>
-                                <td>{{friendly_date($transmission->effective_date)}}</td>
-                                <td>{{$transmission->msk_or_lung}}</td>
-                                <td>{{$transmission->protocol_detail_json}}</td>
-                                <td>{{$transmission->feedback_detail_json}}</td>
-                                <td>
-                                    @php $clientRtmTransmission = $transmission @endphp
-                                    @include('app.patient.care-month._stamp_client_rtm_transmission')
-                                </td>
-                            </tr>
-                        @endforeach
-                    @endif
-                    </tbody>
-                </table>
-            </div>
-
-            {{-- rtm time entries --}}
-            <hr class="m-negator my-3">
+                @endforeach
+            @endif
+            </tbody>
+        </table>
+    </div>
 
-            @if($careMonth->is_enrolled_in_rtm_msk)
-                <div class="screen-only">
+                <div class="screen-only mt-3">
                     <div class="d-flex align-items-center">
-                        <h6 class="font-weight-bold text-secondary m-0 font-size-14">MSK RTM Time Entries</h6>
+                        <h6 class="font-weight-bold text-secondary m-0">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'])
                     </div>
@@ -770,7 +767,7 @@
                                         <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])
+                                        @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
@@ -779,14 +776,58 @@
                         </tbody>
                     </table>
                 </div>
-            @endif
+            </div>
+
+        @endif
 
+        {{-- rtm lung --}}
+        @if($careMonth->is_enrolled_in_rtm_lung)
             <hr class="m-negator my-3">
 
-            @if($careMonth->is_enrolled_in_rtm_lung)
+            <p class="font-weight-bold text-secondary mb-2 font-size-14">RTM Pulmonary</p>
+
+            <div class="pl-3">
                 <div class="screen-only">
+                    <div class="d-flex align-items-center mb-2">
+                        <p class="font-weight-bold text-secondary m-0">Transmissions</p>
+                    </div>
+                    <?php $transmissions = $careMonth->rtmLungTransmissions; ?>
+                    <table class="table table-striped table-sm table-bordered mt-2 mb-0">
+                        <thead>
+                        <tr>
+                            <th class="text-secondary border-bottom-0">Effective Date</th>
+                            <th class="text-secondary border-bottom-0">Instructions</th>
+                            <th class="text-secondary border-bottom-0">Response</th>
+                            <th class="text-secondary border-bottom-0">Stamp</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        @if(!$transmissions || !count($transmissions))
+                            <tr>
+                                <td class="text-secondary p-0 border-0" colspan="4">
+                                    No items to show
+                                </td>
+                            </tr>
+                        @else
+                            @foreach($transmissions as $transmission)
+                                <tr>
+                                    <td>{{friendly_date($transmission->effective_date)}}</td>
+                                    <td>{{$transmission->protocol_detail_json}}</td>
+                                    <td>{{$transmission->feedback_detail_json}}</td>
+                                    <td>
+                                        @php $clientRtmTransmission = $transmission @endphp
+                                        @include('app.patient.care-month._stamp_client_rtm_transmission')
+                                    </td>
+                                </tr>
+                            @endforeach
+                        @endif
+                        </tbody>
+                    </table>
+                </div>
+
+                <div class="screen-only mt-3">
                     <div class="d-flex align-items-center">
-                        <h6 class="font-weight-bold text-secondary m-0 font-size-14">Lung RTM Time Entries</h6>
+                        <h6 class="font-weight-bold text-secondary m-0">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'])
                     </div>
@@ -811,7 +852,7 @@
                                         {{time_in_hrminsec($entry->time_in_seconds)}}
                                     </td>
                                     <td class="px-2">
-                                        {{friendly_date_time($entry->created_at)}} 
+                                        {{friendly_date_time($entry->created_at)}}
                                     </td>
                                     <td class="px-2">
                                         <div class="text-secondary in-table-markup">{!! $entry->content_text !!}</div>
@@ -825,7 +866,7 @@
                         </tbody>
                     </table>
                 </div>
-            @endif
+            </div>
 
         @endif