resolved conflicts

docker/statistics/Modules/ClinicalData/Resources/views/drug_units/create.blade.php

@@ -0,0 +1,53 @@
+@extends('layouts.main')
+
+@section('title', '| Add Drug Unit')
+
+@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">{{ __('drug_units.add_new_drug_unit') }}</h4>
+    </div>
+    <div class="col-lg-9 col-sm-8 col-md-8 col-xs-12">
+        <ol class="breadcrumb">
+            <li><a href="{{ route('home') }}">{{ __('drug_units.dashboard') }}</a></li>
+            <li><a href="{{ route('clinical_data.index') }}">{{ __('drug_units.clinical_data') }}</a></li>
+            <li><a href="/drug_units/">{{ __('drug_units.drug_units') }}</a></li>
+            <li class="active">{{ __('drug_units.add_new_drug_unit') }}</li>
+        </ol>
+    </div>
+    <!-- /.col-lg-12 -->
+</div>
+
+<div class="row">
+    <div class="col-sm-12">
+        @include('clinical_data::drug_units.menu')
+    </div>
+</div>
+
+
+@include('flash::message')
+
+<div class="panel panel-default" style="border-radius: 5px;">
+
+    <div class="panel-body">
+        {{ Form::open(['route' => 'drug_units.store','data-toggle'=>'validator']) }}
+
+        <div class="form-group">
+            {{ Form::label('name', __('drug_units.drug_unit_name')) }}
+            {{ Form::text('name', '', ['class' => 'form-control compulsory', 'required']) }}
+            <div class="help-block with-errors"></div>
+        </div>
+
+        {{ Form::button(__('drug_units.save'),['type'=>'submit','class'=>'btn btn-success btn-rounded waves-effect waves-light m-r-10']) }}
+        {{ Form::button(__('drug_units.cancel'),['type'=>'reset','class'=>'btn btn-default btn-rounded waves-effect waves-light']) }}
+
+        {{ Form::close() }}
+    </div>
+</div>
+@endsection
+
+
+@push('scripts')
+<script src="{{ asset('elite/js/validator.js') }}"></script>
+@endpush

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

@@ -0,0 +1,47 @@
+@extends('layouts.main')
+
+@section('title', '| Edit Drug Unit')
+
+@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">{{ __('drug_units.edit_drug_unit') }}</h4>
+    </div>
+    <div class="col-lg-9 col-sm-8 col-md-8 col-xs-12">
+        <ol class="breadcrumb">
+            <li><a href="{{ route('home') }}">{{ __('drug_units.dashboard') }}</a></li>
+            <li><a href="{{ route('clinical_data.index') }}">{{ __('drug_units.clinical_data') }}</a></li>
+            <li><a href="/drug_units/">{{ __('drug_units.drug_units') }}</a></li>
+            <li class="active">{{ __('drug_units.edit_drug_unit') }}</li>
+        </ol>
+    </div>
+    <!-- /.col-lg-12 -->
+</div>
+
+<div class="row">
+    <div class="col-sm-12">
+        @include('clinical_data::drug_units.menu')
+    </div>
+</div>
+
+
+@include('flash::message')
+
+<div class="panel panel-default" style="border-radius: 5px;">
+
+    <div class="panel-body">
+        {{ Form::model($drug_unit, ['method' => 'PUT', 'route' => ['drug_units.update',$drug_unit]]) }}
+
+        <div class="form-group">
+            {{ Form::label('name', __('drug_units.drug_unit_name')) }}
+            {{ Form::text('name', $drug_unit->name, ['class' => 'form-control compulsory']) }}
+        </div>
+
+        {{ Form::button( __('drug_units.save'),['type'=>'submit','class'=>'btn btn-success btn-rounded waves-effect waves-light m-r-10']) }}
+        {{ Form::button( __('drug_units.cancel'),['type'=>'reset','class'=>'btn btn-default btn-rounded waves-effect waves-light']) }}
+
+        {{ Form::close() }}
+    </div>
+</div>
+@endsection

docker/statistics/Modules/ClinicalData/Resources/views/drug_units/inactive.blade.php

@@ -0,0 +1,71 @@
+@extends('layouts.main')
+
+@push('styles')
+<link href="{{ asset('/elite/bower_components/datatables/jquery.dataTables.min.css') }}" rel="stylesheet" type="text/css" />
+<link href="{{ asset('elite/tables/css/buttons.dataTables.min.css') }}" rel="stylesheet" type="text/css" />
+@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">{{ __('drug_units.activate_drug_unit') }}</h4>
+    </div>
+    <div class="col-lg-9 col-sm-8 col-md-8 col-xs-12">
+        <ol class="breadcrumb">
+            <li><a href="{{ route('home') }}">{{ __('drug_units.dashboard') }}</a></li>
+            <li><a href="{{ route('clinical_data.index') }}">{{ __('drug_units.clinical_data') }}</a></li>
+            <li><a href="/drug_units/">{{ __('drug_units.drug_units') }}</a></li>
+            <li class="active">{{ __('drug_units.activate_drug_unit') }}</li>
+        </ol>
+    </div>
+    <!-- /.col-lg-12 -->
+</div>
+
+<div class="row">
+    <div class="col-sm-12">
+        @include('clinical_data::drug_units.menu')
+    </div>
+</div>
+
+
+@include('flash::message')
+
+<div class="panel panel-default" style="border-radius: 5px;">
+    <div class="panel-body">
+        <div class="table-responsive">
+        <table class="table color-bordered-table success-bordered-table table-striped">
+            <thead>
+                <tr>
+                    <th>{{ __('drug_units.drug_unit_name') }}</th>
+                    <th class="text-center">Action</th>
+                </tr>
+            </thead>
+            <tbody>
+                @foreach($drug_units as $drug_unit)
+                <tr>
+                    <td>{{ $drug_unit->name }}</td>
+                    <td>
+                        {{ Form::model($drug_unit->id ,['method' => 'POST', 'route' => ['drug_units.activate', $drug_unit->id]]) }}
+                        <button type="submit" class="btn btn-rounded btn-warning" onclick="return confirm('Are you sure?')"><i class="fa fa-check"></i> {{ __('drug_units.activate') }}</button>
+                        {{ Form::close() }}
+                    </td>
+
+                </tr>
+                @endforeach
+            </tbody>
+
+        </table>
+        </div>
+    </div>
+</div>
+@endsection
+
+@push('scripts')
+
+<script src="{{ asset('elite/bower_components/datatables/jquery.dataTables.min.js') }}"></script>
+
+<script>
+    $('.table').DataTable();
+</script>
+@endpush

docker/statistics/Modules/ClinicalData/Resources/views/drug_units/index.blade.php

@@ -0,0 +1,73 @@
+@extends('layouts.main')
+
+@push('styles')
+<link href="{{ asset('/elite/bower_components/datatables/jquery.dataTables.min.css') }}" rel="stylesheet" type="text/css" />
+<link href="{{ asset('elite/tables/css/buttons.dataTables.min.css') }}" rel="stylesheet" type="text/css" />
+@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">{{ __('drug_units.drug_units') }}</h4>
+    </div>
+    <div class="col-lg-9 col-sm-8 col-md-8 col-xs-12">
+        <ol class="breadcrumb">
+            <li><a href="{{ route('home') }}">{{ __('drug_units.dashboard') }}</a></li>
+            <li><a href="{{ route('clinical_data.index') }}">{{ __('drug_units.clinical_data') }}</a></li>
+            <li class="active">{{ __('drug_units.drug_units') }}</li>
+        </ol>
+    </div>
+    <!-- /.col-lg-12 -->
+</div>
+
+<div class="row">
+    <div class="col-sm-12">
+        @include('clinical_data::drug_units.menu')
+    </div>
+</div>
+
+@include('flash::message')
+
+<div class="panel panel-default" style="border-radius: 5px;">
+    <div class="panel-body">
+        <div class="table-responsive">
+        <table class="table color-bordered-table success-bordered-table table-striped">
+            <thead>
+                <tr>
+                    <th>{{ __('drug_units.drug_unit') }}</th>
+                    <th></th>
+                    <th></th>
+                </tr>
+            </thead>
+            <tbody>
+                @foreach($drug_units as $drug_unit)
+                <tr>
+                    <td>{{ $drug_unit->name }}</td>
+                    <td>
+                        <a href="/drug_units/{{ $drug_unit->id }}/edit/" class="btn btn-warning"><i class="fa fa-pencil"></i> {{ __('drug_units.edit') }}</a>
+                    </td>
+                    <td>
+                        {{ Form::model($drug_unit->id ,['method' => 'DELETE', 'route' => ['drug_units.destroy', $drug_unit->id]]) }}
+                        <button type="submit" class="btn btn-danger" onclick="return confirm('Are you sure?')"><i class="fa fa-trash"></i> {{ __('drug_units.delete') }}</button>
+                        {{ Form::close() }}
+                    </td>
+
+                </tr>
+                @endforeach
+            </tbody>
+
+        </table>
+        </div>
+    </div>
+</div>
+@endsection
+
+@push('scripts')
+
+<script src="{{ asset('elite/bower_components/datatables/jquery.dataTables.min.js') }}"></script>
+
+<script>
+    $('.table').DataTable();
+</script>
+@endpush

docker/statistics/Modules/ClinicalData/Resources/views/drug_units/menu.blade.php

@@ -0,0 +1,7 @@
+<div class="panel panel-default" style="border-radius: 10px;">
+    <div class="panel-body">
+        <a href="{{ route('drug_units.create') }}" class="nav-item btn btn-success"><i class="fa fa-plus"></i> <span style="margin-left: 10px;">{{ __('drug_units.add_new_drug_unit') }}</span></a>
+        <a href="{{ route('drug_units.index') }}" class="nav-item btn btn-warning"><i class="fa fa-eye"></i> <span style="margin-left: 10px;">{{ __('drug_units.view_drug_units') }}</span></a>
+        <a href="{{ route('drug_units.inactive') }}" class="nav-item btn btn-danger"><i class="fa fa-trash"></i> <span style="margin-left: 10px;">{{ __('drug_units.activate_drug_units') }}</span></a>
+    </div>
+</div>