moving

src/app/dashboard/Registration-trainee-movement/registration-trainee-movement-list/registration-trainee-movement-list.component.html

@@ -38,6 +38,7 @@
               </span>
             </div>
           </div>
+   
       </div>
   
       <table class="table table-bordered">

src/app/dashboard/Registration-trainee-movement/registration-trainee-movement-list/registration-trainee-movement-list.component.ts

@@ -186,6 +186,8 @@ export class RegistrationTraineeMovementListComponent implements OnInit {
     );
   };
 
+  
+
 
 
   //edit function

src/app/dashboard/model-vehicle/model-vehicle-list/model-vehicle-list.component.html

@@ -40,6 +40,17 @@
         <div class="col-12 col-sm-12 col-md-12 col-lg-6">
   
         </div>
+        <div class="col-12 col-sm-12 col-md-12 col-lg-12" style="margin-top: 20px;">
+          <div class="form-group">
+            <span class="spanSelect-w" style="margin-right:10px;">
+              <select [ngModel]="dataTableNumber" style="width:134px;" class="form-control selectButton-w" (input)="onGetValue($event)">
+                <option *ngFor="let type of vehicle_types" [value]="type.id">{{type.name}}</option>
+              </select>
+                 النوع
+            </span>
+          </div>
+        </div>
+        
     </div>
   
     <table class="table table-bordered">

src/app/dashboard/model-vehicle/model-vehicle-list/model-vehicle-list.component.ts

@@ -29,6 +29,7 @@ export class ModelVehicleListComponent implements OnInit {
   serviceId:number;
   dataTableNumber: number = 5;
   pages = [];
+  vehicle_types:any[] = [];
 
   constructor(private route: ActivatedRoute,
     private userSer: UserService,
@@ -62,6 +63,17 @@ export class ModelVehicleListComponent implements OnInit {
       }
     );
 
+    this.http.get(this.authSer.pathApi + '/get_vehicle_types_list').subscribe(
+      (response) => {
+        console.log(response);
+        this.vehicle_types = response['types'];
+        
+      },
+      (error) => {
+        console.log(error);
+      }
+     );
+
     this.route.parent.params.subscribe(
       (params:Params) => {
         this.userLoginId = params['userID'];
@@ -162,11 +174,30 @@ export class ModelVehicleListComponent implements OnInit {
       };
   
        //determine the list count from select element 
-    onGetValue(event) {
+       onGetValue(event) {
+        this.spinner.show();
+        this.dataList = [];
+        this.dataTableNumber = event.target.value;
+        this.dashBoardSer.getListData(this.pageId, this.currentPage, this.dataTableNumber).subscribe(
+          (responce) => {
+            console.log(responce);
+            this.dataList = responce['vehicle_models'];
+            this.count = responce['count'];
+            this.perPagePagenation = responce['per_page'];
+            this.spinner.hide();
+          },
+          (error) => {
+            console.log(error);
+            this.spinner.hide();
+          }
+        );
+      };
+
+    onGetValueFiltter(event) {
       this.spinner.show();
       this.dataList = [];
       this.dataTableNumber = event.target.value;
-      this.dashBoardSer.getListData(this.pageId, this.currentPage, this.dataTableNumber).subscribe(
+      this.http.get(this.authSer.pathApi +'/page_list/' + this.pageId + '/' + this.currentPage + '/' + this.dataTableNumber + '/' + event.target.value).subscribe(
         (responce) => {
           console.log(responce);
           this.dataList = responce['vehicle_models'];
@@ -176,11 +207,11 @@ export class ModelVehicleListComponent implements OnInit {
         },
         (error) => {
           console.log(error);
-          this.spinner.hide();
         }
       );
     }
   
+  
     onDelete() {
   
       this.dataListIds = [];

src/app/dashboard/registration-vehicle/registration-vehicle-list/registration-vehicle-list.component.html

@@ -40,6 +40,16 @@
         <div class="col-12 col-sm-12 col-md-12 col-lg-6">
   
         </div>
+        <div class="col-12 col-sm-12 col-md-12 col-lg-12" style="margin-top: 20px;">
+          <div class="form-group">
+            <span class="spanSelect-w" style="margin-right:10px;">
+              <select [ngModel]="dataTableNumber" style="width:134px;" class="form-control selectButton-w" (input)="onGetValueFiltter($event)">
+                <option *ngFor="let type of vehicle_types" [value]="type.id">{{type.name}}</option>
+              </select>
+                 النوع
+            </span>
+          </div>
+        </div>
     </div>
   
     <table class="table table-bordered">

src/app/dashboard/registration-vehicle/registration-vehicle-list/registration-vehicle-list.component.ts

@@ -28,6 +28,7 @@ export class RegistrationVehicleListComponent implements OnInit {
   serviceId:number;
   dataTableNumber: number = 5;
   pages = [];
+  vehicle_types:any [] = [];
 
   constructor(private route: ActivatedRoute,
     private userSer: UserService,
@@ -60,6 +61,17 @@ export class RegistrationVehicleListComponent implements OnInit {
         }
       );
 
+      this.http.get(this.authSer.pathApi + '/get_vehicle_types_list').subscribe(
+        (response) => {
+          console.log(response);
+          this.vehicle_types = response['types'];
+          
+        },
+        (error) => {
+          console.log(error);
+        }
+       );
+
       this.route.parent.params.subscribe(
         (params:Params) => {
           this.userLoginId = params['userID'];
@@ -177,7 +189,25 @@ export class RegistrationVehicleListComponent implements OnInit {
         this.spinner.hide();
       }
     );
-  }
+  };
+
+  onGetValueFiltter(event) {
+    this.spinner.show();
+    this.dataList = [];
+    this.dataTableNumber = event.target.value;
+    this.http.get(this.authSer.pathApi +'/page_list/' + this.pageId + '/' + this.currentPage + '/' + this.dataTableNumber + '/' + event.target.value).subscribe(
+      (responce) => {
+        console.log(responce);
+        this.dataList = responce['vehicle_datas'];
+        this.count = responce['count'];
+        this.perPagePagenation = responce['per_page'];
+        this.spinner.hide();
+      },
+      (error) => {
+        console.log(error);
+      }
+    );
+  };
 
   onDelete() {