From 27e7cfa63f0b775c7df3a89d44b97cda36f7bd0b Mon Sep 17 00:00:00 2001
From: Anna BOUDOUL <Anna.BOUDOUL@etu.uca.fr>
Date: Fri, 23 Dec 2022 14:36:46 +0100
Subject: [PATCH] exception management again

---
 controller/FrontCtrl.php   |  8 +++++---
 controller/UserCtrl.php    |  6 ++++--
 controller/VisitorCtrl.php |  6 ++++--
 index.php                  |  2 +-
 view/newTask.php           | 22 +++++++++++++++++-----
 5 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/controller/FrontCtrl.php b/controller/FrontCtrl.php
index 1a4defa..77f18e8 100644
--- a/controller/FrontCtrl.php
+++ b/controller/FrontCtrl.php
@@ -9,8 +9,9 @@ class FrontCtrl
     private bool $isUser;
     private $TabVues;
 
-    function __construct(&$con, $TabVues){
+    function __construct(&$con, $TabVues, $TMessage){
         session_start();
+        $this->TMessage = $TMessage;
         $this->TabVues = $TabVues;
         $this->usrMdl = new UserModel($con);
         $this->action_User = array('deconnexion','loadListePriv','newListPrivate');
@@ -23,7 +24,7 @@ class FrontCtrl
                 if(!$this->isUser){ # si pas conncter
                     # appel controlleur visiteur avec action connecter
                     require("VisitorCtrl.php");
-                    $visitCtrl = new VisitorCtrl($con, $this->TabVues);
+                    $visitCtrl = new VisitorCtrl($con, $this->TabVues, $this->TMessage);
                     $visitCtrl->goconnexion();
                 } else { # sinon
                     # handle action avec controlleur user
@@ -34,9 +35,10 @@ class FrontCtrl
             } else { # sinon forcement action visiteur
                 # appel controlleur visiteur avec l'action
                 require("VisitorCtrl.php"); 
-                $visitCtrl = new VisitorCtrl($con, $this->TabVues, $this->isUser);
+                $visitCtrl = new VisitorCtrl($con, $this->TabVues, $this->TMessage, $this->isUser);
             }
         } catch (Exception $e){ // verifier si catch bon
+            $this->TMessage[] = $e->getMessage();
             require($this->TabVues["erreur"]); 
         }
     }
diff --git a/controller/UserCtrl.php b/controller/UserCtrl.php
index f7150f9..aece6f5 100644
--- a/controller/UserCtrl.php
+++ b/controller/UserCtrl.php
@@ -9,8 +9,9 @@ class UserCtrl
     private $userModel;
     private $TabVues;
 
-    public function __construct(Connection $con, $TabVues){
+    public function __construct(Connection $con, $TabVues, $TMessage){
         $this->TabVues = $TabVues;
+        $this->TMessage = $TMessage;
         $this->con = $con;
         $this->userModel = new UserModel($this->con);
         $this->taskModel = new TaskModel($this->con);
@@ -31,12 +32,13 @@ class UserCtrl
                     $this->deconnexion();
                     break;
                 default:
-                $TMessage[] = 'Unexpected error';
+                $this->TMessage[] = 'Unexpected error';
                 require($this->TabVues["erreur"]); 
                 break;
     
             }
         } catch(Exception $e) {
+            $this->TMessage[] = $e->getMessage();
             require($this->TabVues["erreur"]); 
         }
     }
diff --git a/controller/VisitorCtrl.php b/controller/VisitorCtrl.php
index 29b1e50..1623c0f 100644
--- a/controller/VisitorCtrl.php
+++ b/controller/VisitorCtrl.php
@@ -8,8 +8,9 @@ class VisitorCtrl
     private $isUser;
     private $TabVues;
 
-    function __construct($con, $TabVues, $isUser){
+    function __construct($con, $TabVues, $TMessage, $isUser){
         $this->TabVues = $TabVues;
+        $this->TMessage = $TMessage;
         $this->isUser = $isUser;
         $dvueErreur = array();
         $this->taskModel = new TaskModel($con);
@@ -82,12 +83,13 @@ class VisitorCtrl
                 
                 default:
                     # 
-                    $TMessage[] = 'Unexpected error';
+                    $this->TMessage[] = 'Unexpected error';
                     require($this->TabVues["erreur"]); 
                     break;
             }
             
         } catch (Exception $e) {
+            $this->TMessage[] = $e->getMessage();
             require($this->TabVues["erreur"]); 
         }
     }
diff --git a/index.php b/index.php
index 9248503..8a4b373 100644
--- a/index.php
+++ b/index.php
@@ -3,6 +3,6 @@
     require('config/Validation.php');
     require("view/erreur.php");
     require_once("controller/FrontCtrl.php");
-    $fc = new FrontCtrl($con, $TabVues);
+    $fc = new FrontCtrl($con, $TabVues, $TMessage);
 ?>
 
diff --git a/view/newTask.php b/view/newTask.php
index f8caa8f..10222dc 100644
--- a/view/newTask.php
+++ b/view/newTask.php
@@ -50,28 +50,40 @@
                 <h4 class="text-center my-3 pb-3">New Task</h4>
                 <form method="post" action="index.php">
                         <div class="form-outline mb-4 align-items-center">
-                            <input name="titreT" type="text"  id="form2title" class="form-control" required minlength="0" maxlength="250"/>
                             <label class="form-label" for="form2title">Name</label>
+                            <input name="titreT" type="text"  id="form2title" class="form-control" required minlength="0" maxlength="250"/>
                         </div>
 
                         <div class="form-outline mb-4">
-                            <input name="descT" type="text" id="form2description" class="form-control" minlength="0" maxlength="250">
                             <label class="form-label" for="form2description">Description</label>
+                            <input name="descT" type="text" id="form2description" class="form-control" minlength="0" maxlength="250">
                         </div>
 
                         <div class="form-outline mb-4">
-                            <input name="dateDebT" type="date" id="form2dateDeb" class="form-control">
                             <label class="form-label" for="form2dateDeb">Starting date</label>
+                            <input name="dateDebT" type="date" id="form2dateDeb" class="form-control">
                         </div>
 
                         <div class="form-outline mb-4">
-                            <input name="dateFinT" type="date" id="form2dateFin" class="form-control">
                             <label class="form-label" for="form2dateFin">Ending date</label>
+                            <input name="dateFinT" type="date" id="form2dateFin" class="form-control">
                         </div>
 
-                        <div class="form-outline mb-4">
+                        <!-- <div class="form-outline mb-4">
                             <input name="prioriteT" type="text" id="form2importance" class="form-control" />
                             <label class="form-label" for="form2importance">Importance</label>
+                        </div> -->
+
+                        <div class="form-outline mb-4">
+                            <label class="form-label" for="form2importance">Importance</label>
+                            <select name="prioriteT" id="form2importance" class="form-control">
+                                <option value="">--Please choose an option--</option>
+                                <option value="Urgent">Urgent</option>
+                                <option value="Important">Important</option>
+                                <option value="Medium">Medium</option>
+                                <option value="Low">Low</option>
+                                <option value="None">None</option>
+                            </select>
                         </div>
 
                         <!-- Submit button -->