From 03d01cdb49ce343ebda6c3cf0c774160ab4da992 Mon Sep 17 00:00:00 2001 From: ganga satish kumar Date: Fri, 11 Feb 2022 16:45:27 +0530 Subject: [PATCH] add initial loading --- .../generate-letter.component.ts | 51 ++++++++++-- .../schedule-appointment.component.ts | 82 +++++++++++++------ src/app/shared/helpers/token.interceptor.ts | 3 + 3 files changed, 102 insertions(+), 34 deletions(-) diff --git a/src/app/annual-health-checkup/generate-letter/generate-letter.component.ts b/src/app/annual-health-checkup/generate-letter/generate-letter.component.ts index 4fb3b88a..235b0b3e 100644 --- a/src/app/annual-health-checkup/generate-letter/generate-letter.component.ts +++ b/src/app/annual-health-checkup/generate-letter/generate-letter.component.ts @@ -32,6 +32,16 @@ export class GenerateLetterComponent implements OnInit { downloadPDFlevel3: boolean = false; downloadPDFlevel0: boolean = false; isDisabled: boolean = true; + userDetails:any = { + employeeId:null, + employeeName:null, + designation:null, + department:null, + level:null, + location:null, + date:null, + gender:null + }; constructor( private formBuilder: FormBuilder, @@ -64,10 +74,11 @@ export class GenerateLetterComponent implements OnInit { .subscribe( (res: { StatusCode: number; IsRequestSuccessfull: any; Data: any }) => { if (res && res?.StatusCode === 200 && res?.IsRequestSuccessfull) { - response = res && res?.Data ? res.Data : null; + this.userDetails = res && res?.Data ? res.Data : null; } } ); + this.initiateControls(); } /** @@ -76,15 +87,37 @@ export class GenerateLetterComponent implements OnInit { */ createNewForm(): void { this.generateLetterForm = this.formBuilder.group({ - employeeId: [{ value: "1234", disabled: true }], - employeeName: [{ value: "Satish Ganga", disabled: true }], - designation: [{ value: "developer", disabled: true }], - department: [{ value: "MIS", disabled: true }], - level: [{ value: "L3", disabled: true }], - location: [{ value: "Akrudi", disabled: true }], - date: [{ value: "22/02/2022", disabled: true }], - gender: [{ value: "Male", disabled: true }], + employeeId: [{ value: '', disabled: true }], + employeeName: [{ value: '', disabled: true }], + designation: [{ value: '', disabled: true }], + department: [{ value: '', disabled: true }], + level: [{ value: '', disabled: true }], + location: [{ value: '', disabled: true }], + date: [{ value: '', disabled: true }], + gender: [{ value: '', disabled: true }], }); + + } + + initiateControls(){ + this.userDetails.employeeId = this.userDetails && this.userDetails?.employeeId?this.userDetails?.employeeId:"12345"; + this.userDetails.employeeName = this.userDetails && this.userDetails?.employeeName?this.userDetails?.employeeName:"Bajaj" + this.userDetails.designation = this.userDetails &&this.userDetails?.designation?this.userDetails?.designation:"developer" + this.userDetails.department = this.userDetails && this.userDetails?.department?this.userDetails?.department:"MIS" + this.userDetails.level = this.userDetails && this.userDetails?.level?this.userDetails?.level:"L3" + this.userDetails.location = this.userDetails && this.userDetails?.location?this.userDetails?.location:"Akrudi" + this.userDetails.date = this.userDetails &&this.userDetails?.date?this.userDetails?.date:"22/02/2022" + this.userDetails.gender = this.userDetails && this.userDetails?.gender?this.userDetails?.gender:"Male" + + this.generateLetterForm.get('employeeId')?.setValue(this.userDetails?.employeeId); + this.generateLetterForm.get('employeeName')?.setValue(this.userDetails?.employeeName); + this.generateLetterForm.get('designation')?.setValue(this.userDetails?.designation); + this.generateLetterForm.get('department')?.setValue(this.userDetails?.department); + this.generateLetterForm.get('level')?.setValue(this.userDetails?.level); + this.generateLetterForm.get('location')?.setValue(this.userDetails?.location); + this.generateLetterForm.get('date')?.setValue(this.userDetails?.date); + this.generateLetterForm.get('gender')?.setValue(this.userDetails?.gender); + this.title = this.generateLetterForm?.get("employeeName")?.value; this.location = this.generateLetterForm?.get("location")?.value; this.letterDate = this.generateLetterForm?.get("date")?.value; diff --git a/src/app/annual-health-checkup/schedule-appointment/schedule-appointment.component.ts b/src/app/annual-health-checkup/schedule-appointment/schedule-appointment.component.ts index cf8d9833..f1705f41 100644 --- a/src/app/annual-health-checkup/schedule-appointment/schedule-appointment.component.ts +++ b/src/app/annual-health-checkup/schedule-appointment/schedule-appointment.component.ts @@ -39,12 +39,24 @@ export class ScheduleAppointmentComponent implements OnInit { @ViewChild("scheduleAppointmentPDF") scheduleAppointmentPDF!: ElementRef; - constructor(private formBuilder: FormBuilder, private router: Router, private scheduleAppointmentService:ScheduleAppointmentService) {} + userDetails:any = { + employeeId:null, + employeeName:null, + designation:null, + department:null, + level:null, + location:null, + date:null, + gender:null + }; + + constructor(private formBuilder: FormBuilder, private router: Router, private scheduleAppointmentService:ScheduleAppointmentService) { + this.createNewForm(); + } ngOnInit(): void { this.downloadPDF = false; - this.getUserDetails() - this.createNewForm(); + this.getUserDetails(); this.initiateForm(); } @@ -63,12 +75,33 @@ export class ScheduleAppointmentComponent implements OnInit { this.todayDate.setDate(this.todayDate.getDate() + 1); } + /** + * @description to create the new form on the initialization of the component. + * @returns Void(); + */ + createNewForm(): void { + this.scheduleAppointmentForm = this.formBuilder.group({ + employeeId: [{ value: '', disabled: true }, Validators.required], + employeeName: [{ value: '', disabled: true }, Validators.required], + level: [{ value: '', disabled: true }, Validators.required], + designation: [ + { value: '', disabled: true }, + Validators.required, + ], + department: [{ value: '', disabled: true }], + location: [{ value: '', disabled: true }], + eligiblePackage: [{ value: "eligiblePackage", disabled: true }], + preferredDate: ["", Validators.required], + contactNumber: ["9730370631", Validators.required], + gender: ["Male"], + }); + } + /** * @description to create the user details. * @returns Void(); */ getUserDetails() { - let response; const body = { userId: "E114989", password: "init1234", @@ -79,32 +112,31 @@ export class ScheduleAppointmentComponent implements OnInit { .subscribe( (res: { StatusCode: number; IsRequestSuccessfull: any; Data: any }) => { if (res && res?.StatusCode === 200 && res?.IsRequestSuccessfull) { - response = res && res?.Data ? res.Data : null; + this.userDetails = res && res?.Data ? res.Data : null; } } ); + this.initiateControls(); } - /** - * @description to create the new form on the initialization of the component. - * @returns Void(); - */ - createNewForm(): void { - this.scheduleAppointmentForm = this.formBuilder.group({ - employeeId: [{ value: "1234", disabled: true }, Validators.required], - employeeName: [{ value: "bajaj", disabled: true }, Validators.required], - level: [{ value: "L3", disabled: true }, Validators.required], - designation: [ - { value: "developer", disabled: true }, - Validators.required, - ], - department: [{ value: "MIS", disabled: true }], - location: [{ value: "Akrudi", disabled: true }], - eligiblePackage: [{ value: "eligiblePackage", disabled: true }], - preferredDate: ["", Validators.required], - contactNumber: ["9730370631", Validators.required], - gender: ["Male"], - }); + initiateControls(){ + this.userDetails.employeeId = this.userDetails && this.userDetails?.employeeId?this.userDetails?.employeeId:"12345"; + this.userDetails.employeeName = this.userDetails && this.userDetails?.employeeName?this.userDetails?.employeeName:"Bajaj"; + this.userDetails.level = this.userDetails && this.userDetails?.level?this.userDetails?.level:"L3"; + this.userDetails.designation = this.userDetails &&this.userDetails?.designation?this.userDetails?.designation:"developer"; + this.userDetails.department = this.userDetails && this.userDetails?.department?this.userDetails?.department:"MIS"; + this.userDetails.location = this.userDetails && this.userDetails?.location?this.userDetails?.location:"Akrudi"; + this.userDetails.date = this.userDetails &&this.userDetails?.date?this.userDetails?.date:"22/02/2022"; + this.userDetails.gender = this.userDetails && this.userDetails?.gender?this.userDetails?.gender:"Male"; + + this.scheduleAppointmentForm.get('employeeId')?.setValue(this.userDetails?.employeeId); + this.scheduleAppointmentForm.get('employeeName')?.setValue(this.userDetails?.employeeName); + this.scheduleAppointmentForm.get('designation')?.setValue(this.userDetails?.designation); + this.scheduleAppointmentForm.get('department')?.setValue(this.userDetails?.department); + this.scheduleAppointmentForm.get('level')?.setValue(this.userDetails?.level); + this.scheduleAppointmentForm.get('location')?.setValue(this.userDetails?.location); + this.scheduleAppointmentForm.get('preferredDate')?.setValue(this.userDetails?.date); + this.scheduleAppointmentForm.get('gender')?.setValue(this.userDetails?.gender); } scheduleAppointmentSubmitForm() { diff --git a/src/app/shared/helpers/token.interceptor.ts b/src/app/shared/helpers/token.interceptor.ts index ba4dd9ae..757f46e5 100644 --- a/src/app/shared/helpers/token.interceptor.ts +++ b/src/app/shared/helpers/token.interceptor.ts @@ -33,6 +33,9 @@ export class TokenInterceptor implements HttpInterceptor { // Subscription: subscription, // ClientId: clientId, // ClientSecret: clientSecret + 'Access-Control-Allow-Headers':'Content-Type', + 'Access-Control-Allow-Methods':'GET', + 'Access-Control-Allow-Origin':'*' } }); return next