resolved conflicts

docker/statistics/Modules/ClinicalData/Resources/views/clinics/edit.blade.php

@@ -0,0 +1,74 @@
+@extends('layouts.main')
+
+@push('styles')
+    <link href="{{ asset('elite/bower_components/select2/select2.min.css') }}" rel="stylesheet" />
+    <link href="{{ asset('elite/bower_components/icheck/skins/all.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">{{ __('clinics.edit_clinic') }}</h4>
+    </div>
+    <div class="col-lg-9 col-sm-8 col-md-8 col-xs-12">
+        <ol class="breadcrumb">
+            <li><a href="{{ route('home') }}">{{ __('clinics.dashboard') }}</a></li>
+            <li><a href="/clinics/index">{{ __('clinics.clinics') }}</a></li>
+            <li class="active">{{ __('clinics.edit') }}</li>
+        </ol>
+    </div>
+</div>
+
+<div class="row">
+    <div class="col-sm-12">
+        @include('clinical_data::clinics.menu')
+    </div>
+</div>
+
+<div class="white-box">
+    @include('flash::message')
+
+    {{ Form::model($clinic, ['method' => 'PUT', 'route' => ['clinics.update',$clinic], 'data-toggle' => 'validator']) }}
+
+    <div class="row">
+        <div class="col-md-4">
+            <div class="form-group">
+                {{ Form::label('name', __('clinics.clinic_name')) }}
+                {{ Form::text('name', $clinic->name, ['class' => 'form-control compulsory', 'required']) }}
+                <div class="help-block with-errors"></div>
+            </div>
+        </div>
+        <div class="col-md-4">
+            <div class="form-group">
+                {{ Form::label('clinic_type', __('clinics.clinic_type')) }}
+                {{ Form::select('clinic_type', $clinic_types, $clinic->clinic_type, ['class' => 'form-control compulsory', 'required', 'id' => 'clinic_type']) }}
+            </div>
+        </div>
+        <div class="col-md-4">
+            <div class="form-group">
+                {{ Form::label('', __('clinics.is_clinic_available'), ["class"=>'col-md-12']) }}
+                &nbsp;&nbsp;{{ __('clinics.yes') }} {{ Form::radio('available', 1, $clinic->available == 1, ["required", 'class' => 'check form-control', 'data-radio'=>'iradio_flat-green']) }}
+                &nbsp;&nbsp;{{ __('clinics.no') }} {{ Form::radio('available', 0, $clinic->available == 0, ["required", 'class' => 'check form-control', 'data-radio'=>'iradio_flat-green']) }}
+                <div class="help-block with-errors"></div>
+            </div>
+        </div>
+    </div>
+
+    {{ Form::button(__('clinics.submit'),['type'=>'submit','class'=>'btn btn-success waves-effect waves-light m-r-10']) }}
+    {{ Form::button(__('clinics.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>
+    <script src="{{ asset('elite/bower_components/select2/select2.min.js') }}"></script>
+    <!-- icheck -->
+    <script src="{{ asset('elite/bower_components/icheck/icheck.min.js') }}"></script>
+    <script src="{{ asset('elite/bower_components/icheck/icheck.init.js') }}"></script>
+
+    <script>
+        $('#clinic_type').select2();
+    </script>
+@endpush