merge commit

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

@@ -24,8 +24,8 @@
     </div>
 
     <div class="row">
-        <div class="col-12 col-sm-12 col-md-12 col-lg-6">
-          <div class="form-group">
+        <div class="col-12 col-sm-12 col-md-12 col-lg-12">
+          <div class="form-group" style="float:right;">
             <span class="spanSelect-w" style="margin-right:10px;">
               <select [ngModel]="dataTableNumber" class="form-control selectButton-w" (input)="onGetValue($event)">
                 <option value="5">5</option>
@@ -36,13 +36,8 @@
               من العناصر يتم عرضها
             </span>
           </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;">
+          <div class="form-group" style="float: right; margin: 0 20px;">
+            <span class="spanSelect-w" >
               <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>
@@ -51,6 +46,7 @@
           </div>
         </div>
 
+
     </div>
 
     <table class="table table-bordered" *ngIf="this.count != 0">
@@ -61,7 +57,7 @@
               <input type="checkbox" class="custom-control-input" [(ngModel)]="selectedAll" (change)="selectAll();" id="customCheck" name="example1">
             </div>
           </th>
-          <th>إسم النوع</th>
+          <th>إسم الموديل</th>
           <th>الحاله</th>
           <th *ngIf="authSer.showEditBtn">تعديل</th>
         </tr>
@@ -83,7 +79,7 @@
   <div class="col-12" *ngIf="this.count == 0" >
     <!-- taaaaaaaaaaable -->
     <h2 class="title">
-       لايوجد بيانات لعرضها 
+       لايوجد بيانات لعرضها
      </h2>
 
   </div>

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

@@ -7,7 +7,7 @@
           </ul>
       </div>
     </div>
-  
+
     <div class="containerContent-w">
 
       <div class="row">
@@ -38,10 +38,10 @@
               </span>
             </div>
           </div>
-   
+
       </div>
-  
-      <table class="table table-bordered">
+
+      <table class="table table-bordered" *ngIf="dataList.length != 0">
         <thead class="headBackground-w">
           <tr>
               <th>
@@ -72,9 +72,13 @@
           </tr>
         </tbody>
       </table>
-      <pagination-controls nextLabel="التالي" previousLabel="السابق" (pageChange)="onPageChange($event)"></pagination-controls>
+      <div class="col-12" *ngIf="dataList.length == 0" >
+        <h2 class="title">
+           لايوجد بيانات لعرضها
+         </h2>
+      </div>
+      <pagination-controls nextLabel="التالي" previousLabel="السابق" (pageChange)="onPageChange($event)" *ngIf="dataList.length != 0"></pagination-controls>
     </div>
-  
-  
+
+
   </div>
-  

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

@@ -25,7 +25,7 @@
 
     <div class="row">
         <div class="col-12 col-sm-12 col-md-12 col-lg-6">
-          <div class="form-group">
+          <div class="form-group" style="float: right;">
             <span class="spanSelect-w" style="margin-right:10px;">
               <select [ngModel]="dataTableNumber" class="form-control selectButton-w" (input)="onGetValue($event)">
                 <option value="5">5</option>
@@ -36,13 +36,8 @@
               من العناصر يتم عرضها
             </span>
           </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;">
+            <span class="spanSelect-w" style="float: right; margin: 0 20px;">
               <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>

src/app/trainning-service/add-request/add-request.component.html

@@ -27,7 +27,7 @@
             <div class="col-12 col-sm-12 col-md-4 col-lg-4">
               <div class="form-group">
                 <label for="specialize">اسم التخصص</label>
-                <input type="text" placeholder="نوع الطلب" class="form-control" name="specialization_name" [ngModel]="dataForm.specialization_name" required/>
+                <input type="text" placeholder="اسم التخصص" class="form-control" name="specialization_name" [ngModel]="dataForm.specialization_name" required/>
               </div>
             </div>
             <div class="col-12 col-sm-12 col-md-4 col-lg-4">
@@ -115,7 +115,7 @@
               </div>
               <div class="col-12">
                <div class="row">
-                 
+
                   <div class="col-12">
                   <button type="button" class="btn btn-default" (click)="plusImage()" style="margin:10px 0;">إضافه مرفق</button>
                  </div>
@@ -151,4 +151,4 @@
       </div>
     </div>
   </div>
-</div>
+</div>

src/app/trainning-service/all-requests/all-requests.component.html

@@ -1,5 +1,5 @@
 <div class="container">
-  
+
     <div class="row">
       <div class="col-12">
           <ul class="list-unstyled titileLi-w">
@@ -8,10 +8,13 @@
           </ul>
       </div>
     </div>
-  
-    <div class="containerContent-w">
-    
-        <table class="table table-bordered">
+
+    <div class="containerContent-w" style="text-align: center;">
+      <div class="col-12 "  *ngIf="requests.length == 0 " >
+        <h2 class="title">لا يوجد بيانات لعرضها </h2>
+
+      </div>
+        <table class="table table-bordered" *ngIf="requests.length != 0 " >
             <thead class="headBackground-w">
               <tr>
                 <th>الحاله</th>
@@ -29,7 +32,7 @@
                 <td>{{data.type}}</td>
                 <td>{{data.specialization_name}}</td>
                 <td>{{data.specific_specialization}}</td>
-                
+
                 <td>
                   <button *ngIf=" data.status == 'pending' " type="button" class="btn btn-outline-secondary" (click)="onEdit(data)"><i class="fas fa-edit"></i></button>
                   <span *ngIf="data.status != 'pending'">غير مسموح</span>
@@ -39,4 +42,3 @@
           </table>
     </div>
   </div>
-  

src/app/trainning-service/all-requests/all-requests.component.ts

@@ -13,7 +13,7 @@ import { Router, ActivatedRoute, Params } from '@angular/router';
 export class AllRequestsComponent implements OnInit {
 
   constructor(private http: HttpClient,
-    private spinner: NgxSpinnerService, 
+    private spinner: NgxSpinnerService,
     private router: Router,
     private toastr: ToastrService,
     private route: ActivatedRoute,
@@ -22,7 +22,7 @@ export class AllRequestsComponent implements OnInit {
     requests = [];
     count: number;
     visitorId: number;
-  
+
 
   ngOnInit() {
 
@@ -51,9 +51,6 @@ export class AllRequestsComponent implements OnInit {
       (responce) => {
         console.log(responce);
         this.requests = responce['requests'];
-        if(this.requests.length == 0) {
-          this.toastr.warning('قائمه الطلبات فارغه ');
-        }
         this.spinner.hide();
       },
       (error) => {
@@ -72,7 +69,7 @@ export class AllRequestsComponent implements OnInit {
 
 
 
-  
+
 
 
 }