Kaynağa Gözat

Merge branch 'master' of rav.triplestart.com:jmudaka/stagfe2

= 3 yıl önce
ebeveyn
işleme
92cc72d32b

+ 9 - 7
resources/views/app/patient/care-month/_matrix.blade.php

@@ -178,13 +178,15 @@ foreach ($days as $k => $day) {
             @if($mIndex === 0)
                 <td rowspan="{{count($days[$k])}}" class="px-2">
                     @if($performerRole === 'ADMIN')
-                        <div class="my-1">
-                            <span class="text-secondary">MCP Unstamped:</span>
-                            <b class="{{count($unstampedMCP[$k]) ? '' : 'text-secondary font-weight-normal'}}">{{count($unstampedMCP[$k])}}</b>
-                        </div>
-                        <div class="">
-                            <span class="text-secondary">Non-HCP Unstamped:</span>
-                            <b class="{{count($unstampedNonHCP[$k]) ? '' : 'text-secondary font-weight-normal'}}">{{count($unstampedNonHCP[$k])}}</b>
+                        <div class="d-flex align-items-center flex-wrap">
+                            <div class="mr-2">
+                                <span class="text-secondary">MCP Unstamped:</span>
+                                <b class="{{count($unstampedMCP[$k]) ? '' : 'text-secondary font-weight-normal'}}">{{count($unstampedMCP[$k])}}</b>
+                            </div>
+                            <div class="">
+                                <span class="text-secondary">Non-HCP Unstamped:</span>
+                                <b class="{{count($unstampedNonHCP[$k]) ? '' : 'text-secondary font-weight-normal'}}">{{count($unstampedNonHCP[$k])}}</b>
+                            </div>
                         </div>
                     @elseif($performerRole === 'MCP')
                         @if(count($unstampedMCP[$k]))

+ 9 - 7
resources/views/app/patient/care-month/_work_matrix.blade.php

@@ -202,13 +202,15 @@ $days = $daysWithUnstamped;
                 @if($mIndex === 0)
                     <td rowspan="{{count($days[$k])}}" class="px-2">
                         @if($performerRole === 'ADMIN')
-                            <div class="my-1">
-                                <span class="text-secondary">MCP Unstamped:</span>
-                                <b class="{{count($unstampedMCP[$k]) ? '' : 'text-secondary font-weight-normal'}}">{{count($unstampedMCP[$k])}}</b>
-                            </div>
-                            <div class="">
-                                <span class="text-secondary">RMM Unstamped:</span>
-                                <b class="{{count($unstampedRMM[$k]) ? '' : 'text-secondary font-weight-normal'}}">{{count($unstampedRMM[$k])}}</b>
+                            <div class="d-flex align-items-center flex-wrap">
+                                <div>
+                                    <span class="text-secondary">MCP Unstamped:</span>
+                                    <b class="{{count($unstampedMCP[$k]) ? '' : 'text-secondary font-weight-normal'}}">{{count($unstampedMCP[$k])}}</b>
+                                </div>
+                                <div class="">
+                                    <span class="text-secondary">RMM Unstamped:</span>
+                                    <b class="{{count($unstampedRMM[$k]) ? '' : 'text-secondary font-weight-normal'}}">{{count($unstampedRMM[$k])}}</b>
+                                </div>
                             </div>
                             <div class="text-sm text-secondary">Only the MCP or RMM can stamp-all!</div>
                         @elseif($performerRole === 'MCP')

+ 8 - 0
resources/views/app/practice-management/visit-templates/index.blade.php

@@ -20,6 +20,7 @@
                         <th class="border-0">Title</th>
                         <th class="border-0">Created At</th>
                         <th class="border-0">Status</th>
+                        <th class="border-0">Accessiblity</th>
                         <th class="border-0">&nbsp;</th>
                     </tr>
                 </thead>
@@ -50,6 +51,13 @@
                                 @endif
                             </div>
                         </td>
+                        <td>
+                            @if($template->is_accessible_to_all)
+                                <small class="text-muted"><i class="fas fa-check text-success"></i> Accessible to All</small>
+                            @else
+                                <small class="text-muted"><i class="fas fa-ban"></i> Limited Access</small>
+                            @endif
+                        </td>
                         <td>
                             <div class="d-flex align-items-center">
                                 <div class="mr-2">