Procházet zdrojové kódy

CM measurements matrix (html cleanup)

Vijayakrishnan před 3 roky
rodič
revize
68cae8946c

+ 6 - 5
resources/views/app/patient/care-month/_matrix.blade.php

@@ -9,7 +9,8 @@
         $performerRole = 'NON-HCP';
     }
 ?>
-<table class="table table-condensed table-sm table-bordered mt-2 mb-0">
+<p class="font-weight-bold">Care Month Matrix</p>
+<table class="table table-condensed table-sm table-bordered mt-2 mb-3">
     <thead>
     <tr>
         <th class="px-2 text-secondary align-bottom" rowspan="2">Date</th>
@@ -22,7 +23,6 @@
         <th class="text-secondary text-sm">Type</th>
         <th class="text-secondary text-sm">Value</th>
         <th class="text-secondary text-sm">Stamp</th>
-        <th></th>
     </tr>
     </thead>
     <tbody>
@@ -159,9 +159,10 @@
             </td>
             <td>
                 @foreach($m->entries as $entry)
-                    <div class="my-1 d-flex align-items-start">
-                        <b>{{round($entry->time_in_seconds / 60)}}m</b>
-                        <span class="text-secondary ml-2 inline-html-container">{!! $entry->content_text !!}</span>
+                    <div class="my-1 d-flex align-items-start flex-nowrap">
+                        <b class="mr-2">{{round($entry->time_in_seconds / 60)}}m</b>
+                        <span class="text-secondary mr-2 text-nowrap text-sm">({{date('h:i a', strtotime($entry->created_at))}})</span>
+                        <span class="text-secondary inline-html-container flex-grow-1">{!! $entry->content_text !!}</span>
                     </div>
                 @endforeach
                     <div moe large>

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

@@ -389,7 +389,7 @@
 
                     @include('app.patient.care-month._matrix')
 
-                    <table class="table table-striped table-sm table-bordered mt-2 mb-0">
+                    <table class="table table-striped table-sm table-bordered mt-2 mb-0 d-none">
                         <thead>
                         <tr>
                             <th class="px-2 text-secondary">Effective Date</th>
@@ -598,9 +598,8 @@
             </div>
         </div> --}}
 
-        <hr class="m-negator mt-4 mb-3">
-
         @if($pro->pro_type === 'ADMIN')
+            <hr class="m-negator mt-4 mb-3">
             <div class="pb-3 screen-only">
                 <div class="ml-auto d-flex align-items-center">