From 9e19b264938e356e829249d33995782348f326a1 Mon Sep 17 00:00:00 2001
From: nicrausaz <n.crausaz99@gmail.com>
Date: Thu, 9 May 2019 09:21:06 +0200
Subject: [PATCH] Quelques modification globales
---
.../API/app/Helpers/AccessLevelHelper.php | 2 +-
canapGEST/Documentation/journal_travail.xlsx | Bin 13474 -> 13701 bytes
.../application/applicationCommentItem.vue | 4 ++--
.../src/components/applicationsFilters.vue | 9 +++++----
canapGEST/Site/src/plugins/axios.js | 3 +--
.../src/store/modules/applications/getters.js | 4 ++--
canapGEST/Site/src/views/ApplicationsView.vue | 8 +++++++-
7 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/canapGEST/API/app/Helpers/AccessLevelHelper.php b/canapGEST/API/app/Helpers/AccessLevelHelper.php
index f3cd92c..6254551 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 = 'responsable'; // formateur
+ $user_role = 'formateur'; // formateur
$user_groups = explode(',', $user_groups);
foreach ($default_access_groups as $group => $accesses) {
diff --git a/canapGEST/Documentation/journal_travail.xlsx b/canapGEST/Documentation/journal_travail.xlsx
index fa27c8a57b5cb47a80818e9cb9384cae727291d3..a59d2e49af24020da32ddf0f114e2e4e88fdfb8f 100644
GIT binary patch
delta 5127
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
delta 4902
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
R&;*LHlwb#Oiu`x{zW@}06HovE
diff --git a/canapGEST/Site/src/components/application/applicationCommentItem.vue b/canapGEST/Site/src/components/application/applicationCommentItem.vue
index 2adf4fc..621305b 100644
--- a/canapGEST/Site/src/components/application/applicationCommentItem.vue
+++ b/canapGEST/Site/src/components/application/applicationCommentItem.vue
@@ -78,7 +78,7 @@
export default {
name: 'application-comment-item',
props: {
- comment: {}
+ comment: Object
},
data() {
return {
@@ -94,7 +94,7 @@ export default {
let dateTimeParts = value.split(/[- :]/)
dateTimeParts[1]--
let date = new Date(...dateTimeParts)
- return date.getDate() + '/' + (date.getMonth() + 1) + '/' + date.getFullYear() + ' Ã ' + date.getHours() + ':' + date.getMinutes()
+ return date.getDate() + '/' + (date.getMonth() + 1) + '/' + date.getFullYear() + ' Ã ' + ('0' + date.getHours()).slice(-2) + ':' + ('0' + date.getMinutes()).slice(-2)
},
toggleEditComment(id, content, isPrivate) {
this.editingComment.id = id
diff --git a/canapGEST/Site/src/components/applicationsFilters.vue b/canapGEST/Site/src/components/applicationsFilters.vue
index 7797ddc..e07fca6 100644
--- a/canapGEST/Site/src/components/applicationsFilters.vue
+++ b/canapGEST/Site/src/components/applicationsFilters.vue
@@ -26,6 +26,7 @@
label="Rechercher"
single-line
hide-details
+ clearable
></v-text-field>
</v-card-title>
</div>
@@ -34,7 +35,7 @@
<script>
export default {
name: 'applications-filters',
- data () {
+ data() {
return {
jobFilter: null,
statusFilter: null,
@@ -42,13 +43,13 @@ export default {
}
},
watch: {
- jobFilter () {
+ jobFilter() {
this.$store.commit('moduleApplications/setFilterJob', this.jobFilter)
},
- statusFilter () {
+ statusFilter() {
this.$store.commit('moduleApplications/setFilterStatus', this.statusFilter)
},
- search () {
+ search() {
this.$store.commit('moduleApplications/setFilterSearch', this.search)
}
},
diff --git a/canapGEST/Site/src/plugins/axios.js b/canapGEST/Site/src/plugins/axios.js
index 660eb3b..0cab721 100644
--- a/canapGEST/Site/src/plugins/axios.js
+++ b/canapGEST/Site/src/plugins/axios.js
@@ -12,11 +12,10 @@ instance.interceptors.response.use(function (response) {
}, function (error) {
if (!error.response) {
store.commit('moduleSnackbar/toggle', { open: true, message: 'API non atteignable', type: 'warning' }, { root: true })
- store.dispatch('moduleUser/logout', false)
} 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)
+ // 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 {
diff --git a/canapGEST/Site/src/store/modules/applications/getters.js b/canapGEST/Site/src/store/modules/applications/getters.js
index 989f18d..a83d6ce 100644
--- a/canapGEST/Site/src/store/modules/applications/getters.js
+++ b/canapGEST/Site/src/store/modules/applications/getters.js
@@ -14,7 +14,7 @@ export function getFormatedApplicationDate(state) {
let dateTimeParts = state.currentApplication.application_data.personal_data.applicant_application_date.split(/[- :]/)
dateTimeParts[1]--
let date = new Date(...dateTimeParts)
- return date.getDate() + '/' + (date.getMonth() + 1) + '/' + date.getFullYear() + ' Ã ' + date.getHours() + ':' + date.getMinutes()
+ return date.getDate() + '/' + (date.getMonth() + 1) + '/' + date.getFullYear() + ' Ã ' + ('0' + date.getHours()).slice(-2) + ':' + ('0' + date.getMinutes()).slice(-2)
}
export function getFormatedApplicationUpdateDate(state) {
@@ -22,7 +22,7 @@ export function getFormatedApplicationUpdateDate(state) {
let dateTimeParts = state.currentApplication.application_data.personal_data.applicant_application_updated_date.split(/[- :]/)
dateTimeParts[1]--
let date = new Date(...dateTimeParts)
- return date.getDate() + '/' + (date.getMonth() + 1) + '/' + date.getFullYear() + ' Ã ' + date.getHours() + ':' + date.getMinutes()
+ return date.getDate() + '/' + (date.getMonth() + 1) + '/' + date.getFullYear() + ' Ã ' + ('0' + date.getHours()).slice(-2) + ':' + ('0' + date.getMinutes()).slice(-2)
} else {
return null
}
diff --git a/canapGEST/Site/src/views/ApplicationsView.vue b/canapGEST/Site/src/views/ApplicationsView.vue
index 92745bd..d76328d 100644
--- a/canapGEST/Site/src/views/ApplicationsView.vue
+++ b/canapGEST/Site/src/views/ApplicationsView.vue
@@ -83,7 +83,7 @@
>
</td>
<td>{{ props.item.applicant_scolarity_end }}</td>
- <td>{{ props.item.applicant_application_date }}</td>
+ <td>{{ getFormatedDate(props.item.applicant_application_date) }}</td>
<td>
<v-select
:items="$store.state.moduleApplications.available_status"
@@ -170,6 +170,12 @@ export default {
} else {
return date > this.$store.state.moduleUser.lastConnection.last_connection_date
}
+ },
+ getFormatedDate(value) {
+ let dateTimeParts = value.split(/[- :]/)
+ dateTimeParts[1]--
+ let date = new Date(...dateTimeParts)
+ return date.getDate() + '/' + (date.getMonth() + 1) + '/' + date.getFullYear() + ' Ã ' + ('0' + date.getHours()).slice(-2) + ':' + ('0' + date.getMinutes()).slice(-2)
}
},
components: {
--
GitLab