moving fixes bugs

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

@@ -14,9 +14,9 @@ import { NgForm } from '@angular/forms';
 })
 export class ModelVehicleAddComponent implements OnInit {
 
-  constructor(private dashBoardSer: DashboardService, 
-    private toastr: ToastrService, 
-    private authSer: AuthServiceService, 
+  constructor(private dashBoardSer: DashboardService,
+    private toastr: ToastrService,
+    private authSer: AuthServiceService,
     private route: ActivatedRoute,
     private spinner: NgxSpinnerService,
     private location: Location,
@@ -55,7 +55,7 @@ export class ModelVehicleAddComponent implements OnInit {
       (response) => {
         console.log(response);
         this.vehicle_types = response['types'];
-        
+
       },
       (error) => {
         console.log(error);
@@ -86,11 +86,11 @@ export class ModelVehicleAddComponent implements OnInit {
   }
 
   onSubmitted() {
-    
+
     this.checkSaveclick = true;
 
-    if(this.vehicle_types) {
-      
+    if(this.vehicleId) {
+
       this.dashBoardSer.editItem(this.vehicleId, this.vehicleForm.value, 'vehicelModel').subscribe(
         (responce) => {
           console.log(responce);
@@ -102,11 +102,11 @@ export class ModelVehicleAddComponent implements OnInit {
           this.toastr.error('خطأ في الخادم ، برجاء المحاوله لاحقا');
         }
       );
-      
+
     } else {
 
       console.log(this.vehicleForm);
-      
+
       this.dashBoardSer.addItem(this.vehicleForm.value, 'modelVehicle').subscribe(
         (responce) => {
           this.checkSaveclick = false;
@@ -121,7 +121,7 @@ export class ModelVehicleAddComponent implements OnInit {
         }
       );
     }
-    
+
   }
 
 }

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

@@ -22,7 +22,7 @@
         </div>
       </div>
     </div>
-  
+
     <div class="row">
         <div class="col-12 col-sm-12 col-md-12 col-lg-6">
           <div class="form-group">
@@ -38,7 +38,7 @@
           </div>
         </div>
         <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">
@@ -50,10 +50,10 @@
             </span>
           </div>
         </div>
-        
+
     </div>
-  
-    <table class="table table-bordered">
+
+    <table class="table table-bordered" *ngIf="this.count != 0">
       <thead class="headBackground-w">
         <tr>
           <th>
@@ -80,6 +80,13 @@
       </tr>
     </tbody>
   </table>
-  <pagination-controls nextLabel="التالي" previousLabel="السابق" (pageChange)="onPageChange($event)"></pagination-controls>
+  <div class="col-12" *ngIf="this.count == 0" >
+    <!-- taaaaaaaaaaable -->
+    <h2 class="title">
+       لايوجد بيانات لعرضها 
+     </h2>
+
+  </div>
+  <pagination-controls nextLabel="التالي" previousLabel="السابق" (pageChange)="onPageChange($event)" *ngIf="this.count != 0"></pagination-controls>
   </div>
 </div>

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

@@ -10,13 +10,13 @@
         </div>
       </div>
       <div class="containerContent-w">
-  
+
       <div class="row">
         <div class="col-12">
-  
+
           <form (ngSubmit)="onSubmitted()" #f="ngForm">
             <div class="row">
-            
+
               <div class="col-12 col-sm-12 col-md-4">
                 <div class="form-group">
                   <label for="vehicle_id" style="float: right; margin-right: 5px">نوع المركبه</label>
@@ -51,7 +51,7 @@
                   </div>
                 </div>
               </div>
-  
+
               <div class="col-12 col-sm-12 col-md-4 col-lg-4">
                 <div class="form-group">
                   <label for="endDate" style="float:right" >تاريخ تسليم البطاقه <span class="spanReqired-w">*</span></label>
@@ -90,15 +90,15 @@
                   <button type="submit" class="btn btn-success rightW" [disabled]="!f.valid || checkSaveclick">حفظ</button>
                   <button type="button" class="btn btn-warning rightW" (click)="authSer.backFromEdit()">إلغاء</button>
               </div>
-  
+
             </div>
           </form>
-  
+
         </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">
@@ -112,7 +112,7 @@
               من العناصر يتم عرضها
             </span>
           </div>
-        </div>     
+        </div>
         <div class="col-12">
           <!-- taaaaaaaaaaable -->
           <h2 *ngIf="vehicleDataTable.length == 0" class="title"> لايوجد بيانات لعرضها في الجدول </h2>
@@ -139,4 +139,3 @@
     </div>
     </div>
   </div>
-  

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

@@ -16,9 +16,9 @@ import { NgForm } from '@angular/forms';
 
 export class RegisterMovementVehicleAddComponent implements OnInit {
 
-  constructor(private dashBoardSer: DashboardService, 
-    private toastr: ToastrService, 
-    private authSer: AuthServiceService, 
+  constructor(private dashBoardSer: DashboardService,
+    private toastr: ToastrService,
+    private authSer: AuthServiceService,
     private route: ActivatedRoute,
     private spinner: NgxSpinnerService,
     private location: Location,
@@ -45,7 +45,7 @@ export class RegisterMovementVehicleAddComponent implements OnInit {
   registerVehicleId: number;
   startDate: string = '';
   endDate: string = '';
-  
+
   count: number;
   perPagePagenation: number;
   currentPage:number = 1;
@@ -61,7 +61,7 @@ export class RegisterMovementVehicleAddComponent implements OnInit {
   }
 
   ngOnInit() {
-    
+
     this.http.get(this.authSer.pathApi + '/get_vehicle_types_list').subscribe(
       (response) => {
         console.log(response);
@@ -128,12 +128,12 @@ export class RegisterMovementVehicleAddComponent implements OnInit {
   }
 
 
-    //get value date from child component 
+    //get value date from child component
     public getDate(date: any , type: string):void {
-      
+
       if(date.month < 10) {
         date.month = '0' + date.month;
-      } 
+      }
 
       if(date.day < 10) {
         date.day = '0' + date.day;
@@ -154,7 +154,7 @@ export class RegisterMovementVehicleAddComponent implements OnInit {
 
     }
 
-     //change page 
+     //change page
     onPageChange(pagenationNumber) {
       this.spinner.show();
       this.currentPage = pagenationNumber;
@@ -176,8 +176,8 @@ export class RegisterMovementVehicleAddComponent implements OnInit {
       }
       );
     };
-        
-    //determine the list count from select element 
+
+    //determine the list count from select element
     onGetValue(event) {
       this.spinner.show();
       this.vehicleDataTable = [];
@@ -196,7 +196,24 @@ export class RegisterMovementVehicleAddComponent implements OnInit {
         }
       );
     };
-
+    onChangeVehicleType(event) {
+      const typeId = event.target.value;
+      this.getModelName(typeId);
+    }
+    getModelName(typeVehicleId) {
+      this.http.get(this.authSer.pathApi + '/get_vehicle_models_by_type_id/' + typeVehicleId).subscribe(
+        (responce) => {
+          console.log('types names of vehicles ', responce);
+          this.modelNames = responce['models'];
+          if(this.modelNames.length == 0) {
+            this.toastr.warning('لا يوجد اسماء موديل لهذا النوع');
+          }
+        },
+        (error) => {
+          console.log(error);
+        }
+      )
+    }
 
     onSubmitted() {
 

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

@@ -22,7 +22,7 @@
         </div>
       </div>
     </div>
-  
+
     <div class="row">
         <div class="col-12 col-sm-12 col-md-12 col-lg-6">
           <div class="form-group">
@@ -38,12 +38,13 @@
           </div>
         </div>
         <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>
                  النوع
@@ -51,8 +52,8 @@
           </div>
         </div>
     </div>
-  
-    <table class="table table-bordered">
+
+    <table class="table table-bordered" *ngIf="this.count != 0 " >
       <thead class="headBackground-w">
         <tr>
           <th>
@@ -67,6 +68,7 @@
           <th *ngIf="authSer.showEditBtn">تعديل</th>
         </tr>
       </thead>
+
       <tbody>
         <tr *ngFor="let data of dataList | paginate: { itemsPerPage: perPagePagenation, currentPage: currentPage, totalItems: count }; let i = index ">
           <td>
@@ -83,6 +85,12 @@
       </tr>
     </tbody>
   </table>
-  <pagination-controls nextLabel="التالي" previousLabel="السابق" (pageChange)="onPageChange($event)"></pagination-controls>
+  <div class="col-12" *ngIf="this.count == 0 " >
+    <!-- taaaaaaaaaaable -->
+    <h2 class="title">لا يوجد بيانات لعرضها </h2>
+
   </div>
+  <pagination-controls nextLabel="التالي" previousLabel="السابق" (pageChange)="onPageChange($event)" *ngIf="this.count != 0 "></pagination-controls>
+  </div>
+
 </div>

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

@@ -18,7 +18,7 @@
 
         <form (ngSubmit)="onSubmitted()" #f="ngForm">
           <div class="row">
-          
+
             <div class="col-12 col-sm-12 col-md-4">
               <div class="form-group">
                 <label for="vehicle_id" style="float: right; margin-right: 5px">نوع المركبه</label>
@@ -80,9 +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">
@@ -96,7 +96,7 @@
             من العناصر يتم عرضها
           </span>
         </div>
-      </div>     
+      </div>
       <div class="col-12">
         <!-- taaaaaaaaaaable -->
         <h2 *ngIf="vehicleDataTable.length == 0" class="title"> لايوجد بيانات لعرضها في الجدول </h2>

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

@@ -23,8 +23,7 @@
       </div>
     </div>
 
-
-    <div class="row">
+    <div class="row"  *ngIf="this.count != 0">
         <div class="col-12 col-sm-12 col-md-12 col-lg-6">
           <div class="form-group">
             <span class="spanSelect-w">
@@ -40,7 +39,7 @@
         </div>
     </div>
 
-    <table class="table table-bordered">
+    <table class="table table-bordered" *ngIf="this.count != 0" >
       <thead class="headBackground-w">
         <tr>
             <th>
@@ -67,9 +66,15 @@
         </tr>
       </tbody>
     </table>
-    <pagination-controls nextLabel="التالي" previousLabel="السابق" (pageChange)="onPageChange($event)"></pagination-controls>
+    <div class="col-12" *ngIf="this.count == 0" >
+      <!-- taaaaaaaaaaable -->
+      <h2 class="title"> لايوجد بيانات لعرضها
+      </h2>
+
+    </div>
+    <pagination-controls nextLabel="التالي" previousLabel="السابق" (pageChange)="onPageChange($event)" *ngIf="this.count != 0" ></pagination-controls>
   </div>
 
 
-</div>
 
+</div>

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

@@ -16,8 +16,8 @@ import { Modal } from 'ngx-modialog/plugins/bootstrap';
 export class VehicleMaintenanceListComponent implements OnInit {
 
 
-  constructor(private route: ActivatedRoute,    
-    private router: Router, 
+  constructor(private route: ActivatedRoute,
+    private router: Router,
     private userSer: UserService,
     private http: HttpClient,
     private toastr: ToastrService,
@@ -29,7 +29,7 @@ export class VehicleMaintenanceListComponent implements OnInit {
     pageId: number;
     dataList = [];
     dataListIds = [];
-    
+
     count: number;
     perPagePagenation: number;
     currentPage:number = 1;
@@ -41,11 +41,11 @@ export class VehicleMaintenanceListComponent implements OnInit {
     serviceId:number;
     serviceName: string = '';
     pages = [];
-
+    emty : boolean = false;
 
 
   ngOnInit() {
-    
+
     //this.spinner.show();
 
     //init the values of permision boolean
@@ -72,7 +72,7 @@ export class VehicleMaintenanceListComponent implements OnInit {
     (params:Params) => {
         this.userLoginId = params['userID'];
         this.serviceId = params['serviceID'];
-        
+
         this.route.parent.params.subscribe(
           (params:Params) => {
             this.userLoginId = params['userID'];
@@ -103,7 +103,7 @@ export class VehicleMaintenanceListComponent implements OnInit {
     );
 
 
-    //get list data 
+    //get list data
     this.dashBoardSer.getListData(this.pageId, this.currentPage ,this.dataTableNumber).subscribe(
       (responce) => {
         console.log('rescponce dataaaa', responce);
@@ -121,7 +121,7 @@ export class VehicleMaintenanceListComponent implements OnInit {
 
   }
 
-  //make all checkbox of user checked 
+  //make all checkbox of user checked
   selectAll() {
     for (var i = 0; i < this.dataList.length; i++) {
       this.dataList[i].selected = this.selectedAll;
@@ -138,7 +138,7 @@ export class VehicleMaintenanceListComponent implements OnInit {
      filtterFunc(data) {
       this.dataList = [];
       console.log(data.target.value);
-      const dataSearch = data.target.value;     
+      const dataSearch = data.target.value;
       this.currentPage = 1;
       console.log('search curent page', this.currentPage);
       this.dashBoardSer.getDataUSerSearchBar(dataSearch, this.pageId, this.currentPage, this.dataTableNumber).subscribe(
@@ -156,10 +156,10 @@ export class VehicleMaintenanceListComponent implements OnInit {
       );
     };
 
-    //change page 
+    //change page
 onPageChange(pagenationNumber) {
   this.spinner.show();
-  
+
   this.currentPage = pagenationNumber;
   this.dataList = [];
   //console.log(pagenationNumber);
@@ -180,7 +180,7 @@ onPageChange(pagenationNumber) {
   );
 };
 
-  //determine the list count from select element 
+  //determine the list count from select element
   onGetValue(event) {
     this.spinner.show();
     this.dataList = [];
@@ -220,16 +220,16 @@ onPageChange(pagenationNumber) {
           <h4>هل ترغب في حذف العناصر المحدده ؟ </h4>
           `)
       .open();
-  
+
         dialogRef.result
-        .then( result => 
+        .then( result =>
           this.dashBoardSer.deleteItem(this.dataListIds , this.pageId).subscribe(
             (responce) => {
               console.log(responce);
               this.toastr.success('تم الحذف');
               this.spinner.show();
               this.dataList = [];
-               //get list data 
+               //get list data
               this.dashBoardSer.getListData(this.pageId, this.currentPage ,this.dataTableNumber).subscribe(
                 (responce) => {
                   console.log(responce);

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

@@ -22,7 +22,7 @@
         </div>
       </div>
     </div>
-  
+
     <div class="row">
         <div class="col-12 col-sm-12 col-md-12 col-lg-6">
           <div class="form-group">
@@ -38,11 +38,11 @@
           </div>
         </div>
         <div class="col-12 col-sm-12 col-md-12 col-lg-6">
-  
+
         </div>
     </div>
-  
-    <table class="table table-bordered">
+
+    <table class="table table-bordered" *ngIf="this.count != 0">
       <thead class="headBackground-w">
         <tr>
           <th>
@@ -69,6 +69,11 @@
       </tr>
     </tbody>
   </table>
-  <pagination-controls nextLabel="التالي" previousLabel="السابق" (pageChange)="onPageChange($event)"></pagination-controls>
+  <div class="col-12" *ngIf="this.count == 0" >
+    <!-- taaaaaaaaaaable -->
+    <h2 class="title"> لا يوجد بيانات لعرضها </h2>
+
+  </div>
+  <pagination-controls nextLabel="التالي" previousLabel="السابق" (pageChange)="onPageChange($event)" *ngIf="this.count != 0"></pagination-controls>
   </div>
 </div>