diff --git a/app/Http/Controllers/Bo/ObjectivesController.php b/app/Http/Controllers/Bo/ObjectivesController.php index cb82ba6..faaf940 100644 --- a/app/Http/Controllers/Bo/ObjectivesController.php +++ b/app/Http/Controllers/Bo/ObjectivesController.php @@ -67,6 +67,11 @@ class ObjectivesController extends Controller case 'user_id': $objectives = $objectives->orderBy('user_id', Session::get('objectives.sort_way')); break; + case 'tc_id': + $objectives = $objectives->select('objectives.*'); + $objectives = $objectives->leftJoin('users', 'users.id', '=', 'objectives.user_id'); + $objectives = $objectives->orderBy('users.tc_id', Session::get('objectives.sort_way')); + break; } } diff --git a/app/Http/Controllers/Bo/UsersController.php b/app/Http/Controllers/Bo/UsersController.php index 21b30d8..a401553 100644 --- a/app/Http/Controllers/Bo/UsersController.php +++ b/app/Http/Controllers/Bo/UsersController.php @@ -184,6 +184,7 @@ class UsersController extends Controller $adress_chargement = filter_var($request->adress_chargement, FILTER_SANITIZE_STRING); $optional_contact = filter_var($request->optional_contact, FILTER_SANITIZE_STRING); $num_client = filter_var($request->client_number, FILTER_SANITIZE_STRING); + $tc_id = $request->tc_id; //check if num client has been filled if (empty($user->client_number) && !empty($num_client)) { @@ -203,6 +204,7 @@ class UsersController extends Controller $user->adress_chargement = $adress_chargement; $user->optional_contact = $optional_contact; $user->client_number = $num_client; + $user->tc_id = $tc_id; $phone = $request->phone; $user->apiData->phone = $phone; diff --git a/database/migrations/2021_05_26_111401_add_tc_field_to_users_table.php b/database/migrations/2021_05_26_111401_add_tc_field_to_users_table.php new file mode 100644 index 0000000..c2e6b42 --- /dev/null +++ b/database/migrations/2021_05_26_111401_add_tc_field_to_users_table.php @@ -0,0 +1,32 @@ +unsignedInteger('tc_id')->nullable()->after('tech_commercial'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('users', function (Blueprint $table) { + $table->dropColumn('tc_id'); + }); + } +} diff --git a/resources/views/bo/objectives/index.blade.php b/resources/views/bo/objectives/index.blade.php index 3a6863a..27bfb98 100644 --- a/resources/views/bo/objectives/index.blade.php +++ b/resources/views/bo/objectives/index.blade.php @@ -10,28 +10,31 @@
| Produit + | Prod. @include('bo.modules.sorter', ['colname' => 'produit', 'list' => 'objectives']) |
- Qualité + | Qualité @include('bo.modules.sorter', ['colname' => 'qualite', 'list' => 'objectives']) |
- Campagne + | Camp. @include('bo.modules.sorter', ['colname' => 'campagne', 'list' => 'objectives']) |
- Qté + | Qté @include('bo.modules.sorter', ['colname' => 'quantite', 'list' => 'objectives']) |
- Prix + | Prix @include('bo.modules.sorter', ['colname' => 'prix', 'list' => 'objectives']) |
- Echeance + | Echeance @include('bo.modules.sorter', ['colname' => 'echeance', 'list' => 'objectives']) |
- Client + | Client @include('bo.modules.sorter', ['colname' => 'user_id', 'list' => 'objectives']) |
- Status + | TC + @include('bo.modules.sorter', ['colname' => 'tc_id', 'list' => 'objectives']) + |
+ Status @include('bo.modules.sorter', ['colname' => 'status_id', 'list' => 'objectives']) |
Réinitialiser le tri | @@ -47,6 +50,7 @@{{$objectif->prix}} | {{$objectif->echeance}} | {{$objectif->user->lastname}} | +{{$objectif->user->tc_id}} |
{{$objectif->status->label}}
@if(!empty($objectif->goal_at))
diff --git a/resources/views/bo/users/edit_pro.blade.php b/resources/views/bo/users/edit_pro.blade.php
index ef94bf1..2abba8c 100644
--- a/resources/views/bo/users/edit_pro.blade.php
+++ b/resources/views/bo/users/edit_pro.blade.php
@@ -189,6 +189,10 @@
+
+
+
+
|
|---|