From 2e45cff233095796aac31d0121b73c511bb12340 Mon Sep 17 00:00:00 2001 From: sebastien <dupuy@datakode.fr> Date: Wed, 8 Feb 2023 14:43:34 +0100 Subject: [PATCH] php cs fixer --- app/Http/Controllers/Api/EvaluationsController.php | 5 ++--- .../Single/Components/Step4/MeasureActionForm.vue | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Api/EvaluationsController.php b/app/Http/Controllers/Api/EvaluationsController.php index 7d0b6f70..211c1105 100644 --- a/app/Http/Controllers/Api/EvaluationsController.php +++ b/app/Http/Controllers/Api/EvaluationsController.php @@ -125,7 +125,6 @@ public function save(EvaluationRepository $repository, EvaluationRequest $reques // get list of actuals measures $previous_measures_array = MeasureLevel::where('evaluation_id', $evaluation['id'])->pluck('id')->toArray(); foreach ($data['measure_levels'] as $put_measure_level) { - $measure = Measure::find($put_measure_level['measure_id']); $fundamentalMeasure = $measure->fundamental; @@ -138,7 +137,7 @@ public function save(EvaluationRepository $repository, EvaluationRequest $reques $measure_level->measure_id = $put_measure_level['measure_id']; $measure_level->evaluation_id = $evaluation['id']; $measure_level->actual_level = $put_measure_level['actual_level'] ?? null; - if ($fundamentalMeasure && (int)$evaluation->current_step === 2){ + if ($fundamentalMeasure && 2 === (int) $evaluation->current_step) { $measure_level->expected_level = $put_measure_level['actual_level'] + 1 ?? null; } else { $measure_level->expected_level = $put_measure_level['expected_level'] ?? null; @@ -230,7 +229,7 @@ private function deleteMeasureOrActionPlanStep($evaluation, $step) $mesureLevel->expected_level = null; } if (2 === $step) { - $mesureLevel->expected_level = ($mesureLevel->actual_level < 3 && $measure->fundamental ===1) ? $mesureLevel->actual_level + 1 : null; + $mesureLevel->expected_level = ($mesureLevel->actual_level < 3 && 1 === $measure->fundamental) ? $mesureLevel->actual_level + 1 : null; } $mesureLevel->end_date = null; diff --git a/resources/js/components/Evaluations/Single/Components/Step4/MeasureActionForm.vue b/resources/js/components/Evaluations/Single/Components/Step4/MeasureActionForm.vue index 3ce7185d..e5f7fae8 100644 --- a/resources/js/components/Evaluations/Single/Components/Step4/MeasureActionForm.vue +++ b/resources/js/components/Evaluations/Single/Components/Step4/MeasureActionForm.vue @@ -2,7 +2,7 @@ <div> <label class="mt-2" :for="`expected_level${measure.id}`"> Choisir le niveau visé</label> <select :id="`expected_level${measure.id}`" v-model="expected_level" class="form-select form-control-sm" :disabled="!isEditable || level == 3"> <!-- v-model="measure.expected_level" --> - <option v-if="this.level === 0" :value="0"></option> + <option v-if="level === 0" :value="0"></option> <option v-for="level in expectedLevelAvailable" :key="level" :value="level">{{ level }}</option> </select> -- GitLab