moving service

src/app/dashboard/register-movement-vehicle/register-movement-vehicle-add/register-movement-vehicle-add.component.css

@@ -2,4 +2,22 @@ input, select {
     font-size: 12px;
     background-color: #f9f9f9;
     border: 2px solid #bda380;
+}
+
+input, select {
+    font-size: 12px;
+    background-color: #f9f9f9;
+    border: 2px solid #bda380;
+}
+
+.title {
+    float: right;
+    margin: 20px 0;
+    color: #ef1c1c;
+    font-size: 15px;
+}
+
+.hr {
+    height: 2px;
+    background-color: #bda380;
 }

src/app/dashboard/register-movement-vehicle/register-movement-vehicle-add/register-movement-vehicle-add.component.html

@@ -96,6 +96,46 @@
   
         </div>
       </div>
+
+      <hr class="hr">
+    
+      <div class="row">
+        <div class="col-12 col-sm-12 col-md-12 col-lg-6">
+          <div class="form-group">
+            <span class="spanSelect-w">
+              <select [ngModel]="dataTableNumber" class="form-control selectButton-w" (input)="onGetValue($event)">
+                <option value="5">5</option>
+                <option value="10">10</option>
+                <option value="15">15</option>
+                <option value="20">20</option>
+              </select>
+              من العناصر يتم عرضها
+            </span>
+          </div>
+        </div>     
+        <div class="col-12">
+          <!-- taaaaaaaaaaable -->
+          <h2 *ngIf="vehicleDataTable.length == 0" class="title"> لايوجد بيانات لعرضها في الجدول </h2>
+          <table class="table table-bordered">
+            <thead class="headBackground-w">
+              <tr>
+                <th> نوع المركبه</th>
+                <th>رقم اللوحه</th>
+                <th *ngIf="authSer.showEditBtn">تعديل</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr *ngFor="let data of vehicleDataTable | paginate: { itemsPerPage: perPagePagenation, currentPage: currentPage, totalItems: count }; let i = index ">
+                <td>{{data.vehicle_type_name}}</td>
+                <td>{{data.vehicle_plate_number}}</td>
+                <td *ngIf="authSer.showEditBtn"><button type="button" class="btn btn-outline-secondary" (click)="onEdit(data.id)"><i class="fas fa-edit"></i></button></td>
+              </tr>
+            </tbody>
+          </table>
+          <pagination-controls nextLabel="التالي" previousLabel="السابق" (pageChange)="onPageChange($event)"></pagination-controls>
+        </div>
+      </div>
+
     </div>
     </div>
   </div>

src/app/dashboard/register-movement-vehicle/register-movement-vehicle-add/register-movement-vehicle-add.component.ts

@@ -12,6 +12,8 @@ import { NgForm } from '@angular/forms';
   templateUrl: './register-movement-vehicle-add.component.html',
   styleUrls: ['./register-movement-vehicle-add.component.css']
 })
+
+
 export class RegisterMovementVehicleAddComponent implements OnInit {
 
   constructor(private dashBoardSer: DashboardService, 
@@ -35,11 +37,20 @@ export class RegisterMovementVehicleAddComponent implements OnInit {
   typeMode: boolean = false;
 
   vehicleId: number;
+  vehicleNumber: number;
+
   vehicle_types:any[] = [];
   modelNames:any[] = [];
+  vehicleDataTable:any[]=[];
   registerVehicleId: number;
   startDate: string = '';
   endDate: string = '';
+  
+  count: number;
+  perPagePagenation: number;
+  currentPage:number = 1;
+  dataTableNumber: number = 5;
+
   formData = {
     vehicle_id: '',
     vehicle_recipient_name: '',
@@ -55,7 +66,6 @@ export class RegisterMovementVehicleAddComponent implements OnInit {
       (response) => {
         console.log(response);
         this.vehicle_types = response['types'];
-        
       },
       (error) => {
         console.log(error);
@@ -68,6 +78,7 @@ export class RegisterMovementVehicleAddComponent implements OnInit {
       );
 
       if(this.registerVehicleId) {
+        this.spinner.show();
         this.typePage = 'تعديل';
         this.typeMode = true;
         this.dashBoardSer.getItemData(this.registerVehicleId, 'registerMovementVehicle').subscribe(
@@ -96,7 +107,21 @@ export class RegisterMovementVehicleAddComponent implements OnInit {
           (error) => {
             console.log(error);
           }
-        )
+        );
+
+        this.dashBoardSer.getDataUSerSearchBar(this.vehicleNumber,
+          47,
+         this.currentPage,
+         this.dataTableNumber).subscribe(
+         (responce) => {
+           console.log('search table edit ', responce);
+           this.vehicleDataTable = responce['vehicle_movements'];
+         },
+         (error) => {
+           console.log(error);
+         }
+       );
+
       } else {
         this.typePage = 'إضافه';
       }
@@ -129,6 +154,49 @@ export class RegisterMovementVehicleAddComponent implements OnInit {
 
     }
 
+     //change page 
+    onPageChange(pagenationNumber) {
+      this.spinner.show();
+      this.currentPage = pagenationNumber;
+      this.vehicleDataTable = [];
+      //console.log(pagenationNumber);
+      //console.log(this.pageId);
+      this.dashBoardSer.getListData(47, pagenationNumber, this.dataTableNumber).subscribe(
+      (responce) => {
+        console.log('search result ', responce);
+        this.vehicleDataTable = responce['vehicle_movements'];
+        this.count = responce['count'];
+        this.perPagePagenation = responce['per_page'];
+        console.log(this.vehicleDataTable);
+        this.spinner.hide();
+      },
+      (error) => {
+        console.log(error);
+        this.spinner.hide();
+      }
+      );
+    };
+        
+    //determine the list count from select element 
+    onGetValue(event) {
+      this.spinner.show();
+      this.vehicleDataTable = [];
+      this.dataTableNumber = event.target.value;
+      this.dashBoardSer.getListData(47, this.currentPage, this.dataTableNumber).subscribe(
+        (responce) => {
+          console.log(responce);
+          this.vehicleDataTable = responce['vehicle_movements'];
+          this.count = responce['count'];
+          this.perPagePagenation = responce['per_page'];
+          this.spinner.hide();
+        },
+        (error) => {
+          console.log(error);
+          this.spinner.hide();
+        }
+      );
+    };
+
 
     onSubmitted() {
 
@@ -142,6 +210,7 @@ export class RegisterMovementVehicleAddComponent implements OnInit {
       const endDateData = this.endDate.split('-');
 
       if(this.typeMode) {
+
         if(startDateData[0] > endDateData[0]) {
           this.toastr.warning('سنه تاريخ الإنتهاء يجب أن تكون أكبر من سنه تاريخ الإنتهاء !');
           this.checkSaveclick = false;
@@ -165,6 +234,7 @@ export class RegisterMovementVehicleAddComponent implements OnInit {
             }
           );
         }
+
       } else {
 
         if(startDateData[0] > endDateData[0]) {

src/app/dashboard/vehicle-maintenance/vehicle-maintenance-add/vehicle-maintenance-add.component.css

@@ -2,4 +2,16 @@ input, select {
     font-size: 12px;
     background-color: #f9f9f9;
     border: 2px solid #bda380;
+}
+
+.title {
+    float: right;
+    margin: 20px 0;
+    color: #ef1c1c;
+    font-size: 15px;
+}
+
+.hr {
+    height: 2px;
+    background-color: #bda380;
 }

src/app/dashboard/vehicle-maintenance/vehicle-maintenance-add/vehicle-maintenance-add.component.html

@@ -80,7 +80,9 @@
 
       </div>
     </div>
-
+    
+    <hr class="hr">
+    
     <div class="row">
       <div class="col-12 col-sm-12 col-md-12 col-lg-6">
         <div class="form-group">
@@ -97,14 +99,10 @@
       </div>     
       <div class="col-12">
         <!-- taaaaaaaaaaable -->
+        <h2 *ngIf="vehicleDataTable.length == 0" class="title"> لايوجد بيانات لعرضها في الجدول </h2>
         <table class="table table-bordered">
           <thead class="headBackground-w">
             <tr>
-                <th>
-                    <div class="custom-control custom-checkbox">
-                      <input type="checkbox" class="custom-control-input" [(ngModel)]="selectedAll" (change)="selectAll();" id="customCheck" name="example1">
-                    </div>
-                </th>
               <th> نوع المركبه</th>
               <th>رقم اللوحه</th>
               <th *ngIf="authSer.showEditBtn">تعديل</th>
@@ -112,12 +110,6 @@
           </thead>
           <tbody>
             <tr *ngFor="let data of vehicleDataTable | paginate: { itemsPerPage: perPagePagenation, currentPage: currentPage, totalItems: count }; let i = index ">
-              <td>
-                <div class="custom-control custom-checkbox centerIneerItem">
-                  <input type="checkbox" class="custom-control-input" id="{{data.id}}" [(ngModel)]="data.selected" [value]='data' (change)="checkIfAllSelected();">
-                  <!-- <label class="custom-control-label disblayBlock-w" for="{{tab.id}}" style="color:#2a2a2a"></label> -->
-                </div>
-              </td>
               <td>{{data.vehicle_type_name}}</td>
               <td>{{data.vehicle_plate_number}}</td>
               <td *ngIf="authSer.showEditBtn"><button type="button" class="btn btn-outline-secondary" (click)="onEdit(data.id)"><i class="fas fa-edit"></i></button></td>

src/app/dashboard/vehicle-maintenance/vehicle-maintenance-add/vehicle-maintenance-add.component.ts

@@ -112,15 +112,20 @@ export class VehicleMaintenanceAddComponent implements OnInit {
             console.log(error);
           }
          );
-
-        this.dashBoardSer.getDataUSerSearchBar(this.vehicleNumber, this.maintenanceVehicleId, this.currentPage, this.dataTableNumber).subscribe(
+        
+        this.dashBoardSer.getDataUSerSearchBar(this.vehicleNumber,
+           46,
+          this.currentPage,
+          this.dataTableNumber).subscribe(
           (responce) => {
             console.log('search table edit ', responce);
+            this.vehicleDataTable = responce['vehicle_maintenances'];
           },
           (error) => {
             console.log(error);
           }
-        )
+        );
+
       } else {
         this.typePage = 'إضافه';
       }
@@ -153,29 +158,49 @@ export class VehicleMaintenanceAddComponent implements OnInit {
   }
 
 
-    //change page 
-onPageChange(pagenationNumber) {
-  this.spinner.show();
-  
-  this.currentPage = pagenationNumber;
-  this.vehicleDataTable = [];
-  //console.log(pagenationNumber);
-  //console.log(this.pageId);
-  this.dashBoardSer.getListData(this.maintenanceVehicleId, pagenationNumber, this.dataTableNumber).subscribe(
-  (responce) => {
-    console.log('search result ', responce);
-    this.vehicleDataTable = responce['vehicle_maintenances'];
-    this.count = responce['count'];
-    this.perPagePagenation = responce['per_page'];
-    console.log(this.vehicleDataTable);
-    this.spinner.hide();
-  },
-  (error) => {
-    console.log(error);
-    this.spinner.hide();
-   }
-  );
-};
+        //change page 
+    onPageChange(pagenationNumber) {
+      this.spinner.show();
+      
+      this.currentPage = pagenationNumber;
+      this.vehicleDataTable = [];
+      //console.log(pagenationNumber);
+      //console.log(this.pageId);
+      this.dashBoardSer.getListData(46, pagenationNumber, this.dataTableNumber).subscribe(
+      (responce) => {
+        console.log('search result ', responce);
+        this.vehicleDataTable = responce['vehicle_maintenances'];
+        this.count = responce['count'];
+        this.perPagePagenation = responce['per_page'];
+        console.log(this.vehicleDataTable);
+        this.spinner.hide();
+      },
+      (error) => {
+        console.log(error);
+        this.spinner.hide();
+      }
+      );
+    };
+
+  //determine the list count from select element 
+  onGetValue(event) {
+    this.spinner.show();
+    this.vehicleDataTable = [];
+    this.dataTableNumber = event.target.value;
+    this.dashBoardSer.getListData(46, this.currentPage, this.dataTableNumber).subscribe(
+      (responce) => {
+        console.log(responce);
+        this.vehicleDataTable = responce['vehicle_maintenances'];
+        this.count = responce['count'];
+        this.perPagePagenation = responce['per_page'];
+        this.spinner.hide();
+      },
+      (error) => {
+        console.log(error);
+        this.spinner.hide();
+      }
+    );
+  };
 
 
   onSubmitted() {

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

@@ -29,14 +29,16 @@ export class VehicleMaintenanceListComponent implements OnInit {
     pageId: number;
     dataList = [];
     dataListIds = [];
+    
     count: number;
     perPagePagenation: number;
     currentPage:number = 1;
+    dataTableNumber: number = 5;
+
     filtterStatus = '';
     selectedAll: any;
     userLoginId:number;
     serviceId:number;
-    dataTableNumber: number = 5;
     serviceName: string = '';
     pages = [];
 
@@ -177,7 +179,7 @@ onPageChange(pagenationNumber) {
   );
 };
 
-      //determine the list count from select element 
+  //determine the list count from select element 
   onGetValue(event) {
     this.spinner.show();
     this.dataList = [];

src/app/shared/dashboard.service.ts

@@ -30,6 +30,7 @@ export class DashboardService {
       if(pageId == 40) {
         return this.http.get(this.authService.pathApi + '/page_list' + '/' + pageId + '/' + pagenationNumber + '/' + dataTableNumber + '/1/' + data);
       } else {
+        console.log('urrrrrl',this.authService.pathApi + '/page_list' + '/' + pageId + '/' + pagenationNumber + '/' + dataTableNumber + '/all/' );
         return this.http.get(this.authService.pathApi + '/page_list' + '/' + pageId + '/' + pagenationNumber + '/' + dataTableNumber + '/all/' + data);
       }
     }