diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/dbemkartal1.sql b/dbemkartal1.sql old mode 100644 new mode 100755 diff --git a/doc/BDD/Mld.drawio b/doc/BDD/Mld.drawio old mode 100644 new mode 100755 diff --git a/doc/BDD/Mld.png b/doc/BDD/Mld.png old mode 100644 new mode 100755 diff --git a/doc/Diagramme De Cas D'utilisation/DDCD.drawio b/doc/Diagramme De Cas D'utilisation/DDCD.drawio old mode 100644 new mode 100755 diff --git a/doc/Diagrammes/DiagrammeClasse.drawio b/doc/Diagrammes/DiagrammeClasse.drawio old mode 100644 new mode 100755 diff --git a/doc/Diagrammes/DiagrammeClasse.png b/doc/Diagrammes/DiagrammeClasse.png old mode 100644 new mode 100755 diff --git a/src/.htaccess b/src/.htaccess old mode 100644 new mode 100755 diff --git a/src/config/.DS_Store b/src/config/.DS_Store old mode 100644 new mode 100755 diff --git a/src/config/Connection.php b/src/config/Connection.php old mode 100644 new mode 100755 diff --git a/src/config/Validation.php b/src/config/Validation.php index e79c088..8af36f8 100755 --- a/src/config/Validation.php +++ b/src/config/Validation.php @@ -53,6 +53,7 @@ class Validation { } + static function cleanString(string &$str) { $str = preg_replace('/[^A-Za-z\-]/', '', $str); if($str == null || $str == '') diff --git a/src/controller/CtrlAdmin.php b/src/controller/CtrlAdmin.php old mode 100644 new mode 100755 diff --git a/src/controller/CtrlUtilisateur.php b/src/controller/CtrlUtilisateur.php old mode 100644 new mode 100755 diff --git a/src/controller/CtrlVisiteur.php b/src/controller/CtrlVisiteur.php old mode 100644 new mode 100755 index e9a6c19..91ad586 --- a/src/controller/CtrlVisiteur.php +++ b/src/controller/CtrlVisiteur.php @@ -49,10 +49,22 @@ class CtrlVisiteur { $this->SupprimerListe(); break; + case "AjouterTache": + $this->AjouterTache(); + break; + + case "ModifierListe": + $this->ModifierListe(); + break; + + case "check": + $this->check(); + break; + //mauvaise action default: $dVueEreur[] = "Erreur d'appel php"; - require ($rep.$vues['home']); + require ($rep.$vues['listPublic']); break; } @@ -138,6 +150,34 @@ class CtrlVisiteur { require ($rep.$vues['listPublic']); } + + public function AjouterTache(){ + global $rep,$vues; + $tache = MdlVisiteur::AjouterTache(); + $listes = MdlVisiteur::RecupererListePublic(); + $taches = MdlVisiteur::RecupererTache(); + $action=NULL; + require ($rep.$vues['listPublic']); + } + + public function ModifierListe(){ + global $rep,$vues; + $tache = MdlVisiteur::ModifierListe(); + $listes = MdlVisiteur::RecupererListePublic(); + $taches = MdlVisiteur::RecupererTache(); + $action=NULL; + require ($rep.$vues['listPublic']); + } + + public function check() + { + global $rep,$vues; + $tache = MdlVisiteur::check(); + $listes = MdlVisiteur::RecupererListePublic(); + $taches = MdlVisiteur::RecupererTache(); + $action=NULL; + require ($rep.$vues['listPublic']); + } }//fin class ?> diff --git a/src/controller/FrontControleur.php b/src/controller/FrontControleur.php old mode 100644 new mode 100755 index ffd4492..d1f150f --- a/src/controller/FrontControleur.php +++ b/src/controller/FrontControleur.php @@ -28,7 +28,7 @@ class FrontControleur { // } // else new CtrlVisiteur(); - + echo "coucou"; } catch (Exception $e) { $dVueEreur[] = "Erreur inattendue!!! "; diff --git a/src/modele/MdlAdmin.php b/src/modele/MdlAdmin.php old mode 100644 new mode 100755 diff --git a/src/modele/MdlUtilisateur.php b/src/modele/MdlUtilisateur.php old mode 100644 new mode 100755 diff --git a/src/modele/MdlVisiteur.php b/src/modele/MdlVisiteur.php old mode 100644 new mode 100755 index b5a2bdb..77aaac8 --- a/src/modele/MdlVisiteur.php +++ b/src/modele/MdlVisiteur.php @@ -28,7 +28,7 @@ class MdlVisiteur $userGtw = new TacheGateway(); return $userGtw->getTache(); } - + public static function SupprimerTache(){ $userGtw = new TacheGateway(); $id = $_GET['idTache']; @@ -43,4 +43,37 @@ class MdlVisiteur $userGtw->Supprimer($id); } + public function AjouterTache(){ + $taskGtw = new TacheGateway(); + $id = $_POST['idListe']; + $nom = Validation::cleanString($_POST['nom-ajout']); + $description = Validation::cleanString($_POST['description-ajout']); + $taskGtw->AjouterTache($nom, $description,false,$id); + } + + public function ModifierListe(){ + $userGtw = new ListeGateway(); + $id = $_POST['idListe']; + $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){ + $userGtw->EditerDescription($id, $description); + } + else{ + $userGtw->Editer($id, $nom, $description); + } + } + + public function check(){ + $taskGtw = new TacheGateway(); + $id = $_POST['idTache']; + $taskGtw->isDone($id); + } + } diff --git a/src/modele/gateway/ListeGateway.php b/src/modele/gateway/ListeGateway.php old mode 100644 new mode 100755 index 17752d3..405ed1f --- a/src/modele/gateway/ListeGateway.php +++ b/src/modele/gateway/ListeGateway.php @@ -9,19 +9,38 @@ 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_STRING)), - array('dateCreation' => array($dateCreation, PDO::PARAM_STRING)), + $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))); } - public function Editer(Liste $Liste){ - $query='UPDATE ToDoList_Liste SET nom=:nom WHERE id=:id'; - $this->con->executeQuery($query, array('nom' => array($Liste->getNom(), PDO::PARAM_STRING)), array('id' => array($Liste->getId()),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)) + ); } - public function Supprimer(int $id){ + public function EditerNom(string $id, string $nom){ + $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))); + + } + + 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))); + } + + public function Supprimer(string $id){ $query="DELETE FROM ToDoList_Liste WHERE id=:id"; $this->con->executeQuery($query,array('id' => array($id, PDO::PARAM_INT))); } diff --git a/src/modele/gateway/TacheGateway.php b/src/modele/gateway/TacheGateway.php old mode 100644 new mode 100755 index 20a7268..6ee1c08 --- a/src/modele/gateway/TacheGateway.php +++ b/src/modele/gateway/TacheGateway.php @@ -6,18 +6,28 @@ class TacheGateway{ $this->con=new Connection($dsn,$user,$pass); } - public function Ajouter(string $nom, string $description, Date $dateCreation, bool $estValide, int $idCreateur){ - $query='INSERT INTO ToDoList_Tache(nom, description, dateCreation,estValide, createur) VALUES(:nom, :description, :dateCreation, :estValide, :idCreateur)'; - $this->con->executeQuery($query, array('nom' => array($nom, PDO::PARAM_STRING)), - array('description' => array($description, PDO::PARAM_STRING)), - array('dateCreation' => array($dateCreation, PDO::PARAM_STRING)), + + 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('idCreateur' => array($idCreateur, PDO::PARAM_INT))); + array('idListe' => array($idListe, PDO::PARAM_INT))); } - public function Editer(Tache $tache, string $nom, string $description){ + 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($tache->getNom(), PDO::PARAM_STRING)), array('description' => array($tache->getdescription(), PDO::PARAM_STRING)), array('id' => array($tache->getId(),PDO::PARAM_INT))); + $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))); + } + + 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))); + } + + 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))); } public function Supprimer(string $id){ @@ -40,5 +50,10 @@ class TacheGateway{ } return $taches; } + + public function isDone(string $id){ + $query = 'UPDATE ToDoList_Tache SET estValide = !estValide WHERE id=:id'; + $this->con->executeQuery($query, array('id' => array($id, PDO::PARAM_STR))); + } } ?> \ No newline at end of file diff --git a/src/modele/gateway/UtilisateurGateway.php b/src/modele/gateway/UtilisateurGateway.php old mode 100644 new mode 100755 diff --git a/src/modele/metier/Liste.php b/src/modele/metier/Liste.php old mode 100644 new mode 100755 diff --git a/src/modele/metier/Tache.php b/src/modele/metier/Tache.php old mode 100644 new mode 100755 diff --git a/src/modele/metier/Utilisateur.php b/src/modele/metier/Utilisateur.php old mode 100644 new mode 100755 diff --git a/src/vue/Images/Logo.png b/src/vue/Images/Logo.png old mode 100644 new mode 100755 diff --git a/src/vue/Images/LogoForHome.png b/src/vue/Images/LogoForHome.png old mode 100644 new mode 100755 diff --git a/src/vue/Images/c.gif b/src/vue/Images/c.gif new file mode 100755 index 0000000..57b41f2 Binary files /dev/null and b/src/vue/Images/c.gif differ diff --git a/src/vue/Images/check.gif b/src/vue/Images/check.gif new file mode 100755 index 0000000..4ebc7bf Binary files /dev/null and b/src/vue/Images/check.gif differ diff --git a/src/vue/Images/edit.png b/src/vue/Images/edit.png old mode 100644 new mode 100755 diff --git a/src/vue/Images/gif.gif b/src/vue/Images/gif.gif old mode 100644 new mode 100755 diff --git a/src/vue/Images/plus.png b/src/vue/Images/plus.png new file mode 100755 index 0000000..6a22172 Binary files /dev/null and b/src/vue/Images/plus.png differ diff --git a/src/vue/Images/trash.png b/src/vue/Images/trash.png old mode 100644 new mode 100755 diff --git a/src/vue/css/reset.css b/src/vue/css/reset.css old mode 100644 new mode 100755 diff --git a/src/vue/css/style.css b/src/vue/css/style.css old mode 100644 new mode 100755 diff --git a/src/vue/html/NavBar.php b/src/vue/html/NavBar.php old mode 100644 new mode 100755 diff --git a/src/vue/html/PageListePublic.php b/src/vue/html/PageListePublic.php old mode 100644 new mode 100755 index a5218d8..3613189 --- a/src/vue/html/PageListePublic.php +++ b/src/vue/html/PageListePublic.php @@ -1,7 +1,7 @@ - + Home Page @@ -18,13 +18,17 @@ + + +
-

getNom()?> @@ -33,23 +37,100 @@ - + +

-

getDescription()?> -

getDateCreation()?>

+

getDescription()?> +

getDateCreation()?>

+
+ + + + +
+ +
+
+
+ +
    getIdListe() == $liste->getId()){ + if($tache->getEstValide() == 1){ + $done = $done + 1; + } + $total = $total + 1; ?>
  • - +
    + getEstValide() == 1) echo "checked" ?>> + +
    getNom() ?> : getDescription() ?> @@ -68,6 +149,16 @@ ?>
+
+ +
%;">
+
@@ -76,7 +167,6 @@ } ?> -