Corretifs globaux et réaffichage infos manquantes

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) {

canapGEST/DB/Valeurs de tests/test5.sql → canapGEST/DB/Valeurs de tests/table_scolarity.sql

-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);

canapGEST/DB/Valeurs de tests/test6.sql

-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);

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é');

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"

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>

canapGEST/Site/src/components/application/sheets/personalDataSheet.vue

 <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>

canapGEST/Site/src/components/application/sheets/responsiblesDataSheet.vue

+<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>

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

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

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,