diff --git a/canapGEST/Site/src/plugins/axios.js b/canapGEST/Site/src/plugins/axios.js index c07074fe66e45702aa888d88fbbf4886aa403d6c..1ad2a5a8bbc2135530cd115e2a291685dae43d19 100644 --- a/canapGEST/Site/src/plugins/axios.js +++ b/canapGEST/Site/src/plugins/axios.js @@ -1,30 +1,31 @@ import axios from 'axios' -// import store from '@/store/store.js' -// import router from '@/router/index.js' +import store from '@/store/store.js' +import router from '@/router/index.js' const instance = axios.create({ headers: { 'Authorization': "Bearer " + localStorage.getItem('stored_token') }, baseURL: 'https://canap-gest.epfl.ch:8443/api' }) -// instance.interceptors.response.use(function (response) { -// return response -// }, function (error) { -// if (!error.response) { -// store.commit('moduleSnackbar/toggle', { open: true, message: 'API non atteignable', type: 'warning' }, { root: true }) -// } else if (error.response.status == 400 || error.response.status == 401) { -// // Erreur de token -// store.commit('moduleSnackbar/toggle', { open: true, message: error.response.data.error, type: 'warning' }, { root: true }) -// store.dispatch('moduleUser/logout', false) -// } else if (error.response.status == 403 || error.response.status == 404) { -// router.push({ name: 'error', params: { status: error.response.data.error, message: error.response.data.message, route: '' } }) -// } else { -// // Affichage des erreurs (snackbar) -// Object.values(error.response.data).forEach(errMsg => { -// store.commit('moduleSnackbar/toggle', { open: true, message: errMsg[0], type: 'error' }, { root: true }) -// }) -// } -// return Promise.reject(error) -// }) +instance.interceptors.response.use(function (response) { + return response +}, function (error) { + if (!error.response) { + store.commit('moduleSnackbar/toggle', { open: true, message: 'API non atteignable', type: 'warning' }, { root: true }) + } else if (error.response.status == 400 || error.response.status == 401) { + // Erreur de token + // store.commit('moduleSnackbar/toggle', { open: true, message: error.response.data.error, type: 'warning' }, { root: true }) + // store.dispatch('moduleUser/logout', false) + console.log('token is dead') + } else if (error.response.status == 403 || error.response.status == 404) { + router.push({ name: 'error', params: { status: error.response.data.error, message: error.response.data.message, route: '' } }) + } else { + // Affichage des erreurs (snackbar) + Object.values(error.response.data).forEach(errMsg => { + store.commit('moduleSnackbar/toggle', { open: true, message: errMsg[0], type: 'error' }, { root: true }) + }) + } + return Promise.reject(error) +}) export default instance \ No newline at end of file diff --git a/canapGEST/Site/src/views/ApplicationsView.vue b/canapGEST/Site/src/views/ApplicationsView.vue index d76328d9c4854c4dd87a5177fd7302b39808b724..5cf33a8c313c0df648cb5aa1cd279569e2d3c407 100644 --- a/canapGEST/Site/src/views/ApplicationsView.vue +++ b/canapGEST/Site/src/views/ApplicationsView.vue @@ -45,6 +45,10 @@ <td>{{ props.item.applicant_name }} {{ props.item.applicant_fsname }}</td> <td>{{ props.item.job_full_value }}</td> <td>{{ props.item.location_site }}</td> + <td> + <span v-if="props.item.applicant_maturity">✔</span> + <span v-else>✘</span> + </td> <td>{{ props.item.applicant_address_street }} {{ props.item.applicant_address_npa }}</td> <td>{{ props.item.applicant_mail }}</td> <td> @@ -119,6 +123,7 @@ export default { { text: 'Nom, Prénom', align: 'left', value: 'applicant_fsname' }, { text: 'Formation', value: 'applicant_formation' }, { text: 'Lieu', value: 'applicant_formation_location' }, + { text: 'Maturité', value: 'applicant_maturity' }, { text: 'Adresse', value: 'applicant_npa' }, { text: 'Email', value: 'applicant_mail' }, { text: 'Date naissance, majeur', value: 'applicant_birthdate' }, diff --git a/canapGEST/Site/src/views/OpenJobsView.vue b/canapGEST/Site/src/views/OpenJobsView.vue index 79746eac82b6b8c0cbf1fd5e5dc1315e97d4f6a3..c6cb3f402ad2668653d8d59f99deac60cb700fa4 100644 --- a/canapGEST/Site/src/views/OpenJobsView.vue +++ b/canapGEST/Site/src/views/OpenJobsView.vue @@ -1,7 +1,7 @@ <template> <div id="openjobs-view"> <h1>Places ouvertes</h1> - <template v-if="loaded"> + <template> <div> <v-toolbar flat color="white"> <v-spacer></v-spacer> @@ -93,10 +93,7 @@ <template v-slot:items="props"> <td>{{ props.item.job_full_value }}</td> <td>{{ props.item.location_site }}</td> - <td - v-if="props.item.access_groups.length > 1" - >{{ props.item.access_groups[0].access_group_value }} + {{props.item.access_groups.length-1}} autre(s) groupes(s)</td> - <td v-else>{{props.item.access_groups[0].access_group_value }}</td> + <td>{{props.item.access_groups.length}} groupe(s)</td> <td>{{ props.item.position_spot_number }}</td> <td> <v-icon class="mr-2" @click="editItem(props.item)">edit</v-icon>