From 1d2737cf205b187f2d1d847c584723eb912a4183 Mon Sep 17 00:00:00 2001 From: nicrausaz <n.crausaz99@gmail.com> Date: Wed, 8 May 2019 14:14:41 +0200 Subject: [PATCH] =?UTF-8?q?Corretifs=20globaux=20et=20r=C3=A9affichage=20i?= =?UTF-8?q?nfos=20manquantes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../API/app/Helpers/AccessLevelHelper.php | 2 +- .../{test3.sql => table_activity.sql} | 0 .../{test4.sql => table_responsible.sql} | 0 .../{test5.sql => table_scolarity.sql} | 6 +- canapGEST/DB/Valeurs de tests/test6.sql | 6 +- canapGEST/DB/create_db_script.sql | 11 ++- canapGEST/Documentation/journal_travail.xlsx | Bin 13345 -> 13394 bytes .../application/applicationComments.vue | 20 +++- .../application/sheets/filesDataSheet.vue | 7 +- .../application/sheets/personalDataSheet.vue | 5 +- .../sheets/responsiblesDataSheet.vue | 88 ++++++++++++++++++ .../sheets/scolaritiesDataSheet.vue | 9 +- canapGEST/Site/src/views/ApplicationView.vue | 5 + canapGEST/Site/src/views/OpenJobsView.vue | 7 +- 14 files changed, 148 insertions(+), 18 deletions(-) rename canapGEST/DB/Valeurs de tests/{test3.sql => table_activity.sql} (100%) rename canapGEST/DB/Valeurs de tests/{test4.sql => table_responsible.sql} (100%) rename canapGEST/DB/Valeurs de tests/{test5.sql => table_scolarity.sql} (97%) create mode 100644 canapGEST/Site/src/components/application/sheets/responsiblesDataSheet.vue diff --git a/canapGEST/API/app/Helpers/AccessLevelHelper.php b/canapGEST/API/app/Helpers/AccessLevelHelper.php index 6254551..f3cd92c 100644 --- a/canapGEST/API/app/Helpers/AccessLevelHelper.php +++ b/canapGEST/API/app/Helpers/AccessLevelHelper.php @@ -55,7 +55,7 @@ class AccessLevelHelper { $default_access_groups = self::getDefaultAccessGroups(); $user_alloweds = []; - $user_role = 'formateur'; // formateur + $user_role = 'responsable'; // formateur $user_groups = explode(',', $user_groups); foreach ($default_access_groups as $group => $accesses) { diff --git a/canapGEST/DB/Valeurs de tests/test3.sql b/canapGEST/DB/Valeurs de tests/table_activity.sql similarity index 100% rename from canapGEST/DB/Valeurs de tests/test3.sql rename to canapGEST/DB/Valeurs de tests/table_activity.sql diff --git a/canapGEST/DB/Valeurs de tests/test4.sql b/canapGEST/DB/Valeurs de tests/table_responsible.sql similarity index 100% rename from canapGEST/DB/Valeurs de tests/test4.sql rename to canapGEST/DB/Valeurs de tests/table_responsible.sql diff --git a/canapGEST/DB/Valeurs de tests/test5.sql b/canapGEST/DB/Valeurs de tests/table_scolarity.sql similarity index 97% rename from canapGEST/DB/Valeurs de tests/test5.sql rename to canapGEST/DB/Valeurs de tests/table_scolarity.sql index 54b5354..d48a2cc 100644 --- a/canapGEST/DB/Valeurs de tests/test5.sql +++ b/canapGEST/DB/Valeurs de tests/table_scolarity.sql @@ -1,6 +1,6 @@ -INSERT INTO `scolarity` (`scolarity_id`, `scolarity_school`, `scolarity_location`, `scolarity_level`, `scolarity_years`, `fk_applicant_id`) VALUES (123, 'sdfh', 'sdfh', 'sdf', 'sdf', 58); -INSERT INTO `scolarity` (`scolarity_id`, `scolarity_school`, `scolarity_location`, `scolarity_level`, `scolarity_years`, `fk_applicant_id`) VALUES (124, 'sdfh', 'sdfh', 'hsdfh', 'hsdfhsdfhf', 58); -INSERT INTO `scolarity` (`scolarity_id`, `scolarity_school`, `scolarity_location`, `scolarity_level`, `scolarity_years`, `fk_applicant_id`) VALUES (125, 'Beausobre', 'Morges', 'VSB', '2020000', 60); +INSERT INTO `scolarity` (`scolarity_id`, `scolarity_school`, `scolarity_location`, `scolarity_level`, `scolarity_years`, `fk_applicant_id`) VALUES (123, 'sdfh', 'sdfh', 'sdf', 'sdf', 3); +INSERT INTO `scolarity` (`scolarity_id`, `scolarity_school`, `scolarity_location`, `scolarity_level`, `scolarity_years`, `fk_applicant_id`) VALUES (124, 'sdfh', 'sdfh', 'hsdfh', 'hsdfhsdfhf', 3); +INSERT INTO `scolarity` (`scolarity_id`, `scolarity_school`, `scolarity_location`, `scolarity_level`, `scolarity_years`, `fk_applicant_id`) VALUES (125, 'Beausobre', 'Morges', 'VSB', '2020000', 3); INSERT INTO `scolarity` (`scolarity_id`, `scolarity_school`, `scolarity_location`, `scolarity_level`, `scolarity_years`, `fk_applicant_id`) VALUES (126, 'Morges', 'Morges', 'T6/05', '3523894', 60); INSERT INTO `scolarity` (`scolarity_id`, `scolarity_school`, `scolarity_location`, `scolarity_level`, `scolarity_years`, `fk_applicant_id`) VALUES (127, 'asdg', 'asdgas', 'dga', 'sdgasdg', 63); INSERT INTO `scolarity` (`scolarity_id`, `scolarity_school`, `scolarity_location`, `scolarity_level`, `scolarity_years`, `fk_applicant_id`) VALUES (128, 'asdgasdg', 'dg', 'asdg', 'asdg', 63); diff --git a/canapGEST/DB/Valeurs de tests/test6.sql b/canapGEST/DB/Valeurs de tests/test6.sql index 7ab0438..d070cd9 100644 --- a/canapGEST/DB/Valeurs de tests/test6.sql +++ b/canapGEST/DB/Valeurs de tests/test6.sql @@ -1,6 +1,6 @@ -INSERT INTO `training` (`training_id`, `training_job`, `training_company`, `fk_applicant_id`) VALUES (30, 'Informacitien', 'Schenk', 60); -INSERT INTO `training` (`training_id`, `training_job`, `training_company`, `fk_applicant_id`) VALUES (31, 'Informacitien', 'EPFL', 60); -INSERT INTO `training` (`training_id`, `training_job`, `training_company`, `fk_applicant_id`) VALUES (33, 'asdgasdg', 'asdgasdg', 63); +INSERT INTO `training` (`training_id`, `training_job`, `training_company`, `fk_applicant_id`) VALUES (30, 'Informacitien', 'Schenk', 3); +INSERT INTO `training` (`training_id`, `training_job`, `training_company`, `fk_applicant_id`) VALUES (31, 'Informacitien', 'EPFL', 3); +INSERT INTO `training` (`training_id`, `training_job`, `training_company`, `fk_applicant_id`) VALUES (33, 'asdgasdg', 'asdgasdg', 3); INSERT INTO `training` (`training_id`, `training_job`, `training_company`, `fk_applicant_id`) VALUES (34, 'asdgasdg', 'asdgasdga', 63); INSERT INTO `training` (`training_id`, `training_job`, `training_company`, `fk_applicant_id`) VALUES (37, 'asca', 'asdcasdc', 66); INSERT INTO `training` (`training_id`, `training_job`, `training_company`, `fk_applicant_id`) VALUES (38, 'dddd', 'dddd', 67); diff --git a/canapGEST/DB/create_db_script.sql b/canapGEST/DB/create_db_script.sql index e84c322..9309835 100644 --- a/canapGEST/DB/create_db_script.sql +++ b/canapGEST/DB/create_db_script.sql @@ -182,7 +182,7 @@ CREATE TABLE IF NOT EXISTS `canap_db`.`comment` ( CONSTRAINT `fk_comment_applicant1` FOREIGN KEY (`fk_applicant_id`) REFERENCES `canap_db`.`applicant` (`applicant_id`) - ON DELETE NO ACTION + ON DELETE CASCADE ON UPDATE NO ACTION) ENGINE = InnoDB DEFAULT CHARACTER SET = utf8; @@ -309,4 +309,11 @@ CREATE TABLE IF NOT EXISTS `canap_db`.`last_connection` ( `last_connection_tmp_date` DATETIME NULL, PRIMARY KEY (`last_connection_id`), UNIQUE INDEX `last_connection_sciper_UNIQUE` (`last_connection_sciper` ASC)) -ENGINE = InnoDB; \ No newline at end of file +ENGINE = InnoDB; + +-- INSERT STATUS +INSERT INTO `status` (`status_value`) VALUES ('Nouveau'); +INSERT INTO `status` (`status_value`) VALUES ('Valide'); +INSERT INTO `status` (`status_value`) VALUES ('Incomplet'); +INSERT INTO `status` (`status_value`) VALUES ('Invalide'); +INSERT INTO `status` (`status_value`) VALUES ('Refusé'); diff --git a/canapGEST/Documentation/journal_travail.xlsx b/canapGEST/Documentation/journal_travail.xlsx index 105b73685b19ba42054b2555df4de5e21baabefc..c37596b56131b66192fb845f233594cb0bc6d536 100644 GIT binary patch delta 4697 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 bf-RG6Eh&@DGb#cIE|d8)A_mkj00000iL1da delta 4646 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 diff --git a/canapGEST/Site/src/components/application/applicationComments.vue b/canapGEST/Site/src/components/application/applicationComments.vue index 594928d..c7608ed 100644 --- a/canapGEST/Site/src/components/application/applicationComments.vue +++ b/canapGEST/Site/src/components/application/applicationComments.vue @@ -16,9 +16,17 @@ class="ma-0 pa-0" ></v-checkbox> <v-btn block color="primary" @click="comment">Ajouter</v-btn> + <v-divider></v-divider> </div> - <v-divider></v-divider> - <v-subheader>Commentaires publics</v-subheader> + <v-subheader v-if="!$store.getters['moduleUser/userIsResponsible']">Commentaires publics</v-subheader> + <h4 class="text-xs-center"> + <small + class="text-xs-center" + v-if="$store.state.moduleApplications.currentApplication.comments.public == 0" + > + <i>Pas de commentaires</i> + </small> + </h4> <applicationCommentItem v-for="comment in $store.getters['moduleApplications/getSortedPublicComments']" :comment="comment" @@ -27,6 +35,14 @@ </v-list> <v-list subheader three-line v-if="!$store.getters['moduleUser/userIsResponsible']"> <v-subheader>Vos commentaires privés</v-subheader> + <h4 class="text-xs-center"> + <small + class="text-xs-center" + v-if="$store.state.moduleApplications.currentApplication.comments.private == 0" + > + <i>Pas de commentaires</i> + </small> + </h4> <applicationCommentItem v-for="comment in $store.getters['moduleApplications/getSortedPrivateComments']" :comment="comment" diff --git a/canapGEST/Site/src/components/application/sheets/filesDataSheet.vue b/canapGEST/Site/src/components/application/sheets/filesDataSheet.vue index a6de163..d9187d2 100644 --- a/canapGEST/Site/src/components/application/sheets/filesDataSheet.vue +++ b/canapGEST/Site/src/components/application/sheets/filesDataSheet.vue @@ -10,7 +10,12 @@ :key="file.file_id" > <v-list-tile-avatar> - <img src="@/assets/logo_pdf.png" height="75px" @click="getFile(file.file_id, file.file_name)" style="cursor: pointer;"> + <img + src="@/assets/logo_pdf.png" + height="75px" + @click="getFile(file.file_id, file.file_name)" + style="cursor: pointer;" + > </v-list-tile-avatar> <v-list-tile-content> <v-list-tile-title> diff --git a/canapGEST/Site/src/components/application/sheets/personalDataSheet.vue b/canapGEST/Site/src/components/application/sheets/personalDataSheet.vue index 71acd41..a9a40a5 100644 --- a/canapGEST/Site/src/components/application/sheets/personalDataSheet.vue +++ b/canapGEST/Site/src/components/application/sheets/personalDataSheet.vue @@ -1,6 +1,6 @@ <template> <v-sheet class="d-flex" id="personal-data-sheet"> - <v-card > + <v-card> <v-card-title> <h4>Données personnelles</h4> </v-card-title> @@ -166,6 +166,3 @@ export default { name: 'personal-data-sheet' } </script> - -<style> -</style> diff --git a/canapGEST/Site/src/components/application/sheets/responsiblesDataSheet.vue b/canapGEST/Site/src/components/application/sheets/responsiblesDataSheet.vue new file mode 100644 index 0000000..c666bab --- /dev/null +++ b/canapGEST/Site/src/components/application/sheets/responsiblesDataSheet.vue @@ -0,0 +1,88 @@ +<template> + <v-sheet class="d-flex" id="reponsibles-data-sheet"> + <v-card> + <v-card-title> + <h4> + Responsables + <small + v-if="!$store.state.moduleApplications.currentApplication.application_data.responsibles.main && !$store.state.moduleApplications.currentApplication.application_data.responsibles.secondary" + > + <i>(Pas de données)</i> + </small> + </h4> + </v-card-title> + <v-divider></v-divider> + <v-list dense> + <div + v-if="$store.state.moduleApplications.currentApplication.application_data.responsibles.main" + > + <v-subheader>Principal</v-subheader> + <v-list-tile> + <v-list-tile-content>Genre</v-list-tile-content> + <v-list-tile-content + class="align-end" + >{{ $store.state.moduleApplications.currentApplication.application_data.responsibles.main.responsible_gender }}</v-list-tile-content> + </v-list-tile> + <v-list-tile> + <v-list-tile-content>Nom, prénom</v-list-tile-content> + <v-list-tile-content class="align-end"> + {{ $store.state.moduleApplications.currentApplication.application_data.responsibles.main.responsible_name }}, + {{ $store.state.moduleApplications.currentApplication.application_data.responsibles.main.responsible_fsname }} + </v-list-tile-content> + </v-list-tile> + <v-list-tile> + <v-list-tile-content>Adresse</v-list-tile-content> + <v-list-tile-content class="align-end"> + {{ $store.state.moduleApplications.currentApplication.application_data.responsibles.main.responsible_street }}, + {{ $store.state.moduleApplications.currentApplication.application_data.responsibles.main.responsible_npa }} + </v-list-tile-content> + </v-list-tile> + <v-list-tile> + <v-list-tile-content>Téléphone</v-list-tile-content> + <v-list-tile-content + class="align-end" + >{{ $store.state.moduleApplications.currentApplication.application_data.responsibles.main.responsible_phone }}</v-list-tile-content> + </v-list-tile> + </div> + <v-divider></v-divider> + <div + v-if="$store.state.moduleApplications.currentApplication.application_data.responsibles.secondary" + > + <v-subheader>Secondaire</v-subheader> + <v-list-tile> + <v-list-tile-content>Genre</v-list-tile-content> + <v-list-tile-content + class="align-end" + >{{ $store.state.moduleApplications.currentApplication.application_data.responsibles.secondary.responsible_gender }}</v-list-tile-content> + </v-list-tile> + <v-list-tile> + <v-list-tile-content>Nom, prénom</v-list-tile-content> + <v-list-tile-content class="align-end"> + {{ $store.state.moduleApplications.currentApplication.application_data.responsibles.secondary.responsible_name }}, + {{ $store.state.moduleApplications.currentApplication.application_data.responsibles.secondary.responsible_fsname }} + </v-list-tile-content> + </v-list-tile> + <v-list-tile> + <v-list-tile-content>Adresse</v-list-tile-content> + <v-list-tile-content class="align-end"> + {{ $store.state.moduleApplications.currentApplication.application_data.responsibles.secondary.responsible_street }}, + {{ $store.state.moduleApplications.currentApplication.application_data.responsibles.secondary.responsible_npa }} + </v-list-tile-content> + </v-list-tile> + <v-list-tile> + <v-list-tile-content>Téléphone</v-list-tile-content> + <v-list-tile-content + class="align-end" + >{{ $store.state.moduleApplications.currentApplication.application_data.responsibles.secondary.responsible_phone }}</v-list-tile-content> + </v-list-tile> + </div> + </v-list> + </v-card> + </v-sheet> +</template> + +<script> +export default { + name: 'reponsibles-data-sheet' +} +</script> diff --git a/canapGEST/Site/src/components/application/sheets/scolaritiesDataSheet.vue b/canapGEST/Site/src/components/application/sheets/scolaritiesDataSheet.vue index fd247bc..afa79f1 100644 --- a/canapGEST/Site/src/components/application/sheets/scolaritiesDataSheet.vue +++ b/canapGEST/Site/src/components/application/sheets/scolaritiesDataSheet.vue @@ -2,7 +2,14 @@ <v-sheet class="d-flex" id="scolarities-data-sheet"> <v-card> <v-card-title> - <h4>Scolarités <small v-if="$store.state.moduleApplications.currentApplication.application_data.scolarities.length == 0"><i>(Pas de données)</i></small></h4> + <h4> + Scolarités + <small + v-if="$store.state.moduleApplications.currentApplication.application_data.scolarities.length == 0" + > + <i>(Pas de données)</i> + </small> + </h4> </v-card-title> <v-divider></v-divider> <v-list diff --git a/canapGEST/Site/src/views/ApplicationView.vue b/canapGEST/Site/src/views/ApplicationView.vue index b85dceb..715e552 100644 --- a/canapGEST/Site/src/views/ApplicationView.vue +++ b/canapGEST/Site/src/views/ApplicationView.vue @@ -23,6 +23,9 @@ </v-flex> </v-layout> <v-layout row> + <v-flex grow pa-1> + <ResponsiblesDataSheet/> + </v-flex> <v-flex grow pa-1> <ScolaritiesDataSheet/> </v-flex> @@ -46,6 +49,7 @@ import ApplicationTitle from '@/components/application/applicationTitle.vue' import ApplicationComments from '@/components/application/applicationComments.vue' import PersonalDataSheet from '@/components/application/sheets/personalDataSheet.vue' +import ResponsiblesDataSheet from '@/components/application/sheets/responsiblesDataSheet.vue' import FilesDataSheet from '@/components/application/sheets/filesDataSheet.vue' import ScolaritiesDataSheet from '@/components/application/sheets/scolaritiesDataSheet.vue' import TrainingsDataSheet from '@/components/application/sheets/trainingsDataSheet.vue' @@ -74,6 +78,7 @@ export default { ApplicationComments, PersonalDataSheet, FilesDataSheet, + ResponsiblesDataSheet, ScolaritiesDataSheet, TrainingsDataSheet, ActivitiesDataSheet diff --git a/canapGEST/Site/src/views/OpenJobsView.vue b/canapGEST/Site/src/views/OpenJobsView.vue index 9064331..93f6809 100644 --- a/canapGEST/Site/src/views/OpenJobsView.vue +++ b/canapGEST/Site/src/views/OpenJobsView.vue @@ -80,7 +80,11 @@ </v-card> </v-dialog> </v-toolbar> - <v-data-table :headers="headers" :items="$store.state.modulePositions.positions"> + <v-data-table + :headers="headers" + :items="$store.state.modulePositions.positions" + :pagination.sync="pagination" + > <template v-slot:items="props"> <td>{{ props.item.job_full_value }}</td> <td>{{ props.item.location_site }}</td> @@ -112,6 +116,7 @@ export default { { text: 'Nombre de places', value: 'position_spot_number' }, { text: 'Actions', value: 'actions', sortable: false } ], + pagination: { sortBy: 'job_full_value', descending: true, rowsPerPage: 25 }, editedIndex: -1, editedItem: { job_id: null, -- GitLab