resolved conflicts

docker/statistics/Modules/Theatre/Resources/views/anaesthetics/history.blade.php

@@ -0,0 +1,66 @@
+@extends('layouts.main')
+
+@push('styles')
+    <link href="{{ asset('elite/bower_components/bootstrap-datepicker/bootstrap-datepicker.min.css') }}" rel="stylesheet" type="text/css" />
+@endpush
+
+@section('content')
+    <div class="row bg-title">
+        <div class="col-md-7">
+            <h4 class="page-title">View Anaesthetics History</h4>
+        </div>
+        <div class="col-md-5">
+            <ol class="breadcrumb">
+                <li><a href="{{ route('home') }}">Dashboard</a></li>
+                <li class="active">View</li>
+            </ol>
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col-sm-12">
+            @include('patients::allergies.header')
+        </div>
+    </div>
+
+    @include('flash::message')
+
+    <div class="white-box">
+        <div class="row">
+            <div class="col-md-12">
+                <div class="table-responsive">
+                    <table class="table table-striped table-bordered">
+                        <thead>
+                            <th>Procedure</th>
+                            <th>Surgery</th>
+                            <th>Anaesthetist</th>
+                            <th>Time Of Commencement</th>
+                            <th>Date</th>
+                            <th></th>
+                        </thead>
+                        <tbody>
+                        @foreach($anaesthesia_records as $anaesthesia)
+                            <tr>
+                                <td>{{ get_name($anaesthesia->procedure_id,'id','name','procedures') }}</td>
+                                <td>{!! $anaesthesia->surgery_id != null ? get_name($anaesthesia->procedure_id, 'id','name','procedures') : '<font color="red">Not done</font>' !!}</td>
+                                <td>{{ get_full_name($anaesthesia->anaesthetist,'id','first_name','last_name','users') }}</td>
+                                <td>{{ $anaesthesia->time_commenced }}</td>
+                                <td>{{ streamline_date($anaesthesia->created_at) }}</td>
+                                <td><a class="btn btn-sm btn-info" href="/anaesthetics/view_history/{{ $anaesthesia->id }}">View Details</a></td>
+                            </tr>
+                        @endforeach
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection
+
+@push('scripts')
+    <script src="{{ asset('elite/bower_components/bootstrap-datepicker/bootstrap-datepicker.min.js') }}"></script>
+
+    <script type="text/javascript">
+        //
+    </script>
+@endpush