diff --git a/app/Http/Requests/Bo/ImportRequest.php b/app/Http/Requests/Bo/ImportRequest.php index 716e5918..f15c4cfd 100644 --- a/app/Http/Requests/Bo/ImportRequest.php +++ b/app/Http/Requests/Bo/ImportRequest.php @@ -33,12 +33,18 @@ class ImportRequest extends FormRequest 'mimetypes:text/csv,text/plain,application/csv,text/comma-separated-values,text/anytext,application/octet-stream,application/txt', // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassBeforeLastUsed function ($attribute, $value, $fail) { + /** @var \Illuminate\Http\UploadedFile */ + $uploadedFile = $this->file('import'); + $content = $uploadedFile->get(); if ( - $this->import->getClientMimeType() !== 'text/csv' - && $this->import->getClientMimeType() !== 'application/vnd.ms-excel' + $uploadedFile->getClientMimeType() !== 'text/csv' + && $uploadedFile->getClientMimeType() !== 'application/vnd.ms-excel' ) { $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') { + $fail(__('Le fichier doit etre encodé en ISO-8859-1')); + } } ] ]; diff --git a/app/Imports/SalariesImport.php b/app/Imports/SalariesImport.php index 60c9b4b7..df17d9a7 100644 --- a/app/Imports/SalariesImport.php +++ b/app/Imports/SalariesImport.php @@ -4,10 +4,12 @@ namespace App\Imports; use App\Models\Salarie; use Carbon\Carbon; +use Illuminate\Support\Arr; use Maatwebsite\Excel\Concerns\ToModel; use Maatwebsite\Excel\Concerns\WithCustomCsvSettings; +use Maatwebsite\Excel\Concerns\WithHeadingRow; -class SalariesImport implements ToModel, WithCustomCsvSettings +class SalariesImport implements ToModel, WithCustomCsvSettings, WithHeadingRow { /** * @var array $salariesImport @@ -20,61 +22,38 @@ class SalariesImport implements ToModel, WithCustomCsvSettings public function getCsvSettings(): array { return [ - 'delimiter' => ";" + 'delimiter' => ";", + 'input_encoding' => 'ISO-8859-1' ]; } /** - * @param array $line + * @param array $row * * @return \Illuminate\Database\Eloquent\Model|null */ - public function model(array $line) + public function model(array $row) { - if ( - !isset($line[0]) || - !isset($line[1]) || - !isset($line[2]) || - !isset($line[6]) || - !isset($line[7]) || - !isset($line[7]) - ) { - return null; + /** @var string|null */ + $end_date = Arr::get($row, 'date_fin', Arr::get($row, 'date_fin_prevue')); + + if (is_string($end_date)) { + $end_date = Carbon::createFromFormat('d/m/Y', $end_date); } - return $this->processFile($line); - } - /** - * @param array $line - * - * @return \App\Models\Salarie - */ - public function processFile(array $line) - { - /** Check if the first line of the file matches to the data expected or is just a column commentary */ - if (preg_match('/[0-9]{7}/', $line[0])) { - /** @var \App\Models\Salarie */ - $salarie = Salarie::firstOrNew(['matricule' => $line[0]]); - $salarie->customer_id = $salarie->customer_id ?? null; - $salarie->nom = ucfirst(strtolower($line[1])); - $salarie->prenom = ucfirst(strtolower($line[2])); - if (isset($line[3])) { - $salarie->start_date = Carbon::createFromFormat('d/m/Y', $line[3])->format('Y-m-d'); - } - if (isset($line[4])) { - $salarie->end_date = Carbon::createFromFormat('d/m/Y', $line[4])->format('Y-m-d'); - } elseif (isset($line[5])) { - $salarie->end_date = Carbon::createFromFormat('d/m/Y', $line[5])->format('Y-m-d'); - } - $salarie->etablissement = $line[6]; - $salarie->site = $line[7]; - $salarie->service = $line[8]; - $salarie->code = $salarie->code ?? Salarie::generateRandomString(8, Salarie::query()); - Salarie::setSalarieMagasin($salarie); - $salarie->saveOrFail(); - $this->salariesImport = array_merge($this->salariesImport, [$line[0]]); - - return $salarie; - } //end if + $salarie = Salarie::firstOrNew(['matricule' => Arr::get($row, 'matricule')]); + $salarie->matricule = Arr::get($row, 'matricule'); + $salarie->nom = Arr::get($row, 'nom'); + $salarie->prenom = Arr::get($row, 'prenom'); + $salarie->start_date = Carbon::createFromFormat('d/m/Y', Arr::get($row, 'date_debut')); + $salarie->end_date = $end_date; + $salarie->etablissement = Arr::get($row, 'etablissement'); + $salarie->site = Arr::get($row, 'site'); + $salarie->service = Arr::get($row, 'service'); + $salarie->code = $salarie->code ?? Salarie::generateRandomString(8, Salarie::query()); + Salarie::setSalarieMagasin($salarie); + $salarie->saveOrFail(); + $this->salariesImport = array_merge($this->salariesImport, [Arr::get($row, 'matricule')]); + return $salarie; } } diff --git a/resources/views/bo/salaries/index.blade.php b/resources/views/bo/salaries/index.blade.php index d65b25dd..f3995606 100644 --- a/resources/views/bo/salaries/index.blade.php +++ b/resources/views/bo/salaries/index.blade.php @@ -1,29 +1,29 @@ @extends('layouts.bo-layout') @section('content') -