diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 6ead053daab356d056193e79cde1a9d987823c7e..b7301f0007b7e2030e37f8d689a79bfceb89f687 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -40,7 +40,8 @@ class Kernel extends HttpKernel 'api' => [ \Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful::class, - 'throttle:api', +// 'throttle:api', + 'throttle:6000,1', \Illuminate\Routing\Middleware\SubstituteBindings::class, ], ]; diff --git a/resources/js/components/Evaluations/Single/Components/Step4/MeasureActionForm.vue b/resources/js/components/Evaluations/Single/Components/Step4/MeasureActionForm.vue index 4e5c0b309b18ba1f13ba55c852fa3c39bb7239fc..6ae132f0a1c23f01bdf046b0f5854d5f080769a1 100644 --- a/resources/js/components/Evaluations/Single/Components/Step4/MeasureActionForm.vue +++ b/resources/js/components/Evaluations/Single/Components/Step4/MeasureActionForm.vue @@ -83,7 +83,7 @@ export default { evaluation.measure_levels = this.evaluation.measure_levels.map(m => m.measure_id === this.measure.id ? ({...m, expected_level : parseInt(newValue, 10) }) : m) console.log(' evaluation.measure_levels', evaluation.measure_levels) - this.$store.dispatch('saveDraftEvaluation', evaluation).then(() => { + this.$store.dispatch('saveDraftEvaluation', {...evaluation, toast: false}).then(() => { this.$store.dispatch('getGraphForEvaluation', {name: 'risks', id:evaluation.id}) this.$store.dispatch('getGraphForEvaluation', {name: 'futurerisks', id:evaluation.id}) this.$store.commit('updateEvaluation', evaluation) @@ -104,6 +104,11 @@ export default { } evaluation.measure_levels = this.evaluation.measure_levels.map(m => m.measure_id === this.measure.id ? ({...m, end_date : moment(newValue.startDate).format('YYYY-MM-DD'), expected_level : parseInt(this.expected_level, 10) }) : m) this.$store.commit('updateEvaluation', evaluation) + this.$store.dispatch('saveDraftEvaluation', {...evaluation, toast: false}).then(() => { + this.$store.dispatch('getGraphForEvaluation', {name: 'risks', id:evaluation.id}) + this.$store.dispatch('getGraphForEvaluation', {name: 'futurerisks', id:evaluation.id}) + this.$store.commit('updateEvaluation', evaluation) + }) } }, manager: { @@ -117,6 +122,11 @@ export default { } evaluation.measure_levels = this.evaluation.measure_levels.map(m => m.measure_id === this.measure.id ? ({...m, manager : newValue, expected_level : parseInt(this.expected_level, 10) }) : m) this.$store.commit('updateEvaluation', evaluation) + this.$store.dispatch('saveDraftEvaluation', {...evaluation, toast: false}).then(() => { + this.$store.dispatch('getGraphForEvaluation', {name: 'risks', id:evaluation.id}) + this.$store.dispatch('getGraphForEvaluation', {name: 'futurerisks', id:evaluation.id}) + this.$store.commit('updateEvaluation', evaluation) + }) } }, }, diff --git a/resources/js/components/Evaluations/Single/Components/Step4/PlanAction.vue b/resources/js/components/Evaluations/Single/Components/Step4/PlanAction.vue index 93037148584a9d4a3f8809181df39b31793aa3be..ed892c573accaa08e5ad07707341d610feed95fd 100644 --- a/resources/js/components/Evaluations/Single/Components/Step4/PlanAction.vue +++ b/resources/js/components/Evaluations/Single/Components/Step4/PlanAction.vue @@ -63,6 +63,7 @@ export default { computed : { measures () { if (!this.bestMeasures || !this.$store.state.measures.all) { + this.$store.dispatch('getBestMeasures', {id: this.evaluation.id}) return [] } return this.$store.state.measures.all @@ -107,6 +108,7 @@ export default { }, }, mounted() { + console.log('plan action mounted') this.$store.dispatch('getBestMeasures', {id: this.evaluation.id}) } } diff --git a/resources/js/stores/evaluations.js b/resources/js/stores/evaluations.js index 360d95fdb3c56e87ea016a15101a9eaebf875cf2..61536ae92927a5a81a7fa34e462262a7ca417884 100755 --- a/resources/js/stores/evaluations.js +++ b/resources/js/stores/evaluations.js @@ -45,10 +45,12 @@ export default { return req }, updateEvaluation ({ commit }, item) { + const toast = item.toast + delete item.toast const req = item.id ? axios.put(`/api/evaluations/${item.id}`, item) : axios.post('/api/evaluations', item) req.then(res => { commit('updateEvaluation', res.data) - item.id && toaster(this._vm, 'Mise à jour effectuée', 'bg-success', 'check') + item.id && toast && toaster(this._vm, 'Mise à jour effectuée', 'bg-success', 'check') }).catch(err => { console.log('could not update evaluation', err) commit('setErrors', { errors: err.response.data, status: err.response.status })