diff --git a/app/Aliments.php b/app/Aliments.php deleted file mode 100644 index cef5251..0000000 --- a/app/Aliments.php +++ /dev/null @@ -1,15 +0,0 @@ -code_lot = $codeLot; $alim->date_livraison = $date; $alim->type_aliment = $aliment; diff --git a/app/Http/Controllers/EleveurController.php b/app/Http/Controllers/EleveurController.php index 097e097..f1ffe2c 100644 --- a/app/Http/Controllers/EleveurController.php +++ b/app/Http/Controllers/EleveurController.php @@ -2,7 +2,7 @@ namespace App\Http\Controllers; -use App\Eleveur; +use App\Models\Eleveur; use App\Http\Requests\MyRequest; use Response; diff --git a/app/Http/Controllers/FrontController.php b/app/Http/Controllers/FrontController.php index 652a654..2d8c531 100644 --- a/app/Http/Controllers/FrontController.php +++ b/app/Http/Controllers/FrontController.php @@ -2,10 +2,10 @@ namespace App\Http\Controllers; -use App\Eleveur; -use App\Aliments; -use App\MiseEnPlace; -use App\Moba; +use App\Models\Eleveur; +use App\Models\Aliment; +use App\Models\MiseEnPlace; +use App\Models\Moba; use App\VisuelLibelle; use Carbon\Carbon; @@ -54,7 +54,7 @@ class FrontController extends Controller $mep = MiseEnPlace::whereIn('eleveurId_pondeuse', $elevId)->where('date_transfert_poulettes', '<', $datePonte)->orderBy('id', 'DESC')->first(); if ($mep) { - $aliment = Aliments::where('code_lot', $mep->code_lot_pondeuse)->orderBy('id', 'DESC')->first(); + $aliment = Aliment::where('code_lot', $mep->code_lot_pondeuse)->orderBy('id', 'DESC')->first(); } else { $mep = ''; $aliment = ""; diff --git a/app/Models/Aliments.php b/app/Models/Aliments.php new file mode 100644 index 0000000..93fe789 --- /dev/null +++ b/app/Models/Aliments.php @@ -0,0 +1,15 @@ +aboutyou != null && $this->aboutyou != '') { return true; diff --git a/app/MiseEnPlace.php b/app/Models/MiseEnPlace.php similarity index 87% rename from app/MiseEnPlace.php rename to app/Models/MiseEnPlace.php index 7060e70..5cd0022 100644 --- a/app/MiseEnPlace.php +++ b/app/Models/MiseEnPlace.php @@ -1,11 +1,16 @@