From 473e6eb56ca1211be05d2b5fd814710f2ff78d38 Mon Sep 17 00:00:00 2001 From: Debulois Date: Sun, 13 Mar 2022 12:42:37 +0100 Subject: Mise ç jour de pas mal de chose et ajout de la possibilité de pouvoir ajouter/supprimer des catégories d'emploi MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Views/Includes/en/message.php | 40 +++++++++++---- Views/Includes/en/text.php | 16 ++++-- Views/Includes/en/title.php | 2 +- Views/Includes/fr/message.php | 34 ++++++++++--- Views/Includes/fr/text.php | 16 ++++-- Views/Includes/fr/title.php | 2 +- Views/Includes/incl_form_admin.php | 90 +++++++++++++++++++++++++++++++++ Views/Includes/incl_form_delete.php | 60 ---------------------- Views/Includes/incl_form_userInfo.php | 8 +-- Views/Includes/incl_global_navbar.php | 2 +- Views/Includes/incl_index_search.php | 2 +- Views/Includes/incl_table_myMission.php | 4 +- Views/admin.php | 35 +++++++++++++ Views/delete.php | 35 ------------- 14 files changed, 216 insertions(+), 130 deletions(-) create mode 100644 Views/Includes/incl_form_admin.php delete mode 100644 Views/Includes/incl_form_delete.php create mode 100644 Views/admin.php delete mode 100644 Views/delete.php (limited to 'Views') diff --git a/Views/Includes/en/message.php b/Views/Includes/en/message.php index 4303907..6e5955f 100644 --- a/Views/Includes/en/message.php +++ b/Views/Includes/en/message.php @@ -9,9 +9,9 @@ $message = [ // Delete // 0 Message réussitee ["success" => true, - "title" => "Delete an user.", - "info" => "User deleted !", - "timer" => true], + "title" => "Delete an user.", + "info" => "User deleted !", + "timer" => true], // 1 Message échec ["success" => false, "title" => "Delete an user.", @@ -54,9 +54,9 @@ $message = [ // Ajout mission // 8 Message réussitee ["success" => true, - "title" => "Register a mission.", - "info" => "Mission registered !", - "timer" => true], + "title" => "Register a mission.", + "info" => "Mission registered !", + "timer" => true], // 9 Message échec ["success" => false, "title" => "Register a mission.", @@ -65,13 +65,35 @@ $message = [ // Ajout utilisateur // 10 Message réussitee ["success" => true, - "title" => "Register an user.", - "info" => "User successfully registered !", - "timer" => true], + "title" => "Register an user.", + "info" => "User successfully registered !", + "timer" => true], // 11 Message échec ["success" => false, "title" => "Register an user.", "info" => "Error, user not registered.", "timer" => true], + // Ajout categorie + // 12 Message réussitee + ["success" => true, + "title" => "Add a job category.", + "info" => "Category added !", + "timer" => true], + // 13 Message échec + ["success" => false, + "title" => "Add a job category.", + "info" => "Category not added.", + "timer" => true], + // Suppression categorie + // 14 Message réussitee + ["success" => true, + "title" => "Deletion of a job category.", + "info" => "Category deleted !", + "timer" => true], + // 15 Message échec + ["success" => false, + "title" => "Deletion of a job category.", + "info" => "Category not deleted !", + "timer" => true], ]; ?> \ No newline at end of file diff --git a/Views/Includes/en/text.php b/Views/Includes/en/text.php index 7caf330..1111e35 100644 --- a/Views/Includes/en/text.php +++ b/Views/Includes/en/text.php @@ -3,10 +3,16 @@ // Description: Texte du site // **************************************************************************** $text = [ - "incl_form_delete" => [ - "h2" => "Delete an user", - "id" => "ID to delete", - "submit" => "Delete", + "incl_form_admin" => [ + "h2Job" => "Manage job category", + "formJobAddEn" => "Name of the category in English", + "formJobAddFr" => "Name of the category in French", + "submitJobAdd" => "Add", + "selJobDel" => "Choose a job to delete", + "submitJobDel" => "Delete", + "h2Del" => "Delete an user", + "formDel" => "ID to delete", + "submitDel" => "Delete", ], "incl_global_footer" => [ "main" => "Made by Debulois Quentin for my professional folder.
December 2021, all rights reserved.", @@ -48,7 +54,7 @@ $text = [ "btnInfos" => "Modif. infos", "btnMission" => "Register mission", "btnMyMission" => "My missions", - "btnDelete" => "Delete an user", + "btnAdmin" => "Administration", "btnLogin" => "Sign-in", "btnLogout" => "Loggout", "btnRegister" => "Sign-up", diff --git a/Views/Includes/en/title.php b/Views/Includes/en/title.php index 3655a7a..d08f444 100644 --- a/Views/Includes/en/title.php +++ b/Views/Includes/en/title.php @@ -10,6 +10,6 @@ $title = [ "myMission" => "AlphaJob - My missions", "register" => "AlphaJob - Register an user", "userInfo" => "AlphaJob - My user information", - "delete" => "AlphaJob - Delete an user" + "admin" => "AlphaJob - Administration of alphajob" ]; ?> \ No newline at end of file diff --git a/Views/Includes/fr/message.php b/Views/Includes/fr/message.php index 0066cb5..408bd82 100644 --- a/Views/Includes/fr/message.php +++ b/Views/Includes/fr/message.php @@ -54,9 +54,9 @@ $message = [ // Ajout mission // 8 Message réussitee ["success" => true, - "title" => "Enregistrement d'une mission.", - "info" => "Mission enregistrée !", - "timer" => true], + "title" => "Enregistrement d'une mission.", + "info" => "Mission enregistrée !", + "timer" => true], // 9 Message échec ["success" => false, "title" => "Enregistrement d'une mission.", @@ -65,13 +65,35 @@ $message = [ // Ajout utilisateur // 10 Message réussitee ["success" => true, - "title" => "Inscription", - "info" => "Utilisateur inscrit !", - "timer" => true], + "title" => "Inscription", + "info" => "Utilisateur inscrit !", + "timer" => true], // 11 Message échec ["success" => false, "title" => "Inscription.", "info" => "Erreur, utilisateur non enregistré.", "timer" => true], + // Ajout categorie + // 12 Message réussitee + ["success" => true, + "title" => "Ajout d'une categorie.", + "info" => "Categorie ajoutée !", + "timer" => true], + // 13 Message échec + ["success" => false, + "title" => "Ajout d'une categorie.", + "info" => "Categorie non ajoutée.", + "timer" => true], + // Suppression categorie + // 14 Message réussitee + ["success" => true, + "title" => "Suppression d'une categorie.", + "info" => "Categorie supprimée !", + "timer" => true], + // 15 Message échec + ["success" => false, + "title" => "Suppression d'une categorie.", + "info" => "Categorie non supprimée.", + "timer" => true], ]; ?> \ No newline at end of file diff --git a/Views/Includes/fr/text.php b/Views/Includes/fr/text.php index 8d72f26..3b7b989 100644 --- a/Views/Includes/fr/text.php +++ b/Views/Includes/fr/text.php @@ -3,10 +3,16 @@ // Description: Texte du site // **************************************************************************** $text = [ - "incl_form_delete" => [ - "h2" => "Supprimer un utilisateur", - "id" => "ID à supprimer", - "submit" => "Supprimer", + "incl_form_admin" => [ + "h2Job" => "Gestion des categories d'emploi", + "formJobAddEn" => "Nom de la catégorie en Englais", + "formJobAddFr" => "Nom de la catégorie en Français", + "submitJobAdd" => "Ajouter", + "selJobDel" => "Choisir une categorie à suppr.", + "submitJobDel" => "Suppr.", + "h2Del" => "Supprimer un utilisateur", + "formDel" => "ID à supprimer", + "submitDel" => "Supprimer", ], "incl_global_footer" => [ "main" => "Réalisé par Debulois Quentin pour mon dossier professionel.
Decembre 2021, tous droits réservés.", @@ -48,7 +54,7 @@ $text = [ "btnInfos" => "Modif. infos", "btnMission" => "Enreg. mission", "btnMyMission" => "Mes missions", - "btnDelete" => "Suppr. utilisateur", + "btnAdmin" => "Administration", "btnLogin" => "Connection", "btnLogout" => "Déconnection", "btnRegister" => "Inscription", diff --git a/Views/Includes/fr/title.php b/Views/Includes/fr/title.php index f0537b2..25b6dd0 100644 --- a/Views/Includes/fr/title.php +++ b/Views/Includes/fr/title.php @@ -10,6 +10,6 @@ $title = [ "myMission" => "AlphaJob - Mes missions", "register" => "AlphaJob - Inscription", "userInfo" => "AlphaJob - Mes informations", - "delete" => "AlphaJob - Supprimer un utilisateur" + "admin" => "AlphaJob - Administration d'alphajob" ]; ?> \ No newline at end of file diff --git a/Views/Includes/incl_form_admin.php b/Views/Includes/incl_form_admin.php new file mode 100644 index 0000000..ef34daa --- /dev/null +++ b/Views/Includes/incl_form_admin.php @@ -0,0 +1,90 @@ + +
+ +
+

'.$text[basename(__FILE__, ".php")]["h2Job"].'

+
+ + +
+ +
+ + +
'.PHP_EOL); + +// Form pour la suppression et envoie au wrappeur. +echo(' +

'.$text[basename(__FILE__, ".php")]["h2Del"].'

+
+ + +
'.PHP_EOL); + +// Récupération de tous les utilisateurs. +$result = $dbadmin->get_all_users_account(); +// Affichage de la table. +echo(" + + + ".PHP_EOL); +// Affichage des en-tête de colonne. +foreach($header[0] as $header) { + echo(" ".PHP_EOL); +} +echo(" ".PHP_EOL); +// Affichage du résultat de la recherche. +foreach ($result as $rows) { + echo(" + ".PHP_EOL); + foreach ($rows as $key => $value) { + // Traduction du résultat si reponse binaire en Oui / Non. + if (($key == "isClient" || $key == "isPro" || $key == "isAdmin") && $value == "1") { + echo(" ".PHP_EOL); + } elseif (($key == "isClient" || $key == "isPro" || $key == "isAdmin") && $value == "0") { + echo(" ".PHP_EOL); + } else { + echo(" ".PHP_EOL); + } + } + echo(" ".PHP_EOL); +} +echo('
".$header."
".$yes."
".$no."
".$value."
+ +
+
'.PHP_EOL); + +?> \ No newline at end of file diff --git a/Views/Includes/incl_form_delete.php b/Views/Includes/incl_form_delete.php deleted file mode 100644 index 99ce216..0000000 --- a/Views/Includes/incl_form_delete.php +++ /dev/null @@ -1,60 +0,0 @@ - -
- -
-

'.$text[basename(__FILE__, ".php")]["h2"].'

-
- - -
'.PHP_EOL); -// Récupération de tous les utilisateurs. -$result = $dbsearch->search_all(); -// Affichage de la table. -echo(" - - - ".PHP_EOL); -// Affichage des en-tête de colonne. -foreach($header[0] as $header) { - echo(" ".PHP_EOL); -} -echo(" ".PHP_EOL); -// Affichage du résultat de la recherche. -foreach ($result as $rows) { - echo(" - ".PHP_EOL); - foreach ($rows as $key => $value) { - // Traduction du résultat si reponse binaire en Oui / Non. - if (($key == "isClient" || $key == "isPro" || $key == "isAdmin") && $value == "1") { - echo(" ".PHP_EOL); - } elseif (($key == "isClient" || $key == "isPro" || $key == "isAdmin") && $value == "0") { - echo(" ".PHP_EOL); - } else { - echo(" ".PHP_EOL); - } - } - echo(" ".PHP_EOL); -} -echo('
".$header."
".$yes."
".$no."
".$value."
- -
-
'.PHP_EOL); - -?> \ No newline at end of file diff --git a/Views/Includes/incl_form_userInfo.php b/Views/Includes/incl_form_userInfo.php index 4cc509c..760838d 100644 --- a/Views/Includes/incl_form_userInfo.php +++ b/Views/Includes/incl_form_userInfo.php @@ -56,19 +56,19 @@ echo(' diff --git a/Views/Includes/incl_global_navbar.php b/Views/Includes/incl_global_navbar.php index 86241e9..1572fa6 100644 --- a/Views/Includes/incl_global_navbar.php +++ b/Views/Includes/incl_global_navbar.php @@ -30,7 +30,7 @@ if (isset($_SESSION["loggedIn"]) if (isset($_SESSION["isAdmin"]) && $_SESSION["isAdmin"] == "1" ) { - echo('
  • '.$text[basename(__FILE__, ".php")]["btnDelete"].'
    • '.PHP_EOL); + echo('
  • '.$text[basename(__FILE__, ".php")]["btnAdmin"].'
    • '.PHP_EOL); } echo('
  • '.$text[basename(__FILE__, ".php")]["btnInfos"].'
    •
  • '.$text[basename(__FILE__, ".php")]["btnLogout"].'
    • '.PHP_EOL); diff --git a/Views/Includes/incl_index_search.php b/Views/Includes/incl_index_search.php index df6372a..a0e0be4 100644 --- a/Views/Includes/incl_index_search.php +++ b/Views/Includes/incl_index_search.php @@ -67,7 +67,7 @@ if (isset($_SESSION["search"])) { if ($_SESSION["search"]["isResearch"]) { echo('
    - +
    '); diff --git a/Views/Includes/incl_table_myMission.php b/Views/Includes/incl_table_myMission.php index b7e4ba9..35e69d4 100644 --- a/Views/Includes/incl_table_myMission.php +++ b/Views/Includes/incl_table_myMission.php @@ -9,9 +9,9 @@ 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"); // Instanciation de la bdd avec les méthodes de recherche. -$dbsearch = new DbSearch; +$dbmission = new DbMission; // Recherches des missions avec l'id de l'utilisateur actuellement connecté. -$result = $dbsearch->get_all_mission_by_id($_SESSION["userId"]); +$result = $dbmission->get_mission_by_id($_SESSION["userId"]); echo('
    diff --git a/Views/admin.php b/Views/admin.php new file mode 100644 index 0000000..6af1c7c --- /dev/null +++ b/Views/admin.php @@ -0,0 +1,35 @@ + + +'.PHP_EOL); ?> + + + +".$title[basename(__FILE__, ".php")]."".PHP_EOL); ?> + + + + + + + + \ No newline at end of file diff --git a/Views/delete.php b/Views/delete.php deleted file mode 100644 index c11c768..0000000 --- a/Views/delete.php +++ /dev/null @@ -1,35 +0,0 @@ - - -'.PHP_EOL); ?> - - - -".$title[basename(__FILE__, ".php")]."".PHP_EOL); ?> - - - - - - - - \ No newline at end of file -- cgit v1.2.3