From a9807b99e215e75bb74aaea44c11e9d19d9aae51 Mon Sep 17 00:00:00 2001
From: Ludovic CANDELLIER <ludo@huma.net>
Date: Mon, 11 May 2020 23:52:36 +0200
Subject: [PATCH] Fix sorting

---
 app/DataTables/Botanic/VarietiesDataTable.php |  2 +-
 .../Botanic/Admin/VarietyController.php       |  2 +
 .../Botanic/Admin/Families/form.blade.php     | 40 +++++++++++++------
 resources/views/components/save.blade.php     |  4 +-
 4 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/app/DataTables/Botanic/VarietiesDataTable.php b/app/DataTables/Botanic/VarietiesDataTable.php
index 9406693f..501a377e 100644
--- a/app/DataTables/Botanic/VarietiesDataTable.php
+++ b/app/DataTables/Botanic/VarietiesDataTable.php
@@ -12,7 +12,7 @@ class VarietiesDataTable extends DataTable
 
 	public function query(Variety $model)
 	{
-		$model = $model::with('specie');
+		$model = $model::with('specie')->select(['botanic_varieties.*']);
 		return self::buildQuery($model);
 	}
 
diff --git a/app/Http/Controllers/Botanic/Admin/VarietyController.php b/app/Http/Controllers/Botanic/Admin/VarietyController.php
index 56a1f39c..4b1f5dd7 100644
--- a/app/Http/Controllers/Botanic/Admin/VarietyController.php
+++ b/app/Http/Controllers/Botanic/Admin/VarietyController.php
@@ -9,6 +9,8 @@ use App\Repositories\Botanic\Varieties;
 use App\Repositories\Botanic\Species;
 use App\DataTables\Botanic\VarietiesDataTable;
 
+use App\Models\Shop\Variety;
+
 class VarietyController extends Controller
 {
     public function index(VarietiesDataTable $dataTable)
diff --git a/resources/views/Botanic/Admin/Families/form.blade.php b/resources/views/Botanic/Admin/Families/form.blade.php
index d3c61436..6710434e 100644
--- a/resources/views/Botanic/Admin/Families/form.blade.php
+++ b/resources/views/Botanic/Admin/Families/form.blade.php
@@ -1,21 +1,37 @@
+@include('boilerplate::load.tinymce')
+
 <div class="row">
 	<div class="col-md-8">
-		{{ Form::label('name', 'Nom') }}
-		@include('components.input', ['name' => 'name', 'value' => (isset($family['name'])) ? $family['name'] : null, 'required' => true])
-
-		{{ Form::label('alias', 'Alias') }}
-		@include('components.input', ['name' => 'alias', 'value' => (isset($family['alias'])) ? $family['alias'] : null, 'required' => true])
+		<div class="row">
+			<div class="col-6">
+				{{ Form::label('name', 'Nom') }}
+				@include('components.input', ['name' => 'name', 'value' => (isset($family['name'])) ? $family['name'] : null, 'required' => true])
+			</div>
+			<div class="col-6">
+				{{ Form::label('alias', 'Alias') }}
+				@include('components.input', ['name' => 'alias', 'value' => (isset($family['alias'])) ? $family['alias'] : null, 'required' => true])
+			</div>
+		</div>
 
 		{{ Form::label('latin', 'Nom latin') }}
 		@include('components.input', ['name' => 'latin', 'value' => (isset($family['latin'])) ? $family['latin'] : null, 'required' => true])		
 
+		<div class="row">
+			<div class="col-12">
+				{{ Form::label('description', 'Description') }}
+				@include('components.textarea', ['name' => 'description', 'value' => isset($family['description']) ? $family['description'] : null, 'class' => 'editor', 'required' => true])
+			</div>
+		</div>
+
 	</div>
 </div>
 
-<div class="row">
-	<div class="col-md-8">
-		<div class="float-right mt-3">
-			@include('components.button-save')
-		</div>
-	</div>
-</div>
+@include('components.save')
+
+@push('js')
+<script>
+    $(function() {
+        $('.editor').tinymce({});
+    });
+</script>
+@endpush
\ No newline at end of file
diff --git a/resources/views/components/save.blade.php b/resources/views/components/save.blade.php
index bd1d638d..25a496b3 100644
--- a/resources/views/components/save.blade.php
+++ b/resources/views/components/save.blade.php
@@ -1,6 +1,6 @@
-<div class="row pb-5">
+<div class="row pt-3 pb-5">
 	<div class="col-12">
-		<div class="text-center mt-3">
+		<div class="text-right mt-3">
 			@include('components.button-save')
 		</div>
 	</div>