Prechádzať zdrojové kódy

Trim client single dashboard

Vijayakrishnan Krishnan 5 rokov pred
rodič
commit
0ded34d4cb

+ 22 - 0
public/css/style.css

@@ -86,3 +86,25 @@ hr.m-negator {
     margin-left: -1.25rem;
     margin-right: -1.25rem;
 }
+.mcp-theme-1 *:not(i) {
+    font-family: Verdana, sans-serif;
+    font-size: 13px;
+}
+.mcp-theme-1 .font-size-11 {
+    font-size: 11px;
+}
+.mcp-theme-1 .font-size-13 {
+    font-size: 13px;
+}
+.mcp-theme-1 .font-underline {
+    text-decoration: underline;
+}
+.mcp-theme-1 .on-hover-opaque {
+    opacity: 0.5;
+}
+.mcp-theme-1 .on-hover-opaque:hover {
+    opacity: 1;
+}
+.mcp-theme-1 a, .mcp-theme-1 a:link {
+    color: rgb(13, 89, 175);
+}

+ 170 - 227
resources/views/app/patient/dashboard.blade.php

@@ -1,8 +1,8 @@
 @extends ('layouts.patient')
 
-@section('section-title')
+{{--@section('section-title')
     Patient Dashboard
-@endsection
+@endsection--}}
 
 @section('inner-content')
     {{--<div>
@@ -63,16 +63,17 @@
         <?php $infoLines = json_decode($patient->info_lines);?>
         <?php $infoLines = !$infoLines ? [] : $infoLines; ?>
 
-        <hr class="mt-3 mb-0 m-negator">
+        {{--<hr class="mt-3 mb-0 m-negator">--}}
 
         <div class="row">
-            <div class="col-7">
+            <div class="col-6">
                 {{-- rx --}}
-                <div class="mt-4 overflow-auto">
-                    <div class="d-flex align-items-center pb-2">
-                        <h6 class="mr-3 my-0 font-weight-bold">Current Medications</h6>
+                <div class="mt-2 pb-1">
+                    <div class="d-flex align-items-center mb-2 py-2 border-top border-bottom">
+                        <h6 class="my-0 font-weight-bold text-secondary">Current Medications</h6>
+                        <span class="mx-2 text-secondary">|</span>
                         <div moe>
-                            <a start show class="btn btn-sm btn-primary py-0">+ Add</a>
+                            <a start show class="py-0 font-weight-normal">Add</a>
                             <form url="/api/clientInfoLine/create">
                                 <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
                                 <input type="hidden" name="category" value="rx">
@@ -84,27 +85,21 @@
                                 </div>
                             </form>
                         </div>
+                        <span class="mx-2 text-secondary">|</span>
+                        <a start show class="py-0 font-weight-normal" href="#">View All</a>
                     </div>
-                    <table class="table table-striped table-sm table-bordered">
-                        <thead>
-                        <tr>
-                            {{--<th class="px-2 text-secondary">Category</th>--}}
-                            <th class="px-2 text-secondary">Medication</th>
-                            {{--<th class="px-2 text-secondary">Content Detail</th>--}}
-                            <th class="px-2 text-secondary delete-column">&nbsp;</th>
-                        </tr>
-                        </thead>
+                    <table class="table table-sm border-0 m-0">
                         <tbody>
+                        <?php $itemCount = 0; ?>
                         @foreach($infoLines as $category => $lines)
                             @if($category === "rx")
                                 @foreach ($lines as $line)
+                                    <?php $itemCount++; ?>
                                     <tr>
-                                        {{--<td class="px-2">{{$category}}</td>--}}
-                                        <td class="px-2">{{$line->contentText}}</td>
-                                        {{--<td class="px-2"><pre><?php print_r($line->contentDetail) ?></pre></td>--}}
-                                        <td class="px-2 text-center delete-column">
-                                            <div moe relative>
-                                                <a start show><i class="fa fa-trash text-danger"></i></a>
+                                        <td class="text-black p-0 border-0">
+                                            <span class="font-weight-bold">{{$line->contentText}}</span>
+                                            <span moe relative class="ml-1">
+                                                <a class="on-hover-opaque" start show><i class="font-size-11 fa fa-trash-alt text-danger"></i></a>
                                                 <form url="/api/clientInfoLine/remove" right>
                                                     <input type="hidden" name="uid" value="{{ $line->uid }}">
                                                     <p class="small">Are you sure you want to delete this entry?</p>
@@ -113,22 +108,30 @@
                                                         <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
                                                     </div>
                                                 </form>
-                                            </div>
+                                            </span>
                                         </td>
                                     </tr>
                                 @endforeach
                             @endif
                         @endforeach
+                        @if($itemCount === 0)
+                            <tr>
+                                <td class="text-secondary p-0 border-0">
+                                    No items to show
+                                </td>
+                            </tr>
+                        @endif
                         </tbody>
                     </table>
                 </div>
 
                 {{-- dx --}}
-                <div class="mt-4 overflow-auto">
-                    <div class="d-flex align-items-center pb-2">
-                        <h6 class="mr-3 my-0 font-weight-bold">Dx &amp; Focus Areas</h6>
+                <div class="mt-4 pb-1">
+                    <div class="d-flex align-items-center mb-2 py-2 border-top border-bottom">
+                        <h6 class="my-0 font-weight-bold text-secondary">Dx &amp; Focus Areas</h6>
+                        <span class="mx-2 text-secondary">|</span>
                         <div moe>
-                            <a start show class="btn btn-sm btn-primary py-0">+ Add</a>
+                            <a start show class="py-0 font-weight-normal">Add</a>
                             <form url="/api/clientInfoLine/create">
                                 <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
                                 <input type="hidden" name="category" value="dx">
@@ -150,35 +153,25 @@
                                 </div>
                             </form>
                         </div>
+                        <span class="mx-2 text-secondary">|</span>
+                        <a start show class="py-0 font-weight-normal" href="#">View All</a>
                     </div>
-                    <table class="table table-striped table-sm table-bordered">
-                        <thead>
-                        <tr>
-                            {{--<th class="px-2 text-secondary">Category</th>--}}
-                            <th class="px-2 text-secondary">Title</th>
-                            <th class="px-2 text-secondary">ICD</th>
-                            <th class="px-2 text-secondary">Chronic or Acute</th>
-                            <th class="px-2 text-secondary">Prognosis</th>
-                            <th class="px-2 text-secondary">Treatment Goal</th>
-                            <th class="px-2 text-secondary">Treatment Plan</th>
-                            <th class="px-2 text-secondary delete-column">&nbsp;</th>
-                        </tr>
-                        </thead>
+                    <table class="table table-sm border-0 m-0">
                         <tbody>
+                        <?php $itemCount = 0; ?>
                         @foreach($infoLines as $category => $lines)
                             @if($category === "dx")
                                 @foreach ($lines as $line)
+                                    <?php $itemCount++; ?>
                                     <tr>
-                                        {{--<td class="px-2">{{$category}}</td>--}}
-                                        <td class="px-2">{{$line->contentText}}</td>
-                                        <td class="px-2">{{ $line->contentDetail->{"ICD"} }}</td>
-                                        <td class="px-2">{{ $line->contentDetail->{"Chronic or Acute"} }}</td>
-                                        <td class="px-2">{{ $line->contentDetail->{"Prognosis"} }}</td>
-                                        <td class="px-2">{{ $line->contentDetail->{"Treatment Goal"} }}</td>
-                                        <td class="px-2">{{ $line->contentDetail->{"Treatment Plan"} }}</td>
-                                        <td class="px-2 text-center delete-column">
-                                            <div moe relative>
-                                                <a start show><i class="fa fa-trash text-danger"></i></a>
+                                        <td class="text-black p-0 border-0">
+                                            <span class="font-weight-bold">{{$line->contentText}}</span>
+                                            /
+                                            <span class="text-secondary">{{ $line->contentDetail->{"Chronic or Acute"} }}</span>
+                                            /
+                                            <span class="text-secondary">ICD: {{ $line->contentDetail->{"ICD"} ? $line->contentDetail->{"ICD"} : '-' }}</span>
+                                            <span moe relative class="ml-1">
+                                                <a class="on-hover-opaque" start show><i class="font-size-11 fa fa-trash-alt text-danger"></i></a>
                                                 <form url="/api/clientInfoLine/remove" right>
                                                     <input type="hidden" name="uid" value="{{ $line->uid }}">
                                                     <p class="small">Are you sure you want to delete this entry?</p>
@@ -187,22 +180,30 @@
                                                         <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
                                                     </div>
                                                 </form>
-                                            </div>
+                                            </span>
                                         </td>
                                     </tr>
                                 @endforeach
                             @endif
                         @endforeach
+                        @if($itemCount === 0)
+                            <tr>
+                                <td class="text-secondary p-0 border-0">
+                                    No items to show
+                                </td>
+                            </tr>
+                        @endif
                         </tbody>
                     </table>
                 </div>
 
                 {{-- care_team --}}
-                <div class="mt-4 overflow-auto">
-                    <div class="d-flex align-items-center pb-2">
-                        <h6 class="mr-3 my-0 font-weight-bold">Care Team</h6>
+                <div class="mt-4">
+                    <div class="d-flex align-items-center mb-2 py-2 border-top border-bottom">
+                        <h6 class="my-0 font-weight-bold text-secondary">Care Team</h6>
+                        <span class="mx-2 text-secondary">|</span>
                         <div moe>
-                            <a start show class="btn btn-sm btn-primary py-0">+ Add</a>
+                            <a start show class="py-0 font-weight-normal">Add</a>
                             <form url="/api/clientInfoLine/create">
                                 <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
                                 <input type="hidden" name="category" value="care_team">
@@ -219,35 +220,25 @@
                                 </div>
                             </form>
                         </div>
+                        <span class="mx-2 text-secondary">|</span>
+                        <a start show class="py-0 font-weight-normal" href="#">View All</a>
                     </div>
-                    <table class="table table-striped table-sm table-bordered">
-                        <thead>
-                        <tr>
-                            {{--<th class="px-2 text-secondary">Category</th>--}}
-                            <th class="px-2 text-secondary">Name</th>
-                            <th class="px-2 text-secondary">Specialty</th>
-                            <th class="px-2 text-secondary">Organization</th>
-                            <th class="px-2 text-secondary">Phone<br>Fax</th>
-                            <th class="px-2 text-secondary">Next Appointment</th>
-                            {{--<th class="px-2 text-secondary">Memo</th>--}}
-                            <th class="px-2 text-secondary delete-column">&nbsp;</th>
-                        </tr>
-                        </thead>
+                    <table class="table table-sm border-0 m-0">
                         <tbody>
+                        <?php $itemCount = 0; ?>
                         @foreach($infoLines as $category => $lines)
                             @if($category === "care_team")
                                 @foreach ($lines as $line)
+                                    <?php $itemCount++; ?>
                                     <tr>
-                                        {{--<td class="px-2">{{$category}}</td>--}}
-                                        <td class="px-2">{{$line->contentText}}</td>
-                                        <td class="px-2">{{ $line->contentDetail->{"Specialty"} }}</td>
-                                        <td class="px-2">{{ $line->contentDetail->{"Organization"} }}</td>
-                                        <td class="px-2">{{ $line->contentDetail->{"Phone"} }}<br>{{ $line->contentDetail->{"Fax"} }}</td>
-                                        <td class="px-2">{{ $line->contentDetail->{"Next Appointment"} }}</td>
-                                        {{--<td class="px-2">{{ $line->contentDetail->{"Memo"} }}</td>--}}
-                                        <td class="px-2 text-center delete-column">
-                                            <div moe relative>
-                                                <a start show><i class="fa fa-trash text-danger"></i></a>
+                                        <td class="text-black p-0 border-0">
+                                            <span class="font-weight-bold">{{$line->contentText}}</span>
+                                            /
+                                            <span class="text-secondary">{{ $line->contentDetail->{"Specialty"} }}</span>
+                                            /
+                                            <span class="text-secondary">Next Apt: {{ $line->contentDetail->{"Next Appointment"} ? $line->contentDetail->{"Next Appointment"} : '-' }}</span>
+                                            <span moe relative class="ml-1">
+                                                <a class="on-hover-opaque" start show><i class="font-size-11 fa fa-trash-alt text-danger"></i></a>
                                                 <form url="/api/clientInfoLine/remove" right>
                                                     <input type="hidden" name="uid" value="{{ $line->uid }}">
                                                     <p class="small">Are you sure you want to delete this entry?</p>
@@ -256,23 +247,40 @@
                                                         <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
                                                     </div>
                                                 </form>
-                                            </div>
+                                            </span>
                                         </td>
                                     </tr>
                                 @endforeach
                             @endif
                         @endforeach
+                        @if($itemCount === 0)
+                            <tr>
+                                <td class="text-secondary p-0 border-0">
+                                    No items to show
+                                </td>
+                            </tr>
+                        @endif
                         </tbody>
                     </table>
                 </div>
             </div>
-            <div class="col-5">
+            <div class="col-6">
+
+                <div class="mt-2">
+                    <div class="d-flex align-items-center mb-2 py-2 border-top border-bottom">
+                        <h6 class="my-0 font-weight-bold text-secondary">History</h6>
+                        <span class="mx-2 text-secondary">|</span>
+                        <a start show class="py-0 font-weight-normal" href="#">View All</a>
+                    </div>
+                </div>
+
                 {{-- history_medical --}}
-                <div class="mt-4">
+                <div class="mt-2">
                     <div class="d-flex align-items-center pb-2">
-                        <h6 class="mr-3 my-0 font-weight-bold">Medical History</h6>
+                        <h6 class="my-0 font-weight-bold">Medical</h6>
+                        <span class="mx-2 text-secondary">|</span>
                         <div moe>
-                            <a start show class="btn btn-sm btn-primary py-0">+ Add</a>
+                            <a start show class="py-0 font-weight-normal">Add</a>
                             <form url="/api/clientInfoLine/create">
                                 <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
                                 <input type="hidden" name="category" value="history_medical">
@@ -284,24 +292,16 @@
                             </form>
                         </div>
                     </div>
-                    <table class="table table-striped table-sm table-bordered">
-                        <thead>
-                        <tr>
-                            {{--<th class="px-2 text-secondary">Category</th>--}}
-                            <th class="px-2 text-secondary">History</th>
-                            <th class="px-2 text-secondary delete-column">&nbsp;</th>
-                        </tr>
-                        </thead>
+                    <table class="table table-sm border-0 m-0">
                         <tbody>
                         @foreach($infoLines as $category => $lines)
                             @if($category === "history_medical")
                                 @foreach ($lines as $line)
                                     <tr>
-                                        {{--<td class="px-2">{{$category}}</td>--}}
-                                        <td class="px-2">{{$line->contentText}}</td>
-                                        <td class="px-2 text-center delete-column">
-                                            <div moe relative>
-                                                <a start show><i class="fa fa-trash text-danger"></i></a>
+                                        <td class="pl-4 py-0 border-0">
+                                            {{$line->contentText}}
+                                            <span moe relative class="ml-1">
+                                                <a class="on-hover-opaque" start show><i class="font-size-11 fa fa-trash-alt text-danger"></i></a>
                                                 <form url="/api/clientInfoLine/remove" right>
                                                     <input type="hidden" name="uid" value="{{ $line->uid }}">
                                                     <p class="small">Are you sure you want to delete this entry?</p>
@@ -310,7 +310,7 @@
                                                         <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
                                                     </div>
                                                 </form>
-                                            </div>
+                                            </span>
                                         </td>
                                     </tr>
                                 @endforeach
@@ -321,11 +321,12 @@
                 </div>
 
                 {{-- history_surgical --}}
-                <div class="mt-4">
+                <div class="mt-2">
                     <div class="d-flex align-items-center pb-2">
-                        <h6 class="mr-3 my-0 font-weight-bold">Surgical History</h6>
+                        <h6 class="my-0 font-weight-bold">Surgical</h6>
+                        <span class="mx-2 text-secondary">|</span>
                         <div moe>
-                            <a start show class="btn btn-sm btn-primary py-0">+ Add</a>
+                            <a start show class="py-0 font-weight-normal">Add</a>
                             <form url="/api/clientInfoLine/create">
                                 <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
                                 <input type="hidden" name="category" value="history_surgical">
@@ -337,24 +338,15 @@
                             </form>
                         </div>
                     </div>
-                    <table class="table table-striped table-sm table-bordered">
-                        <thead>
-                        <tr>
-                            {{--<th class="px-2 text-secondary">Category</th>--}}
-                            <th class="px-2 text-secondary">History</th>
-                            <th class="px-2 text-secondary delete-column">&nbsp;</th>
-                        </tr>
-                        </thead>
+                    <table class="table table-sm border-0 m-0">
                         <tbody>
                         @foreach($infoLines as $category => $lines)
                             @if($category === "history_surgical")
                                 @foreach ($lines as $line)
                                     <tr>
-                                        {{--<td class="px-2">{{$category}}</td>--}}
-                                        <td class="px-2">{{$line->contentText}}</td>
-                                        <td class="px-2 text-center delete-column">
-                                            <div moe relative>
-                                                <a start show><i class="fa fa-trash text-danger"></i></a>
+                                        <td class="pl-4 py-0 border-0">{{$line->contentText}}
+                                            <span moe relative>
+                                                <a class="on-hover-opaque" start show><i class="font-size-11 fa fa-trash text-danger"></i></a>
                                                 <form url="/api/clientInfoLine/remove" right>
                                                     <input type="hidden" name="uid" value="{{ $line->uid }}">
                                                     <p class="small">Are you sure you want to delete this entry?</p>
@@ -363,7 +355,7 @@
                                                         <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
                                                     </div>
                                                 </form>
-                                            </div>
+                                            </span>
                                         </td>
                                     </tr>
                                 @endforeach
@@ -374,11 +366,12 @@
                 </div>
 
                 {{-- history_family --}}
-                <div class="mt-4">
+                <div class="mt-2">
                     <div class="d-flex align-items-center pb-2">
-                        <h6 class="mr-3 my-0 font-weight-bold">Family History</h6>
+                        <h6 class="my-0 font-weight-bold">Family</h6>
+                        <span class="mx-2 text-secondary">|</span>
                         <div moe>
-                            <a start show class="btn btn-sm btn-primary py-0">+ Add</a>
+                            <a start show class="py-0 font-weight-normal">Add</a>
                             <form url="/api/clientInfoLine/create">
                                 <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
                                 <input type="hidden" name="category" value="history_family">
@@ -390,24 +383,16 @@
                             </form>
                         </div>
                     </div>
-                    <table class="table table-striped table-sm table-bordered">
-                        <thead>
-                        <tr>
-                            {{--<th class="px-2 text-secondary">Category</th>--}}
-                            <th class="px-2 text-secondary">History</th>
-                            <th class="px-2 text-secondary delete-column">&nbsp;</th>
-                        </tr>
-                        </thead>
+                    <table class="table table-sm border-0 m-0">
                         <tbody>
                         @foreach($infoLines as $category => $lines)
                             @if($category === "history_family")
                                 @foreach ($lines as $line)
                                     <tr>
                                         {{--<td class="px-2">{{$category}}</td>--}}
-                                        <td class="px-2">{{$line->contentText}}</td>
-                                        <td class="px-2 text-center delete-column">
-                                            <div moe relative>
-                                                <a start show><i class="fa fa-trash text-danger"></i></a>
+                                        <td class="pl-4 py-0 border-0">{{$line->contentText}}
+                                            <span moe relative>
+                                                <a class="on-hover-opaque" start show><i class="font-size-11 fa fa-trash text-danger"></i></a>
                                                 <form url="/api/clientInfoLine/remove" right>
                                                     <input type="hidden" name="uid" value="{{ $line->uid }}">
                                                     <p class="small">Are you sure you want to delete this entry?</p>
@@ -416,7 +401,7 @@
                                                         <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
                                                     </div>
                                                 </form>
-                                            </div>
+                                            </span>
                                         </td>
                                     </tr>
                                 @endforeach
@@ -427,11 +412,12 @@
                 </div>
 
                 {{-- history_social --}}
-                <div class="mt-4">
+                <div class="mt-2">
                     <div class="d-flex align-items-center pb-2">
-                        <h6 class="mr-3 my-0 font-weight-bold">Social History</h6>
+                        <h6 class="my-0 font-weight-bold">Social</h6>
+                        <span class="mx-2 text-secondary">|</span>
                         <div moe>
-                            <a start show class="btn btn-sm btn-primary py-0">+ Add</a>
+                            <a start show class="py-0 font-weight-normal">Add</a>
                             <form url="/api/clientInfoLine/create">
                                 <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
                                 <input type="hidden" name="category" value="history_social">
@@ -443,24 +429,16 @@
                             </form>
                         </div>
                     </div>
-                    <table class="table table-striped table-sm table-bordered">
-                        <thead>
-                        <tr>
-                            {{--<th class="px-2 text-secondary">Category</th>--}}
-                            <th class="px-2 text-secondary">History</th>
-                            <th class="px-2 text-secondary delete-column">&nbsp;</th>
-                        </tr>
-                        </thead>
+                    <table class="table table-sm border-0 m-0">
                         <tbody>
                         @foreach($infoLines as $category => $lines)
                             @if($category === "history_social")
                                 @foreach ($lines as $line)
                                     <tr>
                                         {{--<td class="px-2">{{$category}}</td>--}}
-                                        <td class="px-2">{{$line->contentText}}</td>
-                                        <td class="px-2 text-center delete-column">
-                                            <div moe relative>
-                                                <a start show><i class="fa fa-trash text-danger"></i></a>
+                                        <td class="pl-4 py-0 border-0">{{$line->contentText}}
+                                            <span moe relative>
+                                                <a class="on-hover-opaque" start show><i class="font-size-11 fa fa-trash text-danger"></i></a>
                                                 <form url="/api/clientInfoLine/remove" right>
                                                     <input type="hidden" name="uid" value="{{ $line->uid }}">
                                                     <p class="small">Are you sure you want to delete this entry?</p>
@@ -469,7 +447,7 @@
                                                         <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
                                                     </div>
                                                 </form>
-                                            </div>
+                                            </span>
                                         </td>
                                     </tr>
                                 @endforeach
@@ -480,11 +458,12 @@
                 </div>
 
                 {{-- history_ob_and_preg --}}
-                <div class="mt-4">
+                <div class="mt-2">
                     <div class="d-flex align-items-center pb-2">
-                        <h6 class="mr-3 my-0 font-weight-bold">OB & Pregnancy History</h6>
+                        <h6 class="my-0 font-weight-bold">OB & Pregnancy</h6>
+                        <span class="mx-2 text-secondary">|</span>
                         <div moe>
-                            <a start show class="btn btn-sm btn-primary py-0">+ Add</a>
+                            <a start show class="py-0 font-weight-normal">Add</a>
                             <form url="/api/clientInfoLine/create">
                                 <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
                                 <input type="hidden" name="category" value="history_ob_and_preg">
@@ -496,24 +475,16 @@
                             </form>
                         </div>
                     </div>
-                    <table class="table table-striped table-sm table-bordered">
-                        <thead>
-                        <tr>
-                            {{--<th class="px-2 text-secondary">Category</th>--}}
-                            <th class="px-2 text-secondary">History</th>
-                            <th class="px-2 text-secondary delete-column">&nbsp;</th>
-                        </tr>
-                        </thead>
+                    <table class="table table-sm border-0 m-0">
                         <tbody>
                         @foreach($infoLines as $category => $lines)
                             @if($category === "history_ob_and_preg")
                                 @foreach ($lines as $line)
                                     <tr>
                                         {{--<td class="px-2">{{$category}}</td>--}}
-                                        <td class="px-2">{{$line->contentText}}</td>
-                                        <td class="px-2 text-center delete-column">
-                                            <div moe relative>
-                                                <a start show><i class="fa fa-trash text-danger"></i></a>
+                                        <td class="pl-4 py-0 border-0">{{$line->contentText}}
+                                            <span moe relative>
+                                                <a class="on-hover-opaque" start show><i class="font-size-11 fa fa-trash text-danger"></i></a>
                                                 <form url="/api/clientInfoLine/remove" right>
                                                     <input type="hidden" name="uid" value="{{ $line->uid }}">
                                                     <p class="small">Are you sure you want to delete this entry?</p>
@@ -522,7 +493,7 @@
                                                         <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
                                                     </div>
                                                 </form>
-                                            </div>
+                                            </span>
                                         </td>
                                     </tr>
                                 @endforeach
@@ -533,11 +504,12 @@
                 </div>
 
                 {{-- history_hospitalizations_procedures --}}
-                <div class="mt-4">
+                <div class="mt-2">
                     <div class="d-flex align-items-center pb-2">
-                        <h6 class="mr-3 my-0 font-weight-bold">Hospitalizations / Procedures History</h6>
+                        <h6 class="my-0 font-weight-bold">Hospitalizations / Procedures</h6>
+                        <span class="mx-2 text-secondary">|</span>
                         <div moe>
-                            <a start show class="btn btn-sm btn-primary py-0">+ Add</a>
+                            <a start show class="py-0 font-weight-normal">Add</a>
                             <form url="/api/clientInfoLine/create">
                                 <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
                                 <input type="hidden" name="category" value="history_hospitalizations_procedures">
@@ -549,24 +521,16 @@
                             </form>
                         </div>
                     </div>
-                    <table class="table table-striped table-sm table-bordered">
-                        <thead>
-                        <tr>
-                            {{--<th class="px-2 text-secondary">Category</th>--}}
-                            <th class="px-2 text-secondary">History</th>
-                            <th class="px-2 text-secondary delete-column">&nbsp;</th>
-                        </tr>
-                        </thead>
+                    <table class="table table-sm border-0 m-0">
                         <tbody>
                         @foreach($infoLines as $category => $lines)
                             @if($category === "history_hospitalizations_procedures")
                                 @foreach ($lines as $line)
                                     <tr>
                                         {{--<td class="px-2">{{$category}}</td>--}}
-                                        <td class="px-2">{{$line->contentText}}</td>
-                                        <td class="px-2 text-center delete-column">
-                                            <div moe relative>
-                                                <a start show><i class="fa fa-trash text-danger"></i></a>
+                                        <td class="pl-4 py-0 border-0">{{$line->contentText}}
+                                            <span moe relative>
+                                                <a class="on-hover-opaque" start show><i class="font-size-11 fa fa-trash text-danger"></i></a>
                                                 <form url="/api/clientInfoLine/remove" right>
                                                     <input type="hidden" name="uid" value="{{ $line->uid }}">
                                                     <p class="small">Are you sure you want to delete this entry?</p>
@@ -575,7 +539,7 @@
                                                         <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
                                                     </div>
                                                 </form>
-                                            </div>
+                                            </span>
                                         </td>
                                     </tr>
                                 @endforeach
@@ -586,11 +550,12 @@
                 </div>
 
                 {{-- history_screenings --}}
-                <div class="mt-4">
+                <div class="mt-2">
                     <div class="d-flex align-items-center pb-2">
-                        <h6 class="mr-3 my-0 font-weight-bold">Screenings History</h6>
+                        <h6 class="my-0 font-weight-bold">Screenings</h6>
+                        <span class="mx-2 text-secondary">|</span>
                         <div moe>
-                            <a start show class="btn btn-sm btn-primary py-0">+ Add</a>
+                            <a start show class="py-0 font-weight-normal">Add</a>
                             <form url="/api/clientInfoLine/create">
                                 <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
                                 <input type="hidden" name="category" value="history_screenings">
@@ -602,24 +567,16 @@
                             </form>
                         </div>
                     </div>
-                    <table class="table table-striped table-sm table-bordered">
-                        <thead>
-                        <tr>
-                            {{--<th class="px-2 text-secondary">Category</th>--}}
-                            <th class="px-2 text-secondary">History</th>
-                            <th class="px-2 text-secondary delete-column">&nbsp;</th>
-                        </tr>
-                        </thead>
+                    <table class="table table-sm border-0 m-0">
                         <tbody>
                         @foreach($infoLines as $category => $lines)
                             @if($category === "history_screenings")
                                 @foreach ($lines as $line)
                                     <tr>
                                         {{--<td class="px-2">{{$category}}</td>--}}
-                                        <td class="px-2">{{$line->contentText}}</td>
-                                        <td class="px-2 text-center delete-column">
-                                            <div moe relative>
-                                                <a start show><i class="fa fa-trash text-danger"></i></a>
+                                        <td class="pl-4 py-0 border-0">{{$line->contentText}}
+                                            <span moe relative>
+                                                <a class="on-hover-opaque" start show><i class="font-size-11 fa fa-trash text-danger"></i></a>
                                                 <form url="/api/clientInfoLine/remove" right>
                                                     <input type="hidden" name="uid" value="{{ $line->uid }}">
                                                     <p class="small">Are you sure you want to delete this entry?</p>
@@ -628,7 +585,7 @@
                                                         <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
                                                     </div>
                                                 </form>
-                                            </div>
+                                            </span>
                                         </td>
                                     </tr>
                                 @endforeach
@@ -639,11 +596,12 @@
                 </div>
 
                 {{-- history_colonoscopy --}}
-                <div class="mt-4">
+                <div class="mt-2">
                     <div class="d-flex align-items-center pb-2">
-                        <h6 class="mr-3 my-0 font-weight-bold">Colonoscopy History</h6>
+                        <h6 class="my-0 font-weight-bold">Colonoscopy</h6>
+                        <span class="mx-2 text-secondary">|</span>
                         <div moe>
-                            <a start show class="btn btn-sm btn-primary py-0">+ Add</a>
+                            <a start show class="py-0 font-weight-normal">Add</a>
                             <form url="/api/clientInfoLine/create">
                                 <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
                                 <input type="hidden" name="category" value="history_colonoscopy">
@@ -655,24 +613,16 @@
                             </form>
                         </div>
                     </div>
-                    <table class="table table-striped table-sm table-bordered">
-                        <thead>
-                        <tr>
-                            {{--<th class="px-2 text-secondary">Category</th>--}}
-                            <th class="px-2 text-secondary">History</th>
-                            <th class="px-2 text-secondary delete-column">&nbsp;</th>
-                        </tr>
-                        </thead>
+                    <table class="table table-sm border-0 m-0">
                         <tbody>
                         @foreach($infoLines as $category => $lines)
                             @if($category === "history_colonoscopy")
                                 @foreach ($lines as $line)
                                     <tr>
                                         {{--<td class="px-2">{{$category}}</td>--}}
-                                        <td class="px-2">{{$line->contentText}}</td>
-                                        <td class="px-2 text-center delete-column">
-                                            <div moe relative>
-                                                <a start show><i class="fa fa-trash text-danger"></i></a>
+                                        <td class="pl-4 py-0 border-0">{{$line->contentText}}
+                                            <span moe relative>
+                                                <a class="on-hover-opaque" start show><i class="font-size-11 fa fa-trash text-danger"></i></a>
                                                 <form url="/api/clientInfoLine/remove" right>
                                                     <input type="hidden" name="uid" value="{{ $line->uid }}">
                                                     <p class="small">Are you sure you want to delete this entry?</p>
@@ -681,7 +631,7 @@
                                                         <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
                                                     </div>
                                                 </form>
-                                            </div>
+                                            </span>
                                         </td>
                                     </tr>
                                 @endforeach
@@ -692,11 +642,12 @@
                 </div>
 
                 {{-- history_mammogram --}}
-                <div class="mt-4">
+                <div class="mt-2">
                     <div class="d-flex align-items-center pb-2">
-                        <h6 class="mr-3 my-0 font-weight-bold">Mammogram History</h6>
+                        <h6 class="my-0 font-weight-bold">Mammogram</h6>
+                        <span class="mx-2 text-secondary">|</span>
                         <div moe>
-                            <a start show class="btn btn-sm btn-primary py-0">+ Add</a>
+                            <a start show class="py-0 font-weight-normal">Add</a>
                             <form url="/api/clientInfoLine/create">
                                 <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
                                 <input type="hidden" name="category" value="history_mammogram">
@@ -708,24 +659,16 @@
                             </form>
                         </div>
                     </div>
-                    <table class="table table-striped table-sm table-bordered">
-                        <thead>
-                        <tr>
-                            {{--<th class="px-2 text-secondary">Category</th>--}}
-                            <th class="px-2 text-secondary">History</th>
-                            <th class="px-2 text-secondary delete-column">&nbsp;</th>
-                        </tr>
-                        </thead>
+                    <table class="table table-sm border-0 m-0">
                         <tbody>
                         @foreach($infoLines as $category => $lines)
                             @if($category === "history_mammogram")
                                 @foreach ($lines as $line)
                                     <tr>
                                         {{--<td class="px-2">{{$category}}</td>--}}
-                                        <td class="px-2">{{$line->contentText}}</td>
-                                        <td class="px-2 text-center delete-column">
-                                            <div moe relative>
-                                                <a start show><i class="fa fa-trash text-danger"></i></a>
+                                        <td class="pl-4 py-0 border-0">{{$line->contentText}}
+                                            <span moe relative>
+                                                <a class="on-hover-opaque" start show><i class="font-size-11 fa fa-trash text-danger"></i></a>
                                                 <form url="/api/clientInfoLine/remove" right>
                                                     <input type="hidden" name="uid" value="{{ $line->uid }}">
                                                     <p class="small">Are you sure you want to delete this entry?</p>
@@ -734,7 +677,7 @@
                                                         <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
                                                     </div>
                                                 </form>
-                                            </div>
+                                            </span>
                                         </td>
                                     </tr>
                                 @endforeach

+ 4 - 4
resources/views/layouts/patient.blade.php

@@ -305,7 +305,7 @@
                                             <label for="" class="control-label text-left">Effective time</label>
                                             <input type="time" name="effectiveTime" class="form-control">
                                         </div>
-                                        
+
                                         <div class="form-group">
                                             <textarea name="freeTextHtml" id="" cols="30" rows="10" class="form-control"></textarea>
                                         </div>
@@ -315,7 +315,7 @@
                                         </div>
                                     </form>
                                 </div>
-                                
+
                                 <br>
                                 <button class="btn btn-primary btn-sm mt-2">
                                     <i class="fa fa-book"></i>
@@ -358,8 +358,8 @@
                         </div>
                     </div>
                     <div class="card-body">
-                        <h1 class="h3">@yield('section-title')</h1>
-                        <div>
+                        {{--<h1 class="h3">@yield('section-title')</h1>--}}
+                        <div class="mcp-theme-1">
                             @yield('inner-content')
                         </div>
                     </div>