From f66e40340d62b5c694093bc6d10f99337382d12a Mon Sep 17 00:00:00 2001
From: Debulois <quentin@debulois.fr>
Date: Fri, 18 Mar 2022 13:22:30 +0100
Subject: Réécriture du JS & Modifications de la gestion des informations de
 l'utilisateur et d'autres trucs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Views/Includes/en/message.php           | 64 ++++++++++++++++++-----------
 Views/Includes/en/text.php              | 27 ++++++------
 Views/Includes/fr/message.php           | 68 ++++++++++++++++++------------
 Views/Includes/fr/text.php              | 25 +++++------
 Views/Includes/incl_form_admin.php      |  4 +-
 Views/Includes/incl_form_userInfo.php   | 73 ++++++++++++++++++++++-----------
 Views/Includes/incl_global_message.php  | 14 ++++++-
 Views/Includes/incl_table_myMission.php |  2 +-
 8 files changed, 175 insertions(+), 102 deletions(-)

(limited to 'Views/Includes')

diff --git a/Views/Includes/en/message.php b/Views/Includes/en/message.php
index 6e5955f..50417a3 100644
--- a/Views/Includes/en/message.php
+++ b/Views/Includes/en/message.php
@@ -11,89 +11,105 @@ $message  = [
     ["success" => true,
     "title"    => "Delete an user.",
     "info"     => "User deleted !",
-    "timer"    => true],
+    "timer"    => true,
+    "toSrc"    => true],
     // 1 Message échec
     ["success" => false,
     "title"    => "Delete an user.",
     "info"     => "No user was deleted.",
-    "timer"    => true],
+    "timer"    => true,
+    "toSrc"    => true],
     // Informations de l'utilisateur
     // 2 Message réussitee
     ["success" => true,
-     "title"   => "Update user information.",
-     "info"    => "User informations updated !",
-     "timer"   => true],
+    "title"    => "Update user information.",
+    "info"     => "User informations updated !",
+    "timer"    => true,
+    "toSrc"    => true],
     // Login sans cookie
     // 3 Message réussitee
     ["success" => true,
-     "title"   => "Login.",
-     "info"    => "Successfully logged in!",
-     "timer"   => true],
+    "title"    => "Login.",
+    "info"     => "Successfully logged in!",
+    "timer"    => true,
+    "toSrc"    => false],
     // 4 Message échec
     ["success" => false,
     "title"    => "Login.",
     "info"     => "Error bad credentials.",
-    "timer"    => true],
+    "timer"    => true,
+    "toSrc"    => true],
     // Login avec cookie
     // 5 Message réussitee
     ["success" => true,
-     "title"   => "",
-     "info"    => "",
-     "timer"   => false],
+    "title"    => "",
+    "info"     => "",
+    "timer"    => false,
+    "toSrc"    => false],
     // 6 Message échec
     ["success" => false,
     "title"    => "Login cookie.",
     "info"     => "Error with the cookie auto-login.",
-    "timer"    => true],
+    "timer"    => true,
+    "toSrc"    => false],
     // Log out
     // 7 Message global
     ["success" => true,
-     "title"   => "Log out.",
-     "info"    => "Successefuly logged out!",
-     "timer"   => true],
+    "title"    => "Log out.",
+    "info"     => "Successefuly logged out!",
+    "timer"    => true,
+    "toSrc"    => false],
     // Ajout mission
     // 8 Message réussitee
     ["success" => true,
     "title"    => "Register a mission.",
     "info"     => "Mission registered !",
-    "timer"    => true],
+    "timer"    => true,
+    "toSrc"    => true],
     // 9 Message échec
     ["success" => false,
     "title"    => "Register a mission.",
     "info"     => "Error, probably wrong consultant ID.",
-    "timer"    => true],
+    "timer"    => true,
+    "toSrc"    => true],
     // Ajout utilisateur
     // 10 Message réussitee
     ["success" => true,
     "title"    => "Register an user.",
     "info"     => "User successfully registered !",
-    "timer"    => true],
+    "timer"    => true,
+    "toSrc"    => true],
     // 11 Message échec
     ["success" => false,
     "title"    => "Register an user.",
     "info"     => "Error, user not registered.",
-    "timer"    => true],
+    "timer"    => true,
+    "toSrc"    => true],
     // Ajout categorie
     // 12 Message réussitee
     ["success" => true,
     "title"    => "Add a job category.",
     "info"     => "Category added !",
-    "timer"    => true],
+    "timer"    => true,
+    "toSrc"    => true],
     // 13 Message échec
     ["success" => false,
     "title"    => "Add a job category.",
     "info"     => "Category not added.",
-    "timer"    => true],
+    "timer"    => true,
+    "toSrc"    => true],
     // Suppression categorie
     // 14 Message réussitee
     ["success" => true,
     "title"    => "Deletion of a job category.",
     "info"     => "Category deleted !",
-    "timer"    => true],
+    "timer"    => true,
+    "toSrc"    => true],
     // 15 Message échec
     ["success" => false,
     "title"    => "Deletion of a job category.",
     "info"     => "Category not deleted !",
-    "timer"    => true],
+    "timer"    => true,
+    "toSrc"    => true],
 ];
 ?>
\ No newline at end of file
diff --git a/Views/Includes/en/text.php b/Views/Includes/en/text.php
index 1111e35..73aa268 100644
--- a/Views/Includes/en/text.php
+++ b/Views/Includes/en/text.php
@@ -18,18 +18,19 @@ $text = [
         "main" => "Made by Debulois Quentin for my professional folder.<br>December 2021, all rights reserved.",
     ],
     "incl_form_userInfo" => [
-        "h2"          => "Informations about the user.",
-        "lastname"    => "Last name",
-        "firstname"   => "First name",
-        "job"         => "Job",
-        "degree"      => "Degree",
-        "capability"  => "Capacities",
-        "description" => "Descriptions",
-        "phoneNumber" => "Phone number",
-        "adress"      => "Adress",
-        "zipCode"     => "Zip code",
-        "city"        => "City",
-        "submit"      => "Modify"
+        "h2"           => "Informations about the user.",
+        "lastname"     => "Last name",
+        "firstname"    => "First name",
+        "phoneNumber"  => "Phone number",
+        "adress"       => "Adress",
+        "zipCode"      => "Zip code",
+        "city"         => "City",
+        "jobsSel"      => "Jobs",
+        "jobsAdd"       => "Add",
+        "degree"       => "Degree",
+        "capability"   => "Capacities",
+        "description"  => "Descriptions",
+        "submit"       => "Modify"
     ],
     "incl_form_login" => [
         "h2"         => "Login",
@@ -61,7 +62,7 @@ $text = [
         "lang"         => "Language",
         "btnLang"      => "Select"
     ],
-    "incl_form register" => [
+    "incl_form_register" => [
         "h2"           => "Form to sign-in",
         "email"        => "Email",
         "password"     => "Password",
diff --git a/Views/Includes/fr/message.php b/Views/Includes/fr/message.php
index 408bd82..dbf66f9 100644
--- a/Views/Includes/fr/message.php
+++ b/Views/Includes/fr/message.php
@@ -9,91 +9,107 @@ $message = [
     // Delete
     // 0 Message réussitee
     ["success" => true,
-     "title"   => "Supprimer un utilisateur.",
-     "info"    => "Utilisateur Supprimé !",
-     "timer"   => true],
+    "title"    => "Supprimer un utilisateur.",
+    "info"     => "Utilisateur Supprimé !",
+    "timer"    => true,
+    "toSrc"    => true],
     // 1 Message échec
     ["success" => false,
     "title"    => "Supprimer un utilisateur.",
     "info"     => "Aucun utilisateur supprimé.",
-    "timer"    => true],
+    "timer"    => true,
+    "toSrc"    => true],
     // Informations de l'utilisateur
     // 2 Message réussitee
     ["success" => true,
-     "title"   => "Modification des infos de l'utilisateur.",
-     "info"    => "Informations mises à jour !",
-     "timer"   => true],
+    "title"    => "Modification des infos de l'utilisateur.",
+    "info"     => "Informations mises à jour !",
+    "timer"    => true,
+    "toSrc"    => true],
     // Login sans cookie
     // 3 Message réussitee
     ["success" => true,
-     "title"   => "Connection.",
-     "info"    => "Connection réussie !",
-     "timer"   => true],
+    "title"    => "Connection.",
+    "info"     => "Connection réussie !",
+    "timer"    => true,
+    "toSrc"    => false],
     // 4 Message échec
     ["success" => false,
     "title"    => "Connection.",
     "info"     => "Erreur, mauvais email / mot de passe.",
-    "timer"    => true],
+    "timer"    => true,
+    "toSrc"    => true],
     // Login avec cookie
     // 5 Message réussitee
     ["success" => true,
-     "title"   => "",
-     "info"    => "",
-     "timer"   => false],
+    "title"    => "",
+    "info"     => "",
+    "timer"    => false,
+    "toSrc"    => false],
     // 6 Message échec
     ["success" => false,
     "title"    => "Connection avec cookie.",
     "info"     => "Erreur lors de la connection automatique.",
-    "timer"    => true],
+    "timer"    => true,
+    "toSrc"    => false],
     // Log out
     // 7 Message global
     ["success" => true,
-     "title"   => "Déconnection.",
-     "info"    => "Vous êtes déconnecté!",
-     "timer"   => true],
+    "title"    => "Déconnection.",
+    "info"     => "Vous êtes déconnecté!",
+    "timer"    => true,
+    "toSrc"    => false],
     // Ajout mission
     // 8 Message réussitee
     ["success" => true,
     "title"    => "Enregistrement d'une mission.",
     "info"     => "Mission enregistrée !",
-    "timer"    => true],
+    "timer"    => true,
+    "toSrc"    => true],
     // 9 Message échec
     ["success" => false,
     "title"    => "Enregistrement d'une mission.",
     "info"     => "Erreur, l'ID du consultant est probablement faux.",
-    "timer"    => true],
+    "timer"    => true,
+    "toSrc"    => true],
     // Ajout utilisateur
     // 10 Message réussitee
     ["success" => true,
     "title"    => "Inscription",
     "info"     => "Utilisateur inscrit !",
-    "timer"    => true],
+    "timer"    => true,
+    "toSrc"    => true],
     // 11 Message échec
     ["success" => false,
     "title"    => "Inscription.",
     "info"     => "Erreur, utilisateur non enregistré.",
-    "timer"    => true],
+    "timer"    => true,
+    "toSrc"    => true],
     // Ajout categorie
     // 12 Message réussitee
     ["success" => true,
     "title"    => "Ajout d'une categorie.",
     "info"     => "Categorie ajoutée !",
-    "timer"    => true],
+    "timer"    => true,
+    "toSrc"    => true],
     // 13 Message échec
     ["success" => false,
     "title"    => "Ajout d'une categorie.",
     "info"     => "Categorie non ajoutée.",
-    "timer"    => true],
+    "timer"    => true,
+    "toSrc"    => true],
     // Suppression categorie
     // 14 Message réussitee
     ["success" => true,
     "title"    => "Suppression d'une categorie.",
     "info"     => "Categorie supprimée !",
-    "timer"    => true],
+    "timer"    => true,
+    "toSrc"    => true],
     // 15 Message échec
     ["success" => false,
     "title"    => "Suppression d'une categorie.",
     "info"     => "Categorie non supprimée.",
-    "timer"    => true],
+    "timer"    => true,
+    "toSrc"    => true],
 ];
 ?>
\ No newline at end of file
diff --git a/Views/Includes/fr/text.php b/Views/Includes/fr/text.php
index 3b7b989..dd6d655 100644
--- a/Views/Includes/fr/text.php
+++ b/Views/Includes/fr/text.php
@@ -18,18 +18,19 @@ $text = [
         "main" => "Réalisé par Debulois Quentin pour mon dossier professionel.<br>Decembre 2021, tous droits réservés.",
     ],
     "incl_form_userInfo" => [
-        "h2"          => "Informations sur l'utilisateur.",
-        "lastname"    => "Nom",
-        "firstname"   => "Prénom",
-        "job"         => "Emploi",
-        "degree"      => "Diplômes",
-        "capability"  => "Capacités",
-        "description" => "Description",
-        "phoneNumber" => "Numéro de télephone",
-        "adress"      => "Adresse",
-        "zipCode"     => "Code postal",
-        "city"        => "Ville",
-        "submit"      => "Modifier"
+        "h2"           => "Informations sur l'utilisateur.",
+        "lastname"     => "Nom",
+        "firstname"    => "Prénom",
+        "phoneNumber"  => "Numéro de télephone",
+        "adress"       => "Adresse",
+        "zipCode"      => "Code postal",
+        "city"         => "Ville",
+        "jobsSel"      => "Emplois",
+        "jobsAdd"      => "Ajouter",
+        "degree"       => "Diplômes",
+        "capability"   => "Capacités",
+        "description"  => "Description",
+        "submit"       => "Modifier"
     ],
     "incl_form_login" => [
         "h2"         => "Identification",
diff --git a/Views/Includes/incl_form_admin.php b/Views/Includes/incl_form_admin.php
index ef34daa..7f7963d 100644
--- a/Views/Includes/incl_form_admin.php
+++ b/Views/Includes/incl_form_admin.php
@@ -9,9 +9,11 @@ require_once(dirname(__FILE__)."/".$_SESSION["lang"]."/text.php");
 require_once(dirname( __FILE__ )."/".$_SESSION["lang"]."/table.php");
 // Import des metodes de la base de donnée pour les recherches.
 require_once(dirname( __FILE__ )."/../../Database/meth_dbadmin.php");
+require_once(dirname( __FILE__ )."/../../Database/meth_dbsearch.php");
 
 // Instanciation de la bdd avec les méthodes de recherche.
 $dbadmin = new DbAdmin;
+$dbsearch = new DbSearch;
 // Form pour ajout d'une catégorie d'emploi
 echo('        <!-- Separateur -->
         <div class="separator"></div>
@@ -33,7 +35,7 @@ echo('        <!-- Separateur -->
                     <select name="delCategoryId" required>
                         <option value="" selected>'.$text[basename(__FILE__, ".php")]["selJobDel"].'</option>'.PHP_EOL);
 
-$result = $dbadmin->get_all_job_category();
+$result = $dbsearch->get_job_category_all();
 for ($i = 0; $i < count($result); $i++){
     echo('                        <option value="'.$result[$i]["jobCategoryId"].'">'.$result[$i]["jobCategoryName".ucwords($_SESSION["lang"])].'</option>'.PHP_EOL);
 }
diff --git a/Views/Includes/incl_form_userInfo.php b/Views/Includes/incl_form_userInfo.php
index 760838d..80d61ad 100644
--- a/Views/Includes/incl_form_userInfo.php
+++ b/Views/Includes/incl_form_userInfo.php
@@ -14,14 +14,13 @@ if (!$info) {
     $info = [
         ["lastname"    => "",
         "firstname"    => "",
-        "job"          => "",
-        "degree"       => "",
-        "capability"   => "",
-        "description"  => "",
         "phoneNumber"  => "",
         "adress"       => "",
         "zipCode"      => "",
-        "city"         => ""]
+        "city"         => "",
+        "degree"       => "",
+        "capability"   => "",
+        "description"  => ""]
     ];
 }
 echo('        <!-- Separateur -->
@@ -38,22 +37,6 @@ echo('        <!-- Separateur -->
                     <i class="fas fa-user"></i>
                     <input type="text" name="firstname" id="firstname" maxlength="128" placeholder="'.$text[basename(__FILE__, ".php")]["firstname"].'" value="'.$info[0]["firstname"].'" required>
                 </label>
-                <label>
-                    <i class="fas fa-wrench"></i>
-                    <input type="text" name="job" id="job" maxlength="128" placeholder="'.$text[basename(__FILE__, ".php")]["job"].'" value="'.$info[0]["job"].'">
-                </label>
-                <label>
-                    <i class="fas fa-user-graduate"></i>
-                    <input type="text" name="degree" id="degree" maxlength="128" placeholder="'.$text[basename(__FILE__, ".php")]["degree"].'"value="'.$info[0]["degree"].'">
-                </label>
-                <label>
-                    <i class="fas fa-cogs"></i>
-                    <textarea name="capability" id="capability" placeholder="'.$text[basename(__FILE__, ".php")]["capability"].'" cols="30" rows="2" >'.$info[0]["capability"].'</textarea>
-                </label>
-                <label>
-                    <i class="fas fa-file-signature"></i>
-                    <textarea name="description" id="description" placeholder="'.$text[basename(__FILE__, ".php")]["description"].'" cols="30" rows="2" >'.$info[0]["description"].'</textarea>
-                </label>
                 <label>
                     <i class="fas fa-mobile-alt"></i>
                     <input type="text" name="phoneNumber" id="phoneNumber" maxlength="10" placeholder="'.$text[basename(__FILE__, ".php")]["phoneNumber"].'" value="'.$info[0]["phoneNumber"].'" required>
@@ -69,8 +52,52 @@ echo('        <!-- Separateur -->
                 <label>
                     <i class="fas fa-city"></i>
                     <input type="text" name="city" id="city" maxlength="128" placeholder="'.$text[basename(__FILE__, ".php")]["city"].'" value="'.$info[0]["city"].'" required>
+                </label>'.PHP_EOL);
+// TODO : Commenter
+if ($_SESSION["isPro"]) {
+    $allJobs = $dbsearch->get_job_category_all();
+    $proJobs = $dbsearch->get_pro_job_category($_SESSION["userId"]);
+    $dictJobs = [];
+    for ($i = 0; $i < count($allJobs); $i++) {
+        $dictJobs[$allJobs[$i]["jobCategoryId"]] = $allJobs[$i]["jobCategoryName".ucwords($_SESSION["lang"])];
+    }
+    echo('                <label>
+                    <i class="fas fa-wrench"></i> 
+                    Add a job:'.PHP_EOL);
+    // Select
+    echo('                    <select id="jobsSel">
+                        <option value="" selected>'.$text[basename(__FILE__, ".php")]["jobsSel"].'</option>'.PHP_EOL);
+    foreach ($dictJobs as $jobId => $jobName) {
+    echo('                        <option value="'.$jobId.'">'.$jobName.'</option>'.PHP_EOL);
+    }
+    echo('                    </select>
+                    <button type="button" onclick="add()">'.$text[basename(__FILE__, ".php")]["jobsAdd"].'</button>
+                </label>'.PHP_EOL);
+    // Mes jobs
+    echo('                    Mes jobs
+                    <ul id="jobsList">'.PHP_EOL);
+    for ($i = 0; $i < count($proJobs); $i++) {
+        echo('                       <li>'.$dictJobs[$proJobs[$i]].'</li>'.PHP_EOL);
+    }
+    echo('                    </ul>
+                    <input type="hidden" name="jobs" id="jobs" value="">'.PHP_EOL);
+    // Keep going
+    echo('                <label>
+                    <i class="fas fa-user-graduate"></i>
+                    <input type="text" name="degree" id="degree" maxlength="128" placeholder="'.$text[basename(__FILE__, ".php")]["degree"].'"value="'.$info[0]["degree"].'" required>
                 </label>
-                <input type="submit" value="'.$text[basename(__FILE__, ".php")]["submit"].'">
+                <label>
+                    <i class="fas fa-cogs"></i>
+                    <textarea name="capability" id="capability" placeholder="'.$text[basename(__FILE__, ".php")]["capability"].'" cols="30" rows="2"  required>'.$info[0]["capability"].'</textarea>
+                </label>
+                <label>
+                    <i class="fas fa-file-signature"></i>
+                    <textarea name="description" id="description" placeholder="'.$text[basename(__FILE__, ".php")]["description"].'" cols="30" rows="2"  required>'.$info[0]["description"].'</textarea>
+                </label>'.PHP_EOL);
+}
+echo('                <input type="submit" value="'.$text[basename(__FILE__, ".php")]["submit"].'">
             </form>
-        </div>')
+        </div>
+        <script src="/Statics/Js/userinfo.js"></script>
+        <script>init()</script>')
 ?>
\ No newline at end of file
diff --git a/Views/Includes/incl_global_message.php b/Views/Includes/incl_global_message.php
index b4b653d..b15d00e 100644
--- a/Views/Includes/incl_global_message.php
+++ b/Views/Includes/incl_global_message.php
@@ -14,9 +14,19 @@ if ($message[$_SESSION["messageNumber"]]["success"]) {
 echo("<p>".$message[$_SESSION["messageNumber"]]["info"]."</p>");
 echo('<p id="redirect" class="info">'.$redirect.'</p></div>');
 echo('<script src="/Statics/Js/main.js"></script>');
+echo('<script src="/Statics/Js/message.js"></script>');
+if ($message[$_SESSION["messageNumber"]]["toSrc"]) {
+    if ($_SESSION["src"] !== "index") {
+        $dest = "Views/".$_SESSION["src"];
+    } else {
+        $dest = "index";
+    }
+} else {
+    $dest = "index";
+}
 if ($message[$_SESSION["messageNumber"]]["timer"]) {
-    echo('<script>start_timer();</script>');
+    echo('<script>start_timer("'.$dest.'");</script>');
 } else {
-    echo('<script>redirect("/index")</script>');
+    echo('<script>redirect("'.$dest.'")</script>');
 }
 ?>
\ No newline at end of file
diff --git a/Views/Includes/incl_table_myMission.php b/Views/Includes/incl_table_myMission.php
index 35e69d4..b4c7e04 100644
--- a/Views/Includes/incl_table_myMission.php
+++ b/Views/Includes/incl_table_myMission.php
@@ -7,7 +7,7 @@ require_once(dirname(__FILE__)."/".$_SESSION["lang"]."/text.php");
 // Import des en-tête des tables.
 require_once(dirname(__FILE__)."/".$_SESSION["lang"]."/table.php");
 // Import des metodes de la base de donnée pour les recherches.
-require_once(dirname(__FILE__)."/../../Database/meth_dbsearch.php");
+require_once(dirname(__FILE__)."/../../Database/meth_dbmission.php");
 // Instanciation de la bdd avec les méthodes de recherche.
 $dbmission = new DbMission;
 // Recherches des missions avec l'id de l'utilisateur actuellement connecté.
-- 
cgit v1.2.3