Forráskód Böngészése

RPM manager - column updates

Vijayakrishnan 2 éve
szülő
commit
3548cdb564

+ 1 - 0
app/Http/Controllers/PracticeManagementController.php

@@ -2514,6 +2514,7 @@ WHERE
 SELECT 
        -- display columns
        (client.name_first || ' ' || client.name_last) as client_name,
+       client.age_in_years,
        client.dob,
        care_month.start_date,
        (mcpPro.name_first || ' ' || mcpPro.name_last) as mcp_name,

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

@@ -62,7 +62,7 @@
             <div class="card-header px-2 py-2 d-flex align-items-baseline">
                 <form class="d-block w-100" action="" method="GET" id="rpm-matrix-filter">
                     <div class="d-flex align-items-baseline">
-                        <span class="font-size-16">RPM Manager: {{friendly_month($cmStartDate)}}</span>
+                        <span class="font-size-16">RPM Manager - {{friendly_month($cmStartDate)}}</span>
                     </div>
                 </form>
             </div>
@@ -132,10 +132,12 @@
                                 <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 === '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>
+                                    <th class="border-top-0 border-bottom-0 rmgr-name-column"></th>
+                                @endif
                                 <th class="border-top-0 border-bottom-0"></th>
-                                <th class="border-top-0 border-bottom-0 rmgr-name-column"></th>
-                                <th class="border-top-0 border-bottom-0 rmgr-name-column"></th>
-                                <th class="border-top-0 border-bottom-0 rmgr-name-column"></th>
                                 <th class="border-top-0 border-bottom-0 bg-aliceblue text-nowrap" colspan="3"># Meas. Days</th>
                                 <th class="border-top-0 border-bottom-0"></th>
                                 <th class="border-top-0 border-bottom-0"></th>
@@ -156,10 +158,12 @@
                             <tr>
                                 <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">DOB</th>
-                                <th class="border-bottom-0 border-top">MCP</th>
-                                <th class="border-bottom-0 border-top">RMM</th>
-                                <th class="border-bottom-0 border-top">RME</th>
+                                <th class="border-bottom-0 border-top">Age</th>
+                                @if($viewingAs === 'ADMIN')
+                                    <th class="border-bottom-0 border-top">MCP</th>
+                                    <th class="border-bottom-0 border-top">RMM</th>
+                                    <th class="border-bottom-0 border-top">RME</th>
+                                @endif
                                 <th class="border-bottom-0 border-top">DSLV</th>
 
                                 <!--# Meas. Days-->
@@ -234,10 +238,12 @@
                                            class="text-nowrap d-block max-width-170px overflow-hidden text-ellipsis"
                                         >{{ $iPatient->client_name }}</a>
                                     </td>
-                                    <td><span class="text-nowrap">{{$iPatient->dob}}</span></td>
-                                    <td class="rmgr-name-column"><div class="rmgr-name-element" title="{{$iPatient->mcp_name ?: ''}}">{{$iPatient->mcp_name ?: '-'}}</div></td>
-                                    <td class="rmgr-name-column"><div class="rmgr-name-element" title="{{$iPatient->rmm_name ?: ''}}">{{$iPatient->rmm_name ?: '-'}}</div></td>
-                                    <td class="rmgr-name-column"><div class="rmgr-name-element" title="{{$iPatient->rme_name ?: ''}}">{{$iPatient->rme_name ?: '-'}}</div></td>
+                                    <td title="{{friendly_date($iPatient->dob)}}">{{$iPatient->age_in_years ?: '-'}}</span></td>
+                                    @if($viewingAs === 'ADMIN')
+                                        <td class="rmgr-name-column"><div class="rmgr-name-element" title="{{$iPatient->mcp_name ?: ''}}">{{$iPatient->mcp_name ?: '-'}}</div></td>
+                                        <td class="rmgr-name-column"><div class="rmgr-name-element" title="{{$iPatient->rmm_name ?: ''}}">{{$iPatient->rmm_name ?: '-'}}</div></td>
+                                        <td class="rmgr-name-column"><div class="rmgr-name-element" title="{{$iPatient->rme_name ?: ''}}">{{$iPatient->rme_name ?: '-'}}</div></td>
+                                    @endif
                                     <td>{{$iPatient->days_between_most_recent_mcp_note_date_and_end_of_care_month}}</td>
 
                                     <!--# Meas. Days-->