diff --git a/app/Http/Requests/Bo/ImportRequest.php b/app/Http/Requests/Bo/ImportRequest.php index f15c4cfd..07c1de3f 100644 --- a/app/Http/Requests/Bo/ImportRequest.php +++ b/app/Http/Requests/Bo/ImportRequest.php @@ -42,7 +42,7 @@ class ImportRequest extends FormRequest ) { $fail(__('Le fichier doit être d\'un mime type text/csv ou application/vnd.ms-excel')); } - if (!$content or mb_detect_encoding($content, ['ISO-8859-1'], false) !== 'ISO-8859-1') { + if (!$content or mb_detect_encoding($content, ['ISO-8859-1'], true) !== 'ISO-8859-1') { $fail(__('Le fichier doit etre encodé en ISO-8859-1')); } } diff --git a/app/Imports/SalariesImport.php b/app/Imports/SalariesImport.php index df17d9a7..db1cb7d1 100644 --- a/app/Imports/SalariesImport.php +++ b/app/Imports/SalariesImport.php @@ -8,8 +8,9 @@ use Illuminate\Support\Arr; use Maatwebsite\Excel\Concerns\ToModel; use Maatwebsite\Excel\Concerns\WithCustomCsvSettings; use Maatwebsite\Excel\Concerns\WithHeadingRow; +use Maatwebsite\Excel\Concerns\WithValidation; -class SalariesImport implements ToModel, WithCustomCsvSettings, WithHeadingRow +class SalariesImport implements ToModel, WithCustomCsvSettings, WithHeadingRow, WithValidation { /** * @var array $salariesImport @@ -56,4 +57,23 @@ class SalariesImport implements ToModel, WithCustomCsvSettings, WithHeadingRow $this->salariesImport = array_merge($this->salariesImport, [Arr::get($row, 'matricule')]); return $salarie; } + + /** + * Validation + * + * @return array + */ + public function rules(): array + { + return [ + 'matricule' => 'required|numeric|digits:6', + 'nom' => 'required|string|max:255', + 'prenom' => 'required|string|max:255', + 'etablissement' => 'required|string|max:255', + 'site' => 'required|string|max:255', + 'service' => 'required|string|max:255', + 'date_fin' => 'sometimes|nullable|date_format:d/m/Y', + 'date_fin_prevue' => 'sometimes|nullable|date_format:d/m/Y' + ]; + } } diff --git a/resources/views/bo/salaries/index.blade.php b/resources/views/bo/salaries/index.blade.php index f3995606..6e0e9c1f 100644 --- a/resources/views/bo/salaries/index.blade.php +++ b/resources/views/bo/salaries/index.blade.php @@ -7,6 +7,7 @@ {{ session('success') }} @endif + @include('modules.flash-messages')