diff options
Diffstat (limited to 'Database')
| -rw-r--r-- | Database/dbmain.php | 34 | ||||
| -rw-r--r-- | Database/meth_dbmission.php | 2 | ||||
| -rw-r--r-- | Database/meth_dbuser.php | 8 |
3 files changed, 24 insertions, 20 deletions
diff --git a/Database/dbmain.php b/Database/dbmain.php index b1777ba..67f27a4 100644 --- a/Database/dbmain.php +++ b/Database/dbmain.php @@ -22,7 +22,7 @@ class DbMain { // Pour gérer si "en production" private $debug = True; // Salt pour le chiffrement - private $salt = "cTKXHBoN3oxymlhNem2h"; + private $salt = "t87RL7dKfaNAJKtCAR6cVFhEfkn7qBGW"; // Configuration du serveur MYSQL / MARIADB private $conn; private $host = "127.0.0.1"; @@ -35,12 +35,12 @@ class DbMain { // **************************************************************************** // UserAccount, infos du compte nécessaire à la connection private $createTableUserAccount = "CREATE TABLE IF NOT EXISTS `alphajob`.`userAccount` ( - `userId` INT UNSIGNED NOT NULL AUTO_INCREMENT, + `userId` INT UNSIGNED NOT NULL AUTO_INCREMENT, `email` VARCHAR(128) NOT NULL, `password` VARCHAR(128) NOT NULL, `tokenAutoLogin` VARCHAR(128) NULL DEFAULT NULL, - `inscriptionDate` TIMESTAMP NOT NULL, - `userStatus` TINYINT(1) UNSIGNED NOT NULL, + `inscriptionDate` TIMESTAMP NOT NULL, + `userStatus` TINYINT(1) UNSIGNED NOT NULL, PRIMARY KEY (`userId`) ) ENGINE = InnoDB @@ -50,14 +50,14 @@ class DbMain { private $createTableUserInfo = "CREATE TABLE IF NOT EXISTS `alphajob`.`userInfo` ( `lastname` VARCHAR(128) NOT NULL, `firstname` VARCHAR(128) NOT NULL, - `phoneNumber` VARCHAR(10) NOT NULL, + `phoneNumber` VARCHAR(10) NOT NULL, `adress` VARCHAR(128) NOT NULL, - `zipCode` VARCHAR(6) NOT NULL, + `zipCode` VARCHAR(6) NOT NULL, `city` VARCHAR(128) NOT NULL, `degree` VARCHAR(128) NULL DEFAULT NULL, `capability` VARCHAR(256) NULL DEFAULT NULL, `description` VARCHAR(256) NULL DEFAULT NULL, - `userId` INT UNSIGNED NOT NULL, + `userId` INT UNSIGNED NOT NULL, PRIMARY KEY (`userId`), INDEX `fk_userinfo_userId_idx` (`userId` ASC) VISIBLE, CONSTRAINT `fk_userinfo_userId` @@ -71,7 +71,7 @@ class DbMain { // Liste des categories d'emploie possible private $createTableJobCategory = "CREATE TABLE IF NOT EXISTS `alphajob`.`jobCategory` ( - `jobCategoryId` INT UNSIGNED NOT NULL AUTO_INCREMENT, + `jobCategoryId` INT UNSIGNED NOT NULL AUTO_INCREMENT, `jobCategoryNameEn` VARCHAR(128) NOT NULL, `jobCategoryNameFr` VARCHAR(128) NOT NULL, PRIMARY KEY (`jobCategoryId`) @@ -101,17 +101,17 @@ class DbMain { // Infos sur les missions effectuées, liée à userAccount par userId et consultantId private $createTableMission = "CREATE TABLE IF NOT EXISTS `alphajob`.`mission` ( - `missionId` INT UNSIGNED NOT NULL AUTO_INCREMENT, - `date` TIMESTAMP NOT NULL, + `missionId` INT UNSIGNED NOT NULL AUTO_INCREMENT, + `date` TIMESTAMP NOT NULL, `subject` VARCHAR(128) NULL DEFAULT NULL, - `note` TINYINT(1) UNSIGNED NULL DEFAULT NULL, + `note` TINYINT(1) UNSIGNED NULL DEFAULT NULL, `review` VARCHAR(256) NULL DEFAULT NULL, - `acceptedByPro` TIMESTAMP NULL DEFAULT NULL, - `validatedByClient` TIMESTAMP NULL DEFAULT NULL, - `validatedByPro` TIMESTAMP NULL DEFAULT NULL, - `clientId` INT UNSIGNED NOT NULL, - `proId` INT UNSIGNED NOT NULL, - `jobCategoryId` INT UNSIGNED NOT NULL, + `acceptedByPro` TIMESTAMP NULL DEFAULT NULL, + `validatedByClient` TIMESTAMP NULL DEFAULT NULL, + `validatedByPro` TIMESTAMP NULL DEFAULT NULL, + `clientId` INT UNSIGNED NOT NULL, + `proId` INT UNSIGNED NOT NULL, + `jobCategoryId` INT UNSIGNED NOT NULL, PRIMARY KEY (`missionId`), INDEX `fk_mission_clientId_idx` (`clientId` ASC) VISIBLE, INDEX `fk_mission_proId_idx` (`proId` ASC) VISIBLE, diff --git a/Database/meth_dbmission.php b/Database/meth_dbmission.php index 5087bc5..f44edfc 100644 --- a/Database/meth_dbmission.php +++ b/Database/meth_dbmission.php @@ -117,7 +117,7 @@ class DbMission extends DbMain { SELECT missionId, date, subject, note, review, acceptedByPro, validatedByClient, - validatedByPro, jobCategoryId, lastname + validatedByPro, jobCategoryId, proId, lastname FROM ".$this->tableMission." LEFT JOIN diff --git a/Database/meth_dbuser.php b/Database/meth_dbuser.php index 4d983b5..5161a82 100644 --- a/Database/meth_dbuser.php +++ b/Database/meth_dbuser.php @@ -111,12 +111,16 @@ class DbUser extends DbMain { array_push($args, $userId); $this->exec_cmd($reqAddInfoClient, $args); } else { - // TODO: Commenter // https://stackoverflow.com/questions/15986235/how-to-use-json-stringify-and-json-decode-properly + // Récupération des emplois dans le JSON et supression de ces derniers de la liste $selectedJobs = json_decode(html_entity_decode($userInfos["jobs"])); unset($userInfos["jobs"]); - $jobsAdded = array_values(array_diff($selectedJobs, $userJobs)); + // array_value -> Qu'est ce qui est présent dans 1 mais pas dans 2 ? + // Comparaison des jobs anciennement présent avec ceux sélectionnés, donc ajoutés. + $jobsAdded = array_values(array_diff($selectedJobs, $userJobs)); + // Comparaison des jobs deja présent avec ceux sélectionnés, donc ajoutés. $jobsRemoved = array_values(array_diff($userJobs, $selectedJobs)); + // on continue classiquement avec les autres éléments $args = array_values($userInfos); array_push($args, $userId); $this->exec_cmd($reqAddInfoPro, $args); |