diff --git a/ensiie-project/src/Controller/set_utilisateur.php b/ensiie-project/src/Controller/set_utilisateur.php
index 8c196a33cddc66b96619c258179bd48609887000..5b965ed7105e28b0aec3b19354a9e7f988ec9b61 100644
--- a/ensiie-project/src/Controller/set_utilisateur.php
+++ b/ensiie-project/src/Controller/set_utilisateur.php
@@ -5,17 +5,41 @@ if (isset($_SESSION['login']))
//$db_utilisateur = NULL; // TODO Appel à la base pour récupérer l'utilisateur selon son ariseID = $_SESSION['login']
//$utilisateur = new Utilisateur($db_utilisateur['ariseID'],$db_utilisateur['prenom'],$db_utilisateur['nom'],$db_utilisateur['pseudo'],$db_utilisateur['isAdmin'],$db_utilisateur['commandes']);
+ //Bouffe de test
+ $special0 = new Special(0,"Sauce",0,"blanche");
+ $special1 = new Special(1,"Sauce",0,"barbecue");
+ $special2 = new Special(2,"Viande",1,"cordon bleu");
+ $special3 = new Special(3,"Sauce",0,"caramel");
+ $special4 = new Special(4,"Parfum",2,"daim");
+
+ $nourriture0 = new Nourriture(0,"Pizza",0,"raclette","pizza hut",0,"9€","8€");
+ $nourriture1 = new Nourriture(1,"Dessert",1,"McFlurry","McDonald",1,"4.50€","4€");
+ $nourriture2 = new Nourriture(2,"Boisson",2,"Coca Cola","McdDonald",1,"1.50€","1€");
+ $nourriture3 = new Nourriture(3,"Tacos",3,"Taille M","O'bigDelice",2,"5.5€","5€");
+
+ $menu0 = new Menu(0,$nourriture0,array());
+ $menu1 = new Menu(1,$nourriture1,array($special3,$special4));
+ $menu2 = new Menu(2,$nourriture2,array());
+ $menu3 = new Menu(3,$nourriture3,array($special0,$special1,$special2));
+
+
+
if ($_SESSION['login'] == "begue2018")
{
- $utilisateur = new Utilisateur($_SESSION['login'],"Olivier","BEGUE","Jed",FALSE,array());
+ $commande0 = new Commande(0,0,"2019-04-04 18:25:10.0",FALSE,array($menu0,$menu2));
+ $utilisateur = new Utilisateur($_SESSION['login'],"Olivier","BEGUE","Jed",FALSE,array($commande0));
}
elseif ($_SESSION['login'] == "gabbay2018")
{
- $utilisateur = new Utilisateur($_SESSION['login'],"Milan","GABBAY","Jalik",TRUE,array());
+ $commande1 = new Commande(1,1,"2019-04-04 18:25:10.0",FALSE,array($menu3));
+ $utilisateur = new Utilisateur($_SESSION['login'],"Milan","GABBAY","Jalik",TRUE,array($commande1,$commande1));
}
elseif ($_SESSION['login'] == "invite")
{
- $utilisateur = new Utilisateur($_SESSION['login'],"","","Invité",FALSE,array());
+ $commande2 = new Commande(2,2,"2019-04-04 18:25:10.0",FALSE,array($menu0,$menu2));
+ $commande3 = new Commande(3,2,"2019-04-04 18:25:10.0",FALSE,array($menu1));
+ $commande4 = new Commande(4,2,"2019-04-04 18:25:10.0",FALSE,array($menu3));
+ $utilisateur = new Utilisateur($_SESSION['login'],"","","Invité",FALSE,array($commande2,$commande3,$commande4));
}
else
{
diff --git a/ensiie-project/src/Model/Classes/Commande.php b/ensiie-project/src/Model/Classes/Commande.php
index 81f99cfbf4325883b1873ebc6c9617eac57b503a..654cc5041c12e1423686158fe5c7450d700b6b14 100644
--- a/ensiie-project/src/Model/Classes/Commande.php
+++ b/ensiie-project/src/Model/Classes/Commande.php
@@ -25,7 +25,7 @@ class Commande
/**
* @var array<Menu> Le tableau qui contient les différents menus
*/
- private $menus;
+ private $menus = array();
/**
* Constructeur valué
*/
@@ -65,7 +65,16 @@ class Commande
public function addMenus($menu){
array_push($this->menus, $menu);
- }
+ }
+
+ public function toString(){
+ $str = "";
+ foreach($this->getMenus() as $menu)
+ {
+ $str = $str."-".$menu->toString()."<br/>";
+ }
+ return $str;
+ }
}
?>
\ No newline at end of file
diff --git a/ensiie-project/src/Model/Classes/Menu.php b/ensiie-project/src/Model/Classes/Menu.php
index 2306d01d903f508d295b621b8a756cdf17b91183..b2041ee5abbe10d9794e4ecbaf3e69f035a20f6d 100644
--- a/ensiie-project/src/Model/Classes/Menu.php
+++ b/ensiie-project/src/Model/Classes/Menu.php
@@ -58,6 +58,16 @@ class Menu
$this->specials = $specials;
}
+ public function toString()
+ {
+ $str = "";
+ $str = $str.$this->getNourriture()->toString();
+ foreach($this->getSpecials() as $special)
+ {
+ $str = $str.", ".$special->toString();
+ }
+ return $str;
+ }
}
?>
\ No newline at end of file
diff --git a/ensiie-project/src/Model/Classes/Nourriture.php b/ensiie-project/src/Model/Classes/Nourriture.php
index d6198e9a5a9c6ed2e978cac5182d8e6c0353ee17..4ef85a681e38746638d80e0c1a4190ed06a57f29 100644
--- a/ensiie-project/src/Model/Classes/Nourriture.php
+++ b/ensiie-project/src/Model/Classes/Nourriture.php
@@ -1,5 +1,4 @@
<?php
-namespace Nourriture;
class Nourriture
{
@@ -48,7 +47,7 @@ class Nourriture
/**
* Constructeur valué
*/
- public function __construct($idNourriture,$type,$idType, $nom, $nomPart, $idPart, $prixIIENs, $prixLP)
+ public function __construct($idNourriture,$type,$idType, $nom, $nomPart, $idPart, $prixIIENS, $prixLP)
{
$this->idNourriture = $idNourriture;
$this->type = $type;
@@ -98,6 +97,13 @@ class Nourriture
{
return $this->prixLP;
}
+
+ public function toString()
+ {
+ $str = "";
+ $str = $str.$this->getType()." ".$this->getNom();
+ return $str;
+ }
}
?>
\ No newline at end of file
diff --git a/ensiie-project/src/Model/Classes/Special.php b/ensiie-project/src/Model/Classes/Special.php
index ddaaa4b9afef1c827bc3ece95e5aa289111c9905..644554f8a2aa6ffcea1e4512dff6c743bde49ad2 100644
--- a/ensiie-project/src/Model/Classes/Special.php
+++ b/ensiie-project/src/Model/Classes/Special.php
@@ -1,5 +1,4 @@
<?php
-namespace Special;
class Special
{
@@ -59,5 +58,10 @@ class Special
{
return $this->nom;
}
+
+ public function toString()
+ {
+ return $this->getNom();
+ }
}
?>
\ No newline at end of file
diff --git a/ensiie-project/src/View/commande_finie.php b/ensiie-project/src/View/commande_finie.php
index c61458159cddba41a902c0f7dbbcb9f5a736e153..1ffb51e5239c1986fd3d13f57f291e10f13f6ca5 100644
--- a/ensiie-project/src/View/commande_finie.php
+++ b/ensiie-project/src/View/commande_finie.php
@@ -1,20 +1,19 @@
<!DOCTYPE html>
<html>
<body>
+<div class="panel panel-default">
<?php
-
foreach($utilisateur->getCommandes() as $commande){
?>
- <div class="truc">
- <?php
- foreach($commande->getMenus() as $menu)
- {?>
- <p>Vous avez commandé : <?php echo $menu->getNourriture()->getNom().', '.$menu->getSpecial()->getType().' '.$menu->getSpecial()->getNom()?></p>
- <?php
- }?>
+ <div class="panel-body">
+ <div class="text-left">
+ Vous avez commandé : </br><?php echo $commande->toString();?>
+ </div>
</div>
- <?php
+<?php
}
?>
+</div>
+</hr>
</body>
</html>