diff options
| author | Debulois <quentin@debulois.fr> | 2022-03-13 12:42:37 +0100 |
|---|---|---|
| committer | Debulois <quentin@debulois.fr> | 2022-03-13 12:42:37 +0100 |
| commit | 473e6eb56ca1211be05d2b5fd814710f2ff78d38 (patch) | |
| tree | 4544b6c5c2ecaa3198d3583520f3199d7c056ed4 /Views/Includes | |
| parent | 497ce42637ebaad0c388d309d6b5bbf91db2dfa4 (diff) | |
Mise ç jour de pas mal de chose et ajout de la possibilité de pouvoir ajouter/supprimer des catégories d'emploi
Diffstat (limited to 'Views/Includes')
| -rw-r--r-- | Views/Includes/en/message.php | 40 | ||||
| -rw-r--r-- | Views/Includes/en/text.php | 16 | ||||
| -rw-r--r-- | Views/Includes/en/title.php | 2 | ||||
| -rw-r--r-- | Views/Includes/fr/message.php | 34 | ||||
| -rw-r--r-- | Views/Includes/fr/text.php | 16 | ||||
| -rw-r--r-- | Views/Includes/fr/title.php | 2 | ||||
| -rw-r--r-- | Views/Includes/incl_form_admin.php (renamed from Views/Includes/incl_form_delete.php) | 48 | ||||
| -rw-r--r-- | Views/Includes/incl_form_userInfo.php | 8 | ||||
| -rw-r--r-- | Views/Includes/incl_global_navbar.php | 2 | ||||
| -rw-r--r-- | Views/Includes/incl_index_search.php | 2 | ||||
| -rw-r--r-- | Views/Includes/incl_table_myMission.php | 4 |
11 files changed, 130 insertions, 44 deletions
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.<br>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.<br>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_delete.php b/Views/Includes/incl_form_admin.php index 99ce216..ef34daa 100644 --- a/Views/Includes/incl_form_delete.php +++ b/Views/Includes/incl_form_admin.php @@ -8,24 +8,54 @@ 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_dbadmin.php"); + // Instanciation de la bdd avec les méthodes de recherche. -$dbsearch = new DbSearch; -// Form pour la suppression et envoie au wrappeur. +$dbadmin = new DbAdmin; +// Form pour ajout d'une catégorie d'emploi echo(' <!-- Separateur --> <div class="separator"></div> - <!-- Form pour choix de la suppression --> - <div id="delete"> - <h2>'.$text[basename(__FILE__, ".php")]["h2"].'</h2> + <!-- Form pour ajout d une catégorie d emploi --> + <div id="admin"> + <h2>'.$text[basename(__FILE__, ".php")]["h2Job"].'</h2> + <form class="flex-center" action="../../Wrapper/wrapper.php" method="post"> + <label class="width-auto"> + <i class="fas fa-briefcase"></i> + <input type="text" name="addCategoryNameEn" maxlength="128" placeholder="'.$text[basename(__FILE__, ".php")]["formJobAddEn"].'" required> + <i class="fas fa-briefcase" style="margin-left: 5%;"></i> + <input type="text" name="addCategoryNameFr" maxlength="128" placeholder="'.$text[basename(__FILE__, ".php")]["formJobAddFr"].'" required> + </label> + <input type="submit" value="'.$text[basename(__FILE__, ".php")]["submitJobAdd"].'"> + </form> + <!-- Form pour suppression d une catégorie d emploi --> + <form class="flex-center" action="/../Wrapper/wrapper.php" method="post"> + <label> + <select name="delCategoryId" required> + <option value="" selected>'.$text[basename(__FILE__, ".php")]["selJobDel"].'</option>'.PHP_EOL); + +$result = $dbadmin->get_all_job_category(); +for ($i = 0; $i < count($result); $i++){ + echo(' <option value="'.$result[$i]["jobCategoryId"].'">'.$result[$i]["jobCategoryName".ucwords($_SESSION["lang"])].'</option>'.PHP_EOL); +} + +echo(' </select> + </label> + <input type="submit" value="'.$text[basename(__FILE__, ".php")]["submitJobDel"].'"> + </form>'.PHP_EOL); + +// Form pour la suppression et envoie au wrappeur. +echo(' <!-- Form pour choix de la suppression --> + <h2>'.$text[basename(__FILE__, ".php")]["h2Del"].'</h2> <form class="flex-center" action="../../Wrapper/wrapper.php" method="post"> <label class="width-auto"> <i class="fas fa-trash-alt"></i> - <input type="text" name="userId" maxlength="10" placeholder="'.$text[basename(__FILE__, ".php")]["id"].'"> + <input type="text" name="userId" maxlength="10" placeholder="'.$text[basename(__FILE__, ".php")]["formDel"].'" required> </label> - <input type="submit" value="'.$text[basename(__FILE__, ".php")]["submit"].'"> + <input type="submit" value="'.$text[basename(__FILE__, ".php")]["submitDel"].'"> </form>'.PHP_EOL); + // Récupération de tous les utilisateurs. -$result = $dbsearch->search_all(); +$result = $dbadmin->get_all_users_account(); // Affichage de la table. echo(" <!-- Tableau des utilisateurs--> <table> 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(' <!-- Separateur --> </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"].'"> + <input type="text" name="phoneNumber" id="phoneNumber" maxlength="10" placeholder="'.$text[basename(__FILE__, ".php")]["phoneNumber"].'" value="'.$info[0]["phoneNumber"].'" required> </label> <label> <i class="fas fa-home"></i> - <input type="text" name="adress" id="adress" maxlength="128" placeholder="'.$text[basename(__FILE__, ".php")]["adress"].'" value="'.$info[0]["adress"].'"> + <input type="text" name="adress" id="adress" maxlength="128" placeholder="'.$text[basename(__FILE__, ".php")]["adress"].'" value="'.$info[0]["adress"].'" required> </label> <label> <i class="fas fa-map-marker-alt"></i> - <input type="text" name="zipCode" id="zipCode" maxlength="6" placeholder="'.$text[basename(__FILE__, ".php")]["zipCode"].'" value="'.$info[0]["zipCode"].'"> + <input type="text" name="zipCode" id="zipCode" maxlength="6" placeholder="'.$text[basename(__FILE__, ".php")]["zipCode"].'" value="'.$info[0]["zipCode"].'" required> </label> <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"].'"> + <input type="text" name="city" id="city" maxlength="128" placeholder="'.$text[basename(__FILE__, ".php")]["city"].'" value="'.$info[0]["city"].'" required> </label> <input type="submit" value="'.$text[basename(__FILE__, ".php")]["submit"].'"> </form> 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(' <a href="/Views/delete.php"><li><i class="fas fa-trash-alt"></i> '.$text[basename(__FILE__, ".php")]["btnDelete"].'</li></a>'.PHP_EOL); + echo(' <a href="/Views/admin.php"><li><i class="fas fa-cog"></i> '.$text[basename(__FILE__, ".php")]["btnAdmin"].'</li></a>'.PHP_EOL); } echo(' <a href="/Views/userInfo.php"><li><i class="fas fa-user"></i> '.$text[basename(__FILE__, ".php")]["btnInfos"].'</li></a> <a href="/Views/logout.php"><li><i class="fas fa-sign-out-alt"></i> '.$text[basename(__FILE__, ".php")]["btnLogout"].'</li></a>'.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('<td class="noBorder" > <form action="/Wrapper/wrapper.php" method="post"> - <input type="hidden" name="searchInfo" value="'.$rows["id"].'"> + <input type="hidden" name="searchInfo" value="'.$rows["userId"].'"> <input type="submit" value="'.$text[basename(__FILE__, ".php")]["moreInfo"].'"> </form> </td>'); 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(' <!-- Separateur --> <div class="separator"></div> <!-- Mes missions --> |
