Merge branch 'master' of https://bitbucket.org/sriramv18/sparqsineedge

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

@@ -0,0 +1,102 @@
+<p>Address</p>
+<form class="address" [formGroup]="addressForm">
+    <mat-form-field>
+        <input matInput placeholder="Address" formControlName="address">
+    </mat-form-field>
+
+    <mat-form-field>
+        <mat-select placeholder="Address Type" formControlName="address_type">
+            <mat-option value="Office">Office</mat-option>
+            <mat-option value="Clinic">Clinic</mat-option>
+            <mat-option value="Factory">Factory</mat-option>
+            <mat-option value="Warehouse">Warehouse</mat-option>
+            <mat-option value="Shop">Shop</mat-option>
+            <mat-option value="ResidencecumOffice">Residence cum Office</mat-option>
+            <mat-option value="Residence">Residence</mat-option>
+            <mat-option value="Other">Other (PD officer to fill)</mat-option>
+        </mat-select>
+    </mat-form-field>
+
+    <mat-form-field>
+        <mat-select placeholder="Locality" formControlName="locality">
+            <mat-option value="CommercialOffice">Commercial (Office type) Area
+            </mat-option>
+            <mat-option value="CommercialShop">Commercial (shop type) Area</mat-option>
+            <mat-option value="Industrial">Industrial Area</mat-option>
+            <mat-option value="Residential">Residential Area</mat-option>
+            <mat-option value="Mix">Mix use (Comment mandatory)</mat-option>
+            <mat-option value="Rural">Rural (Village) area</mat-option>
+            <mat-option value="Others">Others (Please specify)</mat-option>
+        </mat-select>
+    </mat-form-field>
+    <mat-form-field>
+        <mat-select placeholder="Approach to PD location" formControlName="pd_location">
+            <mat-option value="{{data.pd_location_approach_id}}"
+                        *ngFor="let data of locationdata">{{data.description}}
+            </mat-option>
+        </mat-select>
+    </mat-form-field>
+    <mat-form-field>
+        <mat-select placeholder="Comment on locality" formControlName="comment_locality">
+            <mat-option value="{{data.comments_on_locality_id}}"
+                        *ngFor="let data of commentData">{{data.rating}}
+            </mat-option>
+        </mat-select>
+    </mat-form-field>
+    <mat-form-field>
+        <mat-select placeholder="Customer Behaviour"
+                    formControlName="customer_behaviour">
+            <mat-option value="{{data.customer_behaviour_id}}"
+                        *ngFor="let data of customerData">{{data.description}}
+            </mat-option>
+        </mat-select>
+    </mat-form-field>
+    <mat-card>
+        <mat-card-header>
+            <p>Neighbour hood
+            <p>
+        </mat-card-header>
+        <div formArrayName="neighbourhood">
+            <div *ngFor="let item of addressForm.get('neighbourhood').controls; let i=index">
+                <mat-card-content class="matcard" [formGroup]="item">
+                    <mat-form-field>
+                        <input matInput placeholder="Neighbour name"
+                               formControlName="name">
+                    </mat-form-field>
+                    <mat-form-field>
+                        <mat-select placeholder="Do you know"
+                                    formControlName="do_you_know">
+                            <mat-option value="yes">Yes</mat-option>
+                            <mat-option value="no">No</mat-option>
+                        </mat-select>
+                    </mat-form-field>
+                    <mat-form-field>
+                        <input matInput placeholder="How long do you know the applicant"
+                               formControlName="how_long">
+                    </mat-form-field>
+                    <mat-form-field>
+                        <mat-select placeholder="Is the applicant owner"
+                                    formControlName="is_owner">
+                            <mat-option value="yes">Yes</mat-option>
+                            <mat-option value="no">No</mat-option>
+                            <mat-option value="dont_know">Dont Know</mat-option>
+                        </mat-select>
+                    </mat-form-field>
+                    <button type="button" mat-raised-button mat-icon-button *ngIf="i==0"
+                            (click)="addNeighbour($event)"
+                            style="float: right;">
+                        <mat-icon>add</mat-icon>
+                    </button>
+                    <button type="button" mat-raised-button mat-icon-button *ngIf="i>0"
+                            (click)="removeNeighbour(i)"
+                            style="float: right;">
+                        <mat-icon>close</mat-icon>
+                    </button>
+
+                </mat-card-content>
+            </div>
+        </div>
+    </mat-card>
+    <button mat-raised-button type="submit" class="button" (click)="onSubmit()">Submit
+    </button>
+</form>

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.scss

@@ -0,0 +1,18 @@
+.address {
+  display: flex;
+  padding: 0 2%;
+  flex-direction: column;
+}
+
+.address > * {
+  width: 100%;
+}
+.matcard mat-form-field {
+  margin: 0 2%;
+}
+.address .button {
+  float: right;
+  width: 10px;
+  background: #62B013;
+  color: white;
+}

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

@@ -0,0 +1,184 @@
+import {
+    Component,
+    OnInit,
+    Inject,
+    Input
+} 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-address',
+    templateUrl: './address.component.html',
+    styleUrls: ['./address.component.scss']
+})
+export class AddressComponent implements OnInit {
+    locationdata: any = [];
+    commentData: any = [];
+    customerData: any = [];
+    public currentLoanForm: FormGroup;
+    private notifier: NotifierService;
+    public addressForm: FormGroup;
+
+    public address: AbstractControl;
+    public addressType: AbstractControl;
+    public locality: AbstractControl;
+    public pdLocation: AbstractControl;
+    public commentlocality: AbstractControl;
+    public customerBehaviour: AbstractControl;
+
+
+    constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute,
+                private router: Router,
+                private _pd: PdTrigerService) {
+
+    }
+    ngOnInit() {
+        this.getLocation();
+        this.getComment();
+        this.getCustomer();
+        this.initAddressForm();
+        let params: any = {};
+        params.pd_id = '250';
+        params.pd_form_id = '250';
+        this._pd.retriveForm(params).subscribe(data => {
+            console.log('data', data);
+            var result = Object.keys(data.records.neighbourhood).map(function(key) {
+                return data.records.neighbourhood[key];
+            });
+            this.addressForm.controls.address.setValue(data.records.address);
+            this.addressForm.controls.pd_location.setValue(data.records.pd_location);
+            this.addressForm.controls.address_type.setValue(data.records.address_type);
+            this.addressForm.controls.comment_locality.setValue(data.records.comment_locality);
+            this.addressForm.controls.customer_behaviour.setValue(data.records.customer_behaviour);
+            this.addressForm.controls.locality.setValue(data.records.locality);
+            const control = <FormArray>this.addressForm.controls['neighbourhood'];
+            if(result.length == 0) {
+                control.push(this.createNeighbour());
+            } else {
+                result.forEach(datas => {
+                    control.push(this.createNeighbour());
+                });
+                this.addressForm.controls.neighbourhood.setValue(result);
+            }
+            console.log('result', result);
+        });
+    }
+    public initAddressForm(): void {
+        this.addressForm = this.fb.group({
+            address: ['', Validators.compose([Validators.required])],
+            address_type: ['', Validators.compose([Validators.required])],
+            locality: ['', Validators.compose([Validators.required])],
+            pd_location: ['', Validators.compose([Validators.required])],
+            comment_locality: ['', Validators.compose([Validators.required])],
+            customer_behaviour: ['', Validators.compose([Validators.required])],
+            neighbourhood: this.fb.array([])
+        });
+        this.address = this.addressForm.controls['address'];
+        this.addressType = this.addressForm.controls['address_type'];
+        this.locality = this.addressForm.controls['locality'];
+        this.pdLocation = this.addressForm.controls['pd_location'];
+        this.commentlocality = this.addressForm.controls['comment_locality'];
+        this.customerBehaviour = this.addressForm.controls['customer_behaviour'];
+    }
+    createNeighbour(): FormGroup {
+        return this.fb.group({
+            name: ['', Validators.compose([Validators.required])],
+            do_you_know: ['', Validators.compose([Validators.required])],
+            how_long: ['', Validators.compose([Validators.required])],
+            is_owner: ['', Validators.compose([Validators.required])],
+        });
+    }
+    getLocation() {
+        let master_name = 'PDLOCATIONAPPROACH';
+        this._pd.getAllMasterDatas(master_name).subscribe(data => {
+            console.log('data', data);
+            data.records.forEach(val => {
+                if (val.isactive == 1) {
+                    this.locationdata.push(val);
+                }
+            })
+        });
+    }
+    getComment() {
+        let master_name = 'COMMENTSONLOCALITY';
+        this._pd.getAllMasterDatas(master_name).subscribe(data => {
+            console.log('data', data);
+            data.records.forEach(val => {
+                if (val.isactive == 1) {
+                    this.commentData.push(val);
+                }
+            })
+        });
+    }
+    getCustomer() {
+        let master_name = 'CUSTOMERBEHAVIOUR';
+        this._pd.getAllMasterDatas(master_name).subscribe(data => {
+            console.log('data', data);
+            data.records.forEach(val => {
+                if (val.isactive == 1) {
+                    this.customerData.push(val);
+                }
+            })
+        });
+    }
+    addNeighbour() {
+        const control = <FormArray>this.addressForm.controls['neighbourhood'];
+        if (control.length <= 1) {
+            control.push(this.createNeighbour());
+        }
+    }
+    removeNeighbour(index) {
+        const control = <FormArray>this.addressForm.controls['neighbourhood'];
+        control.removeAt(index);
+    }
+    onSubmit() {
+        if (!this.addressForm.valid) {
+            this.validateAllFormFields(this.addressForm);
+            return;
+        }
+        console.log('form', this.addressForm.value);
+        let records: any = {};
+        records.address = this.address.value;
+        records.address_type = this.addressType.value;
+        records.locality = this.locality.value;
+        records.pd_location = this.pdLocation.value;
+        records.comment_locality = this.commentlocality.value;
+        records.customer_behaviour = this.commentlocality.value;
+        records.neighbourhood = this.addressForm.value.items;
+        records.pdid = '250';
+        records.formid = '250';
+        records.fk_createdby = '250';
+        console.log('params', records);
+        this._pd.saveForm(records).subscribe(data => {
+            console.log('data', data);
+            this.notifier.notify('success', 'Saved Successfully.');
+
+        });
+    }
+    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);
+            }
+        });
+    }
+}

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

@@ -0,0 +1,65 @@
+<form [formGroup]="bankingForm" class="bankForm">
+    <div formArrayName="itemRows">
+        <mat-accordion
+                *ngFor="let itemrow of bankingForm.controls.itemRows.controls; let i=index"
+                [formGroupName]="i">
+            <mat-expansion-panel class="banlFields" [expanded]="step == i">
+                <mat-expansion-panel-header>
+                    <mat-panel-title>
+                        <h4>{{i+1}} Banking details<span *ngIf="i==0" style="float: right;">
+                                                    <mat-icon (click)="addBankdetails(i)">add</mat-icon>
+                                                     </span>
+                            <span *ngIf="i > 0">
+                                                    <mat-icon (click)="deleteBankdetails(i)">delete</mat-icon>
+                                                        </span></h4>
+                    </mat-panel-title>
+                </mat-expansion-panel-header>
+                <mat-form-field>
+                    <input matInput placeholder="Applicant Name"
+                           formControlName="applicant_name">
+                </mat-form-field>
+                <mat-form-field>
+                    <input matInput placeholder="Bank Name" formControlName="bank_name">
+                </mat-form-field>
+
+                <mat-form-field>
+                    <mat-select placeholder="Account Type"
+                                formControlName="account_type">
+                        <mat-option value="Savings">Savings</mat-option>
+                        <mat-option value="Current">Current</mat-option>
+                        <mat-option value="OD">OD</mat-option>
+                        <mat-option value="CC">CC</mat-option>
+
+                    </mat-select>
+                </mat-form-field>
+
+                <mat-form-field>
+                    <mat-select placeholder="Salary Credited in this account"
+                                formControlName="salary">
+                        <mat-option value="Yes">Yes</mat-option>
+                        <mat-option value="No">No</mat-option>
+                        <mat-option value="NA">NA</mat-option>
+                    </mat-select>
+                </mat-form-field>
+                <mat-form-field>
+                    <input matInput placeholder="Limit in case of OD / CC account"
+                           formControlName="limit">
+                </mat-form-field>
+                <mat-form-field>
+                    <mat-select placeholder="Is this the main business account"
+                                formControlName="is_main">
+                        <mat-option value="Yes">Yes</mat-option>
+                        <mat-option value="No">No</mat-option>
+                    </mat-select>
+                </mat-form-field>
+                <mat-form-field>
+                    <input matInput placeholder="Approximate Vintage"
+                           formControlName="vintage">
+                </mat-form-field>
+            </mat-expansion-panel>
+
+        </mat-accordion>
+    </div>
+    <button mat-raised-button class="button" (click)="bankSubmit()">Submit
+    </button>
+</form>

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.scss

@@ -0,0 +1,10 @@
+.banlFields mat-form-field {
+  width: 100%;
+  margin: 0 2%;
+}
+.bankForm .button {
+  float: right;
+  width: 10px;
+  background: #62B013;
+  color: white;
+}

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

@@ -0,0 +1,114 @@
+import {
+    Component,
+    OnInit,
+    Inject,
+    Input
+} 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-banking-details',
+    templateUrl: './banking-details.component.html',
+    styleUrls: ['./banking-details.component.scss']
+})
+export class BankingDetailsComponent implements OnInit {
+    public bankingForm: FormGroup;
+    step: any;
+    private notifier: NotifierService;
+
+    constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute,
+                private router: Router,
+                private _pd: PdTrigerService) {
+
+    }
+    ngOnInit() {
+        this.step = 0;
+        this.initBankingForm();
+        let params: any = {};
+        params.pd_id = '252';
+        params.pd_form_id = '252';
+        this._pd.retriveForm(params).subscribe(data => {
+            console.log('data', data);
+            var result = Object.keys(data.records.banking_details).map(function(key) {
+                return data.records.banking_details[key];
+            });
+            const control = <FormArray>this.bankingForm.controls['itemRows'];
+            if(result.length == 0) {
+                control.push(this.createBankarray());
+            } else {
+                result.forEach(datas => {
+                    control.push(this.createBankarray());
+                });
+                this.bankingForm.controls.itemRows.setValue(result);
+            }
+        });
+    }
+    public initBankingForm(): void {
+        this.bankingForm = this.fb.group({
+            itemRows: this.fb.array([])
+        });
+    }
+    createBankarray() {
+        return this.fb.group({
+            applicant_name: ['', Validators.compose([Validators.required])],
+            bank_name: ['', Validators.compose([Validators.required])],
+            account_type: ['', Validators.compose([Validators.required])],
+            salary: ['', Validators.compose([Validators.required])],
+            limit: ['', Validators.compose([Validators.required])],
+            is_main: ['', Validators.compose([Validators.required])],
+            vintage: ['', Validators.compose([Validators.required])],
+        });
+    }
+    addBankdetails(i) {
+        this.step = i++;
+        const control = <FormArray>this.bankingForm.controls['itemRows'];
+        control.push(this.createBankarray());
+    }
+    deleteBankdetails(index: number) {
+        const control = <FormArray>this.bankingForm.controls['itemRows'];
+        control.removeAt(index);
+    }
+
+    bankSubmit() {
+        if (!this.bankingForm.valid) {
+            this.validateAllFormFields(this.bankingForm);
+            return;
+        }
+        let records: any = {};
+        records.pdid = '252';
+        records.formid = '252';
+        records.fk_createdby = '252';
+        records.banking_details = this.bankingForm.controls['itemRows'].value;
+        console.log('data', records);
+        this._pd.saveForm(records).subscribe(data => {
+            console.log('data', data);
+            this.notifier.notify('success', 'Saved Successfully.');
+        })
+    }
+    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);
+            }
+        });
+    }
+}

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

@@ -0,0 +1,48 @@
+<form [formGroup]="currentLoanForm" class="address">
+    <mat-form-field>
+        <mat-select placeholder="Do you have any other existing Loan"
+                    formControlName="existing_loan">
+            <mat-option value="Yes">Yes</mat-option>
+            <mat-option value="No">No</mat-option>
+        </mat-select>
+    </mat-form-field>
+    <mat-card *ngIf="currentLoanForm.controls.existing_loan.value == 'Yes'">
+        <mat-card-header>
+            <p>Loan Details<p>
+        </mat-card-header>
+        <div formArrayName="loan_details">
+            <div *ngFor="let details of currentLoanForm.get('loan_details').controls; let i=index"
+                 [formGroupName]="i">
+                <mat-card-content class="matcard">
+                    <mat-form-field>
+                        <input matInput placeholder="Loan Amount" formControlName="loan_amount">
+                    </mat-form-field>
+                    <mat-form-field>
+                        <input matInput placeholder="EMI" formControlName="emi">
+                    </mat-form-field>
+                    <mat-form-field>
+                        <input matInput placeholder="Loan Type" formControlName="loan_type">
+                    </mat-form-field>
+                    <mat-form-field>
+                        <input matInput placeholder="Lender" formControlName="lender">
+                    </mat-form-field>
+                    <mat-form-field>
+                        <input matInput placeholder="Original Tenure" formControlName="original_tenure">
+                    </mat-form-field>
+                    <mat-form-field>
+                        <input matInput placeholder="Current Balance Tenure" formControlName="current_balance_tenure">
+                    </mat-form-field>
+                    <button type="button" mat-raised-button mat-icon-button (click)="addLoanDetails()"
+                            *ngIf="i==0">
+                        <mat-icon>add</mat-icon>
+                    </button>
+                    <button type="button" mat-raised-button mat-icon-button (click)="deleteLoanDetails(i)"
+                            *ngIf="i>0">
+                        <mat-icon>close</mat-icon>
+                    </button>
+                </mat-card-content>
+            </div>
+        </div>
+    </mat-card>
+    <button mat-raised-button type="submit" class="button" (click)="submitCurrentloan()"></button>
+</form>

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.scss

@@ -0,0 +1,18 @@
+.address {
+  display: flex;
+  padding: 0 2%;
+  flex-direction: column;
+}
+
+.address > * {
+  width: 100%;
+}
+.matcard mat-form-field {
+  margin: 0 2%;
+}
+.address .button {
+  float: right;
+  width: 10px;
+  background: #62B013;
+  color: white;
+}

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

@@ -0,0 +1,93 @@
+import {
+    Component,
+    OnInit,
+    Inject,
+    Input
+} from '@angular/core';
+
+import {
+    FormBuilder,
+    FormGroup,
+    Validators,
+    FormArray, FormControl,
+} 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-current-loan',
+    templateUrl: './current-loan.component.html',
+    styleUrls: ['./current-loan.component.scss']
+})
+export class CurrentLoanComponent implements OnInit {
+    public currentLoanForm: FormGroup;
+    private notifier: NotifierService;
+
+    constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute,
+                private router: Router,
+                private _pd: PdTrigerService) {
+
+    }
+    ngOnInit() {
+        this.initCurrentloanForm();
+    }
+    public initCurrentloanForm(): void {
+        this.currentLoanForm = this.fb.group({
+            existing_loan: ['', Validators.compose([Validators.required])],
+            loan_details: this.fb.array([this.createLoanDetail()])
+        });
+    }
+    createLoanDetail() {
+        return this.fb.group({
+            loan_amount: ['', Validators.compose([Validators.required])],
+            emi: ['', Validators.compose([Validators.required])],
+            loan_type: ['', Validators.compose([Validators.required])],
+            lender: ['', Validators.compose([Validators.required])],
+            original_tenure: ['', Validators.compose([Validators.required])],
+            current_balance_tenure: ['', Validators.compose([Validators.required])],
+        });
+    }
+    addLoanDetails() {
+        const control = <FormArray>this.currentLoanForm.controls['loan_details'];
+        control.push(this.createLoanDetail());
+    }
+    deleteLoanDetails(index) {
+        const control = <FormArray>this.currentLoanForm.controls['loan_details'];
+        control.removeAt(index);
+    }
+    submitCurrentloan() {
+        if (!this.currentLoanForm.valid) {
+            this.validateAllFormFields(this.currentLoanForm);
+            return;
+        }
+        let records: any = {};
+        records.pdid = '253';
+        records.formid = '253';
+        records.fk_createdby = '253';
+        records.existing_loan = this.currentLoanForm.controls['existing_loan'].value;
+        records.loan_details = this.currentLoanForm.controls['loan_details'].value;
+        console.log('data', records);
+        this._pd.saveForm(records).subscribe(data => {
+            console.log('data', data);
+            this.notifier.notify('success', 'Saved Successfully.');
+        })
+    }
+    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);
+            }
+        });
+    }
+}

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

@@ -0,0 +1,134 @@
+<p>Family</p>
+<form class="address" [formGroup]="familyForm">
+    <mat-form-field>
+        <mat-select placeholder="Person Met" formControlName="person">
+            <mat-option *ngFor="let state of filteredStates" [value]="state">
+                {{state}}
+            </mat-option>
+        </mat-select>
+    </mat-form-field>
+    <mat-form-field *ngIf="person.value =='Other'">
+        <input matInput placeholder="Enter the relationship" formControlName="personOther">
+    </mat-form-field>
+    <mat-form-field>
+        <input matInput placeholder="No. Of family members" formControlName="members">
+    </mat-form-field>
+    <mat-card>
+        <mat-card-header>
+            <p>Earning Members
+            <p>
+        </mat-card-header>
+        <div formArrayName="earningMembers">
+            <div *ngFor="let item of familyForm.get('earningMembers').controls; let i=index"
+                 [formGroupName]="i">
+                <mat-card-content class="matcard">
+                    <mat-form-field>
+                        <mat-select placeholder="Relation" formControlName="relation">
+                            <mat-option value="{{relation.relationship_id}}"
+                                        *ngFor="let relation of relationData">
+                                {{relation.name}}
+                            </mat-option>
+                        </mat-select>
+                    </mat-form-field>
+                    <mat-form-field>
+                        <mat-select placeholder="Segment" formControlName="segment">
+                            <mat-option value="Salaried">Salaried</mat-option>
+                            <mat-option value="SENP">SENP</mat-option>
+                            <mat-option value="SEP">SEP</mat-option>
+
+                        </mat-select>
+                    </mat-form-field>
+                    <mat-form-field>
+                        <input matInput placeholder="Income / Revenue"
+                               formControlName="income">
+                    </mat-form-field>
+                    <mat-form-field>
+                        <input matInput placeholder="Name of Employer / Business"
+                               formControlName="employer_name">
+                    </mat-form-field>
+                    <button type="button" mat-raised-button mat-icon-button *ngIf="i==0"
+                            (click)="addearningMembers()">
+                        <mat-icon>add</mat-icon>
+                    </button>
+                    <button type="button" mat-raised-button mat-icon-button
+                            (click)="deleteEarningMembers(i)" *ngIf="i>0">
+                        <mat-icon>close</mat-icon>
+                    </button>
+                </mat-card-content>
+            </div>
+        </div>
+    </mat-card>
+    <mat-card>
+        <mat-card-header>
+            <p>Non Earning Members
+            <p>
+        </mat-card-header>
+        <div formArrayName="nonEarningMembers">
+            <div *ngFor="let members of familyForm.get('nonEarningMembers').controls; let i=index"
+                 [formGroupName]="i">
+                <mat-card-content class="matcard">
+                    <mat-form-field>
+                        <mat-select placeholder="Relation"
+                                    formControlName="relationship">
+                            <mat-option value="{{relation.relationship_id}}"
+                                        *ngFor="let relation of relationData">
+                                {{relation.name}}
+                            </mat-option>
+                        </mat-select>
+                    </mat-form-field>
+                    <mat-form-field>
+                        <mat-select placeholder="Occupation"
+                                    formControlName="occupation">
+                            <mat-option value="{{occupation.occupation_non_earning_member_id}}"
+                                        *ngFor="let occupation of occupationData">{{occupation.name}}
+                            </mat-option>
+                        </mat-select>
+                    </mat-form-field>
+                    <mat-form-field>
+                        <input matInput placeholder="Retired From"
+                               formControlName="retired">
+                    </mat-form-field>
+                    <button type="button" mat-raised-button mat-icon-button (click)="addMembers()"
+                            *ngIf="i==0">
+                        <mat-icon>add</mat-icon>
+                    </button>
+                    <button type="button" mat-raised-button mat-icon-button (click)="deleteMembers(i)"
+                            *ngIf="i>0">
+                        <mat-icon>close</mat-icon>
+                    </button>
+                </mat-card-content>
+            </div>
+        </div>
+    </mat-card>
+    <mat-card>
+        <mat-card-header>
+            <p>Residence
+            <p>
+        </mat-card-header>
+        <mat-card-content class="matcard">
+            <mat-form-field>
+                <input matInput placeholder="Where is the residence"
+                       formControlName="residence">
+            </mat-form-field>
+            <mat-form-field>
+                <input matInput placeholder="No.of yrs" formControlName="years">
+            </mat-form-field>
+            <mat-form-field>
+                <mat-select placeholder="Ownership" formControlName="ownership">
+                    <mat-option value="Self">Self Owned</mat-option>
+                    <mat-option value="Family">Family Owned</mat-option>
+                    <mat-option value="Rented">Rented</mat-option>
+                    <mat-option value="Others">Others</mat-option>
+                </mat-select>
+            </mat-form-field>
+            <mat-form-field *ngIf="ownership.value =='Others'">
+                <input matInput placeholder="Please specify" formControlName="ownershipOther">
+            </mat-form-field>
+            <mat-form-field *ngIf="ownership.value =='Rented'">
+                <input matInput placeholder="what rent"
+                       formControlName="rent">
+            </mat-form-field>
+        </mat-card-content>
+    </mat-card>
+    <button mat-raised-button class="button" (click)="submitFamily()">Submit</button>
+</form>

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.scss

@@ -0,0 +1,18 @@
+.address {
+  display: flex;
+  padding: 0 2%;
+  flex-direction: column;
+}
+
+.address > * {
+  width: 100%;
+}
+.matcard mat-form-field {
+  margin: 0 2%;
+}
+.address .button {
+  float: right;
+  width: 10px;
+  background: #62B013;
+  color: white;
+}

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

@@ -0,0 +1,216 @@
+import {
+    Component,
+    OnInit,
+    Inject,
+    Input
+} 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 {
+    public currentLoanForm: FormGroup;
+    private notifier: NotifierService;
+    public familyForm: FormGroup;
+
+    public person: AbstractControl;
+    public personOther: AbstractControl;
+    public members: AbstractControl;
+    public residence: AbstractControl;
+    public years: AbstractControl;
+    public ownership: AbstractControl;
+    public ownershipOther: AbstractControl;
+    public rent: AbstractControl;
+
+    relationData: any = [];
+    occupationData: any = [];
+    constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute,
+                private router: Router,
+                private _pd: PdTrigerService) {
+
+    }
+    ngOnInit() {
+        this.getRelation();
+        this.getOccupation();
+        this.initFamilyForm();
+        let params: any = {};
+        params.pd_id = '251';
+        params.pd_form_id = '251';
+        this._pd.retriveForm(params).subscribe(data => {
+            console.log('data', data);
+            var result = Object.keys(data.records.non_earning_members).map(function(key) {
+                return data.records.non_earning_members[key];
+            });
+            var earning = Object.keys(data.records.earning_members).map(function(key) {
+                return data.records.earning_members[key];
+            });
+            this.familyForm.controls.person.setValue(data.records.person_met);
+            this.familyForm.controls.members.setValue(data.records.family_members);
+            this.familyForm.controls.years.setValue(data.records.no_of_years);
+            this.familyForm.controls.ownership.setValue(data.records.ownership);
+            this.familyForm.controls.rent.setValue(data.records.what_rent);
+            const control = <FormArray>this.familyForm.controls['nonEarningMembers'];
+            if (result.length == 0) {
+                control.push(this.createNonMembers());
+            } else {
+                result.forEach(datas => {
+                    control.push(this.createNonMembers());
+                });
+                this.familyForm.controls.nonEarningMembers.setValue(result);
+            }
+            const value = <FormArray>this.familyForm.controls['earningMembers'];
+            if(earning.length == 0) {
+                value.push(this.createMembers());
+            } else {
+                earning.forEach(datas => {
+                    value.push(this.createMembers());
+                });
+                this.familyForm.controls.earningMembers.setValue(earning);
+
+            }
+            this.familyForm.controls.residence.setValue(data.records.residence);
+
+        });
+    }
+    public initFamilyForm(): void {
+        this.familyForm = this.fb.group({
+            person: ['', Validators.compose([Validators.required])],
+            personOther: [''],
+            members: ['', Validators.compose([Validators.required])],
+            residence: ['', Validators.compose([Validators.required])],
+            years: ['', Validators.compose([Validators.required])],
+            ownership: ['', Validators.compose([Validators.required])],
+            ownershipOther: [''],
+            rent: [''],
+            earningMembers: this.fb.array([]),
+            nonEarningMembers: this.fb.array([])
+        });
+        this.person = this.familyForm.controls['person'];
+        this.personOther = this.familyForm.controls['personOther'];
+        this.members = this.familyForm.controls['members'];
+        this.residence = this.familyForm.controls['residence'];
+        this.years = this.familyForm.controls['years'];
+        this.ownership = this.familyForm.controls['ownership'];
+        this.ownershipOther = this.familyForm.controls['ownershipOther'];
+        this.rent = this.familyForm.controls['rent'];
+    }
+    createMembers(): FormGroup {
+        return this.fb.group({
+            relation: ['', Validators.compose([Validators.required])],
+            segment: ['', Validators.compose([Validators.required])],
+            income: ['', Validators.compose([Validators.required])],
+            employer_name: ['', Validators.compose([Validators.required])],
+        });
+    }
+    createNonMembers(): FormGroup {
+        return this.fb.group({
+            relationship: ['', Validators.compose([Validators.required])],
+            occupation: ['', Validators.compose([Validators.required])],
+            retired: ['', Validators.compose([Validators.required])],
+        });
+    }
+
+    addearningMembers() {
+        const control = <FormArray>this.familyForm.controls['earningMembers'];
+        control.push(this.createMembers());
+    }
+    addMembers() {
+        const control = <FormArray>this.familyForm.controls['nonEarningMembers'];
+        control.push(this.createNonMembers());
+    }
+    deleteEarningMembers(index) {
+        const control = <FormArray>this.familyForm.controls['earningMembers'];
+        control.removeAt(index);
+    }
+    deleteMembers(index) {
+        const control = <FormArray>this.familyForm.controls['nonEarningMembers'];
+        control.removeAt(index);
+    }
+
+
+    getRelation() {
+        let master_name = 'RELATIONSHIPS';
+        this._pd.getAllMasterDatas(master_name).subscribe(data => {
+            console.log('data', data);
+            data.records.forEach(val => {
+                if (val.isactive == 1) {
+                    this.relationData.push(val);
+                }
+            })
+        });
+    }
+    getOccupation() {
+        let master_name = 'OCCUPATIONMEMBERS';
+        this._pd.getAllMasterDatas(master_name).subscribe(data => {
+            console.log('data', data);
+            data.records.forEach(val => {
+                if (val.isactive == 1) {
+                    this.occupationData.push(val);
+                }
+            })
+        });
+    }
+    submitFamily() {
+        if (!this.familyForm.valid) {
+            this.validateAllFormFields(this.familyForm);
+            return;
+        }
+        console.log('data', this.familyForm.value);
+        let records: any = {};
+        records.no_of_years = this.years.value;
+        if (this.ownership.value == 'Others') {
+            records.ownership = this.ownershipOther.value;
+        } else {
+            records.ownership = this.ownership.value;
+        }
+        records.residence = this.residence.value;
+        if (this.ownership.value == 'Rented') {
+            records.what_rent = this.rent.value;
+        }
+        if (this.person.value == 'Other') {
+            records.person_met = this.personOther.value;
+        } else {
+            records.person_met = this.person.value;
+        }
+        records.family_members = this.members.value;
+        records.earning_members = this.familyForm.controls['earningMembers'].value;
+        records.non_earning_members = this.familyForm.controls['nonEarningMembers'].value;
+        records.pdid = '251';
+        records.formid = '251';
+        records.fk_createdby = '251';
+        console.log('params', records);
+        this._pd.saveForm(records).subscribe(data => {
+            console.log('data', data);
+            this.notifier.notify('success', 'Saved Successfully.');
+        })
+    }
+    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);
+            }
+        });
+    }
+}

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

@@ -0,0 +1,48 @@
+<form [formGroup]="loanDetailsForm" class="address">
+    <mat-form-field>
+        <input matInput placeholder="Loan Amount applied" formControlName="loan_amount">
+    </mat-form-field>
+    <mat-form-field>
+        <mat-select placeholder="What is the end use"
+                    formControlName="other_income">
+            <mat-option value="Yes">Yes</mat-option>
+            <mat-option value="No">No</mat-option>
+        </mat-select>
+    </mat-form-field>
+    <mat-card *ngIf="currentLoanForm.controls.existing_loan.value == 'Yes'">
+        <mat-card-header>
+            <p>Loan Details<p>
+        </mat-card-header>
+        <div formArrayName="income_details">
+            <div *ngFor="let details of otherIncomeForm.get('income_details').controls; let i=index"
+                 [formGroupName]="i">
+                <mat-card-content class="matcard">
+                    <mat-form-field>
+                        <mat-select placeholder="Source"
+                                    formControlName="source">
+                            <mat-option value="rental_income">Rental Income</mat-option>
+                            <mat-option value="interest_income">Interest Income</mat-option>
+                            <mat-option value="agricultural_income">Agricultural Income</mat-option>
+                            <mat-option value="dividend_income">Dividend Income and Others</mat-option>
+                        </mat-select>
+                    </mat-form-field>
+                    <mat-form-field>
+                        <input matInput placeholder="Amount" formControlName="amount">
+                    </mat-form-field>
+                    <mat-form-field>
+                        <input matInput placeholder="Frequency" formControlName="frequency">
+                    </mat-form-field>
+                    <button type="button" mat-raised-button mat-icon-button (click)="addIncomeDetails()"
+                            *ngIf="i==0">
+                        <mat-icon>add</mat-icon>
+                    </button>
+                    <button type="button" mat-raised-button mat-icon-button (click)="deleteIncomeDetails(i)"
+                            *ngIf="i>0">
+                        <mat-icon>close</mat-icon>
+                    </button>
+                </mat-card-content>
+            </div>
+        </div>
+    </mat-card>
+    <button type="submit" (click)="submitCurrentDetails()"></button>
+</form>

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.scss

@@ -0,0 +1,18 @@
+.address {
+  display: flex;
+  padding: 0 2%;
+  flex-direction: column;
+}
+
+.address > * {
+  width: 100%;
+}
+.matcard mat-form-field {
+  margin: 0 2%;
+}
+.address .button {
+  float: right;
+  width: 10px;
+  background: #62B013;
+  color: white;
+}

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

@@ -0,0 +1,103 @@
+import {
+    Component,
+    OnInit,
+    Inject,
+    Input
+} from '@angular/core';
+
+import {
+    FormBuilder,
+    FormGroup,
+    Validators,
+    FormArray, FormControl,
+} 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-loan-details',
+    templateUrl: './loan-details.component.html',
+    styleUrls: ['./loan-details.component.scss']
+})
+export class LoanDetailsComponent implements OnInit {
+    public loanDetailsForm: FormGroup;
+    private notifier: NotifierService;
+    frequencyData: any;
+
+    constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute,
+                private router: Router,
+                private _pd: PdTrigerService) {
+
+    }
+    ngOnInit() {
+        this.initloanDetailsForm();
+        // this.getFrequency();
+    }
+    public initloanDetailsForm(): void {
+        this.loanDetailsForm = this.fb.group({
+            other_income: ['', Validators.compose([Validators.required])],
+            // income_details: this.fb.array([this.createDetail()])
+        });
+    }
+    // createDetail() {
+    //     return this.fb.group({
+    //         source: ['', Validators.compose([Validators.required])],
+    //         amount: ['', Validators.compose([Validators.required])],
+    //         frequency: ['', Validators.compose([Validators.required])],
+    //     });
+    // }
+    // getFrequency() {
+    //     let master_name = 'FREQUENCY';
+    //     this._pd.getAllMasterDatas(master_name).subscribe(data => {
+    //         console.log('data', data);
+    //         data.records.forEach(val => {
+    //             if (val.isactive == 1) {
+    //                 this.frequencyData.push(val);
+    //             }
+    //         })
+    //     });
+    // }
+    // addIncomeDetails() {
+    //     const control = <FormArray>this.otherIncomeForm.controls['income_details'];
+    //     control.push(this.createDetail());
+    // }
+    // deleteIncomeDetails(index) {
+    //     const control = <FormArray>this.otherIncomeForm.controls['income_details'];
+    //     control.removeAt(index);
+    // }
+    // submitCurrentDetails() {
+    //     if (!this.otherIncomeForm.valid) {
+    //         this.validateAllFormFields(this.otherIncomeForm);
+    //         return;
+    //     }
+    //     let records: any = {};
+    //     records.pdid = '25‎4';
+    //     records.formid = '25‎4';
+    //     records.fk_createdby = '25‎4';
+    //     records.other_income = this.otherIncomeForm.controls['other_income'].value;
+    //     records.income_details = this.otherIncomeForm.controls['income_details'].value;
+    //     console.log('data', records);
+    //     this._pd.saveForm(records).subscribe(data => {
+    //         console.log('data', data);
+    //         this.notifier.notify('success', 'Saved Successfully.');
+    //     })
+    // }
+    // 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);
+    //         }
+    //     });
+    // }
+}

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

@@ -0,0 +1,45 @@
+<form [formGroup]="otherIncomeForm" class="address">
+    <mat-form-field>
+        <mat-select placeholder="Other Income"
+                    formControlName="other_income">
+            <mat-option value="Yes">Yes</mat-option>
+            <mat-option value="No">No</mat-option>
+        </mat-select>
+    </mat-form-field>
+    <mat-card *ngIf="currentLoanForm.controls.existing_loan.value == 'Yes'">
+        <mat-card-header>
+            <p>Loan Details<p>
+        </mat-card-header>
+        <div formArrayName="income_details">
+            <div *ngFor="let details of otherIncomeForm.get('income_details').controls; let i=index"
+                 [formGroupName]="i">
+                <mat-card-content class="matcard">
+                    <mat-form-field>
+                        <mat-select placeholder="Source"
+                                    formControlName="source">
+                            <mat-option value="rental_income">Rental Income</mat-option>
+                            <mat-option value="interest_income">Interest Income</mat-option>
+                            <mat-option value="agricultural_income">Agricultural Income</mat-option>
+                            <mat-option value="dividend_income">Dividend Income and Others</mat-option>
+                        </mat-select>
+                    </mat-form-field>
+                    <mat-form-field>
+                        <input matInput placeholder="Amount" formControlName="amount">
+                    </mat-form-field>
+                    <mat-form-field>
+                        <input matInput placeholder="Frequency" formControlName="frequency">
+                    </mat-form-field>
+                    <button type="button" mat-raised-button mat-icon-button (click)="addIncomeDetails()"
+                            *ngIf="i==0">
+                        <mat-icon>add</mat-icon>
+                    </button>
+                    <button type="button" mat-raised-button mat-icon-button (click)="deleteIncomeDetails(i)"
+                            *ngIf="i>0">
+                        <mat-icon>close</mat-icon>
+                    </button>
+                </mat-card-content>
+            </div>
+        </div>
+    </mat-card>
+    <button type="submit" (click)="submitCurrentDetails()"></button>
+</form>

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.scss

@@ -0,0 +1,18 @@
+.address {
+  display: flex;
+  padding: 0 2%;
+  flex-direction: column;
+}
+
+.address > * {
+  width: 100%;
+}
+.matcard mat-form-field {
+  margin: 0 2%;
+}
+.address .button {
+  float: right;
+  width: 10px;
+  background: #62B013;
+  color: white;
+}

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

@@ -0,0 +1,103 @@
+import {
+    Component,
+    OnInit,
+    Inject,
+    Input
+} from '@angular/core';
+
+import {
+    FormBuilder,
+    FormGroup,
+    Validators,
+    FormArray, FormControl,
+} 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-other-income',
+    templateUrl: './other-income.component.html',
+    styleUrls: ['./other-income.component.scss']
+})
+export class OtherIncomeComponent implements OnInit {
+    public otherIncomeForm: FormGroup;
+    private notifier: NotifierService;
+    frequencyData: any;
+
+    constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute,
+                private router: Router,
+                private _pd: PdTrigerService) {
+
+    }
+    ngOnInit() {
+        this.initOtherincomeForm();
+        this.getFrequency();
+    }
+    public initOtherincomeForm(): void {
+        this.otherIncomeForm = this.fb.group({
+            other_income: ['', Validators.compose([Validators.required])],
+            income_details: this.fb.array([this.createDetail()])
+        });
+    }
+    createDetail() {
+        return this.fb.group({
+            source: ['', Validators.compose([Validators.required])],
+            amount: ['', Validators.compose([Validators.required])],
+            frequency: ['', Validators.compose([Validators.required])],
+        });
+    }
+    getFrequency() {
+        let master_name = 'FREQUENCY';
+        this._pd.getAllMasterDatas(master_name).subscribe(data => {
+            console.log('data', data);
+            data.records.forEach(val => {
+                if (val.isactive == 1) {
+                    this.frequencyData.push(val);
+                }
+            })
+        });
+    }
+    addIncomeDetails() {
+        const control = <FormArray>this.otherIncomeForm.controls['income_details'];
+        control.push(this.createDetail());
+    }
+    deleteIncomeDetails(index) {
+        const control = <FormArray>this.otherIncomeForm.controls['income_details'];
+        control.removeAt(index);
+    }
+    submitCurrentDetails() {
+        if (!this.otherIncomeForm.valid) {
+            this.validateAllFormFields(this.otherIncomeForm);
+            return;
+        }
+        let records: any = {};
+        records.pdid = '25‎4';
+        records.formid = '25‎4';
+        records.fk_createdby = '25‎4';
+        records.other_income = this.otherIncomeForm.controls['other_income'].value;
+        records.income_details = this.otherIncomeForm.controls['income_details'].value;
+        console.log('data', records);
+        this._pd.saveForm(records).subscribe(data => {
+            console.log('data', data);
+            this.notifier.notify('success', 'Saved Successfully.');
+        })
+    }
+    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);
+            }
+        });
+    }
+}

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

@@ -393,6 +393,23 @@
                             <ng-container *ngSwitchCase="4">
                                 <app-assets-info [pdid]="startPD"></app-assets-info>
                             </ng-container>
+                            <ng-container *ngSwitchCase="5">
+                                <app-address></app-address>
+                                <!-- end personal type questions -->
+                            </ng-container>
+                            <ng-container *ngSwitchCase="6">
+                                <app-family-details></app-family-details>
+                            </ng-container>
+                            <ng-container *ngSwitchCase="7">
+                                <!--<p>Banking details</p>-->
+                             <app-banking-details></app-banking-details>
+                            </ng-container>
+                            <ng-container *ngSwitchCase="8">
+                                <app-current-loan></app-current-loan>
+                            </ng-container>
+                            <ng-container *ngSwitchCase="9">
+                                <app-other-income></app-other-income>
+                            </ng-container>
                             <!-- end personal type questions
                             -->
                         </ng-container>
@@ -400,6 +417,29 @@
                     <!-- end form based questions -->
 
                 </figure>
+                                <!--</ng-container>-->
+                                <!--&lt;!&ndash; end supplier type questions &ndash;&gt;-->
+
+                                <!--&lt;!&ndash; start client type questions &ndash;&gt;-->
+                                <!--<ng-container  *ngSwitchCase="2">-->
+                                      <!--<app-client-info [pdid]="startPD"></app-client-info>-->
+                                        <!--</ng-container>-->
+                                <!--&lt;!&ndash; end client type questions &ndash;&gt;-->
+
+                                <!--&lt;!&ndash; start personal type questions &ndash;&gt;-->
+                                <!--<ng-container *ngSwitchCase="3">-->
+                                        <!--<app-personal-info [pdid]="startPD" [pd_all_details]="pdFullDetails"></app-personal-info>-->
+                                        <!--</ng-container>-->
+                                <!--<ng-container *ngSwitchCase="4">-->
+                                    <!--<app-assets-info [pdid]="startPD"></app-assets-info>-->
+                                <!--</ng-container>-->
+                                <!--&lt;!&ndash; end personal type questions -->
+                                <!--&ndash;&gt;-->
+                                <!--</ng-container>-->
+                                <!--</div>-->
+                      <!-- end form based questions -->
+                   
+                  <!--</figure>-->
             </div>
         </mat-sidenav-container>
 
@@ -409,4 +449,3 @@
 <notifier-container></notifier-container>
 
 
- 

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

@@ -121,3 +121,22 @@ mat-icon{
     right: 69px;
     top: 112px;
 }
+.address {
+    display: flex;
+    padding: 0 2%;
+    flex-direction: column;
+}
+
+.address > * {
+    width: 100%;
+}
+.matcard mat-form-field {
+  margin: 0 2%;
+}
+.address .button {
+    float: right;
+    width: 10px;
+    background: #62B013;
+    color: white;
+}
+

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

@@ -1,5 +1,5 @@
 import {Component, ViewChild, OnInit, ViewEncapsulation, OnDestroy} from '@angular/core';
-import { FormBuilder, FormGroup, Validators, FormControl, FormArray } from '@angular/forms';
+import {FormBuilder, FormGroup, Validators, FormControl, FormArray, AbstractControl} from '@angular/forms';
 import {ActivatedRoute, Router} from '@angular/router';
 import {NotifierService} from 'angular-notifier';
 import {ListPdComponent} from './../list-pd.component';
@@ -11,7 +11,6 @@ import { PdTrigerService } from '../../../pd-service/pd-triger.service';
     styleUrls: ['./start-pd.component.scss']
 })
 export class StartPdComponent implements OnInit, OnDestroy {
-private notifier: NotifierService;
     public startPD: string;
     public mainApplicantName: string;
 //public remarks: string;
@@ -29,7 +28,31 @@ selectedQuestionIndex:number;
     getQuestionsLength: number;
     answerList: any = [];
     ansPDList: any = [];
-pdFullDetails:any=[];
+    filteredStates: any = [
+        'Co-Applicant 1 to x',
+        'Accountant',
+        'Manager',
+        'Relative of the applicant',
+        'Friend of the Applicant',
+        'DSA',
+        'Other'
+    ];
+    relationDetails: any = [1];
+// errorMessage:any;
+// selectedCategory:any=[];
+// categoryList: any=[];
+// pdMasterList: any=[];
+// optionsForm: FormGroup;
+// checkBoxForm:FormGroup;
+// textBoxForm:FormGroup;
+// next:number;
+// previous:number;
+// selectedCategoryIndex:number;
+// selectedQuestionIndex:number;
+// getQuestionsLength:number;
+// answerList:any=[];
+// ansPDList:any=[];
+// pdFullDetails:any=[];
 
 // category static form buttons
     categoryFormButtons: any = [
@@ -49,12 +72,34 @@ categoryFormButtons : any=[
             "form_id":4,
             "form_name":"Asset Details",
         },
-];
+        {
+            "form_id": 5,
+            "form_name": "Address"
+        },
+        {
+            "form_id": 6,
+            "form_name": "Family",
+        },
+        {
+            "form_id": 7,
+            "form_name": "Banking",
+        },
+        {
+            "form_id": 8,
+            "form_name": "Current Loan",
+        },
+        {
+            "form_id": 9,
+            "form_name": "Other Income",
+        },
+        {
+            "form_id": 10,
+            "form_name": "Loan Details",
+        },
 
+    ];
     formsCategoryEnable: boolean = false;
     selectedFormsCategory: any;
-
-
 // create values for status check
     pdStatusCheck: any = {
         "DRAFT": 'DRAFT',
@@ -68,6 +113,15 @@ pdStatusCheck :any={
     currentPDStatus: string;
     actualQuestions: number;
     answeredQuestions: number;
+
+
+
+    // start
+
+    // end
+    private notifier: NotifierService;
+
+
     constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute,
                 private router: Router,
                 private listPDComponent: ListPdComponent, private _pd: PdTrigerService,) {
@@ -77,6 +131,9 @@ constructor(notifier: NotifierService, private fb: FormBuilder,private route: Ac
     }
 
     ngOnInit() {
+        // start
+
+        // end
         this.listPDComponent.showListView(false);
         const elemSidebar = <HTMLElement>document.querySelector('.app-inner .mail-sidebar');
         const elemContent = <HTMLElement>document.querySelector('.app-inner .main-content');
@@ -90,6 +147,11 @@ constructor(notifier: NotifierService, private fb: FormBuilder,private route: Ac
         this.next = 1;
         this.previous = 2;
     }
+    // start
+
+
+    // end
+
     isMac(): boolean {
         let bool = false;
         if (navigator.platform.toUpperCase().indexOf('MAC') >= 0 || navigator.platform.toUpperCase().indexOf('IPAD') >= 0) {
@@ -97,6 +159,7 @@ constructor(notifier: NotifierService, private fb: FormBuilder,private route: Ac
         }
         return bool;
     }
+
 // load pd template details
     loadTemplates(startID: string) {
         this._pd.loadPDTemplates(startID).subscribe(
@@ -111,8 +174,6 @@ loadTemplates(startID:string){
                     this.actualQuestions = data.records.counts.overall_question_count;
                     this.answeredQuestions = data.records.counts.overall_answered_count;
 
-              this.pdFullDetails = data.records
-
                 }
                 else {
                     this.pdMasterList = "";
@@ -128,7 +189,6 @@ loadTemplates(startID:string){
     }
 
 
-
     isOver(): boolean {
         return window.matchMedia(`(max-width: 960px)`).matches;
     }
@@ -145,10 +205,35 @@ loadTemplates(startID:string){
             "template_id": selectedQuestions.fk_template_id,
             "category_id": selectedQuestions.fk_template_question_category_id
         }
-       this.getAnswers(serachQuestions);
-      
     }
 
+    // loadTemplates(startID:string){
+    // this._pd.loadPDTemplates(startID).subscribe(
+    //   data => {
+    //     if (data.status == 200) {
+    //         this.pdMasterList=data.records.pdmaster_details;
+    //         this.categoryList=data.records.question_answers;
+    //         let filterApplicantName= data.records.pdapplicants_detials.filter(item => item.applicant_type == 1);
+    //         this.mainApplicantName = filterApplicantName[0].applicant_name;
+    //         this.currentPDStatus = data.records.pdmaster_details.pd_status;
+    //
+    //           this.actualQuestions = data.records.counts.overall_question_count;
+    //           this.answeredQuestions = data.records.counts.overall_answered_count;
+    //
+    //           this.pdFullDetails = data.records
+    //
+    //       }
+    //     else{
+    //         this.pdMasterList="";
+    //         this.mainApplicantName="";
+    //         this.categoryList=[];
+    //         this.currentPDStatus="";
+    //     }
+    //     this.getAnswers(serachQuestions);
+    //
+    // });
+    // }
+
     // load question based answer list
     getAnswers(serachList: any) {
         this.answerList = [];
@@ -178,7 +263,6 @@ loadTemplates(startID:string){
             }, error => this.errorMessage = <any> error);
 
 
-
     }
 
     // load check box form
@@ -277,6 +361,7 @@ optionsMapItems(items) {
         let optionSelectedItems = items.filter((item) => item.options == true).map((item) => item);
         return optionSelectedItems.length ? optionSelectedItems : null;
     }
+
     // map options type while change options
     updateOptionsMapItems(key, items) {
 
@@ -355,6 +440,7 @@ optionsMapItems(items) {
         }, error => {
         });
     }
+
     // next save and previous save for  text type questions
     saveNextPreviousText(details: any, type: number) {
         let fetchAns = [];
@@ -453,7 +539,7 @@ optionsMapItems(items) {
             this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
         });
     }
-
+    // start
      // direct form based questions
     OnSelectDirectForms(details: any) {
         this.formsCategoryEnable = true;
@@ -465,8 +551,8 @@ optionsMapItems(items) {
     // load pd view component
     loadPdViewCompoent() {
         this.router.navigate(['../../viewpd', this.startPD], {relativeTo: this.route});
-
     }
 
 
+// end
  }

ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts

@@ -7,7 +7,10 @@ import {
     MatRadioModule,
     MatButtonModule, MatTableModule, MatPaginatorModule,
     MatProgressBarModule, MatDialogModule, MatSortModule,
-  MatToolbarModule,MatSelectModule, MatListModule, MatGridListModule, MatTabsModule, MatCheckboxModule, MatBadgeModule, MatExpansionModule, MatStepperModule ,MatSidenavModule ,MatMenuModule, MatButtonToggleModule } from '@angular/material';
+    MatToolbarModule, MatSelectModule, MatListModule, MatGridListModule, MatTabsModule, MatCheckboxModule,
+    MatBadgeModule, MatExpansionModule, MatStepperModule, MatSidenavModule, MatMenuModule, MatButtonToggleModule,
+    MatAutocompleteModule
+} 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';
@@ -45,7 +48,14 @@ import { QcCompletedPdComponent } from './list-pd/qc-completed-pd/qc-completed-p
 import {ClientInfoComponent} from './list-pd/start-pd/forms/client-info/client-info.component';
 import {SupplierInfoComponent} from './list-pd/start-pd/forms/supplier-info/supplier-info.component';
 import {PersonalInfoComponent} from './list-pd/start-pd/forms/personal-info/personal-info.component';
+import {CurrentLoanComponent} from "./list-pd/start-pd/forms/current-loan/current-loan.component";
+import {LoanDetailsComponent} from "./list-pd/start-pd/forms/loan-details/loan-details.component";
+import {OtherIncomeComponent} from "./list-pd/start-pd/forms/other-income/other-income.component";
 import { AssetsInfoComponent } from './list-pd/start-pd/forms/assets-info/assets-info.component';
+import {AddressComponent} from "./list-pd/start-pd/forms/address/address.component";
+import {FamilyDetailsComponent} from "./list-pd/start-pd/forms/family-details/family-details.component";
+import {BankingDetailsComponent} from "./list-pd/start-pd/forms/banking-details/banking-details.component";
+
 /**
  * Custom angular notifier options
  */
@@ -91,6 +101,37 @@ 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: [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],
+    // exports: [PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, CompletedPdComponent, QcCompletedPdComponent],
+    // providers: [PdTrigerService, GetGeometricLocationService],
+    // entryComponents: [PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent],
   imports: [
     CommonModule,
     ManagePdRoutingModule,
@@ -116,9 +157,10 @@ const pdCustomNotifierOptions: NotifierOptions = {
     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],
+  // declarations: [ListPdComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent, PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, InprogressPdComponent, AllPdComponent, ScheduledPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, SupplierInfoComponent, PersonalInfoComponent, AssetsInfoComponent],
   exports: [PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, CompletedPdComponent, QcCompletedPdComponent],
   providers: [PdTrigerService, GetGeometricLocationService],
   entryComponents: [PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent]
 })
-export class ManagePdModule { }
+export class ManagePdModule {
+}

ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts

@@ -12,12 +12,14 @@ import { AwsService } from '../../AwsService/aws.service';
 import {environment} from 'environments/environment'
 
 const currentdate = new Date().toJSON().slice(0, 19).replace('T', ' ');
+
 /** Master Interface  */
 export interface Master {
     master_id: number;
     master_name: string;
     constant_name: string;
 }
+
 @Injectable()
 
 
@@ -25,22 +27,41 @@ export class PdTrigerService {
 
     // private  apiUrl = "http://ssa.sineedge.com/sparqapi/api/";
     // private  apiUrl = "http://192.168.0.5:9999/AWSEC2/sparqapi/api/";
-  //private  apiUrl = "http://ssa.sineedge.com/sparqapi/api/";
-  private apiUrl = environment.apiEndpoint;
     MAP_API_KEY: string;
     MAP_API_URL: string;
+    // private  apiUrl = "http://ssa.sineedge.com/sparqapi/api/";
+    private apiUrl = environment.apiEndpoint;
+
     constructor(private _http: HttpClient,
                 private _aws: AwsService) {
         this.MAP_API_KEY = 'AIzaSyBtdO5k6CRntAMJCF-H5uZjTCoSGX95cdk'
         this.MAP_API_URL = `https://maps.googleapis.com/maps/api/geocode/json?key=${this.MAP_API_KEY}&address=`;
     }
+
     // get add pd master details
     getAllMasterDatas(TableName: string): Observable<any> {
-    return this._http.post<any>(this.apiUrl+'getListOfMaster', { "master_name":TableName })
+        console.log('table', TableName);
+        return this._http.post(this.apiUrl + 'getListOfMaster', {"master_name": TableName})
             .pipe(
                 catchError(this.handleError('role', []))
             )
     }
+    saveForm(records): Observable<any> {
+        console.log('table', records);
+        let params = {records}
+        return this._http.post(this.apiUrl + 'savePDFormDetails', params)
+            .pipe(
+                catchError(this.handleError('role', []))
+            )
+    }
+    retriveForm(params): Observable<any> {
+        console.log('data', params);
+        return this._http.post(this.apiUrl + 'getPDFormDetails', params)
+            .pipe(
+                catchError(this.handleError('role', []))
+            )
+    }
+
     //get product and subproduct master details
     getProductsDetails(): Observable<any> {
         return this._http.get<any>(this.apiUrl + 'getListOfProducts')
@@ -48,6 +69,7 @@ export class PdTrigerService {
                 catchError(this.handleError('role', []))
             )
     }
+
     // get lenders list
     getLenderDetails(): Observable<any> {
         return this._http.get<any>(this.apiUrl + 'getListOfLenders')
@@ -55,6 +77,7 @@ export class PdTrigerService {
                 catchError(this.handleError('role', []))
             )
     }
+
     // get customers list
     getCustomersDetails(): Observable<any> {
         return this._http.get<any>(this.apiUrl + 'getListOfCustomerSegments')
@@ -62,6 +85,7 @@ export class PdTrigerService {
                 catchError(this.handleError('role', []))
             )
     }
+
     // get Pd Allocation type details list
     getPDAllocationDetails(): Observable<any> {
         return this._http.get<any>(this.apiUrl + 'getListOfPDAllocationTypes')
@@ -69,6 +93,7 @@ export class PdTrigerService {
                 catchError(this.handleError('role', []))
             )
     }
+
     // get state and city details
     getStateCityDetails(): Observable<any> {
         return this._http.get<any>(this.apiUrl + 'getListOfStatesAndCities')
@@ -76,6 +101,7 @@ export class PdTrigerService {
                 catchError(this.handleError('role', []))
             )
     }
+
     // get pd type and allocation type details
     getPDTypeDetails(): Observable<any> {
         return this._http.get<any>(this.apiUrl + 'getListOfPDAllocationTypes')
@@ -83,6 +109,7 @@ export class PdTrigerService {
                 catchError(this.handleError('role', []))
             )
     }
+
     // add pd details
     addPdDetails(pdForm: any): Observable<any> {
         return this._http.post<any>(this.apiUrl + "triggerNewPD", pdForm)
@@ -90,6 +117,7 @@ export class PdTrigerService {
                 catchError(this.handleError('operation', []))
             )
     }
+
     // get pd details
     getPdDetails(): Observable<any> {
         return this._http.get<any>(this.apiUrl + "listLessPDDetails/get")
@@ -116,6 +144,7 @@ export class PdTrigerService {
                 catchError(this.handleError('operation', []))
             )
     }
+
     // update pd master details
     editPdMasterDetails(editData: any, status: string): Observable<any> {
         editData.pd_status = status;
@@ -127,6 +156,7 @@ export class PdTrigerService {
                 catchError(this.handleError('operation', []))
             )
     }
+
     // update pd applicant
     updatePdApplicant(editData: any): Observable<any> {
         // editData.fk_updatedby = this._aws.getlocale();
@@ -145,6 +175,7 @@ export class PdTrigerService {
                 catchError(this.handleError('operation', []))
             )
     }
+
     // update pd officer
     updatePdOfficer(updateData: any): Observable<any> {
         updateData.fk_updatedby = this._aws.getlocale();
@@ -189,6 +220,24 @@ export class PdTrigerService {
             )
     }
 
+    // save pd answers
+    // savePDQuestions(saveData: any): Observable<any> {
+    //     saveData.createdby = this._aws.getlocale();
+    //     saveData.fk_createdon = currentdate;
+    //     // saveData[0].fk_updatedby = this._aws.getlocale();
+    //     // saveData[0].updatedon = currentdate;
+    //
+    //     return this._http.post<any>(this.apiUrl + "savePDQuestions", {"records": saveData})
+    //         .pipe(
+    //             catchError(this.handleError('operation', []))
+    //         )
+    // }
+
+    private handleError<T>(operation = 'operation', result?: T) {
+        return (error: any): Observable<T> => {
+            return of(result as T);
+        };
+    }
 // common Pd form details get for the Pd Process
 getPDFormDetailsWithID(pdID, formID ):Observable<any> {
     return this._http.post<any>(this.apiUrl+"getPDFormDetails",{"pd_id":pdID,"pd_form_id" : formID})
@@ -222,9 +271,9 @@ getPDFormDetailsWithID(pdID, formID ):Observable<any> {
     )
   }
 
-  private handleError<T>(operation = 'operation', result?: T) {
+  // private handleError<T>(operation = 'operation', result?: T) {
-    return (error: any): Observable<T> => {
+  //   return (error: any): Observable<T> => {
-      return of(result as T);
+  //     return of(result as T);
-    };
+  //   };
-  }
+  // }
 }

ng6-seed/src/app/template/questions/add/add.component.html

@@ -13,14 +13,14 @@
             <mat-error *ngIf="submitted && f.fk_question_category.hasError('required')" class="mat-text-warn">You must Select Category.</mat-error>
           </mat-form-field>
         </div>
-        <div fxFlex="50">
+        <!--<div fxFlex="50">
           <mat-form-field>
             <mat-select placeholder="Select Group" formControlName="fk_question_group_id">
               <mat-option *ngFor="let gp of m_group" [value]="gp.question_group_id">{{ gp.group_name }}</mat-option>
             </mat-select>
             <mat-error *ngIf="submitted && f.fk_question_group_id.hasError('required')" class="mat-text-warn">You must Select Group.</mat-error>
           </mat-form-field>
-        </div>
+        </div>-->
       </div>
       <div fxLayout="row" fxLayoutAlign="start none">
         <div class="example-full-width">
@@ -58,13 +58,13 @@
                     <textarea matInput placeholder="Answer" formControlName="answer"></textarea>
                   </mat-form-field>
                 </div>
-                <div fxFlex="30">
+                <!--<div fxFlex="30">
                   <mat-form-field>
                     <mat-select placeholder="Select Group" formControlName="fk_question_group_id">
                       <mat-option *ngFor="let gp of m_group" [value]="gp.question_group_id">{{ gp.group_name }}</mat-option>
                     </mat-select>
                     </mat-form-field>
-                </div>
+                </div>-->
                 <div fxFlex="20">
                   <span *ngIf="_addQuesFrom.controls.answers.controls.length > 1" (click)="removeLanguage(i)">
                      <button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Delete" matTooltipPosition="above"><mat-icon>delete</mat-icon></button>

ng6-seed/src/app/template/questions/add/add.component.ts

@@ -63,7 +63,7 @@ export class AddComponent implements OnInit {
       question: [null, Validators.compose([Validators.required])],
       description: [null, Validators.compose([Validators.required])],
       fk_question_category: [null, Validators.compose([Validators.required])],
-      fk_question_group_id: [null, Validators.compose([Validators.required])],
+      // fk_question_group_id: [null, Validators.compose([Validators.required])],
       fk_question_answertype: [null, Validators.compose([Validators.required])],
       answers: this._formBuilder.array([
         this.initAnswers(),
@@ -82,7 +82,7 @@ export class AddComponent implements OnInit {
   initAnswers() {
     return this._formBuilder.group({
       answer: ['', Validators.compose([Validators.required])],
-      fk_question_group_id: ['']
+      // fk_question_group_id: ['']
     });
   }
   addLanguage(e) {