From 8b8b0861b1becbb39311461f549d3072575e4363 Mon Sep 17 00:00:00 2001 From: Lucas Mascaro Date: Thu, 3 Dec 2015 11:50:53 +0100 Subject: [PATCH 1/3] =?UTF-8?q?correction=20+=20impl=C3=A9mentation=20etBy?= =?UTF-8?q?Date=20RDV?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- login.php | 72 ------------------------------ repositories/repos/MedecinRepo.php | 2 +- repositories/repos/PatientRepo.php | 2 +- repositories/repos/RDVRepo.php | 6 ++- 4 files changed, 6 insertions(+), 76 deletions(-) delete mode 100755 login.php diff --git a/login.php b/login.php deleted file mode 100755 index 6edee3f..0000000 --- a/login.php +++ /dev/null @@ -1,72 +0,0 @@ - - - 1 && strlen($_POST['mail']) > 1 && strlen($_POST['password']) > 1 && strlen($_POST['co']) > 1; // si au moins 1 caractère - $usernameCheck = $postVariablesNEmpty && preg_match("/^[\w -]{3,10}$/i", $_POST['username']); // utilisateur -> "alphanum_- " -> 3 à 10 caractères - $mailCheck = $usernameCheck && preg_match("/^[\w\.-]+@[\w\.-]+\.[a-z]{2,4}$/i", $_POST['mail']); // mail -> bon format - $passwordCheck = $mailCheck && preg_match("/^[\w -]{8,50}$/i", $_POST['password']); // password -> "alphanum_- " -> 8 à 50 caractères - $coCheck = $passwordCheck && $_POST['co'] == 'Me connecter'; - -if( $coCheck ){ // si toutes les valeurs sont correctes - - $user = array(); // on définit l'utilisateur - $user['name'] = $_POST['username']; - $user['mail'] = $_POST['mail']; - $user['password'] = $_POST['password']; - $user['hash'] = sha1($_POST['password']); - -} - - -// retourne VRAI si l'utilisateur est connecté -function connected($user){ return ($user != null); } - -?> - - - - Tests php - - - - - - - - - - - - "; - - /* AFFICHAGE D'ERREURS */ - if( $postVariablesAreSet ){ // si formulaire soumis - if( !$postVariablesNEmpty ) - echo 'Certains champs requis sont vides.'; - elseif( !$usernameCheck ) - echo 'Nom d\'utilisateur incorrect. (3 car. min)'; - elseif( !$mailCheck ) - echo 'Adresse mail incorrecte.'; - elseif( !$passwordCheck ) - echo 'Mot de passe incorrect. (8 car. min)'; - elseif( connected($user) ) - echo 'Vous êtes connectés.'; - } - - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - - ?> - - - - \ No newline at end of file diff --git a/repositories/repos/MedecinRepo.php b/repositories/repos/MedecinRepo.php index 337753c..9b4d324 100644 --- a/repositories/repos/MedecinRepo.php +++ b/repositories/repos/MedecinRepo.php @@ -25,7 +25,7 @@ class MedecinRepo $req = $this->connexion->prepare('INSERT INTO Medecin VALUES (DEFAULT,:civilite,:prenom,:nom)'); $result = $req->execute(['civilite' => $civilite, 'nom' => $nom, - 'prenom' => $prenom)); + 'prenom' => $prenom]); if($result){return ['id' => $this->connexion->lastInsertId()];} else{return false;} } diff --git a/repositories/repos/PatientRepo.php b/repositories/repos/PatientRepo.php index 71cb119..7469a11 100644 --- a/repositories/repos/PatientRepo.php +++ b/repositories/repos/PatientRepo.php @@ -49,7 +49,7 @@ class PatientRepo public function updateMedecinTraitant($idPatient,$idMedecin){ $req = $this->connexion->prepare('UPDATE Patient SET MedecinTraitant = :medecin WHERE Id = :id'); - return $req->execute['medecin' => $idMedecin, + return $req->execute(['medecin' => $idMedecin, 'id' => $idPatient]); } diff --git a/repositories/repos/RDVRepo.php b/repositories/repos/RDVRepo.php index 9fa90a5..59cd643 100644 --- a/repositories/repos/RDVRepo.php +++ b/repositories/repos/RDVRepo.php @@ -22,8 +22,10 @@ class RDVRepo } public function getByDate($date){ - $date = date('o-m-d',$date); - $req = $this->connexion->prepare('SELECT * FROM RDV WHERE DATE(FROM_UNIXTIME(1449136444)) = :date'); + $date = date('o-m-d',$date); + $req = $this->connexion->prepare('SELECT * FROM RDV WHERE DATE(FROM_UNIXTIME(1449136444)) = :date'); + $req->execute(['date' => $date]); + return StaticRepo::delNumeric($req->fetchAll()); } public function delete($idRDV){ From 52f588c97d74b34054230dfb75cc303b0372e47e Mon Sep 17 00:00:00 2001 From: Lucas Mascaro Date: Thu, 3 Dec 2015 12:00:22 +0100 Subject: [PATCH 2/3] script d'import dans la BDD --- repositories/repos/PatientRepo.php | 2 ++ toBDD.php | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 toBDD.php diff --git a/repositories/repos/PatientRepo.php b/repositories/repos/PatientRepo.php index 7469a11..40b8cb6 100755 --- a/repositories/repos/PatientRepo.php +++ b/repositories/repos/PatientRepo.php @@ -23,6 +23,8 @@ class PatientRepo public function add($civilite,$prenom,$nom,$adresse,$ville,$codePostal,$dateNaissance,$lieuNaissance,$numSecu,$medecinTraitant = null){ + $dateNaissance = date('o-m-d',$dateNaissance); + $req = $this->connexion->prepare('INSERT INTO Patient VALUES (:civilite,:nom,:prenom,:adresse,:ville,:codePostal,:dateNaissance,:lieuNaissance,:numSecu,DEFAULT,:medecin)'); $result = $req->execute(['civilite' => $civilite, 'nom' => $nom, diff --git a/toBDD.php b/toBDD.php new file mode 100644 index 0000000..965b337 --- /dev/null +++ b/toBDD.php @@ -0,0 +1,21 @@ +add($patient['Civilite'], $patient['Prenom'], $patient['Nom']); +} + +foreach($jsonP as $patient){ + $repo->add($patient['Civilite'],$patient['Prenom'],$patient['Nom'],$patient['Adresse'],$patient['Ville'],$patient['CodePostal'],$patient['DateNaissance'],$patient['LieuNaissance'],$patient['NumSecuriteSociale'],$patient['MedecinTraitant']) +} \ No newline at end of file From c681bf4f669c387b2d06904ca05a74a846c8edc4 Mon Sep 17 00:00:00 2001 From: Lucas Mascaro Date: Thu, 3 Dec 2015 12:25:02 +0100 Subject: [PATCH 3/3] Corrections --- repositories/exemple_config.json | 6 +++--- repositories/repos/PatientRepo.php | 8 +++++--- repositories/repos/RDVRepo.php | 1 + toBDD.php | 15 +++++++++++---- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/repositories/exemple_config.json b/repositories/exemple_config.json index 8f65e65..f853bc6 100755 --- a/repositories/exemple_config.json +++ b/repositories/exemple_config.json @@ -1,6 +1,6 @@ { "host": "localhost", - "login": "php", - "password": "Qt358nUdyeTxLDM8", - "database": "projetphp" + "login": "login", + "password": "password", + "database": "DBName" } diff --git a/repositories/repos/PatientRepo.php b/repositories/repos/PatientRepo.php index 40b8cb6..2ff88f4 100755 --- a/repositories/repos/PatientRepo.php +++ b/repositories/repos/PatientRepo.php @@ -21,15 +21,17 @@ class PatientRepo } - public function add($civilite,$prenom,$nom,$adresse,$ville,$codePostal,$dateNaissance,$lieuNaissance,$numSecu,$medecinTraitant = null){ + public function add($civilite,$prenom,$nom,$adresse,$adresse2,$ville,$codePostal,$dateNaissance,$lieuNaissance,$numSecu,$medecinTraitant = null){ - $dateNaissance = date('o-m-d',$dateNaissance); + $dateNaissance = strtotime($dateNaissance); + $dateNaissance = Date('o-m-d',$dateNaissance); - $req = $this->connexion->prepare('INSERT INTO Patient VALUES (:civilite,:nom,:prenom,:adresse,:ville,:codePostal,:dateNaissance,:lieuNaissance,:numSecu,DEFAULT,:medecin)'); + $req = $this->connexion->prepare('INSERT INTO Patient VALUES (:civilite,:nom,:prenom,:adresse,:adresse2,:ville,:codePostal,:dateNaissance,:lieuNaissance,:numSecu,DEFAULT,:medecin)'); $result = $req->execute(['civilite' => $civilite, 'nom' => $nom, 'prenom' => $prenom, 'adresse' => $adresse, + 'adresse2' => $adresse2, 'ville' => $ville, 'codePostal' => $codePostal, 'dateNaissance' => $dateNaissance, diff --git a/repositories/repos/RDVRepo.php b/repositories/repos/RDVRepo.php index 59cd643..8b312f8 100755 --- a/repositories/repos/RDVRepo.php +++ b/repositories/repos/RDVRepo.php @@ -22,6 +22,7 @@ class RDVRepo } public function getByDate($date){ + $date = strtotime($date); $date = date('o-m-d',$date); $req = $this->connexion->prepare('SELECT * FROM RDV WHERE DATE(FROM_UNIXTIME(1449136444)) = :date'); $req->execute(['date' => $date]); diff --git a/toBDD.php b/toBDD.php index 965b337..1573d71 100644 --- a/toBDD.php +++ b/toBDD.php @@ -6,16 +6,23 @@ * Time: 11:52 */ +ini_set('display_errors',1); +ini_set('display_startup_errors',1); +error_reporting(-1); + require_once('autoloader.php'); -$jsonP = json_decode('Docs/PatientExemple.json',true); -$jsonM = json_decode('Docs/MedecinExemple.json',true); +$jsonP = json_decode(file_get_contents('Docs/PatientExemple.json'),true); +$jsonM = json_decode(file_get_contents('Docs/MedecinExemple.json'),true); + +var_dump(StaticRepo::testConnexion()); $repo = new PatientRepo(); +$repoM = new MedecinRepo(); foreach($jsonM as $patient) { - $repo->add($patient['Civilite'], $patient['Prenom'], $patient['Nom']); + $repoM->add($patient['Civilite'], $patient['Prenom'], $patient['Nom']); } foreach($jsonP as $patient){ - $repo->add($patient['Civilite'],$patient['Prenom'],$patient['Nom'],$patient['Adresse'],$patient['Ville'],$patient['CodePostal'],$patient['DateNaissance'],$patient['LieuNaissance'],$patient['NumSecuriteSociale'],$patient['MedecinTraitant']) + $repo->add($patient['Civilite'],$patient['Prenom'],$patient['Nom'],$patient['Adresse'],NULL,$patient['Ville'],$patient['CodePostal'],$patient['DateNaissance'],$patient['LieuNaissance'],$patient['NumSecuriteSociale'],$patient['MedecinTraitant']); } \ No newline at end of file