RPM manager - no stamping for mcp + icds column

app/Http/Controllers/PracticeManagementController.php

@@ -2589,7 +2589,11 @@ SELECT
        care_month.end_date as care_month_end_date,
        mcpBill.has_generic_pro_been_paid as mcp_paid,
        rmmBill.has_generic_pro_been_paid as rmm_paid,
-       rmeBill.has_generic_pro_been_paid as rme_paid
+       rmeBill.has_generic_pro_been_paid as rme_paid,
+       care_month.rm_reason_icd1,
+       care_month.rm_reason_icd2,
+       care_month.rm_reason_icd3,
+       care_month.rm_reason_icd4
 FROM care_month join client on care_month.client_id = client.id 
     left join pro mcpPro on care_month.mcp_pro_id = mcpPro.id
     left join pro rmmPro on care_month.rmm_pro_id = rmmPro.id
@@ -2688,7 +2692,11 @@ SELECT
        care_month.end_date as care_month_end_date,
        mcpBill.has_generic_pro_been_paid as mcp_paid,
        rmmBill.has_generic_pro_been_paid as rmm_paid,
-       rmeBill.has_generic_pro_been_paid as rme_paid
+       rmeBill.has_generic_pro_been_paid as rme_paid,
+       care_month.rm_reason_icd1,
+       care_month.rm_reason_icd2,
+       care_month.rm_reason_icd3,
+       care_month.rm_reason_icd4
 FROM care_month join client on care_month.client_id = client.id 
     left join pro mcpPro on care_month.mcp_pro_id = mcpPro.id
     left join pro rmmPro on care_month.rmm_pro_id = rmmPro.id

public/css/style.css

@@ -3756,7 +3756,7 @@ table.v-top th {
     width: 140px !important;
 }
 .mcp-theme-1 .rmgr-name-column .rmgr-name-element {
-    width: 140px !important;
+    max-width: 140px !important;
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;

resources/views/app/practice-management/rpm-manager/index.blade.php

@@ -140,6 +140,9 @@
                         <th class="border-top-0 border-bottom-0 border-left-0"></th>
                         <th class="border-top-0 border-bottom-0"></th>
                         <th class="border-top-0 border-bottom-0"></th>
+                        @if($viewingAs !== 'RME')
+                            <th class="border-top-0 border-bottom-0"></th>
+                        @endif
                         @if($viewingAs === 'ADMIN')
                             <th class="border-top-0 border-bottom-0 rmgr-name-column"></th>
                             <th class="border-top-0 border-bottom-0 rmgr-name-column"></th>
@@ -178,6 +181,9 @@
                         <th class="border-bottom-0 border-top border-left-0 text-right">#</th>
                         <th class="border-bottom-0 border-top">Name</th>
                         <th class="border-bottom-0 border-top">Age</th>
+                        @if($viewingAs !== 'RME')
+                            <th class="border-bottom-0 border-top">ICDs</th>
+                        @endif
                         @if($viewingAs === 'ADMIN')
                             <th class="border-bottom-0 border-top">MCP</th>
                             <th class="border-bottom-0 border-top">RMM</th>
@@ -441,42 +447,26 @@
                     let tr = $('<tr/>').attr('data-uid', m.uid);
 
                     // date, time
-                    $('<td/>').addClass('p-1 text-sm').text(m.date_display + ' ' + m.time_display).appendTo(tr);
+                    $('<td class="w-25 text-nowrap"/>').addClass('p-1 text-sm').text(m.date_display + ' ' + m.time_display).appendTo(tr);
 
                     // value
                     if(_type === 'bp') {
-                        $('<td/>').addClass('p-1 text-sm').text(m.sbpMmHg + '/' + m.dbpMmHg).appendTo(tr);
+                        $('<td class="pl-2"/>').addClass('p-1 text-sm').text(m.sbpMmHg + '/' + m.dbpMmHg).appendTo(tr);
                     }
                     else if(_type === 'weight') {
-                        $('<td/>').addClass('p-1 text-sm').text(m.numericValue).appendTo(tr);
+                        $('<td class="pl-2"/>').addClass('p-1 text-sm').text(m.numericValue).appendTo(tr);
                     }
 
                     // stamp
                     // MCPs and RMMs get stamp UI
                     let stamp = '';
                     @if($viewingAs === 'MCP')
-                    if(!m.hasBeenStampedByMcp) {
-                        $('<td/>').addClass('p-1')
-                            .append(
-                                $('<a/>').addClass('text-sm btn-quick-stamp c-pointer text-nowrap').attr('data-uid', m.uid).text('Stamp as normal')
-                            )
-                            .appendTo(tr);
-                    }
-                    else {
-                        $('<td/>').addClass('p-1')
-                            .append(
-                                $('<i/>').addClass('fa fa-check text-sm')
-                            )
-                            .append(
-                                $('<span/>').addClass('text-sm ml-1').text('Stamped')
-                            )
-                            .appendTo(tr);
-                    }
+                    {{-- nop --}}
                     @elseif($viewingAs === 'RMM')
                     if(!m.hasBeenStampedByRmm) {
                         $('<td/>').addClass('p-1')
                             .append(
-                                $('<a/>').addClass('text-sm btn-quick-stamp c-pointer text-nowrap').attr('data-uid', m.uid).text('Stamp as normal')
+                                $('<a/>').addClass('text-sm btn-quick-stamp c-pointer text-nowrap').attr('data-uid', m.uid).text('Stamp')
                             )
                             .appendTo(tr);
                     }

resources/views/app/practice-management/rpm-manager/row.blade.php

@@ -79,6 +79,19 @@
         >{{ $iPatient->client_name }}</a>
     </td>
     <td title="{{friendly_date($iPatient->dob)}}">{{$iPatient->age_in_years ?: '-'}}</span></td>
+    @if($viewingAs !== 'RME')
+        <td class="text-nowrap">
+            <?php
+            $reasons = [];
+            if($iPatient->rm_reason_icd1) $reasons[] = $iPatient->rm_reason_icd1;
+            if($iPatient->rm_reason_icd2) $reasons[] = $iPatient->rm_reason_icd2;
+            if($iPatient->rm_reason_icd3) $reasons[] = $iPatient->rm_reason_icd3;
+            if($iPatient->rm_reason_icd4) $reasons[] = $iPatient->rm_reason_icd4;
+            $reasons = count($reasons) ? implode(', ', $reasons) : '-';
+            ?>
+            {{$reasons}}
+        </td>
+    @endif
     @if($viewingAs === 'ADMIN')
         <td class="rmgr-name-column"><div class="rmgr-name-element" title="{{$iPatient->mcp_name ?: ''}}">{{$iPatient->mcp_last_name ?: '-'}}</div></td>
         <td class="rmgr-name-column"><div class="rmgr-name-element" title="{{$iPatient->rmm_name ?: ''}}">{{$iPatient->rmm_last_name ?: '-'}}</div></td>