merge with ibrahem

src/app/External-Page/external-page/external-page.component.ts

@@ -2,6 +2,7 @@ import { Router } from '@angular/router';
 import { AuthServiceService } from './../../shared/auth-service.service';
 import { Component, OnInit } from '@angular/core';
 import { Route } from '@angular/compiler/src/core';
+import { NgxSpinnerService } from 'ngx-spinner';
 
 @Component({
   selector: 'app-external-page',
@@ -10,7 +11,8 @@ import { Route } from '@angular/compiler/src/core';
 })
 export class ExternalPageComponent implements OnInit {
 
-  constructor(private authSer: AuthServiceService, private router:Router) { }
+  constructor(private authSer: AuthServiceService, 
+    private router:Router) { }
 
   myInnerHeight = window.innerHeight;
 

src/app/Internal-Page/hospital-content/hospital-content.component.ts

@@ -47,77 +47,70 @@ export class HospitalContentComponent implements OnInit {
     this.route.params.subscribe(
       (params: Params) => {
         this.typePage = params['typePage'];
-      }
-    );
-
-
-  
-
-    if(this.typePage == 'hospital') {
-
-      this.internalService.getHospitalCenterList('hospitals_centers_list').subscribe(
-        (responce) => {
-          console.log(responce);
-          this.hospitalCenters = responce['hospitals_centers'];
-          this.showDescriptionDetails(this.hospitalCenters[0].fields[0]);
-          console.log(this.hospitalCenters);
-        },
-        (error) => {
-          console.log(error);
-        }
-      );
-
-      this.authSer.parentsPage = [];
-
-      this.internalService.getParentData().subscribe(
-        (responce) => {
-          this.authSer.parentsPage = responce['parents'];
-          for(let i = 0; i < this.authSer.parentsPage.length; i++) {
-            if(this.authSer.parentsPage[i].id == 8) {
-              this.authSer.parentsPage[i].active = 1;
-            } else {
-              this.authSer.parentsPage[i].active = 0;
+        if(params['typePage'] == 'hospital') {
+          this.internalService.getHospitalCenterList('hospitals_centers_list').subscribe(
+            (responce) => {
+              console.log(responce);
+              this.hospitalCenters = responce['hospitals_centers'];
+              this.showDescriptionDetails(this.hospitalCenters[0].fields[0]);
+              console.log(this.hospitalCenters);
+            },
+            (error) => {
+              console.log(error);
             }
-          }
-          this.spinner.hide();
-        },
-        (error) => {
-          console.log(error);
-        }
-      );
-
-
-    } else if(this.typePage == 'managements') {
-      this.internalService.getHospitalCenterList('managements_list').subscribe(
-        (responce) => {
-          console.log(responce);
-          this.hospitalCenters = responce['managements'];
-          this.showDescriptionDetails(this.hospitalCenters[0].fields[0]);
-          console.log(this.hospitalCenters);
-        },
-        (error) => {
-          console.log(error);
-        }
-      );
-
-      this.internalService.getParentData().subscribe(
-        (responce) => {
-          this.authSer.parentsPage = responce['parents'];
-          for(let i = 0; i < this.authSer.parentsPage.length; i++) {
-            if(this.authSer.parentsPage[i].id == 9) {
-              this.authSer.parentsPage[i].active = 1;
-            } else {
-              this.authSer.parentsPage[i].active = 0;
+          );
+    
+          this.authSer.parentsPage = [];
+    
+          this.internalService.getParentData().subscribe(
+            (responce) => {
+              this.authSer.parentsPage = responce['parents'];
+              for(let i = 0; i < this.authSer.parentsPage.length; i++) {
+                if(this.authSer.parentsPage[i].id == 8) {
+                  this.authSer.parentsPage[i].active = 1;
+                } else {
+                  this.authSer.parentsPage[i].active = 0;
+                }
+              }
+              this.spinner.hide();
+            },
+            (error) => {
+              console.log(error);
+            }
+          );
+        } else if(params['typePage'] == 'managements') {
+          this.internalService.getHospitalCenterList('managements_list').subscribe(
+            (responce) => {
+              console.log(responce);
+              this.hospitalCenters = responce['managements'];
+              this.showDescriptionDetails(this.hospitalCenters[0].fields[0]);
+              console.log(this.hospitalCenters);
+            },
+            (error) => {
+              console.log(error);
             }
-          }
-          this.spinner.hide();
-        },
-        (error) => {
-          console.log(error);
+          );
+    
+          this.internalService.getParentData().subscribe(
+            (responce) => {
+              this.authSer.parentsPage = responce['parents'];
+              for(let i = 0; i < this.authSer.parentsPage.length; i++) {
+                if(this.authSer.parentsPage[i].id == 9) {
+                  this.authSer.parentsPage[i].active = 1;
+                } else {
+                  this.authSer.parentsPage[i].active = 0;
+                }
+              }
+              this.spinner.hide();
+            },
+            (error) => {
+              console.log(error);
+            }
+          );
         }
-      );
-      
-    }
+      }
+    );
+
   }
 
   getInformationData(data) {

src/app/Internal-Page/internal-page-content/internal-page-content.component.ts

@@ -171,6 +171,8 @@ export class InternalPageContentComponent implements OnInit {
           description_en: responce['data']['main_ad'] ? responce['data']['main_ad'].description_en: '',
         }
 
+        
+
           this.spinner.hide();
         
 

src/app/Internal-Page/internal-page/internal-page.component.ts

@@ -23,7 +23,7 @@ export class InternalPageComponent implements OnInit {
     private userservice: UserService, 
     private route: ActivatedRoute,
     private internalService: InternalPageService,
-    private spinner: NgxSpinnerService,) {
+    private spinner: NgxSpinnerService) {
       spinner.show();
      }
 

src/app/dashboard/Registration-trainee-movement/registration-trainee-movement-add/registration-trainee-movement-add.component.ts

@@ -263,7 +263,7 @@ export class RegistrationTraineeMovementAddComponent implements OnInit {
 
   onSubmittedForm() {
     console.log(this.actionForm);
-    this.http.post(this.authSer.pathApi + '/final_accreditation_of_trainees', this.actionForm).subscribe(
+    this.http.post(this.authSer.pathApi + '/trace_trainee_movement', this.actionForm).subscribe(
       (responce) => {
         console.log(responce);
         this.toastr.success('تم بنجاح');

src/app/dashboard/Registration-trainee-movement/registration-trainee-movement-list/registration-trainee-movement-list.component.ts

@@ -45,11 +45,13 @@ export class RegistrationTraineeMovementListComponent implements OnInit {
 
     //init the values of permision boolean
     this.route.params.subscribe(
-      (params: Params) => {
-        this.pageId = params['registrationListId'];
-      }
+      (params:Params) => {
+        this.pageId = +params['listPageId'];
+        localStorage.setItem('pageIdActive', params['listPageId']);
+      },
     );
 
+
     //init the values of permision boolean
     this.authSer.showAddBtn = false;
     this.authSer.showDeleteBtn = false;

src/app/dashboard/dashboard-routing.ts

@@ -1,3 +1,4 @@
+import { FinalTraineeReportComponent } from './final-trainee-report/final-trainee-report.component';
 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';
@@ -173,31 +174,32 @@ const dashboardRouting: Routes = [
     {path: 'reviewTrainerData/:listPageId', component: ReviewTraineeDataListComponent},
     {path: 'reviewTraineeData/add', component: ReviewTraineeAddComponent},
     {path: 'reviewTraineeData/edit/:reviewTraineeId', component: ReviewTraineeAddComponent},
-    {path: 'reviewSectionForTrainee/:reviewSectionId', component: SectionReviewTraineeListComponent},
+    {path: 'reviewSectionForTrainee/:listPageId', component: SectionReviewTraineeListComponent},
     {path: 'reviewSectionForTrainee/edit/:reviewSectionAddId', component: SectionReviewTraineeAddComponent},
-    {path: 'registrationTraineeList/:registrationListId', component: RegistrationTraineeMovementListComponent},
-    {path: 'registrationTraineeList/edit/:registrationTraineereviewSectionAddId', component: RegistrationTraineeMovementAddComponent},
-    {path: 'printCardTraineeList/:listPageId', component: PrintCardTraineeListComponent},
-    {path: 'printCardTrainee/edit/:printCardAddId', component: PrintCardTraineeAddComponent},
-    {path: 'finalAccerditationList/:listPageId', component: FinalAccerditationListComponent},
-    {path: 'finalAccerditationList/edit/:finalAccerditationEdit', component: FinalAccerditationAddComponent},
-    {path: 'vehicleList/:listPageId', component: VehicleListComponent},
-    {path: 'vehicle/add', component: VehicleAddComponent},
-    {path: 'vehicle/edit/:vehicleEditId', component: VehicleAddComponent},
-    {path: 'vehicleModelList/:listPageId' , component: ModelVehicleListComponent},
-    {path: 'vehicleModel/add' , component: ModelVehicleAddComponent},
-    {path: 'vehicleModel/edit/:modelVehicleEditId', component:ModelVehicleAddComponent },
-    {path: 'registrationVehicleList/:listPageId', component: RegistrationVehicleListComponent},
-    {path: 'registrationVehicle/add', component: RegistrationVehicleAddComponent},
-    {path: 'registrationVehicle/edit/:registrationVehicleEditId', component:RegistrationVehicleAddComponent },
-    {path: 'registerMovementVehicleList/:listPageId', component: RegisterMovementVehicleListComponent},
-    {path: 'registerMovementVehicle/add', component: RegisterMovementVehicleAddComponent},
-    {path: 'registerMovementVehicle/edit/:registerMovementVehicleEditId', component: RegisterMovementVehicleAddComponent },
-    {path: 'vehicleMaintenanceList/:listPageId', component: VehicleMaintenanceListComponent},
-    {path: 'vehicleMaintenance/add', component: VehicleMaintenanceAddComponent},
-    {path: 'vehicleMaintenance/edit/:vehicleMaintenanceEditId', component: VehicleMaintenanceAddComponent },
-    {path: 'existingReportVehicle', component: ExistingReportComponent},
-    {path: 'VehicleReport/:typeReport', component: VehicleMovementReportComponent},
+    {path: 'registrationTraineeList/:listPageId', component: RegistrationTraineeMovementListComponent},
+    {path: 'registrationTraineeList/edit/:registrationTraineereviewSectionAddId', component: RegistrationTraineeMovementAddComponent, canActivate: [AuthGuard]},
+    {path: 'printCardTraineeList/:listPageId', component: PrintCardTraineeListComponent, canActivate: [AuthGuard]},
+    {path: 'printCardTrainee/edit/:printCardAddId', component: PrintCardTraineeAddComponent, canActivate: [AuthGuard]},
+    {path: 'finalAccerditationList/:listPageId', component: FinalAccerditationListComponent, canActivate: [AuthGuard]},
+    {path: 'finalAccerditationList/edit/:finalAccerditationEdit', component: FinalAccerditationAddComponent, canActivate: [AuthGuard]},
+    {path: 'vehicleList/:listPageId', component: VehicleListComponent, canActivate: [AuthGuard]},
+    {path: 'vehicle/add', component: VehicleAddComponent, canActivate: [AuthGuard]},
+    {path: 'vehicle/edit/:vehicleEditId', component: VehicleAddComponent, canActivate: [AuthGuard]},
+    {path: 'vehicleModelList/:listPageId' , component: ModelVehicleListComponent, canActivate: [AuthGuard]},
+    {path: 'vehicleModel/add' , component: ModelVehicleAddComponent, canActivate: [AuthGuard]},
+    {path: 'vehicleModel/edit/:modelVehicleEditId', component:ModelVehicleAddComponent, canActivate: [AuthGuard] },
+    {path: 'registrationVehicleList/:listPageId', component: RegistrationVehicleListComponent, canActivate: [AuthGuard]},
+    {path: 'registrationVehicle/add', component: RegistrationVehicleAddComponent, canActivate: [AuthGuard]},
+    {path: 'registrationVehicle/edit/:registrationVehicleEditId', component:RegistrationVehicleAddComponent, canActivate: [AuthGuard] },
+    {path: 'registerMovementVehicleList/:listPageId', component: RegisterMovementVehicleListComponent, canActivate: [AuthGuard]},
+    {path: 'registerMovementVehicle/add', component: RegisterMovementVehicleAddComponent, canActivate: [AuthGuard]},
+    {path: 'registerMovementVehicle/edit/:registerMovementVehicleEditId', component: RegisterMovementVehicleAddComponent, canActivate: [AuthGuard] },
+    {path: 'vehicleMaintenanceList/:listPageId', component: VehicleMaintenanceListComponent, canActivate: [AuthGuard]},
+    {path: 'vehicleMaintenance/add', component: VehicleMaintenanceAddComponent, canActivate: [AuthGuard]},
+    {path: 'vehicleMaintenance/edit/:vehicleMaintenanceEditId', component: VehicleMaintenanceAddComponent, canActivate: [AuthGuard] },
+    {path: 'existingReportVehicle', component: ExistingReportComponent, canActivate: [AuthGuard]},
+    {path: 'VehicleReport/:typeReport', component: VehicleMovementReportComponent, canActivate: [AuthGuard]},
+    {path: 'finalAccerditationReprot', component: FinalTraineeReportComponent, canActivate: [AuthGuard]},
   ]},
 ];
 

src/app/dashboard/dashboard.module.ts

@@ -127,6 +127,7 @@ import { VehicleMaintenanceListComponent } from './vehicle-maintenance/vehicle-m
 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';
+import { FinalTraineeReportComponent } from './final-trainee-report/final-trainee-report.component';
 
 
 @NgModule({
@@ -220,6 +221,7 @@ import { VehicleMovementReportComponent } from './vehicle-movement-report/vehicl
         VehicleMaintenanceAddComponent,
         ExistingReportComponent,
         VehicleMovementReportComponent,
+        FinalTraineeReportComponent,
     ],
     imports: [
         CommonModule,

src/app/dashboard/department/department-list/department-list.component.ts

@@ -57,7 +57,6 @@ export class DepartmentListComponent implements OnInit {
         this.pageId = params['listPageId'];
         localStorage.setItem('pageIdActive', '3');
       },
-      (error) => {console.log(error)}
     );
 
     this.route.parent.params.subscribe(

src/app/dashboard/final-accreditation-of-trainees/final-accerditation-add/final-accerditation-add.component.css

@@ -66,7 +66,7 @@ select.ng-invalid{
     border-radius: 20px;
     margin: 30px auto;
 }
-.iconUpload-w {
+/* .iconUpload-w {
     width: 30px;
     font-size: 1.25em;
     font-weight: 700;
@@ -78,7 +78,7 @@ select.ng-invalid{
     border: 1px solid #ccc;
     border-radius: 50%;
     bottom: 0;
-}
+} */
 
 .inputfile {
 	width: 0.1px;
@@ -102,7 +102,6 @@ select.ng-invalid{
 
 .inputfile:focus + label,
 .inputfile + label:hover {
-    background-color: #00a99d;
     color: #fff;
 }
 
@@ -207,17 +206,25 @@ select.ng-invalid{
 }
 
 .wrapper .iconUpload-w {
-    width: 265px;
-    height: 37px;
+    width: 60px;
+    height: 30px;
     border-radius: 5px;
     font-size: 1.25em;
     font-weight: 700;
     display: inline-block;
-    background-color: #fff;
-    border: 1px solid #ccc;
     padding: 0 10px;
     position: absolute;
-    right: 75px;
+    right: 125px;
+    margin: 2px 0;
+}
+
+.downloadFile-w {
+    color: #b28c5e;
+    font-size: 19px;
+}
+
+.downloadFile-w a {
+    margin: 5px 0;
 }
 
 .wrapper .deleteRow-w {

src/app/dashboard/final-accreditation-of-trainees/final-accerditation-add/final-accerditation-add.component.html

@@ -5,7 +5,7 @@
           <div class="col-12">
             <ul class="list-unstyled titileLi-w">
               <li class="headingText-w">خدمه التدريب</li>
-              <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()"> تسجيل حركه المتدرب</li>
+              <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()">الأعتماد النهائي للمتدربين </li>
             </ul>
           </div>
       </div>
@@ -189,28 +189,9 @@
                 <!-- <h2 class="departmentHeading-w">أختر الأقسام <span>(قم بإختيار قسم كحد أدني)</span></h2> -->
                   <div class="col-12 col-sm-12 col-md-4 col-lg-4">
                     <div class="form-group">
-                      <label for="department1" style="float:right;">القسم الأول</label>
-                      <select class="form-control selectStyle-w" id="department1" name="department1" (input)="changeDepartment($event , 1)" [(ngModel)]="formData.department1" [disabled]="disabledInput">
+                      <label for="department" style="float:right;">القسم المناسب</label>
+                      <select class="form-control selectStyle-w" id="department" name="department" (input)="changeDepartment($event , 1)" [ngModel]="formData.department" [disabled]="disabledInput">
                         <option *ngFor="let department of departments" [value]="department.id">{{department.name}}</option>
-                        <option [value]="2001">حذف</option>
-                      </select>
-                    </div>
-                  </div>
-                  <div class="col-12 col-sm-12 col-md-4 col-lg-4">
-                    <div class="form-group">
-                      <label for="department2" style="float:right;">القسم الثاني</label>
-                      <select class="form-control selectStyle-w" id="department2" name="department2" (input)="changeDepartment($event , 2)" [(ngModel)]="formData.department2" [disabled]="disabledInput">
-                        <option *ngFor="let department of departments" [value]="department.id">{{department.name}}</option>
-                        <option [value]="2002">حذف</option>
-                      </select>
-                    </div>
-                  </div>
-                  <div class="col-12 col-sm-12 col-md-4 col-lg-4">
-                    <div class="form-group">
-                      <label for="department3" style="float:right;">القسم الثالث</label>
-                      <select class="form-control selectStyle-w" id="department3" name="department3" (input)="changeDepartment($event , 3)" [(ngModel)]="formData.department3" [disabled]="disabledInput">
-                        <option *ngFor="let department of departments" [value]="department.id">{{department.name}}</option>
-                        <option [value]="2003">حذف</option>
                       </select>
                     </div>
                   </div>
@@ -232,18 +213,20 @@
                       <tr>
                         <th> إسم المرفق</th>
                         <th>رفع املف ( بصيغه pdf )</th>
+                        <th>عرض الملف</th>
                         <th>حذف</th>
                       </tr>
                     </thead>
                     <tbody>
                       <tr style="text-align:center;" *ngFor="let file of files; let i = index">
-                        <td><input type="text" class="form-control" placeholder="إسم الملف" [(ngModel)]="file.title" [ngModelOptions]="{standalone: true}" [disabled]="disabledInput"/></td>
+                        <td><input type="text" class="form-control" placeholder="إسم الملف" [(ngModel)]="file.title" [ngModelOptions]="{standalone: true}"/></td>
                         <td style="position: relative;">
-                          <input type="file" name="file{{i}}" id="file{{i}}" class="inputfile" alife-file-to-base64 (onFileChanged)="onFileChanges($event,i)" [disabled]="disabledInput"/>
-                          <label for="file{{i}}" class="iconUpload-w"><i class="fas fa-upload"></i></label>
-                          <span class="fileName-w">{{file.nameFile}}</span>
+                          <input type="file" name="file{{i}}" id="file{{i}}" class="inputfile" alife-file-to-base64 (onFileChanged)="onFileChanges($event,i)"/>
+                          <label for="file{{i}}" class="iconUpload-w"><i class="fas fa-upload" style="color: #03aa9e"></i></label>
+                          <!-- <span class="fileName-w">{{file.nameFile}}</span> -->
                         </td>
-                        <td><button type="button" class="btn btn-danger form-control deleteRow-w" (click)="onDeleteRow(i)" [disabled]="disabledInput">حذف</button></td>
+                        <td><a class="downloadFile-w" href="{{authSer.pathImg + file.file}}" target="_blank" *ngIf="file.file"><i class="fas fa-download"></i></a></td>
+                        <td><button type="button" class="btn btn-danger form-control deleteRow-w" (click)="onDeleteRow(i)">حذف</button></td>
                       </tr>
                     </tbody>
                   </table>
@@ -274,14 +257,20 @@
                     <div class="col-12 col-md-4">
                       <div class="form-group">
                         <label style="float:right;">إستلام البطاقه</label>
-                        <button type="button" class="btn btn-success" style="width: 100%;" (click)="recieveCard()"> إستلام</button>
+                        <button type="button" class="btn btn-success" style="width: 100%;" (click)="recieveCard()"> إستلام البطاقه</button>
+                      </div>
+                    </div>
+                    <div class="col-12 col-md-4">
+                      <div class="form-group">
+                        <label style="float:right;">طباعه المشهد</label>
+                        <button type="button" class="btn btn-primary" style="width: 100%;" (click)="printCard()"> طباعه المشهد</button>
                       </div>
                     </div>
                   </div>
                 </div>
             </div>
 
-            <div class="col-12">
+            <div class="col-12 ">
               <button type="submit" class="btn btn-success rightW" [disabled]="checkSaveClick">حفظ</button>
               <button type="button" class="btn btn-warning rightW" (click)="authSer.backFromEdit()" style="margin:20px 10px;">إلغاء</button>
             </div>

src/app/dashboard/final-accreditation-of-trainees/final-accerditation-add/final-accerditation-add.component.ts

@@ -1,5 +1,5 @@
 import { NgxSpinnerService } from 'ngx-spinner';
-import { ActivatedRoute, Params } from '@angular/router';
+import { ActivatedRoute, Params, Router } from '@angular/router';
 import { DashboardService } from './../../../shared/dashboard.service';
 import { HttpClient } from '@angular/common/http';
 import { UserService } from './../../../shared/user.service';
@@ -20,6 +20,7 @@ export class FinalAccerditationAddComponent implements OnInit {
     private toastr: ToastrService,
     private route: ActivatedRoute,
     private dashBoardSer: DashboardService,
+    private router: Router,
     private spinner: NgxSpinnerService,
     private location: Location,
     private authSer: AuthServiceService) { }
@@ -33,11 +34,14 @@ export class FinalAccerditationAddComponent implements OnInit {
   reportId: number;
   stoppedShow: boolean = false;
   endedShow: boolean = false;
+  userLoginId: number;
+  serviceId: number;
   countries: any[] = [];
   identities: any[] = [];
   trainees:any[] = [];
   departments:any[] = [];
   departmentsId:any[] = [];
+  attachments_ids: any[] =[];
 
   @ViewChild('f') traineeForm: NgForm;
 
@@ -56,9 +60,7 @@ export class FinalAccerditationAddComponent implements OnInit {
     contract_type: '',
     status: '',
     organization_affiliated_with: '',
-    department1: '',
-    department2: '',
-    department3: '',
+    department: '',
   }
 
   //user data object
@@ -106,6 +108,22 @@ export class FinalAccerditationAddComponent implements OnInit {
      this.authSer.showHeaderDashBoard = true;
      this.authSer.showDashboardHeader = true;
      this.authSer.internalHeader = false;
+
+     //catch params id from activated route
+     this.route.params.subscribe(
+      (params: Params) => {
+        this.reportId = +params['finalAccerditationEdit'];
+      }
+    );
+
+    //catch parent params id from activated route
+     this.route.parent.params.subscribe(
+      (params:Params) => {
+          this.userLoginId = +params['userID'];
+          this.serviceId = +params['serviceID'];
+        }
+  
+      );
  
      //get nationality data
      this.userSer.getNationality().subscribe(
@@ -150,12 +168,7 @@ export class FinalAccerditationAddComponent implements OnInit {
          console.log(error);
        }
      );
- 
-     this.route.params.subscribe(
-       (params: Params) => {
-         this.reportId = params['finalAccerditationEdit'];
-       }
-     );
+
 
      if(this.reportId) {
 
@@ -190,22 +203,16 @@ export class FinalAccerditationAddComponent implements OnInit {
           this.userData.nationality_id = responce['data']['user'].nationality_id;
           this.userId = responce['data']['user'].id;
           this.userData['id'] = this.userId;
-
-             //add departmrnts ids 
-             if(responce['data']['request'].departments.length > 0) {
-              for(let i = 0; i < responce['data']['request'].departments.length; i++) {
-                if(i == 0) {
-                  this.formData.department1 = responce['data']['request'].departments[0].department_id;
-                  this.departmentsId[i] = responce['data']['request'].departments[i].department_id;
-                } else if(i == 1) {
-                  this.formData.department2 = responce['data']['request'].departments[i].department_id;
-                  this.departmentsId[i] = responce['data']['request'].departments[i].department_id;
-                } else if(i == 2) {
-                  this.formData.department3 = responce['data']['request'].departments[i].department_id;
-                  this.departmentsId[i] = responce['data']['request'].departments[i].department_id;
-              }
+          for(let i = 0; i < responce['data']['request'].attachments.length; i++) {
+            this.attachments_ids.push(responce['data']['request'].attachments[i].id);
+          }
+          console.log('attachemnts ids ', this.attachments_ids);
+          for(let i = 0; i < responce['data']['request'].departments.length; i++) {
+            if(responce['data']['request'].departments[i].is_confirmed == 1) {
+              this.formData.department = responce['data']['request'].departments[i].department_id;
             }
           }
+        
 
          
 
@@ -228,6 +235,7 @@ export class FinalAccerditationAddComponent implements OnInit {
           console.log(error);
         }
       );
+
     }
  
   }
@@ -237,20 +245,123 @@ export class FinalAccerditationAddComponent implements OnInit {
     this.actionForm.card_received = 1
   }
 
+  printCard() {
+    this.router.navigate(['service/' + this.userLoginId + '/' + this.serviceId + '/finalAccerditationReprot']);
+  }
+
+
+  //delete row of files
+  onDeleteRow(rowIndex: number) {
+    this.files.splice(rowIndex , 1);
+    if(this.attachments_ids.length > 0) {
+      this.attachments_ids.splice(rowIndex, 1);
+    }
+    console.log('files after delete ',this.files);
+    console.log('attachements ids', this.attachments_ids);
+  }
+
+  //add attachements 
+  plusImage() {
+    this.files.push({
+      title: '',
+      file: '',
+      file_type: '',
+      nameFile: '',
+      id: null,
+    });
+    console.log('files after plus ', this.files);
+  }
+//finalAccerditationReprot
+  //on file change 
+    //change file 
+    onFileChanges(event, index:number) {
+      console.log(event);
+      console.log(index);
+       this.files[index].nameFile = event[0].name.substring(0,20) + '....';
+       this.files[index].file = event[0].base64;
+       this.files[index].file_type = event[0].type.split('/')[1];
+         //validate in pdf type file in edit mode 
+         if(this.files[index].file_type != '') {
+           if(this.files[index].file_type != 'pdf') {
+             this.toastr.warning('يجب أن تكون صيغه الملف pdf !');
+             this.checkSaveClick = true;
+           } else {
+             this.checkSaveClick = false;
+           }
+         }
+  
+         console.log(this.files);
+   
+    }
+
+  //submitted form 
   onSubmittedForm() {
+
     console.log(this.actionForm);
+
+    //get the attchiements edit 
+    const editAttachements = [];
+    for(let i = 0; i < this.files.length; i++) {
+      for(let j = 0; j < this.attachments_ids.length; j++) {
+       if(this.files[i].id == this.attachments_ids[j]) {
+        editAttachements[i] = this.files[i];
+       }
+      }
+    };
+
+    //delete file & file type if not change it in old file
+    for(let i = 0; i < editAttachements.length; i++) {
+      if(editAttachements[i].file_type == '') {
+        delete editAttachements[i].file;
+        delete editAttachements[i].file_type;
+      }
+    };
+
+    //delete the extera key file name 
+    for(let i = 0; i < editAttachements.length; i++) {
+      delete editAttachements[i].nameFile;
+    };
+    
+    
+    //remove old file from files object
+    for(let i = 0; i < editAttachements.length; i++) {
+      for(let j = 0; j < this.files.length; j++) {
+        if(editAttachements[i].id == this.files[j].id) {
+          this.files.splice(j , 1);
+        }
+      }
+    };
+
+    //remove nameFile and id from object
+    for(let i = 0; i < this.files.length; i++) {
+      delete this.files[i].nameFile;
+      delete this.files[i].id;
+    };
+    
+    console.log('files after update ', this.files);
+    console.log('edit files after update ', editAttachements);
+    
+    this.actionForm['attachments_ids'] = this.attachments_ids;
+    this.actionForm['editable_attachments'] = editAttachements;
+    this.actionForm['attachments'] = this.files;
+
+    this.checkSaveClick = true;
+
     this.http.post(this.authSer.pathApi + '/final_accreditation_of_trainees', this.actionForm).subscribe(
       (responce) => {
         console.log(responce),
         this.toastr.success('تم بنجاح');
+        this.checkSaveClick = false;
         this.location.back();
       },
       (error) => {
         console.log(error);
-        this.toastr.error('يوجد خطأ في السيرفر ، حاول لاحقاَ');
+        this.checkSaveClick = false;
+        this.toastr.error('يوجد خطأ ، حاول لاحقاَ');
         this.location.back();
       }
-    )
+    );
+
   }
 
 }

src/app/dashboard/final-accreditation-of-trainees/final-accerditation-list/final-accerditation-list.component.html

@@ -3,7 +3,7 @@
       <div class="col-12">
           <ul class="list-unstyled titileLi-w">
             <li class="headingText-w">خدمه التدريب</li>
-            <li class="headingText-w activeLi-w" style="margin-right:5px">طباعه بطاقه المتدربين</li>
+            <li class="headingText-w activeLi-w" style="margin-right:5px">الأعتماد النهائي للمتدرب</li>
           </ul>
       </div>
     </div>

src/app/dashboard/final-trainee-report/final-trainee-report.component.css

@@ -0,0 +1,43 @@
+.containerContent-w h2 {
+    font-size: 20px;
+    color: #007a71;
+    margin: 20px 0;
+}
+
+.head {
+    text-align: center;
+    margin-right: 10px;
+    color: #888;
+}
+
+.head p {
+    margin: 0 10px;
+
+}
+
+.headTd {
+    width: 150px;
+    text-align: center;
+}
+
+.rightLogo {
+    width: 100%;
+    text-align: right;
+    margin: 20px 0;
+}
+
+.rightLogo p {
+    color: #007a71;
+}
+
+.rightLogo p span {
+    color: #888;
+}
+
+
+.signature {
+    width: 100%;
+    padding: 10px 0;
+    border-bottom: 1px solid #888;
+    border-top: 1px solid #888;
+}

src/app/dashboard/final-trainee-report/final-trainee-report.component.ts

@@ -0,0 +1,19 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-final-trainee-report',
+  templateUrl: './final-trainee-report.component.html',
+  styleUrls: ['./final-trainee-report.component.css']
+})
+export class FinalTraineeReportComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+  onPrint() {
+    window.print();
+  }
+
+}

src/app/dashboard/print-card-trainee/print-card-trainee-add/print-card-trainee-add.component.css

@@ -1,3 +1,43 @@
+.containerContent-w h2 {
+    text-align: right;
+    color: #007a71;
+    font-size: 25px;
+}
+
+.containerContent-w p {
+    text-align: right;
+    margin: 10px 0;
+    font-size: 18px;
+    font-weight: bold;
+}
+
+.card {
+    width: 400px;
+    display: inline-block;
+    padding: 20px 0;
+    margin: 50px 0;
+    border: 1px solid #ccc;
+    box-shadow: 0 1px 3px 1px #ccc;
+}
+
+.imgCard-w {
+    width: 150px;
+    height: 150px;
+    border: 1px solid #ccc;
+    margin: 10px auto;
+}
+
+.imgCard-w img{
+    width: 100%;
+    height: 100%;
+    border-radius: 10px;
+    border: 1px solid #ccc;
+}
+
+.card-body p span {
+    color: #007a71;
+    font-weight: bold;
+} 
 .userForm-w {
     width: 100%;
     padding: 20px 0;
@@ -148,9 +188,7 @@ select.ng-invalid{
 
 
 
-.titileLi-w {
-    margin: 0 65px;
-}
+
 .titileLi-w li {
     margin: 0 5px;
 }

src/app/dashboard/print-card-trainee/print-card-trainee-add/print-card-trainee-add.component.html

@@ -1,265 +1,47 @@
 <div class="addHospital-w">
     <div class="container">
   
-      <div class="row" style="margin-bottom: 30px;">
+      <div class="row">
           <div class="col-12">
-            <ul class="list-unstyled titileLi-w">
+            <ul class="list-unstyled titileLi-w" style="margin: 10px 0;">
               <li class="headingText-w">خدمه التدريب</li>
-              <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()"> تسجيل حركه المتدرب</li>
+              <li class="headingText-w" style="cursor:pointer" (click)="authSer.perviousLocation()"> طباعه بطاقه المتدرب</li>
             </ul>
           </div>
       </div>
   
       <div class="containerContent-w">
-        <form (ngSubmit)="onSubmittedForm()" #f="ngForm">
-          <div class="row">
-            <div class="col-12">
-              <h2 class="title">المعلومات الشخصيه</h2>
-              <div class="row">
-                <div class="wrapper">
-                  
-                  <div class="col-12 col-md-4">
-                    <div class="form-group">
-                      <label for="name" style="float:right">الإسم</label>
-                      <input id="name" type="text" class="form-control" placeholder="الإسم" ngModel name="name"  [(ngModel)]="userData.name" [disabled]="disabledInput" required/>
-                    </div>
-                  </div>
+        <h2>تعليمات</h2>
+        <p>في حاله فقدان هذه البطاقه أو انتهاء خدمات المتدرب أو العثور عليها تسليمها أو ابلاغ إداره الإمن والسلامه بمجمع الملك فيصل الطبي بصحه الطائف </p>
 
-                  <div class="col-12 col-sm-12 col-md-6 col-lg-4">
-                    <div class="form-group">
-                    <label style="float:right">الجنسية <span class="spanReqired-w">*</span></label>
-                    <select class="form-control" style="padding:0 5px" ngModel name="nationality_id" [(ngModel)]="userData.nationality_id" [disabled]="disabledInput" required>
-                      <option *ngFor="let country of countries; let i = index" [value]="country.id">{{country.country_arName}}</option>
-                    </select>
-                    </div>
-                  </div>
-
-                
-
-                  <div class="col-12 col-sm-12 col-md-6 col-lg-4">
-                    <div class="form-group">
-                      <label for="identity" style="float:right"> الهويه <span class="spanReqired-w">*</span></label>
-                      <select class="form-control select" id="identity" (change)="getSelectedOptionText($event)" ngModel name="identity_type_id" [(ngModel)]="userData.identity_type_id" [disabled]="disabledInput" required>
-                        <option *ngFor="let identity of identities" [value]="identity.id">{{identity.name}}</option>
-                      </select>
-                    </div>
-                  </div>
-
-                  <div class="col-12 col-sm-12 col-md-6 col-lg-4">
-                    <div class="form-group">
-                    <label for="identityNumber" style="float:right">رقم الهويه <span class="spanReqired-w">*</span></label>
-                    <input type="number" class="form-control" placeholder="رقم الهويه" id="identityNumber" (input)="onIdentitiyChange($event.target.value)" ngModel name="identity_number" [(ngModel)]="userData.identity_number" [disabled]="disabledInput" required/>
-                    <span class="errorMessage-w" *ngIf="identity_id == 1">أدخل رقم هويه مكون من 10 أرقام يبدأ برقم 1</span>
-                    <span class="errorMessage-w" *ngIf="identity_id == 2">أدخل رقم هويه مكون من 10 أرقام </span>
-                    <span class="errorMessage-w" *ngIf="identity_id == 3">أدخل رقم الإقامه مكون من 10 أرقام يبدأ برقم 2 </span>
-                    </div>
-                  </div>
-
-                  <div class="col-12 col-sm-12 col-md-6 col-lg-4">
-                      <div class="form-group">
-                        <label for="birthday" style="float:right">تاريخ الميلاد <span class="spanReqired-w">*</span></label>
-                        <input type="date" max="{{min}}" id="birthdate" placeholder="تاريخ الميلاد" class="form-control" ngModel name="birthday" [(ngModel)]="userData.birthday" [disabled]="disabledInput" required/> 
-                      </div>
-                    </div>
-
-                  <div class="col-12 col-sm-12 col-md-6 col-lg-4">
-                    <div class="form-group">
-                      <label style="float: right; margin-right:5px;margin-top:10px">النوع <span class="spanReqired-w">*</span></label>
-                      <div class="custom-control custom-radio inlineBlock-w" style="padding: 2px 31px;background: #bd90592e;color: #a98559;border: 1px solid #b38553c2;">
-                        <input type="radio" class="custom-control-input customStyleInput" id="defaultUnchecked" value="male" name="gender" ngModel [(ngModel)]="userData.gender" [disabled]="disabledInput">
-                        <label class="custom-control-label" for="defaultUnchecked" style="cursor: pointer;">ذكر</label>
-                      </div>
-                      
-                      <div class="custom-control custom-radio inlineBlock-w" style="padding: 2px 31px;background: #bd90592e;color: #a98559;border: 1px solid #b38553c2;">
-                        <input type="radio" class="custom-control-input customStyleInput" id="defaultChecked" value="female" name="gender" ngModel [(ngModel)]="userData.gender" [disabled]="disabledInput">
-                        <label class="custom-control-label" for="defaultChecked" style="cursor: pointer;">انثي</label>
-                      </div>
-      
-                    </div>
-                  </div>
-
-                </div>
-              </div>
-            </div>
-
-            <div class="col-12">
-              <h2 class="title">معلومات الإتصال</h2>
-              <div class="row">
-                <div class="wrapper">
-                  <div class="col-12 col-sm-12 col-md-6 col-lg-4">
-                    <div class="form-group">
-                      <label for="phone" style="float:right">رقم الجوال <span class="spanReqired-w">*</span></label>
-                      <input type="text" id="phone" appNumberDerictive class="form-control" placeholder="رقم الجوال يبدأ ب 05 ومكون من 10 أرقام" ngModel name="phone" [(ngModel)]="userData.phone" [disabled]="disabledInput" required/>
-                    </div>
-                  </div>
-                  <div class="col-12 col-md-4">
-                    <div class="form-group">
-                      <label for="email" style="float:right">البريد الإلكتروني <span class="spanReqired-w">*</span></label>
-                      <input id="email" type="email" class="form-control" placeholder="الإيميل" ngModel name="email"  [(ngModel)]="userData.email" [disabled]="disabledInput" required/>
-                    </div>
-                  </div>
+        <div class="row">
+          <div class="col-12">
+            <div class="card">
+              
+              <div class="imgCard-w">
+                <img src="{{userCardData.photo ? authSer.pathImg + userCardData.photo : authSer.imgSrc}}" class="card-img-top" alt="...">
               </div>
-            </div>
-          </div>
-
-            <div class="col-12">
-              <h2 class="title">معلومات التدريب</h2>
-              <div class="row">
-                <div class="wrapper">
-                  
-                  <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>
-                      <select class="form-control selectStyle-w" ngModel name="type" [(ngModel)]="formData.type" [disabled]="disabledInput" (input)="changeType($event)" required>
-                        <option value="trainees">المتدربين</option>
-                        <option value="fellowship"> زماله(البورد السعودي) </option>
-                        <option value="university_administrators">مشرفي الجامعات</option>
-                      </select>
-                    </div>
-                  </div>
-                  
-                  <div class="col-12 col-sm-12 col-md-4 col-lg-4">
-                    <div class="form-group">
-                      <label for="order" style="float:right">اسم التخصص <span class="spanReqired-w">*</span></label>
-                      <input type="text" id="order" placeholder=" إسم التخصص" ngModel name="specialization_name" [(ngModel)]="formData.specialization_name" class="form-control" [disabled]="disabledInput" required/>
-                    </div>
-                  </div>
-
-                  <div class="col-12 col-sm-12 col-md-4 col-lg-4">
-                    <div class="form-group">
-                      <label for="spec" style="float:right">التخصص الدقيق <span class="spanReqired-w">*</span></label>
-                      <input type="text" id="spec" class="form-control" placeholder="التخصص الدقيق" name="specific_specialization" [(ngModel)]="formData.specific_specialization" [disabled]="disabledInput" ngModel required/>
-                    </div>
-                  </div>
-
-                  <div class="col-12 col-sm-12 col-md-4 col-lg-4 ">
-                    <div class="form-group">
-                      <label for="universty" style="float:right">الجامعه <span class="spanReqired-w">*</span></label>
-                      <input type="text" id="universty" placeholder="الجامعه" class="form-control" name="univeristy" ngModel [(ngModel)]="formData.university" [disabled]="disabledInput" required/>
-                    </div>
-                  </div>
-
-                  <div class="col-12 col-sm-12 col-md-4 col-lg-4">
-                    <div class="form-group">
-                      <label for="level" style="float:right">المستوي <span class="spanReqired-w">*</span></label>
-                      <input type="text" id="level" placeholder="المستوي" class="form-control" name="level" ngModel [(ngModel)]="formData.level" [disabled]="disabledInput" required/>
-                    </div>
-                  </div>
-
-                  <div class="col-12 col-sm-12 col-md-4 col-lg-4">
-                    <div class="form-group">
-                      <label for="trainning" style="float:right">الفتره التدريبيه <span class="spanReqired-w">*</span></label>
-                      <input type="text" id="trainning" placeholder="الفتره التدريبيه" class="form-control" name="training_period" ngModel [(ngModel)]="formData.training_period" [disabled]="disabledInput" required />
-                    </div>
-                  </div>
-
-                  <div class="col-12 col-sm-12 col-md-4 col-lg-4" *ngIf="formData.type == 'fellowship'">
-                    <div class="form-group">
-                      <label for="regester" style="float:right">رقم التسجيل <span class="spanReqired-w">*</span></label>
-                      <input type="number" id="regester" placeholder="رقم التسجيل" class="form-control" name="training_period" ngModel [(ngModel)]="formData.registration_number" [disabled]="disabledInput" required/>
-                    </div>
-                  </div>
-
-                  <div class="col-12 col-sm-12 col-md-4 col-lg-4" *ngIf="formData.type == 'fellowship'">
-                    <div class="form-group">
-                      <label for="card" style="float:right">رقم البطاقه الهينه <span class="spanReqired-w">*</span></label>
-                      <input id="card" type="number" placeholder="رقم البطاقه الهينه" class="form-control" name="authority_card_number" ngModel [(ngModel)]="formData.authority_card_number" [disabled]="disabledInput" required/>
-                    </div>
-                  </div>
-
-                  <div class="col-12 col-sm-12 col-md-4 col-lg-4" *ngIf="formData.type == 'fellowship'">
-                    <div class="form-group">
-                      <label for="job" style="float:right"> البطاقه الوظيفي <span class="spanReqired-w">*</span></label>
-                      <input type="number" id="job" placeholder="البطاقه الوظيفي" class="form-control" name="functional_number" ngModel [(ngModel)]="formData.functional_number" [disabled]="disabledInput" required/>
-                    </div>
-                  </div>
-                  <div class="col-12 col-sm-12 col-md-4 col-lg-4" *ngIf="formData.type == 'fellowship'">
-                    <div class="form-group">
-                      <label for="contract" style="float:right">نوع التعاقد <span class="spanReqired-w">*</span></label>
-                      <input type="text" id="contract" placeholder="نوع التعاقد" class="form-control" name="contract_type" ngModel [(ngModel)]="formData.contract_type" [disabled]="disabledInput" required/>
-                    </div>
-                  </div>
-                  <div class="col-12 col-sm-12 col-md-4 col-lg-4" *ngIf="formData.type == 'fellowship'">
-                    <div class="form-group">
-                      <label for="field" style="float:right">الجهه التابع لها المتدرب <span class="spanReqired-w">*</span></label>
-                      <input type="text" id="field" placeholder="الجهه التابع لها المتدرب" class="form-control" name="organization_affiliated_with" ngModel [(ngModel)]="formData.organization_affiliated_with" [disabled]="disabledInput" required/>
-                    </div>
-                  </div>
-
-                <!-- <h2 class="departmentHeading-w">أختر الأقسام <span>(قم بإختيار قسم كحد أدني)</span></h2> -->
-                  <div class="col-12 col-sm-12 col-md-4 col-lg-4">
-                    <div class="form-group">
-                      <label for="department1" style="float:right;">القسم الأول</label>
-                      <select class="form-control selectStyle-w" id="department1" name="department1" (input)="changeDepartment($event , 1)" [(ngModel)]="formData.department1" [disabled]="disabledInput">
-                        <option *ngFor="let department of departments" [value]="department.id">{{department.name}}</option>
-                        <option [value]="2001">حذف</option>
-                      </select>
-                    </div>
-                  </div>
-                  <div class="col-12 col-sm-12 col-md-4 col-lg-4">
-                    <div class="form-group">
-                      <label for="department2" style="float:right;">القسم الثاني</label>
-                      <select class="form-control selectStyle-w" id="department2" name="department2" (input)="changeDepartment($event , 2)" [(ngModel)]="formData.department2" [disabled]="disabledInput">
-                        <option *ngFor="let department of departments" [value]="department.id">{{department.name}}</option>
-                        <option [value]="2002">حذف</option>
-                      </select>
-                    </div>
-                  </div>
-                  <div class="col-12 col-sm-12 col-md-4 col-lg-4">
-                    <div class="form-group">
-                      <label for="department3" style="float:right;">القسم الثالث</label>
-                      <select class="form-control selectStyle-w" id="department3" name="department3" (input)="changeDepartment($event , 3)" [(ngModel)]="formData.department3" [disabled]="disabledInput">
-                        <option *ngFor="let department of departments" [value]="department.id">{{department.name}}</option>
-                        <option [value]="2003">حذف</option>
-                      </select>
-                    </div>
-                  </div>
-                </div>
+              
+              <div class="card-body">
+                <p>الإسم : <span>{{ userCardData.name ? userCardData.name : 'لايوجد' }}</span></p>
+                <p>الإيميل : <span>{{ userCardData.email ? userCardData.email : 'لايوجد' }}</span></p>
+                <p>رقم الهويه : <span>{{ userCardData.identity_number ? userCardData.identity_number : 'لايوجد' }}</span></p>
+                <p>رقم الهاتف : <span>{{ userCardData.phone ? userCardData.phone : 'لايوجد' }}</span></p>
+                <p>  التخصص : <span>{{ requestCardData.specialization_name ? requestCardData.specialization_name : 'لايوجد' }}</span></p>
+                <p>التخصص الدقيق : <span>{{ requestCardData.specific_specialization ? requestCardData.specific_specialization : 'لايوجد' }}</span></p>
+                <p>تاريخ الإنتهاء : <span>{{ requestCardData.end_date ? requestCardData.end_date : 'لايوجد' }}</span></p>
               </div>
-            </div>
-
-            <div class="col-12">
-              <h2 class="title">المرفقات</h2>
-              <div class="row">
-                <div class="wrapper">
-                  
-                  <div class="col-12">
-                    <button type="button" class="btn btn-default" (click)="plusImage()" style="margin:20px 0; float:right;">إضافه مرفق</button>
-                  </div>
 
-                  <table class="table table-bordered">
-                    <thead class="headBackground-w">
-                      <tr>
-                        <th> إسم المرفق</th>
-                        <th>رفع املف ( بصيغه pdf )</th>
-                        <th>حذف</th>
-                      </tr>
-                    </thead>
-                    <tbody>
-                      <tr style="text-align:center;" *ngFor="let file of files; let i = index">
-                        <td><input type="text" class="form-control" placeholder="إسم الملف" [(ngModel)]="file.title" [ngModelOptions]="{standalone: true}" [disabled]="disabledInput"/></td>
-                        <td style="position: relative;">
-                          <input type="file" name="file{{i}}" id="file{{i}}" class="inputfile" alife-file-to-base64 (onFileChanged)="onFileChanges($event,i)" [disabled]="disabledInput"/>
-                          <label for="file{{i}}" class="iconUpload-w"><i class="fas fa-upload"></i></label>
-                          <span class="fileName-w">{{file.nameFile}}</span>
-                        </td>
-                        <td><button type="button" class="btn btn-danger form-control deleteRow-w" (click)="onDeleteRow(i)" [disabled]="disabledInput">حذف</button></td>
-                      </tr>
-                    </tbody>
-                  </table>
-
-                </div>
-              </div>
             </div>
+          </div>
+        </div>
 
-
-            <!-- <div class="col-12">
-              <button type="submit" class="btn btn-success rightW" [disabled]="checkSaveClick">حفظ</button>
-              <button type="button" class="btn btn-warning rightW" (click)="authSer.backFromEdit()" style="margin:20px 10px;">إلغاء</button>
-            </div> -->
-
+        <div class="row">
+          <div class="col-12">
+            <button class="btn btn-success" style="float: right; margin: 10px 0;" (click)="onPrint()">طباعه</button> 
           </div>
-        </form>
+        </div>
+
       </div>
   
   

src/app/dashboard/print-card-trainee/print-card-trainee-add/print-card-trainee-add.component.ts

@@ -37,6 +37,8 @@ export class PrintCardTraineeAddComponent implements OnInit {
   trainees:any[] = [];
   departments:any[] = [];
   departmentsId:any[] = [];
+  userCardData: any[] = [];
+  requestCardData:any[] =[]
 
   @ViewChild('f') traineeForm: NgForm;
 
@@ -162,6 +164,9 @@ export class PrintCardTraineeAddComponent implements OnInit {
       this.dashBoardSer.getItemData(this.reportId,'traineeRequest').subscribe(
         (responce) => {
           console.log('get request by id', responce);
+          this.userCardData = responce['data']['user'];
+          this.requestCardData = responce['data']['request'];
+          console.log('ussssser data', this.userCardData);
           this.formData.trainee = responce['data']['user'].id;
           this.formData.type = responce['data']['request'].type;
           this.formData.specialization_name = responce['data']['request'].specialization_name;
@@ -225,6 +230,10 @@ export class PrintCardTraineeAddComponent implements OnInit {
     }
   }
 
+  onPrint() {
+    window.print();
+  }
+
 
 
 

src/app/dashboard/print-card-trainee/print-card-trainee-list/print-card-trainee-list.component.ts

@@ -105,9 +105,7 @@ export class PrintCardTraineeListComponent implements OnInit {
             this.count = responce['count'];
             this.perPagePagenation = responce['per_page'];
             console.log('evennnnts', this.dataList);
-            if(this.dataList.length > 0) {
-              this.spinner.hide();
-            }
+            this.spinner.hide();
           },
           (error) => {
             console.log(error);

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

@@ -59,7 +59,7 @@
                   <div class="col-12 col-sm-12 col-md-6 col-lg-4">
                     <div class="form-group">
                     <label for="identityNumber" style="float:right">رقم الهويه <span class="spanReqired-w">*</span></label>
-                    <input type="number" class="form-control" placeholder="رقم الهويه" id="identityNumber" (input)="onIdentitiyChange($event.target.value)" ngModel name="identity_number" [(ngModel)]="userData.identity_number" [disabled]="disabledInput" required/>
+                    <input type="number" class="form-control" placeholder="رقم الهويه" (keypress)="authSer.onKeydown($event)" id="identityNumber" (input)="onIdentitiyChange($event.target.value)" ngModel name="identity_number" [(ngModel)]="userData.identity_number" [disabled]="disabledInput" min="0" required/>
                     <span class="errorMessage-w" *ngIf="identity_id == 1">أدخل رقم هويه مكون من 10 أرقام يبدأ برقم 1</span>
                     <span class="errorMessage-w" *ngIf="identity_id == 2">أدخل رقم هويه مكون من 10 أرقام </span>
                     <span class="errorMessage-w" *ngIf="identity_id == 3">أدخل رقم الإقامه مكون من 10 أرقام يبدأ برقم 2 </span>
@@ -100,7 +100,7 @@
                   <div class="col-12 col-sm-12 col-md-6 col-lg-4">
                     <div class="form-group">
                       <label for="phone" style="float:right">رقم الجوال <span class="spanReqired-w">*</span></label>
-                      <input type="text" id="phone" appOnlyNumber class="form-control" placeholder="رقم الجوال يبدأ ب 05 ومكون من 10 أرقام" ngModel name="phone" [(ngModel)]="userData.phone" [disabled]="disabledInput" required/>
+                      <input type="text" id="phone" appOnlyNumber class="form-control" (keypress)="authSer.onKeydown($event)" placeholder="رقم الجوال يبدأ ب 05 ومكون من 10 أرقام" ngModel name="phone" [(ngModel)]="userData.phone" [disabled]="disabledInput" required/>
                     </div>
                   </div>
                   <div class="col-12 col-md-4">
@@ -113,184 +113,189 @@
               </div>
             </div>
           </div>
-            <div class="col-12">
-              <h2 class="title">معلومات التدريب</h2>
-              <div class="row">
-                <div class="wrapper">
-                  
-                  <div class="col-12" *ngIf="typeMode">
-                    <div class="form-group">
-                      <h2 class="titleStatus">{{formData.status == 'pending' ? 'تحت الإجراء' 
+
+          <div class="col-12">
+            <h2 class="title">المرفقات</h2>
+            <div class="row">
+              <div class="wrapper">
+                
+                <div class="col-12">
+                  <button type="button" class="btn btn-default" (click)="plusImage()" style="margin:20px 0; float:right;">إضافه مرفق</button>
+                </div>
+
+                <table class="table table-bordered">
+                  <thead class="headBackground-w">
+                    <tr>
+                      <th> إسم المرفق</th>
+                      <th>رفع املف ( بصيغه pdf )</th>
+                      <th>حذف</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <tr style="text-align:center;" *ngFor="let file of files; let i = index">
+                      <td><input type="text" class="form-control" placeholder="إسم الملف" [(ngModel)]="file.title" [ngModelOptions]="{standalone: true}"/></td>
+                      <td style="position: relative;">
+                        <input type="file" name="file{{i}}" id="file{{i}}" class="inputfile" alife-file-to-base64 (onFileChanged)="onFileChanges($event,i)" />
+                        <label for="file{{i}}" class="iconUpload-w"><i class="fas fa-upload"></i></label>
+                        <span class="fileName-w">{{file.nameFile}}</span>
+                      </td>
+                      <td><button type="button" class="btn btn-danger form-control deleteRow-w" (click)="onDeleteRow(i)">حذف</button></td>
+                    </tr>
+                  </tbody>
+                </table>
+
+              </div>
+            </div>
+          </div>
+
+          <div class="col-12">
+            <h2 class="title">معلومات التدريب</h2>
+            <div class="row">
+              <div class="wrapper">
+                
+                <div class="col-12" *ngIf="typeMode">
+                    <div [className]="formData.status == 'accepted' ? 'alert-success' : formData.status == 'refused' ? 'alert-danger' : 'alert-dark'" class="alert" style="height:40px; padding:6px 0;"ole="alert">
+                      <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>
+                          : 'لم يتم تسجيل حاله الطلب'}}</h2>
                     </div>
-                  </div>
+                  <!-- <div class="form-group">
+                   
+                  </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>
-                      <select class="form-control selectStyle-w" ngModel name="type" [(ngModel)]="formData.type" (input)="changeType($event)" required>
-                        <option value="trainees">المتدربين</option>
-                        <option value="fellowship"> زماله(البورد السعودي) </option>
-                        <option value="university_administrators">مشرفي الجامعات</option>
-                      </select>
-                    </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>
+                    <select class="form-control selectStyle-w" ngModel name="type" [(ngModel)]="formData.type" (input)="changeType($event)" required>
+                      <option value="trainees">المتدربين</option>
+                      <option value="fellowship"> زماله(البورد السعودي) </option>
+                      <option value="university_administrators">مشرفي الجامعات</option>
+                    </select>
                   </div>
-                  
-                  <div class="col-12 col-sm-12 col-md-4 col-lg-4">
-                    <div class="form-group">
-                      <label for="order" style="float:right">اسم التخصص <span class="spanReqired-w">*</span></label>
-                      <input type="text" id="order" placeholder=" إسم التخصص" ngModel name="specialization_name" [(ngModel)]="formData.specialization_name" class="form-control" required/>
-                    </div>
+                </div>
+                
+                <div class="col-12 col-sm-12 col-md-4 col-lg-4">
+                  <div class="form-group">
+                    <label for="order" style="float:right">اسم التخصص <span class="spanReqired-w">*</span></label>
+                    <input type="text" id="order" placeholder=" إسم التخصص" ngModel name="specialization_name" [(ngModel)]="formData.specialization_name" class="form-control" required/>
                   </div>
+                </div>
 
-                  <div class="col-12 col-sm-12 col-md-4 col-lg-4">
-                    <div class="form-group">
-                      <label for="spec" style="float:right">التخصص الدقيق <span class="spanReqired-w">*</span></label>
-                      <input type="text" id="spec" class="form-control" placeholder="التخصص الدقيق" name="specific_specialization" [(ngModel)]="formData.specific_specialization" ngModel required/>
-                    </div>
+                <div class="col-12 col-sm-12 col-md-4 col-lg-4">
+                  <div class="form-group">
+                    <label for="spec" style="float:right">التخصص الدقيق <span class="spanReqired-w">*</span></label>
+                    <input type="text" id="spec" class="form-control" placeholder="التخصص الدقيق" name="specific_specialization" [(ngModel)]="formData.specific_specialization" ngModel required/>
                   </div>
+                </div>
 
-                  <div class="col-12 col-sm-12 col-md-4 col-lg-4 ">
-                    <div class="form-group">
-                      <label for="universty" style="float:right">الجامعه <span class="spanReqired-w">*</span></label>
-                      <input type="text" id="universty" placeholder="الجامعه" class="form-control" name="univeristy" ngModel [(ngModel)]="formData.university" required/>
-                    </div>
+                <div class="col-12 col-sm-12 col-md-4 col-lg-4 ">
+                  <div class="form-group">
+                    <label for="universty" style="float:right">الجامعه <span class="spanReqired-w">*</span></label>
+                    <input type="text" id="universty" placeholder="الجامعه" class="form-control" name="univeristy" ngModel [(ngModel)]="formData.university" required/>
                   </div>
+                </div>
 
-                  <div class="col-12 col-sm-12 col-md-4 col-lg-4">
-                    <div class="form-group">
-                      <label for="level" style="float:right">المستوي <span class="spanReqired-w">*</span></label>
-                      <input type="text" id="level" placeholder="المستوي" class="form-control" name="level" ngModel [(ngModel)]="formData.level" required/>
-                    </div>
+                <div class="col-12 col-sm-12 col-md-4 col-lg-4">
+                  <div class="form-group">
+                    <label for="level" style="float:right">المستوي <span class="spanReqired-w">*</span></label>
+                    <input type="text" id="level" placeholder="المستوي" class="form-control" name="level" ngModel [(ngModel)]="formData.level" required/>
                   </div>
+                </div>
 
-                  <div class="col-12 col-sm-12 col-md-4 col-lg-4">
-                    <div class="form-group">
-                      <label for="trainning" style="float:right">الفتره التدريبيه <span class="spanReqired-w">*</span></label>
-                      <input type="text" id="trainning" placeholder="الفتره التدريبيه" class="form-control" name="training_period" ngModel [(ngModel)]="formData.training_period" required />
-                    </div>
+                <div class="col-12 col-sm-12 col-md-4 col-lg-4">
+                  <div class="form-group">
+                    <label for="trainning" style="float:right">الفتره التدريبيه <span class="spanReqired-w">*</span></label>
+                    <input type="text" id="trainning" placeholder="الفتره التدريبيه" class="form-control" name="training_period" ngModel [(ngModel)]="formData.training_period" required />
                   </div>
+                </div>
 
-                  <div class="col-12 col-sm-12 col-md-4 col-lg-4" *ngIf="formData.type == 'fellowship'">
-                    <div class="form-group">
-                      <label for="regester" style="float:right">رقم التسجيل <span class="spanReqired-w">*</span></label>
-                      <input type="number" id="regester" placeholder="رقم التسجيل" class="form-control" name="training_period" ngModel [(ngModel)]="formData.registration_number" required/>
-                    </div>
+                <div class="col-12 col-sm-12 col-md-4 col-lg-4" *ngIf="formData.type == 'fellowship'">
+                  <div class="form-group">
+                    <label for="regester" style="float:right">رقم التسجيل <span class="spanReqired-w">*</span></label>
+                    <input type="number" id="regester" min="0" (keypress)="authSer.onKeydown($event)" placeholder="رقم التسجيل" class="form-control" name="training_period" ngModel [(ngModel)]="formData.registration_number" required/>
                   </div>
+                </div>
 
-                  <div class="col-12 col-sm-12 col-md-4 col-lg-4" *ngIf="formData.type == 'fellowship'">
-                    <div class="form-group">
-                      <label for="card" style="float:right">رقم البطاقه الهينه <span class="spanReqired-w">*</span></label>
-                      <input id="card" type="number" placeholder="رقم البطاقه الهينه" class="form-control" name="authority_card_number" ngModel [(ngModel)]="formData.authority_card_number" required/>
-                    </div>
+                <div class="col-12 col-sm-12 col-md-4 col-lg-4" *ngIf="formData.type == 'fellowship'">
+                  <div class="form-group">
+                    <label for="card" style="float:right">رقم البطاقه الهينه <span class="spanReqired-w">*</span></label>
+                    <input id="card" type="number" min="0" (keypress)="authSer.onKeydown($event)" placeholder="رقم البطاقه الهينه" class="form-control" name="authority_card_number" ngModel [(ngModel)]="formData.authority_card_number" required/>
                   </div>
+                </div>
 
-                  <div class="col-12 col-sm-12 col-md-4 col-lg-4" *ngIf="formData.type == 'fellowship'">
-                    <div class="form-group">
-                      <label for="job" style="float:right"> البطاقه الوظيفي <span class="spanReqired-w">*</span></label>
-                      <input type="number" id="job" placeholder="البطاقه الوظيفي" class="form-control" name="functional_number" ngModel [(ngModel)]="formData.functional_number" required/>
-                    </div>
+                <div class="col-12 col-sm-12 col-md-4 col-lg-4" *ngIf="formData.type == 'fellowship'">
+                  <div class="form-group">
+                    <label for="job" style="float:right"> البطاقه الوظيفي <span class="spanReqired-w">*</span></label>
+                    <input type="number" id="job" min="0" (keypress)="authSer.onKeydown($event)" placeholder="البطاقه الوظيفي" class="form-control" name="functional_number" ngModel [(ngModel)]="formData.functional_number" required/>
                   </div>
-                  <div class="col-12 col-sm-12 col-md-4 col-lg-4" *ngIf="formData.type == 'fellowship'">
-                    <div class="form-group">
-                      <label for="contract" style="float:right">نوع التعاقد <span class="spanReqired-w">*</span></label>
-                      <input type="text" id="contract" placeholder="نوع التعاقد" class="form-control" name="contract_type" ngModel [(ngModel)]="formData.contract_type" required/>
-                    </div>
+                </div>
+                <div class="col-12 col-sm-12 col-md-4 col-lg-4" *ngIf="formData.type == 'fellowship'">
+                  <div class="form-group">
+                    <label for="contract" style="float:right">نوع التعاقد <span class="spanReqired-w">*</span></label>
+                    <input type="text" id="contract" placeholder="نوع التعاقد" class="form-control" name="contract_type" ngModel [(ngModel)]="formData.contract_type" required/>
                   </div>
-                  <div class="col-12 col-sm-12 col-md-4 col-lg-4" *ngIf="formData.type == 'fellowship'">
-                    <div class="form-group">
-                      <label for="field" style="float:right">الجهه التابع لها المتدرب <span class="spanReqired-w">*</span></label>
-                      <input type="text" id="field" placeholder="الجهه التابع لها المتدرب" class="form-control" name="organization_affiliated_with" ngModel [(ngModel)]="formData.organization_affiliated_with" required/>
-                    </div>
+                </div>
+                <div class="col-12 col-sm-12 col-md-4 col-lg-4" *ngIf="formData.type == 'fellowship'">
+                  <div class="form-group">
+                    <label for="field" style="float:right">الجهه التابع لها المتدرب <span class="spanReqired-w">*</span></label>
+                    <input type="text" id="field" placeholder="الجهه التابع لها المتدرب" class="form-control" name="organization_affiliated_with" ngModel [(ngModel)]="formData.organization_affiliated_with" required/>
                   </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">
-                      <label for="department1" style="float:right;">القسم الأول</label>
-                      <select class="form-control selectStyle-w" id="department1" name="department1" (input)="changeDepartment($event , 1)" [(ngModel)]="formData.department1">
-                        <option *ngFor="let department of departments" [value]="department.id">{{department.name}}</option>
-                      </select>
-                    </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">
+                    <label for="department1" style="float:right;">القسم الأول</label>
+                    <select class="form-control selectStyle-w" id="department1" name="department1" (input)="changeDepartment($event , 1)" [(ngModel)]="formData.department1">
+                      <option *ngFor="let department of departments" [value]="department.id">{{department.name}}</option>
+                    </select>
                   </div>
-                  <div class="col-12 col-sm-12 col-md-4 col-lg-4" *ngIf="!editMode">
-                    <div class="form-group">
-                      <label for="department2" style="float:right;">القسم الثاني</label>
-                      <select class="form-control selectStyle-w" id="department2" name="department2" (input)="changeDepartment($event , 2)" [(ngModel)]="formData.department2">
-                        <option *ngFor="let department of departments" [value]="department.id">{{department.name}}</option>
-                      </select>
-                    </div>
+                </div>
+                <div class="col-12 col-sm-12 col-md-4 col-lg-4" *ngIf="!editMode">
+                  <div class="form-group">
+                    <label for="department2" style="float:right;">القسم الثاني</label>
+                    <select class="form-control selectStyle-w" id="department2" name="department2" (input)="changeDepartment($event , 2)" [(ngModel)]="formData.department2">
+                      <option *ngFor="let department of departments" [value]="department.id">{{department.name}}</option>
+                    </select>
                   </div>
-                  <div class="col-12 col-sm-12 col-md-4 col-lg-4" *ngIf="!editMode">
-                    <div class="form-group">
-                      <label for="department3" style="float:right;">القسم الثالث</label>
-                      <select class="form-control selectStyle-w" id="department3" name="department3" (input)="changeDepartment($event , 3)" [(ngModel)]="formData.department3">
-                        <option *ngFor="let department of departments" [value]="department.id">{{department.name}}</option>
-                      </select>
-                    </div>
+                </div>
+                <div class="col-12 col-sm-12 col-md-4 col-lg-4" *ngIf="!editMode">
+                  <div class="form-group">
+                    <label for="department3" style="float:right;">القسم الثالث</label>
+                    <select class="form-control selectStyle-w" id="department3" name="department3" (input)="changeDepartment($event , 3)" [(ngModel)]="formData.department3">
+                      <option *ngFor="let department of departments" [value]="department.id">{{department.name}}</option>
+                    </select>
                   </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>
-                      <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>
-                    </div>
+                </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>
+                    <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>
                   </div>
+                </div>
 
 
-                  <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>
-                      <button type="button" class="btn btn-success statusBtn-w" (click)="statusShow('accepted')">قبول</button>
-                      <button type="button" class="btn btn-danger statusBtn-w" (click)="statusShow('refused')">رفض</button>
-                      <button type="button" class="btn btn-default statusBtn-w" (click)="statusShow('asked_for_opinion')">طلب رأي</button>
-                      <input type="text" placeholder="سبب الرفض" class="form-control" name="status_description" ngModel [(ngModel)]="formData.status_description" *ngIf="showRefusedCause" required>
-                    </div>
+                <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>
+                    <button type="button" class="btn btn-success statusBtn-w" (click)="statusShow('accepted')">قبول</button>
+                    <button type="button" class="btn btn-danger statusBtn-w" (click)="statusShow('refused')">رفض</button>
+                    <button type="button" class="btn btn-default statusBtn-w" (click)="statusShow('asked_for_opinion')">طلب رأي</button>
+                    <input type="text" placeholder="سبب الرفض" class="form-control" name="status_description" ngModel [(ngModel)]="formData.status_description" *ngIf="showRefusedCause" required>
                   </div>
-
                 </div>
-              </div>
-            </div>
 
-            <div class="col-12">
-              <h2 class="title">المرفقات</h2>
-              <div class="row">
-                <div class="wrapper">
-                  
-                  <div class="col-12">
-                    <button type="button" class="btn btn-default" (click)="plusImage()" style="margin:20px 0; float:right;">إضافه مرفق</button>
-                  </div>
-
-                  <table class="table table-bordered">
-                    <thead class="headBackground-w">
-                      <tr>
-                        <th> إسم المرفق</th>
-                        <th>رفع املف ( بصيغه pdf )</th>
-                        <th>حذف</th>
-                      </tr>
-                    </thead>
-                    <tbody>
-                      <tr style="text-align:center;" *ngFor="let file of files; let i = index">
-                        <td><input type="text" class="form-control" placeholder="إسم الملف" [(ngModel)]="file.title" [ngModelOptions]="{standalone: true}"/></td>
-                        <td style="position: relative;">
-                          <input type="file" name="file{{i}}" id="file{{i}}" class="inputfile" alife-file-to-base64 (onFileChanged)="onFileChanges($event,i)" />
-                          <label for="file{{i}}" class="iconUpload-w"><i class="fas fa-upload"></i></label>
-                          <span class="fileName-w">{{file.nameFile}}</span>
-                        </td>
-                        <td><button type="button" class="btn btn-danger form-control deleteRow-w" (click)="onDeleteRow(i)">حذف</button></td>
-                      </tr>
-                    </tbody>
-                  </table>
-
-                </div>
               </div>
             </div>
+          </div>
+
 
             <div class="col-12">
               <button type="submit" class="btn btn-success rightW" [disabled]="!f.valid || checkSaveClick">حفظ</button>

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

@@ -170,7 +170,8 @@ export class ReviewTraineeAddComponent implements OnInit {
           } else {
             this.showRefusedCause = false;
           }
-          this.formData.status_description = responce['data']['request'].status_description;
+          this.formData.status_description = responce['data']['request'].status_description ? responce['data']['request'].status_description : '';
+          console.log(this.formData.status_description);
           this.formData.functional_number = responce['data']['request'].functional_number;
           this.formData.organization_affiliated_with = responce['data']['request'].organization_affiliated_with;
           this.formData.registration_number = responce['data']['request'].registration_number;
@@ -183,6 +184,7 @@ export class ReviewTraineeAddComponent implements OnInit {
           this.userData.gender = responce['data']['user'].gender;
           this.userData.nationality_id = responce['data']['user'].nationality_id;
           this.userId = responce['data']['user'].id;
+          
           this.userData['id'] = this.userId;
 
              //full departments in edit mode 
@@ -190,8 +192,10 @@ export class ReviewTraineeAddComponent implements OnInit {
                this.departments = [];
               for(let i = 0; i < responce['data']['request'].departments.length; i++) {
                 this.departments[i] = responce['data']['request'].departments[i];
-            }
-            this.formData.department4 = responce['data']['request'].departments[0].department_id;
+                if(this.departments[i].asked_for_opinion == 1){
+                  this.formData.department4 = responce['data']['request'].departments[i].department_id;
+                }
+              }
           }
 
 
@@ -225,19 +229,60 @@ export class ReviewTraineeAddComponent implements OnInit {
 
   statusShow(typeStatus: string) {
     console.log(typeStatus);
-    if(typeStatus == 'accepted') {
-      this.formData.status = typeStatus;
-      this.toastr.success('تم تسجيل الحاله مقبول');
-      this.showRefusedCause = false;
-    } else if(typeStatus == 'refused') {
-      this.formData.status = typeStatus;
+    let statusData = {
+      status_description: '',
+      id: null,
+      status: '',
+      choosen_department_id: '',
+    };
+    console.log(this.formData.status_description);
+    this.formData['id'] = this.reportId;
+    
+    statusData.id = this.reportId;
+    statusData.status = typeStatus;
+  
+
+    if(typeStatus == 'refused') {
       this.showRefusedCause = true;
-      this.toastr.error('تم تسجيل الحاله بالرفض');
-    } else if(typeStatus == 'asked_for_opinion') {
-      this.formData.status = typeStatus;
-      this.showRefusedCause = false;
-      this.toastr.warning('تم تسجيل الحاله طلب رأي ');
     }
+
+    if(this.formData['department4'] == '') {
+      this.toastr.warning('من فضلك قم بإختيار قسم مناسب ثم قم بتسجيل حاله الطلب !');
+    } else if(typeStatus == 'refused' && this.formData.status_description == ''){
+      this.toastr.warning('قم بتسجيل سبب الرفص !');
+    } else {
+      if(typeStatus == 'accepted') {
+        this.formData.status = typeStatus;
+        this.toastr.success('تم تسجيل الحاله مقبول');
+        this.showRefusedCause = false;
+      } else if(typeStatus == 'refused') {
+        statusData.status_description = this.formData.status_description;
+        console.log( statusData.status_description);
+        this.formData.status = typeStatus;
+        this.toastr.error('تم تسجيل الحاله بالرفض');
+      } else if(typeStatus == 'asked_for_opinion') {
+        this.formData.status = typeStatus;
+        this.showRefusedCause = false;
+        this.toastr.warning('تم تسجيل الحاله طلب رأي ');
+      }
+
+      statusData.choosen_department_id = this.formData['department4'];
+
+
+    
+
+      console.log ('status data', statusData);
+
+      this.http.post(this.authSer.pathApi + '/change_reuqest_status', statusData).subscribe(
+        (responce) => {
+          console.log(responce);
+        },
+        (error) => {
+          console.log(error);
+        }
+      )
+    }
+   
   }
 
   plusImage() {
@@ -377,7 +422,7 @@ export class ReviewTraineeAddComponent implements OnInit {
     if(this.editMode) {
 
       this.formData['id'] = this.reportId;
-      this.formData['choosen_department_id'] = this.formData['department4'];
+      //this.formData['choosen_department_id'] = this.formData['department4'];
       //add old file in new array
       const editAttachements = [];
       for(let i = 0; i < this.files.length; i++) {
@@ -391,8 +436,6 @@ export class ReviewTraineeAddComponent implements OnInit {
   
       if(this.formData.trainee == '') {
         this.toastr.warning('من فضلك قم بإختيار متدرب !');
-      } else if(this.formData['choosen_department_id'] == '') {
-        this.toastr.warning('يجب إختيار قسم واحد من الأقسام المحدده !');
       } else {
         
         //delete file & file type if not change it in old file
@@ -428,6 +471,8 @@ export class ReviewTraineeAddComponent implements OnInit {
         delete this.formData['department2'];
         delete this.formData['department3'];
         delete this.formData['department4'];
+        delete this.formData['status'];
+        delete this.formData['status_description'];
 
 
         //add to form the edit old file 

src/app/dashboard/section-review-for-trainee/section-review-trainee-add/section-review-trainee-add.component.html

@@ -157,7 +157,7 @@
                   <div class="col-12 col-sm-12 col-md-4 col-lg-4" *ngIf="formData.type == 'fellowship'">
                     <div class="form-group">
                       <label for="regester" style="float:right">رقم التسجيل <span class="spanReqired-w">*</span></label>
-                      <input type="number" id="regester" placeholder="رقم التسجيل" class="form-control" name="training_period" ngModel [(ngModel)]="formData.registration_number" [disabled]="disabledInput" required/>
+                      <input type="number" id="regester" placeholder="رقم التسجيل" class="form-control" name="register_number" ngModel [(ngModel)]="formData.registration_number" [disabled]="disabledInput" required/>
                     </div>
                   </div>
 
@@ -271,24 +271,24 @@
                       <div class="col-12 col-sm-12 col-md-4 col-lg-4">
                           <div class="form-group">
                             <label for="startDate" style="float:right" >تاريخ البدايه</label>
-                            <!-- <div *ngIf='bindingDateSplitStart && typeMode'>
+                            <div *ngIf='bindingDateSplitStart && typeMode'>
                               <app-higri-date (onDatePicked)="getDate($event, 'start')" [myDate]="bindingDateSplitStart"></app-higri-date>
-                            </div> -->
-                            <div *ngIf='!typeMode'>
-                              <app-higri-date (onDatePicked)="getDate($event, 'start')" ></app-higri-date>
                             </div>
+                            <!-- <div *ngIf='!typeMode'>
+                              <app-higri-date (onDatePicked)="getDate($event, 'start')" ></app-higri-date>
+                            </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" >تاريخ الإنتهاء</label>
-                            <!-- <div *ngIf='bindingDateSplitEnd && typeMode'>
+                            <div *ngIf='bindingDateSplitEnd && typeMode'>
                               <app-end-higri-date  (onDatePicked)="getDate($event, 'end')" [myEndDate]="bindingDateSplitEnd"> </app-end-higri-date>
-                            </div> -->
-                            <div *ngIf='!typeMode'>
-                              <app-end-higri-date  (onDatePicked)="getDate($event, 'end')" ></app-end-higri-date>
                             </div>
+                            <!-- <div *ngIf='!typeMode'>
+                              <app-end-higri-date  (onDatePicked)="getDate($event, 'end')" ></app-end-higri-date>
+                            </div> -->
                           </div>
                         </div>
 

src/app/dashboard/section-review-for-trainee/section-review-trainee-add/section-review-trainee-add.component.ts

@@ -33,6 +33,7 @@ export class SectionReviewTraineeAddComponent implements OnInit {
   showRefusedCause: boolean = false; //to show the cause of refused when ststus is refused
   editMode: boolean = false; //true in edit mode 
   isConfirmedStatus: boolean = false;
+  typeMode:boolean = true;
   reportId: number;
   attachments_ids = []; //for edit mode;
 
@@ -42,6 +43,9 @@ export class SectionReviewTraineeAddComponent implements OnInit {
   departments:any[] = [];
   departmentsId:any[] = [];
 
+  bindingDateSplitStart;
+  bindingDateSplitEnd;
+
   @ViewChild('f') traineeForm: NgForm;
 
   //all form data 
@@ -183,6 +187,7 @@ export class SectionReviewTraineeAddComponent implements OnInit {
           } else {
             this.isConfirmedStatus = false;
           }
+
           this.formData.trainee = responce['data']['user'].id;
           this.formData.type = responce['data']['request'].type;
           this.formData.specialization_name = responce['data']['request'].specialization_name;
@@ -214,6 +219,21 @@ export class SectionReviewTraineeAddComponent implements OnInit {
           this.userData.phone = responce['data']['user'].phone;
           this.userData.gender = responce['data']['user'].gender;
           this.userId = responce['data']['user'].id;
+
+          this.actionConfirmedForm.start_date = responce['data']['request'].start_date;
+          this.actionConfirmedForm.end_date = responce['data']['request'].end_date;
+
+          this.bindingDateSplitStart = {
+            year: parseInt(responce['data']['request'].start_date ? responce['data']['request'].start_date.split('-')[0] : ''),
+            month: parseInt(responce['data']['request'].start_date ? responce['data']['request'].start_date.split('-')[1] : ''),
+            day: parseInt(responce['data']['request'].start_date ? responce['data']['request'].start_date.split('-')[2] : ''),
+          }
+
+          this.bindingDateSplitEnd = {
+           year: parseInt(responce['data']['request'].end_date ? responce['data']['request'].end_date.split('-')[0] : ''),
+           month: parseInt(responce['data']['request'].end_date ? responce['data']['request'].end_date.split('-')[1] : ''),
+           day: parseInt(responce['data']['request'].end_date ? responce['data']['request'].end_date.split('-')[2] : ''),
+         }
             //add departmrnts ids 
             if(responce['data']['request'].departments.length > 0) {
               for(let i = 0; i < responce['data']['request'].departments.length; i++) {
@@ -271,7 +291,17 @@ export class SectionReviewTraineeAddComponent implements OnInit {
 
   //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;
+    }
+
     console.log( date);
+
     if(type == 'start') {
       this.startDate = date.year + '-' + date.month + '-' + date.day;
       this.actionConfirmedForm.start_date = this.startDate;
@@ -286,16 +316,25 @@ export class SectionReviewTraineeAddComponent implements OnInit {
   }
 
   onSubmittedForm() {
+
+    this.checkSaveClick = true;
+    
     if(this.isConfirmedStatus) {
-      alert(this.isConfirmedStatus);
       const startDateObj = this.actionConfirmedForm.start_date.split('-');
       const endDateObj = this.actionConfirmedForm.end_date.split('-');
-      console.log(startDateObj[0]);
-      console.log(startDateObj[1]);
       console.log(startDateObj[2]);
+      console.log(endDateObj[2]);
+      
       console.log(this.actionConfirmedForm);
       if(endDateObj[0] < startDateObj[0]) {
         this.toastr.warning('تاريخ الإنتهاء يجب أن يكون أكبر من تاريخ الإبتداء !');
+        this.checkSaveClick = false;
+      } else if(endDateObj[0] == startDateObj[0] && endDateObj[1] < startDateObj[1]){
+        this.toastr.warning('شهر تاريخ الإنتهاء يجب أن يكون أكبر من شهر تاريخ الإبتداء');
+        this.checkSaveClick = false;
+      } else if(endDateObj[1] == startDateObj[1] && endDateObj[2] < startDateObj[2]){
+        this.toastr.warning('يوم تاريخ الإنتهاء يجب أن يكون أكبر من يوم تاريخ الإبتداء');
+        this.checkSaveClick = false;
       } else {
         this.http.post(this.authSer.pathApi + '/manage_request_time_status', this.actionConfirmedForm).subscribe(
           (responce) => {
@@ -305,12 +344,11 @@ export class SectionReviewTraineeAddComponent implements OnInit {
           },
           (error) => {
             console.log(error);
-            this.toastr.error('يوكد مشكله في السيرفر ، حاول لاحقاً');
+            this.toastr.error('يوكد مشكله في الحفظ ، حاول لاحقاً');
           }
         );
       }
     } else {
-      alert(this.isConfirmedStatus);
       console.log(this.actionOpinionForm);
       this.http.post(this.authSer.pathApi +  '/department_shows_opinion', this.actionOpinionForm).subscribe(
         (responce) => {
@@ -320,7 +358,7 @@ export class SectionReviewTraineeAddComponent implements OnInit {
         },
         (error) => {
           console.log(error);
-          this.toastr.warning('خطأ في السيرفر ، نعمل علي حلها ، حاول لاحقا');
+          this.toastr.warning('خطأ في الحفظ ، نعمل علي حلها ، حاول لاحقا');
           this.location.back();
         }
       )

src/app/dashboard/section-review-for-trainee/section-review-trainee-list/section-review-trainee-list.component.html

@@ -25,8 +25,9 @@
 
 
       <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">
                 <select [ngModel]="dataTableNumber" class="form-control selectButton-w" (input)="onGetValue($event)">
                   <option value="5">5</option>
@@ -37,19 +38,20 @@
                 من العناصر يتم عرضها
               </span>
             </div>
-          </div>
-          <div class="col-12 col-sm-12 col-md-12 col-lg-12" style="margin-top:20px;">
-            <div class="form-group">
+
+            <div class="form-group" style="float:right; margin:0 10px;">
               <span class="spanSelect-w">
-                  حاله الطلب
                 <select [ngModel]="dataTableNumber" class="form-control selectButton-w" (input)="onFiltterChosen($event)" style="width:200px;">
                   <option value="all">الكل</option>
                   <option value="asked_for_opinion">طلب رأي</option>
                   <option value="is_confirmed">الطلبات المقبوله</option>
                 </select>
+                حاله الطلب
               </span>
             </div>
+
           </div>
+        
       </div>
   
       <table class="table table-bordered">

src/app/dashboard/section-review-for-trainee/section-review-trainee-list/section-review-trainee-list.component.ts

@@ -59,9 +59,10 @@ export class SectionReviewTraineeListComponent implements OnInit {
     this.authSer.internalHeader = false;
     
     this.route.params.subscribe(
-      (params: Params) => {
-        this.pageId = params['reviewSectionId'];
-      }
+      (params:Params) => {
+        this.pageId = params['listPageId'];
+        localStorage.setItem('pageIdActive', params['listPageId']);
+      },
     );
     
     //to show / hide permissions

src/app/dashboard/vehicle-movement-report/vehicle-movement-report/vehicle-movement-report.component.ts

@@ -21,23 +21,24 @@ export class VehicleMovementReportComponent implements OnInit {
   vehicleData = [];
   typeReport:string = '';
   typeReportPage:string = '';
+
   ngOnInit() {
     this.route.params.subscribe(
       (params: Params) => {
         this.typeReport = params['typeReport'];
+        if(params['typeReport'] == 'Movement') {
+          this.typeReportPage = 'تقارير حركه المركبات';
+          localStorage.setItem('pageIdActive', '49');
+          this.searchData = '';
+          this.vehicleData = [];
+        } else if(params['typeReport'] == 'General') {
+          this.typeReportPage = 'تقرير عام عن المركبه';
+          localStorage.setItem('pageIdActive', '50');
+          this.searchData = '';
+          this.vehicleData = [];
+        }
       }
     );
-
-    if(this.typeReport == 'Movement') {
-      this.typeReportPage = 'تقارير حركه المركبات';
-      localStorage.setItem('pageIdActive', '49');
-    } else if(this.typeReport == 'General') {
-      this.typeReportPage = 'تقرير عام عن المركبه';
-      localStorage.setItem('pageIdActive', '50');
-
-    } else {
-      console.log('error');
-    }
   }
 
   onGetData() {

src/app/shared/auth-service.service.ts

@@ -182,6 +182,15 @@ export class AuthServiceService {
     }
   }
 
+  //prevent ngative value in input number
+  onKeydown(e) {
+    if(!((e.keyCode > 95 && e.keyCode < 106)
+      || (e.keyCode > 47 && e.keyCode < 58) 
+      || e.keyCode == 8)) {
+        return false;
+    }
+}
+
    writeHijri(date, lang, type) {
     
     lang = lang || 'en';

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

@@ -25,6 +25,7 @@ export class AllRequestsComponent implements OnInit {
 
 
   ngOnInit() {
+
     this.spinner.show();
 
 
@@ -55,7 +56,8 @@ export class AllRequestsComponent implements OnInit {
       (error) => {
         console.log(error);
       }
-    )
+    );
+    
   }
 
   onEdit(requestData) {