diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html index 43e2b6a27..46efa23f7 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html @@ -207,12 +207,12 @@ - + - + + - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html index 907f84964..afaceb53b 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html @@ -276,7 +276,7 @@ add @@ -299,7 +299,7 @@ add @@ -364,7 +364,7 @@ add @@ -387,7 +387,7 @@ add @@ -452,7 +452,7 @@ add @@ -475,7 +475,7 @@ add @@ -540,7 +540,7 @@ add @@ -563,7 +563,7 @@ add diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html index f1a738b42..aea09fcdc 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html @@ -200,4 +200,10 @@ - \ No newline at end of file + + +
+
{{ errorMessage }}
+
+ \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts index 67ec1a524..1da10a7a3 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts @@ -101,6 +101,7 @@ export class ClientInfoComponent implements OnInit { }; noRecordsFound: Boolean = false; + errorMessage: any = ''; ngOnInit() { this.pdTrigerService.getTypeofActivityForSuppliedInfoForm(this.pdid).subscribe(data => { @@ -135,10 +136,12 @@ export class ClientInfoComponent implements OnInit { }else { this.notifier.notify('warning', 'No Category Records Found.!'); this.noRecordsFound = false; + this.errorMessage = data.msg; } }, err => { this.notifier.notify('warning', 'No Category Records Found.!'); this.noRecordsFound = false; + this.errorMessage = 'No Records Found , Something went Wrong!'; }) // this.getM_FreqOfPurchase(); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html index f632b397b..56803b3fd 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html @@ -269,181 +269,277 @@ + - - \ No newline at end of file + +--> diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts index 4187be04d..5f32b8ba6 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts @@ -256,3 +256,352 @@ export class FamilyDetailsComponent implements OnInit { } + + + + + + +// =================== other family details multiple add + +// import { +// Component, +// OnInit, +// Inject, +// Input, Output +// } from '@angular/core'; + +// import { +// FormBuilder, +// FormGroup, +// Validators, +// FormArray, FormControl, AbstractControl, +// } from '@angular/forms'; + +// import { NotifierService } from 'angular-notifier'; + +// import { +// MatDialog, +// MatDialogRef, +// MAT_DIALOG_DATA +// } from '@angular/material'; +// /** Service */ +// import { PdTrigerService } from '../../../../../pd-service/pd-triger.service'; +// import {ActivatedRoute, Router} from "@angular/router"; + +// @Component({ +// selector: 'app-family-details', +// templateUrl: './family-details.component.html', +// styleUrls: ['./family-details.component.scss'] +// }) +// export class FamilyDetailsComponent implements OnInit { +// //@Input() pdid: number; +// pageTitle: string ="Other Family Details"; +// pdid : string; +// form_id : number; + +// private notifier: NotifierService; +// public familyForm: FormGroup; +// public selectPerson; +// // selectPerson = [{ +// // name : 'person 1', +// // id : 111 +// // }, { +// // name : 'person 2', +// // id : 222 +// // }]; + +// earningStatus = [{ +// type: 'Earning', +// id: 1 +// }, { +// type: 'Non Earning', +// id: 2 +// }] + +// relationData: any = []; +// occupationData: any = []; +// //personMetData: any = []; +// ownerShipData: any = []; +// customerSegData: any = []; +// // earnMemberArrCount :any ; +// // nonEarnMemberArrCount :any ; +// count : number; +// constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute, +// private router: Router, +// private _pd: PdTrigerService, +// @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { +// console.log(pd_all_details); +// this.selectPerson = this.pd_all_details.pdapplicants_detials; +// this.pdid = this.pd_all_details.pdmaster_details.pd_id; +// this.form_id = 6; +// this.notifier = notifier; +// } +// ngOnInit() { +// this.getMasterDetails('RELATIONSHIPS',1); +// this.getMasterDetails('OCCUPATIONMEMBERS',2); +// //this.getMasterDetails('PERSONSMET',3); +// this.getMasterDetails('RESIDENCEOWNERSHIP',4); +// this.getMasterDetails('CUSTOMERSEGMENT',5); +// this.initFamilyFormDetails(); +// let params: any = {}; +// params.pd_id = this.pdid; +// params.pd_form_id = '6'; +// this._pd.retriveForm(params).subscribe(data => { +// const control = this.familyForm.controls['nonEarningMembers']; +// const value = this.familyForm.controls['earningMembers']; +// if (data.status == 200) { +// this.initFamilyForm(data.records); +// // this.familyForm.controls.selected_person.setValue(data.records.selected_person); +// // this.familyForm.controls.residence_place.setValue(data.records.residence_place); +// // this.familyForm.controls.residence_city.setValue(data.records.residence_city); +// // this.familyForm.controls.residence_state.setValue(data.records.residence_state); +// // this.familyForm.controls.residence_pin.setValue(data.records.residence_pin); +// // this.familyForm.controls.residence_No_of_years.setValue(data.records.residence_No_of_years); +// // this.familyForm.controls.residence_ownership.setValue(data.records.residence_ownership); +// // this.familyForm.controls.ownershipOther.setValue(data.records.ownershipOther); +// // this.familyForm.controls.rent.setValue(data.records.rent); +// // this.familyForm.controls.total_number_of_family_members.setValue(data.records.total_number_of_family_members); +// // this.familyForm.controls.family_details_form_remark.setValue(data.records.family_details_form_remark); +// // this.generateFamilyMembersDetailsGetData(data.records.family_members_details); +// } else { +// // value.push(this.createMembers()); +// // control.push(this.createNonMembers()); +// } +// }); +// } + +// initgenerateFamilyMembersDetailsGet(val): FormGroup { +// return this.fb.group({ +// family_member_name : [val.family_member_name, Validators.compose([])], +// family_member_relationship : [val.family_member_relationship, Validators.compose([])], +// family_member_age : [val.family_member_age, Validators.compose([])], +// family_member_earning_status : [val.family_member_earning_status, Validators.compose([])], +// earning_segment: [val.earning_segment, Validators.compose([])], +// earning_gross_income_per_month: [val.earning_gross_income_per_month, Validators.compose([])], +// earning_name_of_the_employer_or_business: [val.earning_name_of_the_employer_or_business, Validators.compose([])], +// earning_number_of_years_in_employment_or_business: [val.earning_number_of_years_in_employment_or_business, Validators.compose([])], +// non_earning_occupation: [val.non_earning_occupation, Validators.compose([])], +// non_earning_if_others: [val.non_earning_if_others, Validators.compose([])], +// non_earning_if_retired_from: [val.non_earning_if_retired_from, Validators.compose([])], +// }) +// } + +// generateFamilyMembersDetailsGetData(data) { +// var result = Object.keys(data).map(function (key) { +// return data[key]; +// }); +// if (result.length > 0) { +// for (let val of result) { +// const control = this.familyForm.controls['family_members_details']; +// control.push(this.initgenerateFamilyMembersDetailsGet(val)); +// } +// } +// } + +// onSearchChange(e):void { +// e.preventDefault(); +// } +// public initFamilyFormDetails(): void { +// this.familyForm = this.fb.group({ +// family_details: this.fb.array([]), +// family_details_form_remark: [''] +// }) +// } + +// public noRecordsFound: Boolean = false; + +// public initFamilyForm(records): void { +// // let data = [...records]; +// let recordss = { +// "selected_person":"95", +// "residence_place":"check ", +// "residence_city":"check ", +// "residence_state":"check ", +// "residence_pin":"123456", +// "residence_No_of_years":"2", +// "residence_ownership":"1", +// "ownershipOther":"", +// "rent":"", +// "total_number_of_family_members":"2", +// "family_members_details":{ +// "1":{ +// "family_member_name":"name", +// "family_member_relationship":"1", +// "family_member_age":"21", +// "family_member_earning_status":"1", +// "earning_segment":"1", +// "earning_gross_income_per_month":"12000", +// "earning_name_of_the_employer_or_business":"check", +// "earning_number_of_years_in_employment_or_business":"2", +// "non_earning_occupation":"", +// "non_earning_if_others":"", +// "non_earning_if_retired_from":"" +// }, +// "2":{ +// "family_member_name":"chekc ", +// "family_member_relationship":"2", +// "family_member_age":"31", +// "family_member_earning_status":"2", +// "earning_segment":"", +// "earning_gross_income_per_month":"", +// "earning_name_of_the_employer_or_business":"", +// "earning_number_of_years_in_employment_or_business":"", +// "non_earning_occupation":"9", +// "non_earning_if_others":"others check ", +// "non_earning_if_retired_from":"" +// } +// }, +// "family_details_form_remark":"check remark" +// }; +// if(recordss === null) { +// this.fb.group({ +// selected_person: ['', Validators.compose([Validators.required])], +// residence_place: ['', Validators.compose([])], +// residence_city: ['', Validators.compose([])], +// residence_state: ['', Validators.compose([])], +// residence_pin: ['', Validators.compose([])], +// residence_No_of_years: ['', Validators.compose([])], +// residence_ownership: ['', Validators.compose([])], +// ownershipOther: [''], +// rent: [''], +// total_number_of_family_members: ['', Validators.compose([Validators.min(1), Validators.max(20)])], +// family_members_details: this.fb.array([this.addFamilyMemberDetails()]), +// }); +// } else { +// let formData: FormGroup = this.fb.group({ +// selected_person: ['1', Validators.compose([Validators.required])], +// residence_place: ['as', Validators.compose([])], +// residence_city: ['as', Validators.compose([])], +// residence_state: ['sa', Validators.compose([])], +// residence_pin: ['sa', Validators.compose([])], +// residence_No_of_years: ['sa', Validators.compose([])], +// residence_ownership: ['s', Validators.compose([])], +// ownershipOther: ['s'], +// rent: ['as'], +// total_number_of_family_members: ['1', Validators.compose([Validators.min(1), Validators.max(20)])], +// family_members_details: this.fb.array([]), +// }); + +// const control = this.familyForm.controls['family_details']; +// control.push(formData); +// console.log(this.familyForm.value); +// } +// this.noRecordsFound = true; +// } + +// addFamilyMemberDetails(): void { + +// } + +// addMoreApplicantFamilyDetails(e): void { +// e.stopPropagation(); +// this.initFamilyForm('chck'); +// } + +// getNumberOfFamilyMemberDetails(inx){ +// // alert(inx); +// let formData = this.familyForm.controls['family_details']['controls'][inx].controls; +// // alert(formData['total_number_of_family_members'].value); +// // alert(this.familyForm.controls.total_number_of_family_members.valid); +// if(formData['total_number_of_family_members'].valid){ +// let totalMem = formData['total_number_of_family_members'].value; +// const control = this.familyForm.controls['family_details']['controls'][inx].controls.family_members_details; +// if(totalMem > control.length) { +// let len = totalMem - control.length; +// for(let i = 0; i < len; i++){ +// control.push(this.generateFamilyMembersDetailsGet()); +// } +// } else if (totalMem < control.length) { +// // control.controls.slice(0, totalMem); +// control.controls = []; +// for(let i = 0; i < totalMem; i++){ +// control.push(this.generateFamilyMembersDetailsGet()); +// } +// } +// } else { + +// } +// } + +// generateFamilyMembersDetailsGet(): FormGroup { +// return this.fb.group({ +// family_member_name : ['', Validators.compose([])], +// family_member_relationship : ['', Validators.compose([])], +// family_member_age : ['', Validators.compose([])], +// family_member_earning_status : ['', Validators.compose([])], +// earning_segment: ['', Validators.compose([])], +// earning_gross_income_per_month: ['', Validators.compose([])], +// earning_name_of_the_employer_or_business: ['', Validators.compose([])], +// earning_number_of_years_in_employment_or_business: ['', Validators.compose([])], +// non_earning_occupation: ['', Validators.compose([])], +// non_earning_if_others: ['', Validators.compose([])], +// non_earning_if_retired_from: ['', Validators.compose([])], +// }) +// } + +// // get all master details +// getMasterDetails(table:string,type:number){ +// this._pd.getAllMasterDatas(table).subscribe( +// data => { +// if (data.status == 200) { +// if(type==1){ +// this.relationData=data.records.filter(item => item.isactive == 1); +// } +// else if(type==2){ +// this.occupationData=data.records.filter(item => item.isactive == 1); +// } +// // else if(type==3){ +// // this.personMetData=data.records.filter(item => item.isactive == 1); +// // } +// else if(type==4){ +// this.ownerShipData=data.records.filter(item => item.isactive == 1); +// } +// else if(type==5){ +// this.customerSegData=data.records.filter(item => item.isactive == 1); +// } + +// } +// }); +// } + +// submitFamily() { +// if (!this.familyForm.valid) { +// return; +// } +// var records = this.familyForm.value; +// //To Remove The "Null" With Key also +// Object.keys(records).forEach((key) => (records[key] == null) && delete records[key]); +// // records.other_family_details = answerFormValues; +// records.pdid = this.pdid; +// records.formid = '6'; +// // records.fk_createdby = '251'; +// console.log(JSON.stringify(records)); +// this._pd.saveForm(records).subscribe(data => { +// this.notifier.notify('success', 'Saved Successfully.'); +// }, error => { +// this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); +// }); +// } +// // validateAllFormFields(formGroup: FormGroup) { +// // Object.keys(formGroup.controls).forEach(field => { +// // const control = formGroup.get(field); +// // if (control instanceof FormControl) { +// // control.markAsTouched({onlySelf: true}); +// // } else if (control instanceof FormGroup) { +// // this.validateAllFormFields(control); +// // } +// // }); +// // } + +// // /** On Key Press Event For Age */ +// // keyPress(event: any) { +// // const pattern = /[0-9]/; + +// // let inputChar = String.fromCharCode(event.charCode); +// // if (event.keyCode != 8 && !pattern.test(inputChar)) { +// // event.preventDefault(); +// // } +// // } + +// } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html index 495143ec5..25f21ceb7 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html @@ -35,8 +35,9 @@ {{relation.controls.applicant_name.value | titlecase}} + - + @@ -66,7 +67,17 @@ +
+ + +
+ +
+ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts index 6dd11f334..7f18d0981 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts @@ -127,7 +127,7 @@ export class GeneralInfoComponent implements OnInit { return this._fb.group({ pd_co_applicant_id: [elementValue.pd_co_applicant_id], applicant_name: [elementValue.applicant_name], - company_name: [elementValue.company_name], + company_name: [elementValue.company_name,], exist_status:[elementValue.exist_status==1 && elementValue.pd_co_applicant_id > 0 ? true : false] }); } @@ -192,6 +192,18 @@ export class GeneralInfoComponent implements OnInit { } } + // remove other details + removeOthers(index, item: any){ + console.log(item) + if(item.pd_co_applicant_id==0){ + let relationControl = this._generalForm.controls['applicant_relation']; + relationControl.removeAt(index); + // remove related to details + let pos_name=this.fetch_related_details.indexOf(item.applicant_name); + this.fetch_related_details.splice(pos_name, 1); + } + } + // submit form details submitGeneralForm(formData:any) { if (this._generalForm.invalid) { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html index cfa8d8f4b..e8da740ae 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html @@ -46,7 +46,7 @@ @@ -99,7 +99,7 @@ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html index bea4ae748..b43043049 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html @@ -131,4 +131,9 @@ - \ No newline at end of file + +
+
{{ errorMessage }}
+
+ \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts index 0e9ab8f5b..9dad4a868 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts @@ -74,8 +74,8 @@ export class SupplierInfoComponent implements OnInit { }; noRecordsFound: Boolean = false; + errorMessage: any = ''; ngOnInit() { - this.pdTrigerService.getTypeofActivityForSuppliedInfoForm(this.pdid).subscribe(data => { if(data.dataStatus){ // let datas = { @@ -100,10 +100,12 @@ export class SupplierInfoComponent implements OnInit { }else { this.notifier.notify('warning', 'No Category Records Found.!'); this.noRecordsFound = false; + this.errorMessage = data.msg; } }, err => { this.notifier.notify('warning', 'No Category Records Found.!'); this.noRecordsFound = false; + this.errorMessage = 'No Records Found , Something went Wrong!'; }) // this.getM_FreqOfPurchase(); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html index 3c40f3481..7f6e2a2a5 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html @@ -16,13 +16,13 @@
- - + +
{{ (formButton.form_name.length>17)? (formButton.form_name | slice:0:17)+'..':(formButton.form_name) }}
- Q{{formButton.pd_form_order}} + {{quesIndex+1}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.scss index 38778876d..ce04f2137 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.scss @@ -60,7 +60,7 @@ mat-card .child_mat_card > mat-card { transition: box-shadow 0.5s, transform 0.5s; &:hover { cursor: pointer; - background-color: #e00201 !important; + // background-color: #e00201 !important; transform: scale(1); box-shadow: 5px 20px 30px rgba(0, 0, 0, 0.2); } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html index f690e1625..8c26e9ebf 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html @@ -11,7 +11,7 @@
- + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts index bcf27d053..64fd67858 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts @@ -60,16 +60,7 @@ export class ViewPdComponent implements OnInit, OnDestroy { this.route.params.subscribe(params => { this.viewID = params['pdid']; }); - let courrentDateTime: string = this.pipe.transform(new Date(), 'yyyy-MM-dd HH:mm'); - let scheduledDateTime: string="2018-12-03 08:20"; - let diffInMs: number = Date.parse(courrentDateTime) - Date.parse(scheduledDateTime); - let diffInHours: number = Math.floor(diffInMs / 1000 / 60 / 60); - if(diffInHours>=-4){ - this.enableStartPD=true; - } - else { - this.enableStartPD=false; - } + this.viewPdDetails(this.viewID); } @@ -84,6 +75,22 @@ export class ViewPdComponent implements OnInit, OnDestroy { //this.applicantPDLogsData= data.records.pd_logs.master; this.currentPDStatus = data.records.pd_master_details[0].pd_status; this.pdAdditionalReqData = data.records.pd_additional_requirements; + // enable pd start time + if(data.records.pd_master_details[0].scheduled_on_for_validation){ + let courrentDateTime: string = this.pipe.transform(new Date(), 'yyyy-MM-dd HH:mm'); + let scheduledDateTime: string=data.records.pd_master_details[0].scheduled_on_for_validation; + let diffInMs: number = Date.parse(courrentDateTime) - Date.parse(scheduledDateTime); + let diffInHours: number = Math.floor(diffInMs / 1000 / 60 / 60); + if(diffInHours>=-4){ + this.enableStartPD=true; + } + else { + this.enableStartPD=false; + } + } + else { + this.enableStartPD=false; + } } }, error => this.errorMessage = error); } diff --git a/ng6-seed/src/app/settings/service/entity/entity.service.ts b/ng6-seed/src/app/settings/service/entity/entity.service.ts index ffd8d6557..3adb41f8b 100755 --- a/ng6-seed/src/app/settings/service/entity/entity.service.ts +++ b/ng6-seed/src/app/settings/service/entity/entity.service.ts @@ -5,6 +5,10 @@ import { catchError } from 'rxjs/operators'; import { of } from 'rxjs'; import 'rxjs/add/operator/map'; + +/** Environment */ +import { environment } from 'environments/environment'; + /** Imported Service Files Are., */ import { AwsService } from '../../../AwsService/aws.service'; @@ -24,7 +28,10 @@ const currentdate = new Date().toJSON().slice(0, 19).replace('T', ' '); * Kdk */ export class EntityService { +<<<<<<< HEAD +======= +>>>>>>> e945a07cbf0d2c99e43afcb965007c5dde7684fe private apiUrl = environment.apiEndpoint; private serviceUrl = 'https://jsonplaceholder.typicode.com/users';