diff --git a/rapports_iterations/iteration_3.md b/rapports_iterations/iteration_3.md
new file mode 100644
index 0000000000000000000000000000000000000000..4a7a0c53de40cd9f06683851b7653e75b953299d
--- /dev/null
+++ b/rapports_iterations/iteration_3.md
@@ -0,0 +1,79 @@
+# Rapport d'itération
+
+## Composition de l'équipe
+
+
+| | Itération précédente |
+| ------------- |------------- |
+| **Product Owner** | *AICHHORN Guillaume* |
+| **Scrum Master** | *ALIMEHENNI Hugues* |
+| **Dev** | *KIM Hyoseok* |
+| **Dev** | *ALVES Alexandre* |
+| **Dev** | *SANN Sokchivin* |
+| **Dev** | *BENCHETRIT Milan* |
+| **Dev** | *MELCHIOR Louis* |
+
+## Bilan de l'itération précédente
+### Évènements
+*Quels sont les évènements qui ont marqué l'itération précédente? Répertoriez ici les évènements qui ont eu un impact sur ce qui était prévu à l'itération précédente.*
+> Guillaume n'était pas très disponible du fait de sa participation aux élections du BDE
+> L'équipe manquait d'organisation et a donc eu du mal à se mettre au travail (tâches définies mais mal réparties)
+
+### Taux de complétion de l'itération
+*Quel est le nombre d'éléments terminés par rapport au nombre total d'éléments prévu pour l'itération?*
+> 5 terminées / 5 prévues = 100%
+
+### Liste des User Stories terminées
+> Page d'accueil
+> Modification des annonces
+> Modification du profil
+> Ajout d'image (par défaut)
+> Champ de recherche
+
+## Rétrospective de l'itération précédente
+
+### Bilans des retours et des précédentes actions
+> Les USs n'avaient pas été étudiées assez finement (mauvais calcul du temps de travail)
+>
+
+### Actions prises pour la prochaine itération
+> Plus de réunion
+> US de plus petite taille.
+> Meilleur découpage des US.
+> Nouvel axe de travail
+
+### Axes d'améliorations
+> Tous : Plus de réunions
+ sprint en 2 parties: Dev puis Tests
+> Dev : Doivent être plus présents dans la réalisation du projet, n'hésitant pas à faire part de leurs problèmes
+
+## Prévisions de l'itération suivante
+### Évènements prévus
+> Campagne BDE
+> Conférences
+
+### Titre des User Stories reportées
+> Recherche avancée
+
+### Titre des nouvelles User Stories
+> Les US reportées
+> Réservations
+> Refonte affichage
+
+## Confiance
+### Taux de confiance de l'équipe dans l'itération
+*Remplir le tableau sachant que :D est une confiance totale dans le fait de livrer les éléments de l'itération. Mettre le nombre de votes dans chacune des cases. Expliquer en cas de besoin.*
+
+| | :( | :| | :) | :D |
+|:--------: |:----: |:----: |:----: |:----: |
+| Equipe 7 | *0* | *3* | *4* | *0* |
+
+### Taux de confiance de l'équipe pour la réalisation du projet
+*Remplir le tableau sachant que :D est une confiance totale dans le fait de réaliser le projet. Mettre le nombre de votes dans chacune des cases. Expliquer en cas de besoin.*
+
+| | :( | :| | :) | :D |
+|:--------: |:----: |:----: |:----: |:----: |
+| Equipe 7 | *0* | *1* | *4* | *1* |
+
+
+
diff --git a/rapports_iterations/iteration_4.md b/rapports_iterations/iteration_4.md
new file mode 100644
index 0000000000000000000000000000000000000000..87cef6ef2314d41cc761b6bf49f6238130ff53ad
--- /dev/null
+++ b/rapports_iterations/iteration_4.md
@@ -0,0 +1,75 @@
+# Rapport d'itération
+
+## Composition de l'équipe
+
+
+| | Itération précédente |
+| ------------- |------------- |
+| **Product Owner** | *AICHHORN Guillaume* |
+| **Scrum Master** | *ALVES Alexandre* |
+| **Dev** | *KIM Hyoseok* |
+| **Dev** | *ALIMEHNNI Hugues* |
+| **Dev** | *SANN Sokchivin* |
+| **Dev** | *BENCHETRIT Milan* |
+| **Dev** | *MELCHIOR Louis* |
+
+## Bilan de l'itération précédente
+### Évènements
+*Quels sont les évènements qui ont marqué l'itération précédente? Répertoriez ici les évènements qui ont eu un impact sur ce qui était prévu à l'itération précédente.*
+> La campagne BDE à prit beaucoup de temps
+> Les autres projets on prit beaucoup de temps
+
+### Taux de complétion de l'itération
+*Quel est le nombre d'éléments terminés par rapport au nombre total d'éléments prévu pour l'itération?*
+> 8 / 9 = 88 %
+
+### Liste des User Stories terminées
+> Recherche avancé
+> Profil améliorer
+> Dépôt d'annonce
+> Rappel des annonces déposé
+> Organisation des produits par date d'expiration
+> Système de réservation/demande
+> Refonte de l'affichage (2 US)
+
+## Rétrospective de l'itération précédente
+
+### Bilans des retours et des précédentes actions
+> Pas assez de réunion (du aux projet)
+> Travail pas régulier la première semaine
+
+### Actions prises pour la prochaine itération
+> Avoir une meilleur cohésion d'équipe
+
+### Axes d'améliorations
+> Revoir les présentations de notre projet
+> Faire plus de test
+> Mieux étaler notre workflow
+
+## Prévisions de l'itération suivante
+### Évènements prévus
+> Fin PIMA
+
+### Titre des User Stories reportées
+> Map affichant les annonces (trop technique/chronophage pour être réaliser en PIMA)
+
+### Titre des nouvelles User Stories
+> Fin PIMA
+
+## Confiance
+### Taux de confiance de l'équipe dans l'itération
+*Remplir le tableau sachant que :D est une confiance totale dans le fait de livrer les éléments de l'itération. Mettre le nombre de votes dans chacune des cases. Expliquer en cas de besoin.*
+
+| | :( | :| | :) | :D |
+|:--------: |:----: |:----: |:----: |:----: |
+| Equipe 7 | *0* | *0* | *4* | *3* |
+
+### Taux de confiance de l'équipe pour la réalisation du projet
+*Remplir le tableau sachant que :D est une confiance totale dans le fait de réaliser le projet. Mettre le nombre de votes dans chacune des cases. Expliquer en cas de besoin.*
+
+| | :( | :| | :) | :D |
+|:--------: |:----: |:----: |:----: |:----: |
+| Equipe 7 | *0* | *0* | *1* | *6* |
+
+
+
diff --git a/workspace/.c9/metadata/workspace/app/Http/Controllers/ProductsController.php b/workspace/.c9/metadata/workspace/app/Http/Controllers/ProductsController.php
index 523d0fb3b33dc910e26ebfcb2375fa96ba3f87f7..0930d9ed59e9dfc05944f6aebdb68fa49ec235de 100644
--- a/workspace/.c9/metadata/workspace/app/Http/Controllers/ProductsController.php
+++ b/workspace/.c9/metadata/workspace/app/Http/Controllers/ProductsController.php
@@ -1 +1 @@
-{"filter":false,"title":"ProductsController.php","tooltip":"/app/Http/Controllers/ProductsController.php","undoManager":{"mark":47,"position":47,"stack":[[{"start":{"row":203,"column":97},"end":{"row":203,"column":98},"action":"insert","lines":[","],"id":90,"ignore":true}],[{"start":{"row":203,"column":98},"end":{"row":203,"column":111},"action":"insert","lines":["$address_city"],"id":91,"ignore":true}],[{"start":{"row":201,"column":54},"end":{"row":201,"column":56},"action":"insert","lines":[",$"],"id":92,"ignore":true}],[{"start":{"row":201,"column":56},"end":{"row":201,"column":58},"action":"insert","lines":["ad"],"id":93,"ignore":true}],[{"start":{"row":201,"column":58},"end":{"row":201,"column":59},"action":"insert","lines":["d"],"id":94,"ignore":true}],[{"start":{"row":201,"column":55},"end":{"row":201,"column":59},"action":"remove","lines":["$add"],"id":95,"ignore":true},{"start":{"row":201,"column":55},"end":{"row":201,"column":68},"action":"insert","lines":["$address_city"]}],[{"start":{"row":202,"column":5},"end":{"row":203,"column":9},"action":"insert","lines":[""," i"],"id":96,"ignore":true}],[{"start":{"row":203,"column":9},"end":{"row":203,"column":15},"action":"insert","lines":["f (!$)"],"id":97,"ignore":true}],[{"start":{"row":203,"column":14},"end":{"row":203,"column":16},"action":"insert","lines":["ad"],"id":98,"ignore":true}],[{"start":{"row":203,"column":13},"end":{"row":203,"column":16},"action":"remove","lines":["$ad"],"id":99,"ignore":true},{"start":{"row":203,"column":13},"end":{"row":203,"column":26},"action":"insert","lines":["$address_city"]}],[{"start":{"row":203,"column":27},"end":{"row":205,"column":9},"action":"insert","lines":["{"," "," }"],"id":100,"ignore":true}],[{"start":{"row":204,"column":12},"end":{"row":204,"column":117},"action":"insert","lines":["$products = $this->productRepository->getSearchA($this->nbrPerPage, $category, $expire_at,$address_city);"],"id":101,"ignore":true}],[{"start":{"row":204,"column":101},"end":{"row":204,"column":115},"action":"remove","lines":[",$address_city"],"id":102,"ignore":true}],[{"start":{"row":205,"column":9},"end":{"row":206,"column":9},"action":"insert","lines":[""," e"],"id":103,"ignore":true}],[{"start":{"row":206,"column":9},"end":{"row":206,"column":11},"action":"insert","lines":["ls"],"id":104,"ignore":true}],[{"start":{"row":206,"column":11},"end":{"row":206,"column":13},"action":"insert","lines":["e{"],"id":105,"ignore":true}],[{"start":{"row":207,"column":113},"end":{"row":207,"column":114},"action":"insert","lines":["}"],"id":106,"ignore":true}],[{"start":{"row":204,"column":59},"end":{"row":204,"column":60},"action":"remove","lines":["A"],"id":107,"ignore":true},{"start":{"row":204,"column":59},"end":{"row":204,"column":60},"action":"insert","lines":["B"]}],[{"start":{"row":203,"column":12},"end":{"row":203,"column":13},"action":"remove","lines":["!"],"id":108,"ignore":true},{"start":{"row":207,"column":113},"end":{"row":209,"column":8},"action":"insert","lines":[""," "," "]}],[{"start":{"row":203,"column":25},"end":{"row":203,"column":32},"action":"insert","lines":[" == \" \""],"id":109,"ignore":true}],[{"start":{"row":207,"column":113},"end":{"row":208,"column":12},"action":"remove","lines":[""," "],"id":110,"ignore":true}],[{"start":{"row":203,"column":32},"end":{"row":203,"column":37},"action":"insert","lines":[" && $"],"id":111,"ignore":true}],[{"start":{"row":203,"column":37},"end":{"row":203,"column":39},"action":"insert","lines":["ex"],"id":112,"ignore":true}],[{"start":{"row":203,"column":36},"end":{"row":203,"column":39},"action":"remove","lines":["$ex"],"id":113,"ignore":true},{"start":{"row":203,"column":36},"end":{"row":203,"column":49},"action":"insert","lines":["$expire_at =="]}],[{"start":{"row":203,"column":49},"end":{"row":203,"column":53},"action":"insert","lines":[" \" \""],"id":114,"ignore":true}],[{"start":{"row":203,"column":55},"end":{"row":204,"column":12},"action":"insert","lines":[""," "],"id":115,"ignore":true}],[{"start":{"row":203,"column":32},"end":{"row":203,"column":53},"action":"remove","lines":[" && $expire_at == \" \""],"id":117},{"start":{"row":203,"column":34},"end":{"row":205,"column":9},"action":"remove","lines":[""," $products = $this->productRepository->getSearchB($this->nbrPerPage, $category, $expire_at);"," }"]}],[{"start":{"row":203,"column":34},"end":{"row":204,"column":8},"action":"insert","lines":[""," "],"id":118,"ignore":true}],[{"start":{"row":203,"column":34},"end":{"row":204,"column":8},"action":"remove","lines":[""," "],"id":119,"ignore":true}],[{"start":{"row":203,"column":32},"end":{"row":203,"column":53},"action":"insert","lines":[" && $expire_at == \" \""],"id":120,"ignore":true},{"start":{"row":203,"column":55},"end":{"row":205,"column":9},"action":"insert","lines":[""," $products = $this->productRepository->getSearchB($this->nbrPerPage, $category, $expire_at);"," }"]}],[{"start":{"row":205,"column":9},"end":{"row":208,"column":9},"action":"insert","lines":[""," if ($address_city == \" \" && $expire_at == \" \"){"," $products = $this->productRepository->getSearchB($this->nbrPerPage, $category, $expire_at);"," }"],"id":121,"ignore":true}],[{"start":{"row":206,"column":47},"end":{"row":206,"column":48},"action":"remove","lines":["="],"id":122,"ignore":true},{"start":{"row":206,"column":47},"end":{"row":206,"column":48},"action":"insert","lines":["!"]}],[{"start":{"row":208,"column":9},"end":{"row":211,"column":9},"action":"insert","lines":[""," if ($address_city == \" \" && $expire_at != \" \"){"," $products = $this->productRepository->getSearchB($this->nbrPerPage, $category, $expire_at);"," }"],"id":123,"ignore":true}],[{"start":{"row":209,"column":26},"end":{"row":209,"column":27},"action":"remove","lines":["="],"id":124,"ignore":true},{"start":{"row":209,"column":26},"end":{"row":209,"column":27},"action":"insert","lines":["!"]},{"start":{"row":209,"column":47},"end":{"row":209,"column":48},"action":"remove","lines":["!"]},{"start":{"row":209,"column":47},"end":{"row":209,"column":48},"action":"insert","lines":["="]}],[{"start":{"row":204,"column":59},"end":{"row":204,"column":60},"action":"remove","lines":["B"],"id":125,"ignore":true},{"start":{"row":211,"column":9},"end":{"row":212,"column":8},"action":"insert","lines":[""," "]}],[{"start":{"row":212,"column":8},"end":{"row":214,"column":9},"action":"insert","lines":["if ($address_city == \" \" && $expire_at != \" \"){"," $products = $this->productRepository->getSearchB($this->nbrPerPage, $category, $expire_at);"," }"],"id":126,"ignore":true}],[{"start":{"row":212,"column":26},"end":{"row":212,"column":27},"action":"remove","lines":["="],"id":127,"ignore":true},{"start":{"row":212,"column":26},"end":{"row":212,"column":27},"action":"insert","lines":["!"]}],[{"start":{"row":213,"column":12},"end":{"row":213,"column":103},"action":"remove","lines":["$products = $this->productRepository->getSearchB($this->nbrPerPage, $category, $expire_at);"],"id":128,"ignore":true},{"start":{"row":213,"column":12},"end":{"row":213,"column":117},"action":"insert","lines":["$products = $this->productRepository->getSearchA($this->nbrPerPage, $category, $expire_at,$address_city);"]},{"start":{"row":215,"column":4},"end":{"row":219,"column":9},"action":"remove","lines":[" $products = $this->productRepository->getSearchB($this->nbrPerPage, $category, $expire_at);"," }"," else{"," $products = $this->productRepository->getSearchA($this->nbrPerPage, $category, $expire_at,$address_city);"," }"]}],[{"start":{"row":210,"column":99},"end":{"row":210,"column":101},"action":"remove","lines":["at"],"id":129,"ignore":true},{"start":{"row":214,"column":9},"end":{"row":215,"column":4},"action":"remove","lines":[""," "]}],[{"start":{"row":210,"column":92},"end":{"row":210,"column":99},"action":"remove","lines":["expire_"],"id":130,"ignore":true},{"start":{"row":210,"column":92},"end":{"row":210,"column":94},"action":"insert","lines":["ad"]}],[{"start":{"row":210,"column":94},"end":{"row":210,"column":95},"action":"insert","lines":["d"],"id":131,"ignore":true}],[{"start":{"row":210,"column":95},"end":{"row":210,"column":96},"action":"insert","lines":["r"],"id":132,"ignore":true}],[{"start":{"row":207,"column":59},"end":{"row":207,"column":60},"action":"remove","lines":["B"],"id":133,"ignore":true},{"start":{"row":207,"column":59},"end":{"row":207,"column":60},"action":"insert","lines":["N"]},{"start":{"row":210,"column":91},"end":{"row":210,"column":96},"action":"remove","lines":["$addr"]},{"start":{"row":210,"column":91},"end":{"row":210,"column":104},"action":"insert","lines":["$address_city"]}],[{"start":{"row":207,"column":60},"end":{"row":207,"column":61},"action":"insert","lines":["o"],"id":134,"ignore":true}],[{"start":{"row":207,"column":61},"end":{"row":207,"column":65},"action":"insert","lines":["city"],"id":135,"ignore":true},{"start":{"row":210,"column":59},"end":{"row":210,"column":60},"action":"remove","lines":["B"]},{"start":{"row":210,"column":59},"end":{"row":210,"column":60},"action":"insert","lines":["N"]}],[{"start":{"row":210,"column":60},"end":{"row":210,"column":61},"action":"insert","lines":["o"],"id":136,"ignore":true}],[{"start":{"row":210,"column":61},"end":{"row":210,"column":65},"action":"insert","lines":["date"],"id":137,"ignore":true}],[{"start":{"row":204,"column":88},"end":{"row":204,"column":100},"action":"remove","lines":[", $expire_at"],"id":138,"ignore":true}]]},"ace":{"folds":[],"scrolltop":360,"scrollleft":0,"selection":{"start":{"row":46,"column":14},"end":{"row":46,"column":38},"isBackwards":false},"options":{"guessTabSize":true,"useWrapMode":true,"wrapToView":true},"firstLineState":0},"timestamp":1513548540099,"hash":"2c30d238ce998efa89c5a97fa0fe01de36fbba90"}
\ No newline at end of file
+{"filter":false,"title":"ProductsController.php","tooltip":"/app/Http/Controllers/ProductsController.php","undoManager":{"mark":47,"position":47,"stack":[[{"start":{"row":203,"column":97},"end":{"row":203,"column":98},"action":"insert","lines":[","],"id":90,"ignore":true}],[{"start":{"row":203,"column":98},"end":{"row":203,"column":111},"action":"insert","lines":["$address_city"],"id":91,"ignore":true}],[{"start":{"row":201,"column":54},"end":{"row":201,"column":56},"action":"insert","lines":[",$"],"id":92,"ignore":true}],[{"start":{"row":201,"column":56},"end":{"row":201,"column":58},"action":"insert","lines":["ad"],"id":93,"ignore":true}],[{"start":{"row":201,"column":58},"end":{"row":201,"column":59},"action":"insert","lines":["d"],"id":94,"ignore":true}],[{"start":{"row":201,"column":55},"end":{"row":201,"column":59},"action":"remove","lines":["$add"],"id":95,"ignore":true},{"start":{"row":201,"column":55},"end":{"row":201,"column":68},"action":"insert","lines":["$address_city"]}],[{"start":{"row":202,"column":5},"end":{"row":203,"column":9},"action":"insert","lines":[""," i"],"id":96,"ignore":true}],[{"start":{"row":203,"column":9},"end":{"row":203,"column":15},"action":"insert","lines":["f (!$)"],"id":97,"ignore":true}],[{"start":{"row":203,"column":14},"end":{"row":203,"column":16},"action":"insert","lines":["ad"],"id":98,"ignore":true}],[{"start":{"row":203,"column":13},"end":{"row":203,"column":16},"action":"remove","lines":["$ad"],"id":99,"ignore":true},{"start":{"row":203,"column":13},"end":{"row":203,"column":26},"action":"insert","lines":["$address_city"]}],[{"start":{"row":203,"column":27},"end":{"row":205,"column":9},"action":"insert","lines":["{"," "," }"],"id":100,"ignore":true}],[{"start":{"row":204,"column":12},"end":{"row":204,"column":117},"action":"insert","lines":["$products = $this->productRepository->getSearchA($this->nbrPerPage, $category, $expire_at,$address_city);"],"id":101,"ignore":true}],[{"start":{"row":204,"column":101},"end":{"row":204,"column":115},"action":"remove","lines":[",$address_city"],"id":102,"ignore":true}],[{"start":{"row":205,"column":9},"end":{"row":206,"column":9},"action":"insert","lines":[""," e"],"id":103,"ignore":true}],[{"start":{"row":206,"column":9},"end":{"row":206,"column":11},"action":"insert","lines":["ls"],"id":104,"ignore":true}],[{"start":{"row":206,"column":11},"end":{"row":206,"column":13},"action":"insert","lines":["e{"],"id":105,"ignore":true}],[{"start":{"row":207,"column":113},"end":{"row":207,"column":114},"action":"insert","lines":["}"],"id":106,"ignore":true}],[{"start":{"row":204,"column":59},"end":{"row":204,"column":60},"action":"remove","lines":["A"],"id":107,"ignore":true},{"start":{"row":204,"column":59},"end":{"row":204,"column":60},"action":"insert","lines":["B"]}],[{"start":{"row":203,"column":12},"end":{"row":203,"column":13},"action":"remove","lines":["!"],"id":108,"ignore":true},{"start":{"row":207,"column":113},"end":{"row":209,"column":8},"action":"insert","lines":[""," "," "]}],[{"start":{"row":203,"column":25},"end":{"row":203,"column":32},"action":"insert","lines":[" == \" \""],"id":109,"ignore":true}],[{"start":{"row":207,"column":113},"end":{"row":208,"column":12},"action":"remove","lines":[""," "],"id":110,"ignore":true}],[{"start":{"row":203,"column":32},"end":{"row":203,"column":37},"action":"insert","lines":[" && $"],"id":111,"ignore":true}],[{"start":{"row":203,"column":37},"end":{"row":203,"column":39},"action":"insert","lines":["ex"],"id":112,"ignore":true}],[{"start":{"row":203,"column":36},"end":{"row":203,"column":39},"action":"remove","lines":["$ex"],"id":113,"ignore":true},{"start":{"row":203,"column":36},"end":{"row":203,"column":49},"action":"insert","lines":["$expire_at =="]}],[{"start":{"row":203,"column":49},"end":{"row":203,"column":53},"action":"insert","lines":[" \" \""],"id":114,"ignore":true}],[{"start":{"row":203,"column":55},"end":{"row":204,"column":12},"action":"insert","lines":[""," "],"id":115,"ignore":true}],[{"start":{"row":203,"column":32},"end":{"row":203,"column":53},"action":"remove","lines":[" && $expire_at == \" \""],"id":117},{"start":{"row":203,"column":34},"end":{"row":205,"column":9},"action":"remove","lines":[""," $products = $this->productRepository->getSearchB($this->nbrPerPage, $category, $expire_at);"," }"]}],[{"start":{"row":203,"column":34},"end":{"row":204,"column":8},"action":"insert","lines":[""," "],"id":118,"ignore":true}],[{"start":{"row":203,"column":34},"end":{"row":204,"column":8},"action":"remove","lines":[""," "],"id":119,"ignore":true}],[{"start":{"row":203,"column":32},"end":{"row":203,"column":53},"action":"insert","lines":[" && $expire_at == \" \""],"id":120,"ignore":true},{"start":{"row":203,"column":55},"end":{"row":205,"column":9},"action":"insert","lines":[""," $products = $this->productRepository->getSearchB($this->nbrPerPage, $category, $expire_at);"," }"]}],[{"start":{"row":205,"column":9},"end":{"row":208,"column":9},"action":"insert","lines":[""," if ($address_city == \" \" && $expire_at == \" \"){"," $products = $this->productRepository->getSearchB($this->nbrPerPage, $category, $expire_at);"," }"],"id":121,"ignore":true}],[{"start":{"row":206,"column":47},"end":{"row":206,"column":48},"action":"remove","lines":["="],"id":122,"ignore":true},{"start":{"row":206,"column":47},"end":{"row":206,"column":48},"action":"insert","lines":["!"]}],[{"start":{"row":208,"column":9},"end":{"row":211,"column":9},"action":"insert","lines":[""," if ($address_city == \" \" && $expire_at != \" \"){"," $products = $this->productRepository->getSearchB($this->nbrPerPage, $category, $expire_at);"," }"],"id":123,"ignore":true}],[{"start":{"row":209,"column":26},"end":{"row":209,"column":27},"action":"remove","lines":["="],"id":124,"ignore":true},{"start":{"row":209,"column":26},"end":{"row":209,"column":27},"action":"insert","lines":["!"]},{"start":{"row":209,"column":47},"end":{"row":209,"column":48},"action":"remove","lines":["!"]},{"start":{"row":209,"column":47},"end":{"row":209,"column":48},"action":"insert","lines":["="]}],[{"start":{"row":204,"column":59},"end":{"row":204,"column":60},"action":"remove","lines":["B"],"id":125,"ignore":true},{"start":{"row":211,"column":9},"end":{"row":212,"column":8},"action":"insert","lines":[""," "]}],[{"start":{"row":212,"column":8},"end":{"row":214,"column":9},"action":"insert","lines":["if ($address_city == \" \" && $expire_at != \" \"){"," $products = $this->productRepository->getSearchB($this->nbrPerPage, $category, $expire_at);"," }"],"id":126,"ignore":true}],[{"start":{"row":212,"column":26},"end":{"row":212,"column":27},"action":"remove","lines":["="],"id":127,"ignore":true},{"start":{"row":212,"column":26},"end":{"row":212,"column":27},"action":"insert","lines":["!"]}],[{"start":{"row":213,"column":12},"end":{"row":213,"column":103},"action":"remove","lines":["$products = $this->productRepository->getSearchB($this->nbrPerPage, $category, $expire_at);"],"id":128,"ignore":true},{"start":{"row":213,"column":12},"end":{"row":213,"column":117},"action":"insert","lines":["$products = $this->productRepository->getSearchA($this->nbrPerPage, $category, $expire_at,$address_city);"]},{"start":{"row":215,"column":4},"end":{"row":219,"column":9},"action":"remove","lines":[" $products = $this->productRepository->getSearchB($this->nbrPerPage, $category, $expire_at);"," }"," else{"," $products = $this->productRepository->getSearchA($this->nbrPerPage, $category, $expire_at,$address_city);"," }"]}],[{"start":{"row":210,"column":99},"end":{"row":210,"column":101},"action":"remove","lines":["at"],"id":129,"ignore":true},{"start":{"row":214,"column":9},"end":{"row":215,"column":4},"action":"remove","lines":[""," "]}],[{"start":{"row":210,"column":92},"end":{"row":210,"column":99},"action":"remove","lines":["expire_"],"id":130,"ignore":true},{"start":{"row":210,"column":92},"end":{"row":210,"column":94},"action":"insert","lines":["ad"]}],[{"start":{"row":210,"column":94},"end":{"row":210,"column":95},"action":"insert","lines":["d"],"id":131,"ignore":true}],[{"start":{"row":210,"column":95},"end":{"row":210,"column":96},"action":"insert","lines":["r"],"id":132,"ignore":true}],[{"start":{"row":207,"column":59},"end":{"row":207,"column":60},"action":"remove","lines":["B"],"id":133,"ignore":true},{"start":{"row":207,"column":59},"end":{"row":207,"column":60},"action":"insert","lines":["N"]},{"start":{"row":210,"column":91},"end":{"row":210,"column":96},"action":"remove","lines":["$addr"]},{"start":{"row":210,"column":91},"end":{"row":210,"column":104},"action":"insert","lines":["$address_city"]}],[{"start":{"row":207,"column":60},"end":{"row":207,"column":61},"action":"insert","lines":["o"],"id":134,"ignore":true}],[{"start":{"row":207,"column":61},"end":{"row":207,"column":65},"action":"insert","lines":["city"],"id":135,"ignore":true},{"start":{"row":210,"column":59},"end":{"row":210,"column":60},"action":"remove","lines":["B"]},{"start":{"row":210,"column":59},"end":{"row":210,"column":60},"action":"insert","lines":["N"]}],[{"start":{"row":210,"column":60},"end":{"row":210,"column":61},"action":"insert","lines":["o"],"id":136,"ignore":true}],[{"start":{"row":210,"column":61},"end":{"row":210,"column":65},"action":"insert","lines":["date"],"id":137,"ignore":true}],[{"start":{"row":204,"column":88},"end":{"row":204,"column":100},"action":"remove","lines":[", $expire_at"],"id":138,"ignore":true}]]},"ace":{"folds":[],"scrolltop":360,"scrollleft":0,"selection":{"start":{"row":41,"column":46},"end":{"row":41,"column":77},"isBackwards":false},"options":{"guessTabSize":true,"useWrapMode":true,"wrapToView":true},"firstLineState":{"row":20,"state":"php-start","mode":"ace/mode/php"}},"timestamp":1513548540099,"hash":"2c30d238ce998efa89c5a97fa0fe01de36fbba90"}
\ No newline at end of file
diff --git a/workspace/.c9/metadata/workspace/app/Http/Controllers/UserController.php b/workspace/.c9/metadata/workspace/app/Http/Controllers/UserController.php
index c8d00c89706a855e0670e0c48069539e7b13693c..9264eff0c6f5387b1c56b65cfecc16cf3278eb3c 100644
--- a/workspace/.c9/metadata/workspace/app/Http/Controllers/UserController.php
+++ b/workspace/.c9/metadata/workspace/app/Http/Controllers/UserController.php
@@ -1 +1 @@
-{"filter":false,"title":"UserController.php","tooltip":"/app/Http/Controllers/UserController.php","undoManager":{"mark":100,"position":100,"stack":[[{"start":{"row":68,"column":56},"end":{"row":68,"column":57},"action":"insert","lines":[","],"id":1471}],[{"start":{"row":68,"column":57},"end":{"row":68,"column":58},"action":"insert","lines":[" "],"id":1472}],[{"start":{"row":68,"column":58},"end":{"row":68,"column":60},"action":"insert","lines":["''"],"id":1473}],[{"start":{"row":68,"column":59},"end":{"row":68,"column":60},"action":"insert","lines":["u"],"id":1474}],[{"start":{"row":68,"column":60},"end":{"row":68,"column":61},"action":"insert","lines":["s"],"id":1475}],[{"start":{"row":68,"column":61},"end":{"row":68,"column":62},"action":"insert","lines":["e"],"id":1476}],[{"start":{"row":68,"column":62},"end":{"row":68,"column":63},"action":"insert","lines":["r"],"id":1477}],[{"start":{"row":68,"column":63},"end":{"row":68,"column":64},"action":"insert","lines":["s"],"id":1478}],[{"start":{"row":68,"column":64},"end":{"row":68,"column":65},"action":"insert","lines":["."],"id":1479}],[{"start":{"row":68,"column":65},"end":{"row":68,"column":66},"action":"insert","lines":["e"],"id":1480}],[{"start":{"row":68,"column":66},"end":{"row":68,"column":67},"action":"insert","lines":["ù"],"id":1481}],[{"start":{"row":68,"column":67},"end":{"row":68,"column":68},"action":"insert","lines":["a"],"id":1482}],[{"start":{"row":68,"column":67},"end":{"row":68,"column":68},"action":"remove","lines":["a"],"id":1483}],[{"start":{"row":68,"column":66},"end":{"row":68,"column":67},"action":"remove","lines":["ù"],"id":1484}],[{"start":{"row":68,"column":66},"end":{"row":68,"column":67},"action":"insert","lines":["m"],"id":1485}],[{"start":{"row":68,"column":67},"end":{"row":68,"column":68},"action":"insert","lines":["a"],"id":1486}],[{"start":{"row":68,"column":68},"end":{"row":68,"column":69},"action":"insert","lines":["i"],"id":1487}],[{"start":{"row":68,"column":69},"end":{"row":68,"column":70},"action":"insert","lines":["l"],"id":1488}],[{"start":{"row":60,"column":21},"end":{"row":60,"column":31},"action":"remove","lines":["'users.*',"],"id":1489},{"start":{"row":60,"column":21},"end":{"row":60,"column":73},"action":"insert","lines":["'users.id as id_user', 'users.name', 'users.email', "]}],[{"start":{"row":60,"column":72},"end":{"row":60,"column":73},"action":"remove","lines":[" "],"id":1490}],[{"start":{"row":60,"column":21},"end":{"row":60,"column":45},"action":"insert","lines":["'reservations.id_sender'"],"id":1491}],[{"start":{"row":60,"column":45},"end":{"row":60,"column":46},"action":"insert","lines":[","],"id":1492}],[{"start":{"row":60,"column":46},"end":{"row":60,"column":47},"action":"insert","lines":[" "],"id":1493}],[{"start":{"row":8,"column":43},"end":{"row":9,"column":0},"action":"insert","lines":["",""],"id":1494}],[{"start":{"row":9,"column":0},"end":{"row":9,"column":43},"action":"insert","lines":["use App\\Repositories\\ReservationRepository;"],"id":1495}],[{"start":{"row":9,"column":31},"end":{"row":9,"column":32},"action":"remove","lines":["n"],"id":1496}],[{"start":{"row":9,"column":30},"end":{"row":9,"column":31},"action":"remove","lines":["o"],"id":1497}],[{"start":{"row":9,"column":29},"end":{"row":9,"column":30},"action":"remove","lines":["i"],"id":1498}],[{"start":{"row":9,"column":28},"end":{"row":9,"column":29},"action":"remove","lines":["t"],"id":1499}],[{"start":{"row":9,"column":27},"end":{"row":9,"column":28},"action":"remove","lines":["a"],"id":1500}],[{"start":{"row":9,"column":26},"end":{"row":9,"column":27},"action":"remove","lines":["v"],"id":1501}],[{"start":{"row":9,"column":25},"end":{"row":9,"column":26},"action":"remove","lines":["r"],"id":1502}],[{"start":{"row":9,"column":24},"end":{"row":9,"column":25},"action":"remove","lines":["e"],"id":1503}],[{"start":{"row":9,"column":23},"end":{"row":9,"column":24},"action":"remove","lines":["s"],"id":1504}],[{"start":{"row":9,"column":22},"end":{"row":9,"column":23},"action":"remove","lines":["e"],"id":1505}],[{"start":{"row":9,"column":21},"end":{"row":9,"column":22},"action":"remove","lines":["R"],"id":1506}],[{"start":{"row":9,"column":21},"end":{"row":9,"column":22},"action":"insert","lines":["P"],"id":1507}],[{"start":{"row":9,"column":22},"end":{"row":9,"column":23},"action":"insert","lines":["r"],"id":1508}],[{"start":{"row":9,"column":23},"end":{"row":9,"column":24},"action":"insert","lines":["o"],"id":1509}],[{"start":{"row":9,"column":24},"end":{"row":9,"column":25},"action":"insert","lines":["d"],"id":1510}],[{"start":{"row":9,"column":25},"end":{"row":9,"column":26},"action":"insert","lines":["u"],"id":1511}],[{"start":{"row":9,"column":26},"end":{"row":9,"column":27},"action":"insert","lines":["c"],"id":1512}],[{"start":{"row":9,"column":27},"end":{"row":9,"column":28},"action":"insert","lines":["t"],"id":1513}],[{"start":{"row":71,"column":14},"end":{"row":71,"column":15},"action":"remove","lines":["p"],"id":1514}],[{"start":{"row":71,"column":14},"end":{"row":71,"column":15},"action":"insert","lines":["g"],"id":1515}],[{"start":{"row":71,"column":15},"end":{"row":71,"column":16},"action":"insert","lines":["e"],"id":1516}],[{"start":{"row":71,"column":16},"end":{"row":71,"column":17},"action":"insert","lines":["t"],"id":1517}],[{"start":{"row":71,"column":17},"end":{"row":71,"column":18},"action":"insert","lines":["P"],"id":1518}],[{"start":{"row":63,"column":14},"end":{"row":63,"column":15},"action":"remove","lines":["p"],"id":1519}],[{"start":{"row":63,"column":14},"end":{"row":63,"column":15},"action":"insert","lines":["g"],"id":1520}],[{"start":{"row":63,"column":15},"end":{"row":63,"column":16},"action":"insert","lines":["e"],"id":1521}],[{"start":{"row":63,"column":16},"end":{"row":63,"column":17},"action":"insert","lines":["t"],"id":1522}],[{"start":{"row":63,"column":17},"end":{"row":63,"column":18},"action":"insert","lines":["P"],"id":1523}],[{"start":{"row":63,"column":17},"end":{"row":63,"column":18},"action":"remove","lines":["P"],"id":1524}],[{"start":{"row":63,"column":16},"end":{"row":63,"column":17},"action":"remove","lines":["t"],"id":1525}],[{"start":{"row":63,"column":15},"end":{"row":63,"column":16},"action":"remove","lines":["e"],"id":1526}],[{"start":{"row":63,"column":14},"end":{"row":63,"column":15},"action":"remove","lines":["g"],"id":1527}],[{"start":{"row":63,"column":14},"end":{"row":63,"column":15},"action":"insert","lines":["p"],"id":1528}],[{"start":{"row":71,"column":14},"end":{"row":71,"column":18},"action":"remove","lines":["getP"],"id":1529},{"start":{"row":71,"column":14},"end":{"row":71,"column":15},"action":"insert","lines":["p"]}],[{"start":{"row":8,"column":43},"end":{"row":9,"column":39},"action":"remove","lines":["","use App\\Repositories\\ProductRepository;"],"id":1530}],[{"start":{"row":10,"column":28},"end":{"row":11,"column":0},"action":"insert","lines":["",""],"id":1531}],[{"start":{"row":11,"column":0},"end":{"row":11,"column":1},"action":"insert","lines":["u"],"id":1532}],[{"start":{"row":11,"column":1},"end":{"row":11,"column":2},"action":"insert","lines":["s"],"id":1533}],[{"start":{"row":11,"column":2},"end":{"row":11,"column":3},"action":"insert","lines":["e"],"id":1534}],[{"start":{"row":11,"column":3},"end":{"row":11,"column":4},"action":"insert","lines":[" "],"id":1535}],[{"start":{"row":11,"column":4},"end":{"row":11,"column":5},"action":"insert","lines":["C"],"id":1536}],[{"start":{"row":11,"column":5},"end":{"row":11,"column":6},"action":"insert","lines":["a"],"id":1537}],[{"start":{"row":11,"column":6},"end":{"row":11,"column":7},"action":"insert","lines":["r"],"id":1538}],[{"start":{"row":11,"column":7},"end":{"row":11,"column":8},"action":"insert","lines":["b"],"id":1539}],[{"start":{"row":11,"column":8},"end":{"row":11,"column":9},"action":"insert","lines":["o"],"id":1540}],[{"start":{"row":11,"column":9},"end":{"row":11,"column":10},"action":"insert","lines":["n"],"id":1541}],[{"start":{"row":11,"column":10},"end":{"row":11,"column":11},"action":"insert","lines":["\\"],"id":1542}],[{"start":{"row":11,"column":11},"end":{"row":11,"column":12},"action":"insert","lines":["C"],"id":1543}],[{"start":{"row":11,"column":12},"end":{"row":11,"column":13},"action":"insert","lines":["a"],"id":1544}],[{"start":{"row":11,"column":13},"end":{"row":11,"column":14},"action":"insert","lines":["r"],"id":1545}],[{"start":{"row":11,"column":14},"end":{"row":11,"column":15},"action":"insert","lines":["b"],"id":1546}],[{"start":{"row":11,"column":15},"end":{"row":11,"column":16},"action":"insert","lines":["o"],"id":1547}],[{"start":{"row":11,"column":16},"end":{"row":11,"column":17},"action":"insert","lines":["n"],"id":1548}],[{"start":{"row":11,"column":17},"end":{"row":11,"column":18},"action":"insert","lines":[";"],"id":1549}],[{"start":{"row":70,"column":51},"end":{"row":71,"column":0},"action":"insert","lines":["",""],"id":1550},{"start":{"row":71,"column":0},"end":{"row":71,"column":12},"action":"insert","lines":[" "]}],[{"start":{"row":71,"column":12},"end":{"row":71,"column":75},"action":"insert","lines":["->whereDate('expire_at', '>=', Carbon::today()->toDateString())"],"id":1551}],[{"start":{"row":71,"column":25},"end":{"row":71,"column":26},"action":"insert","lines":["p"],"id":1552}],[{"start":{"row":71,"column":26},"end":{"row":71,"column":27},"action":"insert","lines":["r"],"id":1553}],[{"start":{"row":71,"column":27},"end":{"row":71,"column":28},"action":"insert","lines":["o"],"id":1554}],[{"start":{"row":71,"column":28},"end":{"row":71,"column":29},"action":"insert","lines":["d"],"id":1555}],[{"start":{"row":71,"column":29},"end":{"row":71,"column":30},"action":"insert","lines":["u"],"id":1556}],[{"start":{"row":71,"column":30},"end":{"row":71,"column":31},"action":"insert","lines":["c"],"id":1557}],[{"start":{"row":71,"column":31},"end":{"row":71,"column":32},"action":"insert","lines":["t"],"id":1558}],[{"start":{"row":71,"column":32},"end":{"row":71,"column":33},"action":"insert","lines":["s"],"id":1559}],[{"start":{"row":71,"column":33},"end":{"row":71,"column":34},"action":"insert","lines":["."],"id":1560}],[{"start":{"row":62,"column":56},"end":{"row":63,"column":0},"action":"insert","lines":["",""],"id":1561},{"start":{"row":63,"column":0},"end":{"row":63,"column":12},"action":"insert","lines":[" "]}],[{"start":{"row":63,"column":12},"end":{"row":63,"column":75},"action":"insert","lines":["->whereDate('expire_at', '>=', Carbon::today()->toDateString())"],"id":1562}],[{"start":{"row":63,"column":25},"end":{"row":63,"column":26},"action":"insert","lines":["p"],"id":1563}],[{"start":{"row":63,"column":26},"end":{"row":63,"column":27},"action":"insert","lines":["r"],"id":1564}],[{"start":{"row":63,"column":27},"end":{"row":63,"column":28},"action":"insert","lines":["o"],"id":1565}],[{"start":{"row":63,"column":28},"end":{"row":63,"column":29},"action":"insert","lines":["d"],"id":1566}],[{"start":{"row":63,"column":29},"end":{"row":63,"column":30},"action":"insert","lines":["u"],"id":1567}],[{"start":{"row":63,"column":30},"end":{"row":63,"column":31},"action":"insert","lines":["c"],"id":1568}],[{"start":{"row":63,"column":31},"end":{"row":63,"column":32},"action":"insert","lines":["t"],"id":1569}],[{"start":{"row":63,"column":32},"end":{"row":63,"column":33},"action":"insert","lines":["s"],"id":1570}],[{"start":{"row":63,"column":33},"end":{"row":63,"column":34},"action":"insert","lines":["."],"id":1571}]]},"ace":{"folds":[],"scrolltop":528,"scrollleft":0,"selection":{"start":{"row":44,"column":2},"end":{"row":44,"column":2},"isBackwards":true},"options":{"guessTabSize":true,"useWrapMode":false,"wrapToView":true},"firstLineState":0},"timestamp":1513586506043,"hash":"2cf1af03bda142061884605d40e46de7e680e53b"}
\ No newline at end of file
+{"filter":false,"title":"UserController.php","tooltip":"/app/Http/Controllers/UserController.php","ace":{"folds":[],"scrolltop":730,"scrollleft":0,"selection":{"start":{"row":87,"column":2},"end":{"row":87,"column":2},"isBackwards":false},"options":{"guessTabSize":true,"useWrapMode":false,"wrapToView":true},"firstLineState":{"row":62,"state":"php-start","mode":"ace/mode/php"}},"hash":"f1c129edf28f2815251c4b290fc0a1ce051f584e","undoManager":{"mark":100,"position":100,"stack":[[{"start":{"row":58,"column":35},"end":{"row":58,"column":36},"action":"insert","lines":["e"],"id":1366}],[{"start":{"row":58,"column":36},"end":{"row":58,"column":37},"action":"insert","lines":["r"],"id":1367}],[{"start":{"row":58,"column":37},"end":{"row":58,"column":38},"action":"insert","lines":["v"],"id":1368}],[{"start":{"row":58,"column":38},"end":{"row":58,"column":39},"action":"insert","lines":["a"],"id":1369}],[{"start":{"row":58,"column":39},"end":{"row":58,"column":40},"action":"insert","lines":["t"],"id":1370}],[{"start":{"row":58,"column":40},"end":{"row":58,"column":41},"action":"insert","lines":["i"],"id":1371}],[{"start":{"row":58,"column":41},"end":{"row":58,"column":42},"action":"insert","lines":["o"],"id":1372}],[{"start":{"row":58,"column":42},"end":{"row":58,"column":43},"action":"insert","lines":["n"],"id":1373}],[{"start":{"row":58,"column":43},"end":{"row":58,"column":44},"action":"insert","lines":["s"],"id":1374}],[{"start":{"row":58,"column":44},"end":{"row":58,"column":45},"action":"insert","lines":["."],"id":1375}],[{"start":{"row":69,"column":38},"end":{"row":69,"column":42},"action":"remove","lines":["', '"],"id":1376},{"start":{"row":69,"column":38},"end":{"row":69,"column":39},"action":"insert","lines":[" "]}],[{"start":{"row":61,"column":43},"end":{"row":61,"column":47},"action":"remove","lines":["', '"],"id":1377},{"start":{"row":61,"column":43},"end":{"row":61,"column":44},"action":"insert","lines":[" "]}],[{"start":{"row":60,"column":195},"end":{"row":60,"column":196},"action":"insert","lines":[","],"id":1378}],[{"start":{"row":60,"column":196},"end":{"row":60,"column":197},"action":"insert","lines":[" "],"id":1379}],[{"start":{"row":60,"column":197},"end":{"row":60,"column":198},"action":"insert","lines":["r"],"id":1380}],[{"start":{"row":60,"column":198},"end":{"row":60,"column":199},"action":"insert","lines":["e"],"id":1381}],[{"start":{"row":60,"column":199},"end":{"row":60,"column":200},"action":"insert","lines":["s"],"id":1382}],[{"start":{"row":60,"column":200},"end":{"row":60,"column":201},"action":"insert","lines":["e"],"id":1383}],[{"start":{"row":60,"column":201},"end":{"row":60,"column":202},"action":"insert","lines":["r"],"id":1384}],[{"start":{"row":60,"column":202},"end":{"row":60,"column":203},"action":"insert","lines":["v"],"id":1385}],[{"start":{"row":60,"column":203},"end":{"row":60,"column":204},"action":"insert","lines":["a"],"id":1386}],[{"start":{"row":60,"column":204},"end":{"row":60,"column":205},"action":"insert","lines":["t"],"id":1387}],[{"start":{"row":60,"column":205},"end":{"row":60,"column":206},"action":"insert","lines":["i"],"id":1388}],[{"start":{"row":60,"column":206},"end":{"row":60,"column":207},"action":"insert","lines":["o"],"id":1389}],[{"start":{"row":60,"column":207},"end":{"row":60,"column":208},"action":"insert","lines":["n"],"id":1390}],[{"start":{"row":60,"column":208},"end":{"row":60,"column":209},"action":"insert","lines":["s"],"id":1391}],[{"start":{"row":60,"column":209},"end":{"row":60,"column":210},"action":"insert","lines":["."],"id":1392}],[{"start":{"row":60,"column":209},"end":{"row":60,"column":210},"action":"remove","lines":["."],"id":1393}],[{"start":{"row":60,"column":208},"end":{"row":60,"column":209},"action":"remove","lines":["s"],"id":1394}],[{"start":{"row":60,"column":207},"end":{"row":60,"column":208},"action":"remove","lines":["n"],"id":1395}],[{"start":{"row":60,"column":206},"end":{"row":60,"column":207},"action":"remove","lines":["o"],"id":1396}],[{"start":{"row":60,"column":205},"end":{"row":60,"column":206},"action":"remove","lines":["i"],"id":1397}],[{"start":{"row":60,"column":204},"end":{"row":60,"column":205},"action":"remove","lines":["t"],"id":1398}],[{"start":{"row":60,"column":203},"end":{"row":60,"column":204},"action":"remove","lines":["a"],"id":1399}],[{"start":{"row":60,"column":202},"end":{"row":60,"column":203},"action":"remove","lines":["v"],"id":1400}],[{"start":{"row":60,"column":201},"end":{"row":60,"column":202},"action":"remove","lines":["r"],"id":1401}],[{"start":{"row":60,"column":200},"end":{"row":60,"column":201},"action":"remove","lines":["e"],"id":1402}],[{"start":{"row":60,"column":199},"end":{"row":60,"column":200},"action":"remove","lines":["s"],"id":1403}],[{"start":{"row":60,"column":198},"end":{"row":60,"column":199},"action":"remove","lines":["e"],"id":1404}],[{"start":{"row":60,"column":197},"end":{"row":60,"column":198},"action":"remove","lines":["r"],"id":1405}],[{"start":{"row":60,"column":196},"end":{"row":60,"column":197},"action":"remove","lines":[" "],"id":1406}],[{"start":{"row":60,"column":195},"end":{"row":60,"column":196},"action":"remove","lines":[","],"id":1434}],[{"start":{"row":61,"column":43},"end":{"row":61,"column":44},"action":"insert","lines":["'"],"id":1435}],[{"start":{"row":61,"column":44},"end":{"row":61,"column":45},"action":"insert","lines":["'"],"id":1436}],[{"start":{"row":61,"column":45},"end":{"row":61,"column":46},"action":"remove","lines":[" "],"id":1437}],[{"start":{"row":61,"column":44},"end":{"row":61,"column":45},"action":"insert","lines":[","],"id":1438}],[{"start":{"row":61,"column":45},"end":{"row":61,"column":46},"action":"insert","lines":[" "],"id":1439}],[{"start":{"row":61,"column":46},"end":{"row":61,"column":50},"action":"remove","lines":["'=',"],"id":1440}],[{"start":{"row":61,"column":45},"end":{"row":61,"column":46},"action":"remove","lines":[" "],"id":1441}],[{"start":{"row":69,"column":38},"end":{"row":69,"column":41},"action":"remove","lines":[" ='"],"id":1442}],[{"start":{"row":69,"column":38},"end":{"row":69,"column":39},"action":"insert","lines":["'"],"id":1443}],[{"start":{"row":68,"column":28},"end":{"row":68,"column":29},"action":"remove","lines":["*"],"id":1444}],[{"start":{"row":68,"column":28},"end":{"row":68,"column":29},"action":"insert","lines":["i"],"id":1445}],[{"start":{"row":68,"column":29},"end":{"row":68,"column":30},"action":"insert","lines":["d"],"id":1446}],[{"start":{"row":68,"column":30},"end":{"row":68,"column":31},"action":"insert","lines":[" "],"id":1447}],[{"start":{"row":68,"column":31},"end":{"row":68,"column":32},"action":"insert","lines":["a"],"id":1448}],[{"start":{"row":68,"column":32},"end":{"row":68,"column":33},"action":"insert","lines":["s"],"id":1449}],[{"start":{"row":68,"column":33},"end":{"row":68,"column":34},"action":"insert","lines":[" "],"id":1450}],[{"start":{"row":68,"column":34},"end":{"row":68,"column":35},"action":"insert","lines":["i"],"id":1451}],[{"start":{"row":68,"column":35},"end":{"row":68,"column":36},"action":"insert","lines":["d"],"id":1452}],[{"start":{"row":68,"column":36},"end":{"row":68,"column":37},"action":"insert","lines":["_"],"id":1453}],[{"start":{"row":68,"column":37},"end":{"row":68,"column":38},"action":"insert","lines":["u"],"id":1454}],[{"start":{"row":68,"column":38},"end":{"row":68,"column":39},"action":"insert","lines":["s"],"id":1455}],[{"start":{"row":68,"column":39},"end":{"row":68,"column":40},"action":"insert","lines":["e"],"id":1456}],[{"start":{"row":68,"column":40},"end":{"row":68,"column":41},"action":"insert","lines":["r"],"id":1457}],[{"start":{"row":68,"column":42},"end":{"row":68,"column":43},"action":"insert","lines":[","],"id":1458}],[{"start":{"row":68,"column":43},"end":{"row":68,"column":44},"action":"insert","lines":[" "],"id":1459}],[{"start":{"row":68,"column":44},"end":{"row":68,"column":46},"action":"insert","lines":["''"],"id":1460}],[{"start":{"row":68,"column":45},"end":{"row":68,"column":46},"action":"insert","lines":["u"],"id":1461}],[{"start":{"row":68,"column":46},"end":{"row":68,"column":47},"action":"insert","lines":["s"],"id":1462}],[{"start":{"row":68,"column":47},"end":{"row":68,"column":48},"action":"insert","lines":["e"],"id":1463}],[{"start":{"row":68,"column":48},"end":{"row":68,"column":49},"action":"insert","lines":["r"],"id":1464}],[{"start":{"row":68,"column":49},"end":{"row":68,"column":50},"action":"insert","lines":["s"],"id":1465}],[{"start":{"row":68,"column":50},"end":{"row":68,"column":51},"action":"insert","lines":["."],"id":1466}],[{"start":{"row":68,"column":51},"end":{"row":68,"column":52},"action":"insert","lines":["n"],"id":1467}],[{"start":{"row":68,"column":52},"end":{"row":68,"column":53},"action":"insert","lines":["a"],"id":1468}],[{"start":{"row":68,"column":53},"end":{"row":68,"column":54},"action":"insert","lines":["m"],"id":1469}],[{"start":{"row":68,"column":54},"end":{"row":68,"column":55},"action":"insert","lines":["e"],"id":1470}],[{"start":{"row":68,"column":56},"end":{"row":68,"column":57},"action":"insert","lines":[","],"id":1471}],[{"start":{"row":68,"column":57},"end":{"row":68,"column":58},"action":"insert","lines":[" "],"id":1472}],[{"start":{"row":68,"column":58},"end":{"row":68,"column":60},"action":"insert","lines":["''"],"id":1473}],[{"start":{"row":68,"column":59},"end":{"row":68,"column":60},"action":"insert","lines":["u"],"id":1474}],[{"start":{"row":68,"column":60},"end":{"row":68,"column":61},"action":"insert","lines":["s"],"id":1475}],[{"start":{"row":68,"column":61},"end":{"row":68,"column":62},"action":"insert","lines":["e"],"id":1476}],[{"start":{"row":68,"column":62},"end":{"row":68,"column":63},"action":"insert","lines":["r"],"id":1477}],[{"start":{"row":68,"column":63},"end":{"row":68,"column":64},"action":"insert","lines":["s"],"id":1478}],[{"start":{"row":68,"column":64},"end":{"row":68,"column":65},"action":"insert","lines":["."],"id":1479}],[{"start":{"row":68,"column":65},"end":{"row":68,"column":66},"action":"insert","lines":["e"],"id":1480}],[{"start":{"row":68,"column":66},"end":{"row":68,"column":67},"action":"insert","lines":["ù"],"id":1481}],[{"start":{"row":68,"column":67},"end":{"row":68,"column":68},"action":"insert","lines":["a"],"id":1482}],[{"start":{"row":68,"column":67},"end":{"row":68,"column":68},"action":"remove","lines":["a"],"id":1483}],[{"start":{"row":68,"column":66},"end":{"row":68,"column":67},"action":"remove","lines":["ù"],"id":1484}],[{"start":{"row":68,"column":66},"end":{"row":68,"column":67},"action":"insert","lines":["m"],"id":1485}],[{"start":{"row":68,"column":67},"end":{"row":68,"column":68},"action":"insert","lines":["a"],"id":1486}],[{"start":{"row":68,"column":68},"end":{"row":68,"column":69},"action":"insert","lines":["i"],"id":1487}],[{"start":{"row":68,"column":69},"end":{"row":68,"column":70},"action":"insert","lines":["l"],"id":1488}],[{"start":{"row":60,"column":21},"end":{"row":60,"column":31},"action":"remove","lines":["'users.*',"],"id":1489},{"start":{"row":60,"column":21},"end":{"row":60,"column":73},"action":"insert","lines":["'users.id as id_user', 'users.name', 'users.email', "]}],[{"start":{"row":60,"column":72},"end":{"row":60,"column":73},"action":"remove","lines":[" "],"id":1490}],[{"start":{"row":60,"column":21},"end":{"row":60,"column":45},"action":"insert","lines":["'reservations.id_sender'"],"id":1491}],[{"start":{"row":60,"column":45},"end":{"row":60,"column":46},"action":"insert","lines":[","],"id":1492}],[{"start":{"row":60,"column":46},"end":{"row":60,"column":47},"action":"insert","lines":[" "],"id":1493}]]},"timestamp":1513552939716}
\ No newline at end of file
diff --git a/workspace/.c9/metadata/workspace/resources/views/products/product_index.blade.php b/workspace/.c9/metadata/workspace/resources/views/products/product_index.blade.php
index f029a1e06d8944c3c3db0a8764eac6abf78d9993..e531b05f7fa2252df5da8393056bd6b7b1f88db4 100644
--- a/workspace/.c9/metadata/workspace/resources/views/products/product_index.blade.php
+++ b/workspace/.c9/metadata/workspace/resources/views/products/product_index.blade.php
@@ -1 +1 @@
-{"filter":false,"title":"product_index.blade.php","tooltip":"/resources/views/products/product_index.blade.php","undoManager":{"mark":-1,"position":-1,"stack":[]},"ace":{"folds":[],"scrolltop":1860,"scrollleft":0,"selection":{"start":{"row":173,"column":27},"end":{"row":173,"column":27},"isBackwards":false},"options":{"guessTabSize":true,"useWrapMode":false,"wrapToView":true},"firstLineState":0},"timestamp":1513546817022,"hash":"2ad1985a8305ae0960ece72bd0e7c3054bd89e78"}
\ No newline at end of file
+{"filter":false,"title":"product_index.blade.php","tooltip":"/resources/views/products/product_index.blade.php","ace":{"folds":[],"scrolltop":900,"scrollleft":0,"selection":{"start":{"row":66,"column":1},"end":{"row":66,"column":1},"isBackwards":false},"options":{"guessTabSize":true,"useWrapMode":false,"wrapToView":true},"firstLineState":{"row":220,"mode":"ace/mode/php"}},"hash":"2ad1985a8305ae0960ece72bd0e7c3054bd89e78","undoManager":{"mark":-1,"position":-1,"stack":[]},"timestamp":1513546817022}
\ No newline at end of file
diff --git a/workspace/.c9/metadata/workspace/resources/views/products/product_show.blade.php b/workspace/.c9/metadata/workspace/resources/views/products/product_show.blade.php
index 3321c84275029aed8be88cde29067544b5010650..c57295d891ad9d2e1f120a6238a8e3fbd6f7daa0 100644
--- a/workspace/.c9/metadata/workspace/resources/views/products/product_show.blade.php
+++ b/workspace/.c9/metadata/workspace/resources/views/products/product_show.blade.php
@@ -1 +1 @@
-{"filter":false,"title":"product_show.blade.php","tooltip":"/resources/views/products/product_show.blade.php","undoManager":{"mark":12,"position":12,"stack":[[{"start":{"row":80,"column":5},"end":{"row":81,"column":0},"action":"insert","lines":["",""],"id":1328},{"start":{"row":81,"column":0},"end":{"row":81,"column":4},"action":"insert","lines":["\t\t\t\t"]}],[{"start":{"row":81,"column":4},"end":{"row":82,"column":0},"action":"insert","lines":["",""],"id":1329},{"start":{"row":82,"column":0},"end":{"row":82,"column":4},"action":"insert","lines":["\t\t\t\t"]}],[{"start":{"row":82,"column":4},"end":{"row":86,"column":5},"action":"insert","lines":["if(Auth::user()->id != $product->id_owner and ! $product->booked){ //réservation pour les autres que le proprio de l'annonce","\t\t\t\t\techo ( Form::open(['method' => 'GET', 'route' => ['reservations.store', $product->id, Auth::user()->id ]]) ); // TODO resa","\t\t\t\t\techo ( Form::submit('Réserver', ['class' => 'btn btn-warning mx-1', 'onclick' => 'return confirm(\\'Confirmez-vous votre réservation ?\\')']) );","\t\t\t\t\techo ( Form::close() );","\t\t\t\t}"],"id":1330}],[{"start":{"row":82,"column":51},"end":{"row":82,"column":52},"action":"remove","lines":[" "],"id":1331}],[{"start":{"row":82,"column":50},"end":{"row":82,"column":51},"action":"remove","lines":["!"],"id":1332}],[{"start":{"row":78,"column":66},"end":{"row":78,"column":67},"action":"insert","lines":[" "],"id":1333}],[{"start":{"row":78,"column":67},"end":{"row":78,"column":68},"action":"insert","lines":["a"],"id":1352}],[{"start":{"row":78,"column":68},"end":{"row":78,"column":69},"action":"insert","lines":["n"],"id":1353}],[{"start":{"row":78,"column":69},"end":{"row":78,"column":70},"action":"insert","lines":["d"],"id":1354}],[{"start":{"row":78,"column":70},"end":{"row":78,"column":71},"action":"insert","lines":[" "],"id":1355}],[{"start":{"row":78,"column":67},"end":{"row":78,"column":71},"action":"remove","lines":["and "],"id":1356}],[{"start":{"row":78,"column":66},"end":{"row":78,"column":67},"action":"remove","lines":[" "],"id":1357}],[{"start":{"row":80,"column":5},"end":{"row":86,"column":5},"action":"remove","lines":["","\t\t\t\t","\t\t\t\tif(Auth::user()->id != $product->id_owner and $product->booked){ //réservation pour les autres que le proprio de l'annonce","\t\t\t\t\techo ( Form::open(['method' => 'GET', 'route' => ['reservations.store', $product->id, Auth::user()->id ]]) ); // TODO resa","\t\t\t\t\techo ( Form::submit('Réserver', ['class' => 'btn btn-warning mx-1', 'onclick' => 'return confirm(\\'Confirmez-vous votre réservation ?\\')']) );","\t\t\t\t\techo ( Form::close() );","\t\t\t\t}"],"id":1358}]]},"ace":{"folds":[],"scrolltop":600,"scrollleft":0,"selection":{"start":{"row":61,"column":8},"end":{"row":61,"column":8},"isBackwards":false},"options":{"guessTabSize":true,"useWrapMode":false,"wrapToView":true},"firstLineState":{"row":49,"state":"php-start","mode":"ace/mode/php"}},"timestamp":1513549557238,"hash":"af056d9478dc35ac56acdfeff417056ce72b0d4b"}
\ No newline at end of file
+{"filter":false,"title":"product_show.blade.php","tooltip":"/resources/views/products/product_show.blade.php","ace":{"folds":[],"scrolltop":196.5,"scrollleft":0,"selection":{"start":{"row":33,"column":13},"end":{"row":33,"column":106},"isBackwards":true},"options":{"guessTabSize":true,"useWrapMode":false,"wrapToView":true},"firstLineState":{"row":0,"state":"start","mode":"ace/mode/php"}},"hash":"af056d9478dc35ac56acdfeff417056ce72b0d4b","undoManager":{"mark":12,"position":12,"stack":[[{"start":{"row":80,"column":5},"end":{"row":81,"column":0},"action":"insert","lines":["",""],"id":1328},{"start":{"row":81,"column":0},"end":{"row":81,"column":4},"action":"insert","lines":["\t\t\t\t"]}],[{"start":{"row":81,"column":4},"end":{"row":82,"column":0},"action":"insert","lines":["",""],"id":1329},{"start":{"row":82,"column":0},"end":{"row":82,"column":4},"action":"insert","lines":["\t\t\t\t"]}],[{"start":{"row":82,"column":4},"end":{"row":86,"column":5},"action":"insert","lines":["if(Auth::user()->id != $product->id_owner and ! $product->booked){ //réservation pour les autres que le proprio de l'annonce","\t\t\t\t\techo ( Form::open(['method' => 'GET', 'route' => ['reservations.store', $product->id, Auth::user()->id ]]) ); // TODO resa","\t\t\t\t\techo ( Form::submit('Réserver', ['class' => 'btn btn-warning mx-1', 'onclick' => 'return confirm(\\'Confirmez-vous votre réservation ?\\')']) );","\t\t\t\t\techo ( Form::close() );","\t\t\t\t}"],"id":1330}],[{"start":{"row":82,"column":51},"end":{"row":82,"column":52},"action":"remove","lines":[" "],"id":1331}],[{"start":{"row":82,"column":50},"end":{"row":82,"column":51},"action":"remove","lines":["!"],"id":1332}],[{"start":{"row":78,"column":66},"end":{"row":78,"column":67},"action":"insert","lines":[" "],"id":1333}],[{"start":{"row":78,"column":67},"end":{"row":78,"column":68},"action":"insert","lines":["a"],"id":1352}],[{"start":{"row":78,"column":68},"end":{"row":78,"column":69},"action":"insert","lines":["n"],"id":1353}],[{"start":{"row":78,"column":69},"end":{"row":78,"column":70},"action":"insert","lines":["d"],"id":1354}],[{"start":{"row":78,"column":70},"end":{"row":78,"column":71},"action":"insert","lines":[" "],"id":1355}],[{"start":{"row":78,"column":67},"end":{"row":78,"column":71},"action":"remove","lines":["and "],"id":1356}],[{"start":{"row":78,"column":66},"end":{"row":78,"column":67},"action":"remove","lines":[" "],"id":1357}],[{"start":{"row":80,"column":5},"end":{"row":86,"column":5},"action":"remove","lines":["","\t\t\t\t","\t\t\t\tif(Auth::user()->id != $product->id_owner and $product->booked){ //réservation pour les autres que le proprio de l'annonce","\t\t\t\t\techo ( Form::open(['method' => 'GET', 'route' => ['reservations.store', $product->id, Auth::user()->id ]]) ); // TODO resa","\t\t\t\t\techo ( Form::submit('Réserver', ['class' => 'btn btn-warning mx-1', 'onclick' => 'return confirm(\\'Confirmez-vous votre réservation ?\\')']) );","\t\t\t\t\techo ( Form::close() );","\t\t\t\t}"],"id":1358}]]},"timestamp":1513549557211}
\ No newline at end of file
diff --git a/workspace/.c9/metadata/workspace/resources/views/user/user_show.blade.php b/workspace/.c9/metadata/workspace/resources/views/user/user_show.blade.php
index 7c6fcd4573960b1f97b504815cd0174a99f34f36..53e43dd957d97ac2f4cd82245d97682edce2b8e9 100644
--- a/workspace/.c9/metadata/workspace/resources/views/user/user_show.blade.php
+++ b/workspace/.c9/metadata/workspace/resources/views/user/user_show.blade.php
@@ -1 +1 @@
-{"filter":false,"title":"user_show.blade.php","tooltip":"/resources/views/user/user_show.blade.php","undoManager":{"mark":100,"position":100,"stack":[[{"start":{"row":180,"column":8},"end":{"row":181,"column":0},"action":"remove","lines":["",""],"id":821}],[{"start":{"row":185,"column":2},"end":{"row":185,"column":30},"action":"remove","lines":["<div class=\"col-lg-4\"></div>"],"id":822}],[{"start":{"row":185,"column":1},"end":{"row":185,"column":2},"action":"remove","lines":["\t"],"id":823}],[{"start":{"row":185,"column":0},"end":{"row":185,"column":1},"action":"remove","lines":["\t"],"id":824}],[{"start":{"row":184,"column":2},"end":{"row":185,"column":0},"action":"remove","lines":["",""],"id":825}],[{"start":{"row":186,"column":76},"end":{"row":187,"column":0},"action":"insert","lines":["",""],"id":826},{"start":{"row":187,"column":0},"end":{"row":187,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":187,"column":2},"end":{"row":188,"column":0},"action":"insert","lines":["",""],"id":827},{"start":{"row":188,"column":0},"end":{"row":188,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":188,"column":2},"end":{"row":190,"column":30},"action":"insert","lines":["<br/>","\t\t","\t\t<div class=\"col-lg-4\"></div>"],"id":828}],[{"start":{"row":190,"column":30},"end":{"row":191,"column":0},"action":"insert","lines":["",""],"id":829},{"start":{"row":191,"column":0},"end":{"row":191,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":239,"column":8},"end":{"row":240,"column":0},"action":"insert","lines":["",""],"id":830},{"start":{"row":240,"column":0},"end":{"row":240,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":240,"column":2},"end":{"row":241,"column":0},"action":"insert","lines":["",""],"id":831},{"start":{"row":241,"column":0},"end":{"row":241,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":241,"column":2},"end":{"row":243,"column":30},"action":"insert","lines":["<br/>","\t\t","\t\t<div class=\"col-lg-4\"></div>"],"id":832}],[{"start":{"row":240,"column":2},"end":{"row":243,"column":30},"action":"remove","lines":["","\t\t<br/>","\t\t","\t\t<div class=\"col-lg-4\"></div>"],"id":833}],[{"start":{"row":240,"column":1},"end":{"row":240,"column":2},"action":"remove","lines":["\t"],"id":834}],[{"start":{"row":240,"column":0},"end":{"row":240,"column":1},"action":"remove","lines":["\t"],"id":835}],[{"start":{"row":239,"column":8},"end":{"row":240,"column":0},"action":"remove","lines":["",""],"id":836}],[{"start":{"row":242,"column":2},"end":{"row":242,"column":30},"action":"remove","lines":["<div class=\"col-lg-4\"></div>"],"id":837}],[{"start":{"row":242,"column":1},"end":{"row":242,"column":2},"action":"remove","lines":["\t"],"id":838}],[{"start":{"row":242,"column":0},"end":{"row":242,"column":1},"action":"remove","lines":["\t"],"id":839}],[{"start":{"row":241,"column":2},"end":{"row":242,"column":0},"action":"remove","lines":["",""],"id":840}],[{"start":{"row":241,"column":1},"end":{"row":241,"column":2},"action":"remove","lines":["\t"],"id":841}],[{"start":{"row":241,"column":0},"end":{"row":241,"column":1},"action":"remove","lines":["\t"],"id":842}],[{"start":{"row":240,"column":8},"end":{"row":241,"column":0},"action":"remove","lines":["",""],"id":843}],[{"start":{"row":239,"column":8},"end":{"row":240,"column":0},"action":"insert","lines":["",""],"id":844},{"start":{"row":240,"column":0},"end":{"row":240,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":240,"column":2},"end":{"row":241,"column":0},"action":"insert","lines":["",""],"id":845},{"start":{"row":241,"column":0},"end":{"row":241,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":241,"column":2},"end":{"row":243,"column":30},"action":"insert","lines":["<br/>","\t\t","\t\t<div class=\"col-lg-4\"></div>"],"id":846}],[{"start":{"row":243,"column":30},"end":{"row":244,"column":0},"action":"insert","lines":["",""],"id":847},{"start":{"row":244,"column":0},"end":{"row":244,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":240,"column":2},"end":{"row":241,"column":7},"action":"remove","lines":["","\t\t<br/>"],"id":848}],[{"start":{"row":240,"column":1},"end":{"row":240,"column":2},"action":"remove","lines":["\t"],"id":849}],[{"start":{"row":240,"column":0},"end":{"row":240,"column":1},"action":"remove","lines":["\t"],"id":850}],[{"start":{"row":239,"column":8},"end":{"row":240,"column":0},"action":"remove","lines":["",""],"id":851}],[{"start":{"row":239,"column":8},"end":{"row":241,"column":30},"action":"remove","lines":["","\t\t","\t\t<div class=\"col-lg-4\"></div>"],"id":852}],[{"start":{"row":240,"column":1},"end":{"row":240,"column":2},"action":"remove","lines":["\t"],"id":853}],[{"start":{"row":240,"column":0},"end":{"row":240,"column":1},"action":"remove","lines":["\t"],"id":854}],[{"start":{"row":239,"column":8},"end":{"row":240,"column":0},"action":"remove","lines":["",""],"id":855}],[{"start":{"row":240,"column":8},"end":{"row":241,"column":0},"action":"insert","lines":["",""],"id":856},{"start":{"row":241,"column":0},"end":{"row":241,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":241,"column":2},"end":{"row":243,"column":30},"action":"insert","lines":["<br/>","\t\t","\t\t<div class=\"col-lg-4\"></div>"],"id":857}],[{"start":{"row":240,"column":8},"end":{"row":241,"column":0},"action":"insert","lines":["",""],"id":858},{"start":{"row":241,"column":0},"end":{"row":241,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":240,"column":8},"end":{"row":242,"column":7},"action":"remove","lines":["","\t\t","\t\t<br/>"],"id":859}],[{"start":{"row":65,"column":6},"end":{"row":65,"column":7},"action":"insert","lines":[" "],"id":860}],[{"start":{"row":65,"column":7},"end":{"row":65,"column":8},"action":"insert","lines":["c"],"id":861}],[{"start":{"row":65,"column":8},"end":{"row":65,"column":9},"action":"insert","lines":["o"],"id":862}],[{"start":{"row":65,"column":9},"end":{"row":65,"column":10},"action":"insert","lines":["l"],"id":863}],[{"start":{"row":65,"column":9},"end":{"row":65,"column":10},"action":"remove","lines":["l"],"id":864}],[{"start":{"row":65,"column":8},"end":{"row":65,"column":9},"action":"remove","lines":["o"],"id":865}],[{"start":{"row":65,"column":8},"end":{"row":65,"column":9},"action":"insert","lines":["l"],"id":866}],[{"start":{"row":65,"column":9},"end":{"row":65,"column":10},"action":"insert","lines":["a"],"id":867}],[{"start":{"row":65,"column":10},"end":{"row":65,"column":11},"action":"insert","lines":["s"],"id":868}],[{"start":{"row":65,"column":11},"end":{"row":65,"column":12},"action":"insert","lines":["s"],"id":869}],[{"start":{"row":65,"column":12},"end":{"row":65,"column":13},"action":"insert","lines":[" "],"id":870}],[{"start":{"row":65,"column":13},"end":{"row":65,"column":14},"action":"insert","lines":["="],"id":871}],[{"start":{"row":65,"column":14},"end":{"row":65,"column":15},"action":"insert","lines":[" "],"id":872}],[{"start":{"row":65,"column":14},"end":{"row":65,"column":15},"action":"remove","lines":[" "],"id":873}],[{"start":{"row":65,"column":13},"end":{"row":65,"column":14},"action":"remove","lines":["="],"id":874}],[{"start":{"row":65,"column":12},"end":{"row":65,"column":13},"action":"remove","lines":[" "],"id":875}],[{"start":{"row":65,"column":12},"end":{"row":65,"column":13},"action":"insert","lines":["="],"id":876}],[{"start":{"row":65,"column":13},"end":{"row":65,"column":15},"action":"insert","lines":["''"],"id":877}],[{"start":{"row":65,"column":13},"end":{"row":65,"column":15},"action":"remove","lines":["''"],"id":878}],[{"start":{"row":65,"column":13},"end":{"row":65,"column":15},"action":"insert","lines":["\"\""],"id":879}],[{"start":{"row":65,"column":14},"end":{"row":65,"column":15},"action":"insert","lines":["c"],"id":880}],[{"start":{"row":65,"column":15},"end":{"row":65,"column":16},"action":"insert","lines":["o"],"id":881}],[{"start":{"row":65,"column":16},"end":{"row":65,"column":17},"action":"insert","lines":["l"],"id":882}],[{"start":{"row":65,"column":17},"end":{"row":65,"column":18},"action":"insert","lines":["-"],"id":883}],[{"start":{"row":65,"column":18},"end":{"row":65,"column":19},"action":"insert","lines":["l"],"id":884}],[{"start":{"row":65,"column":19},"end":{"row":65,"column":20},"action":"insert","lines":["g"],"id":885}],[{"start":{"row":65,"column":20},"end":{"row":65,"column":21},"action":"insert","lines":["-"],"id":886}],[{"start":{"row":65,"column":21},"end":{"row":65,"column":22},"action":"insert","lines":["8"],"id":887}],[{"start":{"row":126,"column":2},"end":{"row":127,"column":30},"action":"remove","lines":["","\t\t<div class=\"col-lg-4\"></div>"],"id":888}],[{"start":{"row":126,"column":1},"end":{"row":126,"column":2},"action":"remove","lines":["\t"],"id":889}],[{"start":{"row":126,"column":0},"end":{"row":126,"column":1},"action":"remove","lines":["\t"],"id":890}],[{"start":{"row":125,"column":8},"end":{"row":126,"column":0},"action":"remove","lines":["",""],"id":891}],[{"start":{"row":133,"column":6},"end":{"row":133,"column":7},"action":"insert","lines":[" "],"id":892}],[{"start":{"row":133,"column":7},"end":{"row":133,"column":23},"action":"insert","lines":["class=\"col-lg-8\""],"id":893}],[{"start":{"row":190,"column":6},"end":{"row":190,"column":7},"action":"insert","lines":[" "],"id":894}],[{"start":{"row":190,"column":7},"end":{"row":190,"column":23},"action":"insert","lines":["class=\"col-lg-8\""],"id":895}],[{"start":{"row":237,"column":8},"end":{"row":238,"column":0},"action":"insert","lines":["",""],"id":896},{"start":{"row":238,"column":0},"end":{"row":238,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":238,"column":2},"end":{"row":239,"column":0},"action":"insert","lines":["",""],"id":897},{"start":{"row":239,"column":0},"end":{"row":239,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":239,"column":2},"end":{"row":239,"column":30},"action":"insert","lines":["<div class=\"col-lg-4\"></div>"],"id":898}],[{"start":{"row":179,"column":2},"end":{"row":180,"column":30},"action":"remove","lines":["","\t\t<div class=\"col-lg-4\"></div>"],"id":899}],[{"start":{"row":237,"column":2},"end":{"row":238,"column":30},"action":"remove","lines":["","\t\t<div class=\"col-lg-4\"></div>"],"id":900}],[{"start":{"row":239,"column":2},"end":{"row":240,"column":30},"action":"remove","lines":["","\t\t<div class=\"col-lg-4\"></div>"],"id":901}],[{"start":{"row":252,"column":2},"end":{"row":253,"column":0},"action":"insert","lines":["",""],"id":902},{"start":{"row":253,"column":0},"end":{"row":253,"column":1},"action":"insert","lines":["\t"]}],[{"start":{"row":253,"column":1},"end":{"row":253,"column":2},"action":"insert","lines":["."],"id":903}],[{"start":{"row":253,"column":2},"end":{"row":253,"column":3},"action":"insert","lines":["h"],"id":904}],[{"start":{"row":253,"column":3},"end":{"row":253,"column":4},"action":"insert","lines":["2"],"id":905}],[{"start":{"row":253,"column":4},"end":{"row":253,"column":5},"action":"insert","lines":["."],"id":906}],[{"start":{"row":253,"column":5},"end":{"row":253,"column":6},"action":"insert","lines":["m"],"id":907}],[{"start":{"row":253,"column":6},"end":{"row":253,"column":7},"action":"insert","lines":["y"],"id":908}],[{"start":{"row":253,"column":7},"end":{"row":253,"column":8},"action":"insert","lines":["-"],"id":909}],[{"start":{"row":253,"column":8},"end":{"row":253,"column":9},"action":"insert","lines":["4"],"id":910}],[{"start":{"row":253,"column":9},"end":{"row":253,"column":10},"action":"insert","lines":["{"],"id":911}],[{"start":{"row":253,"column":10},"end":{"row":255,"column":2},"action":"insert","lines":["","\t\t","\t}"],"id":912}],[{"start":{"row":254,"column":2},"end":{"row":254,"column":29},"action":"insert","lines":["text-decoration: underline;"],"id":913}],[{"start":{"row":253,"column":4},"end":{"row":253,"column":9},"action":"remove","lines":[".my-4"],"id":914}],[{"start":{"row":253,"column":4},"end":{"row":253,"column":5},"action":"insert","lines":[" "],"id":915}],[{"start":{"row":253,"column":1},"end":{"row":253,"column":2},"action":"remove","lines":["."],"id":916}],[{"start":{"row":253,"column":3},"end":{"row":253,"column":4},"action":"insert","lines":["."],"id":917}],[{"start":{"row":253,"column":4},"end":{"row":253,"column":5},"action":"insert","lines":["m"],"id":918}],[{"start":{"row":253,"column":5},"end":{"row":253,"column":6},"action":"insert","lines":["y"],"id":919}],[{"start":{"row":253,"column":6},"end":{"row":253,"column":7},"action":"insert","lines":["-"],"id":920}],[{"start":{"row":253,"column":7},"end":{"row":253,"column":8},"action":"insert","lines":["4"],"id":921}]]},"ace":{"folds":[],"scrolltop":2770,"scrollleft":0,"selection":{"start":{"row":253,"column":8},"end":{"row":253,"column":8},"isBackwards":false},"options":{"guessTabSize":true,"useWrapMode":false,"wrapToView":true},"firstLineState":0},"timestamp":1513554489922,"hash":"1c25fb2644fdd3c4df945dd13aae4ea5647ef140"}
\ No newline at end of file
+{"filter":false,"title":"user_show.blade.php","tooltip":"/resources/views/user/user_show.blade.php","undoManager":{"mark":100,"position":100,"stack":[[{"start":{"row":206,"column":74},"end":{"row":206,"column":75},"action":"insert","lines":["r"],"id":604}],[{"start":{"row":206,"column":75},"end":{"row":207,"column":0},"action":"insert","lines":["",""],"id":605},{"start":{"row":207,"column":0},"end":{"row":207,"column":6},"action":"insert","lines":["\t\t\t\t\t\t"]}],[{"start":{"row":207,"column":5},"end":{"row":207,"column":6},"action":"remove","lines":["\t"],"id":606}],[{"start":{"row":207,"column":4},"end":{"row":207,"column":5},"action":"remove","lines":["\t"],"id":607}],[{"start":{"row":207,"column":3},"end":{"row":207,"column":4},"action":"remove","lines":["\t"],"id":608}],[{"start":{"row":207,"column":2},"end":{"row":207,"column":3},"action":"remove","lines":["\t"],"id":609}],[{"start":{"row":207,"column":1},"end":{"row":207,"column":2},"action":"remove","lines":["\t"],"id":610}],[{"start":{"row":207,"column":0},"end":{"row":207,"column":1},"action":"remove","lines":["\t"],"id":611}],[{"start":{"row":206,"column":75},"end":{"row":207,"column":0},"action":"remove","lines":["",""],"id":612}],[{"start":{"row":206,"column":101},"end":{"row":206,"column":102},"action":"insert","lines":["<"],"id":613}],[{"start":{"row":206,"column":102},"end":{"row":206,"column":103},"action":"insert","lines":["/"],"id":614}],[{"start":{"row":206,"column":103},"end":{"row":206,"column":104},"action":"insert","lines":["a"],"id":615}],[{"start":{"row":206,"column":104},"end":{"row":206,"column":105},"action":"insert","lines":["<"],"id":616}],[{"start":{"row":206,"column":104},"end":{"row":206,"column":105},"action":"remove","lines":["<"],"id":617}],[{"start":{"row":206,"column":104},"end":{"row":206,"column":105},"action":"insert","lines":[">"],"id":618}],[{"start":{"row":206,"column":52},"end":{"row":206,"column":53},"action":"insert","lines":["<"],"id":619}],[{"start":{"row":206,"column":53},"end":{"row":206,"column":54},"action":"insert","lines":["p"],"id":620}],[{"start":{"row":206,"column":54},"end":{"row":206,"column":55},"action":"insert","lines":["h"],"id":621}],[{"start":{"row":206,"column":55},"end":{"row":206,"column":56},"action":"insert","lines":["p"],"id":622}],[{"start":{"row":206,"column":55},"end":{"row":206,"column":56},"action":"remove","lines":["p"],"id":623}],[{"start":{"row":206,"column":54},"end":{"row":206,"column":55},"action":"remove","lines":["h"],"id":624}],[{"start":{"row":206,"column":53},"end":{"row":206,"column":54},"action":"remove","lines":["p"],"id":625}],[{"start":{"row":206,"column":52},"end":{"row":206,"column":53},"action":"remove","lines":["<"],"id":626}],[{"start":{"row":206,"column":51},"end":{"row":206,"column":52},"action":"remove","lines":["/"],"id":627}],[{"start":{"row":206,"column":51},"end":{"row":206,"column":52},"action":"insert","lines":["/"],"id":628}],[{"start":{"row":206,"column":52},"end":{"row":206,"column":53},"action":"insert","lines":["\""],"id":629}],[{"start":{"row":206,"column":53},"end":{"row":206,"column":54},"action":"insert","lines":["."],"id":630}],[{"start":{"row":206,"column":77},"end":{"row":206,"column":78},"action":"remove","lines":["\""],"id":631}],[{"start":{"row":206,"column":38},"end":{"row":206,"column":78},"action":"remove","lines":["<a href=\"user/\".$reservation->id_sender>"],"id":632}],[{"start":{"row":206,"column":65},"end":{"row":206,"column":66},"action":"remove","lines":[">"],"id":633}],[{"start":{"row":206,"column":64},"end":{"row":206,"column":65},"action":"remove","lines":["a"],"id":634}],[{"start":{"row":206,"column":63},"end":{"row":206,"column":64},"action":"remove","lines":["/"],"id":635}],[{"start":{"row":206,"column":62},"end":{"row":206,"column":63},"action":"remove","lines":["<"],"id":636}],[{"start":{"row":206,"column":62},"end":{"row":206,"column":63},"action":"remove","lines":[" "],"id":637}],[{"start":{"row":206,"column":62},"end":{"row":206,"column":63},"action":"insert","lines":[" "],"id":638}],[{"start":{"row":206,"column":63},"end":{"row":206,"column":156},"action":"insert","lines":["{!!link_to_route('user.show', $userInfo->name, [$product->id_owner], ['class' => 'title'])!!}"],"id":639}],[{"start":{"row":206,"column":94},"end":{"row":206,"column":101},"action":"remove","lines":["userInf"],"id":640},{"start":{"row":206,"column":94},"end":{"row":206,"column":95},"action":"insert","lines":["r"]}],[{"start":{"row":206,"column":95},"end":{"row":206,"column":96},"action":"insert","lines":["e"],"id":641}],[{"start":{"row":206,"column":96},"end":{"row":206,"column":97},"action":"insert","lines":["s"],"id":642}],[{"start":{"row":206,"column":97},"end":{"row":206,"column":98},"action":"insert","lines":["e"],"id":643}],[{"start":{"row":206,"column":98},"end":{"row":206,"column":99},"action":"insert","lines":["r"],"id":644}],[{"start":{"row":206,"column":99},"end":{"row":206,"column":100},"action":"insert","lines":["v"],"id":645}],[{"start":{"row":206,"column":100},"end":{"row":206,"column":101},"action":"insert","lines":["a"],"id":646}],[{"start":{"row":206,"column":101},"end":{"row":206,"column":102},"action":"insert","lines":["t"],"id":647}],[{"start":{"row":206,"column":102},"end":{"row":206,"column":103},"action":"insert","lines":["i"],"id":648}],[{"start":{"row":206,"column":103},"end":{"row":206,"column":104},"action":"insert","lines":["o"],"id":649}],[{"start":{"row":206,"column":104},"end":{"row":206,"column":105},"action":"insert","lines":["n"],"id":650}],[{"start":{"row":206,"column":105},"end":{"row":206,"column":106},"action":"remove","lines":["o"],"id":651}],[{"start":{"row":206,"column":115},"end":{"row":206,"column":122},"action":"remove","lines":["product"],"id":652},{"start":{"row":206,"column":115},"end":{"row":206,"column":116},"action":"insert","lines":["r"]}],[{"start":{"row":206,"column":116},"end":{"row":206,"column":117},"action":"insert","lines":["e"],"id":653}],[{"start":{"row":206,"column":117},"end":{"row":206,"column":118},"action":"insert","lines":["s"],"id":654}],[{"start":{"row":206,"column":118},"end":{"row":206,"column":119},"action":"insert","lines":["e"],"id":655}],[{"start":{"row":206,"column":119},"end":{"row":206,"column":120},"action":"insert","lines":["r"],"id":656}],[{"start":{"row":206,"column":120},"end":{"row":206,"column":121},"action":"insert","lines":["v"],"id":657}],[{"start":{"row":206,"column":121},"end":{"row":206,"column":122},"action":"insert","lines":["a"],"id":658}],[{"start":{"row":206,"column":122},"end":{"row":206,"column":123},"action":"insert","lines":["t"],"id":659}],[{"start":{"row":206,"column":123},"end":{"row":206,"column":124},"action":"insert","lines":["i"],"id":660}],[{"start":{"row":206,"column":124},"end":{"row":206,"column":125},"action":"insert","lines":["o"],"id":661}],[{"start":{"row":206,"column":125},"end":{"row":206,"column":126},"action":"insert","lines":["n"],"id":662}],[{"start":{"row":206,"column":135},"end":{"row":206,"column":136},"action":"remove","lines":["r"],"id":663}],[{"start":{"row":206,"column":134},"end":{"row":206,"column":135},"action":"remove","lines":["e"],"id":664}],[{"start":{"row":206,"column":133},"end":{"row":206,"column":134},"action":"remove","lines":["n"],"id":665}],[{"start":{"row":206,"column":132},"end":{"row":206,"column":133},"action":"remove","lines":["w"],"id":666}],[{"start":{"row":206,"column":131},"end":{"row":206,"column":132},"action":"remove","lines":["o"],"id":667}],[{"start":{"row":206,"column":131},"end":{"row":206,"column":132},"action":"insert","lines":["s"],"id":668}],[{"start":{"row":206,"column":132},"end":{"row":206,"column":133},"action":"insert","lines":["e"],"id":669}],[{"start":{"row":206,"column":133},"end":{"row":206,"column":134},"action":"insert","lines":["n"],"id":670}],[{"start":{"row":206,"column":134},"end":{"row":206,"column":135},"action":"insert","lines":["d"],"id":671}],[{"start":{"row":206,"column":135},"end":{"row":206,"column":136},"action":"insert","lines":["e"],"id":672}],[{"start":{"row":206,"column":136},"end":{"row":206,"column":137},"action":"insert","lines":["r"],"id":673}],[{"start":{"row":206,"column":37},"end":{"row":206,"column":62},"action":"remove","lines":[" {!!$reservation->name!!}"],"id":674}],[{"start":{"row":206,"column":38},"end":{"row":206,"column":139},"action":"remove","lines":["{!!link_to_route('user.show', $reservation->name, [$reservation->id_sender], ['class' => 'title'])!!}"],"id":725},{"start":{"row":206,"column":38},"end":{"row":206,"column":62},"action":"insert","lines":["{!!$reservation->name!!}"]}],[{"start":{"row":179,"column":2},"end":{"row":180,"column":0},"action":"insert","lines":["",""],"id":726},{"start":{"row":180,"column":0},"end":{"row":180,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":180,"column":2},"end":{"row":181,"column":0},"action":"insert","lines":["",""],"id":727},{"start":{"row":181,"column":0},"end":{"row":181,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":180,"column":2},"end":{"row":182,"column":9},"action":"insert","lines":["@if($products != NULL)","\t\t\t\t{!! $products->links() !!}","\t\t\t@endif"],"id":728}],[{"start":{"row":182,"column":2},"end":{"row":182,"column":3},"action":"remove","lines":["\t"],"id":729}],[{"start":{"row":181,"column":9},"end":{"row":181,"column":17},"action":"remove","lines":["products"],"id":730},{"start":{"row":181,"column":9},"end":{"row":181,"column":10},"action":"insert","lines":["M"]}],[{"start":{"row":181,"column":10},"end":{"row":181,"column":11},"action":"insert","lines":["y"],"id":731}],[{"start":{"row":181,"column":11},"end":{"row":181,"column":12},"action":"insert","lines":["r"],"id":732}],[{"start":{"row":181,"column":12},"end":{"row":181,"column":13},"action":"insert","lines":["e"],"id":733}],[{"start":{"row":181,"column":13},"end":{"row":181,"column":14},"action":"insert","lines":["s"],"id":734}],[{"start":{"row":181,"column":14},"end":{"row":181,"column":15},"action":"insert","lines":["e"],"id":735}],[{"start":{"row":181,"column":15},"end":{"row":181,"column":16},"action":"insert","lines":["r"],"id":736}],[{"start":{"row":181,"column":16},"end":{"row":181,"column":17},"action":"insert","lines":["v"],"id":737}],[{"start":{"row":181,"column":17},"end":{"row":181,"column":18},"action":"insert","lines":["a"],"id":738}],[{"start":{"row":181,"column":18},"end":{"row":181,"column":19},"action":"insert","lines":["t"],"id":739}],[{"start":{"row":181,"column":19},"end":{"row":181,"column":20},"action":"insert","lines":["i"],"id":740}],[{"start":{"row":181,"column":20},"end":{"row":181,"column":21},"action":"insert","lines":["o"],"id":741}],[{"start":{"row":181,"column":21},"end":{"row":181,"column":22},"action":"insert","lines":["n"],"id":742}],[{"start":{"row":181,"column":22},"end":{"row":181,"column":23},"action":"insert","lines":["s"],"id":743}],[{"start":{"row":240,"column":8},"end":{"row":241,"column":0},"action":"insert","lines":["",""],"id":744},{"start":{"row":241,"column":0},"end":{"row":241,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":241,"column":2},"end":{"row":242,"column":0},"action":"insert","lines":["",""],"id":745},{"start":{"row":242,"column":0},"end":{"row":242,"column":2},"action":"insert","lines":["\t\t"]}],[{"start":{"row":180,"column":6},"end":{"row":180,"column":15},"action":"remove","lines":["$products"],"id":746},{"start":{"row":180,"column":6},"end":{"row":180,"column":21},"action":"insert","lines":["$Myreservations"]}],[{"start":{"row":242,"column":2},"end":{"row":244,"column":8},"action":"insert","lines":["\t\t@if($Myreservations != NULL)","\t\t\t\t{!! $Myreservations->links() !!}","\t\t@endif"],"id":747}],[{"start":{"row":242,"column":0},"end":{"row":242,"column":1},"action":"remove","lines":["\t"],"id":748},{"start":{"row":243,"column":0},"end":{"row":243,"column":1},"action":"remove","lines":["\t"]}],[{"start":{"row":242,"column":0},"end":{"row":242,"column":1},"action":"remove","lines":["\t"],"id":749},{"start":{"row":243,"column":0},"end":{"row":243,"column":1},"action":"remove","lines":["\t"]}],[{"start":{"row":243,"column":2},"end":{"row":243,"column":3},"action":"insert","lines":["\t"],"id":750}],[{"start":{"row":242,"column":8},"end":{"row":242,"column":9},"action":"remove","lines":["y"],"id":751}],[{"start":{"row":242,"column":7},"end":{"row":242,"column":8},"action":"remove","lines":["M"],"id":752}],[{"start":{"row":243,"column":9},"end":{"row":243,"column":10},"action":"remove","lines":["y"],"id":753}],[{"start":{"row":243,"column":8},"end":{"row":243,"column":9},"action":"remove","lines":["M"],"id":754}]]},"ace":{"folds":[],"scrolltop":3473.5000000000114,"scrollleft":0,"selection":{"start":{"row":243,"column":8},"end":{"row":243,"column":8},"isBackwards":false},"options":{"guessTabSize":true,"useWrapMode":false,"wrapToView":true},"firstLineState":{"row":216,"state":"start","mode":"ace/mode/php"}},"timestamp":1513589580090,"hash":"1c25fb2644fdd3c4df945dd13aae4ea5647ef140"}
\ No newline at end of file
diff --git a/workspace/Retro.3.md b/workspace/Retro.3.md
index dbe91f8170eff5eecd285d284f60e9d3aabc929d..ab934f156eef1d4a086a67c97643acdb22d9a447 100644
--- a/workspace/Retro.3.md
+++ b/workspace/Retro.3.md
@@ -12,16 +12,16 @@ LDG ?
## Remarque sur le sprint
-Sok : Pas trop le temps de travail sur le projet
-Ping : Pareil, voudrait plus de réu
- Plus de fonctionnalité du MVP qui ont été faite
-Gonzo : Apprécié les réunions, en demande plus (lundi en +)
- Plus de fonctionnalité qu'avant
-Magie : Bosse au début du sprint mais pas à la fin (manque de motivation)
-Parp1 : Pas mal de problème sur image (problème d'accès sur les images). Trop de temps passé dessus.
- Les fonctionnalité prenne plus de temps à être dev et on en a moins (projet école).
- Le projet à bien avancé
-Cartman : Plus de réu ça serait mieux (juste avant les démos ça serait cool).
+Sok : Pas trop le temps de travail sur le projet
+Ping : Pareil, voudrait plus de réu
+ Plus de fonctionnalité du MVP qui ont été faite
+Gonzo : Apprécié les réunions, en demande plus (lundi en +)
+ Plus de fonctionnalité qu'avant
+Magie : Bosse au début du sprint mais pas à la fin (manque de motivation)
+Parp3 : Pas mal de problème sur image (problème d'accès sur les images). Trop de temps passé dessus.
+ Les fonctionnalité prenne plus de temps à être dev et on en a moins (projet école).
+ Le projet à bien avancé
+Cartman : Plus de réu ça serait mieux (juste avant les démos ça serait cool).
##Les dislike sur le produit
diff --git a/workspace/Retro.4.md b/workspace/Retro.4.md
index 3f3fea49b5996e34b53fbd1c08900649a3fb7311..262dbc13f95101ac594ce3f9b75287e271a1f1f3 100644
--- a/workspace/Retro.4.md
+++ b/workspace/Retro.4.md
@@ -4,8 +4,8 @@
Sok : Réservation, recherche avancé
LDG : C'est bien (tout marche et c'est bien)
Gonzo : produit fonctionnel
-Magis : Ouai
-Parp1 : Plus de participation de tout le monde, toutes les US faites
+Magi : Ouai
+Parp4 : Plus de participation de tout le monde, toutes les US faites
Cartman : Le produit commence à avoir de la gueule
#dislike
@@ -17,3 +17,9 @@ Magis : Pareil, pas beaucoup de temps sur la PIMA
Parp1 : Mauvaise gestion du temps , pas assez de travail la première semaine
Cartman : On se marchait sur les pieds à un moment ralentit le dev parfois.
+#Solution pour dislike
+LDG : Revoir les séances PIMA, consacrer tout son temps à la PIMA (1 semaine ?)
+Gonzo : Pareil et on drop les autres projets
+Sok : Gestion du temps pour faire PIMA
+Magis : Pareil, revoir la gestion de PIMA
+Parp1 : Travailler d'avantage sur les précédent sprint pour éviter le rush final
diff --git a/workspace/reports/iteration_3.md b/workspace/reports/iteration_3.md
index e9b346d0f20e30c0027cc455b075f3798fa20607..8e6331218bec52d1ae1bc525da0f49a414905716 100644
--- a/workspace/reports/iteration_3.md
+++ b/workspace/reports/iteration_3.md
@@ -6,9 +6,9 @@
| | Itération précédente |
| ------------- |------------- |
| **Product Owner** | *AICHHORN Guillaume* |
-| **Scrum Master** | *ALVES Alexandre* |
+| **Scrum Master** | *ALIMEHENNI Hugues* |
| **Dev** | *KIM Hyoseok* |
-| **Dev** | *ALIMEHNNI Hugues* |
+| **Dev** | *ALVES Alexandre* |
| **Dev** | *SANN Sokchivin* |
| **Dev** | *BENCHETRIT Milan* |
| **Dev** | *MELCHIOR Louis* |
diff --git a/workspace/resources/views/user/user_show.blade.php b/workspace/resources/views/user/user_show.blade.php
index 2bdd6f1580dcc0c35061ff58f76aa9cf46b66ca5..586aefa40ba1a64061a6391656e4e0fb8589740e 100644
--- a/workspace/resources/views/user/user_show.blade.php
+++ b/workspace/resources/views/user/user_show.blade.php
@@ -178,6 +178,10 @@
</div>
+ @if($Myreservations != NULL)
+ {!! $Myreservations->links() !!}
+ @endif
+
@endif
@@ -236,6 +240,10 @@
<hr>
</div>
+ @if($reservations != NULL)
+ {!! $reservations->links() !!}
+ @endif
+
@endif