diff --git a/app/Http/Controllers/Bo/ObjectivesController.php b/app/Http/Controllers/Bo/ObjectivesController.php index 02da10e..cb82ba6 100644 --- a/app/Http/Controllers/Bo/ObjectivesController.php +++ b/app/Http/Controllers/Bo/ObjectivesController.php @@ -6,6 +6,7 @@ use App\Http\Controllers\Controller; use App\Models\Objectives; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; +use Illuminate\Support\Facades\Session; class ObjectivesController extends Controller { @@ -17,7 +18,59 @@ class ObjectivesController extends Controller */ public function index(Request $request) { - return view('bo.objectives.index'); + $objectives = $this->filterObjectives($request); + + $objectives = $objectives->paginate(10); + + return view('bo.objectives.index', compact('objectives')); + } + + protected function filterObjectives(Request $request) { + $objectives = Objectives::query(); + + if ($request->rst) { + Session::remove('objectives.sort_col'); + Session::remove('objectives.sort_way'); + } + if ($request->sort_col) { + Session::put('objectives.sort_col', $request->sort_col); + Session::save(); + } + if ($request->sort_way) { + Session::put('objectives.sort_way', $request->sort_way); + Session::save(); + } + + if (Session::has('objectives.sort_col') and Session::has('objectives.sort_way')) { + switch (Session::get('objectives.sort_col')) { + case 'produit': + $objectives = $objectives->orderBy('produit', Session::get('objectives.sort_way')); + break; + case 'qualite': + $objectives = $objectives->orderBy('qualite', Session::get('objectives.sort_way')); + break; + case 'campagne': + $objectives = $objectives->orderBy('campagne', Session::get('objectives.sort_way')); + break; + case 'quantite': + $objectives = $objectives->orderBy('quantite', Session::get('objectives.sort_way')); + break; + case 'prix': + $objectives = $objectives->orderBy('prix', Session::get('objectives.sort_way')); + break; + case 'echeance': + $objectives = $objectives->orderBy('echeance', Session::get('objectives.sort_way')); + break; + case 'status_id': + $objectives = $objectives->orderBy('status_id', Session::get('objectives.sort_way')); + break; + case 'user_id': + $objectives = $objectives->orderBy('user_id', Session::get('objectives.sort_way')); + break; + } + } + + return $objectives; } /** @@ -49,7 +102,8 @@ class ObjectivesController extends Controller */ public function show($id) { - // + $objectif = Objectives::findOrFail($id); + return view('bo.objectives.show', compact('objectif')); } /** diff --git a/public/css/app.css b/public/css/app.css index 50e3af1..3155d80 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -10094,3 +10094,7 @@ h3 { text-align: center; font-size: large; } + +table.no-wrap-header th { + white-space: nowrap; +} diff --git a/resources/sass/app_custom.scss b/resources/sass/app_custom.scss index e990ddc..0c99857 100644 --- a/resources/sass/app_custom.scss +++ b/resources/sass/app_custom.scss @@ -57,3 +57,9 @@ text-align: center; font-size: large; } + +table.no-wrap-header { + th { + white-space: nowrap; + } +} diff --git a/resources/views/bo/cotations/checkgoals.blade.php b/resources/views/bo/cotations/checkgoals.blade.php index 2e88255..4823960 100644 --- a/resources/views/bo/cotations/checkgoals.blade.php +++ b/resources/views/bo/cotations/checkgoals.blade.php @@ -4,7 +4,7 @@
| Produit + @include('bo.modules.sorter', ['colname' => 'produit', 'list' => 'objectives']) + | +Qualité + @include('bo.modules.sorter', ['colname' => 'qualite', 'list' => 'objectives']) + | +Campagne + @include('bo.modules.sorter', ['colname' => 'campagne', 'list' => 'objectives']) + | +Qté + @include('bo.modules.sorter', ['colname' => 'quantite', 'list' => 'objectives']) + | +Prix + @include('bo.modules.sorter', ['colname' => 'prix', 'list' => 'objectives']) + | +Echeance + @include('bo.modules.sorter', ['colname' => 'echeance', 'list' => 'objectives']) + | +Client + @include('bo.modules.sorter', ['colname' => 'user_id', 'list' => 'objectives']) + | +Status + @include('bo.modules.sorter', ['colname' => 'status_id', 'list' => 'objectives']) + | +Réinitialiser le tri | +
|---|---|---|---|---|---|---|---|---|
| {{$objectif->produit}} | +{{$objectif->qualite}} | +{{$objectif->campagne}} | +{{$objectif->quantite}} | +{{$objectif->prix}} | +{{$objectif->echeance}} | +{{$objectif->user->lastname}} | +
+ {{$objectif->status->label}}
+ @if(!empty($objectif->goal_at))
+ {{$objectif->goal_at}} + @endif + |
+ Detail | +