moving

src/app/dashboard/dashboard-routing.ts

@@ -1,3 +1,4 @@
+import { ExistingReportComponent } from './reports-existing-vehicles/existing-report/existing-report.component';
 import { VehicleMaintenanceAddComponent } from './vehicle-maintenance/vehicle-maintenance-add/vehicle-maintenance-add.component';
 import { VehicleMaintenanceListComponent } from './vehicle-maintenance/vehicle-maintenance-list/vehicle-maintenance-list.component';
 import { RegisterMovementVehicleListComponent } from './register-movement-vehicle/register-movement-vehicle-list/register-movement-vehicle-list.component';
@@ -194,6 +195,7 @@ const dashboardRouting: Routes = [
     {path: 'vehicleMaintenanceList/:vehicleMaintenanceListId', component: VehicleMaintenanceListComponent},
     {path: 'vehicleMaintenance/add', component: VehicleMaintenanceAddComponent},
     {path: 'vehicleMaintenance/edit/:vehicleMaintenanceEditId', component: VehicleMaintenanceAddComponent },
+    {path: 'existingReportVehicle', component: ExistingReportComponent},
   ]},
 ];
 

src/app/dashboard/dashboard.module.ts

@@ -125,6 +125,7 @@ import { RegisterMovementVehicleListComponent } from './register-movement-vehicl
 import { RegisterMovementVehicleAddComponent } from './register-movement-vehicle/register-movement-vehicle-add/register-movement-vehicle-add.component';
 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';
 
 
 @NgModule({
@@ -216,6 +217,7 @@ import { VehicleMaintenanceAddComponent } from './vehicle-maintenance/vehicle-ma
         RegisterMovementVehicleAddComponent,
         VehicleMaintenanceListComponent,
         VehicleMaintenanceAddComponent,
+        ExistingReportComponent,
     ],
     imports: [
         CommonModule,

src/app/dashboard/reivew-trainee-data/review-trainee-add/review-trainee-add.component.css

@@ -148,6 +148,7 @@ select.ng-invalid{
 
 
 
+
 .titileLi-w {
     margin: 0 65px;
 }
@@ -248,6 +249,12 @@ select.ng-invalid{
     color: red;
 }
 
+.titleStatus {
+    font-size: 19px;
+    margin: 2px 14px;
+    color: green;
+}
+
 /* start media query style */
 
 @media(max-width: 767px){

src/app/dashboard/reivew-trainee-data/review-trainee-add/review-trainee-add.component.html

@@ -24,7 +24,7 @@
               </div>
             </div>
             
-            <div class="col-12" *ngIf="typeMode">
+            <div class="col-12" *ngIf="showPersonalData">
               <h2 class="title">المعلومات الشخصيه</h2>
               <div class="row">
                 <div class="wrapper">
@@ -117,6 +117,18 @@
               <div class="row">
                 <div class="wrapper">
                   
+                  <div class="col-12">
+                    <div class="form-group">
+                      <h2 class="titleStatus">{{formData.status == 'pending' ? 'تحت الإجراء' 
+                          : formData.status == 'accepted' ? 'مقبول' 
+                          : formData.status == 'replayed_opinion' ? 'رأي القسم'
+                          : formData.status == 'refused' ? 'مرفوض' 
+                          : formData.status == 'canceled' ? 'ملغي'
+                          : formData.status == 'asked_for_opinion' ? 'طلب رأي'
+                          : formData.status == 'asked_for_opinion' ? 'طلب رأي' : 'لايوجد'}}</h2>
+                    </div>
+                  </div>
+
                   <div class="col-12 col-sm-12 col-md-4 col-lg-4">
                     <div class="form-group">
                       <label style="float:right">نوع الطلب <span class="spanReqired-w">*</span></label>
@@ -196,9 +208,6 @@
                     </div>
                   </div>
 
-                  
-                
-
                 <!-- <h2 class="departmentHeading-w">أختر الأقسام <span>(قم بإختيار قسم كحد أدني)</span></h2> -->
                   <div class="col-12 col-sm-12 col-md-4 col-lg-4" *ngIf="!editMode">
                     <div class="form-group">
@@ -226,7 +235,7 @@
                   </div>
                   <div class="col-12 col-sm-12 col-md-4 col-lg-4"  *ngIf="editMode">
                     <div class="form-group">
-                      <label for="department4" style="float:right;">القسم</label>
+                      <label for="department4" style="float:right;">القسم المناسب</label>
                       <select class="form-control selectStyle-w" id="department4" name="department4" [(ngModel)]="formData.department4">
                         <option *ngFor="let department of departments" [value]="department.department_id">{{department.department_name}}</option>
                       </select>
@@ -236,7 +245,7 @@
 
                   <div class="col-12 col-sm-12 col-md-12 col-lg-12" *ngIf="editMode">
                     <div class="form-group">
-                      <label for="status" style="float:right; display:block"> الحاله <span class="spanReqired-w">*</span></label>
+                      <label for="status" style="float:right; display:block"> الأوامر <span class="spanReqired-w">*</span></label>
                       <button type="button" class="btn btn-success statusBtn-w" (click)="statusShow('accepted')">قبول</button>
                       <button type="button" class="btn btn-danger statusBtn-w" (click)="statusShow('refuced')">رفض</button>
                       <button type="button" class="btn btn-default statusBtn-w" (click)="statusShow('asked_for_opinion')">طلب رأي</button>

src/app/dashboard/reivew-trainee-data/review-trainee-add/review-trainee-add.component.ts

@@ -32,6 +32,7 @@ export class ReviewTraineeAddComponent implements OnInit {
   showEditField: boolean = false; //to show the field in edit mode 
   showRefusedCause: boolean = false; //to show the cause of refused when ststus is refused
   editMode: boolean = false; //true in edit mode 
+  showPersonalData: boolean = false;
   reportId: number;
   attachments_ids = []; //for edit mode;
 
@@ -148,6 +149,7 @@ export class ReviewTraineeAddComponent implements OnInit {
       this.spinner.show();
       this.editMode = true;
       this.typeMode = true;
+      this.showPersonalData = true;
       this.files = [];
 
       this.dashBoardSer.getItemData(this.reportId,'traineeRequest').subscribe(
@@ -276,7 +278,7 @@ export class ReviewTraineeAddComponent implements OnInit {
     this.http.get(this.authSer.pathApi + '/get_user/' + event.target.value).subscribe(
       (responce) => {
         console.log('one trainee data ', responce);
-        this.typeMode = true;
+       this.showPersonalData = true;
         this.disabledInput = true;
         this.userData.name = responce['user'].name;
         this.userData.nationality_id = responce['user'].nationality_id;
@@ -386,8 +388,6 @@ export class ReviewTraineeAddComponent implements OnInit {
         this.toastr.warning('من فضلك قم بإختيار متدرب !');
       } else if(this.formData['choosen_department_id'] == '') {
         this.toastr.warning('يجب إختيار قسم واحد من الأقسام المحدده !');
-      } else if(this.formData.status == 'pending') {
-        this.toastr.warning('من فضلك قم بإختيار حاله الطلب !');
       } else {
         
         //delete file & file type if not change it in old file

src/app/dashboard/reivew-trainee-data/review-trainee-data-list/review-trainee-data-list.component.html

@@ -17,7 +17,7 @@
         </div>
         <div class="col-12 col-sm-12 col-md-6 col-lg-6">
           <div class="form-group">
-            <input type="text" placeholder="البحث" class="form-control inputSearchTable-w" style="margin-top:13px;" (input)="filtterFunc($event)"/>
+            <input type="text" placeholder="البحث ( بالاسم او رقم الهويه أو رقم الهاتف )" class="form-control inputSearchTable-w" style="margin-top:13px;" (input)="filtterFunc($event)"/>
             <hr>
           </div>
         </div>
@@ -71,8 +71,10 @@
             </th>
             <th> إسم المتدرب</th>
             <th>إسم التخصص</th>
-            <th>إسم التخصص الدقيق</th>
-            <th> الجامعه</th>
+            <th>الجنسيه</th>
+            <th>الجامعه</th>
+            <th>نوع التدريب</th>
+            <th>الحاله</th>
             <th *ngIf="authSer.showEditBtn">تفاصيل المتدرب</th>
           </tr>
         </thead>
@@ -86,8 +88,25 @@
             </td>
             <td>{{data.trainee_name}}</td>
             <td> {{data.specialization_name}}</td>
-            <td>{{data.specific_specialization}}</td>
+            <td>{{data.country_arNationality}}</td>
             <td>{{data.university}}</td>
+            <!-- <td>{{data.type == 'trainees' ? 'متدربين' 
+              : data.type == 'fellowship' ? 'زماله' 
+              : data.type == 'university_administrators' : 'مشرفي الجامعات'
+              : 'لايوجد'}}
+            </td> -->
+            <td>{{data.type == 'trainees' ? 'متدربين' 
+                : data.type == 'fellowship' ? 'زماله' 
+                : data.type == 'university_administrators' ? 'مشرفي الجامعات'
+                : 'لايوجد'}}</td>
+
+            <td>{{data.status == 'pending' ? 'تحت الإجراء' 
+              : data.status == 'accepted' ? 'مقبول' 
+              : data.status == 'replayed_opinion' ? 'رأي القسم'
+              : data.status == 'refused' ? 'مرفوض' 
+              : data.status == 'canceled' ? 'ملغي'
+              : data.status == 'asked_for_opinion' ? 'طلب رأي'
+              : data.status == 'asked_for_opinion' ? 'طلب رأي' : 'لايوجد'}}</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>

src/app/dashboard/reivew-trainee-data/review-trainee-data-list/review-trainee-data-list.component.ts

@@ -108,9 +108,6 @@ export class ReviewTraineeDataListComponent implements OnInit {
             }
       
           );
-
-         
-
       }
     );
 
@@ -203,6 +200,9 @@ onGetValue(event) {
       this.dataList = responce['requests'];
       this.count = responce['count'];
       this.perPagePagenation = responce['per_page'];
+      if(this.dataList.length == 0) {
+        this.toastr.warning('لا يوجد بيانات لعرضها');
+      }
       this.spinner.hide();
     },
     (error) => {
@@ -222,6 +222,9 @@ onFiltterChosen(event) {
       console.log(responce);
       console.log(responce);
       this.dataList = responce['requests'];
+      if(this.dataList.length == 0) {
+        this.toastr.warning('لا يوجد بيانات لعرضها');
+      }
       this.count = responce['count'];
       this.perPagePagenation = responce['per_page'];
       this.spinner.hide();

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

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

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

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

src/app/dashboard/supervisor/supervisor-add/supervisor-add.component.html

@@ -49,7 +49,7 @@
                                   <div class="col-12 col-sm-12 col-md-4" *ngIf="superDeaprt.phone != ''">
                                     <div class="form-group">
                                         <label for="phone" style="float: right; margin-right: 5px">رقم الجوال<span class="spanReqired-w">*</span></label>
-                                        <input type="phone" class="form-control" placeholder="رقم الجوال" id="phone" [ngModel]="superDeaprt.phone" name="phone" ngModel required/> 
+                                        <input type="phone" class="form-control" placeholder="رقم الجوال" id="phone" [ngModel]="superDeaprt.phone" name="phone" appOnlyNumber ngModel required/> 
                                     </div>
                                   </div>
 

src/app/dashboard/trainner-data/trainner-data-add/trainner-data-add.component.html

@@ -34,7 +34,7 @@
                 <div class="form-group">
                   <label style="float:right">الجنسيه <span class="spanReqired-w">*</span></label>
                   <select class="form-control" formControlName="nationality_id" style="padding:0 5px">
-                    <option *ngFor="let country of countries; let i = index" [value]="country.id">{{country.country_arName}}</option>
+                    <option *ngFor="let country of countries; let i = index" [value]="country.id">{{country.country_arNationality}}</option>
                   </select>
                 </div>
               </div>