resolved conflicts

docker/statistics/Modules/Investigations/Resources/views/lab_instruments/create.blade.php

@@ -0,0 +1,42 @@
+@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-lg-3 col-md-4 col-sm-4 col-xs-12">
+            <h4 class="page-title">{{ __('lab_instruments.add_lab_instrument') }}</h4>
+        </div>
+        <div class="col-lg-9 col-sm-8 col-md-8 col-xs-12">
+            <ol class="breadcrumb">
+                <li><a href="{{ route('home') }}">{{ __('lab_instruments.dashboard') }}</a></li>
+                <li><a href="lab_instruments">{{ __('lab_instruments.lab_instruments') }}</a></li>
+                <li class="active">{{ __('lab_instruments.create') }}</li>
+            </ol>
+        </div>
+    </div>
+
+    <div class="white-box">
+        {{ Form::open(['route' => 'lab_instruments.store', 'data-toggle' => 'validator']) }}
+
+        <div class="row">
+            <div class="col-md-6">
+                <div class="form-group">
+                    {{ Form::label('name',__('lab_instruments.lab_instrument_name')) }}
+                    {{ Form::text('name','',['class' => 'form-control compulsory', 'required']) }}
+                </div>
+            </div>
+        </div>
+
+        {{ Form::button(__('lab_instruments.submit'),['type'=>'submit','class'=>'btn btn-success waves-effect waves-light m-r-10 submit-btn']) }}
+        {{ Form::button(__('lab_instruments.cancel'),['type'=>'reset','class'=>'btn btn-default waves-effect waves-light']) }}
+        {{ Form::close() }}
+    </div>
+@endsection
+
+@push('scripts')
+    <script src="{{ asset('elite/js/validator.js') }}"></script>
+@endpush