merge2

2 years ago · 908ec8ebf4
parent 3754eba1d6 65d4ad2d24
commit 908ec8ebf4
11 changed files with 81 additions and 107 deletions
--- a/controller/CtrlUser.php
+++ b/controller/CtrlUser.php
@ -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);
-        }
-    }
-
-?>
--- a/controller/FrontCtrl.php
+++ b/controller/FrontCtrl.php
@ -9,7 +9,7 @@ class FrontController
    function __construct(){
        session_start();
        try{
-            $user = $this->usrMdl.isUser(); // cette fonction retourne quoi?
+            $user = $this->usrMdl->isUser(); // cette fonction retourne quoi?
            $action = $_REQUEST['action'];
    
            if(($i = array_search($action,$action_User)) !== false){ # si action dans la liste d'actions user
--- a/controller/UserCtrl.php
+++ b/controller/UserCtrl.php
@ -12,25 +12,27 @@ class UserCtrl
            $action=$_REQUEST['action'];
            switch($action){

-                // voir les listes privees 
-                case 'voir_liste_priv': 
-                    $this->loadListePriv();
-                    break;
+        //         // voir les listes privees 
+        //         case 'voir_liste_priv': 
+        //             $this->loadListePriv();
+        //             break;
                
-                // ajouter une liste privee
-                case 'creer_liste_priv': 
-                    $this->newListPrivate();
-                    break;
+        //         // ajouter une liste privee
+        //         case 'creer_liste_priv': 
+        //             $this->newListPrivate();
+        //             break;
    
-            }
-        } catch(Exception $e) {
-            require("../view/erreur.php");
-        }
+        //     }
+        // } catch(Exception $e) {
+        //     require("../view/erreur.php");
+        // }
    }

    public function loadListePriv(){
        $name = "Liste privée";
-        $TabList = array();
+        $taskmdl = new TaskModel($this->con);
+        $TabTask = $taskmdl->loadPublicLists();
+        var_dump($TabTask);
        // $TabList[] = new ListTask(0, "Projet PHP");
        // $TabList[] = new ListTask(1, "Projet Blazor");
        $TabListPriv = $this->taskmodel->getPrivateList();
--- a/dal/TaskGateway.php
+++ b/dal/TaskGateway.php
@ -55,6 +55,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)
                {
@ -71,10 +72,10 @@ class TaskGateway
                $results=$this->con->getResults();
                foreach($results as $row)
                {
-                    $tabTaches[]=new Task($row['id'],$row['titre'],$row['description'],$row['priorite'],
+                    $tabResult[]=new Task($row['id'],$row['titre'],$row['description'],$row['priorite'],
                    $row['idList'],$row['dateDebut'],$row['dateFin'],$row['isDone']);    
                }
-                return $tabTaches;
+                return $tabResult;

 		    } else if($table == 'list'){
                if(strcmp($element,"")==0)
@ -92,12 +93,15 @@ class TaskGateway
                $results=$this->con->getResults();
                foreach($results as $row)
                {
-                    $tabList[]=new ListTask($row['id'],$row['nom'],$row['user'],$row['dc']);    
+                    $tabResult[]=new ListTask($row['id'],$row['nom'],$row['user'],$row['dc']);    
                }
-                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){
--- a/index.php
+++ b/index.php
@ -2,7 +2,7 @@
    $fc = new FrontCtrl();
    $TMessage = array();

-    require_once(controller/FrontCtrl.php);
-    require(erreur.php);
+    require_once("controller/FrontCtrl.php");
+    require("erreur.php");
 ?>

--- a/tests/credentials.php
+++ b/tests/credentials.php
@ -1,4 +1,4 @@
 <?php
-	static $user = 'nifranco';
+	static $user = 'anboudoul';
 	static $pass = 'achanger';
 ?>
--- a/tests/test.php
+++ b/tests/test.php
@ -14,8 +14,9 @@ include("credentials.php");
 $con = new Connection('mysql:host=localhost;dbname=dbanboudoul', 'anboudoul', 'achanger');

 # 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){
@ -47,6 +48,13 @@ foreach($tasks as $i)
 //         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');
@ -76,6 +84,11 @@ require('../controller/UserCtrl.php');
 // $mdl->modifLogin('Anna', 'Aeryn');
 // $mdl->modifMdp('Aeryn', 'wtfmec');
 // $mdl->supprimer('Aeryn');
+// $mdl->connexion('Aeryn', 'wtfmec');
+
+$usrctrl = new UserCtrl($con);
+// $usrctrl->loadListePriv();
+$usrctrl->loadListePriv();

 ?>

--- a/view/ajouter
+++ b/view/ajouter
--- a/view/liste.php
+++ b/view/liste.php
@ -1,10 +1,13 @@
-<?php
-        echo '<head>
+<!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>';
+    </head>
+    <body>
+    <?php
            echo '<h1>'.$name.'</h1><center>';
            echo '<div class="list-group list-group-light">';
            foreach($TabList as $liste){
@ -12,3 +15,5 @@
            }
            echo '</div></center>';
    ?>
+    </body>
+</html>
--- a/view/newList.html
+++ b/view/newList.html
--- a/view/list.html
+++ b/view/list.html
@ -31,30 +31,18 @@
 										</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>
+										<?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>
-					<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>
+												</tr>';
+											}
+										?>
 									</tbody>
 								</table>