From 75c5bd477074b5b53597313f9ab6e5fd558a809f Mon Sep 17 00:00:00 2001
From: Barbarroux Pierrick <barbarroux.pierrick@outlook.fr>
Date: Thu, 22 Nov 2018 02:11:31 +0100
Subject: [PATCH] Ajout de la categorie autre et des modifs qui vont avec
Please enter the commit message for your changes. Lines starting
---
.../Controllers/Formulaire2Controller.php | 6 +-
pima/app/Test.php | 10 ++
pima/app/Tool.php | 19 +++
.../2018_11_15_102916_create_test_table.php | 31 +++++
pima/database/seeds/DatabaseSeeder.php | 125 ++++++++++++++++++
pima/resources/views/formulaire2.blade.php | 14 ++
6 files changed, 204 insertions(+), 1 deletion(-)
create mode 100644 pima/app/Test.php
create mode 100644 pima/database/migrations/2018_11_15_102916_create_test_table.php
diff --git a/pima/app/Http/Controllers/Formulaire2Controller.php b/pima/app/Http/Controllers/Formulaire2Controller.php
index 79ca420..7af296e 100644
--- a/pima/app/Http/Controllers/Formulaire2Controller.php
+++ b/pima/app/Http/Controllers/Formulaire2Controller.php
@@ -15,7 +15,7 @@ class Formulaire2Controller extends Controller
}
public function store(FormulaireRequest $request){
-
+
if (!isset($request->message)) {
$message = null;
}
@@ -23,6 +23,10 @@ class Formulaire2Controller extends Controller
$message = $request->message;
}
+ if ($request->categorie == 4){
+ $request->objet = $request->objet_autre;
+ }
+
Message::create([
'auteur' => $request->nom,
'type' => $request->off_dem,
diff --git a/pima/app/Test.php b/pima/app/Test.php
new file mode 100644
index 0000000..58f7e87
--- /dev/null
+++ b/pima/app/Test.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Test extends Model
+{
+ //
+}
diff --git a/pima/app/Tool.php b/pima/app/Tool.php
index 116b6aa..6678dde 100644
--- a/pima/app/Tool.php
+++ b/pima/app/Tool.php
@@ -3,10 +3,29 @@
namespace App;
use Illuminate\Database\Eloquent\Model;
+use App\Categorie;
class Tool extends Model
{
protected $fillable =[
'objet', 'categorie',
];
+
+ public static function tool_list(){
+ $categories = Categorie::categories_names();
+ //dd($categories);
+ $array_cat = array();
+ foreach ($categories as $categorie){
+ $array_cat = array_add($array_cat, $categorie, array());
+ //dd($array_cat);
+ $tools = Tool::where('categorie', Categorie::where('nom', $categorie)->first()->id)->get();
+ //dd($tools);
+ foreach($tools as $tool){
+ //dd($tool);
+ $array_cat[$categorie] = array_add($array_cat[$categorie], $tool->objet, $tool->objet);
+ }
+ }
+ //dd($array_cat);
+ return $array_cat;
+ }
}
diff --git a/pima/database/migrations/2018_11_15_102916_create_test_table.php b/pima/database/migrations/2018_11_15_102916_create_test_table.php
new file mode 100644
index 0000000..b44886c
--- /dev/null
+++ b/pima/database/migrations/2018_11_15_102916_create_test_table.php
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateTestTable extends Migration
+{
+ /**
+ * Run the migrations.
+ *
+ * @return void
+ */
+ public function up()
+ {
+ Schema::create('test', function (Blueprint $table) {
+ $table->increments('id');
+ $table->timestamps();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::dropIfExists('test');
+ }
+}
diff --git a/pima/database/seeds/DatabaseSeeder.php b/pima/database/seeds/DatabaseSeeder.php
index d6c2606..31812fb 100644
--- a/pima/database/seeds/DatabaseSeeder.php
+++ b/pima/database/seeds/DatabaseSeeder.php
@@ -4,6 +4,7 @@ use Illuminate\Database\Seeder;
use App\Message;
use App\User;
use App\Categorie;
+use App\Tool;
class DatabaseSeeder extends Seeder
{
@@ -27,6 +28,10 @@ class DatabaseSeeder extends Seeder
'nom' => 'Jardinage',
]);
+ Categorie::create([
+ 'nom' => 'Autre',
+ ]);
+
Message::create([
'auteur' => 'Michel',
'type' => true,
@@ -83,6 +88,126 @@ class DatabaseSeeder extends Seeder
'telephone' => '06 69 00 00 00',
]);
+ Tool::create([
+ 'objet'=> "Tournevis",
+ 'categorie' => 1,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Marteau",
+ 'categorie' => 1,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Scie sauteuse",
+ 'categorie' => 1,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Perceuse",
+ 'categorie' => 1,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Niveau a bulle",
+ 'categorie' => 1,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Grattoir" ,
+ 'categorie' => 1,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Spatule" ,
+ 'categorie' => 1,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Ruban adhésif" ,
+ 'categorie' => 1,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Ponceuse" ,
+ 'categorie' => 1,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Papier de verre" ,
+ 'categorie' => 1,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Rouleau a patisserie" ,
+ 'categorie' => 2,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Plat a tarte" ,
+ 'categorie' => 2,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Moule" ,
+ 'categorie' => 2,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Poche a douille" ,
+ 'categorie' => 2,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Fouet" ,
+ 'categorie' => 2,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Thermometre" ,
+ 'categorie' => 2,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Presse citron" ,
+ 'categorie' => 2,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Pelle" ,
+ 'categorie' => 3,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Pioche" ,
+ 'categorie' => 3,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Beche" ,
+ 'categorie' => 3,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Secateur" ,
+ 'categorie' => 3,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Brouette" ,
+ 'categorie' => 3,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Bache" ,
+ 'categorie' => 3,
+ ]);
+
+ Tool::create([
+ 'objet'=> "Binette" ,
+ 'categorie' => 3,
+ ]);
+
}
}
diff --git a/pima/resources/views/formulaire2.blade.php b/pima/resources/views/formulaire2.blade.php
index b9d978f..e77a1dc 100644
--- a/pima/resources/views/formulaire2.blade.php
+++ b/pima/resources/views/formulaire2.blade.php
@@ -3,6 +3,7 @@
<?php
use App\Message;
use App\Categorie;
+use App\Tool;
?>
@section('titre')
@@ -58,13 +59,26 @@ Accueil
{{ Form::radio('off_dem', false) }} <B>Demande</B> <br>
-->
+
+<!--
<B>Objet</B> {{ Form::text('objet')}} <br>
{{ $errors->first('objet', ':message') }}
<br>
+
+ -->
+
+
+
<B>Catégorie</B> {{ Form::select('categorie', Categorie::categories_names()) }}
{{ $errors->first('categorie', ':message') }}
+ <br>
+ <B>Objet</B> {{Form::select('objet', Tool::tool_list())}}
+ {{ $errors->first('objet', ':message') }}
+
+<br>
+<B>Objet si categorie Autre<B> {{ Form::text('objet_autre')}}
<br><br>
<B>Message</B> {{ Form::text('message')}}
<br><br>
--
GitLab