Browse Source

fix report 1

Hima 6 years ago
parent
commit
1d6b4991f1

+ 2 - 0
src/app/dashboard/dashboard.module.ts

@@ -126,6 +126,7 @@ import { RegisterMovementVehicleAddComponent } from './register-movement-vehicle
 import { VehicleMaintenanceListComponent } from './vehicle-maintenance/vehicle-maintenance-list/vehicle-maintenance-list.component';
 import { VehicleMaintenanceAddComponent } from './vehicle-maintenance/vehicle-maintenance-add/vehicle-maintenance-add.component';
 import { ExistingReportComponent } from './reports-existing-vehicles/existing-report/existing-report.component';
+import { VehicleMovementReportComponent } from './vehicle-movement-report/vehicle-movement-report/vehicle-movement-report.component';
 
 
 @NgModule({
@@ -218,6 +219,7 @@ import { ExistingReportComponent } from './reports-existing-vehicles/existing-re
         VehicleMaintenanceListComponent,
         VehicleMaintenanceAddComponent,
         ExistingReportComponent,
+        VehicleMovementReportComponent,
     ],
     imports: [
         CommonModule,

+ 3 - 1
src/app/dashboard/reports-existing-vehicles/existing-report/existing-report.component.html

@@ -28,6 +28,7 @@
               <label style="float: right;margin-right: 5px">نوع الموديل</label>
               <select class="form-control" (input)="getReport($event)">
                 <option>أختر نوع الموديل</option>
+                <option value="all"> الكل</option>
                 <option class="form-control" *ngFor="let model of vehicle_models" name="model" [value]="model.id">{{model.name}}</option>
               </select>
             </div>
@@ -37,6 +38,7 @@
               <label style="float: right;margin-right: 5px">الحاله</label>
               <select class="form-control" (input)="getFillter($event)">
                 <option>أختر الحاله</option>
+                <option value="all"> الكل</option>
                 <option value="new">جديد</option>
                 <option value="used">مستعمل</option>
               </select>
@@ -44,7 +46,7 @@
           </div>
         </div>
 
-        <div class="row" *ngIf="vehicleModelId">
+        <div class="row" *ngIf="showTableData">
           <div class="col-12">
             <table class="table table-bordered">
                 <thead class="headBackground-w">

+ 11 - 0
src/app/dashboard/reports-existing-vehicles/existing-report/existing-report.component.ts

@@ -21,6 +21,7 @@ export class ExistingReportComponent implements OnInit {
     vehiclesData: any[] = [];
     vehicleTypeId: number;
     vehicleModelId:number;
+    showTableData:boolean = false;
 
   ngOnInit() {
     
@@ -63,6 +64,11 @@ export class ExistingReportComponent implements OnInit {
       (responce) => {
         console.log('report data ', responce);
         this.vehiclesData = responce['vehicles'];
+        if(this.vehiclesData.length > 0) {
+          this.showTableData = true;
+        } else {
+          this.showTableData = false;
+        }
       },
       (error) => {
         console.log(error);
@@ -85,6 +91,11 @@ export class ExistingReportComponent implements OnInit {
         if(this.vehiclesData.length == 0) {
           this.toastr.warning('لا يوجد بيانات لعرضها حاليا');
         }
+        if(this.vehiclesData.length > 0) {
+          this.showTableData = true;
+        } else {
+          this.showTableData = false;
+        }
       },
       (error) => {
         console.log(error);

+ 0 - 0
src/app/dashboard/vehicle-movement-report/vehicle-movement-report/vehicle-movement-report.component.css


+ 3 - 0
src/app/dashboard/vehicle-movement-report/vehicle-movement-report/vehicle-movement-report.component.html

@@ -0,0 +1,3 @@
+<p>
+  vehicle-movement-report works!
+</p>

+ 15 - 0
src/app/dashboard/vehicle-movement-report/vehicle-movement-report/vehicle-movement-report.component.ts

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-vehicle-movement-report',
+  templateUrl: './vehicle-movement-report.component.html',
+  styleUrls: ['./vehicle-movement-report.component.css']
+})
+export class VehicleMovementReportComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}