diff --git a/app/Http/Controllers/Api/EvaluationsController.php b/app/Http/Controllers/Api/EvaluationsController.php index affb46dd3d72615362738e5fa0a22f21a5ce38fb..c18ff72d63d8fb327ac1be4540635b88fc80cf66 100644 --- a/app/Http/Controllers/Api/EvaluationsController.php +++ b/app/Http/Controllers/Api/EvaluationsController.php @@ -112,19 +112,19 @@ public function save(EvaluationRequest $request, $id = null) // get list of actuals measures $previous_measures_array = MeasureLevel::where('evaluation_id', $evaluation['id'])->pluck('id')->toArray(); // dd($data['measure_levels']); - foreach ($data['measure_levels'] as $measure_level) { - if (null !== $measure_level['id']) { - $measure_level = MeasureLevel::find($measure_level['id']); + foreach ($data['measure_levels'] as $put_measure_level) { + if (isset($put_measure_level['id'])) { + $measure_level = MeasureLevel::find($put_measure_level['id']); } else { $measure_level = new MeasureLevel(); } - $measure_level->measure_id = $measure_level['measure_id']; + $measure_level->measure_id = $put_measure_level['measure_id']; $measure_level->evaluation_id = $evaluation['id']; - $measure_level->actual_level = $measure_level['actual_level']; - $measure_level->expected_level = $measure_level['expected_level'] ? $measure_level['expected_level'] : null; - $measure_level->manager_id = $measure_level['manager_id'] ? $measure_level['manager_id'] : null; - $measure_level->end_date = $measure_level['end_date'] ? $measure_level['end_date'] : null; + $measure_level->actual_level = $put_measure_level['actual_level'] ?? null; + $measure_level->expected_level = $put_measure_level['expected_level'] ?? null; + $measure_level->manager_id = $put_measure_level['manager_id'] ?? null; + $measure_level->end_date = $put_measure_level['end_date'] ?? null; $measure_level->save(); if (in_array($measure_level['id'], $previous_measures_array)) { diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 7f6a5e0a71dd7585c4dd927cc37e85404af5fad0..29412119d512adc350dea9b424f347178d3819db 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -5,9 +5,5 @@ "/images/logo_madis_2020_couleur.png": "/images/logo_madis_2020_couleur.png", "/images/logo_madis_2020_favicon.png": "/images/logo_madis_2020_favicon.png", "/images/logo_madis_2020_favicon_white.png": "/images/logo_madis_2020_favicon_white.png", - "/images/soluris-logo-white.png": "/images/soluris-logo-white.png", - "/images/vendor/vuejs-datatable/docs/icons.png": "/images/vendor/vuejs-datatable/docs/icons.png", - "/images/vendor/vuejs-datatable/docs/icons@2x.png": "/images/vendor/vuejs-datatable/docs/icons@2x.png", - "/images/vendor/vuejs-datatable/docs/widgets.png": "/images/vendor/vuejs-datatable/docs/widgets.png", - "/images/vendor/vuejs-datatable/docs/widgets@2x.png": "/images/vendor/vuejs-datatable/docs/widgets@2x.png" + "/images/soluris-logo-white.png": "/images/soluris-logo-white.png" }