fixed merge conflicts

visitor-controller
Nicolas FRANCO 2 years ago
commit 3c93d6e282

@ -4,5 +4,7 @@
$rep=__DIR__.'/../';
$con = new Connection('mysql:host=localhost;dbname=phpproject', 'nifranco', 'achanger');
//$con = new Connection('mysql:host=localhost;dbname=dbanboudoul', 'anboudoul', 'achanger');
//$con = new Connection('mysql:host=localhost;dbname=dbanboudoul', 'anboudoul', 'mdpMYSQL');
$TMessage = array();
?>

@ -1,38 +0,0 @@
<?php
class CtrlUser{
function __construct(){
$rep=__DIR__.'/../';
$dVueErreur = array ();
try{
$action=$_REQUEST['action'];
switch($action) {
case NULL:
$this->Reinit();
break;
case "validationFormulaire":
$this->ValidationFormulaire($dVueEreur);
break;
//mauvaise action
default:
$dVueEreur[] = "Erreur d'appel php";
require ($rep.$vues['vuephp1']);
break;
}
} catch (PDOException $e)
{
//si erreur BD, pas le cas ici
$dVueEreur[] = "Erreur inattendue!!! ";
require ($rep.$vues['erreur']);
}
catch (Exception $e2)
{
$dVueEreur[] = "Erreur inattendue!!! ";
require ($rep.$vues['erreur']);
}
exit(0);
}
}
?>

@ -1,7 +1,7 @@
<?php
require("model/UserModel.php");
class FrontController
class FrontCtrl
{
private UserModel $usrMdl;
private $action_User;

@ -1,45 +1,63 @@
<?php
require_once("../model/TaskModel.php");
class UserCtrl
{
private $model;
private $view;
private $con;
private $taskModel;
private $userModel;
public function __construct(Connection $con){
$this->con = $con;
$this->model = new UserModel($this->con);
try{
$action=$_REQUEST['action'];
switch($action){
// voir les listes privees
case 'voir_liste_priv':
$this->loadListePriv();
break;
// ajouter une liste privee
case 'creer_liste_priv':
$this->newListPrivate();
break;
}
} catch(Exception $e) {
require("../view/erreur.php");
}
$this->userModel = new UserModel($this->con);
$this->taskModel = new TaskModel($this->con);
// try{
// $action=$_REQUEST['action'];
// switch($action){
// // voir les listes privees
// case 'voirListePriv':
// $this->loadListePriv();
// break;
// // ajouter une liste privee
// case 'creerListePriv':
// $this->newListPrivate();
// break;
// case 'deconnecter':
// $this->deconnexion();
// break;
// }
// } catch(Exception $e) {
// require("../view/erreur.php");
// }
}
public function loadListePriv(){
$name = "Liste privée";
$TabList = array();
// $TabList[] = new ListTask(0, "Projet PHP");
// $TabList[] = new ListTask(1, "Projet Blazor");
$TabListPriv = $this->model->getPrivateList();
$TabList = $this->taskModel->loadPrivateLists($_SESSION['login']);
require("../view/liste.php");
}
public function newListPrivate(){
$nom=$_POST['listeNom'];
insertL(new ListTask(0, $nom, $_SESSION['login']));
// $nom = "New List";
$this->taskModel->addList($nom,$_SESSION['login']);
}
function loadHome(){
$user = false;
$public_lists = $this->taskModel->loadPublicLists();
require("../view/home.php");
}
public function deconnexion(){
$usrModel->deconnexion();
loadHome();
}
}
?>

@ -56,6 +56,7 @@ class TaskGateway
# une fois pour prendre toutes les listes qui ont l'id de l'user
# pour toutes ces listes (foreach), find toutes chaque tache associé
public function find($table, $element="", $valeur=""){
$tabResult = array();
if($table =='task'){
if(strcmp($element,"")==0)
{
@ -75,7 +76,7 @@ class TaskGateway
$tabTaches[]=new Task($row['titre'],$row['description'],$row['priorite'],
$row['idList'],$row['dateDebut'],$row['dateFin'],$row['isDone'],$row['id']);
}
return $tabTaches;
return $tabResult;
} else if($table == 'list'){
if(strcmp($element,"")==0)
@ -95,10 +96,13 @@ class TaskGateway
{
$tabList[]=new ListTask($row['nom'],$row['user'],$row['dc'],$row['id']);
}
return $tabList;
return $tabResult;
}
}
// SELECT tache.id FROM Tache tache, Liste liste
// tache.idListe = liste.id AND liste.user IS NULL;
/* # LIST FUNCTIONS */
/*create, update, delete, read(select info)*/
public function insertL(ListTask $l){
@ -119,7 +123,7 @@ class TaskGateway
$this->con->executeQuery($query, array(
':user' => array($user,PDO::PARAM_STR)
));
$tabLists = array();
$results = $this->con->getResults();
foreach($results as $row){
$tabLists[]= new ListTask($row[1],$row[2],$row[3],$row[0]);
@ -149,6 +153,7 @@ class TaskGateway
$query='SELECT * from uList where user is NULL';
$this->con->executeQuery($query);
$tabLists = array();
$results = $this->con->getResults();
foreach($results as $row){
$tabLists[]= new ListTask($row[1],$row[2],$row[3],$row[0]);

@ -1,7 +1,8 @@
<?php
require(__DIR__.'/config/config.php');
require(__DIR__.'/controller/FrontCtrl.php');
require_once("config/config.php");
require_once("controller/FrontCtrl.php");
$fc = new FrontCtrl($con);
$front = new FrontController($con);
?>

@ -1,4 +1,4 @@
<?php
static $user = 'nifranco';
static $pass = 'achanger';
static $user = 'anboudoul';
static $pass = 'mdpMYSQL';
?>

@ -12,12 +12,12 @@ require_once("../controller/VisitorCtrl.php");
# connection
include("credentials.php");
$con = new Connection('mysql:host=localhost;dbname=phpproject', 'nifranco', 'achanger');
var_dump($con);
$con = new Connection('mysql:host=localhost;dbname=dbanboudoul', 'anboudoul', 'mdpMYSQL');
# gateway
// $t = new Task(3,'richarlison voltar pro flu','desc.','urgent','0');
// $tgt = new TaskGateway($con);
//$tgt->insert($t);
// $tgt->insertT($t);
//$tgt->delete('10');
//$taches = $tgt->findUserList('nifranco');
// foreach($taches as $t){
@ -25,13 +25,25 @@ var_dump($con);
// }
# test find
/*$tasks=$tgt->find('idList','001');
foreach($tasks as $i)
echo $i->get_id()."<br>"; */
// $tasks=$tgt->find('idList','001');
// foreach($tasks as $i)
// echo $i->get_id()."<br>";
# Test du modele Tache
// $mt= new TaskModel($con);
//$mt->addTask('3','testIsDone','desc.','urgent','001');
//$mt->modifTask('3','isDone','1');
//$tasks = $mt->getTaskBy('titre','tache1');
// $tasks = $mt->getAllTask();
// foreach($tasks as $i)
// echo $i->get_id()."<br>";
# Test LOAD PRIVATE TASKS
$mt= new TaskModel($con);
//$mt->addList('private','nifranco');
# Test LOAD PRIVATE TASKS
// $mt= new TaskModel($con);
// $mt->addList('private','nifranco');
// $lists = $mt->loadPublicLists();
// foreach($lists as $l){
@ -41,16 +53,20 @@ $mt= new TaskModel($con);
// echo $t->get_id()."<br>";
// }
// }
// //$tasks = $mt->getTaskBy('titre','tache1');
// $tasks = $mt->getAllTask();
// foreach($tasks as $i)
// echo $i->get_id()."<br>";
// $tasks = $mt->loadPublicLists();
// foreach($tasks as $i)
// echo $i->get_id()."<br>";
// $mt->addList('002','todo2','nifranco');
// $mt->modifList('2','nom','22do');
//mt->supList('2');
$public_lists = $mt->loadPrivateLists('nifranco');
$user = true;
//require("../view/newList.php");
require("../view/home.php");
// $public_lists = $mt->loadPrivateLists('nifranco');
// $user = true;
//require("../view/home.php");
//require("../view/register.php");
//require("../view/connection.php");
/* -------------
@ -72,13 +88,33 @@ require('../controller/UserCtrl.php');
// Test Modèle User
$mu = new UserModel($con);
//$mu = new UserModel($con);
//$res = $mu->connexion('nifranco','achanger');
//var_dump($res);
$mdl = new UserModel($con);
// $mdl->ajouter('Anna', 'unmdptrescomplique');
// $mdl->modifLogin('Anna', 'Aeryn');
// $mdl->modifMdp('Aeryn', 'wtfmec');
// $mdl->supprimer('Aeryn');
$mdl->connexion('Aeryn', 'wtfmec');
$mt->addList("Test Liste");
$mt->addList("Liste publique");
$mt->addList("Liste privée", "Aeryn");
$mt->addList("Projet de PHP", "Aeryn");
$mt->addList("Projet Blazor", "Aeryn");
$mt->addList("Projet de PHP", "RicharlisonR9");
$mt->addList("Projet Blazor", "RicharlisonR9");
// TEST USER CONTROLLER
session_start();
$_SESSION['login'] = 'RicharlisonR9';
$usrctrl = new UserCtrl($con);
$usrctrl->loadHome();
?>

@ -23,40 +23,28 @@
</form>
<table class="table mb-4">
<thead>
<tr>
<th scope="col">Task</th>
<th scope="col">Importance</th>
<th scope="col">Actions</th>
</tr>
</thead>
<tbody>
<tr>
<td>Faire le controlleur</td>
<td>Urgent</td>
<td>
<button type="submit" class="btn btn-success ms-1">Done</button>
<button type="submit" class="btn btn-danger">&#128465;</button>
</td>
</tr>
<tr>
<td>Finir les vues</td>
<td>Moyen</td>
<td>
<button type="submit" class="btn btn-success ms-1">Done</button>
<button type="submit" class="btn btn-danger">&#128465;</button>
</td>
</tr>
<tr>
<td>Gestion des erreurs</td>
<td>Important</td>
<td>
<button type="submit" class="btn btn-success ms-1">Done</button>
<button type="submit" class="btn btn-danger">&#128465;</button>
<td>
</tr>
</tbody>
</table>
<thead>
<tr>
<th scope="col">Task</th>
<th scope="col">Importance</th>
<th scope="col">Actions</th>
</tr>
</thead>
<tbody>
<?php
foreach($TabTask as $task){
echo '<tr>
<td scope="col">'.$task->get_titre().'</td>
<td scope="col">'.$task->get_priorite().'</td>
<td>
<button type="submit" class="btn btn-success ms-1">Done</button>
<button type="submit" class="btn btn-danger">&#128465;</button>
</td>
</tr>';
}
?>
</tbody>
</table>
</div>
</div>

@ -0,0 +1,56 @@
<!DOCTYPE html>
<html lang="fr">
<head>
<meta charset="utf-8" />
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css"
rel="stylesheet" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65"
crossorigin="anonymous">
</head>
<body>
<section class="vh-100" style="background-color: #eee;">
<div class="container py-5 h-100">
<div class="row d-flex justify-content-center align-items-center h-100">
<div class="col col-lg-9 col-xl-7">
<div class="card rounded-3"><div class="card rounded-3">
<div class="card-body p-4">
<h4 class="text-center my-3 pb-3">My List</h4>
<form class="row row-cols-lg-auto g-3 justify-content-center align-items-center mb-4 pb-2">
<div class="col-12">
<button type="submit" class="btn btn-primary">New task &#128221;</button>
</div>
</form>
<table class="table mb-4">
<thead>
<tr>
<th scope="col">Task</th>
<th scope="col">Importance</th>
<th scope="col">Actions</th>
</tr>
</thead>
<tbody>
<?php
foreach($TabTask as $task){
echo '<tr>
<td scope="col">'.$task->get_titre().'</td>
<td scope="col">'.$task->get_priorite().'</td>
<td>
<button type="submit" class="btn btn-success ms-1">Done</button>
<button type="submit" class="btn btn-danger">&#128465;</button>
</td>
</tr>';
}
?>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
</section>
</body>
</html>
Loading…
Cancel
Save