Przeglądaj źródła

CM single - mine/other -> show the very last entry truncated + and when (if self 'me')

Vijayakrishnan 2 lat temu
rodzic
commit
205ebed126

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

@@ -142,7 +142,7 @@
                                 <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 bg-aliceblue" colspan="{{$viewingAs === 'ADMIN' ? 2 : 1}}">Entries</th>
+                                    <th class="border-top-0 border-bottom-0 bg-aliceblue" colspan="2">Entries</th>
                                 @endif
                                 <th class="border-top-0 border-bottom-0"></th>
                                 @if($viewingAs !== 'RME')
@@ -153,7 +153,7 @@
                                     <th class="border-top-0 border-bottom-0 bg-aliceblue" colspan="3">Claim</th>
                                 @endif
                                 <th class="border-top-0 border-bottom-0"></th>
-                                <th class="border-top-0 border-bottom-0 border-right-0"></th>
+                                <th class="border-top-0 border-bottom-0 border-right-0 w-25"></th>
                             </tr>
                             <tr>
                                 <th class="border-bottom-0 border-top border-left-0 text-right">#</th>
@@ -176,9 +176,7 @@
 
                                 @if($viewingAs !== 'RME')
                                     <th class="border-bottom-0 border-top">Mine</th>
-                                    @if($viewingAs === 'ADMIN')
-                                        <th class="border-bottom-0 border-top">Others</th>
-                                    @endif
+                                    <th class="border-bottom-0 border-top">Others</th>
                                 @endif
 
                                 <th class="border-bottom-0 border-top">
@@ -334,42 +332,34 @@
                                     </td>
 
                                     @if($viewingAs !== 'RME')
-                                        <td class="width-300px">
-                                            <div class="d-flex align-items-baseline">
-                                                @if(@$iPatient->myEntries && count($iPatient->myEntries))
-                                                    <div class="d-inline-flex align-items-baseline" title="{{$iPatient->myEntries[0]->proNameFirst}} {{$iPatient->myEntries[0]->proNameLast}}: {{strip_tags($iPatient->myEntries[0]->contentText)}}">
-                                                        <span>{{round($iPatient->myEntries[0]->timeInSeconds/30)}}m</span>
-                                                        <span class="ml-1 text-secondary text-sm">
-                                                            {{$iPatient->myEntries[0]->effectiveDate->month}}/{{$iPatient->myEntries[0]->effectiveDate->day}}/{{$iPatient->myEntries[0]->effectiveDate->year}}
-                                                        </span>
-                                                    </div>
-                                                @else
-                                                    <span class="text-secondary">None</span>
-                                                @endif
-                                                <span class="mx-1 text-secondary text-sm">|</span>
-                                                <a href="#" class="btn-my-entries-popup"
-                                                   data-uid="{{$iPatient->care_month_uid}}">All</a>
-                                            </div>
+                                        <td>
+                                            @if(@$iPatient->myEntries && count($iPatient->myEntries))
+                                                <div class="d-flex align-items-baseline" title="Me: {{strip_tags($iPatient->myEntries[0]->contentText)}}">
+                                                    <span class="text-info mr-1">{{round($iPatient->myEntries[0]->timeInSeconds/30)}}m</span>
+                                                    <span class="flex-grow-1 max-width-200px text-ellipsis mr-1">{{strip_tags($iPatient->myEntries[0]->contentText)}}</span>
+                                                    @if(gettype($iPatient->myEntries[0]->effectiveDate) === 'string')
+                                                        <span class="text-secondary text-sm">{{friendly_date_est_compact($iPatient->myEntries[0]->effectiveDate)}}</span>
+                                                    @endif
+                                                </div>
+                                            @else
+                                                <span class="text-secondary">None</span>
+                                            @endif
                                         </td>
-                                        @if($viewingAs === 'ADMIN')
-                                            <td class="width-300px">
-                                                <div class="d-flex align-items-baseline">
-                                                    @if(@$iPatient->otherEntries && count($iPatient->otherEntries))
-                                                        <div class="d-inline-flex align-items-baseline" title="{{$iPatient->otherEntries[0]->proNameFirst}} {{$iPatient->otherEntries[0]->proNameLast}}: {{strip_tags($iPatient->otherEntries[0]->contentText)}}">
-                                                            <span>{{round($iPatient->otherEntries[0]->timeInSeconds/30)}}m</span>
-                                                            <span class="ml-1 text-secondary text-sm">
-                                                                {{$iPatient->otherEntries[0]->effectiveDate->month}}/{{$iPatient->otherEntries[0]->effectiveDate->day}}/{{$iPatient->otherEntries[0]->effectiveDate->year}}
-                                                            </span>
-                                                        </div>
-                                                    @else
-                                                        <span class="text-secondary">None</span>
+                                        <td>
+                                            @if(@$iPatient->otherEntries && count($iPatient->otherEntries))
+                                                <div class="d-flex align-items-baseline" title="{{$iPatient->otherEntries[0]->proNameFirst}} {{$iPatient->otherEntries[0]->proNameLast}}: {{strip_tags($iPatient->otherEntries[0]->contentText)}}">
+                                                    @if($viewingAs === 'ADMIN')
+                                                        <span class="text-info mr-1">{{round($iPatient->otherEntries[0]->timeInSeconds/30)}}m</span>
+                                                    @endif
+                                                    <span class="flex-grow-1 max-width-200px text-ellipsis mr-1">{{strip_tags($iPatient->otherEntries[0]->contentText)}}</span>
+                                                    @if(gettype($iPatient->otherEntries[0]->effectiveDate) === 'string')
+                                                        <span class="text-secondary text-sm">{{friendly_date_est_compact($iPatient->otherEntries[0]->effectiveDate)}}</span>
                                                     @endif
-                                                    <span class="mx-1 text-secondary text-sm">|</span>
-                                                    <a href="#" class="btn-other-entries-popup"
-                                                       data-uid="{{$iPatient->care_month_uid}}">All</a>
                                                 </div>
-                                            </td>
-                                        @endif
+                                            @else
+                                                <span class="text-secondary">None</span>
+                                            @endif
+                                        </td>
                                     @endif
 
                                     <td>