Small changes : ps

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html

@@ -41,7 +41,7 @@
                               <mat-form-field style="width: 40%" *ngIf="relation.controls.company_name.value">
                                   <mat-select placeholder="Relation" formControlName="company_relationship">
                                       <mat-option>Select</mat-option>
-                                      <mat-option *ngFor="let comrelShip of relationShipList" [value]="comrelShip.relationship_id">
+                                      <mat-option *ngFor="let comrelShip of companyRelationShipList" [value]="comrelShip.company_relationship_id">
                                       {{comrelShip.name | titlecase}}
                                       </mat-option>
                                   </mat-select>

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts

@@ -17,6 +17,7 @@ export class GeneralInfoComponent implements OnInit {
   public _generalForm: FormGroup;
   public pd_applicants_details: any;
   relationShipList:any=[];
+  companyRelationShipList:any=[];
   errorMessage:any;
   fetch_related_details:any=[];
 
@@ -32,8 +33,7 @@ export class GeneralInfoComponent implements OnInit {
   ngOnInit() {
     this.initFormDetails();
     this.getMasterDetails('RELATIONSHIPS',1);
-    
+    this.getMasterDetails('COMPANYRELATIONSHIPS',2);
-    
   }
 
   // init form
@@ -55,6 +55,9 @@ export class GeneralInfoComponent implements OnInit {
           if(type==1){
             this.relationShipList=data.records.filter(item => item.isactive == 1);
           }
+          if(type==2){
+            this.companyRelationShipList=data.records.filter(item => item.isactive == 1);
+          }
         
         }
   }, error => this.errorMessage = <any> error);
@@ -124,6 +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],
           exist_status:[elementValue.exist_status==1 && elementValue.pd_co_applicant_id > 0 ? true : false]
       });
       }
@@ -141,7 +145,7 @@ export class GeneralInfoComponent implements OnInit {
       }
 
       // checkand un check function
-      checkboxChange(event, index, item) {
+      checkboxChange(event, index, item) {     
         if(item.exist_status.value){
           if(item.pd_co_applicant_id.value==0){
             const dialogRef = this.dialog.open(OtherApplicantDetailsComponent, {
@@ -154,7 +158,7 @@ export class GeneralInfoComponent implements OnInit {
               if(dataresult.data.length>0){
                 let relationControl = <FormArray>this._generalForm.controls['applicant_relation'];
                 dataresult.data.forEach(element => {
-                  let applicant_details: any= {'pd_co_applicant_id':element.pd_co_applicant_id,'applicant_name':element.applicant_name,'applicant_relation_to':'','relation':'','company_name':'','company_relation':'',};
+                  let applicant_details: any= {'pd_co_applicant_id':element.pd_co_applicant_id,'applicant_name':element.applicant_name,'applicant_relation_to':'','relation':'','company_name':element.company_name,'company_relation':''};
                 relationControl.push(this.createApplicantRelation(applicant_details));
                 // push related to details
                 this.fetch_related_details.push(element.applicant_name);
@@ -166,7 +170,7 @@ export class GeneralInfoComponent implements OnInit {
           }
           else{
             let relationControl = <FormArray>this._generalForm.controls['applicant_relation'];
-          let applicant_details: any= {'pd_co_applicant_id':item.pd_co_applicant_id.value,'applicant_name':item.applicant_name.value,'applicant_relation_to':'','relation':'','company_name':'','company_relation':'',};
+          let applicant_details: any= {'pd_co_applicant_id':item.pd_co_applicant_id.value,'applicant_name':item.applicant_name.value,'applicant_relation_to':'','relation':'','company_name':item.company_name.value,'company_relation':''};
           relationControl.push(this.createApplicantRelation(applicant_details));
          // push related to details
           this.fetch_related_details.push(item.applicant_name.value);

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html

@@ -30,7 +30,7 @@
                                             
                                             <mat-form-field style="width: 20%">
                                                     <!-- <input matInput placeholder="Entity" formControlName="entity_ans" type="text" required> -->
-                                                    <mat-select placeholder="Entity" formControlName="entity_ans" required>
+                                                    <mat-select placeholder="Entity" formControlName="entity_ans" required (selectionChange)="selectedEntityChanges($event)">
                                                             <mat-option  value="individual" >Individual</mat-option>
                                                             <mat-option  value="non-individual" >Non-Individual</mat-option>
                                                     </mat-select>     
@@ -118,7 +118,7 @@
                                                         <!-- <mat-label>{{coDetails.controls.pd_question.value}}</mat-label> -->
                           
                                                         <!-- <input matInput placeholder="Entity" formControlName="entity_ans"  type="text" required> -->
-                                                        <mat-select placeholder="Entity" formControlName="entity_ans" required>
+                                                        <mat-select placeholder="Entity" formControlName="entity_ans" required (selectionChange)="selectedCoApplicantEntityChanges($event,c)">
                                                                 <mat-option  value="individual" >Individual</mat-option>
                                                                 <mat-option  value="non-individual" >Non-Individual</mat-option>
                                                         </mat-select>
@@ -155,7 +155,7 @@
                                                     <mat-form-field *ngIf="coDetails['controls'].entity_ans.value=='non-individual'" style="width: 20%">
                 
                                                             <input matInput placeholder="Vintage" formControlName="vintage_ans" type="text" required (keypress)="keyPress($event)">
-                                                            <mat-error *ngIf="mainDetails['controls'].vintage_ans.hasError('pattern') || mainDetails['controls'].vintage_ans.hasError('maxlength') || mainDetails['controls'].vintage_ans.hasError('minlength')">Enter Valid Vintage. </mat-error>  
+                                                            <mat-error *ngIf="coDetails['controls'].vintage_ans.hasError('pattern') || coDetails['controls'].vintage_ans.hasError('maxlength') || coDetails['controls'].vintage_ans.hasError('minlength')">Enter Valid Vintage.</mat-error>
                             
                                                     </mat-form-field>
                                                           
@@ -168,7 +168,7 @@
                                                             </mat-select>    
                                                     </mat-form-field>
                                                           
-                                                    <mat-form-field *ngIf="coDetails['controls'].entity_ans.value=='individual' && mainDetails['controls'].qualification_ans.value == 2" style="width: 20%">
+                                                    <mat-form-field *ngIf="coDetails['controls'].entity_ans.value=='individual' && coDetails['controls'].qualification_ans.value == 2" style="width: 20%">
                                                             <input matInput placeholder="Education Level" formControlName="edu_level_ans" type="text">
                                                     </mat-form-field>
                                                    
@@ -332,3 +332,5 @@
         <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="submit" matTooltip="Save" matTooltipPosition="above"><mat-icon>save</mat-icon></button>
     </div>
 </mat-dialog-actions>
+</form>
+<notifier-container></notifier-container>

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts

@@ -206,13 +206,13 @@ removeCoApplicant(renoveIndex) {
 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]*$')])],
+    age_ans: [applicant.age_ans, Validators.compose([Validators.minLength(1),Validators.maxLength(3),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]*$')])],
+    vintage_ans: [applicant.vintage_ans, Validators.compose([Validators.minLength(1),Validators.maxLength(3),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],
+    qualification_ans: [applicant.qualification_ans],
-    earning_ans: [applicant.earning_ans, Validators.required],
+    earning_ans: [applicant.earning_ans],
     edu_level_ans: [applicant.edu_level_ans],
     current_added_status: [applicant.current_added_status],
 });
@@ -222,13 +222,13 @@ loadMainApplicant(applicant:any) {
 loadCoApplicant(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]*$')])],
+    age_ans: [applicant.age_ans, Validators.compose([Validators.minLength(1),Validators.maxLength(3),Validators.pattern('^[0-9]*$')])],
     entity_ans: [applicant.entity_ans, Validators.required],
-    qualification_ans: [applicant.qualification_ans, Validators.required],
+    qualification_ans: [applicant.qualification_ans],
-    vintage_ans: [applicant.vintage_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.minLength(1),Validators.maxLength(3),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],
+    earning_ans: [applicant.earning_ans],
     relation_ans: [applicant.relation_ans, Validators.required],
     edu_level_ans: [applicant.edu_level_ans],
     current_added_status: [applicant.current_added_status],   
@@ -239,13 +239,13 @@ loadCoApplicant(applicant:any) {
 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]*$')])],
+    age_ans: ['', Validators.compose([Validators.minLength(1),Validators.maxLength(3),Validators.pattern('^[0-9]*$')])],
-    vintage_ans:['', Validators.compose([Validators.required,Validators.minLength(1),Validators.maxLength(3),Validators.required,Validators.pattern('^[0-9]*$')])],
+    vintage_ans:['', Validators.compose([Validators.minLength(1),Validators.maxLength(3),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],
+    entity_ans: [this.pd_all_details.pdmaster_details.customer_segment_abbr.substring(0,3).toUpperCase()==='SAL' ?  'individual' : '', Validators.required],
-    qualification_ans: ['', Validators.required],
+    qualification_ans: [''],
-    earning_ans: ['', Validators.required],
+    earning_ans: [''],
     edu_level_ans:[''],
     current_added_status: [applicant.current_added_status],
     });
@@ -255,28 +255,29 @@ loadDefaultMainApplicant(applicant:any){
   loadDefaultCoApplicant(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]*$')])],
+        age_ans: ['', Validators.compose([Validators.minLength(1),Validators.maxLength(3),Validators.pattern('^[0-9]*$')])],
-        vintage_ans:['', Validators.compose([Validators.required,Validators.minLength(1),Validators.maxLength(3),Validators.required,Validators.pattern('^[0-9]*$')])],
+        vintage_ans:['', Validators.compose([Validators.minLength(1),Validators.maxLength(3),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],
+        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],
+        qualification_ans: [''],
-        earning_ans: ['', Validators.required],
+        earning_ans: [''],
         relation_ans: ['', Validators.required],
         current_added_status: [applicant.current_added_status],
     });
     }
     // submit forms details
 submitPersonalForm(formData:any) {
-  if (this._personalForm.invalid) {
+  // if (this._personalForm.invalid) {
-    this.validateAllFormFields(this._personalForm);
+  //   this.validateAllFormFields(this._personalForm);
   
-   // this.notifier.notify('warning', 'All Fields Are Required.!');
+  //  //this.notifier.notify('warning', 'All Fields Are Required.!');
 
-    return;
+  //   return;
-  }
+  // }
-  else{
+  // else{
+    //this.notifier.notify('warning', 'Fields Are Required.!');
       let main_applicantDetails:any=[];
        let co_applicantDetails:any=[];
        let new_co_applicant:any=[];
@@ -348,7 +349,7 @@ submitPersonalForm(formData:any) {
         this.questionsSubmitCheck(save_details);
       }
    
-  }
+  //}
 }
 
 // submit and check all questions 
@@ -383,4 +384,114 @@ validateAllFormFields(formGroup: any) {
 }   
 
 
+// selectedAccTypeChanges(event: any){
+//   console.log('First Time',event);
+//   console.log('First Time Value',event.value);
+//  if(event.value == 2) {   
+//      const control = <FormArray>this.bankingForm.controls['itemRows'];
+//      console.log('Inside If Condition');
+//      console.log(control);
+//      console.log(control.controls);
+     
+//      control.controls[0].get('limit').clearValidators();
+//      control.controls[0].get('limit').updateValueAndValidity();
+
+//      //this.loanDetailsForm.controls['is_topup'].setValidators([Validators.required]);
+//      // this.bankingForm.controls['itemRows'].
+//      // this.bankingForm.controls.get('limit').clearValidators();
+//      // this.bankingForm.controls.itemRows['controls'].get('limit').updateValueAndValidity();
+//      // const control = <FormArray>this.bankingForm.controls['itemRows'];
+//      //       console.log(control.controls['limit'].value);
+     
+//  }
+//  else{
+//      //alert('sd');
+//  }}
+
+ selectedEntityChanges(event: any){
+  const control = <FormArray>this._personalForm.controls['main_applicant_details'];
+  if(event.value == 'individual') {   
+
+    control.controls[0].get('vintage_ans').clearValidators();
+    control.controls[0].get('vintage_ans').updateValueAndValidity();
+
+    control.controls[0].get('age_ans').setValidators([Validators.required]);
+    control.controls[0].get('age_ans').updateValueAndValidity();
+    
+    control.controls[0].get('earning_ans').setValidators([Validators.required]);
+    control.controls[0].get('earning_ans').updateValueAndValidity();
+
+    control.controls[0].get('qualification_ans').setValidators([Validators.required]);
+    control.controls[0].get('qualification_ans').updateValueAndValidity();
+    
+    control.controls[0].get('non_individual_entity_ans').clearValidators();
+    control.controls[0].get('non_individual_entity_ans').updateValueAndValidity();
+
+  }
+  else if(event.value == 'non-individual'){
+
+    control.controls[0].get('vintage_ans').setValidators([Validators.required]);
+    control.controls[0].get('vintage_ans').updateValueAndValidity();
+    
+    control.controls[0].get('age_ans').clearValidators();
+    control.controls[0].get('age_ans').updateValueAndValidity();
+    
+    control.controls[0].get('earning_ans').clearValidators();
+    control.controls[0].get('earning_ans').updateValueAndValidity();
+
+    control.controls[0].get('qualification_ans').clearValidators();
+    control.controls[0].get('qualification_ans').updateValueAndValidity();
+    
+    control.controls[0].get('non_individual_entity_ans').setValidators([Validators.required]);
+    control.controls[0].get('non_individual_entity_ans').updateValueAndValidity();
+    
+  }
+
+}
+
+selectedCoApplicantEntityChanges(event: any,c){
+  
+  const control = <FormArray>this._personalForm.controls['co_applicant_details'];
+
+  if(event.value == 'individual') {   
+
+    control.controls[0].get('vintage_ans').clearValidators();
+    control.controls[0].get('vintage_ans').updateValueAndValidity();
+
+    control.controls[0].get('age_ans').setValidators([Validators.required]);
+    control.controls[0].get('age_ans').updateValueAndValidity();
+    
+    control.controls[0].get('earning_ans').setValidators([Validators.required]);
+    control.controls[0].get('earning_ans').updateValueAndValidity();
+    
+    control.controls[0].get('qualification_ans').setValidators([Validators.required]);
+    control.controls[0].get('qualification_ans').updateValueAndValidity();
+
+    control.controls[0].get('non_individual_entity_ans').clearValidators();
+    control.controls[0].get('non_individual_entity_ans').updateValueAndValidity();
+
+  }
+  else if(event.value == 'non-individual'){
+
+    control.controls[0].get('vintage_ans').setValidators([Validators.required]);
+    control.controls[0].get('vintage_ans').updateValueAndValidity();
+    
+    control.controls[0].get('age_ans').clearValidators();
+    control.controls[0].get('age_ans').updateValueAndValidity();
+    
+    control.controls[0].get('earning_ans').clearValidators();
+    control.controls[0].get('earning_ans').updateValueAndValidity();
+
+    control.controls[0].get('qualification_ans').clearValidators();
+    control.controls[0].get('qualification_ans').updateValueAndValidity();
+
+    control.controls[0].get('non_individual_entity_ans').setValidators([Validators.required]);
+    control.controls[0].get('non_individual_entity_ans').updateValueAndValidity();
+    
+  }
+
+}
+
+
+
 }

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.html

@@ -327,4 +327,5 @@
     </div>
 </mat-dialog-actions>
 </form>
+<notifier-container></notifier-container>
 

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts

@@ -324,12 +324,12 @@ pdFullDetails:any=[];
 
               this.pdFullDetails = data.records
 
-              // manually push genral forms for test should remove code move
+            // manually push genral forms for test should remove code move
-              this.categoryFormButtons.unshift({
+            //   this.categoryFormButtons.unshift({
-                  "form_id":18,
+            //       "form_id":18,
-                  "form_name": 'General Information',
+            //       "form_name": 'General Information',
-                  "isAnswered":false
+            //       "isAnswered":false
-              })
+            //   })
 
           }
         else{