From 07ce3a14d5914c564c91ed4233a956085a2161b0 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Thu, 6 Dec 2018 11:29:20 +0530 Subject: [PATCH] Build Issues : ps --- .../list-pd/add-pd/add-pd.component.html | 2 +- .../list-pd/add-pd/add-pd.component.ts | 2 +- .../edit-pd-applicant.component.html | 2 +- .../personal-info.component.html | 135 ++++++++++---- .../personal-info/personal-info.component.ts | 38 +++- .../manage-pd/manage-pd.module.ts | 174 +++++++++++------- .../qc-list/qc-start/qc-start.component.html | 65 ------- 7 files changed, 249 insertions(+), 169 deletions(-) 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 a2701b740..e61829172 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 @@ -43,7 +43,7 @@ Contact Person Required - + Contact Number Required Enter Valid Mobile Number. diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts index e858b0690..e4d9618eb 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts @@ -77,7 +77,7 @@ export class AddPdComponent implements OnInit, OnDestroy { fk_customer_segment: [null], loan_amount: [null,Validators.compose([Validators.pattern('^[0-9]*$')])], applicant_name: [null], - mobile_no: [null,Validators.compose([Validators.minLength(10),Validators.maxLength(10),Validators.required])], + mobile_no: [null,Validators.compose([Validators.minLength(10),Validators.maxLength(10)])], landline : [null,Validators.compose([Validators.minLength(12),Validators.maxLength(13)])], email: [null],   addressline1: [null], diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html index 4980cad00..2b9401a40 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html @@ -25,7 +25,7 @@
- + Mobile number is required. Enter Valid Mobile Number. diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html index a71ce6ed1..1ab208e18 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html @@ -24,36 +24,74 @@
- + - - - + + + + + Individual + Non-Individual + + + + + Enter Valid Age. - - - - - - - - - {{earning.earning_member_status}} + + + + + + + {{NE.non_individual_entity_name}} - - + + + + + + + + + + + + {{earning.earning_member_status}} + + + + + + + + Enter Valid Vintage. + + + + + + + + {{education.qualification_name}} - + - + + + + +
@@ -71,40 +109,68 @@ - + - + + + + + + + Individual + Non-Individual + + + Enter Valid Age. - - - - + + + + + {{NE.non_individual_entity_name}} + + + - + + + + + + {{earning.earning_member_status}} - - + + + + + Enter Valid Vintage. + + + + - {{education.qualification_name}} - - - + + + + + + @@ -113,12 +179,13 @@ {{rel.name}} - - - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts index ca6d166ea..5ee16791d 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts @@ -20,6 +20,7 @@ export class PersonalInfoComponent implements OnInit { earningStatus:any=[]; qualifications:any=[]; relationShipList:any=[]; + nonindividualentities: any = []; // @Input() pdid : string; // @Input() pd_all_details:any; @@ -33,17 +34,25 @@ export class PersonalInfoComponent implements OnInit { public const_main_applicant : any = { "name_ans": '', "age_ans":'', + "vintage_ans":'', + "non_individual_entity_ans":'', + "other_non_individual_entity_ans":'', "earning_ans": '', "entity_ans": '', "qualification_ans": '', + "edu_level_ans":'', "current_added_status":1 }; public const_co_applicant : any = { "name_ans": '', "age_ans":'', + "vintage_ans":'', + "non_individual_entity_ans":'', + "other_non_individual_entity_ans":'', "earning_ans": '', "entity_ans": '', "qualification_ans": '', + "edu_level_ans":'', "relation_ans": '', "current_added_status":1 }; @@ -64,6 +73,7 @@ export class PersonalInfoComponent implements OnInit { this.getMasterDetails('RELATIONSHIPS',1); this.getMasterDetails('EARNINGMEMBERSSTATUS',2); this.getMasterDetails('EDUQUALIFICATION',3); + this.getMasterDetails('NONINDIVIDUALENTITIES',4); this.mainApplicantDetails = this.pd_all_details.pdapplicants_detials.filter(item => item.applicant_type == 1); // console.log(this.mainApplicantDetails) this.coApplicantDetails = this.pd_all_details.pdapplicants_detials.filter(item => item.applicant_type == 0); @@ -149,8 +159,10 @@ export class PersonalInfoComponent implements OnInit { else if(type==3){ this.qualifications=data.records.filter(item => item.isactive == 1); } + else if(type==4){ + this.nonindividualentities=data.records.filter(item => item.isactive == 1); + } - } }, error => this.errorMessage = error); } @@ -195,9 +207,13 @@ loadMainApplicant(applicant:any) { return this._fb.group({ name_ans: [applicant.name_ans, Validators.required], age_ans: [applicant.age_ans, Validators.compose([Validators.required,Validators.minLength(1),Validators.maxLength(3),Validators.required,Validators.pattern('^[0-9]*$')])], + vintage_ans: [applicant.vintage_ans, Validators.compose([Validators.required,Validators.minLength(1),Validators.maxLength(3),Validators.required,Validators.pattern('^[0-9]*$')])], + non_individual_entity_ans: [applicant.non_individual_entity_ans], + other_non_individual_entity_ans:[applicant.other_non_individual_entity_ans], entity_ans: [applicant.entity_ans, Validators.required], qualification_ans: [applicant.qualification_ans, Validators.required], earning_ans: [applicant.earning_ans, Validators.required], + edu_level_ans: [applicant.edu_level_ans], current_added_status: [applicant.current_added_status], }); @@ -209,8 +225,12 @@ loadCoApplicant(applicant:any) { age_ans: [applicant.age_ans, Validators.compose([Validators.required,Validators.minLength(1),Validators.maxLength(3),Validators.required,Validators.pattern('^[0-9]*$')])], entity_ans: [applicant.entity_ans, Validators.required], qualification_ans: [applicant.qualification_ans, Validators.required], + vintage_ans: [applicant.vintage_ans, Validators.compose([Validators.required,Validators.minLength(1),Validators.maxLength(3),Validators.required,Validators.pattern('^[0-9]*$')])], + non_individual_entity_ans: [applicant.non_individual_entity_ans], + other_non_individual_entity_ans:[applicant.other_non_individual_entity_ans], earning_ans: [applicant.earning_ans, Validators.required], relation_ans: [applicant.relation_ans, Validators.required], + edu_level_ans: [applicant.edu_level_ans], current_added_status: [applicant.current_added_status], }); @@ -220,9 +240,13 @@ loadDefaultMainApplicant(applicant:any){ return this._fb.group({ name_ans: [applicant.applicant_name, Validators.required], age_ans: ['', Validators.compose([Validators.required,Validators.minLength(1),Validators.maxLength(3),Validators.required,Validators.pattern('^[0-9]*$')])], + vintage_ans:['', Validators.compose([Validators.required,Validators.minLength(1),Validators.maxLength(3),Validators.required,Validators.pattern('^[0-9]*$')])], + non_individual_entity_ans:[''], + other_non_individual_entity_ans:[''], entity_ans: [this.pd_all_details.pdmaster_details.customer_segment_abbr.substring(0,3).toUpperCase()==='SAL' ? 'Individual' : '', Validators.required], qualification_ans: ['', Validators.required], earning_ans: ['', Validators.required], + edu_level_ans:[''], current_added_status: [applicant.current_added_status], }); } @@ -232,7 +256,11 @@ loadDefaultMainApplicant(applicant:any){ return this._fb.group({ name_ans: [applicant.applicant_name, Validators.required], age_ans: ['', Validators.compose([Validators.required,Validators.minLength(1),Validators.maxLength(3),Validators.required,Validators.pattern('^[0-9]*$')])], + vintage_ans:['', Validators.compose([Validators.required,Validators.minLength(1),Validators.maxLength(3),Validators.required,Validators.pattern('^[0-9]*$')])], + non_individual_entity_ans:[''], + other_non_individual_entity_ans:[''], entity_ans: [this.pd_all_details.pdmaster_details.customer_segment_abbr.substring(0,3).toUpperCase()==='SAL' ? 'Individual' : '', Validators.required], + edu_level_ans:[''], qualification_ans: ['', Validators.required], earning_ans: ['', Validators.required], relation_ans: ['', Validators.required], @@ -257,8 +285,12 @@ submitPersonalForm(formData:any) { main_applicantDetails.push({ "name_ans":element.name_ans, "age_ans":element.age_ans, + "vintage_ans":element.vintage_ans, + "non_individual_entity_ans":element.non_individual_entity_ans, + "other_non_individual_entity_ans":element.other_non_individual_entity_ans, "entity_ans":element.entity_ans, "qualification_ans":element.qualification_ans, + "edu_level_ans":element.edu_level_ans, "earning_ans":element.earning_ans, }) } @@ -271,6 +303,10 @@ submitPersonalForm(formData:any) { "qualification_ans":Coelement.qualification_ans, "entity_ans":Coelement.entity_ans, "earning_ans":Coelement.earning_ans, + "vintage_ans":Coelement.vintage_ans, + "non_individual_entity_ans":Coelement.non_individual_entity_ans, + "other_non_individual_entity_ans":Coelement.other_non_individual_entity_ans, + "edu_level_ans":Coelement.edu_level_ans, "relation_ans":Coelement.relation_ans, }) // get new co applicant list for applicant table diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts index 7d45fdff0..345c1d13e 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts @@ -1,5 +1,6 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; + import { MatCardModule, MatIconModule, @@ -7,10 +8,12 @@ import { MatRadioModule, MatButtonModule, MatTableModule, MatPaginatorModule, MatProgressBarModule, MatDialogModule, MatSortModule, - MatToolbarModule, MatSelectModule, MatListModule, MatGridListModule, MatTabsModule, MatCheckboxModule, - MatBadgeModule, MatExpansionModule, MatStepperModule, MatSidenavModule, MatMenuModule, MatButtonToggleModule, - MatAutocompleteModule, MatDatepickerModule -} from '@angular/material'; + MatToolbarModule, MatSelectModule, MatListModule, MatGridListModule, + MatTabsModule, MatCheckboxModule, + MatBadgeModule, MatExpansionModule, MatStepperModule, MatSidenavModule, + MatMenuModule, MatButtonToggleModule, + MatAutocompleteModule, MatDatepickerModule } from '@angular/material'; + import {MatSlideToggleModule} from '@angular/material/slide-toggle'; import {FormsModule, ReactiveFormsModule} from '@angular/forms'; import {FileUploadModule} from 'ng2-file-upload/ng2-file-upload'; @@ -114,69 +117,108 @@ const pdCustomNotifierOptions: NotifierOptions = { }; @NgModule({ - // imports: [ - // CommonModule, - // ManagePdRoutingModule, - // NotifierModule.withConfig(pdCustomNotifierOptions), - // MatCardModule, - // MatIconModule, - // MatInputModule, - // MatRadioModule, - // MatTableModule, - // MatPaginatorModule, - // MatButtonModule, - // MatProgressBarModule, - // MatAutocompleteModule, - // MatToolbarModule, - // FlexLayoutModule, - // NgxDatatableModule, - // FormsModule, - // MatSlideToggleModule, - // MatSelectModule, MatListModule, MatGridListModule, MatTabsModule, MatBadgeModule, MatCheckboxModule, MatStepperModule, MatSidenavModule, MatMenuModule, MatButtonToggleModule, - // ReactiveFormsModule, - // FileUploadModule, - // TreeModule, - // MatDialogModule, MatSortModule, - // NgxMatSelectSearchModule, MatTooltipModule, MatExpansionModule, - // AgmCoreModule.forRoot({apiKey: 'AIzaSyBtdO5k6CRntAMJCF-H5uZjTCoSGX95cdk'}), OwlDateTimeModule, - // OwlNativeDateTimeModule, - // ], - declarations: [RentalInfoComponent, TelePdAllocationComponent, FinancialInfoComponent, BusinessInfoComponent, EmploymentInfoComponent, StockComponent, BankingDetailsComponent, ListPdComponent, FamilyDetailsComponent, AddressComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent, PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, InprogressPdComponent, AllPdComponent, ScheduledPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, CurrentLoanComponent, AssetsInfoComponent, LoanDetailsComponent, OtherIncomeComponent, SupplierInfoComponent, PersonalInfoComponent, LenderRepresentativeComponent, PdReportComponent, AssessedIncomeComponent, AllocationViewMoreComponent], + imports: [ + CommonModule, + ManagePdRoutingModule, + NotifierModule.withConfig(pdCustomNotifierOptions), + MatCardModule, + MatIconModule, + MatInputModule, + MatRadioModule, + MatTableModule, + MatPaginatorModule, + MatButtonModule, + MatProgressBarModule, + MatToolbarModule, + FlexLayoutModule, + NgxDatatableModule, + FormsModule,MatSlideToggleModule, + MatSelectModule, MatListModule,MatGridListModule, MatTabsModule, MatBadgeModule, MatCheckboxModule,MatStepperModule,MatSidenavModule ,MatMenuModule, MatButtonToggleModule, + ReactiveFormsModule, + FileUploadModule, + TreeModule, + MatDatepickerModule, + MatDialogModule,MatSortModule, + NgxMatSelectSearchModule,MatTooltipModule, MatExpansionModule, + AgmCoreModule.forRoot({apiKey: 'AIzaSyBtdO5k6CRntAMJCF-H5uZjTCoSGX95cdk'}),OwlDateTimeModule, + OwlNativeDateTimeModule, + ], + declarations: [RentalInfoComponent, + TelePdAllocationComponent, + FinancialInfoComponent, + BusinessInfoComponent, + EmploymentInfoComponent, + StockComponent, + BankingDetailsComponent, + ListPdComponent, + FamilyDetailsComponent, + AddressComponent, + ManagePdComponent, + MapPdViewComponent, + AddPdComponent, + ViewPdComponent, + PdAllocationComponent, + SmartPdAllocationComponent, + SchedulePdComponent, + EditPdApplicantComponent, + EditPdMasterComponent, + StartPdComponent, + InprogressPdComponent, + AllPdComponent, + ScheduledPdComponent, + CompletedPdComponent, + QcCompletedPdComponent, + ClientInfoComponent, + CurrentLoanComponent, + AssetsInfoComponent, + LoanDetailsComponent, + OtherIncomeComponent, + SupplierInfoComponent, + PersonalInfoComponent, + LenderRepresentativeComponent, + PdReportComponent, + AssessedIncomeComponent, + AllocationViewMoreComponent], - // exports: [PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, CompletedPdComponent, QcCompletedPdComponent], - // providers: [PdTrigerService, GetGeometricLocationService], - // entryComponents: [PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent], - imports: [ - CommonModule, - ManagePdRoutingModule, - NotifierModule.withConfig(pdCustomNotifierOptions), - MatCardModule, - MatIconModule, - MatInputModule, - MatRadioModule, - MatTableModule, - MatPaginatorModule, - MatButtonModule, - MatProgressBarModule, - MatToolbarModule, - FlexLayoutModule, - NgxDatatableModule, - FormsModule,MatSlideToggleModule, - MatSelectModule, MatListModule,MatGridListModule, MatTabsModule, MatBadgeModule, MatCheckboxModule,MatStepperModule,MatSidenavModule ,MatMenuModule, MatButtonToggleModule, - ReactiveFormsModule, - FileUploadModule, - TreeModule, - MatDatepickerModule, - MatDialogModule,MatSortModule, - NgxMatSelectSearchModule,MatTooltipModule, MatExpansionModule, - AgmCoreModule.forRoot({apiKey: 'AIzaSyBtdO5k6CRntAMJCF-H5uZjTCoSGX95cdk'}),OwlDateTimeModule, - OwlNativeDateTimeModule, - ], - // declarations: [ListPdComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent, PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, InprogressPdComponent, AllPdComponent, ScheduledPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, SupplierInfoComponent, PersonalInfoComponent, AssetsInfoComponent], - exports: [PdAllocationComponent, SmartPdAllocationComponent, TelePdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, SupplierInfoComponent, PersonalInfoComponent, CurrentLoanComponent, LoanDetailsComponent, OtherIncomeComponent, AssetsInfoComponent, AddressComponent, FamilyDetailsComponent, BankingDetailsComponent, StockComponent, EmploymentInfoComponent, BusinessInfoComponent, FinancialInfoComponent, LenderRepresentativeComponent,RentalInfoComponent, AssessedIncomeComponent, AllocationViewMoreComponent], - providers: [PdTrigerService, GetGeometricLocationService], - entryComponents: [PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, TelePdAllocationComponent, AllocationViewMoreComponent, PersonalInfoComponent, - ClientInfoComponent, SupplierInfoComponent, CurrentLoanComponent, LoanDetailsComponent, OtherIncomeComponent, AssetsInfoComponent, AddressComponent, FamilyDetailsComponent, BankingDetailsComponent, StockComponent, EmploymentInfoComponent, BusinessInfoComponent, FinancialInfoComponent, LenderRepresentativeComponent,RentalInfoComponent, AssessedIncomeComponent], + exports: [PdAllocationComponent, + SmartPdAllocationComponent, + TelePdAllocationComponent, + SchedulePdComponent, + EditPdApplicantComponent, + EditPdMasterComponent, + StartPdComponent, + CompletedPdComponent, + QcCompletedPdComponent, + AllocationViewMoreComponent], + + providers: [PdTrigerService, + GetGeometricLocationService], + + entryComponents: [PdAllocationComponent, + SmartPdAllocationComponent, + SchedulePdComponent, + EditPdApplicantComponent, + EditPdMasterComponent, + TelePdAllocationComponent, + AllocationViewMoreComponent, + + PersonalInfoComponent, + ClientInfoComponent, + SupplierInfoComponent, + CurrentLoanComponent, + LoanDetailsComponent, + OtherIncomeComponent, + AssetsInfoComponent, + AddressComponent, + FamilyDetailsComponent, + BankingDetailsComponent, + StockComponent, + EmploymentInfoComponent, + BusinessInfoComponent, + FinancialInfoComponent, + LenderRepresentativeComponent, + RentalInfoComponent, + AssessedIncomeComponent], }) export class ManagePdModule { } diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.html b/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.html index c5f78c18a..a7fb22324 100755 --- a/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.html +++ b/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.html @@ -374,71 +374,6 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -