diff options
Diffstat (limited to 'Views')
| -rw-r--r-- | Views/Includes/en/message.php | 281 | ||||
| -rw-r--r-- | Views/Includes/en/table.php | 91 | ||||
| -rw-r--r-- | Views/Includes/en/text.php | 38 | ||||
| -rw-r--r-- | Views/Includes/fr/message.php | 281 | ||||
| -rw-r--r-- | Views/Includes/fr/table.php | 91 | ||||
| -rw-r--r-- | Views/Includes/fr/text.php | 40 | ||||
| -rw-r--r-- | Views/Includes/incl_form_admin.php | 26 | ||||
| -rw-r--r-- | Views/Includes/incl_form_mission.php | 89 | ||||
| -rw-r--r-- | Views/Includes/incl_form_register.php | 6 | ||||
| -rw-r--r-- | Views/Includes/incl_form_userInfo.php | 12 | ||||
| -rw-r--r-- | Views/Includes/incl_global_message.php | 13 | ||||
| -rw-r--r-- | Views/Includes/incl_global_navbar.php | 35 | ||||
| -rw-r--r-- | Views/Includes/incl_index_search.php | 129 | ||||
| -rw-r--r-- | Views/Includes/incl_index_slideshow.php | 16 | ||||
| -rw-r--r-- | Views/Includes/incl_table_myMission.php | 147 | ||||
| -rw-r--r-- | Views/admin.php | 4 | ||||
| -rw-r--r-- | Views/message.php | 2 | ||||
| -rw-r--r-- | Views/mission.php | 8 | ||||
| -rw-r--r-- | Views/myMission.php | 10 |
19 files changed, 868 insertions, 451 deletions
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.<br><br>For all your needs.<br><br><span>AlphaJob</span>", + "slide1" => "Find the right proffessional for you.<br><br>For all your needs.<br><br><span>AlphaJob</span>", "slide2" => "Only the bests proffessionals can register!<br><br>Quality of work guarantee!<br><br><span>AlphaJob</span>", "slide3" => "Find the bests offers for your website today.<br><br>Discover our ready to use solutions.<br><br><span>AlphaJob</span>" ] 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.<br><br>Pour tous vos besoins.<br><br><span>AlphaJob</span>", + "slide1" => "Trouvez le proffessionel idéal proche de chez vous.<br><br>Pour tous vos besoins.<br><br><span>AlphaJob</span>", "slide2" => "Seuls les meilleurs professionnels sont acceptés.<br><br>Qualité guarantie.<br><br><span>AlphaJob</span>", "slide3" => "Les meilleurs offres pour créer votre site Web.<br><br>Découvrez nos solutions clefs en main.<br><br><span>AlphaJob</span>" ] 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(" <!-- Tableau des utilisateurs--> <!-- En-tête --> <tr>".PHP_EOL); // Affichage des en-tête de colonne. -foreach($header[0] as $header) { +foreach($header["adminDel"] as $header) { echo(" <th>".$header."</th>".PHP_EOL); } echo(" </tr>".PHP_EOL); @@ -73,13 +73,23 @@ foreach ($result as $rows) { echo(" <!-- Utilisateurs --> <tr>".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(" <td><pre>".$yes."<prepre></td>".PHP_EOL); - } elseif (($key == "isClient" || $key == "isPro" || $key == "isAdmin") && $value == "0") { - echo(" <td><pre>".$no."<prepre></td>".PHP_EOL); - } else { - echo(" <td><pre>".$value."</pre></td>".PHP_EOL); + switch ($key) { + case "userStatus": + switch ($value) { + case 0: + echo(" <td><pre>Admin<pre></td>".PHP_EOL); + break; + case 1: + echo(" <td><pre>Pro<pre></td>".PHP_EOL); + break; + case 2: + echo(" <td><pre>Client<pre></td>".PHP_EOL); + break; + } + break; + default: + echo(" <td><pre>".$value."</pre></td>".PHP_EOL); + break; } } echo(" </tr>".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(' <div class="separator"></div> - <div id="mission"> - <h2>'.$text[basename(__FILE__, ".php")]["h2"].'</h2> - <form id="missionForm" action="/../Wrapper/wrapper.php" method="post"> - <label> - <i class="fas fa-edit"></i> - <input type="text" name="subject" placeholder="'.$text[basename(__FILE__, ".php")]["subject"].'" maxlength="128" required> - </label> - <label class="flex-start"> - <i class="far fa-star"></i> - <select name="note" required> - <option value="" selected disabled hidden>Note</option> - <option value="5">5</option> - <option value="4">4</option> - <option value="3">3</option> - <option value="2">2</option> - <option value="1">1</option> - <option value="0">0</option> - </select> - </label> - <label> - <i class="far fa-comment-alt"></i> - <textarea name="review" placeholder="'.$text[basename(__FILE__, ".php")]["review"].'" required></textarea> - </label> - <label> - <i class="fas fa-user-cog"></i> - <input type="text" name="proId" placeholder="'.$text[basename(__FILE__, ".php")]["consultantId"].'" maxlength="10" required> - </label> - <input type="submit" value="'.$text[basename(__FILE__, ".php")]["submit"].'"> - </form> - </div>'.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(' <div class="separator"></div> + <div id="mission"> + <h2>'.$text[basename(__FILE__, ".php")]["h2"].'</h2> + <form id="missionForm" action="/../Wrapper/wrapper.php" method="post"> + <label> + <i class="fas fa-edit"></i> + <input type="text" name="missionSubject" placeholder="'.$text[basename(__FILE__, ".php")]["subject"].'" maxlength="128" required> + </label> + <select name="missionJob"> + <option value="" selected>'.$text[basename(__FILE__, ".php")]["jobsSel"].'</option>'.PHP_EOL); + for ($i = 0; $i < count($_SESSION["missionInitiate"]["proJobs"]); $i++) { + echo(' <option value="'.$_SESSION["missionInitiate"]["proJobs"][$i]["jobCategoryId"].'">'.$_SESSION["missionInitiate"]["proJobs"][$i]["jobCategoryName".ucwords($_SESSION["lang"])].'</option>'.PHP_EOL); + } + echo(' </select> + <input type="hidden" name="missionProId" value="'.$_SESSION["missionInitiate"]["proId"].'"> + <input type="submit" value="'.$text[basename(__FILE__, ".php")]["submit"].'"> + </form> + </div>'.PHP_EOL); + unset($_SESSION["missionInitiate"]); + +} elseif (isset($_SESSION["missionCompleted"]) + && count($_SESSION["missionCompleted"]) > 0 +) { + echo('<div class="separator"></div> + <div id="mission"> + <h2>'.$text[basename(__FILE__, ".php")]["h2"].'</h2> + <form id="missionForm" action="/../Wrapper/wrapper.php" method="post"> + <label class="flex-start"> + <i class="far fa-star"></i> + <select name="note" required> + <option value="" selected disabled hidden>Note</option> + <option value="5">5</option> + <option value="4">4</option> + <option value="3">3</option> + <option value="2">2</option> + <option value="1">1</option> + <option value="0">0</option> + </select> + </label> + <label> + <i class="far fa-comment-alt"></i> + <textarea name="review" placeholder="'.$text[basename(__FILE__, ".php")]["review"].'" required></textarea> + </label>'); + echo(' <input type="hidden" name="missionCompletedId" value="'.$_SESSION["missionCompleted"]["missionId"].'"> + <input type="submit" value="'.$text[basename(__FILE__, ".php")]["submit"].'"> + </form> + </div>'.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(' <!-- Separateur --> <input type="password" name="password" id="password" maxlength="128" placeholder="'.$text[basename(__FILE__, ".php")]["password"].'" maxlength="128" required> </label> <label class="info flex-center">'.$text[basename(__FILE__, ".php")]["notice"].'</label> - <label for="is_user" class="flex-center"><input type="checkbox" name="is_client" id="is_user">'.$text[basename(__FILE__, ".php")]["isUser"].'</label> - <label for="is_consultant" class="flex-center"><input type="checkbox" name="is_pro" id="is_consultant">'.$text[basename(__FILE__, ".php")]["isConsultant"].'</label> - <label for="is_admin" class="flex-center"><input type="checkbox" name="is_admin" id="is_admin">'.$text[basename(__FILE__, ".php")]["isAdmin"].'</label> + <label for="isAdmin" class="flex-center"><input type="radio" id="isAdmin" name="userStatus" value="0">'.$text[basename(__FILE__, ".php")]["isAdmin"].'</label> + <label for="isPro" class="flex-center"><input type="radio" id="isPro" name="userStatus" value="1">'.$text[basename(__FILE__, ".php")]["isPro"].'</label> + <label for="isClient" class="flex-center"><input type="radio" id="isClient" name="userStatus" value="2">'.$text[basename(__FILE__, ".php")]["isClient"].'</label> <input type="submit" value="'.$text[basename(__FILE__, ".php")]["submit"].'"> </form> </div>'.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(' <!-- Separateur --> <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"]) { +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(' <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); + for ($i = 0; $i < count($allJobs); $i++) { + echo(' <option value="'.$allJobs[$i]["jobCategoryId"].'">'.$allJobs[$i]["jobCategoryName".ucwords($_SESSION["lang"])].'</option>'.PHP_EOL); } echo(' </select> <button type="button" onclick="add()">'.$text[basename(__FILE__, ".php")]["jobsAdd"].'</button> @@ -77,7 +73,7 @@ if ($_SESSION["isPro"]) { echo(' Mes jobs <ul id="jobsList">'.PHP_EOL); for ($i = 0; $i < count($proJobs); $i++) { - echo(' <li>'.$dictJobs[$proJobs[$i]].'</li>'.PHP_EOL); + echo(' <li>'.$proJobs[$i]["jobCategoryName".ucwords($_SESSION["lang"])].'</li>'.PHP_EOL); } echo(' </ul> <input type="hidden" name="jobs" id="jobs" value="">'.PHP_EOL); diff --git a/Views/Includes/incl_global_message.php b/Views/Includes/incl_global_message.php index b15d00e..304e906 100644 --- a/Views/Includes/incl_global_message.php +++ b/Views/Includes/incl_global_message.php @@ -4,18 +4,19 @@ // **************************************************************************** // Import des différents messages possibles. require_once(dirname( __FILE__ )."/".$_SESSION["lang"]."/message.php"); +$name = $_SESSION["message"][0]; +$status = $_SESSION["message"][1]; echo('<div class="separator"></div>'); -echo('<div id="message"><h2>'.$message[$_SESSION["messageNumber"]]["title"].'</h3>'); -if ($message[$_SESSION["messageNumber"]]["success"]) { +echo('<div id="message"><h2>'.$messageText[$name][$status]["title"].'</h3>'); +if ($messageText[$name][$status]["success"]) { echo('<h3 class="success">'.$success.'</h3>'); } else { echo('<h3 class="error">'.$error.'</h3>'); } -echo("<p>".$message[$_SESSION["messageNumber"]]["info"]."</p>"); +echo("<p>".$messageText[$name][$status]["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 ($messageText[$name][$status]["toSrc"]) { if ($_SESSION["src"] !== "index") { $dest = "Views/".$_SESSION["src"]; } else { @@ -24,7 +25,7 @@ if ($message[$_SESSION["messageNumber"]]["toSrc"]) { } else { $dest = "index"; } -if ($message[$_SESSION["messageNumber"]]["timer"]) { +if ($messageText[$name][$status]["timer"]) { echo('<script>start_timer("'.$dest.'");</script>'); } else { echo('<script>redirect("'.$dest.'")</script>'); diff --git a/Views/Includes/incl_global_navbar.php b/Views/Includes/incl_global_navbar.php index 1572fa6..664d6ff 100644 --- a/Views/Includes/incl_global_navbar.php +++ b/Views/Includes/incl_global_navbar.php @@ -14,26 +14,29 @@ echo(' <!-- Navbar --> <ul class="userManager"> <a href="/index.php#separator2"><li><i class="fas fa-search"></i> '.$text[basename(__FILE__, ".php")]["btnSearch"].'</li></a>'.PHP_EOL); // Affichage des éléments en fonction de si l'utilisateur est connecté ou non et de ses fonctions. -if (isset($_SESSION["loggedIn"]) +if (isset($_SESSION["loggedIn"], $_SESSION["userStatus"]) && $_SESSION["loggedIn"] == "1" - ) { - if (isset($_SESSION["isClient"]) - && $_SESSION["isClient"] == "1" - ) { - echo(' <a href="/Views/mission.php"><li><i class="fas fa-plus-square"></i> '.$text[basename(__FILE__, ".php")]["btnMission"].'</li></a>'.PHP_EOL); +) { + // Switch -> https://www.php.net/manual/fr/control-structures.switch.php + // https://stackoverflow.com/questions/6330114/do-you-need-break-in-switch-when-return-is-used + switch ($_SESSION["userStatus"]) { + case 0: + $status = 'Admin'; + echo(' <a href="/Views/admin.php"><li><i class="fas fa-cog"></i> '.$text[basename(__FILE__, ".php")]["btnAdmin"].'</li></a>'.PHP_EOL); + break; + case 1: + $status = 'Pro'; + echo(' <a href="/Views/myMission.php"><li><i class="fas fa-tasks"></i> '.$text[basename(__FILE__, ".php")]["btnMyMission"].'</li></a>'.PHP_EOL); + break; + case 2: + $status = 'Client'; + echo(' <a href="/Views/myMission.php"><li><i class="fas fa-tasks"></i> '.$text[basename(__FILE__, ".php")]["btnMyMission"].'</li></a>'.PHP_EOL); + break; } - if (isset($_SESSION["isPro"]) - && $_SESSION["isPro"] == "1" - ) { - echo(' <a href="/Views/myMission.php"><li><i class="fas fa-tasks"></i> '.$text[basename(__FILE__, ".php")]["btnMyMission"].'</li></a>'.PHP_EOL); - } - if (isset($_SESSION["isAdmin"]) - && $_SESSION["isAdmin"] == "1" - ) { - 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); + + echo('<li>'.$_SESSION["email"].'<br>'.$status.'</li>'.PHP_EOL); } else { echo(' <a href="/Views/login.php"><li><i class="fas fa-sign-in-alt"></i> '.$text[basename(__FILE__, ".php")]["btnLogin"].'</li></a> <a href="/Views/register.php"><li><i class="fas fa-user-plus"></i> '.$text[basename(__FILE__, ".php")]["btnRegister"].'</li></a>'.PHP_EOL); diff --git a/Views/Includes/incl_index_search.php b/Views/Includes/incl_index_search.php index a0e0be4..ac107b7 100644 --- a/Views/Includes/incl_index_search.php +++ b/Views/Includes/incl_index_search.php @@ -23,65 +23,96 @@ echo(' <!-- Form de recherche --> // Si l'index est chargé avec des données dans la variable "search" de la session, // c'est qu'une recherche à été effectuée, on affiche alors le contenu de cette recherche en tableau. if (isset($_SESSION["search"])) { - echo("<table><tr>"); + echo("<table>"); // Si la variable isResearch est vrai, c'est une rechreche. if ($_SESSION["search"]["isResearch"]) { - foreach ($header[1] as $header) { - echo("<th><pre>".$header."</pre></th>"); - } - // Sinon c'est un "Plus d'info". - } else { - foreach ($header[2] as $header) { - echo("<th><pre>".$header."</pre></th>"); - } - } - // On affiche le résultat de la recherche ou du "Plus d'info". - echo("</tr>"); - foreach ($_SESSION["search"]["result"] as $rows) { echo("<tr>"); - foreach ($rows as $key => $value) { - if ($key !== "id") { - if ($key !== "star") { - echo("<td><pre>".$value."</pre></td>"); - } else { - if ($value) { - echo('<td>'); - $missingStar = 5 - $value; - for ($i = 0; $i < $value; $i++) { - echo('<i class="fa fa-star star checked"></i>'); - } - if ($missingStar) { - for ($i = 0; $i < $missingStar; $i++) { - echo('<i class="fa fa-star star unchecked"></i>'); - } - } - } else { - echo('<td>N/A'); + for ($i = 0; $i < count($header["search"]); $i++) { + echo("<th><pre>".$header["search"][$i]."</pre></th>"); + } + echo("</tr>"); + foreach ($_SESSION["search"]["result"] as $result) { + echo("<tr>"); + echo("<td><pre>".$result["lastname"]."</pre></td>"); + echo("<td><pre>".$result["firstname"]."</pre></td>"); + // jobs + if (count($result["jobs"]) > 0) { + $jobsName = array(); + for ($i = 0; $i < count($result["jobs"]); $i++) { + array_push($jobsName, $result["jobs"][$i]["jobCategoryName".ucwords($_SESSION["lang"])]); + } + echo("<td><pre>".join(", ", $jobsName)."</pre></td>"); + } else { + echo('<td>N/A</td>'); + } + echo("<td><pre>".$result["capability"]."</pre></td>"); + echo("<td><pre>".$result["numberOfMissions"]."</pre></td>"); + echo("<td><pre>".$result["note"]."</pre></td>"); + // I'm a star !! + if ($result["star"]) { + echo('<td>'); + $missingStar = 5 - $result["star"]; + for ($i = 0; $i < $result["star"]; $i++) { + echo('<i class="fa fa-star star checked"></i>'); + } + if ($missingStar) { + for ($i = 0; $i < $missingStar; $i++) { + echo('<i class="fa fa-star star unchecked"></i>'); } - echo("</td>"); } + echo("</td>"); + } else { + echo('<td>N/A</td>'); } - } - // Si c'est une recherche on ajoute le bouton plus d'info, - // pour plus d'info avec une recherche par ID. - if ($_SESSION["search"]["isResearch"]) { + // Si c'est une recherche on ajoute le bouton plus d'info, + // pour plus d'info avec une recherche par Id. echo('<td class="noBorder" > - <form action="/Wrapper/wrapper.php" method="post"> - <input type="hidden" name="searchInfo" value="'.$rows["userId"].'"> - <input type="submit" value="'.$text[basename(__FILE__, ".php")]["moreInfo"].'"> - </form> - </td>'); + <form action="/Wrapper/wrapper.php" method="post"> + <input type="hidden" name="moreInfoProId" value="'.$result["userId"].'"> + <input type="submit" value="'.$text[basename(__FILE__, ".php")]["moreInfo"].'"> + </form> + </td>'); + echo("</tr>"); } - echo("</tr>"); + echo("</table>"); + // Sinon c'est un "Plus d'info". + } else { + echo("<tr>"); + for ($i = 0; $i < count($header["moreInfos"]); $i++) { + echo("<th><pre>".$header["moreInfos"][$i]."</pre></th>"); + } + echo('</tr> + <tr> + <td><pre>'.$_SESSION["search"]["result"][0]["lastname"].'</pre></td> + <td><pre>'.$_SESSION["search"]["result"][0]["firstname"].'</pre></td>'); + // jobs + if (count($_SESSION["search"]["result"][0]["jobs"]) > 0) { + $jobsName = array(); + for ($i = 0; $i < count($_SESSION["search"]["result"][0]["jobs"]); $i++) { + array_push($jobsName, $_SESSION["search"]["result"][0]["jobs"][$i]["jobCategoryName".ucwords($_SESSION["lang"])]); + } + echo("<td><pre>".join(", ", $jobsName)."</pre></td>"); + } else { + echo('<td>N/A</td>'); + } + echo(' <td><pre>'.$_SESSION["search"]["result"][0]["degree"].'</pre></td> + <td><pre>'.$_SESSION["search"]["result"][0]["capability"].'</pre></td> + <td><pre>'.$_SESSION["search"]["result"][0]["description"].'</pre></td> + <td><pre>'.$_SESSION["search"]["result"][0]["phoneNumber"].'</pre></td> + <td><pre>'.$_SESSION["search"]["result"][0]["adress"].'</pre></td> + <td><pre>'.$_SESSION["search"]["result"][0]["zipCode"].'</pre></td> + <td><pre>'.$_SESSION["search"]["result"][0]["city"].'</pre></td> + </tr> + </table> + <form action="/Wrapper/wrapper.php" method="post"> + <input type="hidden" name="mandateProId" value="'.$_SESSION["search"]["result"][0]["userId"].'"> + <input type="submit" value="'.$text[basename(__FILE__, ".php")]["mandate"].'"> + </form>'); } - echo('<!-- Espace vide si le tableau est petit --> -</table> -<div class="spacer"></div>'.PHP_EOL); -} else { - echo(' <!-- Espace vide --> - <div class="spacer"></div>'.PHP_EOL); } -echo(' </div>'); +echo(' <!-- Espace vide si le tableau est petit --> + <div class="spacer"></div> + </div>'); // On supprime la variable de recherche si elle existe. unset($_SESSION["search"]); ?>
\ No newline at end of file diff --git a/Views/Includes/incl_index_slideshow.php b/Views/Includes/incl_index_slideshow.php index d632bbc..1a7790e 100644 --- a/Views/Includes/incl_index_slideshow.php +++ b/Views/Includes/incl_index_slideshow.php @@ -7,15 +7,15 @@ require_once(dirname(__FILE__)."/".$_SESSION["lang"]."/text.php"); echo(' <!-- Separateur --> <div id="separator1" class="separator"></div> <!-- Slideshow --> - <div id="slideshow"> - <p id="textSlide0" class="show">'.$text[basename(__FILE__, ".php")]["slide1"].'</p> - <p id="textSlide1">'.$text[basename(__FILE__, ".php")]["slide2"].'</p> - <p id="textSlide2">'.$text[basename(__FILE__, ".php")]["slide3"].'</p> + <div id="slides"> + <p id="slide_0" class="show_slide">'.$text[basename(__FILE__, ".php")]["slide1"].'</p> + <p id="slide_1">'.$text[basename(__FILE__, ".php")]["slide2"].'</p> + <p id="slide_2">'.$text[basename(__FILE__, ".php")]["slide3"].'</p> <!-- Indicateur de slide actuellement en cour --> - <div id="slideIndicator"> - <i id="indicatorSlide0" class="fas fa-circle slideSelected"></i> - <i id="indicatorSlide1" class="fas fa-circle"></i> - <i id="indicatorSlide2" class="fas fa-circle"></i> + <div id="slideDots"> + <i id="slideDot_0" class="fas fa-circle slideSelected"></i> + <i id="slideDot_1" class="fas fa-circle"></i> + <i id="slideDot_2" class="fas fa-circle"></i> </div> </div>'.PHP_EOL); ?>
\ No newline at end of file diff --git a/Views/Includes/incl_table_myMission.php b/Views/Includes/incl_table_myMission.php index b4c7e04..de071b1 100644 --- a/Views/Includes/incl_table_myMission.php +++ b/Views/Includes/incl_table_myMission.php @@ -7,33 +7,152 @@ 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. +$dbsearch = new DbSearch; $dbmission = new DbMission; + +// TODO: commenter // Recherches des missions avec l'id de l'utilisateur actuellement connecté. -$result = $dbmission->get_mission_by_id($_SESSION["userId"]); +switch ($_SESSION["userStatus"]) { + case 1: + $result = $dbmission->get_mission_by_pro_id($_SESSION["userId"]); + for ($i = 0; $i < count($result); $i++) { + $result[$i]["jobCategoryId"] = $dbsearch->get_job_category_by_id($result[$i]["jobCategoryId"]); + } + break; + case 2: + $result = $dbmission->get_mission_by_client_id($_SESSION["userId"]); + for ($i = 0; $i < count($result); $i++) { + $result[$i]["jobCategoryId"] = $dbsearch->get_job_category_by_id($result[$i]["jobCategoryId"]); + } + break; + default: + break; +} + +$missionStatus = [ + "pending" => [], + "ongoing" => [], + "completed" => [] +]; + +for ($i = 0; $i < count($result); $i++) { + if (!$result[$i]["acceptedByPro"] + ) { + array_push($missionStatus["pending"], $result[$i]); + } elseif (!$result[$i]["validatedByPro"] + || !$result[$i]["validatedByClient"] + ) { + array_push($missionStatus["ongoing"], $result[$i]); + } else { + array_push($missionStatus["completed"], $result[$i]); + } +} + echo(' <!-- Separateur --> <div class="separator"></div> <!-- Mes missions --> <div id="myMission"> - <h2>'.$text[basename(__FILE__, ".php")]["h2"].'</h2> - <table> + <div id="missionButtons"> + <button onclick="show(\'pendingTable\')"><h2>'.$text[basename(__FILE__, ".php")]["pendingMission"].'</h2></button> + <button onclick="show(\'ongoingTable\')"><h2>'.$text[basename(__FILE__, ".php")]["ongoingMission"].'</h2></button> + <button onclick="show(\'completedTable\')"><h2>'.$text[basename(__FILE__, ".php")]["completedMission"].'</h2></button> + </div>'.PHP_EOL); + +// tableau 3 pending +echo(' <table id="pendingTable"> + <!-- En-tête --> + <tr>'.PHP_EOL); +foreach($header["pendingMissions"] as $columnHeader) { + echo(" <th>".$columnHeader."</th>".PHP_EOL); +} +echo(" </tr>".PHP_EOL); +foreach ($missionStatus["pending"] as $rows) { + echo(' <!-- Missions --> + <tr> + <td><pre>'.$rows["date"].'</pre></td> + <td><pre>'.$rows["lastname"].'</pre></td> + <td><pre>'.$rows["jobCategoryId"][0]["jobCategoryName".ucwords($_SESSION["lang"])].'</pre></td> + <td><pre>'.$rows["subject"].'</pre></td>'); + if ($_SESSION["userId"] == $rows["proId"]) { + echo(' <td class="noBorder" > + <form action="/Wrapper/wrapper.php" method="post"> + <input type="hidden" name="acceptedMissionId" value="'.$rows["missionId"].'"> + <input type="submit" value="'.$text[basename(__FILE__, ".php")]["accept"].'"> + </form> + </td>'); + } + echo(' </tr>'.PHP_EOL); +} +echo(' </table>'); + +// tableau 4 ongoing +echo(' <table id="ongoingTable"> <!-- En-tête --> <tr>'.PHP_EOL); -foreach($header[3] as $header) { - echo(" <th>".$header."</th>".PHP_EOL); +foreach($header["ongoingMissions"] as $columnHeader) { + echo(" <th>".$columnHeader."</th>".PHP_EOL); } echo(" </tr>".PHP_EOL); -foreach ($result as $rows) { - echo(" <!-- Missions --> - <tr>".PHP_EOL); - foreach ($rows as $value) { - echo(" <td><pre>".$value."</pre></td>".PHP_EOL); +foreach ($missionStatus["ongoing"] as $rows) { + echo(' <!-- Missions --> + <tr> + <td><pre>'.$rows["acceptedByPro"].'</pre></td> + <td><pre>'.$rows["lastname"].'</pre></td> + <td><pre>'.$rows["jobCategoryId"][0]["jobCategoryName".ucwords($_SESSION["lang"])].'</pre></td> + <td><pre>'.$rows["subject"].'</pre></td> + <td><pre>'.$rows["validatedByClient"].'</pre></td> + <td><pre>'.$rows["validatedByPro"].'</pre></td>'); + if (!$rows["validatedByClient"] && $_SESSION["userStatus"] == 2 + || (!$rows["validatedByPro"] && $_SESSION["userStatus"] == 1) + ) { + echo(' <td class="noBorder" > + <form action="/Wrapper/wrapper.php" method="post"> + <input type="hidden" name="validatedMissionId" value="'.$rows["missionId"].'"> + <input type="submit" value="'.$text[basename(__FILE__, ".php")]["validate"].'"> + </form> + </td>'); } - echo(" </tr>".PHP_EOL); + echo(' </tr>'.PHP_EOL); +} +echo(' </table>'); + +// tableau 5 completed +echo(' <table id="completedTable"> + <!-- En-tête --> + <tr>'.PHP_EOL); +foreach($header["completedMissions"] as $columnHeader) { + echo(" <th>".$columnHeader."</th>".PHP_EOL); +} +echo(" </tr>".PHP_EOL); +foreach ($missionStatus["completed"] as $rows) { + echo(' <!-- Missions --> + <tr> + <td><pre>'.$rows["date"].'</pre></td> + <td><pre>'.$rows["acceptedByPro"].'</pre></td> + <td><pre>'.$rows["validatedByClient"].'</pre></td> + <td><pre>'.$rows["validatedByPro"].'</pre></td> + <td><pre>'.$rows["lastname"].'</pre></td> + <td><pre>'.$rows["jobCategoryId"][0]["jobCategoryName".ucwords($_SESSION["lang"])].'</pre></td> + <td><pre>'.$rows["subject"].'</pre></td>'); + if ($rows["review"]) { + echo('<td><pre>'.$rows["review"].'</pre></td>'); + } else { + echo('<td><pre>N/A</pre></td>'); + } + if ($rows["note"]) { + echo('<td><pre>'.$rows["note"].'</pre></td>'); + } else { + echo('<td><pre>N/A</pre></td>'); + } + echo('</tr>'.PHP_EOL); } echo(' </table> - <!-- Espace vide si le tableau est petit --> - <div class="spacer"></div> - </div>'.PHP_EOL); +<!-- Espace vide si le tableau est petit --> +<div class="spacer"></div>'); + +// fin +echo(' </div>'.PHP_EOL); ?>
\ No newline at end of file diff --git a/Views/admin.php b/Views/admin.php index 6af1c7c..67398fd 100644 --- a/Views/admin.php +++ b/Views/admin.php @@ -5,9 +5,9 @@ // Démarrage de la session. session_start(); // Vérification si l'utilisateur est admin et connecté sinon: raise 404. -if (!isset($_SESSION["loggedIn"], $_SESSION["isAdmin"]) +if (!isset($_SESSION["loggedIn"], $_SESSION["userStatus"]) || $_SESSION["loggedIn"] == false - || $_SESSION["isAdmin"] == false + || $_SESSION["userStatus"] != 0 ) { http_response_code(404); die(); diff --git a/Views/message.php b/Views/message.php index f2a93a5..b324f51 100644 --- a/Views/message.php +++ b/Views/message.php @@ -5,7 +5,7 @@ // Démarrage de la session. session_start(); // Si pas de message (variable messageNumber de la session): raise 404. -if (!isset($_SESSION["messageNumber"])) { +if (!isset($_SESSION["message"])) { http_response_code(404); die(); } diff --git a/Views/mission.php b/Views/mission.php index 4d84777..fde7289 100644 --- a/Views/mission.php +++ b/Views/mission.php @@ -5,11 +5,13 @@ // Démarrage de la session. session_start(); // Vérification si connecté et si a le statut utilisateur sinon: raise 404 -if (!isset($_SESSION["loggedIn"], $_SESSION["isClient"]) +if (!isset($_SESSION["loggedIn"], $_SESSION["userStatus"]) || $_SESSION["loggedIn"] == false - || $_SESSION["isClient"] == false + || $_SESSION["userStatus"] != 2 ) { - http_response_code(404); + $messageNumber = 9; + $_SESSION["messageNumber"] = $messageNumber; + header("Location: /Views/message.php"); die(); } // Définition de la variable src de la session avec le nom du fichier. diff --git a/Views/myMission.php b/Views/myMission.php index 49d7107..2f575ba 100644 --- a/Views/myMission.php +++ b/Views/myMission.php @@ -5,9 +5,11 @@ // Démarrage de la session. session_start(); // Si n'est pas connecté ou n'est pas consultant: raise 404. -if (!isset($_SESSION["loggedIn"], $_SESSION["isPro"]) - || $_SESSION["loggedIn"] == false - || $_SESSION["isPro"] == false +if (!isset($_SESSION["loggedIn"], $_SESSION["userStatus"]) + || $_SESSION["loggedIn"] == false + || ($_SESSION["userStatus"] != 1 + && $_SESSION["userStatus"] != 2 + ) ) { http_response_code(404); die(); @@ -30,5 +32,7 @@ $_SESSION["src"] = basename(__FILE__, ".php"); <?php require_once(dirname( __FILE__ )."/Includes/incl_table_myMission.php"); ?> <?php require_once(dirname( __FILE__ )."/Includes/incl_global_footer.php"); ?> <script src="/Statics/Js/main.js"></script> + <script src="/Statics/Js/myMission.js"></script> + <script>show('pendingTable')</script> </body> </html>
\ No newline at end of file |