diff --git a/pima/app/Http/Controllers/AjoutObjetController.php b/pima/app/Http/Controllers/AjoutObjetController.php
index bef6540a610e6912e1a86f01d36aae5f44f194b9..f42bd58dab2d86c0209044280550d35e3b136afe 100644
--- a/pima/app/Http/Controllers/AjoutObjetController.php
+++ b/pima/app/Http/Controllers/AjoutObjetController.php
@@ -29,6 +29,6 @@ class AjoutObjetController extends Controller
'caracteristiques' => $request->cara,
]);
- //return redirect()->route('');
+ return redirect()->route('profil',["userid"=>$user->id, "done" =>'done']);
}
}
diff --git a/pima/app/Http/Controllers/ModifierObjetController.php b/pima/app/Http/Controllers/ModifierObjetController.php
new file mode 100644
index 0000000000000000000000000000000000000000..2acd38134241ed0941bbb6e15ff93b5e95d61948
--- /dev/null
+++ b/pima/app/Http/Controllers/ModifierObjetController.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use App\Http\Requests\ModifierObjetRequest;
+use App\Message;
+use App\Tool;
+use App\Dispo;
+use Auth;
+
+class ModifierObjetController extends Controller
+{
+
+ public function create($userid){
+ return view('ajout_objet', ["userid"=>$userid]);
+ }
+
+ public function store(AjoutObjetRequest $request){
+
+ //dd($request);
+ $user = Auth::user();
+
+ Dispo::create([
+ 'id_objet' => Tool::where('objet', $request->nom)->first()->id,
+ 'id_proprio' => $user->id,
+ 'id_emprunteur' => -1,
+ 'description' => $request->description,
+ 'caracteristiques' => $request->cara,
+ ]);
+
+ return redirect()->route('profil',["userid"=>$user->id, "done" =>'done']);
+ }
+}
diff --git a/pima/app/Http/Controllers/ProfilController.php b/pima/app/Http/Controllers/ProfilController.php
index 705d93f1f7045034d18e719cdfff94f01ddcc36e..b6565859cb9c3cb27a4ea182dcf82359b6654ea5 100644
--- a/pima/app/Http/Controllers/ProfilController.php
+++ b/pima/app/Http/Controllers/ProfilController.php
@@ -18,9 +18,9 @@ class ProfilController extends Controller
- public function create($user){
+ public function create($user, $done){
if (Auth::check()){
- return view('profil',["userid"=>$user]);
+ return view('profil',["userid"=>$user, "done" => $done]);
}
}
}
diff --git a/pima/app/Http/Requests/AjoutObjetRequest.php b/pima/app/Http/Requests/AjoutObjetRequest.php
index 510b39792660585ce701d18f4207623e4f0c3efc..5c43100f9a768bb77ab147a4c1efde0a35a16dc4 100644
--- a/pima/app/Http/Requests/AjoutObjetRequest.php
+++ b/pima/app/Http/Requests/AjoutObjetRequest.php
@@ -24,6 +24,7 @@ class AjoutObjetRequest extends FormRequest
public function rules()
{
return [
+ 'nom' => 'required',
];
}
}
diff --git a/pima/resources/views/ajout_objet.blade.php b/pima/resources/views/ajout_objet.blade.php
index 8079f27c45472ad8c9dc8214422169c9da734234..e4042e7015686974697816a90a744f6d443452e1 100644
--- a/pima/resources/views/ajout_objet.blade.php
+++ b/pima/resources/views/ajout_objet.blade.php
@@ -59,11 +59,12 @@ page : nom de l'outil, catégorie, description, caractéristiques
{{ $errors->first('nom', ':message') }}
<br><br>
-
+<!--
<B>Catégorie</B> {{ Form::select('categorie', Categorie::categories_names()) }}
{{ $errors->first('categorie', ':message') }}
<br><br>
+-->
<B>Description</B> <br>{{ Form::textarea('description')}}
<br><br>
diff --git a/pima/resources/views/formulaire2.blade.php b/pima/resources/views/formulaire2.blade.php
index e1230b89dd59d391f0c8c91f0fde7d761e1c1ceb..15c0f8c34fa045bfe32d1af370ffc6acefe03558 100644
--- a/pima/resources/views/formulaire2.blade.php
+++ b/pima/resources/views/formulaire2.blade.php
@@ -17,7 +17,7 @@ Accueil
@auth
<?php
$user = Auth::user();
- $linkprofil = 'http://localhost:8000/profil/' . $user->id;
+ $linkprofil = 'http://localhost:8000/profil/' . $user->id . '/' . '0';
?>
<a href="{{ route('logout') }}"
onclick="event.preventDefault();
diff --git a/pima/resources/views/modifier_objet.blade.php b/pima/resources/views/modifier_objet.blade.php
new file mode 100644
index 0000000000000000000000000000000000000000..e4042e7015686974697816a90a744f6d443452e1
--- /dev/null
+++ b/pima/resources/views/modifier_objet.blade.php
@@ -0,0 +1,115 @@
+@extends('template')
+
+@section('titre')
+Ajout_Objet
+@endsection
+
+<?php
+use App\Message;
+use App\Categorie;
+use App\Tool;
+?>
+
+
+@section('contenu')
+<div class="flex-center position-ref full-height">
+ @if (Route::has('login'))
+ <div class="top-right links">
+ @auth
+ <a href="{{ route('logout') }}"
+ onclick="event.preventDefault();
+ document.getElementById('logout-form').submit();">
+ {{ __('Logout') }}
+ </a>
+ <br>
+ <a href="{{ route('home') }}">Home</a>
+
+ <form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
+ @csrf
+ </form>
+ @else
+ <a href="{{ route('login') }}">Login</a> <br>
+ <a href="{{ route('register') }}">Register</a>
+ @endauth
+ </div>
+ @endif
+</div>
+
+
+<div class="top">
+ <ul>
+ <li><a href="{{ route('welcome') }}">Home</a></li>
+ <li><a href="{{ url('formulaire2') }}">Main</a></li>
+
+ </ul>
+</div>
+
+<h1>Ajouter un objet</h1>
+
+<center>
+ {{ Form::open(['url' => 'ajout_objet/'.$userid])}}
+ {{ Form::token() }}
+
+<!-- Créer les champs du formulaire sur la
+page : nom de l'outil, catégorie, description, caractéristiques
+(sous forme d'array dans la base de données ("key"=>"value")
+-->
+
+ <B>Nom de l'outil</B> {{Form::select('nom', Tool::tool_list())}} <br>
+ {{ $errors->first('nom', ':message') }}
+
+ <br><br>
+<!--
+ <B>Catégorie</B> {{ Form::select('categorie', Categorie::categories_names()) }}
+ {{ $errors->first('categorie', ':message') }}
+
+ <br><br>
+-->
+ <B>Description</B> <br>{{ Form::textarea('description')}}
+ <br><br>
+
+ <B>Caractéristiques<B> <br> {{ Form::text('cara[]')}} <br> <br>
+ <p id="pluscara" onclick="addformcara(this)"> + </p>
+ <p id="moinscara" onclick="remformcara()"> - </p>
+
+ {{ Form::submit('Envoyer', ['class' => 'btn btn-info pull-right']) }}
+ {{ Form::close() }}
+</center>
+
+
+<link type="text/css" href={{asset("css/jquery-ui.min.css")}} rel="stylesheet" />
+<script type="text/javascript" src={{asset("js/jquery-3.3.1.js")}}></script>
+<script type="text/javascript" src={{asset("js/jquery-ui.min.js")}}></script>
+
+<script type="text/javascript">
+
+var k=0;
+function addformcara(t){
+ console.log("hhfiezhuf");
+ if (k<10) {
+ k++;
+ var actualajout = 'cara[]' ;
+ var id = actualajout + k;
+ var inputcara = "<p id="+id+"><input name="+ actualajout +" class='cara' id="+ id +" type='text'> <br> <br> </p>";
+ $(t).before(inputcara);
+ return k;
+ }
+};
+
+function remformcara(){
+ if (k>0) {
+ var actualajout = 'cara[]';
+ console.log(actualajout);
+ $("[id ='"+ actualajout + k +"']").remove();
+ k--;
+ console.log(k);
+ return k;
+ }
+}
+
+$("[id$='pluscara']").css('cursor', 'pointer');
+$("[id$='moinscara']").css('cursor', 'pointer');
+
+</script>
+
+@endsection
diff --git a/pima/resources/views/profil.blade.php b/pima/resources/views/profil.blade.php
index 87da17260fefc39a6af0d7777fff03dff8e3fced..2c9326f0c9a6d71735af988149abbffd761b74e7 100644
--- a/pima/resources/views/profil.blade.php
+++ b/pima/resources/views/profil.blade.php
@@ -5,6 +5,12 @@ Profil
@endsection
@section('contenu')
+<?php
+use App\Dispo;
+use App\Tool;
+use App\Categorie;
+ ?>
+
<div class="flex-center position-ref full-height">
@if (Route::has('login'))
<div class="top-right links">
@@ -68,58 +74,70 @@ Profil
}
?>
<h1 id="liste_outils">Vos outils</h1>
- <div class="row">
- <div class="column">
- <h1> Nom de l'outil </h1>
- <div class="category">
- Catégorie
- </div>
- <div class="description">
- Description de l'objet, modèle, format...
- </div>
- </div>
-
- <div class="column2">
- <h1> Nom de l'outil </h1>
- <div class="category">
- Catégorie
- </div>
- <div class="description">
- Description de l'objet, modèle, format...
- </div>
- </div>
-
- <div class="column">
- <h1> Nom de l'outil </h1>
- <div class="category">
- Catégorie
- </div>
- <div class="description">
- Description de l'objet, modèle, format...
- </div>
- </div>
- </div>
- </br>
- <div class="row">
- <div class="column">
- <h1> Nom de l'outil </h1>
- <div class="category">
- Catégorie
- </div>
- <div class="description">
- Description de l'objet, modèle, format...
- </div>
- </div>
-
- <div class="column2">
- <h1> Nom de l'outil </h1>
- <div class="category">
- Catégorie
- </div>
- <div class="description">
- Description de l'objet, modèle, format...
- </div>
- </div>
+
+ <?php
+ if ($done == 'done'){
+ echo "Votre ajout a bien été pris en compte.";
+ ?> <br> <br> <?php
+
+ }
+
+ ?>
+
+ <?php
+ $objet_list = Dispo::where("id_proprio", Auth::user()->id)->get();
+ $i=0;
+ foreach ($objet_list as $line){
+ $objet = Tool::where("id", $line->id_objet)->first();
+ $nom = $objet->objet;
+ $categorie = Categorie::where("id", $objet->categorie)->first()->nom;
+ $cara = $line->caracteristiques;
+ if ($line->id_emprunteur!=-1){
+ $emprunt = User::where("id", $line->id_emprunteur)->first()->name;
+ }
+ else{
+ $emprunt = "Pas d'emprunteur";
+ }
+
+ if ($i % 3 == 0){
+ ?>
+ <div class="row">
+ <?php
+ }
+ ?>
+ <div class="column">
+ <h1> {{ $nom }}</h1>
+ <div class="category">
+ Catégorie : {{$categorie}}
+ </div>
+ <div class="description">
+ Description : {{$line->description}}
+ <br>
+ Caractéristiques :
+ <ul>
+ <?php foreach ($cara as $c) {
+ ?>
+ <li>{{$c}}</li>
+ <?php
+ }
+ ?>
+ </ul>
+ <div class="emprunteur">
+ Emprunteur : {{$emprunt}}
+ </div>
+ </div>
+ </div>
+
+ <?php
+ if ($i % 3 == 2){
+ ?>
+ </div>
+ <br> <br>
+ <?php
+ }
+ $i++;
+ }
+ ?>
</article>
@endsection
diff --git a/pima/resources/views/welcome.blade.php b/pima/resources/views/welcome.blade.php
index 5ee134d9a68b4b3c48d037e1f3595152cdf470d4..3140d9b1aa3668f4be1620ec60e7f7cff15d713f 100644
--- a/pima/resources/views/welcome.blade.php
+++ b/pima/resources/views/welcome.blade.php
@@ -71,7 +71,7 @@
@auth
<?php
$user = Auth::user();
- $linkprofil = 'http://localhost:8000/profil/' . $user->id;
+ $linkprofil = 'http://localhost:8000/profil/' . $user->id . '/' . '0';
?>
<a href="{{ url('/home') }}">Home</a>
<a href="<?php echo $linkprofil; ?>">Profil</a>
diff --git a/pima/routes/web.php b/pima/routes/web.php
index f79c01609ab7ce5263a39d7ce91066525ce7723e..dd4ae5e5bfc83775431edac4f5841af859da114d 100644
--- a/pima/routes/web.php
+++ b/pima/routes/web.php
@@ -26,8 +26,8 @@ Route::post('formulaire', ['as' => 'formulaire', 'uses' => 'FormulaireController
Route::get('formulaire2', [ 'as' => 'formulaire2', 'uses' => 'Formulaire2Controller@create']);
Route::post('formulaire2', ['as' => 'formulaire2', 'uses' => 'Formulaire2Controller@store']);
-Route::get('profil/{user}', [ 'as' => 'profil', 'uses' => 'ProfilController@create']);
-Route::post('profil/{user}', ['as' => 'profil', 'uses' => 'ProfilController@store']);
+Route::get('profil/{user}/{done}', [ 'as' => 'profil', 'uses' => 'ProfilController@create']);
+Route::post('profil/{user}/{done}', ['as' => 'profil', 'uses' => 'ProfilController@store']);
Route::get('ajout_objet/{userid}', [ 'as' => 'ajout_objet', 'uses' => 'AjoutObjetController@create']);
Route::post('ajout_objet/{userid}', ['as' => 'ajout_objet', 'uses' => 'AjoutObjetController@store']);