From c9d4c87b21f1050a780f5296961d24bd17c9cdc8 Mon Sep 17 00:00:00 2001 From: Debulois Date: Thu, 24 Mar 2022 19:30:30 +0100 Subject: Grosse mise à jour, principalement changement du système des missions et de "mes missions". MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Views/Includes/en/message.php | 281 +++++++++++++++++++++----------- Views/Includes/en/table.php | 91 +++++++---- Views/Includes/en/text.php | 38 +++-- Views/Includes/fr/message.php | 281 +++++++++++++++++++++----------- Views/Includes/fr/table.php | 91 +++++++---- Views/Includes/fr/text.php | 40 +++-- Views/Includes/incl_form_admin.php | 26 ++- Views/Includes/incl_form_mission.php | 89 ++++++---- Views/Includes/incl_form_register.php | 6 +- Views/Includes/incl_form_userInfo.php | 12 +- Views/Includes/incl_global_message.php | 13 +- Views/Includes/incl_global_navbar.php | 35 ++-- Views/Includes/incl_index_search.php | 129 +++++++++------ Views/Includes/incl_index_slideshow.php | 16 +- Views/Includes/incl_table_myMission.php | 147 +++++++++++++++-- Views/admin.php | 4 +- Views/message.php | 2 +- Views/mission.php | 8 +- Views/myMission.php | 10 +- 19 files changed, 868 insertions(+), 451 deletions(-) (limited to 'Views') diff --git a/Views/Includes/en/message.php b/Views/Includes/en/message.php index 50417a3..344b0b8 100644 --- a/Views/Includes/en/message.php +++ b/Views/Includes/en/message.php @@ -5,111 +5,196 @@ $success = "Success"; $error = "Error"; $redirect = "Redirecting in "; -$message = [ - // Delete - // 0 Message réussitee - ["success" => true, - "title" => "Delete an user.", - "info" => "User deleted !", - "timer" => true, - "toSrc" => true], - // 1 Message échec - ["success" => false, - "title" => "Delete an user.", - "info" => "No user was deleted.", - "timer" => true, - "toSrc" => true], +$messageText = [ // Informations de l'utilisateur - // 2 Message réussitee - ["success" => true, - "title" => "Update user information.", - "info" => "User informations updated !", - "timer" => true, - "toSrc" => true], + "infosUpdate" => [ + "success" => [ + "success" => 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, - "toSrc" => false], - // 4 Message échec - ["success" => false, - "title" => "Login.", - "info" => "Error bad credentials.", - "timer" => true, - "toSrc" => true], + "login" => [ + "success" => [ + "success" => true, + "title" => "Login.", + "info" => "Successfully logged in!", + "timer" => true, + "toSrc" => false + ], + "fail" => [ + "success" => false, + "title" => "Login.", + "info" => "Error bad credentials.", + "timer" => true, + "toSrc" => true + ] + ], // Login avec cookie - // 5 Message réussitee - ["success" => true, - "title" => "", - "info" => "", - "timer" => false, - "toSrc" => false], - // 6 Message échec - ["success" => false, - "title" => "Login cookie.", - "info" => "Error with the cookie auto-login.", - "timer" => true, - "toSrc" => false], + "loginCookie" => [ + "success" => [ + "success" => true, + "title" => "", + "info" => "", + "timer" => false, + "toSrc" => false + ], + "fail" => [ + "success" => false, + "title" => "Login cookie.", + "info" => "Error with the cookie auto-login.", + "timer" => true, + "toSrc" => false + ] + ], // Log out - // 7 Message global - ["success" => true, - "title" => "Log out.", - "info" => "Successefuly logged out!", - "timer" => true, - "toSrc" => false], + "logout" => [ + "success" => [ + "success" => 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, - "toSrc" => true], - // 9 Message échec - ["success" => false, - "title" => "Register a mission.", - "info" => "Error, probably wrong consultant ID.", - "timer" => true, - "toSrc" => true], + "missionRegister" => [ + "success" => [ + "success" => true, + "title" => "Register a mission.", + "info" => "Mission registered !", + "timer" => true, + "toSrc" => true + ], + "fail" => [ + "success" => false, + "title" => "Mandate a mission.", + "info" => "Error, please sign-in before.", + "timer" => true, + "toSrc" => true + ] + ], + // Acceptation d'une mission + "missionAccepted" => [ + "success" => [ + "success" => true, + "title" => "Mission info.", + "info" => "Mission accepted !", + "timer" => true, + "toSrc" => true + ], + "fail" => [ + "success" => false, + "title" => "Mandate infos.", + "info" => "Error, mission not accepted.", + "timer" => true, + "toSrc" => true + ] + ], + // Validation d'une mission + "missionValidated" => [ + "success" => [ + "success" => true, + "title" => "Mission info.", + "info" => "Mission completed!", + "timer" => true, + "toSrc" => true + ], + "fail" => [ + "success" => false, + "title" => "Mandate info.", + "info" => "Error, mission not marked as completed.", + "timer" => true, + "toSrc" => true + ] + ], + // Ajout d'un commentaire & note + "missionReview" => [ + "success" => [ + "success" => true, + "title" => "Mission review.", + "info" => "Your review has been registered!", + "timer" => true, + "toSrc" => true + ], + "fail" => [ + "success" => false, + "title" => "Mission review.", + "info" => "Error, your review has not been resgistered.", + "timer" => true, + "toSrc" => true + ] + ], // Ajout utilisateur - // 10 Message réussitee - ["success" => true, - "title" => "Register an user.", - "info" => "User successfully registered !", - "timer" => true, - "toSrc" => true], - // 11 Message échec - ["success" => false, - "title" => "Register an user.", - "info" => "Error, user not registered.", - "timer" => true, - "toSrc" => true], + "userAdd" => [ + "success" => [ + "success" => true, + "title" => "Register an user.", + "info" => "User successfully registered !", + "timer" => true, + "toSrc" => true + ], + "fail" => [ + "success" => false, + "title" => "Register an user.", + "info" => "Error, user not registered.", + "timer" => true, + "toSrc" => true + ] + ], + // Delete utilisateur + "adminDelUser" => [ + "success" => [ + "success" => true, + "title" => "Delete an user.", + "info" => "User deleted !", + "timer" => true, + "toSrc" => true + ], + "fail" => [ + "success" => false, + "title" => "Delete an user.", + "info" => "No user was deleted.", + "timer" => true, + "toSrc" => true + ] + ], // Ajout categorie - // 12 Message réussitee - ["success" => true, - "title" => "Add a job category.", - "info" => "Category added !", - "timer" => true, - "toSrc" => true], - // 13 Message échec - ["success" => false, - "title" => "Add a job category.", - "info" => "Category not added.", - "timer" => true, - "toSrc" => true], + "adminAddJob" => [ + "success" => [ + "success" => true, + "title" => "Add a job category.", + "info" => "Category added !", + "timer" => true, + "toSrc" => true + ], + "fail" => [ + "success" => false, + "title" => "Add a job category.", + "info" => "Category not added.", + "timer" => true, + "toSrc" => true + ] + ], // Suppression categorie - // 14 Message réussitee - ["success" => true, - "title" => "Deletion of a job category.", - "info" => "Category deleted !", - "timer" => true, - "toSrc" => true], - // 15 Message échec - ["success" => false, - "title" => "Deletion of a job category.", - "info" => "Category not deleted !", - "timer" => true, - "toSrc" => true], + "adminDelJob" => [ + "success" => [ + "success" => true, + "title" => "Deletion of a job category.", + "info" => "Category deleted !", + "timer" => true, + "toSrc" => true + ], + "delete" => [ + "success" => false, + "title" => "Deletion of a job category.", + "info" => "Category not deleted !", + "timer" => true, + "toSrc" => true + ] + ], ]; ?> \ No newline at end of file diff --git a/Views/Includes/en/table.php b/Views/Includes/en/table.php index 0b778af..93a0e86 100644 --- a/Views/Includes/en/table.php +++ b/Views/Includes/en/table.php @@ -4,43 +4,64 @@ // **************************************************************************** $header = [ // En-tête des colonnes du tableau Delete de l'admin. - // 0 - ["ID Number", - "Email", - "Crypted Password", - "Token for auto-login", - "Inscription date", - "Is user?", - "Is consultant?", - "Is admin?"], + "adminDel" => [ + "ID Number", + "Email", + "Crypted Password", + "Token for auto-login", + "Inscription date", + "User status" + ], // En-tête des colonnes du tableau Search de l'index. - // 1 - ["Last name", - "First name", - "Job", - "Capabilities", - "Number of missions", - "Note", - "Stars"], + "search" => [ + "Last name", + "First name", + "Job", + "Capabilities", + "Number of missions", + "Note", + "Stars" + ], // En-tête des colonnes du tableau More infos de l'index. - // 2 - ["Last name", - "First name", - "Job", - "Degree", - "Capabilities", - "Description", - "Phone number", - "Adress", - "Zip code", - "City"], + "moreInfos" => [ + "Last name", + "First name", + "Job", + "Degree", + "Capabilities", + "Description", + "Phone number", + "Adress", + "Zip code", + "City" + ], // En-tête des colonnes du tableau mes missions. - // 3 - ["Subject", - "Note", - "Review", - "Client Lastname"] + "pendingMissions" => [ + "Request date", + "Pro name", + "Job", + "Subject" + ], + // En-tête des colonnes du tableau mes missions. + "ongoingMissions" => [ + "Accpeted by pro date", + "Pro name", + "Job", + "Subject", + "Validated by client date", + "Validated by pro date" + ], + // En-tête des colonnes du tableau mes missions. + "completedMissions" => [ + "Request date", + "Started date", + "Validation by client date", + "Validation by pro date", + "Pro name", + "job", + "Subject", + "Review", + "Note" + ] ]; -$yes = "Yes"; -$no = "No"; ?> \ No newline at end of file diff --git a/Views/Includes/en/text.php b/Views/Includes/en/text.php index 73aa268..21e273b 100644 --- a/Views/Includes/en/text.php +++ b/Views/Includes/en/text.php @@ -40,14 +40,19 @@ $text = [ "submit" => "Sign-in" ], "incl_form_mission" => [ - "h2" => "Form to register a mission", - "subject" => "Subject", - "review" => "Review", - "consultantId" => "Consultant ID", - "submit" => "Register" + "h2" => "Form to register a mission", + "subject" => "Subject", + "review" => "Review", + "proId" => "Pro ID", + "submit" => "Register", + "jobsSel" => "Jobs" ], "incl_table_myMission" => [ - "h2" => "My missions" + "pendingMission" => "Pending missions", + "ongoingMission" => "Ongoing missions", + "completedMission" => "Completed missions", + "accept" => "Accept", + "validate" => "Validate" ], "incl_global_navbar" => [ "h2" => "AlphaJob", @@ -63,23 +68,24 @@ $text = [ "btnLang" => "Select" ], "incl_form_register" => [ - "h2" => "Form to sign-in", - "email" => "Email", - "password" => "Password", - "notice" => "For the purpose of the exam only:", - "isUser" => "Is user?", - "isConsultant" => "Is consultant?", - "isAdmin" => "Is admin?", - "submit" => "Sign-up" + "h2" => "Form to sign-in", + "email" => "Email", + "password" => "Password", + "notice" => "Admin is here for the purpose of the exam only:", + "isAdmin" => "Is admin?", + "isPro" => "Is pro?", + "isClient" => "Is client?", + "submit" => "Sign-up" ], "incl_index_search" => [ "h2" => "Search by lastname", "searchBar" => "Lastname", "submit" => "Search", - "moreInfo" => "More info" + "moreInfo" => "More info", + "mandate" => "Mandate" ], "incl_index_slideshow" => [ - "slide1" => "Find the right consultant for you.

For all your needs.

AlphaJob", + "slide1" => "Find the right proffessional for you.

For all your needs.

AlphaJob", "slide2" => "Only the bests proffessionals can register!

Quality of work guarantee!

AlphaJob", "slide3" => "Find the bests offers for your website today.

Discover our ready to use solutions.

AlphaJob" ] diff --git a/Views/Includes/fr/message.php b/Views/Includes/fr/message.php index dbf66f9..e9de43d 100644 --- a/Views/Includes/fr/message.php +++ b/Views/Includes/fr/message.php @@ -5,111 +5,196 @@ $success = "Réussite"; $error = "Erreur"; $redirect = "Redirection dans "; -$message = [ - // Delete - // 0 Message réussitee - ["success" => 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, - "toSrc" => true], +$messageText = [ // Informations de l'utilisateur - // 2 Message réussitee - ["success" => true, - "title" => "Modification des infos de l'utilisateur.", - "info" => "Informations mises à jour !", - "timer" => true, - "toSrc" => true], + "infosUpdate" => [ + "success" => [ + "success" => true, + "title" => "Mise à jour des informations.", + "info" => "Informations mise à jour!", + "timer" => true, + "toSrc" => true + ] + ], // Login sans cookie - // 3 Message réussitee - ["success" => 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, - "toSrc" => true], + "login" => [ + "success" => [ + "success" => true, + "title" => "Connection.", + "info" => "Connection réussie!", + "timer" => true, + "toSrc" => false + ], + "fail" => [ + "success" => false, + "title" => "Connection.", + "info" => "Erreur, connection échouée.", + "timer" => true, + "toSrc" => true + ] + ], // Login avec cookie - // 5 Message réussitee - ["success" => true, - "title" => "", - "info" => "", - "timer" => false, - "toSrc" => false], - // 6 Message échec - ["success" => false, - "title" => "Connection avec cookie.", - "info" => "Erreur lors de la connection automatique.", - "timer" => true, - "toSrc" => false], + "loginCookie" => [ + "success" => [ + "success" => true, + "title" => "", + "info" => "", + "timer" => false, + "toSrc" => false + ], + "fail" => [ + "success" => false, + "title" => "Connection avec auto-connection.", + "info" => "Erreur, connection échouée.", + "timer" => true, + "toSrc" => false + ] + ], // Log out - // 7 Message global - ["success" => true, - "title" => "Déconnection.", - "info" => "Vous êtes déconnecté!", - "timer" => true, - "toSrc" => false], + "logout" => [ + "success" => [ + "success" => 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, - "toSrc" => true], - // 9 Message échec - ["success" => false, - "title" => "Enregistrement d'une mission.", - "info" => "Erreur, l'ID du consultant est probablement faux.", - "timer" => true, - "toSrc" => true], + "missionRegister" => [ + "success" => [ + "success" => true, + "title" => "Requête de mission.", + "info" => "La requete a été émise!", + "timer" => true, + "toSrc" => true + ], + "fail" => [ + "success" => false, + "title" => "Requête de mission.", + "info" => "Erreur lors de la requête.", + "timer" => true, + "toSrc" => true + ] + ], + // Acceptation d'une mission + "missionAccepted" => [ + "success" => [ + "success" => true, + "title" => "Mission info.", + "info" => "Mission acceptée!", + "timer" => true, + "toSrc" => true + ], + "fail" => [ + "success" => false, + "title" => "Mission info.", + "info" => "Erreur, mission non acceptée.", + "timer" => true, + "toSrc" => true + ] + ], + // Validation d'une mission + "missionValidated" => [ + "success" => [ + "success" => true, + "title" => "Mission info.", + "info" => "Mission completée!", + "timer" => true, + "toSrc" => true + ], + "fail" => [ + "success" => false, + "title" => "Mandate info.", + "info" => "Erreur, mission non enregistrée comme completée.", + "timer" => true, + "toSrc" => true + ] + ], + // Ajout d'un commentaire & note + "missionReview" => [ + "success" => [ + "success" => true, + "title" => "Avis sur la mission.", + "info" => "Votre avis a bien été enregistré!", + "timer" => true, + "toSrc" => true + ], + "fail" => [ + "success" => false, + "title" => "Avis sur la mission.", + "info" => "Erreur, votre avis n'a pas été enregistré.", + "timer" => true, + "toSrc" => true + ] + ], // Ajout utilisateur - // 10 Message réussitee - ["success" => true, - "title" => "Inscription", - "info" => "Utilisateur inscrit !", - "timer" => true, - "toSrc" => true], - // 11 Message échec - ["success" => false, - "title" => "Inscription.", - "info" => "Erreur, utilisateur non enregistré.", - "timer" => true, - "toSrc" => true], + "userAdd" => [ + "success" => [ + "success" => true, + "title" => "Enregistrement d'un utilisateur.", + "info" => "Utilisateur enregustré!", + "timer" => true, + "toSrc" => true + ], + "fail" => [ + "success" => false, + "title" => "Enregistrement d'un utilisateur.", + "info" => "Erreur, l'utilisateur n'a pas été enregistré.", + "timer" => true, + "toSrc" => true + ] + ], + // Delete utilisateur + "adminDelete" => [ + "success" => [ + "success" => true, + "title" => "Suppression d'un utilisateur.", + "info" => "Utilisateur supprimé!", + "timer" => true, + "toSrc" => true + ], + "fail" => [ + "success" => false, + "title" => "Suppression d'un utilisateur.", + "info" => "Erreur, l'utilisateur n'a pas été supprimé.", + "timer" => true, + "toSrc" => true + ] + ], // Ajout categorie - // 12 Message réussitee - ["success" => true, - "title" => "Ajout d'une categorie.", - "info" => "Categorie ajoutée !", - "timer" => true, - "toSrc" => true], - // 13 Message échec - ["success" => false, - "title" => "Ajout d'une categorie.", - "info" => "Categorie non ajoutée.", - "timer" => true, - "toSrc" => true], + "adminAddJob" => [ + "success" => [ + "success" => true, + "title" => "Ajout d'une catégorie d'emploi.", + "info" => "La catégorie a bien été ajoutée!", + "timer" => true, + "toSrc" => true + ], + "fail" => [ + "success" => false, + "title" => "Ajout d'une catégorie d'emploi.", + "info" => "Erreur, la catégorie n'a pas été ajoutée.", + "timer" => true, + "toSrc" => true + ] + ], // Suppression categorie - // 14 Message réussitee - ["success" => true, - "title" => "Suppression d'une categorie.", - "info" => "Categorie supprimée !", - "timer" => true, - "toSrc" => true], - // 15 Message échec - ["success" => false, - "title" => "Suppression d'une categorie.", - "info" => "Categorie non supprimée.", - "timer" => true, - "toSrc" => true], + "adminDelJob" => [ + "success" => [ + "success" => true, + "title" => "Suppression d'une catégorie.", + "info" => "Categorie supprimée!", + "timer" => true, + "toSrc" => true + ], + "delete" => [ + "success" => false, + "title" => "Suppression d'une catégorie.", + "info" => "Erreur, la catégorie n'a pas été supprimée.", + "timer" => true, + "toSrc" => true + ] + ], ]; ?> \ No newline at end of file diff --git a/Views/Includes/fr/table.php b/Views/Includes/fr/table.php index 2eeb389..90fb806 100644 --- a/Views/Includes/fr/table.php +++ b/Views/Includes/fr/table.php @@ -4,43 +4,64 @@ // **************************************************************************** $header = [ // En-tête des colonnes du tableau Delete de l'admin. - // 0 - ["Numéro ID", - "Email", - "Mot de passe chiffré", - "Jeton d'auto-connection", - "Date d'inscription", - "Est utilisateur?", - "Est consultant?", - "Est admin?"], + "adminDel" => [ + "Numéro ID", + "Email", + "Mot de passe chiffré", + "Jeton d'auto-connection", + "Date d'inscription", + "Status de l'utilisateur" + ], // En-tête des colonnes du tableau Search de l'index. - // 1 - ["Nom", - "Prénom", - "Emploi", - "Capacités", - "Nombre de mission", - "Note", - "Etoile"], + "search" => [ + "Nom", + "Prénom", + "Emploi", + "Capacités", + "Nombre de mission", + "Note", + "Etoile" + ], // En-tête des colonnes du tableau More infos de l'index. - // 2 - ["Nom", - "Prénom", - "Emploi", - "Diplôme", - "Capacités", - "Description", - "Numéro de téléphone", - "Adresse", - "Code postal", - "Ville"], + "moreInfos" => [ + "Nom", + "Prénom", + "Emploi", + "Diplôme", + "Capacités", + "Description", + "Numéro de téléphone", + "Adresse", + "Code postal", + "Ville" + ], // En-tête des colonnes du tableau mes missions. - // 3 - ["Sujet", - "Note", - "Commentaire", - "Nom du client"] + "pendingMissions" => [ + "Requete emise le", + "Nom du pro", + "Emploi", + "Sujet" + ], + // En-tête des colonnes du tableau mes missions. + "ongoingMissions" => [ + "Accpeté par le pro le", + "Nom du pro", + "Emploi", + "Sujet", + "Date de validation du client", + "Date de validation du pro" + ], + // En-tête des colonnes du tableau mes missions. + "completedMissions" => [ + "Requete emise le", + "Débuté le", + "Validé par le client le", + "Validé par le pro le", + "Nom du pro", + "Emploi", + "Sujet", + "Avis", + "Note" + ] ]; -$yes = "Oui"; -$no = "Non"; ?> \ No newline at end of file diff --git a/Views/Includes/fr/text.php b/Views/Includes/fr/text.php index dd6d655..85814e0 100644 --- a/Views/Includes/fr/text.php +++ b/Views/Includes/fr/text.php @@ -40,14 +40,19 @@ $text = [ "submit" => "Connection" ], "incl_form_mission" => [ - "h2" => "Formulaire pour enregistrer une mission", - "subject" => "Sujet", - "review" => "Commentaire", - "consultantId" => "ID du consultant", - "submit" => "Enregistrer" + "h2" => "Formulaire pour enregistrer une mission", + "subject" => "Sujet", + "review" => "Commentaire", + "proId" => "ID du pro", + "submit" => "Enregistrer", + "jobsSel" => "Emplois" ], "incl_table_myMission" => [ - "h2" => "Mes missions" + "pendingMission" => "Missions en attente", + "ongoingMission" => "Missions en cours", + "completedMission" => "Missions terminées", + "accept" => "Accepter", + "validate" => "Valider" ], "incl_global_navbar" => [ "h2" => "AlphaJob", @@ -63,23 +68,24 @@ $text = [ "btnLang" => "Sélectionner" ], "incl_form_register" => [ - "h2" => "Formulaire d'inscription", - "email" => "Email", - "password" => "Mot de passe", - "notice" => "Pour les besoins de l'examen seulement:", - "isUser" => "Est utilisateur?", - "isConsultant" => "Est consultant?", - "isAdmin" => "Est admin?", - "submit" => "S'inscrire" + "h2" => "Formulaire d'inscription", + "email" => "Email", + "password" => "Mot de passe", + "notice" => "Admin est présent pour les besoins de l'examen uniquement:", + "isClient" => "Est client?", + "isPro" => "Est pro?", + "isAdmin" => "Est admin?", + "submit" => "S'inscrire" ], "incl_index_search" => [ - "h2" => "Recherche de consultant par nom", + "h2" => "Recherche de pro par nom", "searchBar" => "Nom", "submit" => "Rechercher", - "moreInfo" => "Plus d'infos" + "moreInfo" => "Plus d'infos", + "mandate" => "Mandater" ], "incl_index_slideshow" => [ - "slide1" => "Trouvez le consultant idéal proche de chez vous.

Pour tous vos besoins.

AlphaJob", + "slide1" => "Trouvez le proffessionel idéal proche de chez vous.

Pour tous vos besoins.

AlphaJob", "slide2" => "Seuls les meilleurs professionnels sont acceptés.

Qualité guarantie.

AlphaJob", "slide3" => "Les meilleurs offres pour créer votre site Web.

Découvrez nos solutions clefs en main.

AlphaJob" ] diff --git a/Views/Includes/incl_form_admin.php b/Views/Includes/incl_form_admin.php index 7f7963d..6176bc4 100644 --- a/Views/Includes/incl_form_admin.php +++ b/Views/Includes/incl_form_admin.php @@ -64,7 +64,7 @@ echo(" ".PHP_EOL); // Affichage des en-tête de colonne. -foreach($header[0] as $header) { +foreach($header["adminDel"] as $header) { echo(" ".$header."".PHP_EOL); } echo(" ".PHP_EOL); @@ -73,13 +73,23 @@ 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(" 
".$yes."".PHP_EOL);
-        } elseif (($key == "isClient" || $key == "isPro" || $key == "isAdmin") && $value == "0") {
-            echo("                
".$no."".PHP_EOL);
-        } else {
-            echo("                
".$value."
".PHP_EOL);
+        switch ($key) {
+            case "userStatus":
+                switch ($value) {
+                    case 0:
+                        echo("                
Admin
".PHP_EOL);
+                        break;
+                    case 1:
+                        echo("                
Pro
".PHP_EOL);
+                        break;
+                    case 2:
+                        echo("                
Client
".PHP_EOL);
+                        break;
+                }
+                break;
+            default:
+                echo("                
".$value."
".PHP_EOL);
+                break;
         }
     }
     echo("            ".PHP_EOL);
diff --git a/Views/Includes/incl_form_mission.php b/Views/Includes/incl_form_mission.php
index 4d6d311..345dca2 100644
--- a/Views/Includes/incl_form_mission.php
+++ b/Views/Includes/incl_form_mission.php
@@ -4,35 +4,62 @@
 // ****************************************************************************
 // Import des textes en fonction de la langue définie dans la variable "lang" de la session.
 require_once(dirname(__FILE__)."/".$_SESSION["lang"]."/text.php");
-echo('        

-        

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

-            

-                
-                
-                
-                
-                
-            

-        
'.PHP_EOL);
+// Import des méthodes de la base de donnée pour les recherches.
+require_once(dirname( __FILE__ )."/../../Database/meth_dbsearch.php");
+if (isset($_SESSION["missionInitiate"]) 
+    && count($_SESSION["missionInitiate"]) > 0
+) {
+    echo('        

+            

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

+                

+                    
+                    
+                    
+                    
+                

+            
'.PHP_EOL);
+    unset($_SESSION["missionInitiate"]);
+
+} elseif (isset($_SESSION["missionCompleted"]) 
+          && count($_SESSION["missionCompleted"]) > 0
+) {
+    echo('

+    

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

+        

+            
+            ');
+            echo('      
+                        
+                    

+                
'.PHP_EOL);
+    unset($_SESSION["missionCompleted"]);
+
+} else {
+    header("Location: /Views/myMission.php");
+    die();
+}
 ?>
\ No newline at end of file
diff --git a/Views/Includes/incl_form_register.php b/Views/Includes/incl_form_register.php
index bb046ce..b98365b 100644
--- a/Views/Includes/incl_form_register.php
+++ b/Views/Includes/incl_form_register.php
@@ -19,9 +19,9 @@ echo('        
                     
                 
                 
-                
-                
-                
+                
+                
+                
                 
             
         '.PHP_EOL);
diff --git a/Views/Includes/incl_form_userInfo.php b/Views/Includes/incl_form_userInfo.php
index 80d61ad..c79e687 100644
--- a/Views/Includes/incl_form_userInfo.php
+++ b/Views/Includes/incl_form_userInfo.php
@@ -54,21 +54,17 @@ echo('        
                     
                 '.PHP_EOL);
 // TODO : Commenter
-if ($_SESSION["isPro"]) {
+if ($_SESSION["userStatus"] == 1) {
     $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('