resolved conflicts

docker/statistics/Modules/Theatre/Resources/views/theatre_surgeries/index.blade.php

@@ -0,0 +1,67 @@
+@extends('layouts.main')
+
+@push('styles')
+    <link href="{{ asset('elite/bower_components/bootstrap-datepicker/bootstrap-datepicker.min.css') }}" rel="stylesheet" type="text/css" />
+    <link href="{{ asset('elite/bower_components/select2/select2.min.css') }}" rel="stylesheet" />
+@endpush
+
+@section('content')
+    <div class="row bg-title">
+        <div class="col-md-7">
+            <h4 class="page-title">{{ __('theatre_surgeries.view_surgery_history') }}</h4>
+        </div>
+        <div class="col-md-5">
+            <ol class="breadcrumb">
+                <li><a href="{{ route('home') }}">{{ __('home.dashboard') }}</a></li>
+                <li class="active">{{ __('surgery.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 color-bordered-table success-bordered-table">
+                        <thead>
+                            <th>{{ __('surgery.surgery_performed') }}</th>
+                            <th>{{ __('surgery.surgeon') }}</th>
+                            <th>{{ __('theatre_surgeries.anaesthetist') }}</th>
+                            <th>{{ __('surgery.time_surgery_completed') }}</th>
+                            <th>{{ __('surgery.date_of_surgery') }}</th>
+                            <th></th>
+                        </thead>
+                        <tbody>
+                        @foreach($surgeries as $item)
+                            <tr>
+                                <td>
+                                    @php
+                                        $procedures_array = explode(",", $item->procedure_id);
+                                    @endphp
+                                    @for ($i = 0; $i < count($procedures_array); $i++)
+                                        - {{ get_name($procedures_array[$i],'id','name','procedures') }}<br>
+                                    @endfor
+                                </td>
+                                <td>{{ get_full_name($item->surgeon, 'id', 'first_name', 'last_name', 'users') }}</td>
+                                <td>{{ get_full_name(get_name($item->anaesthesia_id,'id','anaesthetist','anaesthesias'),'id','first_name','last_name','users') }}</td>
+                                <td>{{ streamline_date_time($item->time_surgery_completed) }}</td>
+                                <td>{{ streamline_date($item->created_at) }}</td>
+                                <td><a class="btn btn-sm btn-info" href="{{ route('theatre_surgery.details', $item->id) }}">{{ __('surgery.details') }}</a></td>
+                            </tr>
+                        @endforeach
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+
+@endsection