From cd5b95f364e260e702f0c93014f445db28c157cd Mon Sep 17 00:00:00 2001
From: rahassou <Rayhan.HASSOU@etu.uca.fr>
Date: Tue, 13 Dec 2022 21:57:30 +0100
Subject: [PATCH] ajouter tache et modifier liste marche

---
 src/modele/MdlVisiteur.php          |  3 ---
 src/modele/gateway/ListeGateway.php | 33 ++++++++++++++---------------
 src/modele/gateway/TacheGateway.php | 31 ++++++++++++++-------------
 src/vue/html/PageListePublic.php    | 20 ++++++++---------
 4 files changed, 42 insertions(+), 45 deletions(-)

diff --git a/src/modele/MdlVisiteur.php b/src/modele/MdlVisiteur.php
index 77aaac8..19c99ce 100755
--- a/src/modele/MdlVisiteur.php
+++ b/src/modele/MdlVisiteur.php
@@ -57,9 +57,6 @@ class MdlVisiteur
         $nom = Validation::cleanString($_POST['nom-modif-liste']);
         $description = Validation::cleanString($_POST['description-modif-liste']);
         if($description == NULL){
-            echo "$nom";
-            echo "$id";
-
             $userGtw->EditerNom($id, $nom);
         }
         else if($nom == NULL){
diff --git a/src/modele/gateway/ListeGateway.php b/src/modele/gateway/ListeGateway.php
index 405ed1f..096f81b 100755
--- a/src/modele/gateway/ListeGateway.php
+++ b/src/modele/gateway/ListeGateway.php
@@ -8,36 +8,35 @@ class ListeGateway{
     }
 
     public function Ajouter(string $nom,  Date $dateCreation, bool $estValide, int $idCreateur, bool $estPublic){
-    	$query='INSERT INTO ToDoList_Liste(nom, dateCreation,estValide, createur, estPublic) VALUES(:nom, :dateCreation, :estValide, :idCreateur, :estPublic)';
-        $this->con->executeQuery($query, array('nom' => array($nom, PDO::PARAM_STR)),
-                                        array('dateCreation' => array($dateCreation, PDO::PARAM_STR)),
-                                        array('estValide' => array($estValide, PDO::PARAM_BOOL)),
-                                        array('idCreateur' => array($idCreateur, PDO::PARAM_INT)),
-                                        array('estPublic' => array($estPublic, PDO::PARAM_INT)));
+    	$query='INSERT INTO ToDoList_Liste(nom, dateCreation,estValide, createur, estPublic) VALUES(:nom, :dateCreation, :estValide, :idCreateur, :estPublic);';
+        $this->con->executeQuery($query, array(
+                                        'nom' => array($nom, PDO::PARAM_STR),
+                                        'dateCreation' => array($dateCreation, PDO::PARAM_STR),
+                                        'estValide' => array($estValide, PDO::PARAM_BOOL),
+                                        'idCreateur' => array($idCreateur, PDO::PARAM_INT),
+                                        'estPublic' => array($estPublic, PDO::PARAM_INT)));
     }
 
     public function Editer(string $id, string $nom, string $description){
-    	$query='UPDATE ToDoList_Liste SET nom=:nom AND description=:description WHERE id=:id';
-    	$this->con->executeQuery($query, array('nom' => array($nom, PDO::PARAM_STR)), 
-            array('id' => array($id),PDO::PARAM_INT),
-            array('description' => array($description, PDO::PARAM_STR))
+    	$query='UPDATE ToDoList_Liste SET nom=:nom AND description=:description WHERE id=:id;';
+    	$this->con->executeQuery($query, array(
+            'nom' => array($nom, PDO::PARAM_STR), 
+            'id' => array($id,PDO::PARAM_INT),
+            'description' => array($description, PDO::PARAM_STR))
         );
     }
 
     public function EditerNom(string $id, string $nom){
-        $query='UPDATE ToDoList_Liste SET nom=:nom WHERE id=:id';
-
+        $query='UPDATE ToDoList_Liste SET nom=:nom WHERE id=:id;';
 
 // erreur iciiiiiiii
-        $this->con->executeQuery($query, 
-            array('nom' => array($nom, PDO::PARAM_STR)),
-            array('id' => array($id, PDO::PARAM_INT)));
+        $this->con->executeQuery($query, array('nom' => array($nom, PDO::PARAM_STR),'id' => array($id, PDO::PARAM_INT)));
 
     }
 
      public function EditerDescription(string $id, string $description){
-        $query='UPDATE ToDoList_Liste SET description=:description WHERE id=:id';
-        $this->con->executeQuery($query, array('description' => array($description, PDO::PARAM_STR)), array('id' => array($id, PDO::PARAM_INT)));
+        $query='UPDATE ToDoList_Liste SET description=:description WHERE id=:id;';
+        $this->con->executeQuery($query, array('description' => array($description, PDO::PARAM_STR), 'id' => array($id, PDO::PARAM_INT)));
     }
 
     public function Supprimer(string $id){
diff --git a/src/modele/gateway/TacheGateway.php b/src/modele/gateway/TacheGateway.php
index 6ee1c08..7eeb072 100755
--- a/src/modele/gateway/TacheGateway.php
+++ b/src/modele/gateway/TacheGateway.php
@@ -8,41 +8,42 @@ class TacheGateway{
 
 
     public function AjouterTache(string $nom, string $description, bool $estValide, string $idListe){
-        $query='INSERT INTO ToDoList_Tache(nom, description, dateCreation,estValide, idListe) VALUES(:nom, :description, CURRENT_DATE, :estValide, ;idListe)';
-        $this->con->executeQuery($query, array('nom' => array($nom, PDO::PARAM_STR)),
-        array('description' => array($description, PDO::PARAM_STR)),
-        array('estValide' => array($estValide, PDO::PARAM_BOOL)),
-        array('idListe' => array($idListe, PDO::PARAM_INT)));
+        $query='INSERT INTO ToDoList_Tache(nom, description, dateCreation,estValide, idListe) VALUES(:nom, :description, CURRENT_DATE, :estValide, :idListe);';
+        $this->con->executeQuery($query, array(
+        'nom' => array($nom, PDO::PARAM_STR),
+        'description' => array($description, PDO::PARAM_STR),
+        'estValide' => array($estValide, PDO::PARAM_BOOL),
+        'idListe' => array($idListe, PDO::PARAM_INT)));
     }
 
     public function Editer(string $id, string $nom, string $description){
-    	$query='UPDATE ToDoList_Tache SET  nom=:nom, description =:description WHERE id=:id';
-    	$this->con->executeQuery($query, array('nom' => array($nom, PDO::PARAM_STR)), array('description' => array($description, PDO::PARAM_STR)), array('id' => array($id, PDO::PARAM_INT)));
+    	$query='UPDATE ToDoList_Tache SET  nom=:nom, description =:description WHERE id=:id;';
+    	$this->con->executeQuery($query, array('nom' => array($nom, PDO::PARAM_STR), 'description' => array($description, PDO::PARAM_STR), 'id' => array($id, PDO::PARAM_INT)));
     }
 
     public function EditerNom(string $id, string $nom){
-        $query='UPDATE ToDoList_Tache SET  nom=:nom WHERE id=:id';
-        $this->con->executeQuery($query, array('nom' => array($nom, PDO::PARAM_STR)), array('id' => array($id, PDO::PARAM_INT)));
+        $query='UPDATE ToDoList_Tache SET  nom=:nom WHERE id=:id;';
+        $this->con->executeQuery($query, array('nom' => array($nom, PDO::PARAM_STR), 'id' => array($id, PDO::PARAM_INT)));
     }
 
      public function EditerDescription(string $id, string $description){
-        $query='UPDATE ToDoList_Tache SET  description=:description WHERE id=:id';
-        $this->con->executeQuery($query, array('description' => array($description, PDO::PARAM_STR)), array('id' => array($id, PDO::PARAM_INT)));
+        $query='UPDATE ToDoList_Tache SET  description=:description WHERE id=:id;';
+        $this->con->executeQuery($query, array('description' => array($description, PDO::PARAM_STR), 'id' => array($id, PDO::PARAM_INT)));
     }
 
     public function Supprimer(string $id){
-        $query='DELETE FROM ToDoList_Tache WHERE id=:id';
+        $query='DELETE FROM ToDoList_Tache WHERE id=:id;';
         $this->con->executeQuery($query,array('id' => array($id, PDO::PARAM_INT)));
     }
 
     // Si une liste est supprimée on supprime toutes ces tâches grâce à cette fonction
     public function SupprimerViaListe(string $id){
-        $query='DELETE FROM ToDoList_Tache WHERE idListe=:id';
+        $query='DELETE FROM ToDoList_Tache WHERE idListe=:id;';
         $this->con->executeQuery($query,array('id' => array($id, PDO::PARAM_INT)));
     }
 
     public function getTache(){
-        $query='SELECT * FROM ToDoList_Tache';
+        $query='SELECT * FROM ToDoList_Tache;';
          $this->con->executeQuery($query);
         $taches = [];
         foreach ($this->con->getResults() as $tache) {
@@ -52,7 +53,7 @@ class TacheGateway{
     }
 
     public function isDone(string $id){
-        $query = 'UPDATE ToDoList_Tache SET estValide = !estValide WHERE id=:id';
+        $query = 'UPDATE ToDoList_Tache SET estValide = !estValide WHERE id=:id;';
         $this->con->executeQuery($query, array('id' => array($id, PDO::PARAM_STR)));
     }
 }
diff --git a/src/vue/html/PageListePublic.php b/src/vue/html/PageListePublic.php
index 3613189..dea2c5f 100755
--- a/src/vue/html/PageListePublic.php
+++ b/src/vue/html/PageListePublic.php
@@ -41,7 +41,7 @@
                       <img src="./vue/Images/edit.png" width="20" />
                     </button>
        
-                   <button data-toggle="modal" data-target="#formulaireAjout" class="btn btn-default">
+                   <button data-toggle="modal" data-target="#formulaireAjout<?= $liste->getId()?>" class="btn btn-default">
                       <img src="./vue/Images/plus.png" width="20" />
                   </button>
                 </span>
@@ -54,27 +54,27 @@
             <!-- Fenetre modal -->
 
             <div class="container">
-                <div class="modal fade" id="formulaireModif<?= $liste->getId()?>">
+                <div class="modal fade" id="formulaireAjout<?= $liste->getId()?>">
                   <div class="modal-dialog">
                     <div class="modal-content">
                       <div class="modal-header">
-                        <h4 class="modal-title">Modification</h4>              
+                        <h4 class="modal-title">Ajout d'une tache</h4>              
                         <button type="button" class="close" data-dismiss="modal">
                           <span>&times;</span>
                         </button>
                       </div>
                       <div class="modal-body row">
-                        <form class="col" method="POST" action="index.php?action=ModifierListe&idListe=<?= $liste->getId() ?>">
+                        <form class="col" method="POST" action="index.php?action=AjouterTache&idListe=<?= $liste->getId() ?>">
                           <div class="form-group">
-                            <label for="nom" class="form-control-label">Nouveau nom</label>
-                            <input type="text" class="form-control" name ="nom-modif-liste" id="nom" placeholder="<?= $liste->getNom() ?>">
+                            <label for="nom" class="form-control-label">Nom</label>
+                            <input type="text" class="form-control" name ="nom-ajout" id="nom" placeholder="Entrez un nom">
                           </div>
                           <div class="form-group">
-                            <label for="description" class="form-control-label">Nouvelle description</label>
-                            <input type="text" class="form-control" name="description-modif-liste" id="description" placeholder="<?= $liste->getDescription() ?>">
+                            <label for="description" class="form-control-label">Description</label>
+                            <input type="text" class="form-control" name="description-ajout" id="description" placeholder="Entrez une description">
                           </div>
-                          <button type="submit" class="btn btn-primary pull-right">Modifier</button>
-                          <input type="hidden" name="action" value="ModifierListe">
+                          <button type="submit" class="btn btn-primary pull-right">Ajouter</button>
+                          <input type="hidden" name="action" value="AjouterTache">
                           <input type="hidden" name="idListe" value="<?= $liste->getId() ?>">
                         </form>
                       </div>