From 5de5c58367068c15b3e7aa3b35e16f7e4905c615 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Wed, 2 Jan 2019 17:22:02 +0530
Subject: [PATCH 01/29] asset : ps

---
 .../edit-pd-applicant.component.ts            | 35 ++++++-
 .../assets-info/assets-info.component.html    | 92 +++++++++++++------
 .../assets-info/assets-info.component.ts      | 92 +++++++++++++++++--
 .../start-pd/forms/stock/stock.component.html | 34 +++----
 .../start-pd/forms/stock/stock.component.scss |  4 +-
 5 files changed, 195 insertions(+), 62 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts
index 247b93d73..68e8d57a9 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts
@@ -42,7 +42,7 @@ export class EditPdApplicantComponent implements OnInit {
     this._EditApplicantForm = this._fb.group({
       fk_applicant_primary_id: [null],
       applicant_name: [null, Validators.compose([Validators.required])],
-      mobile_no: [null, Validators.compose([Validators.required,Validators.minLength(10),Validators.maxLength(12)])],
+      mobile_no: [null, Validators.compose([Validators.minLength(10),Validators.maxLength(12)])],
       stdcode: [null, Validators.compose([Validators.minLength(2),Validators.maxLength(4)])],
       landline: [null, Validators.compose([Validators.minLength(8),Validators.maxLength(12)])],
       company_name: [null],
@@ -59,7 +59,7 @@ export class EditPdApplicantComponent implements OnInit {
     this._EditApplicantForm = this._fb.group({
       fk_applicant_primary_id: [this.mainApplicantData[0].pd_co_applicant_id],
       applicant_name: [this.mainApplicantData[0].applicant_name, Validators.compose([Validators.required])],
-      mobile_no: [this.mainApplicantData[0].mobile_no, Validators.compose([Validators.required,Validators.required,Validators.minLength(10),Validators.maxLength(12)])],
+      mobile_no: [this.mainApplicantData[0].mobile_no, Validators.compose([Validators.minLength(10),Validators.maxLength(12)])],
       stdcode: [stdcode, Validators.compose([Validators.minLength(2),Validators.maxLength(4)])],
       landline: [landline, Validators.compose([Validators.minLength(6),Validators.maxLength(8)])],
       company_name: [this.mainApplicantData[0].company_name],
@@ -76,9 +76,19 @@ export class EditPdApplicantComponent implements OnInit {
   }
   createItem(listData): FormGroup {
     if(listData){
+      console.log(listData.landline);
+      let stdcode;
+      let landline;
+      if(listData.landline != null){
       let stdcodesearch = listData.landline.search("-");
-      let stdcode =  listData.landline.substr(0,stdcodesearch);
-      let landline = listData.landline.substr(+stdcodesearch + 1,8);
+      stdcode =  listData.landline.substr(0,stdcodesearch);
+      //console.log(stdcode);
+      landline = listData.landline.substr(+stdcodesearch + 1,8);}
+      else{
+        stdcode =  null;
+        landline = null;
+      }
+      console.log(landline);
       return this._fb.group({
         label: ['Co Applicant'],
         fk_applicant_primary_id: [listData.pd_co_applicant_id],
@@ -136,13 +146,28 @@ export class EditPdApplicantComponent implements OnInit {
        "isactive":1
      }];
      formValue.coApplicantItems.forEach((itemElement, itemIndex) => {
+      // console.log(itemElement.coapplicant_stdcode);
+      // console.log(itemElement.coapplicant_landline);
+      let concat_landline
+      if(itemElement.coapplicant_stdcode != null && itemElement.coapplicant_landline != null){
+        let std = itemElement.coapplicant_stdcode == '' ? '' : itemElement.coapplicant_stdcode;
+        let landline = itemElement.coapplicant_landline == '' ? '' : itemElement.coapplicant_landline;
+        concat_landline = std+'-'+landline;
+      }else if(itemElement.coapplicant_stdcode == '' && itemElement.coapplicant_landline == ''){
+        concat_landline = null;
+      }else{
+        concat_landline = null;
+      }
+      
+      
+      console.log(concat_landline);
       let obj1 =  {
         "fk_pd_id": this.data.pdID,
         "pd_co_applicant_id": itemElement.fk_applicant_primary_id,
         "applicant_name":itemElement.coapplicantName,
         "relation":itemElement.relationship,
        "mobile_no":itemElement.coapplicant_mobile_no,
-       "landline":itemElement.coapplicant_stdcode+'-'+itemElement.coapplicant_landline,
+       "landline":concat_landline,
        "applicant_type":itemElement.applicant_type,
        "company_name":itemElement.company_name,
        "isactive":1
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html
index d2346740d..a70160469 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html
@@ -101,7 +101,8 @@
                                                                         <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
                                                                             
                                                                           <mat-form-field style="width:30%">
-                                                                              <input matInput placeholder="Premium Paid" formControlName="premium_paid"  (keypress)="keyPress($event)" autocomplete="off">
+                                                                              <input matInput placeholder="Premium Paid" formControlName="premium_paid"  (keypress)="keyPress($event)" autocomplete="off" (keyup)="inWords($event,s,5)">
+                                                                              <mat-hint align="start" style="font-size:70%" *ngIf="detail.get('premium_paid').value != ''">{{"&#8377;"}} {{PremiumPaidInwords[s]}} Only</mat-hint>
                                                                             </mat-form-field>
 
                                                                           <mat-form-field style="width:30%">
@@ -117,7 +118,8 @@
 
                                                                         <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
                                                                             <mat-form-field style="width:30%">
-                                                                              <input matInput placeholder="Sum Assured" formControlName="sum_assured"  (keypress)="keyPress($event)" autocomplete="off">
+                                                                              <input matInput placeholder="Sum Assured" formControlName="sum_assured"  (keypress)="keyPress($event)" autocomplete="off" (keyup)="inWords($event,s,7)">
+                                                                              <mat-hint align="start" style="font-size:70%" *ngIf="detail.get('sum_assured').value != ''">{{"&#8377;"}} {{SumAssuredInwords[s]}} Only</mat-hint>
                                                                             </mat-form-field>
                                                                           
                                                                             <mat-form-field style="width:30%">
@@ -143,7 +145,8 @@
                                                                                   <input matInput placeholder="Specify Type" formControlName="other_investments_type" autocomplete="off">
                                                                               </mat-form-field>
                                                                               <mat-form-field style="width:30%">
-                                                                                <input matInput placeholder="Amount of Investment" formControlName="amount_of_invest"  (keypress)="keyPress($event)" autocomplete="off">
+                                                                                <input matInput placeholder="Amount of Investment" formControlName="amount_of_invest"  (keypress)="keyPress($event)" autocomplete="off" (keyup)="inWords($event,s,9)">
+                                                                                <mat-hint align="start" style="font-size:70%" *ngIf="detail.get('amount_of_invest').value != ''">{{"&#8377;"}} {{AmtInvestInwords[s]}} Only</mat-hint>
                                                                               </mat-form-field>
                                                                               <mat-form-field style="width:30%">
                                                                                 <input matInput placeholder="Bank Name" formControlName="bank_name"  autocomplete="off">                             
@@ -162,24 +165,45 @@
                                                                             <input matInput placeholder="Description of the Assets" formControlName="any_other_assets"  autocomplete="off">
                                                                           </mat-form-field>
                                                                         </div>
+
                                                                         <div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none">
+                                                                
+                                                                          <mat-form-field style="width:30%">
+                                                                                <input matInput placeholder="Value of the Assets" formControlName="any_other_asset_value"  autocomplete="off" (keyup)="inWords($event,s,11)" (keypress)="keyPress($event)">
+                                                                                <mat-hint align="start" style="font-size:70%" *ngIf="detail.get('any_other_asset_value').value != ''">{{"&#8377;"}} {{AssetValueInwords[s]}} Only</mat-hint>
+                                                                          </mat-form-field>
+
+                                                                          <mat-form-field style="width:30%">
+                                                                                <mat-select placeholder="Is there any asset loan?" formControlName="any_other_asset_loan" (selectionChange)="selectedAssetLoanType($event.value,2)">
+                                                                                    <mat-option value="{{data.value}}" *ngFor="let data of m_any_asset_loan_type">{{data.viewValue}}</mat-option>
+                                                                                </mat-select>
+                                                                          </mat-form-field>
+                                                                          
+                                                                          <mat-form-field style="width:30%" *ngIf="businessEmiAmtFlag">
+                                                                              <input matInput placeholder="What is the EMI amount ?" formControlName="other_asset_emi_amt" autocomplete="off" (keyup)="inWords($event,s,13)" (keypress)="keyPress($event)">
+                                                                              <mat-hint align="start" style="font-size:70%" *ngIf="detail.get('other_asset_emi_amt').value != ''">{{"&#8377;"}} {{B_emiAmtInwords[s]}} Only</mat-hint>
+                                                                          </mat-form-field>
+
+                                                                        </div>
+
+                                                                      <!--  <div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none">
                                                                           <mat-form-field style="width:30%">
                                                                               <input matInput placeholder="Value of the Assets" formControlName="any_other_asset_value"  autocomplete="off">
                                                                           </mat-form-field>
                                                                           <!-- <mat-form-field class="ml-xs example-full-width"> -->
                                                                                 <!-- <input matInput placeholder="Is Any Loan" formControlName="any_other_asset_loan" > -->
-                                                                            <!-- </mat-form-field> -->
+                                                                            <!-- </mat-form-field> --
                                                                             <mat-form-field style="width:30%">
                                                                                   <mat-select placeholder="Is there any asset loan?" formControlName="any_other_asset_loan" (selectionChange)="selectedAssetLoanType($event.value,2)">
                                                                                       <mat-option value="{{data.value}}" *ngFor="let data of m_any_asset_loan_type">{{data.viewValue}}</mat-option>
                                                                                   </mat-select>
                                                                                 </mat-form-field>
-                                                                            <!-- <mat-form-field class="ml-xs example-full-width" *ngIf="detail.get(any_other_asset_loan).value == 'yes'"> -->
+                                                                            <!-- <mat-form-field class="ml-xs example-full-width" *ngIf="detail.get(any_other_asset_loan).value == 'yes'"> --
                                                                                 <mat-form-field style="width:95%" *ngIf="businessEmiAmtFlag">
                                                                                 <input matInput placeholder="What is the EMI amount ?" formControlName="other_asset_emi_amt" autocomplete="off">
-                                                                                <!-- <span matSuffix>.00</span> -->
+                                                                                <!-- <span matSuffix>.00</span> --
                                                                             </mat-form-field>
-                                                                        </div>
+                                                                        </div>-->
                                                                       </div>
                                                                     </div>
                                                                 </div>
@@ -217,15 +241,15 @@
                                                           </mat-form-field>
                                                         
                                                           <mat-form-field  *ngIf="sup.get('business_emi').value === 'yes'" style="width:30%">
-                                                            <input matInput placeholder="Original Loan Tenure in Months" formControlName="business_original_loan_tenure"  autocomplete="off" (change)="loanTenureCalc(sup,2)">
+                                                            <input matInput placeholder="Original Loan Tenure in Months" formControlName="business_original_loan_tenure"  autocomplete="off" (change)="loanTenureCalc(sup,2)" (keypress)="keyPress($event)">
                                                           </mat-form-field>
                                                         
                                                           <mat-form-field *ngIf="sup.get('business_emi').value === 'yes'" style="width:30%">
-                                                            <input matInput placeholder="Balance Tenure in Months" formControlName="business_balance_tenure" autocomplete="off" (change)="loanTenureCalc(sup,2)">
+                                                            <input matInput placeholder="Balance Tenure in Months" formControlName="business_balance_tenure" autocomplete="off" (change)="loanTenureCalc(sup,2)" (keypress)="keyPress($event)">
                                                           </mat-form-field>
                                                         
                                                           <mat-form-field *ngIf="sup.get('business_emi').value === 'yes' && sup.get('business_original_loan_tenure').value != ''  && sup.get('business_balance_tenure').value != '' " style="width:30%">
-                                                            <input matInput placeholder="Elapsed Tenure in Months" formControlName="business_elapsed_tenure" autocomplete="off">
+                                                            <input matInput placeholder="Elapsed Tenure in Months" formControlName="business_elapsed_tenure" autocomplete="off" readonly>
                                                           </mat-form-field>
 
                                                         </div>
@@ -357,7 +381,8 @@
                                                               <div [formGroupName]="s">
                                                                 <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
                                                                     <mat-form-field style="width:30%">
-                                                                      <input matInput placeholder="Premium Paid" formControlName="premium_paid"  (keypress)="keyPress($event)" autocomplete="off">
+                                                                      <input matInput placeholder="Premium Paid" formControlName="premium_paid"  (keypress)="keyPress($event)" autocomplete="off" (keyup)="inWords($event,s,6)">
+                                                                      <mat-hint align="start" style="font-size:70%" *ngIf="detail.get('premium_paid').value != ''">{{"&#8377;"}} {{OtherPremiumPaidInwords[s]}} Only</mat-hint>
                                                                     </mat-form-field>
                                                                     <mat-form-field style="width:30%">
                                                                       <mat-select placeholder="Frequency" formControlName="frequency_mode" >
@@ -371,7 +396,8 @@
 
                                                                 <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
                                                                     <mat-form-field style="width:30%">
-                                                                      <input matInput placeholder="Sum Assured" formControlName="sum_assured"  (keypress)="keyPress($event)" autocomplete="off">
+                                                                      <input matInput placeholder="Sum Assured" formControlName="sum_assured"  (keypress)="keyPress($event)" autocomplete="off" (keyup)="inWords($event,s,8)">
+                                                                      <mat-hint align="start" style="font-size:70%" *ngIf="detail.get('sum_assured').value != ''">{{"&#8377;"}} {{OtherSumAssuredInwords[s]}} Only</mat-hint>
                                                                     </mat-form-field>
 
                                                                     <mat-form-field style="width:30%">
@@ -401,7 +427,8 @@
                                                                   </mat-form-field>
                                                       
                                                                   <mat-form-field style="width:30%">
-                                                                    <input matInput placeholder="Amount of Investment" formControlName="amount_of_invest"  (keypress)="keyPress($event)" autocomplete="off">
+                                                                    <input matInput placeholder="Amount of Investment" formControlName="amount_of_invest"  (keypress)="keyPress($event)" autocomplete="off" (keyup)="inWords($event,i,10)">
+                                                                    <mat-hint align="start" style="font-size:70%" *ngIf="sup.get('amount_of_invest').value != ''">{{"&#8377;"}} {{OtherAmtInvestInwords[i]}} Only</mat-hint>
                                                                   </mat-form-field>
                                                       
                                                               </div>
@@ -426,9 +453,7 @@
                                                                     </mat-form-field>
                                                               </div>
                                                               <div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none">
-                                                                    <mat-form-field style="width:30%">
-                                                                        <input matInput placeholder="Value of the Assets" formControlName="any_other_asset_value"  autocomplete="off">
-                                                                    </mat-form-field>
+                                                                  
                                                                     <mat-form-field style="width:30%">
                                                                         <mat-select placeholder="Name of the Owner"
                                                                         formControlName="name_of_the_owner" >
@@ -436,21 +461,27 @@
                                                                         </mat-select>
                                                                     </mat-form-field>
                                                       
-                                                                    <mat-form-field *ngIf="sup.get('name_of_the_owner').value == 0 && sup.get('name_of_the_owner').value != ''" style="width:30%">
+                                                                    <mat-form-field *ngIf="sup.get('name_of_the_owner').value == 0" style="width:30%">
                                                                         <input matInput placeholder="Specify Owner Name"
                                                                               formControlName="other_owner" autocomplete="off">
                                                                     </mat-form-field>
-                                                                  </div>
-                                                                  <div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none">
+
                                                                     <mat-form-field style="width:30%">
-                                                                        <mat-select placeholder="Relation" formControlName="relation" >
-                                                                            <mat-option value="{{relations.relationship_id}}"
-                                                                                        *ngFor="let relations of m_relation">
-                                                                                {{relations.name}}
-                                                                            </mat-option>
-                                                                        </mat-select>
-                                                                    </mat-form-field>
+                                                                      <mat-select placeholder="Relation" formControlName="relation" >
+                                                                          <mat-option value="{{relations.relationship_id}}"
+                                                                                      *ngFor="let relations of m_relation">
+                                                                              {{relations.name}}
+                                                                          </mat-option>
+                                                                      </mat-select>
+                                                                  </mat-form-field>
+
+                                                                </div>
+                                                                <div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none">
                                                                 
+                                                                  <mat-form-field style="width:30%">
+                                                                    <input matInput placeholder="Value of the Assets" formControlName="any_other_asset_value"  autocomplete="off" (keyup)="inWords($event,s,12)" (keypress)="keyPress($event)">
+                                                                    <mat-hint align="start" style="font-size:70%" *ngIf="detail.get('any_other_asset_value').value != ''">{{"&#8377;"}} {{OtherAssetValueInwords[s]}} Only</mat-hint>
+                                                                  </mat-form-field>
                                                                 <!-- <mat-form-field class="ml-xs example-full-width"> -->
                                                                       <!-- <input matInput placeholder="Is Any Loan" formControlName="any_other_asset_loan" > -->
                                                                   <!-- </mat-form-field> -->
@@ -463,7 +494,8 @@
                                                                   <!-- <mat-form-field class="ml-xs example-full-width" *ngIf="detail.get(any_other_asset_loan).value == 'yes'"> -->
                                                                   <mat-form-field style="width:30%" *ngIf="otherEmiamtFlag">
                                                                       <!-- <mat-form-field class="ml-xs example-full-width"> -->
-                                                                      <input matInput placeholder="What is the EMI amount ?" formControlName="other_asset_emi_amt" autocomplete="off">
+                                                                      <input matInput placeholder="What is the EMI amount ?" formControlName="other_asset_emi_amt" autocomplete="off"(keyup)="inWords($event,s,14)" (keypress)="keyPress($event)">
+                                                                      <mat-hint align="start" style="font-size:70%" *ngIf="detail.get('other_asset_emi_amt').value != ''">{{"&#8377;"}} {{O_emiAmtInwords[s]}} Only</mat-hint>
                                                                       <!-- <span matSuffix>.00</span> -->
                                                                   </mat-form-field>
                                                               </div>
@@ -514,15 +546,15 @@
                                                             </mat-form-field>
               
                                                             <mat-form-field *ngIf="sup.get('emi').value === 'yes'"  style="width:30%">
-                                                              <input matInput placeholder="Original Loan Tenure in Months" formControlName="original_loan_tenure" (change)="loanTenureCalc(sup,1)" autocomplete="off">
+                                                              <input matInput placeholder="Original Loan Tenure in Months" formControlName="original_loan_tenure" (change)="loanTenureCalc(sup,1)" (keypress)="keyPress($event)" autocomplete="off">
                                                             </mat-form-field>
               
                                                             <mat-form-field *ngIf="sup.get('emi').value === 'yes'" style="width:30%">
-                                                              <input matInput placeholder="Balance Tenure in Months" formControlName="balance_tenure" (change)="loanTenureCalc(sup,1)" autocomplete="off">
+                                                              <input matInput placeholder="Balance Tenure in Months" formControlName="balance_tenure" (change)="loanTenureCalc(sup,1)"(keypress)="keyPress($event)"  autocomplete="off">
                                                             </mat-form-field>
               
                                                             <mat-form-field *ngIf="sup.get('emi').value === 'yes' && sup.get('original_loan_tenure').value != ''  && sup.get('balance_tenure').value != '' " style="width:30%">
-                                                              <input matInput placeholder="Elapsed Tenure in Months" formControlName="elapsed_tenure" autocomplete="off">
+                                                              <input matInput placeholder="Elapsed Tenure in Months" formControlName="elapsed_tenure" autocomplete="off" readonly>
                                                             </mat-form-field>
               
                                                         </div>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts
index e6ddfeeb3..40db78e79 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts
@@ -47,6 +47,16 @@ export class AssetsInfoComponent implements OnInit {
   OtherAppxMarketAmtInwords : any = [];
   emiAmtInwords : any = [];
   OtherEmiAmtInwords : any = [];
+  PremiumPaidInwords : any = [];
+  OtherPremiumPaidInwords: any = [];
+  SumAssuredInwords: any = [];
+  OtherSumAssuredInwords: any = [];
+  AmtInvestInwords: any = [];
+  OtherAmtInvestInwords: any = [];
+  AssetValueInwords: any = [];
+  OtherAssetValueInwords: any = [];
+  B_emiAmtInwords: any = [];
+  O_emiAmtInwords: any = [];
   // public m_assets_type = [
   //   {
   //     'id': "1",
@@ -299,6 +309,8 @@ public m_investmentType = [];
   getPdSupplierFormDetails() {
     this.pdTrigerService.getPDFormDetailsWithID(this.pdid, '4').subscribe(
       data => {
+        console.log(data);
+        console.log(data.records);
         if (data) {
           if (data.dataStatus) {
             this.formLoadData(data.records);
@@ -314,6 +326,7 @@ public m_investmentType = [];
   }
 
   formLoadData(val) {
+    console.log(val);
     if (val !== null) {
       let value = val;
       this._assetsQuesFrom = this._formBuilder.group({
@@ -635,6 +648,7 @@ public m_investmentType = [];
   }
 
   initBusinessDetailsWithdata(data) {
+
     return this._formBuilder.group({
       business_assets_mode: [data.business_assets_mode],
       business_details: this._formBuilder.array([]),
@@ -654,10 +668,16 @@ public m_investmentType = [];
 
   loadDetails: boolean;
   addAssetsDetailsWithData(supp_data) {
-    console.log(supp_data);
+    //console.log(supp_data);
     var result = Object.keys(supp_data).map(function (key) {
       return supp_data[key];
     });
+    result.forEach((datas,index) => {
+
+      this.OtherAppxMarketAmtInwords[index] = this.pdTrigerService.convertNumberToWords(datas.approximate_market_value);
+      this.OtherEmiAmtInwords[index] = this.pdTrigerService.convertNumberToWords(datas.emi_paid);
+
+    });
     if (result.length > 0) {
       for (let val of result) {
         let vals = {
@@ -684,12 +704,16 @@ public m_investmentType = [];
 
   addBusinessAssetsDetailsWithData(supp_data) {
 
-    console.log(supp_data);
-
     var result = Object.keys(supp_data).map(function (key) {
       return supp_data[key];
     });
+
     if (result.length > 0) {
+      result.forEach((datas,index) => {        
+          this.appxMarketAmtInwords[index] = this.pdTrigerService.convertNumberToWords(datas.business_approximate_market_value);
+          this.emiAmtInwords[index] = this.pdTrigerService.convertNumberToWords(datas.business_emi_paid);
+      });
+
       for (let val of result) {
         let vals = {
           business_assets_mode: val.business_assets_mode,
@@ -706,10 +730,6 @@ public m_investmentType = [];
           business_balance_tenure: val.business_balance_tenure
         };
 
-        // const control = <FormArray>this._assetsQuesFrom.controls['assets_details'];
-        // control.push(this.initDetailsWithdata(vals));
-        // this.setAssetsDetailsWithData(vals.business_assets_mode, val.details, control.length - 1)
-
         const control = <FormArray>this._assetsQuesFrom.controls['business_assets_details'];
         control.push(this.initBusinessDetailsWithdata(vals));
         this.setBusinessAssetsDetailsWithData(vals.business_assets_mode, val.business_details, control.length - 1)
@@ -755,16 +775,27 @@ public m_investmentType = [];
         break;
       }
       case '6': {
+        data.forEach((datas,i) => {
+          this.OtherPremiumPaidInwords[i] = this.pdTrigerService.convertNumberToWords(+datas.premium_paid);
+          this.OtherSumAssuredInwords[i] = this.pdTrigerService.convertNumberToWords(+datas.sum_assured);
+        });
         const control = (<FormArray>this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray;
         control.push(this.loadInsuranceDescriptionWithData(data));
         break;
       }
       case '7': {
+        data.forEach((datas,i) => {
+           this.OtherAmtInvestInwords[i] = this.pdTrigerService.convertNumberToWords(+datas.amount_of_invest);
+        });
         const control = (<FormArray>this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray;
         control.push(this.loadInvestDescriptionWithData(data));
         break;
       }
       case '8': {
+        data.forEach((datas,i) => {
+          this.OtherAssetValueInwords[i] = this.pdTrigerService.convertNumberToWords(+data.any_other_asset_value);
+          this.O_emiAmtInwords[i] = this.pdTrigerService.convertNumberToWords(+datas.other_asset_emi_amt);
+        });
         const control = (<FormArray>this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray;
         control.push(this.otherAssetsDescriptionWithData(data));
         break;
@@ -776,6 +807,7 @@ public m_investmentType = [];
   }
 
   setBusinessAssetsDetailsWithData(assets_details_mode: any, datas: any, i: any): void {
+    console.log(datas);
     let val = i;
     let data = datas;
     const arr = (<FormArray>this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ;
@@ -806,16 +838,27 @@ public m_investmentType = [];
         break;
       }
       case '6': {
+        data.forEach((datas,i) => {
+          this.PremiumPaidInwords[i] = this.pdTrigerService.convertNumberToWords(+datas.premium_paid);
+          this.SumAssuredInwords[i] = this.pdTrigerService.convertNumberToWords(+datas.sum_assured);
+        });
         const control = (<FormArray>this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ;
         control.push(this.loadInsuranceDescriptionWithData(data));
         break;
       }
       case '7': {
+        data.forEach((datas,i) => {
+          this.AmtInvestInwords[i] = this.pdTrigerService.convertNumberToWords(+datas.amount_of_invest);
+        });
         const control = (<FormArray>this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ;
         control.push(this.loadInvestDescriptionWithData(data));
         break;
       }
       case '8': {
+        data.forEach((datas,i) => {
+          this.AssetValueInwords[i] = this.pdTrigerService.convertNumberToWords(+data.any_other_asset_value);
+          this.B_emiAmtInwords[i] = this.pdTrigerService.convertNumberToWords(+datas.other_asset_emi_amt);
+        });
         const control = (<FormArray>this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ;
         control.push(this.otherBusinessAssetsDescriptionWithData(data));
         break;
@@ -875,6 +918,7 @@ public m_investmentType = [];
 
   /** To Save/Edited Popup Data */
   onSubmit() {
+    console.log(this._assetsQuesFrom.value);
     this.submitted = true;
     
     // stop here if form is invalid
@@ -903,7 +947,7 @@ public m_investmentType = [];
           val.business_elapsed_tenure = '';
         }
       });
-
+console.log(answerFormValues);
       // Save the data with help of Service 
       this.pdTrigerService.savePDFormDetailsWithID(answerFormValues).subscribe(
         dataresult => {
@@ -979,8 +1023,38 @@ inWords(e,i,flag){
   case 4 :
       this.OtherEmiAmtInwords[i] = this.pdTrigerService.convertNumberToWords(e.target.value);
       break;
+  case 5 :
+      this.PremiumPaidInwords[i] = this.pdTrigerService.convertNumberToWords(e.target.value);
+      break;
+  case 6 :
+      this.OtherPremiumPaidInwords[i] = this.pdTrigerService.convertNumberToWords(e.target.value);
+      break;
+  case 7 :
+  this.SumAssuredInwords[i] = this.pdTrigerService.convertNumberToWords(e.target.value);
+      break;
+  case 8 :
+  this.OtherSumAssuredInwords[i] = this.pdTrigerService.convertNumberToWords(e.target.value);
+      break;
+  case 9 :
+  this.AmtInvestInwords[i] = this.pdTrigerService.convertNumberToWords(e.target.value);
+      break;
+  case 10 :
+  this.OtherAmtInvestInwords[i] = this.pdTrigerService.convertNumberToWords(e.target.value);
+      break;
+  case 11 :
+  this.AssetValueInwords[i] = this.pdTrigerService.convertNumberToWords(e.target.value);
+      break;
+  case 12 :
+       this.OtherAssetValueInwords[i] = this.pdTrigerService.convertNumberToWords(e.target.value);
+  break;
+  case 13:
+  this.B_emiAmtInwords[i] = this.pdTrigerService.convertNumberToWords(e.target.value);
+  break;
+  case 14:
+  this.O_emiAmtInwords[i] = this.pdTrigerService.convertNumberToWords(e.target.value);
+  break;
   default:
       break;
   }
 }
-}
+}
\ No newline at end of file
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
index 68a1078bd..45d918e60 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
@@ -18,13 +18,13 @@
                 <div fxFlex="100">
                     <mat-card *ngIf="manufacturingForm">
                             <mat-card-header>
-                                    <mat-card-title><p> Manufacturing Details</p></mat-card-title>
+                              <mat-card-title class="highlight"> Manufacturing Details </mat-card-title>
                             </mat-card-header>
                             <div formArrayName="manufacturing_details">
                                 <div *ngFor="let md of stockForms.controls.manufacturing_details['controls']; let i=index" [formGroupName]="i">        
                                     <div formArrayName="manufacturing_raw_materials">
                                         <div *ngFor="let mrm of md.controls.manufacturing_raw_materials['controls']; let a=index" [formGroupName]="a">    
-                                                <mat-card-subtitle> <p>{{a+1}} . Raw Material </p> </mat-card-subtitle>
+                                                <mat-label class="highlight"> <i> <p>{{a+1}} . Raw Material </p> </i> </mat-label>
                                                 <mat-card-content class="matcard">
                                                     <mat-form-field style="width:30%">
                                                         <input matInput autocomplete="off" placeholder="Name" formControlName="raw_name" >
@@ -62,7 +62,7 @@
                                                                 </mat-select>
                                                             </mat-form-field>
                                                             <mat-form-field *ngIf="mrm.get('is_sufficiant_raw').value == 'no'" appearance="outline" style="width: 90%">
-                                                                <mat-label>Please comment on the stock level observed?</mat-label>
+                                                                <mat-label class="highlight"> <i>Please comment on the stock level observed?</i> </mat-label>
                                                                 <textarea matInput autocomplete="off" placeholder="Please comment on the stock level observed" formControlName="rawmaterial_remarks"></textarea>
                                                             </mat-form-field>
                                                     </span>
@@ -80,7 +80,7 @@
 
                                     <div formArrayName="manufacturing_finished_goods">
                                         <div *ngFor="let mfg of md.controls.manufacturing_finished_goods['controls']; let b=index" [formGroupName]="b">    
-                                                <mat-card-subtitle> <p> {{b+1}} Finished Goods </p> </mat-card-subtitle>
+                                                <mat-label class="highlight"> <i> <p> {{b+1}} Finished Goods </p> </i> </mat-label>
                                                 <mat-card-content class="matcard">
                                                     <mat-form-field style="width:30%">
                                                         <input matInput autocomplete="off" placeholder="Name" formControlName="goods_name" >
@@ -109,7 +109,7 @@
                                                             </mat-select>
                                                         </mat-form-field>
                                                         <mat-form-field *ngIf="mfg.get('is_sufficiant_goods').value == 'no'" appearance="outline" style="width: 90%">
-                                                            <mat-label>Please comment on the finished goods stock level observed?</mat-label>
+                                                            <mat-label class="highlight"> <i>Please comment on the finished goods stock level observed?</i> </mat-label>
                                                             <textarea matInput autocomplete="off" placeholder="Please comment on the finished goods observed" formControlName="finishedgoods_remarks"></textarea>
                                                         </mat-form-field>
                                                     </span>
@@ -128,7 +128,7 @@
 
                                     <div formArrayName="manufacturing_traded_goods">
                                         <div *ngFor="let mtg of md.controls.manufacturing_traded_goods['controls']; let c=index" [formGroupName]="c">    
-                                            <mat-card-subtitle> <p>{{c+1}} Traded Goods </p> </mat-card-subtitle>
+                                            <mat-label class="highlight"> <i> <p>{{c+1}} Traded Goods </p> </i> </mat-label>
                                                 <mat-card-content class="matcard">
                                                     <mat-form-field style="width:30%">
                                                         <input matInput autocomplete="off" placeholder="Name" formControlName="traded_goods_name" >
@@ -158,7 +158,7 @@
                                                             </mat-select>
                                                         </mat-form-field>
                                                         <mat-form-field *ngIf="mtg.get('is_sufficiant_traded_goods').value == 'no'" appearance="outline" style="width: 90%">
-                                                            <mat-label>Please comment on the Traded Goods stock level observed?</mat-label>
+                                                            <mat-label class="highlight"> <i>Please comment on the Traded Goods stock level observed?</i> </mat-label>
                                                             <textarea matInput autocomplete="off" placeholder="Please comment on the traded goods stock level observed" formControlName="traded_goods_remarks"></textarea>
                                                         </mat-form-field>
                                                     </span>
@@ -185,10 +185,10 @@
                         
                             <div formArrayName="retail_details">
                                 <div *ngFor="let rd of stockForms.controls.retail_details['controls']; let j=index" [formGroupName]="j">
-                                    
+
                                     <div formArrayName="retail_finished_goods">
                                         <div *ngFor="let retailfg of rd.controls.retail_finished_goods['controls']; let d=index" [formGroupName]="d">    
-                                                <mat-card-subtitle> <p>{{d+1}} Finished Goods </p> </mat-card-subtitle>
+                                                <mat-label class="highlight"> <i> <p>{{d+1}} Finished Goods </p> </i> </mat-label>
                                                 <mat-card-content class="matcard">
                                                     <mat-form-field style="width:30%">
                                                         <input matInput autocomplete="off" placeholder="Name" formControlName="goods_name" >
@@ -218,7 +218,7 @@
                                                             </mat-select>
                                                         </mat-form-field>
                                                         <mat-form-field *ngIf="retailfg.get('is_sufficiant_goods').value == 'no'" appearance="outline" style="width: 90%">
-                                                            <mat-label>Please comment on the finished goods stock level observed?</mat-label>
+                                                            <mat-label class="highlight"> <i>Please comment on the finished goods stock level observed?</i> </mat-label>
                                                             <textarea matInput autocomplete="off" placeholder="Please comment on the finished goods observed" formControlName="finishedgoods_remarks"></textarea>
                                                         </mat-form-field>
                                                     </span>
@@ -237,7 +237,7 @@
 
                                     <div formArrayName="retail_traded_goods">
                                         <div *ngFor="let item of rd.controls.retail_traded_goods['controls']; let e=index" [formGroupName]="e">    
-                                                <mat-card-subtitle> <p>{{e+1}} Traded Goods </p> </mat-card-subtitle>
+                                                <mat-label class="highlight"> <i> <p>{{e+1}} Traded Goods </p> </i> </mat-label>
                                                 <mat-card-content class="matcard">
                                                     <mat-form-field style="width:30%">
                                                         <input matInput autocomplete="off" placeholder="Name" formControlName="traded_goods_name" >
@@ -267,7 +267,7 @@
                                                                 </mat-select>
                                                             </mat-form-field>
                                                             <mat-form-field *ngIf="item.get('is_sufficiant_traded_goods').value == 'no'" appearance="outline" style="width: 90%">
-                                                                <mat-label>Please comment on the Traded Goods stock level observed?</mat-label>
+                                                                <mat-label class="highlight"> <i>Please comment on the Traded Goods stock level observed?</i> </mat-label>
                                                                 <textarea matInput autocomplete="off" placeholder="Please comment on the traded goods stock level observed" formControlName="traded_goods_remarks"></textarea>
                                                             </mat-form-field>
                                                     </span>
@@ -298,7 +298,7 @@
                                 <div *ngFor="let td of stockForms.controls.trade_details['controls']; let k=index" [formGroupName]="k">
                                     <div formArrayName="trading_finished_goods">
                                         <div *ngFor="let tradesubdetail of td.controls.trading_finished_goods['controls']; let f=index" [formGroupName]="f">    
-                                                <mat-card-subtitle> <p>{{f+1}} Finished Goods </p> </mat-card-subtitle>
+                                                <mat-label class="highlight"> <i> <p>{{f+1}} Finished Goods </p> </i> </mat-label>
                                                 <mat-card-content class="matcard">
                                                     <mat-form-field style="width:30%">
                                                         <input matInput autocomplete="off" placeholder="Name" formControlName="goods_name" >
@@ -328,7 +328,7 @@
                                                             </mat-select>
                                                         </mat-form-field>
                                                         <mat-form-field *ngIf="tradesubdetail.get('is_sufficiant_goods').value == 'no'" appearance="outline" style="width: 90%">
-                                                            <mat-label>Please comment on the finished goods stock level observed?</mat-label>
+                                                            <mat-label class="highlight"> <i>Please comment on the finished goods stock level observed?</i> </mat-label>
                                                             <textarea matInput autocomplete="off" placeholder="Please comment on the finished goods observed" formControlName="finishedgoods_remarks"></textarea>
                                                         </mat-form-field>
                                                     </span>
@@ -348,7 +348,7 @@
 
                                     <div formArrayName="trading_traded_goods">
                                         <div *ngFor="let tradetg of td.controls.trading_traded_goods['controls']; let g=index" [formGroupName]="g">    
-                                                <mat-card-subtitle> <p>{{g+1}} Traded Goods </p> </mat-card-subtitle>
+                                                <mat-label class="highlight"> <i> <p>{{g+1}} Traded Goods </p> </i> </mat-label>
                                                     <mat-card-content class="matcard">
                                                             <mat-form-field style="width:30%">
                                                                 <input matInput autocomplete="off" placeholder="Name" formControlName="traded_goods_name" >
@@ -378,7 +378,7 @@
                                                                                 </mat-select>
                                                                             </mat-form-field>
                                                                             <mat-form-field *ngIf="tradetg.get('is_sufficiant_traded_goods').value == 'no'" appearance="outline" style="width: 90%">
-                                                                                    <mat-label>Please comment on the Traded Goods stock level observed?</mat-label>
+                                                                                    <mat-label class="highlight"> <i>Please comment on the Traded Goods stock level observed?</i> </mat-label>
                                                                                     <textarea matInput autocomplete="off" placeholder="Please comment on the traded goods stock level observed" formControlName="traded_goods_remarks"></textarea>
                                                                             </mat-form-field>
                                                             </span>
@@ -515,7 +515,7 @@
 <mat-dialog-actions>
     <div fxFlex="60" class="pb-0 text-sm-left" align="left">
             <mat-form-field appearance="outline" style="width: 100%">
-                    <mat-label>Remarks</mat-label>
+                    <mat-label class="highlight"> <i>Remarks</i> </mat-label>
                     <textarea matInput autocomplete="off" placeholder="Remarks" formControlName="stock_remarks"></textarea>
             </mat-form-field>
     </div>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.scss
index baeef985a..69732ceb7 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.scss
@@ -16,7 +16,9 @@
 //   background: #62B013;
 //   color: white;
 // }
-
+.highlight {
+    color: red;
+  }
 .paragraph_change {
   color:  #fff !important;
   background-color: #e00201 !important;

From 019a08f53750c921436593d6d1aaa23ed4c0c951 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Wed, 2 Jan 2019 17:37:53 +0530
Subject: [PATCH 02/29] merge : ps

---
 ng6-seed/package-lock.json | 459 ++++++++++---------------------------
 1 file changed, 121 insertions(+), 338 deletions(-)

diff --git a/ng6-seed/package-lock.json b/ng6-seed/package-lock.json
index 20045553b..c56a6d0a5 100755
--- a/ng6-seed/package-lock.json
+++ b/ng6-seed/package-lock.json
@@ -49,7 +49,7 @@
         "memory-fs": "0.4.1",
         "mini-css-extract-plugin": "0.4.5",
         "minimatch": "3.0.4",
-        "node-sass": "4.10.0",
+        "node-sass": "4.11.0",
         "opn": "5.3.0",
         "parse5": "4.0.0",
         "portfinder": "1.0.19",
@@ -590,6 +590,11 @@
         "aws-sdk": "2.319.0"
       }
     },
+    "@types/file-saver": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/file-saver/-/file-saver-2.0.0.tgz",
+      "integrity": "sha512-dxdRrUov2HVTbSRFX+7xwUPlbGYVEZK6PrSqClg2QPos3PNe0bCajkDDkDeeC1znjSH03KOEqVbXpnJuWa2wgQ=="
+    },
     "@types/jasmine": {
       "version": "2.5.52",
       "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.5.52.tgz",
@@ -871,8 +876,7 @@
     "abbrev": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
-      "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
-      "dev": true
+      "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU="
     },
     "accepts": {
       "version": "1.3.5",
@@ -971,8 +975,7 @@
     "amdefine": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
-      "dev": true
+      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU="
     },
     "angular-calendar": {
       "version": "0.23.3",
@@ -1031,8 +1034,7 @@
     "ansi-regex": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "dev": true
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
     },
     "ansi-styles": {
       "version": "3.2.1",
@@ -1082,14 +1084,12 @@
     "aproba": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-      "dev": true
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
     },
     "are-we-there-yet": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
       "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
-      "dev": true,
       "requires": {
         "delegates": "1.0.0",
         "readable-stream": "2.3.6"
@@ -1125,9 +1125,7 @@
     "array-find-index": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
-      "dev": true,
-      "optional": true
+      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E="
     },
     "array-flatten": {
       "version": "2.1.1",
@@ -1185,7 +1183,6 @@
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
       "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-      "dev": true,
       "requires": {
         "safer-buffer": "2.1.2"
       }
@@ -1230,8 +1227,7 @@
     "assert-plus": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "dev": true
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
     },
     "assign-symbols": {
       "version": "1.0.0",
@@ -1254,15 +1250,12 @@
     "async-foreach": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
-      "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
-      "dev": true,
-      "optional": true
+      "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI="
     },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-      "dev": true
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "atoa": {
       "version": "1.0.0",
@@ -1345,14 +1338,12 @@
     "aws-sign2": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-      "dev": true
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
     },
     "aws4": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
-      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
-      "dev": true
+      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
     },
     "babel-code-frame": {
       "version": "6.26.0",
@@ -1483,8 +1474,7 @@
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "dev": true
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
     },
     "base": {
       "version": "0.11.2",
@@ -1568,7 +1558,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
       "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-      "dev": true,
       "optional": true,
       "requires": {
         "tweetnacl": "0.14.5"
@@ -1604,8 +1593,6 @@
       "version": "0.0.9",
       "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
       "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
-      "dev": true,
-      "optional": true,
       "requires": {
         "inherits": "2.0.3"
       }
@@ -1686,7 +1673,6 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
       "requires": {
         "balanced-match": "1.0.0",
         "concat-map": "0.0.1"
@@ -1861,8 +1847,7 @@
     "builtin-modules": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
-      "dev": true
+      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8="
     },
     "builtin-status-codes": {
       "version": "3.0.0",
@@ -1956,16 +1941,12 @@
     "camelcase": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-      "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-      "dev": true,
-      "optional": true
+      "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8="
     },
     "camelcase-keys": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
       "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
-      "dev": true,
-      "optional": true,
       "requires": {
         "camelcase": "2.1.1",
         "map-obj": "1.0.1"
@@ -1980,8 +1961,7 @@
     "caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-      "dev": true
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
     "chalk": {
       "version": "2.2.2",
@@ -2130,8 +2110,6 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
       "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-      "dev": true,
-      "optional": true,
       "requires": {
         "string-width": "1.0.2",
         "strip-ansi": "3.0.1",
@@ -2158,14 +2136,12 @@
     "co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-      "dev": true
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
     },
     "code-point-at": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-      "dev": true
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
     },
     "codelyzer": {
       "version": "4.1.0",
@@ -2220,7 +2196,6 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
       "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
-      "dev": true,
       "requires": {
         "delayed-stream": "1.0.0"
       }
@@ -2281,8 +2256,7 @@
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
     },
     "concat-stream": {
       "version": "1.6.2",
@@ -2349,8 +2323,7 @@
     "console-control-strings": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-      "dev": true
+      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
     },
     "constants-browserify": {
       "version": "1.0.0",
@@ -2444,8 +2417,7 @@
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-      "dev": true
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "cosmiconfig": {
       "version": "4.0.0",
@@ -2512,8 +2484,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
       "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
-      "dev": true,
-      "optional": true,
       "requires": {
         "lru-cache": "4.1.3",
         "which": "1.3.1"
@@ -2606,8 +2576,6 @@
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
       "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
-      "dev": true,
-      "optional": true,
       "requires": {
         "array-find-index": "1.0.2"
       }
@@ -3013,7 +2981,6 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
       "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "dev": true,
       "requires": {
         "assert-plus": "1.0.0"
       }
@@ -3041,8 +3008,7 @@
     "decamelize": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-      "dev": true
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
     },
     "decode-uri-component": {
       "version": "0.2.0",
@@ -3170,14 +3136,12 @@
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-      "dev": true
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
     },
     "delegates": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-      "dev": true
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
     },
     "depd": {
       "version": "1.1.2",
@@ -3369,7 +3333,6 @@
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
       "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-      "dev": true,
       "optional": true,
       "requires": {
         "jsbn": "0.1.1",
@@ -3557,7 +3520,6 @@
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
       "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dev": true,
       "requires": {
         "is-arrayish": "0.2.1"
       }
@@ -3595,8 +3557,7 @@
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "escodegen": {
       "version": "1.8.1",
@@ -4063,8 +4024,7 @@
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "dev": true
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
     },
     "fast-deep-equal": {
       "version": "1.1.0",
@@ -4112,6 +4072,11 @@
         "schema-utils": "0.4.7"
       }
     },
+    "file-saver": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.0.tgz",
+      "integrity": "sha512-cYM1ic5DAkg25pHKgi5f10ziAM7RJU37gaH1XQlyNDrtUnzhC/dfoV9zf2OmF0RMKi42jG5B0JWBnPQqyj/G6g=="
+    },
     "filename-regex": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
@@ -4239,14 +4204,12 @@
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-      "dev": true
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
     },
     "form-data": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
       "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
-      "dev": true,
       "requires": {
         "asynckit": "0.4.0",
         "combined-stream": "1.0.6",
@@ -4308,8 +4271,7 @@
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
     "fsevents": {
       "version": "1.2.4",
@@ -4352,14 +4314,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "1.0.0",
             "concat-map": "0.0.1"
@@ -4374,20 +4334,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -4504,8 +4461,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -4517,7 +4473,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "1.0.1"
           }
@@ -4532,7 +4487,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "1.1.11"
           }
@@ -4540,14 +4494,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "5.1.1",
             "yallist": "3.0.2"
@@ -4566,7 +4518,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -4647,8 +4598,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -4660,7 +4610,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1.0.2"
           }
@@ -4782,7 +4731,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "1.1.0",
             "is-fullwidth-code-point": "1.0.0",
@@ -4858,7 +4806,6 @@
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
       "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
-      "dev": true,
       "requires": {
         "graceful-fs": "4.1.11",
         "inherits": "2.0.3",
@@ -4876,7 +4823,6 @@
       "version": "2.7.4",
       "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-      "dev": true,
       "requires": {
         "aproba": "1.2.0",
         "console-control-strings": "1.1.0",
@@ -4892,8 +4838,6 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
       "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
-      "dev": true,
-      "optional": true,
       "requires": {
         "globule": "1.2.1"
       }
@@ -4901,14 +4845,12 @@
     "get-caller-file": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
-      "dev": true
+      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
     },
     "get-stdin": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-      "dev": true
+      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4="
     },
     "get-stream": {
       "version": "3.0.0",
@@ -4926,7 +4868,6 @@
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
       "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "dev": true,
       "requires": {
         "assert-plus": "1.0.0"
       }
@@ -4935,7 +4876,6 @@
       "version": "7.1.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
       "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
-      "dev": true,
       "requires": {
         "fs.realpath": "1.0.0",
         "inflight": "1.0.6",
@@ -5026,8 +4966,6 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz",
       "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==",
-      "dev": true,
-      "optional": true,
       "requires": {
         "glob": "7.1.3",
         "lodash": "4.17.11",
@@ -5037,17 +4975,14 @@
         "lodash": {
           "version": "4.17.11",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
-          "dev": true,
-          "optional": true
+          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
         }
       }
     },
     "graceful-fs": {
       "version": "4.1.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-      "dev": true
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
     },
     "hammerjs": {
       "version": "2.0.8",
@@ -5098,14 +5033,12 @@
     "har-schema": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-      "dev": true
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
     },
     "har-validator": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.0.tgz",
       "integrity": "sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==",
-      "dev": true,
       "requires": {
         "ajv": "5.5.2",
         "har-schema": "2.0.0"
@@ -5115,7 +5048,6 @@
           "version": "5.5.2",
           "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
           "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
-          "dev": true,
           "requires": {
             "co": "4.6.0",
             "fast-deep-equal": "1.1.0",
@@ -5138,7 +5070,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
       "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "dev": true,
       "requires": {
         "ansi-regex": "2.1.1"
       }
@@ -5181,8 +5112,7 @@
     "has-unicode": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
-      "dev": true
+      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
     },
     "has-value": {
       "version": "1.0.0",
@@ -5256,8 +5186,7 @@
     "hosted-git-info": {
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
-      "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==",
-      "dev": true
+      "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w=="
     },
     "hpack.js": {
       "version": "2.1.6",
@@ -5443,7 +5372,6 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
       "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "dev": true,
       "requires": {
         "assert-plus": "1.0.0",
         "jsprim": "1.4.1",
@@ -5590,16 +5518,12 @@
     "in-publish": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz",
-      "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=",
-      "dev": true,
-      "optional": true
+      "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E="
     },
     "indent-string": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
       "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-      "dev": true,
-      "optional": true,
       "requires": {
         "repeating": "2.0.1"
       }
@@ -5614,7 +5538,6 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
       "requires": {
         "once": "1.4.0",
         "wrappy": "1.0.2"
@@ -5623,8 +5546,7 @@
     "inherits": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-      "dev": true
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
     "ini": {
       "version": "1.3.5",
@@ -5659,9 +5581,7 @@
     "invert-kv": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
-      "dev": true,
-      "optional": true
+      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
     },
     "ip": {
       "version": "1.1.5",
@@ -5704,8 +5624,7 @@
     "is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-      "dev": true
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
     },
     "is-binary-path": {
       "version": "1.0.1",
@@ -5726,7 +5645,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
       "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
-      "dev": true,
       "requires": {
         "builtin-modules": "1.1.1"
       }
@@ -5819,7 +5737,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
       "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
-      "dev": true,
       "requires": {
         "number-is-nan": "1.0.1"
       }
@@ -5828,7 +5745,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
       "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-      "dev": true,
       "requires": {
         "number-is-nan": "1.0.1"
       }
@@ -5934,14 +5850,12 @@
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-      "dev": true
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
     },
     "is-utf8": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-      "dev": true
+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
     },
     "is-windows": {
       "version": "1.0.2",
@@ -5972,8 +5886,7 @@
     "isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
     },
     "isobject": {
       "version": "3.0.1",
@@ -5984,8 +5897,7 @@
     "isstream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-      "dev": true
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
     },
     "istanbul": {
       "version": "0.4.5",
@@ -6269,11 +6181,9 @@
       "integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c="
     },
     "js-base64": {
-      "version": "2.4.9",
-      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.9.tgz",
-      "integrity": "sha512-xcinL3AuDJk7VSzsHgb9DvvIXayBbadtMZ4HFPx8rUszbW1MuNMlwYVC4zzCZ6e1sqZpnNS5ZFYOhXqA39T7LQ==",
-      "dev": true,
-      "optional": true
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.0.tgz",
+      "integrity": "sha512-wlEBIZ5LP8usDylWbDNhKPEFVFdI5hCHpnVoT/Ysvoi/PRhJENm/Rlh9TvjYB38HFfKZN7OzEbRjmjvLkFw11g=="
     },
     "js-cookie": {
       "version": "2.2.0",
@@ -6308,7 +6218,6 @@
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
       "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "dev": true,
       "optional": true
     },
     "jsesc": {
@@ -6326,8 +6235,7 @@
     "json-schema": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-      "dev": true
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
     },
     "json-schema-traverse": {
       "version": "0.3.1",
@@ -6337,8 +6245,7 @@
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-      "dev": true
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
     },
     "json3": {
       "version": "3.3.2",
@@ -6355,7 +6262,6 @@
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
       "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "dev": true,
       "requires": {
         "assert-plus": "1.0.0",
         "extsprintf": "1.3.0",
@@ -6599,8 +6505,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
       "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-      "dev": true,
-      "optional": true,
       "requires": {
         "invert-kv": "1.0.0"
       }
@@ -6685,9 +6589,8 @@
     },
     "load-json-file": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
       "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-      "dev": true,
       "requires": {
         "graceful-fs": "4.1.11",
         "parse-json": "2.2.0",
@@ -6698,9 +6601,8 @@
       "dependencies": {
         "pify": {
           "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
+          "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
         }
       }
     },
@@ -6738,15 +6640,12 @@
     "lodash.assign": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
-      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
-      "dev": true,
-      "optional": true
+      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc="
     },
     "lodash.clonedeep": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
-      "dev": true
+      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8="
     },
     "lodash.debounce": {
       "version": "4.0.8",
@@ -6757,9 +6656,7 @@
     "lodash.mergewith": {
       "version": "4.6.1",
       "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz",
-      "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==",
-      "dev": true,
-      "optional": true
+      "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ=="
     },
     "lodash.tail": {
       "version": "4.1.1",
@@ -6834,8 +6731,6 @@
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
       "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
-      "dev": true,
-      "optional": true,
       "requires": {
         "currently-unhandled": "0.4.1",
         "signal-exit": "3.0.2"
@@ -6851,7 +6746,6 @@
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
       "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
-      "dev": true,
       "requires": {
         "pseudomap": "1.0.2",
         "yallist": "2.1.2"
@@ -6890,8 +6784,7 @@
     "map-obj": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-      "dev": true
+      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0="
     },
     "map-visit": {
       "version": "1.0.0",
@@ -6948,10 +6841,8 @@
     },
     "meow": {
       "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+      "resolved": "http://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
       "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
-      "dev": true,
-      "optional": true,
       "requires": {
         "camelcase-keys": "2.1.0",
         "decamelize": "1.2.0",
@@ -7017,14 +6908,12 @@
     "mime-db": {
       "version": "1.36.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.36.0.tgz",
-      "integrity": "sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==",
-      "dev": true
+      "integrity": "sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw=="
     },
     "mime-types": {
       "version": "2.1.20",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.20.tgz",
       "integrity": "sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==",
-      "dev": true,
       "requires": {
         "mime-db": "1.36.0"
       }
@@ -7075,7 +6964,6 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
       "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
       "requires": {
         "brace-expansion": "1.1.11"
       }
@@ -7146,7 +7034,6 @@
       "version": "0.5.1",
       "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
       "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "dev": true,
       "requires": {
         "minimist": "0.0.8"
       },
@@ -7154,8 +7041,7 @@
         "minimist": {
           "version": "0.0.8",
           "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
         }
       }
     },
@@ -7213,9 +7099,7 @@
     "nan": {
       "version": "2.11.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.0.tgz",
-      "integrity": "sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw==",
-      "dev": true,
-      "optional": true
+      "integrity": "sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw=="
     },
     "nanomatch": {
       "version": "1.2.13",
@@ -7340,7 +7224,7 @@
       "resolved": "https://registry.npmjs.org/ngx-viewer/-/ngx-viewer-1.0.1.tgz",
       "integrity": "sha512-9nYfxsxco/x8zLjdVOAhi4SFMZhSgtHBGTmcns9ebQn5nCBwHbk9O62K5ZIWkfOElr9ey1KA+DmppH32YGkXEA==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "1.9.3"
       }
     },
     "nice-try": {
@@ -7373,8 +7257,6 @@
       "version": "3.8.0",
       "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
       "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
-      "dev": true,
-      "optional": true,
       "requires": {
         "fstream": "1.0.11",
         "glob": "7.1.3",
@@ -7392,10 +7274,8 @@
       "dependencies": {
         "semver": {
           "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
-          "dev": true,
-          "optional": true
+          "resolved": "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
         }
       }
     },
@@ -7439,11 +7319,9 @@
       }
     },
     "node-sass": {
-      "version": "4.10.0",
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.10.0.tgz",
-      "integrity": "sha512-fDQJfXszw6vek63Fe/ldkYXmRYK/QS6NbvM3i5oEo9ntPDy4XX7BcKZyTKv+/kSSxRtXXc7l+MSwEmYc0CSy6Q==",
-      "dev": true,
-      "optional": true,
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.11.0.tgz",
+      "integrity": "sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==",
       "requires": {
         "async-foreach": "0.1.3",
         "chalk": "1.1.3",
@@ -7469,16 +7347,12 @@
         "ansi-styles": {
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true,
-          "optional": true
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
         },
         "chalk": {
           "version": "1.1.3",
-          "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "optional": true,
           "requires": {
             "ansi-styles": "2.2.1",
             "escape-string-regexp": "1.0.5",
@@ -7489,10 +7363,8 @@
         },
         "supports-color": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true,
-          "optional": true
+          "resolved": "http://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
         }
       }
     },
@@ -7500,7 +7372,6 @@
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
       "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-      "dev": true,
       "requires": {
         "abbrev": "1.0.9"
       }
@@ -7509,7 +7380,6 @@
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
       "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
-      "dev": true,
       "requires": {
         "hosted-git-info": "2.7.1",
         "is-builtin-module": "1.0.0",
@@ -7577,7 +7447,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
       "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
-      "dev": true,
       "requires": {
         "are-we-there-yet": "1.1.5",
         "console-control-strings": "1.1.0",
@@ -7609,20 +7478,17 @@
     "number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-      "dev": true
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
     },
     "oauth-sign": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-      "dev": true
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
     },
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "dev": true
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
     "object-component": {
       "version": "0.0.3",
@@ -7741,7 +7607,6 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
       "requires": {
         "wrappy": "1.0.2"
       }
@@ -7817,15 +7682,12 @@
     "os-homedir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-      "dev": true
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
     },
     "os-locale": {
       "version": "1.4.0",
       "resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
       "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-      "dev": true,
-      "optional": true,
       "requires": {
         "lcid": "1.0.0"
       }
@@ -7833,14 +7695,12 @@
     "os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "dev": true
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
     },
     "osenv": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
       "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
-      "dev": true,
       "requires": {
         "os-homedir": "1.0.2",
         "os-tmpdir": "1.0.2"
@@ -7971,7 +7831,6 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
       "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-      "dev": true,
       "requires": {
         "error-ex": "1.3.2"
       }
@@ -8042,8 +7901,7 @@
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
     },
     "path-is-inside": {
       "version": "1.0.2",
@@ -8108,8 +7966,7 @@
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-      "dev": true
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
     "pify": {
       "version": "3.0.0",
@@ -8120,14 +7977,12 @@
     "pinkie": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-      "dev": true
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
     },
     "pinkie-promise": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
       "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "dev": true,
       "requires": {
         "pinkie": "2.0.4"
       }
@@ -8277,8 +8132,7 @@
     "process-nextick-args": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
-      "dev": true
+      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
     },
     "promise": {
       "version": "7.3.1",
@@ -8434,14 +8288,12 @@
     "pseudomap": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
-      "dev": true
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
     },
     "psl": {
       "version": "1.1.29",
       "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.29.tgz",
-      "integrity": "sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==",
-      "dev": true
+      "integrity": "sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ=="
     },
     "public-encrypt": {
       "version": "4.0.3",
@@ -8498,8 +8350,7 @@
     "qs": {
       "version": "6.5.2",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-      "dev": true
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
     },
     "querystring": {
       "version": "0.2.0",
@@ -8657,7 +8508,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
       "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-      "dev": true,
       "requires": {
         "load-json-file": "1.1.0",
         "normalize-package-data": "2.4.0",
@@ -8668,7 +8518,6 @@
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
           "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-          "dev": true,
           "requires": {
             "graceful-fs": "4.1.11",
             "pify": "2.3.0",
@@ -8677,9 +8526,8 @@
         },
         "pify": {
           "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
+          "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
         }
       }
     },
@@ -8687,7 +8535,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
       "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-      "dev": true,
       "requires": {
         "find-up": "1.1.2",
         "read-pkg": "1.1.0"
@@ -8697,7 +8544,6 @@
           "version": "1.1.2",
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
           "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-          "dev": true,
           "requires": {
             "path-exists": "2.1.0",
             "pinkie-promise": "2.0.1"
@@ -8707,7 +8553,6 @@
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
           "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-          "dev": true,
           "requires": {
             "pinkie-promise": "2.0.1"
           }
@@ -8718,7 +8563,6 @@
       "version": "2.3.6",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
       "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-      "dev": true,
       "requires": {
         "core-util-is": "1.0.2",
         "inherits": "2.0.3",
@@ -8745,8 +8589,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
       "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
-      "dev": true,
-      "optional": true,
       "requires": {
         "indent-string": "2.1.0",
         "strip-indent": "1.0.1"
@@ -8863,7 +8705,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
       "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-      "dev": true,
       "requires": {
         "is-finite": "1.0.2"
       }
@@ -8872,7 +8713,6 @@
       "version": "2.88.0",
       "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
       "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
-      "dev": true,
       "requires": {
         "aws-sign2": "0.7.0",
         "aws4": "1.8.0",
@@ -8899,8 +8739,7 @@
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-      "dev": true
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
     },
     "require-from-string": {
       "version": "2.0.2",
@@ -8911,8 +8750,7 @@
     "require-main-filename": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
-      "dev": true
+      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
     },
     "requires-port": {
       "version": "1.0.0",
@@ -8971,7 +8809,6 @@
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
       "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
-      "dev": true,
       "requires": {
         "glob": "7.1.3"
       }
@@ -9016,8 +8853,7 @@
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
     "safe-regex": {
       "version": "1.1.0",
@@ -9037,8 +8873,6 @@
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz",
       "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
-      "dev": true,
-      "optional": true,
       "requires": {
         "glob": "7.1.3",
         "lodash": "4.17.4",
@@ -9092,19 +8926,15 @@
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
       "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
-      "dev": true,
-      "optional": true,
       "requires": {
-        "js-base64": "2.4.9",
+        "js-base64": "2.5.0",
         "source-map": "0.4.4"
       },
       "dependencies": {
         "source-map": {
           "version": "0.4.4",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+          "resolved": "http://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
           "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
-          "dev": true,
-          "optional": true,
           "requires": {
             "amdefine": "1.0.1"
           }
@@ -9152,8 +8982,7 @@
     "semver": {
       "version": "5.5.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.1.tgz",
-      "integrity": "sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==",
-      "dev": true
+      "integrity": "sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw=="
     },
     "semver-dsl": {
       "version": "1.0.1",
@@ -9238,8 +9067,7 @@
     "set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-      "dev": true
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
     },
     "set-immediate-shim": {
       "version": "1.0.1",
@@ -9329,8 +9157,7 @@
     "signal-exit": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-      "dev": true
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
     },
     "silent-error": {
       "version": "1.1.1",
@@ -9715,7 +9542,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz",
       "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==",
-      "dev": true,
       "requires": {
         "spdx-expression-parse": "3.0.0",
         "spdx-license-ids": "3.0.1"
@@ -9724,14 +9550,12 @@
     "spdx-exceptions": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz",
-      "integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==",
-      "dev": true
+      "integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg=="
     },
     "spdx-expression-parse": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
       "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
-      "dev": true,
       "requires": {
         "spdx-exceptions": "2.1.0",
         "spdx-license-ids": "3.0.1"
@@ -9740,8 +9564,7 @@
     "spdx-license-ids": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.1.tgz",
-      "integrity": "sha512-TfOfPcYGBB5sDuPn3deByxPhmfegAhpDYKSOXZQN81Oyrrif8ZCodOLzK3AesELnCx03kikhyDwh0pfvvQvF8w==",
-      "dev": true
+      "integrity": "sha512-TfOfPcYGBB5sDuPn3deByxPhmfegAhpDYKSOXZQN81Oyrrif8ZCodOLzK3AesELnCx03kikhyDwh0pfvvQvF8w=="
     },
     "spdy": {
       "version": "3.4.7",
@@ -9791,7 +9614,6 @@
       "version": "1.14.2",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz",
       "integrity": "sha1-xvxhZIo9nE52T9P8306hBeSSupg=",
-      "dev": true,
       "requires": {
         "asn1": "0.2.4",
         "assert-plus": "1.0.0",
@@ -9853,8 +9675,6 @@
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz",
       "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
-      "dev": true,
-      "optional": true,
       "requires": {
         "readable-stream": "2.3.6"
       }
@@ -9902,7 +9722,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
       "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-      "dev": true,
       "requires": {
         "code-point-at": "1.1.0",
         "is-fullwidth-code-point": "1.0.0",
@@ -9913,7 +9732,6 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
       "requires": {
         "safe-buffer": "5.1.2"
       }
@@ -9922,7 +9740,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
       "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true,
       "requires": {
         "ansi-regex": "2.1.1"
       }
@@ -9931,7 +9748,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
       "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-      "dev": true,
       "requires": {
         "is-utf8": "0.2.1"
       }
@@ -9946,8 +9762,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
       "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-      "dev": true,
-      "optional": true,
       "requires": {
         "get-stdin": "4.0.1"
       }
@@ -10046,10 +9860,8 @@
     },
     "tar": {
       "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+      "resolved": "http://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
       "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
-      "dev": true,
-      "optional": true,
       "requires": {
         "block-stream": "0.0.9",
         "fstream": "1.0.11",
@@ -10176,7 +9988,6 @@
       "version": "2.4.3",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
       "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
-      "dev": true,
       "requires": {
         "psl": "1.1.29",
         "punycode": "1.4.1"
@@ -10185,8 +9996,7 @@
         "punycode": {
           "version": "1.4.1",
           "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-          "dev": true
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
         }
       }
     },
@@ -10199,9 +10009,7 @@
     "trim-newlines": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
-      "dev": true,
-      "optional": true
+      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM="
     },
     "trim-right": {
       "version": "1.0.1",
@@ -10213,8 +10021,6 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
       "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
-      "dev": true,
-      "optional": true,
       "requires": {
         "glob": "7.1.3"
       }
@@ -10326,7 +10132,6 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "dev": true,
       "requires": {
         "safe-buffer": "5.1.2"
       }
@@ -10335,7 +10140,6 @@
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
       "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "dev": true,
       "optional": true
     },
     "type-check": {
@@ -10658,8 +10462,7 @@
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
     "util.promisify": {
       "version": "1.0.0",
@@ -10686,14 +10489,12 @@
     "uuid": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
-      "dev": true
+      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
     },
     "validate-npm-package-license": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
       "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-      "dev": true,
       "requires": {
         "spdx-correct": "3.0.0",
         "spdx-expression-parse": "3.0.0"
@@ -10718,7 +10519,6 @@
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
       "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "dev": true,
       "requires": {
         "assert-plus": "1.0.0",
         "core-util-is": "1.0.2",
@@ -11199,7 +10999,6 @@
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
       "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
       "requires": {
         "isexe": "2.0.0"
       }
@@ -11207,15 +11006,12 @@
     "which-module": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
-      "dev": true,
-      "optional": true
+      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8="
     },
     "wide-align": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
       "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
-      "dev": true,
       "requires": {
         "string-width": "1.0.2"
       }
@@ -11248,7 +11044,6 @@
       "version": "2.1.0",
       "resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
       "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-      "dev": true,
       "requires": {
         "string-width": "1.0.2",
         "strip-ansi": "3.0.1"
@@ -11257,8 +11052,7 @@
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "ws": {
       "version": "1.1.2",
@@ -11331,15 +11125,12 @@
     "yallist": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-      "dev": true
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
     },
     "yargs": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
       "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
-      "dev": true,
-      "optional": true,
       "requires": {
         "camelcase": "3.0.0",
         "cliui": "3.2.0",
@@ -11359,16 +11150,12 @@
         "camelcase": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-          "dev": true,
-          "optional": true
+          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
         },
         "y18n": {
           "version": "3.2.1",
           "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
-          "dev": true,
-          "optional": true
+          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE="
         }
       }
     },
@@ -11376,8 +11163,6 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
       "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
-      "dev": true,
-      "optional": true,
       "requires": {
         "camelcase": "3.0.0"
       },
@@ -11385,9 +11170,7 @@
         "camelcase": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-          "dev": true,
-          "optional": true
+          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
         }
       }
     },
@@ -11409,4 +11192,4 @@
       "integrity": "sha512-W9Nj+UmBJG251wkCacIkETgra4QgBo/vgoEkb4a2uoLzpQG7qF9nzwoLXWU5xj3Fg2mxGvEDh47mg24vXccYjA=="
     }
   }
-}
+}
\ No newline at end of file

From 1912ff89f57e7f555afe1eb2a20fa9f831654cdd Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Wed, 2 Jan 2019 12:25:28 +0000
Subject: [PATCH 03/29] add-pd alert removed: ps

---
 .../manage-pd/list-pd/add-pd/add-pd.component.ts            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts
index 6c23033f2..c78e092ee 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts
@@ -362,11 +362,11 @@ export class AddPdComponent implements OnInit, OnDestroy {
 
     // common function for both draft and process pd
     submitPdDetails(formValue: any, status:string) {
-      alert('Inside Function Submit Function');
+      //alert('Inside Function Submit Function');
       if(this._PDtriggerForm.invalid) {
         this.validateAllFormFields(this._PDtriggerForm);
-        alert('validationError');
-        console.log(this._PDtriggerForm);
+        //alert('validationError');
+        //console.log(this._PDtriggerForm);
         return;
       }
       else {

From f096e16976209fb348dcb07471b590b5c3371af5 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Wed, 2 Jan 2019 12:28:27 +0000
Subject: [PATCH 04/29] Draft Alert Removed : ps

---
 .../manage-pd/list-pd/add-pd/add-pd.component.ts                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts
index c78e092ee..9c22e69e2 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts
@@ -273,7 +273,7 @@ export class AddPdComponent implements OnInit, OnDestroy {
 
     // save pd in draft
     saveDraftPD(formValue: any, status:string){
-      alert('Inside The Draft PD');
+      //alert('Inside The Draft PD');
       this.submitPdDetails(formValue, status);
     }
     //trigger  pd 

From b8eaf93283cfe2fee968a8e73f04f061e6aacbae Mon Sep 17 00:00:00 2001
From: velz <velmurugan.s@venbainfotech.com>
Date: Wed, 2 Jan 2019 19:56:32 +0530
Subject: [PATCH 05/29] JS OUT OF HEAP MEMORY EROOR RESLOVED

---
 ng6-seed/package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ng6-seed/package.json b/ng6-seed/package.json
index 0950afc99..fdbace955 100755
--- a/ng6-seed/package.json
+++ b/ng6-seed/package.json
@@ -3,6 +3,7 @@
   "version": "0.0.0",
   "license": "MIT",
   "scripts": {
+    "build-prod": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng",
     "ng": "ng",
     "start": "ng serve",
     "build": "ng build",

From a6a8e434ac866b2ae8065f65b019936b0dd4c211 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Thu, 3 Jan 2019 13:30:14 +0530
Subject: [PATCH 06/29] general and add/edit pd : ps

---
 .../list-pd/add-pd/add-pd.component.html          |  2 +-
 .../manage-pd/list-pd/add-pd/add-pd.component.ts  |  3 ++-
 .../edit-pd-master/edit-pd-master.component.html  |  6 ++----
 .../edit-pd-master/edit-pd-master.component.ts    |  3 ++-
 .../general-info/general-info.component.html      | 15 ++++++++++-----
 .../forms/general-info/general-info.component.ts  |  9 ++++++---
 6 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html
index 19ad95809..5936fdbb5 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html
@@ -109,7 +109,7 @@
             </mat-form-field>
             <mat-form-field style="width: 32%">
                             <input matInput autocomplete="off" placeholder="Loan Amount" formControlName="loan_amount" (keypress)="keyPress($event)" (keyup)="inWords($event,1)" required autocomplete="off">
-                            <mat-hint align="end" *ngIf="pdMain.loan_amount.value">{{"&#8377;"}} {{loanAmtInWords}} Only</mat-hint>
+                            <mat-hint align="start" style="font-size:70%" *ngIf="pdMain.loan_amount.value">{{"&#8377;"}} {{loanAmtInWords}} Only</mat-hint>
                             <!-- <mat-error *ngIf="pdMain.loan_amount.hasError('required')">Amount Required.</mat-error> -->
                             <mat-error *ngIf="pdMain.loan_amount.hasError('pattern')">Enter valid amount. </mat-error>  
     
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts
index 9c22e69e2..48b443dc7 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts
@@ -473,7 +473,8 @@ export class AddPdComponent implements OnInit, OnDestroy {
   }
   /** On Key Press Event For Mobile Number  */
   keyPress(event: any) {
-    const pattern = /[0-9/ /./-]/;
+    // const pattern = /[0-9/ /./-]/;
+    const pattern = /[0-9]/;
 
     let inputChar = String.fromCharCode(event.charCode);
     if (event.keyCode != 8 && !pattern.test(inputChar)) {
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html
index 259d90574..1a5b61117 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html
@@ -37,10 +37,8 @@
                                                     <input matInput placeholder="Lender Contact Person" formControlName="pd_contact_person" type="text" required>
                                             </mat-form-field>
                                             <mat-form-field style="width: 32%">
-                                                <input matInput placeholder="Lender Contact Number" formControlName="pd_contact_mobileno" type="text" required>
+                                                <input matInput placeholder="Lender Contact Number" formControlName="pd_contact_mobileno" type="text" required (keypress)="keyPress($event)">
                                                 <mat-error *ngIf="pdMain.pd_contact_mobileno.hasError('pattern') || pdMain.pd_contact_mobileno.hasError('maxlength') || pdMain.pd_contact_mobileno.hasError('minlength')">Enter Valid Mobile Number. </mat-error>  
-                  
-                
                                         </mat-form-field>
                                         <mat-form-field style="width: 32%">
                                                 <mat-select  placeholder="Product Name" formControlName="fk_product_id" (selectionChange)="getSubproductList(pdMain.fk_product_id.value)">
@@ -90,7 +88,7 @@
                                             <mat-form-field style="width: 24%">
                                                             <!-- <input matInput placeholder="Loan Amount" formControlName="loan_amount"> -->
                                                             <input matInput placeholder="Loan Amount" formControlName="loan_amount" (keypress)="keyPress($event)" (keyup)="inWords($event,1)" required autocomplete="off">
-                                                            <mat-hint align="end" *ngIf="pdMain.loan_amount.value != ''">{{"&#8377;"}} {{loanAmtInWords}} Only</mat-hint>
+                                                            <mat-hint align="start" style="font-size:70%" *ngIf="pdMain.loan_amount.value != ''">{{"&#8377;"}} {{loanAmtInWords}} Only</mat-hint>
                                                             <!-- <mat-error *ngIf="pdMain.loan_amount.hasError('required')">Amount Required.</mat-error> -->
                                                             <mat-error *ngIf="pdMain.loan_amount.hasError('pattern')">Enter valid amount. </mat-error>  
                 
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts
index 2c8e9b102..a94f9f4ee 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts
@@ -259,7 +259,8 @@ export class EditPdMasterComponent implements OnInit {
   }
    /** On Key Press Event For Mobile Number  */
    keyPress(event: any) {
-    const pattern = /[0-9/ /./-]/;
+    //const pattern = /[0-9/ /./-]/;
+    const pattern = /[0-9]/;
 
     let inputChar = String.fromCharCode(event.charCode);
     if (event.keyCode != 8 && !pattern.test(inputChar)) {
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
index a2237aab1..55a125e6b 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
@@ -92,13 +92,12 @@
                                           <mat-form-field style="width: 40%">
                                               <mat-select placeholder="Relation to" formControlName="applicant_relation_to">
                                                   <mat-option>Select</mat-option>  
-                                                <mat-option *ngFor="let rel of individualsList" [value]="rel.individuals_order_id">
-                                                    <!-- [disabled]="relation.controls.applicant_name.value == rel" -->
+                                                <mat-option *ngFor="let rel of individualsList" [value]="rel.individuals_order_id" [disabled]="relation.controls.applicant_name.value == rel.applicant_name">
                                                   {{rel.applicant_name | titlecase}}
                                                   </mat-option>
                                               </mat-select>
                                             </mat-form-field>  
-                                            <mat-form-field style="width: 30%">
+                                            <mat-form-field style="width: 20%">
                                                 <mat-select placeholder="Relation" formControlName="relationship">
                                                     <mat-option>Select</mat-option>
                                                     <mat-option *ngFor="let relShip of relationShipList" [value]="relShip.relationship_id">
@@ -106,6 +105,9 @@
                                                     </mat-option>
                                                 </mat-select>
                                               </mat-form-field>
+                                                <mat-form-field style="width:20%" *ngIf="mulRel.get('relationship').value == 0">
+                                                    <input matInput autocomplete="off" placeholder="Specify Relation" formControlName="other_relationship">
+                                                </mat-form-field>
                                               <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Add More Personal Relationship" matTooltipPosition="above" color="primary" (click)="addMoreRelation(r,m)" *ngIf="m==0"><mat-icon>add</mat-icon></button>
                                               <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="removeRelation(r,m)" *ngIf="m>0"
                                                   matTooltip="Remove Personal Relationship" matTooltipPosition="above">
@@ -125,8 +127,8 @@
                                                                     {{comp.company_name | titlecase}}
                                                                     </mat-option>
                                                                 </mat-select>
-                                                </mat-form-field>
-                                                <mat-form-field style="width: 30%">
+                                                    </mat-form-field>
+                                                <mat-form-field style="width: 20%">
                                                     <mat-select placeholder="Relation" formControlName="company_relationship">
                                                         <mat-option>Select</mat-option>
                                                         <mat-option *ngFor="let comrelShip of companyRelationShipList" [value]="comrelShip.company_relationship_id">
@@ -134,6 +136,9 @@
                                                         </mat-option>
                                                     </mat-select>
                                                   </mat-form-field> 
+                                                  <mat-form-field style="width:20%" *ngIf="comRel.get('company_relationship').value == 6">
+                                                    <input matInput autocomplete="off" placeholder="Specify Relation" formControlName="company_other_relationship">
+                                                  </mat-form-field>
                                                   <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Add More Company Relationship" matTooltipPosition="above" color="primary" (click)="addMoreCompanyRelation(r,c)" *ngIf="c==0"><mat-icon>add</mat-icon></button>
                                                   <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="removeCompanyRelation(r,c)" *ngIf="c>0"
                                                       matTooltip="Remove Company Relationship" matTooltipPosition="above">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts
index 5cd6e6e98..6348fc091 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts
@@ -70,6 +70,7 @@ export class GeneralInfoComponent implements OnInit {
         if (data.status == 200) {
           if(type==1){
             this.relationShipList=data.records.filter(item => item.isactive == 1);
+            this.relationShipList.push({'relationship_id':"0",'name':'Others'});
           }
           if(type==2){
             this.companyRelationShipList=data.records.filter(item => item.isactive == 1);
@@ -227,6 +228,7 @@ export class GeneralInfoComponent implements OnInit {
         return this._fb.group({
           applicant_relation_to: [elementValue.applicant_relation_to],
           relationship: [elementValue.relationship],
+          other_relationship:[elementValue.other_relationship]
         });
       }
 
@@ -234,7 +236,7 @@ export class GeneralInfoComponent implements OnInit {
       addMoreRelation(rindex,mindex) {
         let control: any = this._generalForm.get('applicant_relation') as FormArray;
         control = control.controls[rindex].get('multiple_relation') as FormArray;
-        let setValues: any = {applicant_relation_to :'',relationship:''}
+        let setValues: any = {applicant_relation_to :'',relationship:'',other_relationship:''}
         control.push(this.createMultipleRelation(setValues))
       }
 
@@ -250,13 +252,14 @@ export class GeneralInfoComponent implements OnInit {
         return this._fb.group({
           company_name: [elementValue.company_name,Validators.required],
           company_relationship: [elementValue.company_relationship],
+          company_other_relationship:[elementValue.company_other_relationship]
         });
       }
       // add more company relation
       addMoreCompanyRelation(rindex,cindex) {
         let control: any = this._generalForm.get('applicant_relation') as FormArray;
         control = control.controls[rindex].get('multiple_company_relation') as FormArray;
-        let setValues: any = {company_name :'',company_relationship:''}
+        let setValues: any = {company_name :'',company_relationship:'',company_other_relationship:''}
         control.push(this.createMultipleCompanyRelation(setValues))
       }
 
@@ -282,7 +285,7 @@ export class GeneralInfoComponent implements OnInit {
               element.individuals_order_id = individualsControl.controls.length+1;
               individualsControl.push(this.createIndividulas(element));
               let relationControl = <FormArray>this._generalForm.controls['applicant_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':'','company_relation':'','individuals_order_id':element.individuals_order_id};
+              let applicant_details: any= {'pd_co_applicant_id':element.pd_co_applicant_id,'applicant_name':element.applicant_name,'applicant_relation_to':'','relation':'','other_relation':'','company_name':'','company_relation':'','company_other_relation':'','individuals_order_id':element.individuals_order_id};
               relationControl.push(this.createApplicantRelation(applicant_details));
               let mulRelationControl = <FormArray> relationControl.controls[relationControl.controls.length-1].get('multiple_relation');
                mulRelationControl.push(this.createMultipleRelation(applicant_details))

From fe21a222851d61c00191106650009112a52ebcbd Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Thu, 3 Jan 2019 17:53:06 +0530
Subject: [PATCH 07/29] general fom company changes

---
 .../general-info/general-info.component.html  |  4 +--
 .../general-info/general-info.component.ts    | 31 ++++++++++++-------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
index a2237aab1..cbefddb1f 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
@@ -63,11 +63,11 @@
               <mat-card-content>
                 <div fxLayout="row wrap" formArrayName="companies">
                     <div fxFlex.xs="100"  fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100" *ngFor="let com of _generalForm.controls.companies['controls']; let c = index;" [formGroupName]="c">
-                          <mat-form-field style="width: 60%">
+                        <mat-form-field style="width: 60%" *ngIf="com.value.is_active==true">
                                 <input matInput placeholder="Company/Firm" formControlName="company_name" type="text">
                             </mat-form-field>
                             <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Add More Company/Firm" matTooltipPosition="above" color="primary" (click)="addMoreCompanies()" *ngIf="c==0"><mat-icon>add</mat-icon></button>
-                            <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="removeCompanies(c)" *ngIf="c>0"
+                            <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="removeCompanies(c)" *ngIf="c>0 && com.value.is_active==true"
                                 matTooltip="Remove Company/Firm" matTooltipPosition="above">
                                     <mat-icon>delete</mat-icon>
                                 </button>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts
index 5cd6e6e98..61e3034b7 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts
@@ -4,6 +4,8 @@ import { MatDialog, MatDialogRef, MAT_DIALOG_DATA , MatTableDataSource} from '@a
 import { NotifierService } from 'angular-notifier';
 import { PdTrigerService } from './../../../../../pd-service/pd-triger.service';
 import {OtherApplicantDetailsComponent} from './../dialogue/other-applicant-details/other-applicant-details.component';
+import { element } from '@angular/core/src/render3/instructions';
+import { ELEMENT_PROBE_PROVIDERS } from '@angular/platform-browser/src/dom/debug/ng_probe';
 @Component({
   selector: 'app-general-info',
   templateUrl: './general-info.component.html',
@@ -47,7 +49,7 @@ export class GeneralInfoComponent implements OnInit {
   // update company details
   this._generalForm.controls['companies'].valueChanges.subscribe(val=>{
     let control = <FormArray>this._generalForm.controls['companies'];
-    this.companyList = control.value.filter(element =>element.company_name);
+    this.companyList = control.value.filter(element =>element.company_name && element.is_active);
   });
   }
 
@@ -112,8 +114,14 @@ export class GeneralInfoComponent implements OnInit {
           return data.records.companies[key];
           });
           if(exist_companies.length>0){
-            exist_companies.forEach(element => {
-              companyControl.push(this.createCompanies(element))
+            exist_companies.forEach((element,cindex) => {
+              companyControl.push(this.createCompanies(element));
+              if(element.is_active==false){
+                let control: any = this._generalForm.get('companies') as FormArray;
+                control.controls[cindex].controls.company_name.clearValidators();
+                control.controls[cindex].controls.company_name.updateValueAndValidity();
+              }
+             
             });
           }
 
@@ -133,11 +141,6 @@ export class GeneralInfoComponent implements OnInit {
                   innercomrelControl.push(this.createMultipleCompanyRelation(innerecomElement));
                 });
               });
-
-              
-
-
-
             }
 
       } 
@@ -157,13 +160,13 @@ export class GeneralInfoComponent implements OnInit {
               
                // create companies
                if(element.company_name!='' && element.company_name!=null){
-                let setCompanyValues: any = {company_order_id :companyControl.controls.length+1,company_name:element.company_name}
+                let setCompanyValues: any = {company_order_id :companyControl.controls.length+1,company_name:element.company_name,is_active:true}
                 companyControl.push(this.createCompanies(setCompanyValues))
                } 
           });
             // check company if null update one row
             if(companyControl.controls.length ==0){
-                let setCompanyValues: any = {company_order_id :companyControl.controls.length+1,company_name:''}
+                let setCompanyValues: any = {company_order_id :companyControl.controls.length+1,company_name:'',is_active:true}
                 companyControl.push(this.createCompanies(setCompanyValues))
 
               }
@@ -186,20 +189,24 @@ export class GeneralInfoComponent implements OnInit {
       return this._fb.group({
         company_order_id: [elementValue.company_order_id],
         company_name: [elementValue.company_name,Validators.required],
+        is_active: [elementValue.is_active]
     });
     }
 
     // add more companies
     addMoreCompanies() {
       let control: any = this._generalForm.get('companies') as FormArray;
-      let setValues: any = {company_order_id :control.controls.length+1,company_name:''}
+      let setValues: any = {company_order_id :control.controls.length+1,company_name:'',is_active:true}
       control.push(this.createCompanies(setValues))
     }
 
     // remove companies
     removeCompanies(indexValues) {
       let control: any = this._generalForm.get('companies') as FormArray;
-      control.removeAt(indexValues);
+      control.controls[indexValues].controls.is_active.setValue(false);
+      control.controls[indexValues].controls.company_name.clearValidators();
+      control.controls[indexValues].controls.company_name.updateValueAndValidity();
+      //control.removeAt(indexValues);
     }
 
       // create applicant form array

From 3482a111150d9725021a9be8ee08723f88ea0e5a Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Thu, 3 Jan 2019 17:54:04 +0530
Subject: [PATCH 08/29] merge : kms

---
 .../list-pd/add-pd/add-pd.component.html          |  2 +-
 .../manage-pd/list-pd/add-pd/add-pd.component.ts  |  3 ++-
 .../edit-pd-master/edit-pd-master.component.html  |  6 ++----
 .../edit-pd-master/edit-pd-master.component.ts    |  3 ++-
 .../general-info/general-info.component.html      | 15 ++++++++++-----
 .../forms/general-info/general-info.component.ts  |  9 ++++++---
 6 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html
index 19ad95809..5936fdbb5 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html
@@ -109,7 +109,7 @@
             </mat-form-field>
             <mat-form-field style="width: 32%">
                             <input matInput autocomplete="off" placeholder="Loan Amount" formControlName="loan_amount" (keypress)="keyPress($event)" (keyup)="inWords($event,1)" required autocomplete="off">
-                            <mat-hint align="end" *ngIf="pdMain.loan_amount.value">{{"&#8377;"}} {{loanAmtInWords}} Only</mat-hint>
+                            <mat-hint align="start" style="font-size:70%" *ngIf="pdMain.loan_amount.value">{{"&#8377;"}} {{loanAmtInWords}} Only</mat-hint>
                             <!-- <mat-error *ngIf="pdMain.loan_amount.hasError('required')">Amount Required.</mat-error> -->
                             <mat-error *ngIf="pdMain.loan_amount.hasError('pattern')">Enter valid amount. </mat-error>  
     
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts
index 9c22e69e2..48b443dc7 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts
@@ -473,7 +473,8 @@ export class AddPdComponent implements OnInit, OnDestroy {
   }
   /** On Key Press Event For Mobile Number  */
   keyPress(event: any) {
-    const pattern = /[0-9/ /./-]/;
+    // const pattern = /[0-9/ /./-]/;
+    const pattern = /[0-9]/;
 
     let inputChar = String.fromCharCode(event.charCode);
     if (event.keyCode != 8 && !pattern.test(inputChar)) {
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html
index 259d90574..1a5b61117 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html
@@ -37,10 +37,8 @@
                                                     <input matInput placeholder="Lender Contact Person" formControlName="pd_contact_person" type="text" required>
                                             </mat-form-field>
                                             <mat-form-field style="width: 32%">
-                                                <input matInput placeholder="Lender Contact Number" formControlName="pd_contact_mobileno" type="text" required>
+                                                <input matInput placeholder="Lender Contact Number" formControlName="pd_contact_mobileno" type="text" required (keypress)="keyPress($event)">
                                                 <mat-error *ngIf="pdMain.pd_contact_mobileno.hasError('pattern') || pdMain.pd_contact_mobileno.hasError('maxlength') || pdMain.pd_contact_mobileno.hasError('minlength')">Enter Valid Mobile Number. </mat-error>  
-                  
-                
                                         </mat-form-field>
                                         <mat-form-field style="width: 32%">
                                                 <mat-select  placeholder="Product Name" formControlName="fk_product_id" (selectionChange)="getSubproductList(pdMain.fk_product_id.value)">
@@ -90,7 +88,7 @@
                                             <mat-form-field style="width: 24%">
                                                             <!-- <input matInput placeholder="Loan Amount" formControlName="loan_amount"> -->
                                                             <input matInput placeholder="Loan Amount" formControlName="loan_amount" (keypress)="keyPress($event)" (keyup)="inWords($event,1)" required autocomplete="off">
-                                                            <mat-hint align="end" *ngIf="pdMain.loan_amount.value != ''">{{"&#8377;"}} {{loanAmtInWords}} Only</mat-hint>
+                                                            <mat-hint align="start" style="font-size:70%" *ngIf="pdMain.loan_amount.value != ''">{{"&#8377;"}} {{loanAmtInWords}} Only</mat-hint>
                                                             <!-- <mat-error *ngIf="pdMain.loan_amount.hasError('required')">Amount Required.</mat-error> -->
                                                             <mat-error *ngIf="pdMain.loan_amount.hasError('pattern')">Enter valid amount. </mat-error>  
                 
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts
index 2c8e9b102..a94f9f4ee 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts
@@ -259,7 +259,8 @@ export class EditPdMasterComponent implements OnInit {
   }
    /** On Key Press Event For Mobile Number  */
    keyPress(event: any) {
-    const pattern = /[0-9/ /./-]/;
+    //const pattern = /[0-9/ /./-]/;
+    const pattern = /[0-9]/;
 
     let inputChar = String.fromCharCode(event.charCode);
     if (event.keyCode != 8 && !pattern.test(inputChar)) {
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
index cbefddb1f..0c7ce91d7 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
@@ -92,13 +92,12 @@
                                           <mat-form-field style="width: 40%">
                                               <mat-select placeholder="Relation to" formControlName="applicant_relation_to">
                                                   <mat-option>Select</mat-option>  
-                                                <mat-option *ngFor="let rel of individualsList" [value]="rel.individuals_order_id">
-                                                    <!-- [disabled]="relation.controls.applicant_name.value == rel" -->
+                                                <mat-option *ngFor="let rel of individualsList" [value]="rel.individuals_order_id" [disabled]="relation.controls.applicant_name.value == rel.applicant_name">
                                                   {{rel.applicant_name | titlecase}}
                                                   </mat-option>
                                               </mat-select>
                                             </mat-form-field>  
-                                            <mat-form-field style="width: 30%">
+                                            <mat-form-field style="width: 20%">
                                                 <mat-select placeholder="Relation" formControlName="relationship">
                                                     <mat-option>Select</mat-option>
                                                     <mat-option *ngFor="let relShip of relationShipList" [value]="relShip.relationship_id">
@@ -106,6 +105,9 @@
                                                     </mat-option>
                                                 </mat-select>
                                               </mat-form-field>
+                                                <mat-form-field style="width:20%" *ngIf="mulRel.get('relationship').value == 0">
+                                                    <input matInput autocomplete="off" placeholder="Specify Relation" formControlName="other_relationship">
+                                                </mat-form-field>
                                               <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Add More Personal Relationship" matTooltipPosition="above" color="primary" (click)="addMoreRelation(r,m)" *ngIf="m==0"><mat-icon>add</mat-icon></button>
                                               <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="removeRelation(r,m)" *ngIf="m>0"
                                                   matTooltip="Remove Personal Relationship" matTooltipPosition="above">
@@ -125,8 +127,8 @@
                                                                     {{comp.company_name | titlecase}}
                                                                     </mat-option>
                                                                 </mat-select>
-                                                </mat-form-field>
-                                                <mat-form-field style="width: 30%">
+                                                    </mat-form-field>
+                                                <mat-form-field style="width: 20%">
                                                     <mat-select placeholder="Relation" formControlName="company_relationship">
                                                         <mat-option>Select</mat-option>
                                                         <mat-option *ngFor="let comrelShip of companyRelationShipList" [value]="comrelShip.company_relationship_id">
@@ -134,6 +136,9 @@
                                                         </mat-option>
                                                     </mat-select>
                                                   </mat-form-field> 
+                                                  <mat-form-field style="width:20%" *ngIf="comRel.get('company_relationship').value == 6">
+                                                    <input matInput autocomplete="off" placeholder="Specify Relation" formControlName="company_other_relationship">
+                                                  </mat-form-field>
                                                   <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Add More Company Relationship" matTooltipPosition="above" color="primary" (click)="addMoreCompanyRelation(r,c)" *ngIf="c==0"><mat-icon>add</mat-icon></button>
                                                   <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="removeCompanyRelation(r,c)" *ngIf="c>0"
                                                       matTooltip="Remove Company Relationship" matTooltipPosition="above">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts
index 61e3034b7..40597ea7d 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts
@@ -72,6 +72,7 @@ export class GeneralInfoComponent implements OnInit {
         if (data.status == 200) {
           if(type==1){
             this.relationShipList=data.records.filter(item => item.isactive == 1);
+            this.relationShipList.push({'relationship_id':"0",'name':'Others'});
           }
           if(type==2){
             this.companyRelationShipList=data.records.filter(item => item.isactive == 1);
@@ -234,6 +235,7 @@ export class GeneralInfoComponent implements OnInit {
         return this._fb.group({
           applicant_relation_to: [elementValue.applicant_relation_to],
           relationship: [elementValue.relationship],
+          other_relationship:[elementValue.other_relationship]
         });
       }
 
@@ -241,7 +243,7 @@ export class GeneralInfoComponent implements OnInit {
       addMoreRelation(rindex,mindex) {
         let control: any = this._generalForm.get('applicant_relation') as FormArray;
         control = control.controls[rindex].get('multiple_relation') as FormArray;
-        let setValues: any = {applicant_relation_to :'',relationship:''}
+        let setValues: any = {applicant_relation_to :'',relationship:'',other_relationship:''}
         control.push(this.createMultipleRelation(setValues))
       }
 
@@ -257,13 +259,14 @@ export class GeneralInfoComponent implements OnInit {
         return this._fb.group({
           company_name: [elementValue.company_name,Validators.required],
           company_relationship: [elementValue.company_relationship],
+          company_other_relationship:[elementValue.company_other_relationship]
         });
       }
       // add more company relation
       addMoreCompanyRelation(rindex,cindex) {
         let control: any = this._generalForm.get('applicant_relation') as FormArray;
         control = control.controls[rindex].get('multiple_company_relation') as FormArray;
-        let setValues: any = {company_name :'',company_relationship:''}
+        let setValues: any = {company_name :'',company_relationship:'',company_other_relationship:''}
         control.push(this.createMultipleCompanyRelation(setValues))
       }
 
@@ -289,7 +292,7 @@ export class GeneralInfoComponent implements OnInit {
               element.individuals_order_id = individualsControl.controls.length+1;
               individualsControl.push(this.createIndividulas(element));
               let relationControl = <FormArray>this._generalForm.controls['applicant_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':'','company_relation':'','individuals_order_id':element.individuals_order_id};
+              let applicant_details: any= {'pd_co_applicant_id':element.pd_co_applicant_id,'applicant_name':element.applicant_name,'applicant_relation_to':'','relation':'','other_relation':'','company_name':'','company_relation':'','company_other_relation':'','individuals_order_id':element.individuals_order_id};
               relationControl.push(this.createApplicantRelation(applicant_details));
               let mulRelationControl = <FormArray> relationControl.controls[relationControl.controls.length-1].get('multiple_relation');
                mulRelationControl.push(this.createMultipleRelation(applicant_details))

From 8e2e82d3ac2605c3824465644ff99a1382569bd0 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Thu, 3 Jan 2019 17:56:06 +0530
Subject: [PATCH 09/29] Issues Fixes : ps

---
 .../edit-pd-applicant.component.ts            |  10 +-
 .../financial-info.component.html             |   2 +-
 .../financial-info.component.ts               |   1 +
 .../start-pd/forms/stock/stock.component.html | 180 ++++++++++--------
 4 files changed, 113 insertions(+), 80 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts
index 68e8d57a9..c7541c588 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts
@@ -150,9 +150,13 @@ export class EditPdApplicantComponent implements OnInit {
       // console.log(itemElement.coapplicant_landline);
       let concat_landline
       if(itemElement.coapplicant_stdcode != null && itemElement.coapplicant_landline != null){
-        let std = itemElement.coapplicant_stdcode == '' ? '' : itemElement.coapplicant_stdcode;
-        let landline = itemElement.coapplicant_landline == '' ? '' : itemElement.coapplicant_landline;
-        concat_landline = std+'-'+landline;
+        if(itemElement.coapplicant_stdcode == '' && itemElement.coapplicant_landline == ''){
+          concat_landline = null;
+        }else{
+          let std = itemElement.coapplicant_stdcode == '' ? '' : itemElement.coapplicant_stdcode;
+          let landline = itemElement.coapplicant_landline == '' ? '' : itemElement.coapplicant_landline;
+          concat_landline = std+'-'+landline;
+        }
       }else if(itemElement.coapplicant_stdcode == '' && itemElement.coapplicant_landline == ''){
         concat_landline = null;
       }else{
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html
index ef48af123..0baee09c0 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html
@@ -26,7 +26,7 @@
                                                     <div style="width:100%">
                                                         <mat-form-field style="width:35%">
                                                             <mat-label>Starting Financial Year</mat-label>
-                                                            <input matInput autocomplete="off" placeholder="YYYY eg.2018" formControlName="staring_financial_year" (keypress)="keyPress($event)">
+                                                            <input matInput autocomplete="off" placeholder="YYYY eg.2018" formControlName="staring_financial_year" (keypress)="keyPress($event)" [readonly]="isReadOnly">
                                                             <mat-error> Invalid year format</mat-error>
                                                         </mat-form-field>
                                                         <!-- <mat-form-field hintLabel="Max 10 characters">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts
index 11e24e847..9c08883a6 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts
@@ -97,6 +97,7 @@ export class FinancialInfoComponent implements OnInit {
                     return value.records.estimated_value[key];
                 });
                 if (result.length > 0) {
+                    this.customerCommentsFlag = result.length == 1 ? false : true;
                     result.forEach((val,index) => {
                         //financial_date.push(this.createDate());
                     this.FY_annualSalesInwords[index] = this._pd.convertNumberToWords(val.financial_annual_sale);    
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
index 45d918e60..4ab5d6981 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
@@ -17,27 +17,30 @@
             <div fxLayout="row wrap">
                 <div fxFlex="100">
                     <mat-card *ngIf="manufacturingForm">
-                            <mat-card-header>
+                            <!-- <mat-card-header>
                               <mat-card-title class="highlight"> Manufacturing Details </mat-card-title>
-                            </mat-card-header>
+                            </mat-card-header> -->
+                            <h5 class="highlight" style="margin: 12px;">Manufacturing Details</h5>
                             <div formArrayName="manufacturing_details">
                                 <div *ngFor="let md of stockForms.controls.manufacturing_details['controls']; let i=index" [formGroupName]="i">        
                                     <div formArrayName="manufacturing_raw_materials">
                                         <div *ngFor="let mrm of md.controls.manufacturing_raw_materials['controls']; let a=index" [formGroupName]="a">    
-                                                <mat-label class="highlight"> <i> <p>{{a+1}} . Raw Material </p> </i> </mat-label>
+                                            <mat-card style="margin: 12px;">
+                                                <mat-label class="highlight"> <i>Raw Material #{{a+1}} </i> </mat-label>
                                                 <mat-card-content class="matcard">
                                                     <mat-form-field style="width:30%">
                                                         <input matInput autocomplete="off" placeholder="Name" formControlName="raw_name" >
                                                     </mat-form-field>
                                                     <mat-form-field style="width:30%">
-                                                        <mat-select placeholder="is the Stock is Observed ?" formControlName="stock_observed"  >
-                                                                <mat-option value="yes" >Yes</mat-option>
-                                                                <mat-option value="no" >No</mat-option>
+                                                        <!-- <mat-select placeholder="is the Stock is Observed ?" formControlName="stock_observed"  > -->
+                                                                <mat-select placeholder="Stock" formControlName="stock_observed"  >
+                                                                <mat-option value="yes">Add Stock Details</mat-option>
+                                                               <mat-option value="no">No Stock Observed</mat-option>
                                                         </mat-select>
                                                     </mat-form-field>
-                                                    <span *ngIf="mrm.get('stock_observed').value == 'no'" >
+                                                    <span *ngIf="mrm.get('stock_observed').value == 'yes'" >
                                                             <mat-form-field style="width:30%">
-                                                                <input matInput autocomplete="off" placeholder="Estimated Quantity" formControlName="raw_quantity" >
+                                                                <input matInput autocomplete="off" placeholder="Estimated Quantity" formControlName="raw_quantity" (keypress)="keyPress($event)">
                                                             </mat-form-field>
                                                             <mat-form-field style="width:30%">
                                                                 <mat-select placeholder="Unit of Mearsurement"
@@ -62,38 +65,43 @@
                                                                 </mat-select>
                                                             </mat-form-field>
                                                             <mat-form-field *ngIf="mrm.get('is_sufficiant_raw').value == 'no'" appearance="outline" style="width: 90%">
-                                                                <mat-label class="highlight"> <i>Please comment on the stock level observed?</i> </mat-label>
+                                                                <mat-label> <i>Please comment on the stock level observed?</i> </mat-label>
                                                                 <textarea matInput autocomplete="off" placeholder="Please comment on the stock level observed" formControlName="rawmaterial_remarks"></textarea>
                                                             </mat-form-field>
                                                     </span>
-                                                    <button type="button" mat-raised-button mat-icon-button (click)="addRawMaterials(1)"
-                                                                                    matTooltip="Add More Raw Materials" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" color="primary"  *ngIf="a==0">
-                                                            <mat-icon>add</mat-icon>
-                                                    </button>
-                                                    <button type="button" mat-raised-button mat-icon-button (click)="deleteRawMaterials(a,1)"
-                                                                                    matTooltip="Delete" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" *ngIf="a>0">
-                                                            <mat-icon>delete</mat-icon>
+                                                    <div align="end">
+                                                        <button type="button" mat-raised-button mat-icon-button (click)="addRawMaterials(1)"
+                                                                                        matTooltip="Add More Raw Materials" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" color="primary"  *ngIf="a==0">
+                                                                <mat-icon>add</mat-icon>
+                                                        </button>
+                                                        <button type="button" mat-raised-button mat-icon-button (click)="deleteRawMaterials(a,1)"
+                                                                                        matTooltip="Delete" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" *ngIf="a>0">
+                                                                <mat-icon>delete</mat-icon>
                                                     </button>
+                                                    </div>
                                                 </mat-card-content>
+                                            </mat-card>
                                         </div>
                                     </div>
 
                                     <div formArrayName="manufacturing_finished_goods">
                                         <div *ngFor="let mfg of md.controls.manufacturing_finished_goods['controls']; let b=index" [formGroupName]="b">    
-                                                <mat-label class="highlight"> <i> <p> {{b+1}} Finished Goods </p> </i> </mat-label>
+                                            <mat-card style="margin: 12px;">
+                                                <mat-label class="highlight"> <i>Finished Goods #{{b+1}} </i> </mat-label>
                                                 <mat-card-content class="matcard">
                                                     <mat-form-field style="width:30%">
                                                         <input matInput autocomplete="off" placeholder="Name" formControlName="goods_name" >
                                                     </mat-form-field>
                                                     <mat-form-field style="width:30%">
-                                                        <mat-select placeholder="is the Goods is Observed ?" formControlName="goods_observed"  >
-                                                            <mat-option value="yes" >Yes</mat-option>
-                                                            <mat-option value="no" >No</mat-option>
+                                                        <!-- <mat-select placeholder="is the Goods is Observed ?" formControlName="goods_observed"  > -->
+                                                                <mat-select placeholder="Finished Goods" formControlName="goods_observed"  >
+                                                                <mat-option value="yes">Add Stock Details</mat-option>
+                                                                <mat-option value="no">No Stock Observed</mat-option>
                                                         </mat-select>
                                                     </mat-form-field>
-                                                    <span *ngIf="mfg.get('goods_observed').value == 'no'" >
+                                                    <span *ngIf="mfg.get('goods_observed').value == 'yes'" >
                                                         <mat-form-field style="width:30%">
-                                                            <input matInput autocomplete="off" placeholder="Estimated Quantity" formControlName="goods_quantity" >
+                                                            <input matInput autocomplete="off" placeholder="Estimated Quantity" formControlName="goods_quantity" (keypress)="keyPress($event)">
                                                         </mat-form-field>
                                                         <mat-form-field style="width:76%">  
                                                             <input matInput autocomplete="off" placeholder="Estimated Value of Stock Observed" formControlName="goods_value" (keypress)="keyPress($event)" (keyup)="inWords($event,2)"  >
@@ -113,7 +121,7 @@
                                                             <textarea matInput autocomplete="off" placeholder="Please comment on the finished goods observed" formControlName="finishedgoods_remarks"></textarea>
                                                         </mat-form-field>
                                                     </span>
-                                                                
+                                                    <div align="end">    
                                                     <button type="button" mat-raised-button mat-icon-button (click)="addGoods(1)"
                                                                                     matTooltip="Add More Finished Goods" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" color="primary"  *ngIf="b==0">
                                                         <mat-icon>add</mat-icon>
@@ -122,26 +130,29 @@
                                                                                     matTooltip="Delete" matTooltipPosition="above" class="mr-1 mb-1 hover-icon"  *ngIf="b>0">
                                                         <mat-icon>delete</mat-icon>
                                                     </button>
+                                                    </div>
                                                 </mat-card-content>
+                                            </mat-card>
                                         </div>
                                     </div>
 
                                     <div formArrayName="manufacturing_traded_goods">
                                         <div *ngFor="let mtg of md.controls.manufacturing_traded_goods['controls']; let c=index" [formGroupName]="c">    
-                                            <mat-label class="highlight"> <i> <p>{{c+1}} Traded Goods </p> </i> </mat-label>
+                                          <mat-card style="margin: 12px;">
+                                            <mat-label class="highlight"> <i>Traded Goods #{{c+1}} </i> </mat-label>
                                                 <mat-card-content class="matcard">
                                                     <mat-form-field style="width:30%">
                                                         <input matInput autocomplete="off" placeholder="Name" formControlName="traded_goods_name" >
                                                     </mat-form-field>
                                                     <mat-form-field style="width:30%">
-                                                        <mat-select placeholder="is the Traded Goods is Observed ?" formControlName="traded_goods_observed"   >
-                                                            <mat-option value="yes" >Yes</mat-option>
-                                                            <mat-option value="no" >No</mat-option>
+                                                        <mat-select placeholder="Traded Goods" formControlName="traded_goods_observed"   >
+                                                                <mat-option value="yes">Add Stock Details</mat-option>
+                                                                <mat-option value="no">No Stock Observed</mat-option>
                                                         </mat-select>
                                                     </mat-form-field>
-                                                    <span *ngIf="mtg.get('traded_goods_observed').value == 'no'" >
+                                                    <span *ngIf="mtg.get('traded_goods_observed').value == 'yes'" >
                                                         <mat-form-field style="width:30%">
-                                                            <input matInput autocomplete="off" placeholder="Estimated Quantity" formControlName="traded_goods_quantity" >
+                                                            <input matInput autocomplete="off" placeholder="Estimated Quantity" formControlName="traded_goods_quantity" (keypress)="keyPress($event)" >
                                                         </mat-form-field>
                                                         <mat-form-field style="width:76%">  
                                                             <input matInput autocomplete="off" placeholder="Estimated Value of Stock Observed" formControlName="estimated_traded_goods_value" (keypress)="keyPress($event)" (keyup)="inWords($event,3)" >
@@ -158,11 +169,11 @@
                                                             </mat-select>
                                                         </mat-form-field>
                                                         <mat-form-field *ngIf="mtg.get('is_sufficiant_traded_goods').value == 'no'" appearance="outline" style="width: 90%">
-                                                            <mat-label class="highlight"> <i>Please comment on the Traded Goods stock level observed?</i> </mat-label>
+                                                            <mat-label> <i>Please comment on the Traded Goods stock level observed?</i> </mat-label>
                                                             <textarea matInput autocomplete="off" placeholder="Please comment on the traded goods stock level observed" formControlName="traded_goods_remarks"></textarea>
                                                         </mat-form-field>
                                                     </span>
-                                                                
+                                                    <div align="end">   
                                                     <button type="button" mat-raised-button mat-icon-button (click)="addTradedGoods(1)"
                                                                                     matTooltip="Add More Traded Goods" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" color="primary"  *ngIf="c==0">
                                                                                         <mat-icon>add</mat-icon>
@@ -171,7 +182,9 @@
                                                                                     matTooltip="Delete" matTooltipPosition="above" class="mr-1 mb-1 hover-icon"  *ngIf="c>0">
                                                                                         <mat-icon>delete</mat-icon>
                                                     </button>
+                                                    </div>
                                                 </mat-card-content>
+                                            </mat-card>
                                         </div>
                                     </div>
                                 </div>
@@ -179,29 +192,31 @@
                     </mat-card>
                     
                     <mat-card *ngIf="retailForm">
-                            <mat-card-header>
-                                <mat-card-title><p>Retail Details</p></mat-card-title>
-                            </mat-card-header>
+                            <!-- <mat-card-header>
+                                <mat-card-title class="highlight"><p>Retail Details</p></mat-card-title>
+                            </mat-card-header> -->
+                            <h5 class="highlight" style="margin: 12px;">Retail Details</h5>
                         
                             <div formArrayName="retail_details">
                                 <div *ngFor="let rd of stockForms.controls.retail_details['controls']; let j=index" [formGroupName]="j">
 
                                     <div formArrayName="retail_finished_goods">
                                         <div *ngFor="let retailfg of rd.controls.retail_finished_goods['controls']; let d=index" [formGroupName]="d">    
-                                                <mat-label class="highlight"> <i> <p>{{d+1}} Finished Goods </p> </i> </mat-label>
+                                            <mat-card style="margin: 12px;">
+                                                <mat-label class="highlight"> <i>Finished Goods #{{d+1}} </i> </mat-label>
                                                 <mat-card-content class="matcard">
                                                     <mat-form-field style="width:30%">
                                                         <input matInput autocomplete="off" placeholder="Name" formControlName="goods_name" >
                                                     </mat-form-field>
                                                     <mat-form-field style="width:30%">
-                                                        <mat-select placeholder="is the Goods is Observed ?" formControlName="goods_observed"  >
-                                                            <mat-option value="yes" >Yes</mat-option>
-                                                            <mat-option value="no" >No</mat-option>
+                                                        <mat-select placeholder="Finished Goods" formControlName="goods_observed"  >
+                                                                <mat-option value="yes">Add Stock Details</mat-option>
+                                                                <mat-option value="no">No stock observed</mat-option>
                                                         </mat-select>
                                                     </mat-form-field>
-                                                    <span *ngIf="retailfg.get('goods_observed').value == 'no'" >
+                                                    <span *ngIf="retailfg.get('goods_observed').value == 'yes'" >
                                                         <mat-form-field style="width:30%">
-                                                            <input matInput autocomplete="off" placeholder="Estimated Quantity" formControlName="goods_quantity" >
+                                                            <input matInput autocomplete="off" placeholder="Estimated Quantity" formControlName="goods_quantity" (keypress)="keyPress($event)">
                                                         </mat-form-field>
                                                         <mat-form-field style="width:76%">  
                                                             <input matInput autocomplete="off" placeholder="Estimated Value of Stock Observed" formControlName="goods_value" (keypress)="keyPress($event)" (keyup)="inWords($event,4)" >
@@ -218,7 +233,7 @@
                                                             </mat-select>
                                                         </mat-form-field>
                                                         <mat-form-field *ngIf="retailfg.get('is_sufficiant_goods').value == 'no'" appearance="outline" style="width: 90%">
-                                                            <mat-label class="highlight"> <i>Please comment on the finished goods stock level observed?</i> </mat-label>
+                                                            <mat-label> <i>Please comment on the finished goods stock level observed?</i> </mat-label>
                                                             <textarea matInput autocomplete="off" placeholder="Please comment on the finished goods observed" formControlName="finishedgoods_remarks"></textarea>
                                                         </mat-form-field>
                                                     </span>
@@ -227,30 +242,33 @@
                                                                             matTooltip="Add More Finished Goods" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" color="primary"  *ngIf="d==0">
                                                         <mat-icon>add</mat-icon>
                                                     </button>
+
                                                     <button type="button" mat-raised-button mat-icon-button (click)="deleteGoods(d,2)"
                                                                             matTooltip="Delete" matTooltipPosition="above" class="mr-1 mb-1 hover-icon"  *ngIf="d>0">
                                                         <mat-icon>delete</mat-icon>
                                                     </button>
                                                 </mat-card-content>
+                                            </mat-card>
                                         </div>
                                      </div>
 
                                     <div formArrayName="retail_traded_goods">
                                         <div *ngFor="let item of rd.controls.retail_traded_goods['controls']; let e=index" [formGroupName]="e">    
-                                                <mat-label class="highlight"> <i> <p>{{e+1}} Traded Goods </p> </i> </mat-label>
+                                            <mat-card style="margin: 12px;">
+                                                <mat-label class="highlight"> <i>Traded Goods #{{e+1}} </i> </mat-label>
                                                 <mat-card-content class="matcard">
                                                     <mat-form-field style="width:30%">
                                                         <input matInput autocomplete="off" placeholder="Name" formControlName="traded_goods_name" >
                                                     </mat-form-field>
                                                     <mat-form-field style="width:30%">
-                                                        <mat-select placeholder="is the Traded Goods is Observed ?" formControlName="traded_goods_observed"  >
-                                                            <mat-option value="yes" >Yes</mat-option>
-                                                            <mat-option value="no" >No</mat-option>
+                                                        <mat-select placeholder="Traded Goods" formControlName="traded_goods_observed"  >
+                                                                <mat-option value="yes">Add Stock Details</mat-option>
+                                                                <mat-option value="no">No Stock Observed</mat-option>
                                                         </mat-select>
                                                     </mat-form-field>
-                                                    <span *ngIf="item.get('traded_goods_observed').value == 'no'" >
+                                                    <span *ngIf="item.get('traded_goods_observed').value == 'yes'" >
                                                             <mat-form-field style="width:30%">
-                                                                <input matInput autocomplete="off" placeholder="Estimated Quantity" formControlName="traded_goods_quantity" >
+                                                                <input matInput autocomplete="off" placeholder="Estimated Quantity" formControlName="traded_goods_quantity" (keypress)="keyPress($event)">
                                                             </mat-form-field>
                                                             <mat-form-field style="width:76%">  
                                                                 <input matInput autocomplete="off" placeholder="Estimated Value of Stock Observed" formControlName="estimated_traded_goods_value" (keypress)="keyPress($event)"  (keyup)="inWords($event,5)" >
@@ -267,11 +285,11 @@
                                                                 </mat-select>
                                                             </mat-form-field>
                                                             <mat-form-field *ngIf="item.get('is_sufficiant_traded_goods').value == 'no'" appearance="outline" style="width: 90%">
-                                                                <mat-label class="highlight"> <i>Please comment on the Traded Goods stock level observed?</i> </mat-label>
+                                                                <mat-label> <i>Please comment on the Traded Goods stock level observed?</i> </mat-label>
                                                                 <textarea matInput autocomplete="off" placeholder="Please comment on the traded goods stock level observed" formControlName="traded_goods_remarks"></textarea>
                                                             </mat-form-field>
                                                     </span>
-                                                    
+                                                    <div align="end">
                                                     <button type="button" mat-raised-button mat-icon-button (click)="addTradedGoods(2)"
                                                                         matTooltip="Add More Traded Goods" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" color="primary"  *ngIf="e==0">
                                                                             <mat-icon>add</mat-icon>
@@ -280,7 +298,9 @@
                                                                         matTooltip="Delete" matTooltipPosition="above" class="mr-1 mb-1 hover-icon"  *ngIf="e>0">
                                                                             <mat-icon>delete</mat-icon>
                                                     </button>
+                                                    </div>
                                                 </mat-card-content>
+                                            </mat-card>
                                                                
                                         </div>
                                     </div>
@@ -290,28 +310,30 @@
                        
                     <mat-card *ngIf="tradingForm">
                             
-                            <mat-card-header>
-                                <mat-card-title><p>Trading Details</p></mat-card-title>
-                            </mat-card-header>
+                            <!-- <mat-card-header>
+                                <mat-card-title class="highlight"><p>Trading Details</p></mat-card-title>
+                            </mat-card-header> -->
+                            <h5 class="highlight" style="margin: 12px;">Trading Details</h5>
                         
                             <div formArrayName="trade_details">
                                 <div *ngFor="let td of stockForms.controls.trade_details['controls']; let k=index" [formGroupName]="k">
                                     <div formArrayName="trading_finished_goods">
                                         <div *ngFor="let tradesubdetail of td.controls.trading_finished_goods['controls']; let f=index" [formGroupName]="f">    
-                                                <mat-label class="highlight"> <i> <p>{{f+1}} Finished Goods </p> </i> </mat-label>
+                                            <mat-card style="margin: 12px;">
+                                                <mat-label class="highlight"> <i>Finished Goods #{{f+1}} </i> </mat-label>
                                                 <mat-card-content class="matcard">
                                                     <mat-form-field style="width:30%">
                                                         <input matInput autocomplete="off" placeholder="Name" formControlName="goods_name" >
                                                     </mat-form-field>
                                                     <mat-form-field style="width:30%">
-                                                        <mat-select placeholder="is the Goods is Observed ?" formControlName="goods_observed"   >
-                                                            <mat-option value="yes" >Yes</mat-option>
-                                                            <mat-option value="no" >No</mat-option>
+                                                        <mat-select placeholder="Finished Goods" formControlName="goods_observed"   >
+                                                                <mat-option value="yes">Add Stock Details</mat-option>
+                                                                <mat-option value="no">No Stock Observed</mat-option>
                                                         </mat-select>
                                                     </mat-form-field>
-                                                    <span *ngIf="tradesubdetail.get('goods_observed').value == 'no'" >
+                                                    <span *ngIf="tradesubdetail.get('goods_observed').value == 'yes'" >
                                                         <mat-form-field style="width:30%">
-                                                            <input matInput autocomplete="off" placeholder="Estimated Quantity" formControlName="goods_quantity" >
+                                                            <input matInput autocomplete="off" placeholder="Estimated Quantity" formControlName="goods_quantity" (keypress)="keyPress($event)">
                                                         </mat-form-field>
                                                         <mat-form-field style="width:76%">  
                                                             <input matInput autocomplete="off" placeholder="Estimated Value of Stock Observed" formControlName="goods_value" (keypress)="keyPress($event)"  (keyup)="inWords($event,6)" >
@@ -328,11 +350,12 @@
                                                             </mat-select>
                                                         </mat-form-field>
                                                         <mat-form-field *ngIf="tradesubdetail.get('is_sufficiant_goods').value == 'no'" appearance="outline" style="width: 90%">
-                                                            <mat-label class="highlight"> <i>Please comment on the finished goods stock level observed?</i> </mat-label>
+                                                            <mat-label> <i>Please comment on the finished goods stock level observed?</i> </mat-label>
                                                             <textarea matInput autocomplete="off" placeholder="Please comment on the finished goods observed" formControlName="finishedgoods_remarks"></textarea>
                                                         </mat-form-field>
                                                     </span>
-                                                        
+                                                
+                                                <div align="end">   
                                                 <button type="button" mat-raised-button mat-icon-button (click)="addGoods(3)"
                                                                             matTooltip="Add More Finished Goods" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" color="primary"  *ngIf="f==0">
                                                     <mat-icon>add</mat-icon>
@@ -341,27 +364,30 @@
                                                                             matTooltip="Delete" matTooltipPosition="above" class="mr-1 mb-1 hover-icon"  *ngIf="f>0">
                                                     <mat-icon>delete</mat-icon>
                                                 </button>
-                                                </mat-card-content>
-
+                                                </div>
+                                            </mat-card-content>
+                                                
+                                            </mat-card>
                                         </div>                       
                                     </div>
 
                                     <div formArrayName="trading_traded_goods">
                                         <div *ngFor="let tradetg of td.controls.trading_traded_goods['controls']; let g=index" [formGroupName]="g">    
-                                                <mat-label class="highlight"> <i> <p>{{g+1}} Traded Goods </p> </i> </mat-label>
+                                            <mat-card style="margin: 12px;">
+                                                <mat-label class="highlight"> <i>Traded Goods #{{g+1}} </i> </mat-label>
                                                     <mat-card-content class="matcard">
                                                             <mat-form-field style="width:30%">
                                                                 <input matInput autocomplete="off" placeholder="Name" formControlName="traded_goods_name" >
                                                             </mat-form-field>
                                                             <mat-form-field style="width:30%">
-                                                               <mat-select placeholder="is the Traded Goods is Observed ?" formControlName="traded_goods_observed"  >
-                                                               <mat-option value="yes" >Yes</mat-option>
-                                                               <mat-option value="no" >No</mat-option>
+                                                               <mat-select placeholder="Traded Goods" formControlName="traded_goods_observed"  >
+                                                               <mat-option value="yes">Add Stock Details</mat-option>
+                                                               <mat-option value="no">No stock observed</mat-option>
                                                                </mat-select>
                                                             </mat-form-field>
-                                                            <span *ngIf="tradetg.get('traded_goods_observed').value == 'no'" >
+                                                            <span *ngIf="tradetg.get('traded_goods_observed').value == 'yes'" >
                                                                             <mat-form-field style="width:30%">
-                                                                                <input matInput autocomplete="off" placeholder="Estimated Quantity" formControlName="traded_goods_quantity" >
+                                                                                <input matInput autocomplete="off" placeholder="Estimated Quantity" formControlName="traded_goods_quantity" (keypress)="keyPress($event)">
                                                                             </mat-form-field>
                                                                             <mat-form-field style="width:76%">  
                                                                                 <input matInput autocomplete="off" placeholder="Estimated Value of Stock Observed" formControlName="estimated_traded_goods_value" (keypress)="keyPress($event)" (keyup)="inWords($event,7)" >
@@ -378,21 +404,22 @@
                                                                                 </mat-select>
                                                                             </mat-form-field>
                                                                             <mat-form-field *ngIf="tradetg.get('is_sufficiant_traded_goods').value == 'no'" appearance="outline" style="width: 90%">
-                                                                                    <mat-label class="highlight"> <i>Please comment on the Traded Goods stock level observed?</i> </mat-label>
+                                                                                    <mat-label> <i>Please comment on the Traded Goods stock level observed?</i> </mat-label>
                                                                                     <textarea matInput autocomplete="off" placeholder="Please comment on the traded goods stock level observed" formControlName="traded_goods_remarks"></textarea>
                                                                             </mat-form-field>
-                                                            </span>
-                                                        
+                                                            </span>    
+                                                            <div align="end">
                                                             <button type="button" mat-raised-button mat-icon-button (click)="addTradedGoods(3)"
                                                                             matTooltip="Add More Traded Goods" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" color="primary"  *ngIf="g==0">
-                                                                                <mat-icon>add</mat-icon>
+                                                                <mat-icon>add</mat-icon>
                                                             </button>
                                                             <button type="button" mat-raised-button mat-icon-button (click)="deleteTradedGoods(g,3)"
                                                                             matTooltip="Delete" matTooltipPosition="above" class="mr-1 mb-1 hover-icon"  *ngIf="g>0">
                                                                                 <mat-icon>delete</mat-icon>
                                                             </button>
-                                                    </mat-card-content>
-                                                                   
+                                                            </div>
+                                                        </mat-card-content>
+                                                </mat-card>                   
                                         </div>
                                     </div>
                                 </div>
@@ -401,9 +428,10 @@
                     </mat-card>
 
                     <mat-card *ngIf="serviceProviderForm">
-                        <mat-card-header>
+                        <!-- <mat-card-header>
                             <p>Service Provider</p>
-                        </mat-card-header>
+                        </mat-card-header> -->
+                        <h5 class="highlight" style="margin: 12px;">Service Provider</h5>
                         <div style="text-align: center; margin: 12px;">Service Provider Details Not applicable here !!</div>
                     </mat-card>
                     

From 596937a1ddca1d9e0248d396e149da570d060ee5 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Thu, 3 Jan 2019 18:00:21 +0530
Subject: [PATCH 10/29] general : ps

---
 .../general-info/general-info.component.html  |  7 ++++---
 .../general-info/general-info.component.ts    | 19 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
index 55a125e6b..b3b6c50f8 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
@@ -58,7 +58,7 @@
         <!-- companies start -->
         <mat-card>
             <mat-card-header>
-              <mat-card-title>Companies</mat-card-title>
+              <mat-card-title>Company/Firm</mat-card-title>
             </mat-card-header>
               <mat-card-content>
                 <div fxLayout="row wrap" formArrayName="companies">
@@ -90,7 +90,7 @@
                                       <div *ngFor="let mulRel of relation.get('multiple_relation').controls; let m = index" [formGroupName]="m">
                                           <div fxLayout="row nowrap">
                                           <mat-form-field style="width: 40%">
-                                              <mat-select placeholder="Relation to" formControlName="applicant_relation_to">
+                                              <mat-select placeholder="Relation to" formControlName="applicant_relation_to" (selectionChange)="selectedApplicant($event,relation.controls.applicant_name.value)">
                                                   <mat-option>Select</mat-option>  
                                                 <mat-option *ngFor="let rel of individualsList" [value]="rel.individuals_order_id" [disabled]="relation.controls.applicant_name.value == rel.applicant_name">
                                                   {{rel.applicant_name | titlecase}}
@@ -98,6 +98,7 @@
                                               </mat-select>
                                             </mat-form-field>  
                                             <mat-form-field style="width: 20%">
+                                                <!--[placeholder]="placeholderName[i] != ''  ? placeholderName[i] : 'Instalment Amount' "-->
                                                 <mat-select placeholder="Relation" formControlName="relationship">
                                                     <mat-option>Select</mat-option>
                                                     <mat-option *ngFor="let relShip of relationShipList" [value]="relShip.relationship_id">
@@ -117,7 +118,7 @@
                                             
                                       </div>
                                         </div>
-                                        <p>Company Relationship</p>
+                                        <p>Company/Firm Relationship</p>
                                         <div formArrayName="multiple_company_relation">
                                                 <div fxLayout="row nowrap" *ngFor="let comRel of relation.get('multiple_company_relation').controls; let c = index" [formGroupName]="c">
                                                     <mat-form-field style="width: 40%">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts
index 6348fc091..d33b85b30 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts
@@ -338,7 +338,24 @@ export class GeneralInfoComponent implements OnInit {
           });
       }
     }
-    
+    selectedApplicant(e,applicant_name){
+        console.log(e);
+        console.log(e.value);
+        console.log(e.viewValue);
+        console.log(applicant_name);
+    }
+    //   selectedfrequency(e,i){  
+    //     switch(+e){
+    //         case 1: this.placeholderName[i] = 'Weekly Instalment Amount';  break;
+    //         case 2: this.placeholderName[i] = 'Daily Instalment Amount';  break;
+    //         case 3: this.placeholderName[i] = 'Annual Instalment Amount'; break;
+    //         case 4: this.placeholderName[i] = 'Hourly Instalment Amount'; break;
+    //         case 5: this.placeholderName[i] = 'EMI Amount'; break;
+    //         case 6: this.placeholderName[i] = 'Quarterly Instalment Amount'; break;
+    //         case 7: this.placeholderName[i] = 'Halfyearly Instalment Amount'; break;
+    //         default : this.placeholderName[i] = ''; break;
+    //     }
+    // }
 
     // validate all form group and form array fields
 validateAllFormFields(formGroup: any) {

From 4693b676e6836008894b1707c60d8c09ebca504b Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Thu, 3 Jan 2019 18:22:53 +0530
Subject: [PATCH 11/29] address issues fixed : ps

---
 .../list-pd/start-pd/forms/address/address.component.html       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html
index e06e9f46c..bf2770284 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html
@@ -176,7 +176,7 @@
                                     </span>                
                                 
 
-                                    <span formArrayName="additional_premises">
+                                    <span *ngIf="addressForm.controls['bussiness_activity'].value == 'yes'" formArrayName="additional_premises">
                                         <div 
                                         *ngFor="let item of addressForm.controls.additional_premises['controls']; let i = index;" [formGroupName]="i">
                                       

From 683777c7e14625eb17cd7e23fa73d92172637b4d Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Thu, 3 Jan 2019 23:41:38 +0530
Subject: [PATCH 12/29] Stock Changes : ps

---
 .../financial-info.component.html             |  12 +-
 .../loan-details/loan-details.component.html  |  14 +-
 .../start-pd/forms/stock/stock.component.html |  71 ++++----
 .../start-pd/forms/stock/stock.component.ts   | 158 ++++++++++++------
 4 files changed, 161 insertions(+), 94 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html
index 0baee09c0..3da828bb1 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html
@@ -31,7 +31,7 @@
                                                         </mat-form-field>
                                                         <!-- <mat-form-field hintLabel="Max 10 characters">
                                                             <input matInput #input maxlength="10" placeholder="Enter some input">
-                                                            <mat-hint align="end">{{input.value?.length || 0}}/10</mat-hint>
+                                                            <mat-hint align="start" style="font-size:70%">{{input.value?.length || 0}}/10</mat-hint>
                                                         </mat-form-field> -->
 
                                                         <mat-form-field style="width:35%">
@@ -60,7 +60,7 @@
                                                                             <span *ngIf="i != 0">
                                                                                     <mat-form-field  style="width:60%"> 
                                                                                             <input matInput autocomplete="off"  placeholder="Sale Variation from Previous Year in %" formControlName="financial_annualsales_variation" (keypress)="keyPress($event)">
-                                                                                            <mat-hint align="end" *ngIf="details.get('financial_annualsales_variation').value != '' "  >
+                                                                                            <mat-hint align="start" style="font-size:70%" *ngIf="details.get('financial_annualsales_variation').value != '' "  >
                                                                                                 <span *ngIf="details.get('financial_annualsales_variation').value == 0">
                                                                                                 No differents in Sales in FY <i> {{details.get('financial_year').value}} </i> over Sales in FY <i> {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}}  </i>   
                                                                                                 </span>
@@ -109,7 +109,7 @@
                                                                 <span *ngIf="i != 0">
                                                                         <mat-form-field style="width:65%">
                                                                             <input matInput autocomplete="off" [ngClass]="{'highlight': (details.controls['financial_variation'].value > 40) || (details.controls['financial_variation'].value < -40)}" placeholder="Profit Variation from Previous Year in %" formControlName="financial_variation" (keypress)="keyPress($event)">
-                                                                            <mat-hint align="end" *ngIf="i != 0 && details.get('financial_variation').value != '' " [ngClass]="{'highlight': (details.controls['financial_variation'].value > 40) || (details.controls['financial_variation'].value < -40)}" >
+                                                                            <mat-hint align="start" style="font-size:70%" *ngIf="i != 0 && details.get('financial_variation').value != '' " [ngClass]="{'highlight': (details.controls['financial_variation'].value > 40) || (details.controls['financial_variation'].value < -40)}" >
                                                                                 <span *ngIf="details.get('financial_variation').value == 0">
                                                                                 No differents in Profit in FY <i> {{details.get('financial_year').value}} </i> over Profit in FY <i> {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} </i>    
                                                                                 </span>
@@ -121,7 +121,7 @@
                                                                                 </span>
                                                                             </mat-hint>
                                                                                 <!-- “Increase in Sales in FY 2017-2018 over sales in FY 2016-2017 is 11.11%” -->
-                                                                                <!-- <mat-hint align="end" *ngIf="i != 0" [ngClass]="{'highlight': (details.controls['financial_variation'].value > 40) || (details.controls['financial_variation'].value < -40)}" >{{SalesStatement[i]}}</mat-hint> -->
+                                                                                <!-- <mat-hint align="start" style="font-size:70%" *ngIf="i != 0" [ngClass]="{'highlight': (details.controls['financial_variation'].value > 40) || (details.controls['financial_variation'].value < -40)}" >{{SalesStatement[i]}}</mat-hint> -->
                                                                         </mat-form-field>
                                                                 </span>
                                                     
@@ -181,7 +181,7 @@
                                                                             <span *ngIf="i != 0">
                                                                                     <mat-form-field  style="width:60%"> 
                                                                                             <input matInput autocomplete="off"  placeholder="Sale Variation from Previous Year in %" formControlName="estimate_annualsales_variation" (keypress)="keyPress($event)">
-                                                                                            <mat-hint align="end" *ngIf="details.get('estimate_annualsales_variation').value != '' "  >
+                                                                                            <mat-hint align="start" style="font-size:70%" *ngIf="details.get('estimate_annualsales_variation').value != '' "  >
                                                                                                 <span *ngIf="details.get('estimate_annualsales_variation').value == 0">
                                                                                                 No differents in Sales in FY <i> {{details.get('estimate_year').value}} </i> over Sales in FY <i> {{financialForm.controls.estimated_value['controls'][i-1].get('estimate_year').value}}   </i>  
                                                                                                 </span>
@@ -225,7 +225,7 @@
                                                                         </div>
                                                                         <mat-form-field *ngIf="i != 0" style="width:65%">
                                                                             <input matInput autocomplete="off" [ngClass]="{'highlight': details.controls['estimate_variation'].value >= 40 || details.controls['estimate_variation'].value >= -40}" placeholder="Variation from Previous Year in %" formControlName="estimate_variation" (keypress)="keyPress($event)">
-                                                                            <mat-hint align="end" [ngClass]="{'highlight': (details.controls['estimate_variation'].value >= 40) || (details.controls['estimate_variation'].value < -40)}" > 
+                                                                            <mat-hint align="start" style="font-size:70%" [ngClass]="{'highlight': (details.controls['estimate_variation'].value >= 40) || (details.controls['estimate_variation'].value < -40)}" > 
                                                                                 <span *ngIf="details.get('estimate_variation').value == 0">
                                                                                         No differents in Profit in FY <i> {{details.get('estimate_year').value}} </i>  over Profit in FY <i> {{financialForm.controls.estimated_value['controls'][i-1].get('estimate_year').value}}  </i>  
                                                                                         </span>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html
index a2ba31c75..6002270aa 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html
@@ -21,7 +21,7 @@
                                         <div fxFlex="33">
                                              <mat-form-field style="width: 80%">
                                             <input matInput placeholder="Loan Amount Applied for ? " formControlName="loan_amount" (keypress)="keyPress($event)" (keyup)="inWords($event,1)" (change)="loanCalc()" required autocomplete="off">
-                                            <mat-hint align="end" *ngIf="loanDetailsForm.controls['loan_amount'].value != ''">{{"&#8377;"}} {{loanAmtInWords}} Only</mat-hint>
+                                            <mat-hint align="start" style="font-size:70%" *ngIf="loanDetailsForm.controls['loan_amount'].value != ''">{{"&#8377;"}} {{loanAmtInWords}} Only</mat-hint>
                                         </mat-form-field>
                                         </div>
                                         <div fxFlex="33">
@@ -66,7 +66,7 @@
                                         <div *ngIf="loanDetailsForm.controls['is_transfer'].value == 'yes' && loanDetailsForm.controls['is_transfer'].value != ''">
                                         <mat-form-field  style="width: 60%">
                                                 <input matInput placeholder="What is the amount required for Balance Transfer ? " (keypress)="keyPress($event)" formControlName="balance_transfer_amount" (keyup)="inWords($event,2)" (change)="loanCalc()" autocomplete="off">
-                                                <mat-hint align="end" *ngIf="loanDetailsForm.controls['loan_amount'].value != ''">{{"&#8377;"}} {{balTxrfAmtInWords}} Only</mat-hint>
+                                                <mat-hint align="start" style="font-size:70%" *ngIf="loanDetailsForm.controls['loan_amount'].value != ''">{{"&#8377;"}} {{balTxrfAmtInWords}} Only</mat-hint>
                                             </mat-form-field>
                                         <mat-form-field style="width:30%">
                                             <mat-select  placeholder="Is there a Top Up"
@@ -88,7 +88,7 @@
                                     
                                         <mat-form-field *ngIf="loanDetailsForm.controls['is_topup'].value == 'yes' && loanDetailsForm.controls['is_topup'].value != '' "  style="width: 60%">
                                             <input matInput placeholder="Top Up Amount" (keypress)="keyPress($event)" formControlName="topup_amount" (keyup)="inWords($event,5)" autocomplete="off">
-                                            <mat-hint align="end" *ngIf="loanDetailsForm.controls['topup_amount'].value != ''">{{"&#8377;"}} {{topUpAmtInWords}} Only</mat-hint>
+                                            <mat-hint align="start" style="font-size:70%" *ngIf="loanDetailsForm.controls['topup_amount'].value != ''">{{"&#8377;"}} {{topUpAmtInWords}} Only</mat-hint>
                                         </mat-form-field>
 
                                         <mat-form-field *ngIf="loanDetailsForm.controls['is_topup'].value == 'yes' && loanDetailsForm.controls['is_topup'].value != '' "  style="width: 30%">
@@ -99,7 +99,7 @@
                                         
                                         <mat-form-field style="width: 30%">
                                             <input matInput placeholder="Amount of Own Contribution" formControlName="own_contribution" (keypress)="keyPress($event)" required (keyup)="inWords($event,4)" autocomplete="off">
-                                            <mat-hint align="end" *ngIf="loanDetailsForm.controls['own_contribution'].value != ''">{{"&#8377;"}} {{ownContributionInWords}} Only</mat-hint>
+                                            <mat-hint align="start" style="font-size:70%" *ngIf="loanDetailsForm.controls['own_contribution'].value != ''">{{"&#8377;"}} {{ownContributionInWords}} Only</mat-hint>
                                         </mat-form-field>
                                         
                                         <mat-form-field style="width: 30%">
@@ -135,7 +135,7 @@
     
                                     <mat-form-field  style="width: 60%">
                                         <input matInput placeholder="EMI Amount Comfortable Paying" formControlName="emi_level" (keypress)="keyPress($event)" (keyup)="inWords($event,6)" required autocomplete="off">
-                                        <mat-hint align="end" *ngIf="loanDetailsForm.controls['emi_level'].value != ''">{{"&#8377;"}} {{emiAmtInWords}} Only</mat-hint>
+                                        <mat-hint align="start" style="font-size:70%" *ngIf="loanDetailsForm.controls['emi_level'].value != ''">{{"&#8377;"}} {{emiAmtInWords}} Only</mat-hint>
                                     </mat-form-field>
 <!-- <div *ngIf="productAbbr === 'HL' || productAbbr === 'LL' || productAbbr === 'LAP' "> -->
     <mat-card *ngIf="mortageCardAccess">
@@ -200,12 +200,12 @@
                                                 <mat-form-field>
                                                     <input matInput placeholder="Estimate Market Value as Per Customer"
                                                         formControlName="emv_per_customer" (keypress)="keyPress($event)" (keyup)="inWords($event,7)" required autocomplete="off">
-                                                        <mat-hint align="end" *ngIf="loanDetailsForm.controls['emv_per_customer'].value != ''">{{"&#8377;"}} {{emvAmtInWords}} Only</mat-hint>
+                                                        <mat-hint align="start" style="font-size:70%" *ngIf="loanDetailsForm.controls['emv_per_customer'].value != ''">{{"&#8377;"}} {{emvAmtInWords}} Only</mat-hint>
                                                 </mat-form-field>
                                                 <!-- <mat-form-field>
                                                     <input matInput placeholder="Value as Per Agreement"
                                                         formControlName="value_per_agreement" (keypress)="keyPress($event)" required (keyup)="inWords($event,3)">
-                                                        <mat-hint align="end" *ngIf="loanDetailsForm.controls['loan_amount'].value != ''">{{"&#8377;"}} {{valAsPerAgmtInWords}} Only</mat-hint>
+                                                        <mat-hint align="start" style="font-size:70%" *ngIf="loanDetailsForm.controls['loan_amount'].value != ''">{{"&#8377;"}} {{valAsPerAgmtInWords}} Only</mat-hint>
                                                 </mat-form-field> -->
                                             </mat-card-content>
                                         </mat-card>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
index 4ab5d6981..66c5663c8 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
@@ -52,11 +52,12 @@
                                                                 <input matInput autocomplete="off" placeholder="Specify Other UOM" formControlName="other_uom" >
                                                             </mat-form-field>
                                                             <mat-form-field style="width:76%">
-                                                                <input matInput autocomplete="off" placeholder="Estimated Value of Stock Observed" formControlName="raw_value" (keypress)="keyPress($event)" (keyup)="inWords($event,1)" >
-                                                                <mat-hint align="end" *ngIf="mrm.get('raw_value').value != ''">{{"&#8377;"}} {{M_rawValueInWords}} Only</mat-hint> 
+                                                                <input matInput autocomplete="off" placeholder="Estimated Value of Stock Observed" formControlName="raw_value" (keypress)="keyPress($event)" (keyup)="inWords($event,1,a)" >
+                                                                <mat-hint align="start" style="font-size:70%" *ngIf="mrm.get('raw_value').value != ''">{{"&#8377;"}} {{M_rawValueInWords[a]}} Only</mat-hint> 
                                                             </mat-form-field>
                                                             <mat-form-field style="width:76%">
-                                                                <input matInput autocomplete="off" placeholder="Value of raw materials as per latest financial Statements" formControlName="rawmaterial_value" (keypress)="keyPress($event)" >
+                                                                <input matInput autocomplete="off" placeholder="Value of raw materials as per latest financial Statements" formControlName="rawmaterial_value" (keypress)="keyPress($event)" (keyup)="inWords($event,8,a)">
+                                                                <mat-hint align="start" style="font-size:70%" *ngIf="mrm.get('rawmaterial_value').value != ''">{{"&#8377;"}} {{M_financialRawValueInWords[a]}} Only</mat-hint> 
                                                             </mat-form-field>
                                                             <mat-form-field style="width:90%">
                                                                 <mat-select placeholder="Is the stock of Raw Materials observed, sufficient considering the size of operations" formControlName="is_sufficiant_raw"  >
@@ -69,7 +70,6 @@
                                                                 <textarea matInput autocomplete="off" placeholder="Please comment on the stock level observed" formControlName="rawmaterial_remarks"></textarea>
                                                             </mat-form-field>
                                                     </span>
-                                                    <div align="end">
                                                         <button type="button" mat-raised-button mat-icon-button (click)="addRawMaterials(1)"
                                                                                         matTooltip="Add More Raw Materials" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" color="primary"  *ngIf="a==0">
                                                                 <mat-icon>add</mat-icon>
@@ -78,7 +78,6 @@
                                                                                         matTooltip="Delete" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" *ngIf="a>0">
                                                                 <mat-icon>delete</mat-icon>
                                                     </button>
-                                                    </div>
                                                 </mat-card-content>
                                             </mat-card>
                                         </div>
@@ -104,11 +103,12 @@
                                                             <input matInput autocomplete="off" placeholder="Estimated Quantity" formControlName="goods_quantity" (keypress)="keyPress($event)">
                                                         </mat-form-field>
                                                         <mat-form-field style="width:76%">  
-                                                            <input matInput autocomplete="off" placeholder="Estimated Value of Stock Observed" formControlName="goods_value" (keypress)="keyPress($event)" (keyup)="inWords($event,2)"  >
-                                                                <mat-hint align="end" *ngIf="mfg.get('goods_value').value != ''">{{"&#8377;"}} {{M_goodsValueInWords}} Only</mat-hint> 
+                                                            <input matInput autocomplete="off" placeholder="Estimated Value of Stock Observed" formControlName="goods_value" (keypress)="keyPress($event)" (keyup)="inWords($event,2,b)"  >
+                                                                <mat-hint align="start" style="font-size:70%" *ngIf="mfg.get('goods_value').value != ''">{{"&#8377;"}} {{M_goodsValueInWords[b]}} Only</mat-hint> 
                                                         </mat-form-field>
                                                         <mat-form-field style="width:76%">
-                                                            <input matInput autocomplete="off" placeholder="Value of finished goods as per latest financial statements" formControlName="finished_goods_value" (keypress)="keyPress($event)" >
+                                                            <input matInput autocomplete="off" placeholder="Value of finished goods as per latest financial statements" formControlName="finished_goods_value" (keypress)="keyPress($event)" (keyup)="inWords($event,9,b)">
+                                                            <mat-hint align="start" style="font-size:70%" *ngIf="mfg.get('finished_goods_value').value != ''">{{"&#8377;"}} {{M_financialGoodsValueInWords[b]}} Only</mat-hint> 
                                                         </mat-form-field>
                                                         <mat-form-field style="width:90%">
                                                             <mat-select placeholder="Is the stock of finished goods observed ?" formControlName="is_sufficiant_goods"  >
@@ -121,7 +121,7 @@
                                                             <textarea matInput autocomplete="off" placeholder="Please comment on the finished goods observed" formControlName="finishedgoods_remarks"></textarea>
                                                         </mat-form-field>
                                                     </span>
-                                                    <div align="end">    
+                                                    
                                                     <button type="button" mat-raised-button mat-icon-button (click)="addGoods(1)"
                                                                                     matTooltip="Add More Finished Goods" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" color="primary"  *ngIf="b==0">
                                                         <mat-icon>add</mat-icon>
@@ -130,7 +130,7 @@
                                                                                     matTooltip="Delete" matTooltipPosition="above" class="mr-1 mb-1 hover-icon"  *ngIf="b>0">
                                                         <mat-icon>delete</mat-icon>
                                                     </button>
-                                                    </div>
+                                                
                                                 </mat-card-content>
                                             </mat-card>
                                         </div>
@@ -155,11 +155,12 @@
                                                             <input matInput autocomplete="off" placeholder="Estimated Quantity" formControlName="traded_goods_quantity" (keypress)="keyPress($event)" >
                                                         </mat-form-field>
                                                         <mat-form-field style="width:76%">  
-                                                            <input matInput autocomplete="off" placeholder="Estimated Value of Stock Observed" formControlName="estimated_traded_goods_value" (keypress)="keyPress($event)" (keyup)="inWords($event,3)" >
-                                                            <mat-hint align="end" *ngIf="mtg.get('estimated_traded_goods_value').value != ''">{{"&#8377;"}} {{M_tradedGoodsValueInWords}} Only</mat-hint>
+                                                            <input matInput autocomplete="off" placeholder="Estimated Value of Stock Observed" formControlName="estimated_traded_goods_value" (keypress)="keyPress($event)" (keyup)="inWords($event,3,c)" >
+                                                            <mat-hint align="start" style="font-size:70%" *ngIf="mtg.get('estimated_traded_goods_value').value != ''">{{"&#8377;"}} {{M_tradedGoodsValueInWords[c]}} Only</mat-hint>
                                                         </mat-form-field>
                                                         <mat-form-field style="width:76%">
-                                                            <input matInput autocomplete="off" placeholder="Value of traded goods as per latest financial statements" formControlName="traded_goods_value" (keypress)="keyPress($event)" >
+                                                            <input matInput autocomplete="off" placeholder="Value of traded goods as per latest financial statements" formControlName="traded_goods_value" (keypress)="keyPress($event)" (keyup)="inWords($event,10,c)">
+                                                            <mat-hint align="start" style="font-size:70%" *ngIf="mtg.get('traded_goods_value').value != ''">{{"&#8377;"}} {{M_financialTradedGoodsValueInWords[c]}} Only</mat-hint> 
                                                         </mat-form-field>
                                                         <mat-form-field style="width:90%">
                                                             <!-- <input matInput autocomplete="off" placeholder="Is the stock of finished goods observed ?" formControlName="is_sufficiant_goods" > -->
@@ -173,7 +174,7 @@
                                                             <textarea matInput autocomplete="off" placeholder="Please comment on the traded goods stock level observed" formControlName="traded_goods_remarks"></textarea>
                                                         </mat-form-field>
                                                     </span>
-                                                    <div align="end">   
+                                                    
                                                     <button type="button" mat-raised-button mat-icon-button (click)="addTradedGoods(1)"
                                                                                     matTooltip="Add More Traded Goods" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" color="primary"  *ngIf="c==0">
                                                                                         <mat-icon>add</mat-icon>
@@ -182,7 +183,7 @@
                                                                                     matTooltip="Delete" matTooltipPosition="above" class="mr-1 mb-1 hover-icon"  *ngIf="c>0">
                                                                                         <mat-icon>delete</mat-icon>
                                                     </button>
-                                                    </div>
+                                                    
                                                 </mat-card-content>
                                             </mat-card>
                                         </div>
@@ -219,11 +220,12 @@
                                                             <input matInput autocomplete="off" placeholder="Estimated Quantity" formControlName="goods_quantity" (keypress)="keyPress($event)">
                                                         </mat-form-field>
                                                         <mat-form-field style="width:76%">  
-                                                            <input matInput autocomplete="off" placeholder="Estimated Value of Stock Observed" formControlName="goods_value" (keypress)="keyPress($event)" (keyup)="inWords($event,4)" >
-                                                            <mat-hint align="end" *ngIf="retailfg.get('goods_value').value != ''">{{"&#8377;"}} {{R_goodsValueInWords}} Only</mat-hint>
+                                                            <input matInput autocomplete="off" placeholder="Estimated Value of Stock Observed" formControlName="goods_value" (keypress)="keyPress($event)" (keyup)="inWords($event,4,d)" >
+                                                            <mat-hint align="start" style="font-size:70%" *ngIf="retailfg.get('goods_value').value != ''">{{"&#8377;"}} {{R_goodsValueInWords[d]}} Only</mat-hint>
                                                         </mat-form-field>
                                                         <mat-form-field style="width:76%">
-                                                            <input matInput autocomplete="off" placeholder="Value of finished goods as per latest financial statements" formControlName="finished_goods_value" (keypress)="keyPress($event)" >
+                                                            <input matInput autocomplete="off" placeholder="Value of finished goods as per latest financial statements" formControlName="finished_goods_value" (keypress)="keyPress($event)" (keyup)="inWords($event,11,d)">
+                                                            <mat-hint align="start" style="font-size:70%" *ngIf="retailfg.get('finished_goods_value').value != ''">{{"&#8377;"}} {{R_financialGoodsValueInWords[d]}} Only</mat-hint> 
                                                         </mat-form-field>
                                                         <mat-form-field style="width:90%">
                                                         
@@ -271,11 +273,12 @@
                                                                 <input matInput autocomplete="off" placeholder="Estimated Quantity" formControlName="traded_goods_quantity" (keypress)="keyPress($event)">
                                                             </mat-form-field>
                                                             <mat-form-field style="width:76%">  
-                                                                <input matInput autocomplete="off" placeholder="Estimated Value of Stock Observed" formControlName="estimated_traded_goods_value" (keypress)="keyPress($event)"  (keyup)="inWords($event,5)" >
-                                                                <mat-hint align="end" *ngIf="item.get('estimated_traded_goods_value').value != ''">{{"&#8377;"}} {{R_tradedGoodsValueInWords}} Only</mat-hint>
+                                                                <input matInput autocomplete="off" placeholder="Estimated Value of Stock Observed" formControlName="estimated_traded_goods_value" (keypress)="keyPress($event)"  (keyup)="inWords($event,5,e)" >
+                                                                <mat-hint align="start" style="font-size:70%" *ngIf="item.get('estimated_traded_goods_value').value != ''">{{"&#8377;"}} {{R_tradedGoodsValueInWords[e]}} Only</mat-hint>
                                                             </mat-form-field>
                                                             <mat-form-field style="width:76%">
-                                                                <input matInput autocomplete="off" placeholder="Value of traded goods as per latest financial statements" formControlName="traded_goods_value" (keypress)="keyPress($event)" >
+                                                                <input matInput autocomplete="off" placeholder="Value of traded goods as per latest financial statements" formControlName="traded_goods_value" (keypress)="keyPress($event)" (keyup)="inWords($event,12,e)">
+                                                                <mat-hint align="start" style="font-size:70%" *ngIf="item.get('traded_goods_value').value != ''">{{"&#8377;"}} {{R_financialTradedGoodsValueInWords[e]}} Only</mat-hint> 
                                                             </mat-form-field>
                                                             <mat-form-field style="width:90%">
 
@@ -289,7 +292,7 @@
                                                                 <textarea matInput autocomplete="off" placeholder="Please comment on the traded goods stock level observed" formControlName="traded_goods_remarks"></textarea>
                                                             </mat-form-field>
                                                     </span>
-                                                    <div align="end">
+                                                    
                                                     <button type="button" mat-raised-button mat-icon-button (click)="addTradedGoods(2)"
                                                                         matTooltip="Add More Traded Goods" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" color="primary"  *ngIf="e==0">
                                                                             <mat-icon>add</mat-icon>
@@ -298,7 +301,7 @@
                                                                         matTooltip="Delete" matTooltipPosition="above" class="mr-1 mb-1 hover-icon"  *ngIf="e>0">
                                                                             <mat-icon>delete</mat-icon>
                                                     </button>
-                                                    </div>
+                                                    
                                                 </mat-card-content>
                                             </mat-card>
                                                                
@@ -336,11 +339,12 @@
                                                             <input matInput autocomplete="off" placeholder="Estimated Quantity" formControlName="goods_quantity" (keypress)="keyPress($event)">
                                                         </mat-form-field>
                                                         <mat-form-field style="width:76%">  
-                                                            <input matInput autocomplete="off" placeholder="Estimated Value of Stock Observed" formControlName="goods_value" (keypress)="keyPress($event)"  (keyup)="inWords($event,6)" >
-                                                            <mat-hint align="end" *ngIf="tradesubdetail.get('goods_value').value != ''">{{"&#8377;"}} {{T_goodsValueInWords}} Only</mat-hint>
+                                                            <input matInput autocomplete="off" placeholder="Estimated Value of Stock Observed" formControlName="goods_value" (keypress)="keyPress($event)"  (keyup)="inWords($event,6,f)" >
+                                                            <mat-hint align="start" style="font-size:70%" *ngIf="tradesubdetail.get('goods_value').value != ''">{{"&#8377;"}} {{T_goodsValueInWords[f]}} Only</mat-hint>
                                                         </mat-form-field>
                                                         <mat-form-field style="width:76%">
-                                                            <input matInput autocomplete="off" placeholder="Value of finished goods as per latest financial statements" formControlName="finished_goods_value" (keypress)="keyPress($event)" >
+                                                            <input matInput autocomplete="off" placeholder="Value of finished goods as per latest financial statements" formControlName="finished_goods_value" (keypress)="keyPress($event)" (keyup)="inWords($event,13,f)">
+                                                            <mat-hint align="start" style="font-size:70%" *ngIf="tradesubdetail.get('finished_goods_value').value != ''">{{"&#8377;"}} {{T_financialGoodsValueInWords[f]}} Only</mat-hint> 
                                                         </mat-form-field>
                                                         <mat-form-field style="width:90%">
                                                         
@@ -355,7 +359,7 @@
                                                         </mat-form-field>
                                                     </span>
                                                 
-                                                <div align="end">   
+                                                 
                                                 <button type="button" mat-raised-button mat-icon-button (click)="addGoods(3)"
                                                                             matTooltip="Add More Finished Goods" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" color="primary"  *ngIf="f==0">
                                                     <mat-icon>add</mat-icon>
@@ -364,7 +368,7 @@
                                                                             matTooltip="Delete" matTooltipPosition="above" class="mr-1 mb-1 hover-icon"  *ngIf="f>0">
                                                     <mat-icon>delete</mat-icon>
                                                 </button>
-                                                </div>
+                                                
                                             </mat-card-content>
                                                 
                                             </mat-card>
@@ -390,11 +394,12 @@
                                                                                 <input matInput autocomplete="off" placeholder="Estimated Quantity" formControlName="traded_goods_quantity" (keypress)="keyPress($event)">
                                                                             </mat-form-field>
                                                                             <mat-form-field style="width:76%">  
-                                                                                <input matInput autocomplete="off" placeholder="Estimated Value of Stock Observed" formControlName="estimated_traded_goods_value" (keypress)="keyPress($event)" (keyup)="inWords($event,7)" >
-                                                                                <mat-hint align="end" *ngIf="tradetg.get('estimated_traded_goods_value').value != ''">{{"&#8377;"}} {{T_tradedGoodsValueInWords}} Only</mat-hint> 
+                                                                                <input matInput autocomplete="off" placeholder="Estimated Value of Stock Observed" formControlName="estimated_traded_goods_value" (keypress)="keyPress($event)" (keyup)="inWords($event,7,g)">
+                                                                                <mat-hint align="start" style="font-size:70%" *ngIf="tradetg.get('estimated_traded_goods_value').value != ''">{{"&#8377;"}} {{T_tradedGoodsValueInWords[g]}} Only</mat-hint> 
                                                                             </mat-form-field>
                                                                             <mat-form-field style="width:76%">
-                                                                                <input matInput autocomplete="off" placeholder="Value of traded goods as per latest financial statements" formControlName="traded_goods_value" (keypress)="keyPress($event)" >
+                                                                                <input matInput autocomplete="off" placeholder="Value of traded goods as per latest financial statements" formControlName="traded_goods_value" (keypress)="keyPress($event)" (keyup)="inWords($event,14,g)">
+                                                                                <mat-hint align="start" style="font-size:70%" *ngIf="tradetg.get('traded_goods_value').value != ''">{{"&#8377;"}} {{T_financialTradedGoodsValueInWords[g]}} Only</mat-hint> 
                                                                             </mat-form-field>
                                                                             <mat-form-field style="width:90%">
                                                                                 <!-- <input matInput autocomplete="off" placeholder="Is the stock of finished goods observed ?" formControlName="is_sufficiant_goods" > -->
@@ -408,7 +413,7 @@
                                                                                     <textarea matInput autocomplete="off" placeholder="Please comment on the traded goods stock level observed" formControlName="traded_goods_remarks"></textarea>
                                                                             </mat-form-field>
                                                             </span>    
-                                                            <div align="end">
+                                                            
                                                             <button type="button" mat-raised-button mat-icon-button (click)="addTradedGoods(3)"
                                                                             matTooltip="Add More Traded Goods" matTooltipPosition="above" class="mr-1 mb-1 hover-icon" color="primary"  *ngIf="g==0">
                                                                 <mat-icon>add</mat-icon>
@@ -417,7 +422,7 @@
                                                                             matTooltip="Delete" matTooltipPosition="above" class="mr-1 mb-1 hover-icon"  *ngIf="g>0">
                                                                                 <mat-icon>delete</mat-icon>
                                                             </button>
-                                                            </div>
+                                                            
                                                         </mat-card-content>
                                                 </mat-card>                   
                                         </div>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts
index e6660afc0..cab80971e 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts
@@ -28,15 +28,24 @@ export class StockComponent implements OnInit {
   
   rawmaterial : any;
   
-  M_rawValueInWords : any;
-
-  M_goodsValueInWords : any;
-  R_goodsValueInWords : any;
-  T_goodsValueInWords : any;
+  M_rawValueInWords : any = [];
+  M_financialRawValueInWords : any = [];
   
-  M_tradedGoodsValueInWords : any;
-  R_tradedGoodsValueInWords : any;
-  T_tradedGoodsValueInWords : any;
+  M_goodsValueInWords : any = [];
+  R_goodsValueInWords : any = [];
+  T_goodsValueInWords : any = [];
+
+  M_financialGoodsValueInWords : any = [];
+  R_financialGoodsValueInWords : any = [];
+  T_financialGoodsValueInWords : any = [];
+  
+  M_tradedGoodsValueInWords : any = [];
+  R_tradedGoodsValueInWords : any = [];
+  T_tradedGoodsValueInWords : any = [];
+
+  M_financialTradedGoodsValueInWords : any = [];
+  R_financialTradedGoodsValueInWords : any = [];
+  T_financialTradedGoodsValueInWords : any = [];
   
   rawMaterialAccess: boolean;
   finishedGoodsAccess: boolean;
@@ -44,6 +53,7 @@ export class StockComponent implements OnInit {
   public submitted = false;
   noRecordsFound: Boolean = false;
   serviceProviderForm: Boolean = false;
+  suppliers_raw_materials : any = [];
 
   constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute,
               private router: Router,
@@ -113,12 +123,9 @@ export class StockComponent implements OnInit {
       let params: any = {};
       params.pd_id = this.pdid;
       params.pd_form_id = this.form_id;
-
       this._pd.retriveForm(params).subscribe(value => {
           if (value.status == 200) {
-              let dataForm = value.records;
-
-              
+              let dataForm = value.records;         
               if(dataForm !== undefined) {
               console.log(dataForm);  
                   this.stockForms = this.fb.group({
@@ -133,6 +140,24 @@ export class StockComponent implements OnInit {
                   let arr = record.filter(data => data.type_of_activity_id == 1);
                   console.log(133,arr.length);
                   if(arr.length > 0) {
+                    this._pd.retriveForm({pd_id:this.pdid,pd_form_id:1}).subscribe(value => {
+                      console.log('136',value);
+                      if(value.status == 200){
+                        this.suppliers_raw_materials = value.records.manufacturing_details[0].main_raw_materials;                        
+                        let manufacturing_temparr = [];
+                        manufacturing_temparr['manufacturing_raw_materials'] = dataForm.manufacturing_details[0].manufacturing_raw_materials; 
+                        manufacturing_temparr['manufacturing_finished_goods'] = dataForm.manufacturing_details[0].manufacturing_finished_goods; 
+                        manufacturing_temparr['manufacturing_traded_goods'] = dataForm.manufacturing_details[0].manufacturing_traded_goods; 
+                        this.initManufacturingDetails(manufacturing_temparr);
+                        }
+                        else{
+                          let manufacturing_temparr = [];
+                        manufacturing_temparr['manufacturing_raw_materials'] = dataForm.manufacturing_details[0].manufacturing_raw_materials; 
+                        manufacturing_temparr['manufacturing_finished_goods'] = dataForm.manufacturing_details[0].manufacturing_finished_goods; 
+                        manufacturing_temparr['manufacturing_traded_goods'] = dataForm.manufacturing_details[0].manufacturing_traded_goods; 
+                        this.initManufacturingDetails(manufacturing_temparr);
+                        }
+                    });
                     // console.log(1,dataForm);
                     // console.log(164,dataForm.manufacturing_details);
                     // console.log(2,dataForm.retail_details);
@@ -169,14 +194,7 @@ export class StockComponent implements OnInit {
                     // console.log(163,dataForm.manufacturing_details.manufacturing_raw_materials);
                     // console.log(164,dataForm.manufacturing_details[0]);
                     // console.log(164,dataForm.manufacturing_details[0].manufacturing_raw_materials);
-
-                    let manufacturing_temparr = [];
-
-                    manufacturing_temparr['manufacturing_raw_materials'] = dataForm.manufacturing_details[0].manufacturing_raw_materials; 
-                    manufacturing_temparr['manufacturing_finished_goods'] = dataForm.manufacturing_details[0].manufacturing_finished_goods; 
-                    manufacturing_temparr['manufacturing_traded_goods'] = dataForm.manufacturing_details[0].manufacturing_traded_goods; 
                     
-                    this.initManufacturingDetails(manufacturing_temparr);
                     //this.initManufacturingDetails(dataForm);
                     
                   }
@@ -264,7 +282,16 @@ export class StockComponent implements OnInit {
                 });
                     let arr = record.filter(data => data.type_of_activity_id == 1);
                     if(arr.length > 0) {
-                      this.initManufacturingDetails(null);     
+                      this._pd.retriveForm({pd_id:this.pdid,pd_form_id:1}).subscribe(value => {
+                        if(value.status == 200){
+                          this.suppliers_raw_materials = value.records.manufacturing_details[0].main_raw_materials;
+                          this.initManufacturingDetails(null);     
+                          }
+                          else{
+                            this.initManufacturingDetails(null);     
+                          }
+                      });
+                      // this.initManufacturingDetails(null);     
                     }
                     let arr1 = record.filter(data => data.type_of_activity_id == 2);
                     if(arr1.length > 0) {
@@ -292,7 +319,16 @@ export class StockComponent implements OnInit {
                 });
                     let arr = record.filter(data => data.type_of_activity_id == 1);
                     if(arr.length > 0) {
-                      this.initManufacturingDetails(null);     
+                      this._pd.retriveForm({pd_id:this.pdid,pd_form_id:1}).subscribe(value => {
+                        if(value.status == 200){
+                          this.suppliers_raw_materials = value.records.manufacturing_details[0].main_raw_materials;
+                          this.initManufacturingDetails(null);     
+                          }
+                          else{
+                            this.initManufacturingDetails(null);     
+                          }
+                      });
+                      
                     }
                     let arr1 = record.filter(data => data.type_of_activity_id == 2);
                     if(arr1.length > 0) {
@@ -378,14 +414,27 @@ tradingFormCreation(val) {
       const rawMaterial = <FormArray>this.stockForms.controls['manufacturing_details']['controls'][0].controls['manufacturing_raw_materials'];
       const finishedGoods = <FormArray>this.stockForms.controls['manufacturing_details']['controls'][0].controls['manufacturing_finished_goods'];
       const tradedGoods = <FormArray>this.stockForms.controls['manufacturing_details']['controls'][0].controls['manufacturing_traded_goods'];
-      const control = <FormArray>this.stockForms.controls['manufacturing_details']['controls'][0].controls['main_raw_materials'];
-      
+      const control = <FormArray>this.stockForms.controls['manufacturing_details']['controls'][0].controls['main_raw_materials'];    
       if(datas === null){
-        //  console.log(299,'if');
+        if(this.suppliers_raw_materials.length > 0){
+          for (let val of this.suppliers_raw_materials) {
+            let Ref_RawMaterials : any = {'raw_name': val.manufacturing_raw_material_name,
+                                                  'stock_observed':'',
+                                                  'raw_quantity': '',
+                                                  'raw_uom': '',
+                                                  'other_uom': '',
+                                                  'raw_value': '',
+                                                  'rawmaterial_value': '',
+                                                  'is_sufficiant_raw': '',
+                                                  'rawmaterial_remarks':''};
+            rawMaterial.push(this.createRawmaterial(Ref_RawMaterials)); 
+          }
+        }
+        else{      
          rawMaterial.push(this.createRawmaterial(null)); 
+        }
          finishedGoods.push(this.createGoods(null)); 
          tradedGoods.push(this.createTradedGoods(null));     
-
        } else {
         //  console.log(305,'else')
         //  console.log(377,datas);
@@ -395,6 +444,7 @@ tradingFormCreation(val) {
           //  console.log(val);
           if(val.raw_value){
             this.M_rawValueInWords = this._pd.convertNumberToWords(val.raw_value);
+            this.M_financialRawValueInWords = this._pd.convertNumberToWords(val.rawmaterial_value);
           }
            rawMaterial.push(this.createRawmaterial(val)); 
           }
@@ -407,6 +457,7 @@ tradingFormCreation(val) {
             // console.log(val);
             if(val.goods_value){
               this.M_goodsValueInWords = this._pd.convertNumberToWords(val.goods_value);
+              this.M_financialGoodsValueInWords = this._pd.convertNumberToWords(val.finished_goods_value);
             }
             finishedGoods.push(this.createGoods(val)); 
                  
@@ -420,6 +471,7 @@ tradingFormCreation(val) {
             // console.log(val);
             if(val.estimated_traded_goods_value){
               this.M_tradedGoodsValueInWords = this._pd.convertNumberToWords(val.estimated_traded_goods_value);
+              this.M_financialTradedGoodsValueInWords = this._pd.convertNumberToWords(val.traded_goods_value);
             }
             tradedGoods.push(this.createTradedGoods(val)); 
                  
@@ -432,21 +484,6 @@ tradingFormCreation(val) {
        }
   }
 
-  createRawmaterial2() {
-      return this.fb.group({
-          raw_name: ['', Validators.compose([Validators.required])],
-          stock_observed:['', Validators.compose([Validators.required])],
-          raw_quantity: [''],
-          raw_uom: [''],
-          other_uom : [''],
-          raw_value: [''],
-          rawmaterial_value: [''],
-          is_sufficiant_raw: [''],
-          rawmaterial_remarks:['']
-      });
-  }
-
-
   createRawmaterial(records) {
     // console.log(330,'function in');
       if(records === null) {
@@ -497,6 +534,7 @@ tradingFormCreation(val) {
       
           if(val.goods_value){
             this.R_goodsValueInWords = this._pd.convertNumberToWords(val.goods_value);
+            this.R_financialGoodsValueInWords =this._pd.convertNumberToWords(val.finished_goods_value);
           }
           finishedGoods.push(this.createGoods(val)); 
                
@@ -512,6 +550,7 @@ tradingFormCreation(val) {
           //  console.log(val);
           if(val.estimated_traded_goods_value){
             this.R_tradedGoodsValueInWords = this._pd.convertNumberToWords(val.estimated_traded_goods_value);
+            this.R_financialTradedGoodsValueInWords =this._pd.convertNumberToWords(val.traded_goods_value);
           }
            tradedGoods.push(this.createTradedGoods(val));     
                 
@@ -596,6 +635,7 @@ tradingFormCreation(val) {
           // console.log(val);
           if(val.goods_value){
             this.T_goodsValueInWords = this._pd.convertNumberToWords(val.goods_value);
+            this.T_financialGoodsValueInWords = this._pd.convertNumberToWords(val.finished_goods_value);
           }
           finishedGoods.push(this.createGoods(val)); 
                
@@ -610,6 +650,7 @@ tradingFormCreation(val) {
           //  console.log(val);
           if(val.estimated_traded_goods_value){
             this.T_tradedGoodsValueInWords = this._pd.convertNumberToWords(val.estimated_traded_goods_value);
+            this.T_financialTradedGoodsValueInWords =this._pd.convertNumberToWords(val.traded_goods_value);
           }
            tradedGoods.push(this.createTradedGoods(val));            
          }
@@ -833,29 +874,50 @@ tradingFormCreation(val) {
     }
 
   /** To Convert Amount into Words  */
-  inWords(e,flag:number){
+  inWords(e,flag:number,i){
 
       switch(flag){
       case 1 :
-          this.M_rawValueInWords = this._pd.convertNumberToWords(e.target.value);    
+          this.M_rawValueInWords[i] = this._pd.convertNumberToWords(e.target.value);    
           break;
       case 2 : 
-          this.M_goodsValueInWords = this._pd.convertNumberToWords(e.target.value);    
+          this.M_goodsValueInWords[i] = this._pd.convertNumberToWords(e.target.value);    
           break;
       case 3 : 
-          this.M_tradedGoodsValueInWords = this._pd.convertNumberToWords(e.target.value);    
+          this.M_tradedGoodsValueInWords[i] = this._pd.convertNumberToWords(e.target.value);    
           break;
       case 4 : 
-          this.R_goodsValueInWords = this._pd.convertNumberToWords(e.target.value);    
+          this.R_goodsValueInWords[i] = this._pd.convertNumberToWords(e.target.value);    
           break;
       case 5 : 
-          this.R_tradedGoodsValueInWords = this._pd.convertNumberToWords(e.target.value);    
+          this.R_tradedGoodsValueInWords[i] = this._pd.convertNumberToWords(e.target.value);    
           break;
       case 6 : 
-          this.T_goodsValueInWords = this._pd.convertNumberToWords(e.target.value);    
+          this.T_goodsValueInWords[i] = this._pd.convertNumberToWords(e.target.value);    
           break;
       case 7 : 
-          this.T_tradedGoodsValueInWords = this._pd.convertNumberToWords(e.target.value);    
+          this.T_tradedGoodsValueInWords[i] = this._pd.convertNumberToWords(e.target.value);    
+          break;
+      case 8 :
+          this.M_financialRawValueInWords[i] = this._pd.convertNumberToWords(e.target.value);    
+          break;
+      case 9 : 
+          this.M_financialGoodsValueInWords[i] = this._pd.convertNumberToWords(e.target.value);    
+          break;
+      case 10 : 
+          this.M_financialTradedGoodsValueInWords[i] = this._pd.convertNumberToWords(e.target.value);    
+          break;
+      case 11 : 
+          this.R_financialGoodsValueInWords[i] = this._pd.convertNumberToWords(e.target.value);    
+          break;
+      case 12 : 
+          this.R_financialTradedGoodsValueInWords[i] = this._pd.convertNumberToWords(e.target.value);    
+          break;
+      case 13 : 
+          this.T_financialGoodsValueInWords[i] = this._pd.convertNumberToWords(e.target.value);    
+          break;
+      case 14 : 
+          this.T_financialTradedGoodsValueInWords[i] = this._pd.convertNumberToWords(e.target.value);    
           break;
       default:
           break;

From b3847536507f316e362190b97650c6a84cfefe6e Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Fri, 4 Jan 2019 13:37:14 +0530
Subject: [PATCH 13/29] asset issues : ps

---
 .../forms/address/address.component.html      |  46 +++++--
 .../forms/address/address.component.ts        |  58 ++++++++-
 .../assets-info/assets-info.component.ts      | 119 ++++++++++++++----
 3 files changed, 187 insertions(+), 36 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html
index bf2770284..76ae7e05c 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html
@@ -32,7 +32,7 @@
 
                                         <div fxFlex="33">
                                             <mat-form-field style="width: 80%;">
-                                                        <mat-select placeholder="Address Type" formControlName="address_type" required>
+                                                        <mat-select placeholder="Address Type" formControlName="address_type" required (selectionChange)="selectedAddressType($event.source.triggerValue)">
                                                             <mat-option value="{{m_addressType.address_type_id}}"
                                                                         *ngFor="let m_addressType of addressData">{{m_addressType.address_type}}
                                                             </mat-option>
@@ -42,7 +42,7 @@
 
                                         <div *ngIf="addressForm.controls['address_type'].value == 12" fxFlex="33">
                                             <mat-form-field  style="width: 80%;">
-                                                <input matInput placeholder="Specify Address Type" formControlName="address_type_others" autocomplete="off">
+                                                <input matInput placeholder="Specify Address Type" formControlName="address_type_others" autocomplete="off" (change)="selectedAddressType($event.target.value)">
                                             </mat-form-field>
                                         </div>
 
@@ -83,6 +83,12 @@
                                                         </mat-form-field>
                                         </div>
 
+                                        <div *ngIf="addressForm.controls['comment_locality'].value == 10 " fxFlex="33">
+                                                <mat-form-field  style="width: 80%;">
+                                                    <input matInput placeholder="Specify Comment on Locality" formControlName="other_comment_locality" autocomplete="off">
+                                                </mat-form-field>
+                                        </div>
+
                                         <div fxFlex="33">
                                                 <mat-form-field style="width: 80%;">
                                                                 <mat-select placeholder="Ownership" formControlName="address_ownership">
@@ -95,7 +101,6 @@
                                         </div>
 
                                         <div *ngIf="addressForm.controls['address_ownership'].value == 4 " fxFlex="33">
-
                                                 <mat-form-field  style="width: 80%;">
                                                     <input matInput placeholder="Specify Ownership" formControlName="other_ownership" autocomplete="off">
                                                 </mat-form-field>
@@ -103,7 +108,8 @@
                                             
                                         <div *ngIf="addressForm.controls['address_ownership'].value == 3 " fxFlex="33">
                                                 <mat-form-field style="width: 80%;">
-                                                    <input matInput placeholder="What is the monthly rent paid?" formControlName="rent_amt" autocomplete="off">
+                                                    <input matInput placeholder="What is the monthly rent paid?" formControlName="rent_amt" autocomplete="off" (keypress)="keyPress($event)" (keyup)="inWords($event,'')">
+                                                    <mat-hint align="start" style="font-size:70%" *ngIf="addressForm.controls['rent_amt'].value != ''">{{"&#8377;"}} {{rentAmtInwords}} Only</mat-hint>
                                                 </mat-form-field>
 
                                         </div>
@@ -119,17 +125,36 @@
                                                         <input matInput autocomplete="off" placeholder="Month(s)" formControlName="business_month" (keypress)="keyPress($event)" (change)="ConvertMonthintoYear($event.target.value)">
                                                     </mat-form-field>
                                             </div>
+                                      </div>
+
+                                      <div fxLayout="row wrap">
+                                            <div fxFlex="68">
+                                                    <mat-form-field style="width: 95%;">
+                                                            <mat-select [placeholder]="placeholderName"
+                                                                                        formControlName="other_premises_bussiness_activity" required>
+                                                                <mat-option value="yes">Yes</mat-option>
+                                                                <mat-option value="no">No</mat-option>
+                                                            </mat-select>
+                                                    </mat-form-field>
+                                                </div>
+                                                <div fxFlex="32">
+                                                    <mat-form-field *ngIf="addressForm.controls['other_premises_bussiness_activity'].value != ''" style="width: 80%;">
+                                                        <input matInput autocomplete="off" placeholder="Remark" formControlName="bussiness_activity_remark">
+                                                    </mat-form-field>
+                                                </div>
+                                      </div>
+
+                                      <div fxLayout="row wrap">
                                             <div fxFlex="100">
-                                                <mat-form-field style="width: 80%;">
-                                                        <!-- <mat-select placeholder="Is there any other premises from which business activity is being run?"-->
-                                                             <mat-select placeholder="Was any business activity seen at the (Address Type) seen during PD visit?"
-                                                                                    formControlName="bussiness_activity" required>
+                                                <mat-form-field style="width: 95%;">
+                                                        <!--placeholder="Was any business activity seen at the (Address Type) seen during PD visit?"-->
+                                                    <mat-select  placeholder="Is there any other premises from which business activity is being run?" formControlName="bussiness_activity" required>
                                                             <mat-option value="yes">Yes</mat-option>
                                                             <mat-option value="no">No</mat-option>
                                                         </mat-select>
                                                 </mat-form-field>
                                             </div>
-                                    </div>
+                                      </div>
 
                                       
 
@@ -209,7 +234,8 @@
                                                           <input matInput placeholder="Specify Ownership" formControlName="premises_ownership_others" autocomplete="off">
                                                       </mat-form-field>
                                                       <mat-form-field *ngIf="item.get('premises_ownership').value == 3" style="width: 40%;">
-                                                        <input matInput placeholder="What is the monthly rent paid?" formControlName="premises_rent_amt" autocomplete="off">
+                                                        <input matInput placeholder="What is the monthly rent paid?" formControlName="premises_rent_amt" autocomplete="off" (keypress)="keyPress($event)" (keyup)="inWords($event,i)">
+                                                        <mat-hint align="start" style="font-size:70%" *ngIf="item.get('premises_rent_amt').value != ''">{{"&#8377;"}} {{premisesRentAmtInwords[i]}} Only</mat-hint>
                                                     </mat-form-field>
                                                       <mat-form-field style="width: 40%">
                                                               <input matInput placeholder="Remarks"
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts
index b622d1efd..e9b0220b0 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts
@@ -57,7 +57,10 @@ export class AddressComponent implements OnInit {
     formPremisesCityArray: any = [];
     additional_premises: any=[];
     bussiness_address_type: any=[];
+    premisesRentAmtInwords:any=[];
+    rentAmtInwords:any;
     tempArr: any[];
+    placeholderName : any = 'Was any business activity seen at the Address Type during PD visit?';
     //neighbourStatusData:any=["Yes","No"];
     //applicantOwnerData:any=["Yes","No","Dont Know"];
 
@@ -69,10 +72,13 @@ export class AddressComponent implements OnInit {
     public locality: AbstractControl;
     public pdLocation: AbstractControl;
     public commentlocality: AbstractControl;
+    public other_comment_locality: AbstractControl;
     public customerBehaviour: AbstractControl;
     public ownership: AbstractControl;
     public other_ownership: AbstractControl;
     public rent_amt : AbstractControl;
+    public other_premises_bussiness_activity : AbstractControl;
+    public bussiness_activity_remark: AbstractControl;
     public bussinessActivity: AbstractControl;
     public business_years: AbstractControl;
     public business_month: AbstractControl;
@@ -118,11 +124,15 @@ export class AddressComponent implements OnInit {
                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.selectedAddressType(data.records.address_type);
                if(data.records.address_type == 12) {
                 this.addressForm.controls.address_type_others.setValue(data.records.address_type_others);
+                this.selectedAddressType(data.records.address_type_others);
                }
                this.addressForm.controls.comment_locality.setValue(data.records.comment_locality);
+               if(data.records.comment_locality == 10){
+                this.addressForm.controls.other_comment_locality.setValue(data.records.other_comment_locality);
+               }
             // this.addressForm.controls.customer_behaviour.setValue(data.records.customer_behaviour);
                this.addressForm.controls.locality.setValue(data.records.locality);
                if(data.records.locality == 7 ){
@@ -132,6 +142,16 @@ export class AddressComponent implements OnInit {
                this.addressForm.controls.address_ownership.setValue(data.records.address_ownership);
                this.addressForm.controls.other_ownership.setValue(data.records.other_ownership);
                this.addressForm.controls.rent_amt.setValue(data.records.rent_amt);
+               if(data.records.rent_amt != ''){
+                this.rentAmtInwords = this._pd.convertNumberToWords(data.records.rent_amt);
+               }
+               this.addressForm.controls.other_premises_bussiness_activity.setValue(data.records.other_premises_bussiness_activity);
+               if(data.records.other_premises_bussiness_activity != '' && data.records.other_premises_bussiness_activity !=null) {
+                  this.addressForm.controls.bussiness_activity_remark.setValue(data.records.other_premises_bussiness_activity);
+               }   
+               else{
+                this.addressForm.controls.bussiness_activity_remark.setValue('');
+               }
                this.addressForm.controls.bussiness_activity.setValue(data.records.bussiness_activity);
                
             if(data.records.bussiness_activity == 'yes' && data.records.bussiness_address_type !=null) {
@@ -152,7 +172,13 @@ export class AddressComponent implements OnInit {
                 })
                  
                }
-               
+               this.additional_premises.forEach((item,index)=>
+               {  
+                console.log(item);
+                console.log(index);
+                //this.premisesRentAmtInwords[index] = this._pd.convertNumberToWords(item.premises_rent_amt);
+                });
+
                this.selectedValue(this.bussiness_address_type,this.additional_premises);
                if (data.records.locality_others) {
                    this.addressForm.controls.locality_others.setValue(data.records.locality_others);
@@ -181,12 +207,15 @@ export class AddressComponent implements OnInit {
             locality_others: [''],
             pd_location: ['', Validators.compose([Validators.required])],
             comment_locality: ['', Validators.compose([Validators.required])],
+            other_comment_locality : [''],
             //customer_behaviour: ['', Validators.compose([Validators.required])],
             //neighbourhood: this.fb.array([]),
             address_form_remark:[''],
             address_ownership:[''],
             other_ownership:[''],
             rent_amt:[''],
+            other_premises_bussiness_activity : [''],
+            bussiness_activity_remark:[''],
             bussiness_activity:[''],
             business_years:[''],
             business_month:[''],
@@ -199,10 +228,13 @@ export class AddressComponent implements OnInit {
         this.locality = this.addressForm.controls['locality'];
         this.pdLocation = this.addressForm.controls['pd_location'];
         this.commentlocality = this.addressForm.controls['comment_locality'];
+        this.other_comment_locality = this.addressForm.controls['other_comment_locality'];
         //this.customerBehaviour = this.addressForm.controls['customer_behaviour'];
         this.ownership = this.addressForm.controls['address_ownership'];
         this.other_ownership = this.addressForm.controls['other_ownership'];
         this.rent_amt = this.addressForm.controls['rent_amt'];
+        this.other_premises_bussiness_activity = this.addressForm.controls['other_premises_bussiness_activity'],
+        this.bussiness_activity_remark = this.addressForm.controls['bussiness_activity_remark'],
         this.bussinessActivity = this.addressForm.controls['bussiness_activity'];
         this.business_years = this.addressForm.controls['business_years'];
         this.business_month = this.addressForm.controls['business_month'];
@@ -303,12 +335,15 @@ export class AddressComponent implements OnInit {
         }
         records.pd_location = this.pdLocation.value;
         records.comment_locality = this.commentlocality.value;
+        records.other_comment_locality = this.other_comment_locality.value;
         //records.customer_behaviour = this.commentlocality.value;
         //records.neighbourhood = this.addressForm.controls.neighbourhood.value;
         records.address_form_remark = this.addressForm.controls.address_form_remark.value;
         records.address_ownership = this.ownership.value;
         records.other_ownership = this.other_ownership.value;
         records.rent_amt = this.rent_amt.value;
+        records.other_premises_bussiness_activity = this.other_premises_bussiness_activity.value;
+        records.bussiness_activity_remark = this.bussiness_activity_remark.value;
         records.bussiness_activity = this.bussinessActivity.value;
         records.business_years = this.business_years.value;
         records.business_month = this.business_month.value;
@@ -323,7 +358,7 @@ export class AddressComponent implements OnInit {
             }
         }
 
-        console.log('this.addressForm.controls.additional_premises.value',this.addressForm.controls.additional_premises.value);
+        // console.log('this.addressForm.controls.additional_premises.value',this.addressForm.controls.additional_premises.value);
 
         this.addressForm.controls.additional_premises.value.forEach((val,index)=>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  
         {
@@ -348,7 +383,7 @@ export class AddressComponent implements OnInit {
         records.formid = '5';
         // records.fk_createdby = '250';
         
-        console.log(JSON.stringify(records));
+        // console.log(JSON.stringify(records));
 
         this._pd.saveForm(records).subscribe(data => {
         
@@ -364,6 +399,10 @@ export class AddressComponent implements OnInit {
     //         this.formPremisesCityArray.push({city: option});
     //     });
     // }
+    selectedAddressType(e: any){
+        // console.log(e);
+        this.placeholderName = 'Was any business activity seen at the '+e+' during PD visit?';
+    }
     SelectedPremises($event){
 
         let premisesData = $event.source.value;
@@ -516,4 +555,15 @@ export class AddressComponent implements OnInit {
           event.preventDefault();
         }
       }
+
+      inWords(e,i){ 
+          console.log(e);
+          console.log(i);
+        if(i != ''){
+            this.premisesRentAmtInwords[i] = this._pd.convertNumberToWords(e.target.value);
+        }
+        else if(i == '' ){
+            this.rentAmtInwords = this._pd.convertNumberToWords(e.target.value);
+        }
+      }
 }
\ No newline at end of file
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts
index 40db78e79..858caabfa 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts
@@ -551,11 +551,10 @@ public m_investmentType = [];
     });
   }
 
-
-
-  loadPropertyWithData(data) {
+  loadPropertyWithData(data) { 
     return this._formBuilder.group({
-      property_type: [data.property_type]
+      property_type: [data.property_type],
+      other_property_type: [data.other_property_type]
       //property_type:['']
     });
   }
@@ -740,28 +739,41 @@ public m_investmentType = [];
 
   setAssetsDetailsWithData(assets_details_mode: any, datas: any, i: any): void {
     let val = i;
-    // var data = Object.keys(datas).map(function (key) {
+    // let data = Object.keys(datas).map(function (key) {
     //   return datas[key];
     // });
-    // alert(JSON.stringify(datas));
+    //alert('JSON Other Asset'+JSON.stringify(datas));
     let data = datas;
+    
     const arr = (<FormArray>this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray;
     arr.controls.splice(0);
     
     switch (assets_details_mode) {
       case '1': {
+        let array_data : any;
+        data.forEach((datas,i) => {
+          array_data = { 'property_type':datas.property_type,'other_property_type':datas.other_property_type };
+        });
         const control = (<FormArray>this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray;
-        control.push(this.loadPropertyWithData(data));
+        control.push(this.loadPropertyWithData(array_data));
         break;
       }
       case '2': {
+        let array_data : any;
+        data.forEach((datas,i) => {
+          array_data = {  'manufacturer_model_four_weeler': datas.manufacturer_model_four_weeler };
+        });
         const control = (<FormArray>this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray;
-        control.push(this.load_Four_WeelerWithData(data));
+        control.push(this.load_Four_WeelerWithData(array_data));
         break;
       }
       case '3': {
+        let array_data : any;
+        data.forEach((datas,i) => {
+          array_data = { 'manufacturer_model_two_weeler': datas.manufacturer_model_two_weeler };
+        });
         const control = (<FormArray>this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray;
-        control.push(this.load_Two_WeelerWithData(data));
+        control.push(this.load_Two_WeelerWithData(array_data));
         break;
       }
       case '4': {
@@ -770,34 +782,60 @@ public m_investmentType = [];
         break;
       }
       case '5': {
+        let array_data : any;
+        data.forEach((datas,i) => {
+          array_data = { 'consumer_durable_description': datas.consumer_durable_description };
+        });
         const control = (<FormArray>this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray;
-        control.push(this.loadConsumerDurableDescriptionWithData(data));
+        control.push(this.loadConsumerDurableDescriptionWithData(array_data));
         break;
       }
       case '6': {
+        let array_data : any;
         data.forEach((datas,i) => {
           this.OtherPremiumPaidInwords[i] = this.pdTrigerService.convertNumberToWords(+datas.premium_paid);
           this.OtherSumAssuredInwords[i] = this.pdTrigerService.convertNumberToWords(+datas.sum_assured);
+          array_data = { 
+            'premium_paid': datas.premium_paid,
+            'frequency_mode': datas.frequency_mode,
+            'other_frequency_mode':datas.other_frequency_mode,
+            'sum_assured': datas.sum_assured,
+            'members_coverd': datas.members_coverd
+          };
         });
         const control = (<FormArray>this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray;
-        control.push(this.loadInsuranceDescriptionWithData(data));
+        control.push(this.loadInsuranceDescriptionWithData(array_data));
         break;
       }
       case '7': {
+        let array_data : any;
         data.forEach((datas,i) => {
            this.OtherAmtInvestInwords[i] = this.pdTrigerService.convertNumberToWords(+datas.amount_of_invest);
+           array_data = {  'investments_type': datas.investments_type,
+            'other_investments_type' : datas.other_investments_type,
+            'amount_of_invest': datas.amount_of_invest,
+            'bank_name': datas.bank_name };
         });
         const control = (<FormArray>this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray;
-        control.push(this.loadInvestDescriptionWithData(data));
+        control.push(this.loadInvestDescriptionWithData(array_data));
         break;
       }
       case '8': {
+        let array_data : any;
         data.forEach((datas,i) => {
-          this.OtherAssetValueInwords[i] = this.pdTrigerService.convertNumberToWords(+data.any_other_asset_value);
+          array_data = {    'any_other_assets': datas.any_other_assets,
+                            'name_of_the_owner':datas.name_of_the_owner,
+                            'other_owner':datas.other_owner,
+                            'relation':datas.relation,
+                            'any_other_asset_value' : datas.any_other_asset_value,
+                            'any_other_asset_loan' : datas.any_other_asset_loan,
+                            'other_asset_emi_amt' : datas.other_asset_emi_amt
+                        };
+          this.OtherAssetValueInwords[i] = this.pdTrigerService.convertNumberToWords(+datas.any_other_asset_value);
           this.O_emiAmtInwords[i] = this.pdTrigerService.convertNumberToWords(+datas.other_asset_emi_amt);
         });
         const control = (<FormArray>this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray;
-        control.push(this.otherAssetsDescriptionWithData(data));
+        control.push(this.otherAssetsDescriptionWithData(array_data));
         break;
       }
       default: {
@@ -807,60 +845,97 @@ public m_investmentType = [];
   }
 
   setBusinessAssetsDetailsWithData(assets_details_mode: any, datas: any, i: any): void {
-    console.log(datas);
+
     let val = i;
     let data = datas;
+        
     const arr = (<FormArray>this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ;
     arr.controls.splice(0);
     
     switch (assets_details_mode) {
       case '1': {
+        let business_property_datas : any;
+        data.forEach((datas,i) => {
+          business_property_datas = { 'property_type':datas.property_type,'other_property_type':datas.other_property_type };
+        });
         const control = (<FormArray>this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ;
-        control.push(this.loadPropertyWithData(data));
+        control.push(this.loadPropertyWithData(business_property_datas));
         break;
       }
       case '2': {
+        let business_Four_Weeler_datas : any;
+        data.forEach((datas,i) => {
+          business_Four_Weeler_datas = {  'manufacturer_model_four_weeler': datas.manufacturer_model_four_weeler };
+        });
         const control = (<FormArray>this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ;
-        control.push(this.load_Four_WeelerWithData(data));
+        control.push(this.load_Four_WeelerWithData(business_Four_Weeler_datas));
         break;
       }
       case '3': {
+        let business_Two_Weeler_datas : any;
+        data.forEach((datas,i) => {
+          business_Two_Weeler_datas = { 'manufacturer_model_two_weeler': datas.manufacturer_model_two_weeler };
+        });
         const control = (<FormArray>this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ;
-        control.push(this.load_Two_WeelerWithData(data));
+        control.push(this.load_Two_WeelerWithData(business_Two_Weeler_datas));
         break;
       }
       case '4': {
         break;
       }
       case '5': {
+        let business_ConsumerDurableDescription_datas : any;
+        data.forEach((datas,i) => {
+          business_ConsumerDurableDescription_datas = { 'consumer_durable_description': datas.consumer_durable_description };
+        });
         const control = (<FormArray>this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ;
-        control.push(this.loadConsumerDurableDescriptionWithData(data));
+        control.push(this.loadConsumerDurableDescriptionWithData(business_ConsumerDurableDescription_datas));
         break;
       }
       case '6': {
+        let business_InsuranceDescription_datas : any;
         data.forEach((datas,i) => {
           this.PremiumPaidInwords[i] = this.pdTrigerService.convertNumberToWords(+datas.premium_paid);
           this.SumAssuredInwords[i] = this.pdTrigerService.convertNumberToWords(+datas.sum_assured);
+          business_InsuranceDescription_datas = { 
+              'premium_paid': datas.premium_paid,
+              'frequency_mode': datas.frequency_mode,
+              'other_frequency_mode':datas.other_frequency_mode,
+              'sum_assured': datas.sum_assured,
+              'members_coverd': datas.members_coverd
+            };
         });
         const control = (<FormArray>this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ;
-        control.push(this.loadInsuranceDescriptionWithData(data));
+        control.push(this.loadInsuranceDescriptionWithData(business_InsuranceDescription_datas));
         break;
       }
       case '7': {
+        let business_InvestDescription_datas : any;
         data.forEach((datas,i) => {
           this.AmtInvestInwords[i] = this.pdTrigerService.convertNumberToWords(+datas.amount_of_invest);
+          business_InvestDescription_datas = {  'investments_type': datas.investments_type,
+            'other_investments_type' : datas.other_investments_type,
+            'amount_of_invest': datas.amount_of_invest,
+            'bank_name': datas.bank_name };
         });
         const control = (<FormArray>this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ;
-        control.push(this.loadInvestDescriptionWithData(data));
+        control.push(this.loadInvestDescriptionWithData(business_InvestDescription_datas));
         break;
       }
       case '8': {
+        let array_datas : any;
         data.forEach((datas,i) => {
           this.AssetValueInwords[i] = this.pdTrigerService.convertNumberToWords(+data.any_other_asset_value);
           this.B_emiAmtInwords[i] = this.pdTrigerService.convertNumberToWords(+datas.other_asset_emi_amt);
+          array_datas = {
+            'any_other_assets': datas.any_other_assets,
+            'any_other_asset_value' : datas.any_other_asset_value,
+            'any_other_asset_loan' : datas.any_other_asset_loan,
+            'other_asset_emi_amt' : datas.other_asset_emi_amt
+          };
         });
         const control = (<FormArray>this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ;
-        control.push(this.otherBusinessAssetsDescriptionWithData(data));
+        control.push(this.otherBusinessAssetsDescriptionWithData(array_datas));
         break;
       }
       default: {

From b6525281aa76fba375e08c85d0e27ea9985b9728 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Fri, 4 Jan 2019 17:20:55 +0530
Subject: [PATCH 14/29] group of business form changes

---
 .../assets-info/assets-info.component.html    |  37 +++---
 .../assets-info/assets-info.component.ts      |  25 ++--
 .../business-info-group.component.html        |  29 +++++
 .../business-info-group.component.scss        |  33 ++++++
 .../business-info-group.component.spec.ts     |  25 ++++
 .../business-info-group.component.ts          | 110 ++++++++++++++++++
 .../business-info.component.html              |   4 +-
 .../business-info/business-info.component.ts  |  13 ++-
 .../client-info/client-info.component.ts      |  14 ++-
 .../financial-info.component.ts               |  47 +-------
 .../start-pd/forms/stock/stock.component.html |   2 +-
 .../start-pd/forms/stock/stock.component.ts   |  14 +--
 .../supplier-info/supplier-info.component.ts  |  13 ++-
 .../list-pd/start-pd/start-pd.component.html  |   2 +-
 .../list-pd/start-pd/start-pd.component.ts    |   3 +-
 .../manage-pd/manage-pd.module.ts             |   7 +-
 .../pd-service/pd-triger.service.ts           |   5 +-
 17 files changed, 286 insertions(+), 97 deletions(-)
 create mode 100644 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.html
 create mode 100644 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.scss
 create mode 100644 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.spec.ts
 create mode 100644 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.ts

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html
index a70160469..35a61dc4e 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html
@@ -28,7 +28,7 @@
                                                   <div fxLayout="row wrap" fxLayoutGap="5px" fxLayoutAlign="start none">
                                                     <mat-form-field style="width:100%">
                                                       <mat-select (selectionChange)="selectedAssetsType($event,i,2)" placeholder="Assets Type" formControlName="business_assets_mode" requried>
-                                                        <mat-option *ngFor="let asset of m_assets_type" [value]="asset.id">{{ asset.name }}</mat-option>
+                                                        <mat-option *ngFor="let asset of m_assets_type" [value]="asset.id">{{ asset.name | titlecase }}</mat-option>
                                                       </mat-select>
                                                     </mat-form-field>
                                                   </div>
@@ -43,7 +43,7 @@
                                                                           
                                                                           <mat-form-field style="width:30%">
                                                                             <mat-select placeholder="Property Type" formControlName="property_type" >
-                                                                              <mat-option *ngFor="let prop of m_propertyType" [value]="prop.id">{{ prop.name }}</mat-option>
+                                                                              <mat-option *ngFor="let prop of m_propertyType" [value]="prop.id">{{ prop.name | titlecase }}</mat-option>
                                                                             </mat-select>
                                                                           </mat-form-field>
 
@@ -107,7 +107,7 @@
 
                                                                           <mat-form-field style="width:30%">
                                                                               <mat-select placeholder="Frequency" formControlName="frequency_mode" >
-                                                                                <mat-option *ngFor="let freqn of m_freqOfPurchase" [value]="freqn.frequency_id">{{ freqn.name }}</mat-option>
+                                                                                <mat-option *ngFor="let freqn of m_freqOfPurchase" [value]="freqn.frequency_id">{{ freqn.name | titlecase }}</mat-option>
                                                                               </mat-select>
                                                                             </mat-form-field>
 
@@ -138,7 +138,7 @@
                                                                           <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
                                                                               <mat-form-field style="width:30%">
                                                                                 <mat-select placeholder="Type" formControlName="investments_type" >
-                                                                                  <mat-option *ngFor="let ins_type of m_investmentType" [value]="ins_type.id">{{ ins_type.name }}</mat-option>
+                                                                                  <mat-option *ngFor="let ins_type of m_investmentType" [value]="ins_type.id">{{ ins_type.name | titlecase }}</mat-option>
                                                                                 </mat-select>
                                                                               </mat-form-field>
                                                                               <mat-form-field style="width:30%" *ngIf="detail.get('investments_type').value == 6 ">
@@ -175,7 +175,7 @@
 
                                                                           <mat-form-field style="width:30%">
                                                                                 <mat-select placeholder="Is there any asset loan?" formControlName="any_other_asset_loan" (selectionChange)="selectedAssetLoanType($event.value,2)">
-                                                                                    <mat-option value="{{data.value}}" *ngFor="let data of m_any_asset_loan_type">{{data.viewValue}}</mat-option>
+                                                                                    <mat-option value="{{data.value}}" *ngFor="let data of m_any_asset_loan_type">{{data.viewValue | titlecase}}</mat-option>
                                                                                 </mat-select>
                                                                           </mat-form-field>
                                                                           
@@ -219,8 +219,13 @@
                                                                           </mat-form-field>
                                                                         
                                                                           <mat-form-field *ngIf="sup.get('business_assets_mode').value == 1 || sup.get('business_assets_mode').value == 2 || sup.get('business_assets_mode').value == 3 || sup.get('business_assets_mode').value == 4 || sup.get('business_assets_mode').value == 5" style="width:30%">
-                                                                              <input matInput placeholder="Name of the Business Owner" formControlName="business_name_of_the_owner" autocomplete="off">
-                                                                          </mat-form-field>
+                                                                              <!-- <input matInput placeholder="Name of the Business Owner" formControlName="business_name_of_the_owner" autocomplete="off"> -->
+                                                                              <mat-select placeholder="Name of the Business Owner"
+                                                                              formControlName="business_name_of_the_owner" required>
+                                                                              <mat-option [value]="company.company_name" *ngFor="let company of existCompanyList">{{company.company_name | titlecase}}</mat-option>
+                                                                              <!-- <mat-option value="Others">Others</mat-option> -->
+                                                                          </mat-select>
+                                                                            </mat-form-field>
                                                                         </div>
                                                                     
                                                               
@@ -301,7 +306,7 @@
                                                     <div fxLayout="row wrap" fxLayoutGap="5px" fxLayoutAlign="start none">
                                                       <mat-form-field style="width:100%">
                                                         <mat-select (selectionChange)="selectedAssetsType($event,i,1)" placeholder="Assets Type" formControlName="assets_mode" requried>
-                                                          <mat-option *ngFor="let asset of m_assets_type" [value]="asset.id">{{ asset.name }}</mat-option>
+                                                          <mat-option *ngFor="let asset of m_assets_type" [value]="asset.id">{{ asset.name | titlecase }}</mat-option>
                                                         </mat-select>
                                                       </mat-form-field>
                                                     </div>
@@ -314,7 +319,7 @@
                                                                 <div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none">
                                                                 <mat-form-field style="width:30%">
                                                                   <mat-select placeholder="Property Type" formControlName="property_type" >
-                                                                    <mat-option *ngFor="let prop of m_propertyType" [value]="prop.id">{{ prop.name }}</mat-option>
+                                                                    <mat-option *ngFor="let prop of m_propertyType" [value]="prop.id">{{ prop.name | titlecase }}</mat-option>
                                                                   </mat-select>
                                                                 </mat-form-field>
                                                                 <mat-form-field *ngIf="detail.get('property_type').value == 5" style="width:30%">
@@ -386,7 +391,7 @@
                                                                     </mat-form-field>
                                                                     <mat-form-field style="width:30%">
                                                                       <mat-select placeholder="Frequency" formControlName="frequency_mode" >
-                                                                        <mat-option *ngFor="let freqn of m_freqOfPurchase" [value]="freqn.frequency_id">{{ freqn.name }}</mat-option>
+                                                                        <mat-option *ngFor="let freqn of m_freqOfPurchase" [value]="freqn.frequency_id">{{ freqn.name | titlecase }}</mat-option>
                                                                       </mat-select>
                                                                     </mat-form-field>
                                                                     <mat-form-field style="width:30%" *ngIf="detail.get('frequency_mode').value == 8 ">
@@ -418,7 +423,7 @@
                                                       
                                                                   <mat-form-field style="width:30%">
                                                                     <mat-select placeholder="Type" formControlName="investments_type" >
-                                                                      <mat-option *ngFor="let ins_type of m_investmentType" [value]="ins_type.id">{{ ins_type.name }}</mat-option>
+                                                                      <mat-option *ngFor="let ins_type of m_investmentType" [value]="ins_type.id">{{ ins_type.name | titlecase }}</mat-option>
                                                                     </mat-select>
                                                                   </mat-form-field>
                                                       
@@ -457,7 +462,7 @@
                                                                     <mat-form-field style="width:30%">
                                                                         <mat-select placeholder="Name of the Owner"
                                                                         formControlName="name_of_the_owner" >
-                                                                            <mat-option value="{{owner.pd_co_applicant_id}}" *ngFor="let owner of applicants">{{owner.applicant_name}}</mat-option>
+                                                                            <mat-option value="{{owner.pd_co_applicant_id}}" *ngFor="let owner of applicants">{{owner.applicant_name | titlecase}}</mat-option>
                                                                         </mat-select>
                                                                     </mat-form-field>
                                                       
@@ -470,7 +475,7 @@
                                                                       <mat-select placeholder="Relation" formControlName="relation" >
                                                                           <mat-option value="{{relations.relationship_id}}"
                                                                                       *ngFor="let relations of m_relation">
-                                                                              {{relations.name}}
+                                                                              {{relations.name | titlecase}}
                                                                           </mat-option>
                                                                       </mat-select>
                                                                   </mat-form-field>
@@ -487,7 +492,7 @@
                                                                   <!-- </mat-form-field> -->
                                                                   <mat-form-field style="width:30%">
                                                                         <mat-select placeholder="Is there any asset loan?" formControlName="any_other_asset_loan" (selectionChange)="selectedAssetLoanType($event.value,1)">
-                                                                            <mat-option value="{{data.value}}" *ngFor="let data of m_any_asset_loan_type">{{data.viewValue}}</mat-option>
+                                                                            <mat-option value="{{data.value}}" *ngFor="let data of m_any_asset_loan_type">{{data.viewValue | titlecase}}</mat-option>
                                                                         </mat-select>
                                                                         <!-- <input matInput placeholder="What is the EMI amount ?" formControlName="any_other_asset_loan" autocomplete="off"> -->
                                                                   </mat-form-field>
@@ -512,7 +517,7 @@
                                                           
                                                             <mat-form-field *ngIf="sup.get('assets_mode').value == 1 || sup.get('assets_mode').value == 2 || sup.get('assets_mode').value == 3 || sup.get('assets_mode').value == 4 || sup.get('assets_mode').value == 5" style="width:30%">
                                                                     <mat-select placeholder="Name of the Owner" formControlName="name_of_the_owner" >    
-                                                                        <mat-option value="{{owner.pd_co_applicant_id}}" *ngFor="let owner of applicants">{{owner.applicant_name}}</mat-option>
+                                                                        <mat-option value="{{owner.pd_co_applicant_id}}" *ngFor="let owner of applicants">{{owner.applicant_name | titlecase}}</mat-option>
                                                                     </mat-select>
                                                             </mat-form-field>
 
@@ -525,7 +530,7 @@
                                                                 <mat-select placeholder="Relation" formControlName="relation" >
                                                                     <mat-option value="{{relations.relationship_id}}"
                                                                                 *ngFor="let relations of m_relation">
-                                                                        {{relations.name}}
+                                                                        {{relations.name | titlecase}}
                                                                     </mat-option>
                                                                 </mat-select>
                                                             </mat-form-field>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts
index 40db78e79..fd418e308 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts
@@ -31,7 +31,7 @@ export class AssetsInfoComponent implements OnInit {
   pageTitle: string ="Assets Details";
   //@Input() pdid: number;
   pdid:string;
-  businessProfessionName :string;
+  //businessProfessionName :string;
   
   public _assetsQuesFrom: FormGroup;
   public submitted = false;
@@ -183,6 +183,7 @@ public m_investmentType = [];
   // ]
 
   private notifier: NotifierService;
+  existCompanyList: any =[];
   constructor(
     notifier: NotifierService,
     private _formBuilder: FormBuilder,
@@ -216,9 +217,14 @@ public m_investmentType = [];
 
   ngOnInit() {
     
-        this.pdTrigerService.getTypeofActivityForSuppliedInfoForm(this.pdid).subscribe(data => {      
-          this.businessProfessionName = (data.status == 200) ? data.records.profession_name : '' ;
-        });
+        // this.pdTrigerService.getTypeofActivityForSuppliedInfoForm(this.pdid,'').subscribe(data => {      
+        //   this.businessProfessionName = (data.status == 200) ? data.records.profession_name : '' ;
+        // });
+        this.pdTrigerService.getCompaniesListsForBusiness(this.pdid).subscribe(data=>{
+          if(data.dataStatus){
+              this.existCompanyList = data.records.filter(val =>val.is_active);
+          }
+      })
 
         this.getPdSupplierFormDetails();
         this.getM_Assets_Type();
@@ -348,7 +354,7 @@ public m_investmentType = [];
           this.initDetails(),
         ]),
         business_assets_details : this._formBuilder.array([
-          this.initBusinessDetails(this.businessProfessionName),
+          this.initBusinessDetails(),
         ]),
         assets_form_remark:['']
       });
@@ -382,12 +388,12 @@ public m_investmentType = [];
     });
   }
 
-  initBusinessDetails(data) {
+  initBusinessDetails() {
     return this._formBuilder.group({
       business_assets_mode: [''],
       business_details: this._formBuilder.array([]),
       business_approximate_market_value: [''],
-      business_name_of_the_owner: [data],
+      business_name_of_the_owner: [],
       //other_owner:[''],
       //relation:[''],
       //purchase_year: [''],
@@ -402,9 +408,6 @@ public m_investmentType = [];
 
   show: boolean;
   selectedAssetsType(e: any, i: any,flag : any): void {
-    console.log(e);
-    console.log(i);
-    console.log(flag);
     let val = i;
     if(flag == 1){
       const arr = (<FormArray>this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray;
@@ -878,7 +881,7 @@ public m_investmentType = [];
     control.push(this.initDetails());
     }else if(flag == 2){
       const control = <FormArray>this._assetsQuesFrom.controls['business_assets_details'];
-      control.push(this.initBusinessDetails(this.businessProfessionName));
+      control.push(this.initBusinessDetails());
     }
   }
 
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.html
new file mode 100644
index 000000000..a5a1581a8
--- /dev/null
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.html
@@ -0,0 +1,29 @@
+<h2 mat-dialog-title class="paragraph_change">
+      <div fxFlex="70" align="left" style="padding: 10px !important;">{{pageTitle}}</div>
+      <div fxFlex="30" align="end" style="padding: 10px !important;">
+              <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Close" matTooltipPosition="right" mat-dialog-close><mat-icon>close</mat-icon></button>
+                      
+      </div>
+  </h2>
+              
+  <mat-dialog-content>
+    <mat-card *ngFor="let companyList of existCompanyList">
+        <mat-card-header>
+            <mat-card-title class="p-text">{{companyList.company_name | titlecase}}</mat-card-title>
+        </mat-card-header>
+        <mat-card-content>
+        <div fxLayout="row wrap" class="child_mat_card">
+            <mat-card fxFlex.xs="80" fxFlex.sm="80" fxFlex.md="40" fxFlex.lg="32" fxFlex.xl="33" *ngFor="let formButton of companyList.form_status;let quesIndex=index" [ngStyle]="{'background-color':formButton.isAnswered == false ? '#fff' : '#4caf50' ,'color':'#fff'}" (click)="OnSelectBusinessGroupForms(formButton, companyList)">
+                <mat-card-header>
+                         <span style="padding: 17px 14px 3px 15px !important;border-radius: 0px 0px 0px 15px!important;width: 50px !important;" class="menu-badge mat-purple ng-star-inserted" align="center">{{quesIndex+1}}</span>
+                        <div fxFlex="100" align="left" style="padding:15px !important;">
+                            {{ formButton.form_name }}
+                        </div>                    
+                </mat-card-header>
+            </mat-card>
+        </div>
+        </mat-card-content>
+    </mat-card>
+
+  </mat-dialog-content>
+  <notifier-container></notifier-container>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.scss
new file mode 100644
index 000000000..eb88eeecc
--- /dev/null
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.scss
@@ -0,0 +1,33 @@
+.paragraph_change {
+    color:  #fff !important;
+    background-color: #e00201 !important;
+  }
+
+  .p-text {
+    color:#e00201 !important;
+    font-weight: bold;
+   }
+   ::ng-deep .mat-card-header-text{
+    margin:0px !important;
+}
+.mat-purple{
+       background-color: gray !important;
+}
+ .cdk-global-overlay-wrapper{
+    justify-content: center !important;
+}
+
+   $base-card-box-shadow:1.5px 2.6px 24px 0 rgba(0, 35, 136, 0.08) !important;
+mat-card .child_mat_card > mat-card {
+     border-radius: 0px 0px 0px 15px;
+     box-shadow: $base-card-box-shadow;
+     transform: scale(0.95);
+     transition: box-shadow 0.5s, transform 0.5s;
+    &:hover {
+        cursor: pointer;
+       // background-color: #e00201 !important;
+        transform: scale(1);
+        box-shadow: 5px 20px 30px rgba(0, 0, 0, 0.2);
+    }
+       
+    }
\ No newline at end of file
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.spec.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.spec.ts
new file mode 100644
index 000000000..ee3eb698a
--- /dev/null
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { BusinessInfoGroupComponent } from './business-info-group.component';
+
+describe('BusinessInfoGroupComponent', () => {
+  let component: BusinessInfoGroupComponent;
+  let fixture: ComponentFixture<BusinessInfoGroupComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ BusinessInfoGroupComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(BusinessInfoGroupComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.ts
new file mode 100644
index 000000000..8e3afd45b
--- /dev/null
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.ts
@@ -0,0 +1,110 @@
+import { Component,OnInit,Inject,Input} from '@angular/core';
+import { NotifierService } from 'angular-notifier';
+import {MatDialog,MatDialogRef,MAT_DIALOG_DATA, MatTableDataSource} from '@angular/material';
+/** Service */
+import { PdTrigerService } from './../../../../../pd-service/pd-triger.service';
+import {ActivatedRoute, Router} from "@angular/router";
+import {SupplierInfoComponent} from './../../forms/supplier-info/supplier-info.component';
+import {ClientInfoComponent} from './../../forms/client-info/client-info.component';
+import {StockComponent} from './../../forms/stock/stock.component';
+import {FinancialInfoComponent} from './../../forms/financial-info/financial-info.component';
+import {BusinessInfoComponent} from './../../forms/business-info/business-info.component';
+
+@Component({
+  selector: 'app-business-info-group',
+  templateUrl: './business-info-group.component.html',
+  styleUrls: ['./business-info-group.component.scss']
+})
+export class BusinessInfoGroupComponent implements OnInit {
+  pageTitle: string ="Business Informations";
+  existCompanyList: any = [];
+  pdid: number;
+  form_id: number;
+  constructor(notifier: NotifierService,
+    private route: ActivatedRoute,
+    private router: Router,
+    private _pd: PdTrigerService,
+    @Inject(MAT_DIALOG_DATA) public pd_all_details: any, private dialog: MatDialog) {
+      this.pdid = this.pd_all_details.pdmaster_details.pd_id;
+      this.form_id = 13;
+     }
+
+  ngOnInit() {
+    this.getCompanyListForBusiness();
+  }
+  getCompanyListForBusiness(): void{
+    this._pd.getCompaniesListsForBusiness(this.pdid).subscribe(data=>{
+        if(data.dataStatus){
+            this.existCompanyList = data.records.filter(val =>val.is_active);
+        }
+    })
+ }
+
+ // direct form based questions
+ OnSelectBusinessGroupForms(details: any, company: any) {
+  this.pd_all_details.company_id =company.company_order_id;
+  this.pd_all_details.company_name =company.company_name;
+   if(details.form_id==1){
+      const dialogRef = this.dialog.open(SupplierInfoComponent, {
+          data: this.pd_all_details,
+          position: { right: '0'},
+          width:'80%',
+          disableClose: true
+        });
+        dialogRef.afterClosed()
+        .subscribe(dataresult => {
+          this.getCompanyListForBusiness();
+        });
+  }
+  else if(details.form_id==2){
+      const dialogRef = this.dialog.open(ClientInfoComponent, {
+          data: this.pd_all_details,
+          position: { right: '0'},
+          width:'80%',
+          disableClose: true
+        });
+        dialogRef.afterClosed()
+        .subscribe(dataresult => {
+          this.getCompanyListForBusiness();
+        });
+  }
+  else if(details.form_id==11){
+      const dialogRef = this.dialog.open(StockComponent, {
+          data: this.pd_all_details,
+          position: { right: '0'},
+          width:'80%',
+          disableClose: true
+        });
+        dialogRef.afterClosed()
+        .subscribe(dataresult => {
+          this.getCompanyListForBusiness();
+        });
+  }
+  else if(details.form_id==13){
+      const dialogRef = this.dialog.open(BusinessInfoComponent, {
+          data: this.pd_all_details,
+          position: { right: '0'},
+          width:'80%',
+          disableClose: true
+        });
+        dialogRef.afterClosed()
+        .subscribe(dataresult => {
+          this.getCompanyListForBusiness();
+        });
+  }
+  else if(details.form_id==14){
+      const dialogRef = this.dialog.open(FinancialInfoComponent, {
+          data: this.pd_all_details,
+          position: { right: '0'},
+          width:'80%',
+          disableClose: true
+        });
+        dialogRef.afterClosed()
+        .subscribe(dataresult => {
+          this.getCompanyListForBusiness();
+        });
+  }
+ 
+}
+
+}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
index 5ce935af8..eb4f59014 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
@@ -26,8 +26,8 @@
                                 <mat-form-field style="width: 45%;">
                                 <mat-select placeholder="Name in Which The Business is Run"
                                             formControlName="profession_name" required>
-                                    <mat-option value="{{company}}" *ngFor="let company of existCompanyList">{{company | titlecase}}</mat-option>
-                                    <mat-option value="Others">Others</mat-option>
+                                    <mat-option [value]="company.company_name" *ngFor="let company of existCompanyList">{{company.company_name | titlecase}}</mat-option>
+                                    <!-- <mat-option value="Others">Others</mat-option> -->
                                 </mat-select>
                                 </mat-form-field>
                                     <mat-form-field style="width: 45%;" *ngIf="businessForm.controls.profession_name.value=='Others'">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
index 3bb8344ef..c83451042 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
@@ -32,8 +32,10 @@ import {DatePipe } from '@angular/common';
 export class BusinessInfoComponent implements OnInit {
     pipe = new DatePipe('en-US');
     pdid: number;
+    company_id: String;
+    company_name: String;
     form_id: number;
-    pageTitle: string ="Business Details";
+    pageTitle: string ="Business Information";
     relationData: any = [];
     companyRelationShipList: any =[];
     //industryData: any = [];
@@ -60,6 +62,8 @@ export class BusinessInfoComponent implements OnInit {
          @Inject(MAT_DIALOG_DATA) public pd_all_details: any, private dialog: MatDialog) {
             //this.adapter.setLocale('fr'); 
             this.pdid = this.pd_all_details.pdmaster_details.pd_id;
+            this.company_id = this.pd_all_details.company_id;
+            this.company_name = this.pd_all_details.company_name;
             this.applicants = this.pd_all_details.pdapplicants_detials;
             this.form_id = 13;
             this.notifier = notifier;   
@@ -101,6 +105,7 @@ export class BusinessInfoComponent implements OnInit {
         let params: any = {};
         params.pd_id = this.pdid;
         params.pd_form_id = this.form_id;
+        params.company_id = this.company_id;
         this._pd.retriveForm(params).subscribe(data => {
             let businessVal = data.records;
             let constVal: any;
@@ -163,6 +168,7 @@ export class BusinessInfoComponent implements OnInit {
 
                 businessVal.pdid  = this.pdid;
                 businessVal.formid  = this.form_id;
+                businessVal.company_id  = this.company_id;
                 businessVal.fk_createdby  = this.pdid;
                 //businessVal.designation  = DesgnArray;
                 businessVal.partners  = PartnrArray;
@@ -562,8 +568,9 @@ export class BusinessInfoComponent implements OnInit {
         this.businessForm = this.fb.group({
             pdid: this.pdid,
             formid: this.form_id,
+            company_id: this.company_id,
             fk_createdby: this.pdid,
-            profession_name: ['', Validators.compose([Validators.required])],
+            profession_name: [this.company_name, Validators.compose([Validators.required])],
             business_entity_type: ['', Validators.compose([Validators.required])],
             business_years: ['', Validators.compose([Validators.required])],
             business_month: ['', Validators.compose([Validators.required])],
@@ -1266,7 +1273,7 @@ export class BusinessInfoComponent implements OnInit {
   getCompanyListForBusiness(): void{
      this._pd.getCompaniesListsForBusiness(this.pdid).subscribe(data=>{
          if(data.dataStatus){
-             this.existCompanyList = data.records;
+             this.existCompanyList = data.records.filter(val =>val.is_active && val.company_order_id==this.company_id);
          }
      })
   }
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts
index 913f9c583..e8fc68ee6 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts
@@ -35,7 +35,7 @@ export class ClientInfoComponent implements OnInit {
   //@Input() pdid: number;
   pdid: string;
   form_id: number;
-
+  company_id: string;
   public _supplierQuesFrom: FormGroup;
   public submitted = false;
 
@@ -78,6 +78,7 @@ export class ClientInfoComponent implements OnInit {
     @Inject(MAT_DIALOG_DATA) public pd_all_details: any) {
     this.pdid = this.pd_all_details.pdmaster_details.pd_id;
     this.form_id = 2;
+    this.company_id = this.pd_all_details.company_id;
     this.notifier = notifier;
   }
   public viewerOptions: any = {
@@ -103,8 +104,7 @@ export class ClientInfoComponent implements OnInit {
   noRecordsFound: Boolean = false;
   errorMessage: any = '';
   ngOnInit() {
-
-    this.pdTrigerService.getTypeofActivityForSuppliedInfoForm(this.pdid).subscribe(data => {
+    this.pdTrigerService.getTypeofActivityForSuppliedInfoForm(this.pdid,this.company_id).subscribe(data => {
       if(data.dataStatus){
       // let datas = {
       //   "profession_name": "Others",
@@ -151,7 +151,11 @@ export class ClientInfoComponent implements OnInit {
 
   retaildTradingForm: Boolean = false;
   initFormLoadDetails(record) {
-    this.pdTrigerService.getPDFormDetailsWithID(this.pdid, '2').subscribe(
+    let params: any = {};
+        params.pd_id = this.pdid;
+        params.pd_form_id = this.form_id;
+        params.company_id = this.company_id;
+    this.pdTrigerService.retriveForm(params).subscribe(
       data => {
         if (data.dataStatus) {
           let dataForm = data.records;
@@ -159,6 +163,7 @@ export class ClientInfoComponent implements OnInit {
             this._supplierQuesFrom = this._formBuilder.group({
               pdid: [this.pdid],
               formid: ['2'],
+              company_id:[this.company_id],
               manufacturing_details: this._formBuilder.array([this.manufacturingFormCreation(record)]),
               trade_details: this._formBuilder.array([this.tradingFormCreation(record)]),
               service_provider_details: this._formBuilder.array([this.serviceProviderFormCreation(record)]),
@@ -244,6 +249,7 @@ export class ClientInfoComponent implements OnInit {
           this._supplierQuesFrom = this._formBuilder.group({
             pdid: [this.pdid],
             formid: ['2'],
+            company_id:[this.company_id],
             manufacturing_details: this._formBuilder.array([this.manufacturingFormCreation(record)]),
             trade_details: this._formBuilder.array([this.tradingFormCreation(record)]),
             service_provider_details: this._formBuilder.array([this.serviceProviderFormCreation(record)]),
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts
index 11e24e847..8858a3f4f 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts
@@ -33,6 +33,7 @@ export class FinancialInfoComponent implements OnInit {
     pageTitle: string ="Financial Information";
      pdid: string;
      form_id: number;
+     company_id: string;
     public financialForm: FormGroup;
     private notifier: NotifierService;
     SalesStatement : any = [];
@@ -57,6 +58,7 @@ export class FinancialInfoComponent implements OnInit {
                 @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { 
                     this.pdid = this.pd_all_details.pdmaster_details.pd_id;
                     this.form_id = 14;
+                    this.company_id =this.pd_all_details.company_id;
                     this.notifier = notifier;
     }
     public viewerOptions: any = {
@@ -84,6 +86,7 @@ export class FinancialInfoComponent implements OnInit {
         let params: any = {};
         params.pd_id = this.pdid;
         params.pd_form_id = this.form_id;
+        params.company_id = this.company_id;
         this._pd.retriveForm(params).subscribe(value => {
             const financial_date = <FormArray>this.financialForm.controls['date_per_financial'];
             const estimated_val = <FormArray>this.financialForm.controls['estimated_value'];
@@ -110,7 +113,6 @@ export class FinancialInfoComponent implements OnInit {
                     financial_date.push(this.createDate(''));
                 }
                 if (result_val.length > 0) {
-                    console.log(result_val);
                     result_val.forEach((val,index) => {
                         //console.log('dedrf',val.estimate_annual_sale);
                          this.AV_annualSalesInwords[index] = this._pd.convertNumberToWords(val.estimate_annual_sale);     
@@ -124,6 +126,7 @@ export class FinancialInfoComponent implements OnInit {
                 }
                 retriveData.pdid = this.pdid;
                 retriveData.formid = this.form_id;
+                retriveData.company_id = this.company_id;
                 retriveData.fk_createdby = this.pdid;
                 this.financialForm.setValue(retriveData);
             } else {
@@ -136,6 +139,7 @@ export class FinancialInfoComponent implements OnInit {
         this.financialForm = this.fb.group({
             pdid: this.pdid,
             formid: this.form_id,
+            company_id: this.company_id,
             fk_createdby: this.pdid,
             financial_remarks: [''],
             staring_financial_year : ['',Validators.compose([Validators.minLength(4),Validators.maxLength(4)])],
@@ -247,7 +251,6 @@ export class FinancialInfoComponent implements OnInit {
     }
 
     selectedType(e: any): void {
-        console.log(e);
         if(e.value == 'yes'){
             let startingYear = this.financialForm.controls['staring_financial_year'].value;
             let totalFinYear = this.financialForm.controls['total_financial_year'].value;
@@ -260,7 +263,6 @@ export class FinancialInfoComponent implements OnInit {
             }
     
             if(array.length > 0 ){
-              console.log(array.length);
 
                     array.value.forEach((val,index)=>{
                         let vals = {
@@ -325,32 +327,23 @@ export class FinancialInfoComponent implements OnInit {
     //     }
     // }
     calFinAnnualSale(index,detail){
-        //alert('FIn Annual Sales Data');
-        console.log(index);
-        console.log()
         let annual_sale = detail.value.financial_annual_sale;
         if (index != 0) {
             let array = <FormArray>this.financialForm.controls['date_per_financial'];
             let prev_annual_sale = array.value[index-1].financial_annual_sale;
             let annual_sale_variation =  (( annual_sale - prev_annual_sale)/prev_annual_sale) * 100 ;
             detail.controls.financial_annualsales_variation.setValue(annual_sale_variation.toFixed(2));
-            console.log('annual sales variation in %',annual_sale_variation);
         }
     }
 
      calculateEstimationAnnualSale(index,detail){
         //alert('Function Inside');
-        console.log(detail);
         let annual_sale = detail.value.estimate_annual_sale;
-        console.log(annual_sale);
-        console.log(index);
-        // console.log(annual_sale);
         if (index != 0) {
             let array = <FormArray>this.financialForm.controls['estimated_value'];
             let prev_annual_sale = array.value[index-1].estimate_annual_sale;
             let annual_sale_variation =  (( annual_sale - prev_annual_sale)/prev_annual_sale) * 100 ;
             detail.controls.estimate_annualsales_variation.setValue(annual_sale_variation.toFixed(2));
-            console.log('estimate annual sales variation in %',annual_sale_variation);
         }
      }
 
@@ -362,25 +355,16 @@ export class FinancialInfoComponent implements OnInit {
         if ( (profit != '' || loss != '') && index != 0) {
            
            let array = <FormArray>this.financialForm.controls['date_per_financial'];
-           
-           console.log('Profit',profit);
-           console.log(Math.abs(profit));
+ 
            let prev_profit = array.value[index - 1].financial_net_profit != '' ? array.value[index - 1].financial_net_profit : 0;
-           console.log('Profitpre',prev_profit);
            let prev_loss = array.value[index - 1].financial_net_loss !='' ? array.value[index - 1].financial_net_loss : 0 ;
            let prev_year = array.value[index - 1].financial_year;    
            let prev_annual_sale = array.value[index-1].financial_annual_sale;
-           console.log('loss',loss);
            loss = loss != 0 ? loss * (-1) : loss;
-           console.log('-1 loss',loss);
-           console.log('pre_loss',prev_loss);
            prev_loss = prev_loss != 0 ? prev_loss * (-1) : prev_loss ;
-           console.log('-1 pre loss',prev_loss);
-           console.log(Math.abs(profit));
            //let variation2 = ((()))
            let variation = (((profit != '' ? profit : loss ) - (prev_profit != '' ? prev_profit : prev_loss ))/ (prev_profit != '' ? Math.abs(prev_profit) : Math.abs(prev_loss))) * 100;     
            //console.log('console.log(Math.abs(profit));',Math.abs(variation));
-           console.log(variation);
         // let variation ;
         //    if(profit != ''){
         //     variation = (((profit != '' ? profit : loss ) - ( prev_profit != '' ? prev_profit : prev_loss ))/ (prev_profit != '' ? prev_profit : prev_loss)) * 100 * (profit != '' ? (1) : (-1)) ;
@@ -395,7 +379,6 @@ export class FinancialInfoComponent implements OnInit {
            detail.controls.financial_variation.setValue(variation.toFixed(2));
            
            //Increase in Sales in FY 2017-18 over sales in FY 2016-17 is 11.11%
-           console.log('variation in %',variation);
            
         //    this.SalesStatement[index] = ( variation <= 0 ? 'Decreases ' : 'Increases ' ) + 'in Sales in FY ' + curr_year + ' Over Sales in FY '+ prev_year + ' is ' + variation.toFixed(2) + '%';
         //    console.log('this.SlesStatement',this.SalesStatement);
@@ -437,7 +420,6 @@ export class FinancialInfoComponent implements OnInit {
     // }
 
     calMargin(index, detail) {
-        console.log('detail', detail);
 //        let array = <FormArray>this.financialForm.controls['date_per_financial'];
         let salary = detail.value.financial_annual_sale;
   //      let prev_annual_sale = array.value[index-1].financial_annual_sale;
@@ -499,7 +481,6 @@ export class FinancialInfoComponent implements OnInit {
         if ( (profit != '' || loss != '') && index != 0) {
            
           let array = <FormArray>this.financialForm.controls['estimated_value'];
-           console.log(array.value[index - 1].financial_net_profit);
             
            let prev_profit = array.value[index - 1].estimate_net_profit != '' ? array.value[index - 1].estimate_net_profit : 1;
            let prev_loss = array.value[index - 1].estimate_net_loss !='' ? array.value[index - 1].estimate_net_loss : 1;
@@ -521,9 +502,7 @@ export class FinancialInfoComponent implements OnInit {
     }
 
     calMarginVal(index, detail) {
-        console.log('Margin Estimate VAR',detail);
         let salary = detail.value.estimate_annual_sale;
-        console.log('Margin Estimate Vsalary',salary);
         
         // if (salary != '' && profit != '') {
         //     let margin = profit / salary * 100;
@@ -534,23 +513,16 @@ export class FinancialInfoComponent implements OnInit {
         if(detail.value.estimate_profit_or_loss == 1){
                  
             let profit = detail.value.estimate_net_profit;
-            console.log('if Margin Profit',profit);
             
            if (salary != '' && profit != '') {
-            console.log('if if Margin Estimate salary',salary);
-            console.log('if if Margin Profit',profit);
             let margin = profit / salary * 100;
-            console.log('margin',margin);
             detail.controls.estimate_margin_of_profit.setValue(margin.toFixed(2));
            }
        }
        else if (detail.value.estimate_profit_or_loss == 2){
            
         let loss = detail.value.estimate_net_loss;
-            console.log('else if Margin loss',loss);
            if (salary != '' && loss != '') {
-            console.log('elseif if Margin Estimate salary',salary);
-            console.log('alseif if Margin loss',loss);
                let margin = (loss / salary) * 100 * (-1);
                detail.controls.estimate_margin_of_loss.setValue(margin.toFixed(2));
                
@@ -588,7 +560,6 @@ export class FinancialInfoComponent implements OnInit {
     // }
 
     calProfitAndLossVal( i, detail) {
-        console.log(detail);
         let salary = detail.value.estimate_annual_sale;
         if(detail.value.estimate_profit_or_loss == 1){
         let margin_profit = detail.value.estimate_margin_of_profit;
@@ -682,9 +653,7 @@ export class FinancialInfoComponent implements OnInit {
         //     return;
         // }
             let records = this.financialForm.value;
-            console.log('data', records);
             this._pd.saveForm(records).subscribe(data => {
-                console.log('data', data);
                 this.notifier.notify('success', 'Saved Successfully.');
                 //this.dialogRef.close();
             }, error => {
@@ -715,10 +684,6 @@ export class FinancialInfoComponent implements OnInit {
 
   /** To Convert Amount into Words  */
   inWords(e,i,flag:number){
-      
-    // console.log(e);
-    //   console.log(i);
-    //   console.log(flag);
 
     switch(flag){
     case 1 :
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
index 45d918e60..949f141f1 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
@@ -527,7 +527,7 @@
 </form>
 </div>
 
-<notifier-container></notifier-container>
+<!-- <notifier-container></notifier-container> -->
 <!-- <mat-card style="padding: 12px;">
 <p>Stock Details</p>
 <form [formGroup]="stockForms" class="address"> -->
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts
index e6660afc0..494ceaf1f 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts
@@ -22,6 +22,7 @@ export class StockComponent implements OnInit {
   pageTitle: string ="Stock Details";
   pdid: number;
   form_id: number;
+  company_id: string;
   public stockForms: FormGroup;
   private notifier: NotifierService;
   public uomData : any = [];
@@ -50,6 +51,7 @@ export class StockComponent implements OnInit {
               private _pd: PdTrigerService,@Inject(MAT_DIALOG_DATA) public pd_all_details: any) { 
                   this.pdid = this.pd_all_details.pdmaster_details.pd_id;
                   this.form_id = 11;
+                  this.company_id = this.pd_all_details.company_id
                   this.notifier = notifier;
   }
   public viewerOptions: any = {
@@ -82,7 +84,7 @@ export class StockComponent implements OnInit {
       //   })
 
       //this._pd.getTypeofActivityForSuppliedInfoForm(this.pdid).subscribe(
-      this._pd.stockFormAccess({pd_id:this.pdid}).subscribe(data => {
+      this._pd.stockFormAccess({pd_id:this.pdid,company_id:this.company_id}).subscribe(data => {
 
         if(data.dataStatus == true){
           let datas = data.records;
@@ -109,21 +111,20 @@ export class StockComponent implements OnInit {
   }
 
   public initstockForms(record){
-      console.log(record);
       let params: any = {};
       params.pd_id = this.pdid;
       params.pd_form_id = this.form_id;
-
+      params.company_id = this.company_id;
       this._pd.retriveForm(params).subscribe(value => {
           if (value.status == 200) {
               let dataForm = value.records;
 
               
               if(dataForm !== undefined) {
-              console.log(dataForm);  
                   this.stockForms = this.fb.group({
                     pdid: [this.pdid],
                     formid: [this.form_id],
+                    company_id: [this.company_id],
                     stock_remarks: [''],
                     manufacturing_details: this.fb.array([this.manufacturingFormCreation(record)]),
                     retail_details : this.fb.array([this.retailFormCreation(record)]),
@@ -131,7 +132,6 @@ export class StockComponent implements OnInit {
                   });
                   
                   let arr = record.filter(data => data.type_of_activity_id == 1);
-                  console.log(133,arr.length);
                   if(arr.length > 0) {
                     // console.log(1,dataForm);
                     // console.log(164,dataForm.manufacturing_details);
@@ -257,6 +257,7 @@ export class StockComponent implements OnInit {
                 this.stockForms = this.fb.group({
                   pdid: [this.pdid],
                   formid: [this.form_id],
+                  company_id: [this.company_id],
                   stock_remarks: [''],
                   manufacturing_details: this.fb.array([this.manufacturingFormCreation(record)]),
                   retail_details : this.fb.array([this.retailFormCreation(record)]),
@@ -320,11 +321,8 @@ export class StockComponent implements OnInit {
 
   manufacturingForm: Boolean = false;
   manufacturingFormCreation(record) {
-    console.log(record);
   let arr = record.filter(data => data.type_of_activity_id == 1);
-  console.log(arr);
   if (arr.length > 0) {
-    console.log(arr.length);
     this.manufacturingForm = true;
       return this.fb.group({
         manufacturing_raw_materials: this.fb.array([]),
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts
index 4b328836f..62520e33b 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts
@@ -37,7 +37,7 @@ export class SupplierInfoComponent implements OnInit {
   //@Input() pdid: number;
   pdid: string;
   form_id: number;
-
+  company_id: string;
   public _supplierQuesFrom: FormGroup;
   public submitted = false;
 
@@ -51,6 +51,7 @@ export class SupplierInfoComponent implements OnInit {
     @Inject(MAT_DIALOG_DATA) public pd_all_details: any) {
     this.pdid = this.pd_all_details.pdmaster_details.pd_id;
     this.form_id = 1;
+    this.company_id = this.pd_all_details.company_id
     this.notifier = notifier;
   }
   public viewerOptions: any = {
@@ -76,7 +77,7 @@ export class SupplierInfoComponent implements OnInit {
   noRecordsFound: Boolean = false;
   errorMessage: any = '';
   ngOnInit() {
-    this.pdTrigerService.getTypeofActivityForSuppliedInfoForm(this.pdid).subscribe(data => {
+    this.pdTrigerService.getTypeofActivityForSuppliedInfoForm(this.pdid, this.company_id).subscribe(data => {
       if(data.dataStatus){
       // let datas = {
       //   "profession_name": "Others",
@@ -116,8 +117,12 @@ export class SupplierInfoComponent implements OnInit {
 
   serviceProviderForm: Boolean = false;
   initFormLoadDetails(record) {
+    let params: any = {};
+        params.pd_id = this.pdid;
+        params.pd_form_id = this.form_id;
+        params.company_id = this.company_id;
     // alert(JSON.stringify(record));
-     this.pdTrigerService.getPDFormDetailsWithID(this.pdid, '1').subscribe(
+     this.pdTrigerService.retriveForm(params).subscribe(
       data => {
         if(data.dataStatus){
             let dataForm = data.records;
@@ -125,6 +130,7 @@ export class SupplierInfoComponent implements OnInit {
                 this._supplierQuesFrom = this._formBuilder.group({
                   pdid: [this.pdid],
                   formid: ['1'],
+                  company_id: [this.company_id],
                   manufacturing_details: this._formBuilder.array([this.manufacturingFormCreation(record)]),
                   trade_details: this._formBuilder.array([this.tradingFormCreation(record)]),
                   supplier_info_form_remark: [dataForm.supplier_info_form_remark || null]
@@ -154,6 +160,7 @@ export class SupplierInfoComponent implements OnInit {
                 this._supplierQuesFrom = this._formBuilder.group({
                     pdid: [this.pdid],
                     formid: ['1'],
+                    company_id: [this.company_id],
                     manufacturing_details: this._formBuilder.array([this.manufacturingFormCreation(record)]),
                     trade_details: this._formBuilder.array([this.tradingFormCreation(record)]),
                     supplier_info_form_remark: [dataForm.supplier_info_form_remark || null]
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html
index 17292f75b..5210ebc7e 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html
@@ -26,7 +26,7 @@
                         <span style="padding: 2px 9px 3px 9px !important;" class="menu-badge mat-purple ng-star-inserted" align="center">{{quesIndex+1}}</span>
                     </div>            -->
             </mat-card-header>
-        </mat-card>                                                                                                                                          
+        </mat-card>
     </div>
     </mat-card-content>
     <mat-card-actions align="end">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts
index 70d19e4b3..4ae08c3ed 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts
@@ -26,6 +26,7 @@ import {LoanDetailsComponent} from './forms/loan-details/loan-details.component'
 import {GeneralInfoComponent} from './forms/general-info/general-info.component';
 import {NeighbourHoodComponent} from './forms/neighbour-hood/neighbour-hood.component';
 import {FinalRemarksComponent} from './forms/final-remarks/final-remarks.component';
+import { BusinessInfoGroupComponent } from './forms/business-info-group/business-info-group.component';
 
 @Component({
     selector: 'app-start-pd',
@@ -314,7 +315,7 @@ export class StartPdComponent implements OnInit, OnDestroy {
               });
         }else
         if(this.selectedFormsCategory.form_id==13){
-            const dialogRef = this.dialog.open(BusinessInfoComponent, {
+            const dialogRef = this.dialog.open(BusinessInfoGroupComponent, {
                 data: this.pdFullDetails,
                 position: { right: '0'},
                 width:'80%',
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts
index 90d398715..eefb41512 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts
@@ -89,6 +89,7 @@ import { FinalRemarksComponent } from './list-pd/start-pd/forms/final-remarks/fi
 import { BusinessOtherFamilyMemberComponent } from './list-pd/start-pd/forms/dialogue/business-other-family-member/business-other-family-member.component';
 import { QcReviewComponent } from './list-pd/pd-report/qc-review/qc-review.component';
 import { SharedModule } from "app/shared/shared.module";
+import { BusinessInfoGroupComponent } from './list-pd/start-pd/forms/business-info-group/business-info-group.component';
 
 /**
  * Custom angular notifier options
@@ -266,7 +267,7 @@ const pdCustomNotifierOptions: NotifierOptions = {
     //     AgmCoreModule.forRoot({apiKey: 'AIzaSyBtdO5k6CRntAMJCF-H5uZjTCoSGX95cdk'}), OwlDateTimeModule,
     //     OwlNativeDateTimeModule,
     // ],
-    declarations: [RentalInfoComponent, TelePdAllocationComponent, FinancialInfoComponent, BusinessInfoComponent, EmploymentInfoComponent, StockComponent, BankingDetailsComponent, ListPdComponent, FamilyDetailsComponent, AddressComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent, PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, InprogressPdComponent, AllPdComponent, ScheduledPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, CurrentLoanComponent, AssetsInfoComponent, LoanDetailsComponent, OtherIncomeComponent, SupplierInfoComponent, PersonalInfoComponent, LenderRepresentativeComponent, PdReportComponent, AssessedIncomeComponent, AllocationViewMoreComponent, PdRequirementComponent, GeneralInfoComponent, ModelEditPdReportComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, DialogChangeCurrentVenrsion, FinalRemarksComponent, BusinessOtherFamilyMemberComponent, QcReviewComponent],
+    declarations: [RentalInfoComponent, TelePdAllocationComponent, FinancialInfoComponent, BusinessInfoComponent, EmploymentInfoComponent, StockComponent, BankingDetailsComponent, ListPdComponent, FamilyDetailsComponent, AddressComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent, PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, InprogressPdComponent, AllPdComponent, ScheduledPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, CurrentLoanComponent, AssetsInfoComponent, LoanDetailsComponent, OtherIncomeComponent, SupplierInfoComponent, PersonalInfoComponent, LenderRepresentativeComponent, PdReportComponent, AssessedIncomeComponent, AllocationViewMoreComponent, PdRequirementComponent, GeneralInfoComponent, ModelEditPdReportComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, DialogChangeCurrentVenrsion, FinalRemarksComponent, BusinessOtherFamilyMemberComponent, QcReviewComponent, BusinessInfoGroupComponent],
 
     // exports: [PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, CompletedPdComponent, QcCompletedPdComponent],
     // providers: [PdTrigerService, GetGeometricLocationService],
@@ -304,13 +305,13 @@ const pdCustomNotifierOptions: NotifierOptions = {
          OwlNativeDateTimeModule,
   ],
   // declarations: [ListPdComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent, PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, InprogressPdComponent, AllPdComponent, ScheduledPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, SupplierInfoComponent, PersonalInfoComponent, AssetsInfoComponent],
-  exports: [PdAllocationComponent, SmartPdAllocationComponent, TelePdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, SupplierInfoComponent, PersonalInfoComponent, CurrentLoanComponent, LoanDetailsComponent, OtherIncomeComponent, AssetsInfoComponent, AddressComponent, FamilyDetailsComponent, BankingDetailsComponent, StockComponent, EmploymentInfoComponent, BusinessInfoComponent, FinancialInfoComponent, LenderRepresentativeComponent,RentalInfoComponent, AssessedIncomeComponent, AllocationViewMoreComponent, GeneralInfoComponent, PdRequirementComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, BusinessOtherFamilyMemberComponent],
+  exports: [PdAllocationComponent, SmartPdAllocationComponent, TelePdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, SupplierInfoComponent, PersonalInfoComponent, CurrentLoanComponent, LoanDetailsComponent, OtherIncomeComponent, AssetsInfoComponent, AddressComponent, FamilyDetailsComponent, BankingDetailsComponent, StockComponent, EmploymentInfoComponent, BusinessInfoComponent, FinancialInfoComponent, LenderRepresentativeComponent,RentalInfoComponent, AssessedIncomeComponent, AllocationViewMoreComponent, GeneralInfoComponent, PdRequirementComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, BusinessOtherFamilyMemberComponent, BusinessInfoGroupComponent],
   providers: [PdTrigerService, GetGeometricLocationService,{provide: MAT_DATE_LOCALE, useValue: 'en-GB'},
             {provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE]},
             {provide: MAT_DATE_FORMATS, useValue: MAT_MOMENT_DATE_FORMATS}],
 
   entryComponents: [PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, TelePdAllocationComponent, AllocationViewMoreComponent, PersonalInfoComponent,
-     ClientInfoComponent, SupplierInfoComponent, CurrentLoanComponent, LoanDetailsComponent, OtherIncomeComponent, AssetsInfoComponent, AddressComponent, FamilyDetailsComponent, BankingDetailsComponent, StockComponent, EmploymentInfoComponent, BusinessInfoComponent, FinancialInfoComponent, LenderRepresentativeComponent,RentalInfoComponent, AssessedIncomeComponent, GeneralInfoComponent, PdRequirementComponent, ModelEditPdReportComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, DialogChangeCurrentVenrsion, FinalRemarksComponent, BusinessOtherFamilyMemberComponent, QcReviewComponent],
+     ClientInfoComponent, SupplierInfoComponent, CurrentLoanComponent, LoanDetailsComponent, OtherIncomeComponent, AssetsInfoComponent, AddressComponent, FamilyDetailsComponent, BankingDetailsComponent, StockComponent, EmploymentInfoComponent, BusinessInfoComponent, FinancialInfoComponent, LenderRepresentativeComponent,RentalInfoComponent, AssessedIncomeComponent, GeneralInfoComponent, PdRequirementComponent, ModelEditPdReportComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, DialogChangeCurrentVenrsion, FinalRemarksComponent, BusinessOtherFamilyMemberComponent, QcReviewComponent, BusinessInfoGroupComponent],
 
 })
 export class ManagePdModule {
diff --git a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts
index c7ced0d9d..42efd209c 100755
--- a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts
+++ b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts
@@ -322,15 +322,14 @@ export class PdTrigerService {
 
     swapOlderPDReportToLatest(pdId: any): Observable<any> {
         pdId.fk_createdby = this._aws.getlocale();
-        alert(JSON.stringify(pdId));
         return this._http.post<any>(this.apiUrl + "swapOlderPDReportToLatest", { "records": pdId })
             .pipe(
             catchError(this.handleError('operation', []))
             )
     }
 
-    getTypeofActivityForSuppliedInfoForm(pd_id: any): Observable<any> {
-        return this._http.post<any>(this.apiUrl + "getTypeOfActivetyFromBusinessForm", { "records": { "pd_id": pd_id } })
+    getTypeofActivityForSuppliedInfoForm(pd_id: any,company_id:any): Observable<any> {
+        return this._http.post<any>(this.apiUrl + "getTypeOfActivetyFromBusinessForm", { "records": { "pd_id": pd_id,"company_id":company_id } })
             .pipe(
             catchError(this.handleError('operation', []))
             )

From 8b3d9f6e8d92aa4039f64c6953e30ea0983bde2c Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Sat, 5 Jan 2019 11:50:49 +0530
Subject: [PATCH 15/29] loan details changes

---
 .../loan-details/loan-details.component.html  |  8 ++---
 .../loan-details/loan-details.component.ts    | 31 +++++--------------
 2 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html
index 6002270aa..be93ee4b2 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html
@@ -139,7 +139,7 @@
                                     </mat-form-field>
 <!-- <div *ngIf="productAbbr === 'HL' || productAbbr === 'LL' || productAbbr === 'LAP' "> -->
     <mat-card *ngIf="mortageCardAccess">
-        <mat-card-header><p>Mortgage</p></mat-card-header>
+        <mat-card-header><p>Details of Property being Mortgaged</p></mat-card-header>
         <mat-card-content class="matcard">
             <mat-form-field>
                 <mat-select placeholder="Type of Property" formControlName="property_type" (selectionChange)="mortage_type($event.value)" required>
@@ -185,10 +185,10 @@
                 </mat-select>
             </mat-form-field>
 
-                                                    <mat-form-field *ngIf="loanDetailsForm.controls['construction_status'].value == 4">
+                                                    <!-- <mat-form-field *ngIf="loanDetailsForm.controls['construction_status'].value == 4">
                                                             <input matInput placeholder="What is the approximate stage of construction (%)?"
-                                                                formControlName="percentage_of_construction" (keypress)="keyPress($event)" required autocomplete="off">
-                                                    </mat-form-field>
+                                                                formControlName="percentage_of_construction" (keypress)="keyPress($event)">
+                                                    </mat-form-field> -->
 
                                                     <!--<mat-select placeholder="Status of construction"
                                                                 formControlName="construction_status">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts
index 82510bd52..4aad78fb4 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts
@@ -107,7 +107,6 @@ export class LoanDetailsComponent implements OnInit {
 };
     ngOnInit() { 
         console.clear();
-        console.log(this.pd_all_details);
         this.initloanDetailsForm();
         this.getM_EndUseofLoad();
         this.getM_sourceofamount();
@@ -119,7 +118,6 @@ export class LoanDetailsComponent implements OnInit {
         params.pd_form_id = this.form_id;
         this._pd.retriveForm(params).subscribe(value => {
             // *ngIf="productAbbr === 'HL' || productAbbr === 'LL' || productAbbr === 'LAP' "
-            console.log('value', value);
             if (value.status == 200) {
                 let result = Object.keys(value.records.end_use_group).map(function(key) {
                     return value.records.end_use_group[key];
@@ -178,15 +176,12 @@ export class LoanDetailsComponent implements OnInit {
                         return value.records.source_group[key];
                     });
 
-                    console.log(source);
 
                     let dbsourcelist : any = [];
                     source.forEach(val => {
                         dbsourcelist.push(val.sources);
                     });
 
-                    console.log('sources',dbsourcelist);
-
                     this.loanDetailsForm.controls['own_contribution'].setValue(value.records.own_contribution);
                     if(value.records.own_contribution){ this.ownContributionInWords = this._pd.convertNumberToWords(value.records.own_contribution); }
                     
@@ -223,12 +218,12 @@ export class LoanDetailsComponent implements OnInit {
                 this.loanDetailsForm.controls['other_owners_name'].setValue(value.records.other_owners_name);
                 this.loanDetailsForm.controls['construction_status'].setValue(value.records.construction_status);
 
-                if(value.records.construction_status == 4 ){
-                    this.loanDetailsForm.controls['percentage_of_construction'].setValue(value.records.percentage_of_construction);
-                }
-                else{
-                    this.loanDetailsForm.controls['percentage_of_construction'].setValue('');
-                }
+                // if(value.records.construction_status == 4 ){
+                //     this.loanDetailsForm.controls['percentage_of_construction'].setValue(value.records.percentage_of_construction);
+                // }
+                // else{
+                //     this.loanDetailsForm.controls['percentage_of_construction'].setValue('');
+                // }
                 if(value.records.emv_per_customer != ''){
                     this.loanDetailsForm.controls['emv_per_customer'].setValue(value.records.emv_per_customer);
                     this.emvAmtInWords = this._pd.convertNumberToWords(value.records.emv_per_customer); 
@@ -287,13 +282,11 @@ getM_sourceofamount() {
           function(data){
             if(that.productAbbr != "LAP"){
                 if(data.group_name == that.productAbbr && data.isactive==1){
-                    console.log('if data');
                      return data;
                 }
             }
             else if(that.productAbbr == "LAP"){
                 if(data.sub_group_name == that.subProductName && data.isactive==1){
-                    console.log('else data');
                     return data;
                }
             }
@@ -368,7 +361,7 @@ getM_sourceofamount() {
             owner_name: ['', Validators.compose([Validators.required])],
             other_owners_name :[''],
             construction_status: ['', Validators.compose([Validators.required])],
-            percentage_of_construction : [''],
+            //percentage_of_construction : [''],
             emv_per_customer: ['', Validators.compose([Validators.required])],
             //value_per_agreement: ['', Validators.compose([Validators.required])],
             loandetails_remarks: ['', Validators.compose([Validators.required])],
@@ -390,9 +383,6 @@ getM_sourceofamount() {
         event.forEach(option => {
           let othersData = this.m_endUseofLoad.filter(sub=>sub.subproduct_id==option)[0];
           OthersAvaliable = othersData.name.substr(0,6).toLowerCase();
-          console.log('other',othersData);
-          console.log('',OthersAvaliable);
-          
           this.endUserList.push({ end_use: option });
           
         });
@@ -404,8 +394,6 @@ getM_sourceofamount() {
             this.isOtherPurpose = false; 
         }
         
-        console.log('e',event);
-
         //this.isOtherPurpose = event.some(e => e == 'others') // this return true or false Only;
     }
 
@@ -444,7 +432,6 @@ getM_sourceofamount() {
         // });
     }
     submitLoanDetails() {
-        console.log('formData', this.loanDetailsForm.value);
         // if (!this.loanDetailsForm.valid) {
         //         //this.notifier.notify('warning', 'Form Invaild Check all requried Field .!');
         //         return;
@@ -524,13 +511,11 @@ getM_sourceofamount() {
         }else{ records.personal_loan_source = ''; }
 
         records.construction_status = this.loanDetailsForm.controls['construction_status'].value;
-        records.percentage_of_construction = this.loanDetailsForm.controls['percentage_of_construction'].value;
+        //records.percentage_of_construction = this.loanDetailsForm.controls['percentage_of_construction'].value;
         records.emv_per_customer = this.loanDetailsForm.controls['emv_per_customer'].value;
         //records.value_per_agreement = this.loanDetailsForm.controls['value_per_agreement'].value;
         records.loandetails_remarks = this.loanDetailsForm.controls['loandetails_remarks'].value;
-        console.log('data', records);
         this._pd.saveForm(records).subscribe(data => {
-            console.log('data', data);
             this.notifier.notify('success', 'Saved Successfully.');
         }, error => {
             this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');

From cfa3d9cb42ae8d563bbb9b625d25d63e08fcb19f Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Sat, 5 Jan 2019 14:05:38 +0530
Subject: [PATCH 16/29] general changes : ps

---
 .../general-info/general-info.component.html  | 127 ++++++++++-
 .../general-info/general-info.component.scss  |   0
 .../general-info.component.spec.ts            |   0
 .../general-info/general-info.component.ts    | 209 ++++++++++++++----
 4 files changed, 284 insertions(+), 52 deletions(-)
 mode change 100755 => 100644 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
 mode change 100755 => 100644 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.scss
 mode change 100755 => 100644 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.spec.ts
 mode change 100755 => 100644 ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
old mode 100755
new mode 100644
index 1f2a2a3d3..e6e6f6e03
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
@@ -77,8 +77,125 @@
           </mat-card>
         
         <!-- companies end -->
+
+        <!-- Person Relationship Starts Here -->
+        <mat-card>
+                <mat-card-header>
+                    <mat-card-title> Person Relationship </mat-card-title>
+                </mat-card-header>
+                <mat-card-content>
+                    <mat-table [dataSource]="relationSource" *ngIf="_generalForm.controls.persons_with_relationships['controls'].length>0" formArrayName="persons_with_relationships">
+                            <ng-container matColumnDef="applicant_name">
+                                    <mat-header-cell *matHeaderCellDef> Name </mat-header-cell>
+                                    <mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i"> 
+                                    
+                                     {{details.value.applicant_name | titlecase}}
+                                </mat-cell>
+                            </ng-container>
+                            <ng-container matColumnDef="relation">
+                                    <mat-header-cell *matHeaderCellDef> Relation </mat-header-cell>
+                                    <mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i"> 
+                            
+                                            <mat-select placeholder="Relation" formControlName="relationship" style="width: 75%;">
+                                            <mat-option>Select</mat-option>
+                                            <mat-option [value]="member.relationship_id" *ngFor="let member of relationShipList">{{member.name + ' of' | titlecase}}</mat-option>
+                                            <mat-option value="0" > Not Applicable </mat-option>
+                                            </mat-select>
+                            
+                                </mat-cell>
+                            </ng-container>
+                            <ng-container matColumnDef="relation_to">
+                                    <mat-header-cell *matHeaderCellDef> Relationship To </mat-header-cell>
+                                    <mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i"> 
+                            
+                                                    <mat-select placeholder="Applicant" formControlName="relation_to" style="width: 75%;">
+                                                        <mat-option>Select</mat-option>
+                                                        <mat-option *ngFor="let appc of individualsList" [value]="appc.pd_co_applicant_id">{{appc.applicant_name | titlecase}}</mat-option>
+                                                        <mat-option value="0" > Not Applicable </mat-option>
+                                                    </mat-select>
+                            
+                                    </mat-cell>
+                            </ng-container>
+                    
+                            <mat-header-row *matHeaderRowDef="secondDisplayedColumns"></mat-header-row>
+                             <mat-row *matRowDef="let row; columns: secondDisplayedColumns;"></mat-row>
+                            
+                    </mat-table>
+                </mat-card-content>
+        </mat-card>
+        <!-- Person Relationship Ends Here -->
+
+        <!-- company Relationship Start Here -->
+        <mat-card>
+            <mat-card-header>
+
+                <mat-card-title> Company/Firm Relationship </mat-card-title>
+
+            </mat-card-header>
+            <mat-card-content>
+            
+                    
+                <mat-table [dataSource]="CompanySource" *ngIf="_generalForm.controls.company_with_relationships['controls'].length>0" formArrayName="company_with_relationships">
+
+                    <ng-container matColumnDef="applicant_name">
+                        <mat-header-cell *matHeaderCellDef> Applicant </mat-header-cell>
+                        <mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i"> 
+                            
+                                        <mat-select placeholder="Applicant" formControlName="applicant_name" style="width: 75%;">
+                                            <mat-option *ngFor="let appc of individualsList" [value]="appc.pd_co_applicant_id">{{appc.applicant_name | titlecase}}</mat-option>
+                                        </mat-select>
+                            
+                        </mat-cell>
+                    </ng-container>
+                    <ng-container matColumnDef="company_relationship">
+                            <mat-header-cell *matHeaderCellDef> Relation </mat-header-cell>
+                            <mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i"> 
+                            <mat-select placeholder="Relation" formControlName="company_relationship" style="width: 75%;">
+                                <mat-option>Select</mat-option>
+                                <mat-option *ngFor="let comrelShip of companyRelationShipList" [value]="comrelShip.company_relationship_id">
+                                {{comrelShip.name + ' of' | titlecase}}
+                                </mat-option>
+                                <mat-option value="0" > Not Applicable </mat-option>
+                            </mat-select>
+                            </mat-cell>
+                    </ng-container>
+
+                    <ng-container matColumnDef="relation_to_company">
+                        <mat-header-cell *matHeaderCellDef> Company </mat-header-cell>
+                            <mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i"> 
+                            
+                                <mat-select placeholder="Company / Firm" formControlName="relation_to_company" style="width: 75%;">
+                                    <mat-option>Select</mat-option>  
+                                            <mat-option *ngFor="let comp of companyList" [value]="comp.company_order_id">
+                                                {{comp.company_name | titlecase}}
+                                            </mat-option>
+                                            <mat-option value="0" > Not Applicable </mat-option>
+                                </mat-select>
+                            
+                            <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="removeCompanyRelationship(i)"
+                                                                        matTooltip="Remove Company Relationship" matTooltipPosition="below">
+                                                                            <mat-icon>delete</mat-icon>
+                            </button>
+                            </mat-cell>
+                    </ng-container>
+                    
+
+                    <mat-header-row *matHeaderRowDef="thridDisplayedColumns"></mat-header-row>
+                        <mat-row *matRowDef="let row; columns: thridDisplayedColumns;">
+                        </mat-row>
+                    </mat-table>
+                   
+            </mat-card-content>
+            <mat-card-actions align="end">
+                    <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="addCompanyRelationshipDialogue()"
+                    matTooltip="Add Company Relationship" matTooltipPosition="left" color="primary">
+                        <mat-icon>add</mat-icon>
+                    </button> 
+            </mat-card-actions>
+        </mat-card>
+        <!-- Company RelationShip Ends Here -->
          
-                    <div fxLayout="row wrap" formArrayName="applicant_relation">
+                   <!-- -- <div fxLayout="row wrap" formArrayName="applicant_relation">
                       <div fxFlex.xs="100"  fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100" *ngFor="let relation of _generalForm.controls.applicant_relation['controls']; let r = index;" [formGroupName]="r">
                           <mat-card >
                               <mat-card-header>
@@ -98,7 +215,7 @@
                                               </mat-select>
                                             </mat-form-field>  
                                             <mat-form-field style="width: 20%">
-                                                <!--[placeholder]="placeholderName[i] != ''  ? placeholderName[i] : 'Instalment Amount' "-->
+                                                <!--[placeholder]="placeholderName[i] != ''  ? placeholderName[i] : 'Instalment Amount' "--
                                                 <mat-select placeholder="Relation" formControlName="relationship">
                                                     <mat-option>Select</mat-option>
                                                     <mat-option *ngFor="let relShip of relationShipList" [value]="relShip.relationship_id">
@@ -117,8 +234,8 @@
                                             </div>
                                             
                                       </div>
-                                        </div>
-                                        <p>Company/Firm Relationship</p>
+                                        </div>-->
+                                        <!-- -- <p>Company/Firm Relationship</p>
                                         <div formArrayName="multiple_company_relation">
                                                 <div fxLayout="row nowrap" *ngFor="let comRel of relation.get('multiple_company_relation').controls; let c = index" [formGroupName]="c">
                                                     <mat-form-field style="width: 40%">
@@ -150,7 +267,7 @@
                               </mat-card-content>
                             </mat-card>
                       </div>
-                    </div>
+                    </div> -->
               
     </mat-dialog-content>
     <mat-dialog-actions>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.scss
old mode 100755
new mode 100644
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.spec.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.spec.ts
old mode 100755
new mode 100644
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts
old mode 100755
new mode 100644
index 4461cf6b4..59f119594
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts
@@ -15,10 +15,16 @@ export class GeneralInfoComponent implements OnInit {
   pageTitle: string ="General Information";
   pdid : string;
   form_id:number;
+  is_new : boolean;
+  count : number  = 1;
   private notifier: NotifierService;
   public _generalForm: FormGroup;
   displayedColumns = ['applicant_name','is_person_met','is_applicant'];
   public individualsSource= new MatTableDataSource();
+  public relationSource= new MatTableDataSource();
+  public CompanySource = new MatTableDataSource();
+  secondDisplayedColumns = ['applicant_name','relation','relation_to'];
+  thridDisplayedColumns = ['applicant_name','company_relationship','relation_to_company'];
   public pd_applicants_details: any;
   relationShipList:any=[];
   companyRelationShipList:any=[];
@@ -51,6 +57,19 @@ export class GeneralInfoComponent implements OnInit {
     let control = <FormArray>this._generalForm.controls['companies'];
     this.companyList = control.value.filter(element =>element.company_name && element.is_active);
   });
+
+  this._generalForm.controls['persons_with_relationships'].valueChanges.subscribe(val=>{
+    let control = <FormArray>this._generalForm.controls['persons_with_relationships'];
+    this.relationSource.data =control.controls;
+    //this.individualsList = control.value.filter(element =>element.is_applicant===true);
+  });
+
+  // change relation with businees update dat sorce table
+  this._generalForm.controls['company_with_relationships'].valueChanges.subscribe(val=>{  
+    let ComapnyControl = <FormArray>this._generalForm.controls['company_with_relationships'];
+    this.CompanySource .data =ComapnyControl.controls;
+  });
+
   }
 
   // init form
@@ -58,11 +77,13 @@ export class GeneralInfoComponent implements OnInit {
     this._generalForm = this._fb.group({
       pdid:this.pdid,
       formid:this.form_id,
-      applicant_relation: this._fb.array([]),
+      //applicant_relation: this._fb.array([]),
       individuals: this._fb.array([]),
       companies: this._fb.array([]),
+      persons_with_relationships: this._fb.array([]),
+      company_with_relationships: this._fb.array([]),
       general_remark:''
-  });
+  })
   this.loadFormData();
 }
 // get all master details
@@ -72,10 +93,12 @@ export class GeneralInfoComponent implements OnInit {
         if (data.status == 200) {
           if(type==1){
             this.relationShipList=data.records.filter(item => item.isactive == 1);
-            this.relationShipList.push({'relationship_id':"0",'name':'Others'});
+
+            //this.relationShipList.push({'relationship_id':"0",'name':'Not Applicable'});
           }
           if(type==2){
             this.companyRelationShipList=data.records.filter(item => item.isactive == 1);
+            this.companyRelationShipList=data.records.filter(item => item.name != 'Others');
           }
         
         }
@@ -89,13 +112,18 @@ export class GeneralInfoComponent implements OnInit {
         params.pd_form_id = '18';
     let individualsControl = <FormArray>this._generalForm.controls['individuals'];
     let companyControl = this._generalForm.get('companies') as FormArray;
-    let relationControl = <FormArray>this._generalForm.controls['applicant_relation'];
+    //let relationControl = <FormArray>this._generalForm.controls['applicant_relation'];
+    let personsWithRelationshipsControl = <FormArray>this._generalForm.controls['persons_with_relationships'];
+    let companyWithRelationshipsControl = <FormArray>this._generalForm.controls['company_with_relationships'];
     individualsControl.controls = [];
-    relationControl.controls = [];
+    //relationControl.controls = [];
     companyControl.controls = [];
+    personsWithRelationshipsControl.controls = [];
     let exist_individuals:any;
     let exist_companies:any;
     let exist_relation:any;
+    let exist_personsWithRelationships:any;
+    let exist_companyWithRelationships:any;
     this._pd.retriveForm(params).subscribe(data => {
      if(data.dataStatus) {
       this._generalForm.controls['general_remark'].setValue(data.records.general_remark ? data.records.general_remark : '');
@@ -110,6 +138,30 @@ export class GeneralInfoComponent implements OnInit {
             individualsControl.push(this.createIndividulas(element))
           });
         }
+
+        // create persons with relationships
+        exist_personsWithRelationships=Object.keys(data.records.persons_with_relationships).map(function(key) {
+          return data.records.persons_with_relationships[key];
+        });
+
+        if(exist_personsWithRelationships.length>0){
+          exist_personsWithRelationships.forEach(element => {
+            //individualsControl.push(this.createIndividulas(element))
+            personsWithRelationshipsControl.push(this.createPersonsWithRelationships(element));
+          });
+        }
+
+        exist_companyWithRelationships=Object.keys(data.records.company_with_relationships).map(function(key) {
+          return data.records.company_with_relationships[key];
+        });
+
+        if(exist_companyWithRelationships.length>0){
+          exist_companyWithRelationships.forEach(element => {
+            //individualsControl.push(this.createIndividulas(element))
+            companyWithRelationshipsControl.push(this.createCompaniesRelationshipWithData(element));
+          });
+        }
+
         // create companies
         exist_companies = Object.keys(data.records.companies).map(function(key) {
           return data.records.companies[key];
@@ -127,37 +179,39 @@ export class GeneralInfoComponent implements OnInit {
           }
 
           // create relations
-          exist_relation = Object.keys(data.records.applicant_relation).map(function(key) {
-            return data.records.applicant_relation[key];
-            });
-            if(exist_relation.length>0){
-              exist_relation.forEach((element,index) => {
-                relationControl.push(this.createApplicantRelation(element));
-                let innerrelControl:any = relationControl.controls[index].get('multiple_relation') as FormArray;
-                element.multiple_relation.forEach((innereElement) => {
-                  innerrelControl.push(this.createMultipleRelation(innereElement));
-                });
-                let innercomrelControl:any = relationControl.controls[index].get('multiple_company_relation') as FormArray;
-                element.multiple_company_relation.forEach((innerecomElement) => {
-                  innercomrelControl.push(this.createMultipleCompanyRelation(innerecomElement));
-                });
-              });
-            }
+          // exist_relation = Object.keys(data.records.applicant_relation).map(function(key) {
+          //   return data.records.applicant_relation[key];
+          //   });
+            // if(exist_relation.length>0){
+            //   exist_relation.forEach((element,index) => {
+            //     relationControl.push(this.createApplicantRelation(element));
+            //     let innerrelControl:any = relationControl.controls[index].get('multiple_relation') as FormArray;
+            //     element.multiple_relation.forEach((innereElement) => {
+            //       innerrelControl.push(this.createMultipleRelation(innereElement));
+            //     });
+            //     let innercomrelControl:any = relationControl.controls[index].get('multiple_company_relation') as FormArray;
+            //     element.multiple_company_relation.forEach((innerecomElement) => {
+            //       innercomrelControl.push(this.createMultipleCompanyRelation(innerecomElement));
+            //     });
+            //   });
+            // }
 
       } 
      else {
       this.pd_applicants_details.forEach((element,key) => {
         element.is_applicant=true;
         element.is_person_met=false;
+        element.is_new=false;
         element.individuals_order_id = key+1
         individualsControl.push(this.createIndividulas(element));
-        let relationControl = <FormArray>this._generalForm.controls['applicant_relation'];
-              let applicant_details: any= {'pd_co_applicant_id':element.pd_co_applicant_id,'applicant_name':element.applicant_name, 'individula_order_id':relationControl.controls.length+1};
-              relationControl.push(this.createApplicantRelation(applicant_details));
-              let mulRelationControl = <FormArray> relationControl.controls[relationControl.controls.length-1].get('multiple_relation');
-              mulRelationControl.push(this.createMultipleRelation(applicant_details))
-              let mulCmyRelationControl = <FormArray> relationControl.controls[relationControl.controls.length-1].get('multiple_company_relation');
-              mulCmyRelationControl.push(this.createMultipleCompanyRelation(applicant_details))
+        personsWithRelationshipsControl.push(this.createPersonsWithRelationships(element));
+        //let relationControl = <FormArray>this._generalForm.controls['applicant_relation'];
+              // let applicant_details: any= {'pd_co_applicant_id':element.pd_co_applicant_id,'applicant_name':element.applicant_name, 'individula_order_id':relationControl.controls.length+1};
+              // relationControl.push(this.createApplicantRelation(applicant_details));
+              // let mulRelationControl = <FormArray> relationControl.controls[relationControl.controls.length-1].get('multiple_relation');
+              // mulRelationControl.push(this.createMultipleRelation(applicant_details))
+              // let mulCmyRelationControl = <FormArray> relationControl.controls[relationControl.controls.length-1].get('multiple_company_relation');
+              // mulCmyRelationControl.push(this.createMultipleCompanyRelation(applicant_details))
               
                // create companies
                if(element.company_name!='' && element.company_name!=null){
@@ -182,9 +236,17 @@ export class GeneralInfoComponent implements OnInit {
         applicant_name: [elementValue.applicant_name],
         is_applicant:[elementValue.is_applicant],
         is_person_met:[elementValue.is_person_met],
+        is_new:[elementValue.is_new],
         individuals_order_id: [elementValue.individuals_order_id],
     });
     }
+    createPersonsWithRelationships(elementValue:any){
+      return this._fb.group({
+        applicant_name: [elementValue.applicant_name],
+        relationship:[elementValue.relationship],
+        relation_to:[elementValue.relation_to],
+    });
+    }
     // create companies
     createCompanies(elementValue:any) {
       return this._fb.group({
@@ -194,6 +256,46 @@ export class GeneralInfoComponent implements OnInit {
     });
     }
 
+    // createCompaniesRelationship(elementValue:any) {
+    //     return this._fb.group({
+    //       applicant_name:[elementValue.applicant_name],
+    //       company_relationship:[elementValue.company_relationship],
+    //       relation_to_company:[elementValue.relation_to_company]
+    //   });
+    //   }
+
+    createCompaniesRelationship() {
+      return this._fb.group({
+        applicant_name:[''],
+        company_relationship:[''],
+        relation_to_company:['']
+    });
+    }
+
+    createCompaniesRelationshipWithData(elementValue:any) {
+      return this._fb.group({
+        applicant_name:[elementValue.applicant_name],
+        company_relationship:[elementValue.company_relationship],
+        relation_to_company:[elementValue.relation_to_company]
+    });
+    }
+
+    // open other family family member details
+    addCompanyRelationshipDialogue() {
+      let control: any = this._generalForm.get('company_with_relationships') as FormArray;
+      //let setValues: any =  { applicant_name:'', company_relationship:'',relation_to_company:''};
+      control.push(this.createCompaniesRelationship())
+    }
+
+  // remove other famil membre 
+  removeCompanyRelationship(indexValues){
+    let control: any = this._generalForm.get('company_with_relationships') as FormArray;
+    control.removeAt(indexValues);
+    // control.controls[indexValues].controls.company_name.clearValidators();
+    // control.controls[indexValues].controls.company_name.updateValueAndValidity();
+    //control.removeAt(indexValues);
+  }
+
     // add more companies
     addMoreCompanies() {
       let control: any = this._generalForm.get('companies') as FormArray;
@@ -203,6 +305,8 @@ export class GeneralInfoComponent implements OnInit {
 
     // remove companies
     removeCompanies(indexValues) {
+      this.count = this.count-1;
+      console.log('removed Count',this.count);
       let control: any = this._generalForm.get('companies') as FormArray;
       control.controls[indexValues].controls.is_active.setValue(false);
       control.controls[indexValues].controls.company_name.clearValidators();
@@ -279,6 +383,7 @@ export class GeneralInfoComponent implements OnInit {
 
     // add more individuals details
     addMoreIndividuals() {     
+      console.log('Initial Count',this.count);
         const dialogRef = this.dialog.open(OtherApplicantDetailsComponent, {
             data: '',
             width:'40%',
@@ -287,17 +392,27 @@ export class GeneralInfoComponent implements OnInit {
           dialogRef.afterClosed()
           .subscribe(dataresult => {
             if(dataresult.data.length>0){
-              dataresult.data.forEach(element => {
+              dataresult.data.forEach((element,index) => {
+              console.log('Foreach Entry Count',this.count);
               let individualsControl = <FormArray>this._generalForm.controls['individuals'];
+              element.pd_co_applicant_id = this.count;
+              this.count = this.count+1;
               element.individuals_order_id = individualsControl.controls.length+1;
+              element.is_new=true;
               individualsControl.push(this.createIndividulas(element));
-              let relationControl = <FormArray>this._generalForm.controls['applicant_relation'];
-              let applicant_details: any= {'pd_co_applicant_id':element.pd_co_applicant_id,'applicant_name':element.applicant_name,'applicant_relation_to':'','relation':'','other_relation':'','company_name':'','company_relation':'','company_other_relation':'','individuals_order_id':element.individuals_order_id};
-              relationControl.push(this.createApplicantRelation(applicant_details));
-              let mulRelationControl = <FormArray> relationControl.controls[relationControl.controls.length-1].get('multiple_relation');
-               mulRelationControl.push(this.createMultipleRelation(applicant_details))
-              let mulCmyRelationControl = <FormArray> relationControl.controls[relationControl.controls.length-1].get('multiple_company_relation');
-              mulCmyRelationControl.push(this.createMultipleCompanyRelation(applicant_details))
+              console.log('Foreach Entry Count with Incremented',this.count);
+              console.log('Final Count',this.count);
+              let relationControl = <FormArray>this._generalForm.controls['persons_with_relationships'];
+              let applicant_details: any= {'applicant_name':element.applicant_name,'relationship':'','relation_to':''};
+              relationControl.push(this.createPersonsWithRelationships(applicant_details));
+
+              // let relationControl2 = <FormArray>this._generalForm.controls['applicant_relation'];
+              // let applicant_details2: any= {'pd_co_applicant_id':element.pd_co_applicant_id,'applicant_name':element.applicant_name,'applicant_relation_to':'','relation':'','other_relation':'','company_name':'','company_relation':'','company_other_relation':'','individuals_order_id':element.individuals_order_id};
+              // relationControl2.push(this.createApplicantRelation(applicant_details2));
+              // let mulRelationControl = <FormArray> relationControl.controls[relationControl.controls.length-1].get('multiple_relation');
+              // mulRelationControl.push(this.createMultipleRelation(applicant_details))
+              // let mulCmyRelationControl = <FormArray> relationControl.controls[relationControl.controls.length-1].get('multiple_company_relation');
+              // mulCmyRelationControl.push(this.createMultipleCompanyRelation(applicant_details))
               });
               
             }
@@ -314,21 +429,26 @@ export class GeneralInfoComponent implements OnInit {
     // submit form details
     submitGeneralForm(formData:any) {
       if (this._generalForm.invalid) {
+        console.log('if',this._generalForm.value);
         this.validateAllFormFields(this._generalForm);
         return;
       }
-      else if(formData.applicant_relation.length==0){
-        this.notifier.notify('warning', 'Please Choose Name of Person Met.!');
-
-      }
+      // else if(formData.applicant_relation.length==0){
+      //   console.log('else if',this._generalForm.value);
+      //   this.notifier.notify('warning', 'Please Choose Name of Person Met.!');
+      // }
       else{
+        console.log('else',this._generalForm.value);
         let saveRecords:any = {}
         saveRecords.pdid=formData.pdid;
         saveRecords.formid=formData.formid;
         saveRecords.individuals=formData.individuals;
         saveRecords.companies=formData.companies;
-        saveRecords.applicant_relation=formData.applicant_relation;
+        saveRecords.persons_with_relationships=formData.persons_with_relationships;
+        saveRecords.company_with_relationships=formData.company_with_relationships;
+        //saveRecords.applicant_relation=formData.applicant_relation;
         saveRecords.general_remark=formData.general_remark;
+        //console.log(saveRecords);
         this._pd.savePDFormDetailsWithID(saveRecords).subscribe(
           dataresult => {
             if (dataresult.status == 200) {
@@ -345,12 +465,7 @@ export class GeneralInfoComponent implements OnInit {
           });
       }
     }
-    selectedApplicant(e,applicant_name){
-        console.log(e);
-        console.log(e.value);
-        console.log(e.viewValue);
-        console.log(applicant_name);
-    }
+   
     //   selectedfrequency(e,i){  
     //     switch(+e){
     //         case 1: this.placeholderName[i] = 'Weekly Instalment Amount';  break;

From c23565056666b335aa984e390b814fd179dbd8c2 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Sat, 5 Jan 2019 14:57:41 +0530
Subject: [PATCH 17/29] UI changes

---
 .../list-pd/view-pd/view-pd.component.html    | 306 ++++++++++--------
 .../list-pd/view-pd/view-pd.component.scss    |  24 +-
 2 files changed, 198 insertions(+), 132 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
index 6d119d0ed..ff83913e9 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
@@ -1,84 +1,139 @@
+
 <mat-card>
-  <mat-card-content>
-    <div class="mb-2">
-      <mat-card>
-        <mat-card-content style="background:#e00201;">
-          <div fxLayout="row" fxLayoutAlign="start center" class="filter-header">
-            <div *ngFor="let master of pdMasterData" class="ml-xs mr-xs" fxFlex="45" style="color:#fff;">
-              <h4>{{master.lender_full_name}} - {{master.branch_name}}</h4>
-              <span *ngIf="master.lender_applicant_id"> {{master.lender_applicant_id}}  -  </span> {{master.pd_date_of_initiation}}
-            </div>
-            <div *ngFor="let master of pdMasterData" class="ml-xs mr-xs pt-1" fxFlex="55" style="text-align:right;">
-              <button *ngIf="master.pd_type_name && currentPDStatus!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.COMPLETED && currentPDStatus!=pdStatusCheck.QC_COMPLETED"
-                mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate" matTooltipPosition="above"
-                (click)="pdAllocationTo(master)"><mat-icon>verified_user</mat-icon></button>
-              <button *ngIf="master.pd_type_name && currentPDStatus!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.COMPLETED && currentPDStatus!=pdStatusCheck.QC_COMPLETED"
-                mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Schedule" matTooltipPosition="above"
-                (click)="scheduleDetails(master)"><mat-icon>schedule</mat-icon></button>
-              <button *ngIf="master.pd_type_name && currentPDStatus!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.TRIGGERED && currentPDStatus!=pdStatusCheck.DRAFT && enableStartPD"
-                mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Discussion" matTooltipPosition="above"
-                (click)="getPDStart(viewID)"><mat-icon>question_answer</mat-icon></button>
-
-              <button *ngIf="master.pd_type_name && (currentPDStatus===pdStatusCheck.QC_COMPLETED || currentPDStatus===pdStatusCheck.COMPLETED)"
-                mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="PD Report" matTooltipPosition="above"
-                (click)="getPDIDReport(viewID)"><mat-icon>ballot</mat-icon></button>
-
-              <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Close" matTooltipPosition="above"
-                (click)="loadPdListCompoent()"><mat-icon>close</mat-icon></button>
-              <br>
-              <!-- <span *ngIf="master.pd_allocated_to" style="color:red;text-align:left" class="fa-1x fa fa-user-secret" matTooltip="PD Officer" 
-                  matTooltipPosition="above"></span>       -->
-
-              <span *ngIf="master.pd_allocated_to && master.fk_pd_type==1" style="color:#fff;text-align:left"><mat-icon  class="hover-icon" matTooltip="PD Officer" matTooltipPosition="above">person</mat-icon>{{master.pd_allocated_to | titlecase}}</span>
-              <span *ngIf="master.executive_name && master.centralofficer && master.fk_pd_type==2" style="color:#fff;text-align:left"><mat-icon   class="hover-icon" matTooltip="PD Officer" matTooltipPosition="above">person</mat-icon>{{master.executive_name | titlecase}}/{{master.centralofficer | titlecase}}</span>
-              <span *ngIf="master.centralofficer && master.fk_pd_type==3" style="color:#fff;text-align:left"><mat-icon  class="hover-icon" matTooltip="PD Officer" matTooltipPosition="above">person</mat-icon>{{master.centralofficer | titlecase}}</span>              &nbsp;&nbsp;
-              <span *ngIf="master.pd_status==pdStatusCheck.SCHEDULED" style="color:#fff;text-align:left">{{master.pd_status | titlecase}} &nbsp;On&nbsp;{{master.scheduled_on}}</span>
-              <span *ngIf="master.pd_status!=pdStatusCheck.SCHEDULED && master.pd_status!=pdStatusCheck.QC_COMPLETED " style="color:#fff;text-align:left">{{master.pd_status | titlecase}}</span>
-              <span *ngIf="master.pd_status==pdStatusCheck.QC_COMPLETED " style="color:#fff;text-align:left">QC Completed</span>
-            </div>
-
-          </div>
-        </mat-card-content>
-      </mat-card>
-
-      <mat-card-content>
-        <div fxLayout="row wrap">
-
-          <div class="m-gap p-gap" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50">
-            <!--pd master  -->
-            <mat-card *ngFor="let master of pdMasterData" class="minheight">
-
-              <mat-card-header>
-                <!--  <img mat-card-avatar src="assets/images/avatar.jpg">
-                 <mat-card-title>{{master.lender_full_name}} -  {{master.lender_applicant_id}}
-                 </mat-card-title>-->
-                <mat-card-title *ngIf="master.state_name" class="hover-icon"><i class="fa-1x fa fa-map-marker"> </i> &nbsp;<span>{{master.city_name}} / {{master.state_name}}-{{master.pincode}}</span></mat-card-title>
-
-                <div class="cardEdit" *ngIf="currentPDStatus==pdStatusCheck.DRAFT || currentPDStatus==pdStatusCheck.TRIGGERED || currentPDStatus==pdStatusCheck.ALLOCATED || currentPDStatus==pdStatusCheck.SCHEDULED">
-                  <!--   <button  *ngIf="master.pd_type_name" mat-raised-button mat-button-sm mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="pdAllocationTo(master)"><mat-icon>directions_run</mat-icon></button>
-                      <button *ngIf="master.pd_type_name" mat-raised-button mat-button-sm mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="scheduleDetails(master)"><mat-icon>schedule</mat-icon></button>
-                    -->
-                  <button mat-raised-button mat-button-sm mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="editPdMaster(master)"><mat-icon>edit</mat-icon></button>
+   <mat-card-content>
+      <mat-card class="p-2 mb-2" style="height: 370px !important;">
+         <div fxLayout="row" fxLayoutWrap="wrap" class="mb-3">
+            <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="25" fxFlex.xl="25" class="profile-center" style="text-align:center;">
+               <!--<div class="mb-1">
+                  <img src="assets/images/userpic.jpg" width="100" height="100" alt="" class="radius-circle">
+               </div>-->
+               <mat-card style="padding: 15px;box-shadow: 0 5px 11px 0 rgba(0,0,0,.18), 0 4px 15px 0 rgba(0,0,0,.15) !important;">
+                <div  *ngFor="let master of pdMasterData" class="ml-xs mr-xs">
+                <h4 class="ma-0">{{master.lender_short_name}}</h4>
+                <small>{{master.branch_name}}</small>
+                <div *ngIf="master.lender_applicant_id">
+                <small> {{master.lender_applicant_id}}</small> <br>
+                <small>{{master.pd_date_of_initiation}}</small><br>
+                <br>
+                <button mat-raised-button  color="primary">
+                <span *ngIf="master.pd_status==pdStatusCheck.SCHEDULED" style="text-align:left">{{master.pd_status | titlecase}}</span>
+                <span *ngIf="master.pd_status!=pdStatusCheck.SCHEDULED && master.pd_status!=pdStatusCheck.QC_COMPLETED " style="text-align:left">{{master.pd_status | titlecase}}</span>
+                <span *ngIf="master.pd_status==pdStatusCheck.QC_COMPLETED " style="text-align:left">QC Completed</span>
+                </button><br>
+                <small *ngIf="master.pd_status==pdStatusCheck.SCHEDULED">{{master.scheduled_on}}</small>
+                <small *ngIf="master.pd_allocated_to && master.fk_pd_type==1" style="text-align:left" matTooltip="PD Officer" matTooltipPosition="above">{{master.pd_allocated_to | titlecase}}</small>
+                <small *ngIf="master.executive_name && master.centralofficer && master.fk_pd_type==2" style="text-align:left" matTooltip="PD Officer" matTooltipPosition="above">{{master.executive_name | titlecase}}/{{master.centralofficer | titlecase}}</small> 
+                <small *ngIf="master.centralofficer && master.fk_pd_type==3" style="text-align:left" matTooltip="PD Officer" matTooltipPosition="above">{{master.centralofficer | titlecase}}</small>   
+               
                 </div>
-              </mat-card-header>
+              </div> 
+               </mat-card>
+              <!--< <h4>John Doe</h4>
+               <span>johndoe@johndoe.com</span>
+               p class="mt-xs mb-xs">Sr. Manager</p>
+               <a href="javascript:;" class="block mt-xs mb-xs">www.example.com</a>
+               <button mat-raised-button color="primary">Edit Profile</button>-->
+            </div>
+            <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="75" fxFlex.xl="75" class="content-data">
+               <figure>
+                  <mat-card-content style="padding:0px !important;">                      
+                     <div *ngFor="let master of pdMasterData" class="ml-xs mr-xs">
+                     <div fxLayout="row">  
+                        <div fxFlex="100" style="text-align: right;">
+                                                        <button *ngIf="master.pd_type_name && currentPDStatus==pdStatusCheck.DRAFT" mat-raised-button  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Trigger" matTooltipPosition="above" (click)="editPdMaster(master)"><mat-icon>save</mat-icon></button>
 
-              <mat-card-content>
-
-                <p *ngIf="master.pd_contact_person || master.pd_contact_mobileno "><span *ngIf="master.pd_contact_person"> <i class="fa-1x fa fa-user-o"></i> {{master.pd_contact_person}}</span>&nbsp;&nbsp;
-                  <span *ngIf="master.pd_contact_mobileno"> <i class="fa-1x fa fa-phone"></i> {{master.pd_contact_mobileno}}</span>
-                  <span style="font-size:13px;"> (Lender Contact Details) </span>
-                </p>
-
-                <p *ngIf="master.product_name">{{master.product_name}}<span *ngIf="master.subproduct_name"> /  {{master.subproduct_name}} </span></p>
-                <p *ngIf="master.pd_type_name"><span>{{master.pd_type_name}}</span> <span *ngIf="master.loan_amount" class="hover-icon"> / <i class="fa-1x fa fa-rupee">&nbsp;</i>{{master.loan_amount}}</span></p>
-                <p><span>{{master.addressline1}}</span></p>
-                <p *ngIf="master.remarks"><span style="font-size:13px;"> Remarks : </span> <span style="color:red">{{master.remarks}}</span></p>
-              </mat-card-content>
-            </mat-card>
-          </div>
-          <div fxFlex.xs="100" class="m-gap p-gap" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50">
-            <!-- applicant card  -->
-            <mat-card class="minheight">
+                              <button  *ngIf="master.pd_type_name && currentPDStatus!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.COMPLETED && currentPDStatus!=pdStatusCheck.QC_COMPLETED" mat-raised-button  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate" matTooltipPosition="above" (click)="pdAllocationTo(master)"><mat-icon>verified_user</mat-icon></button>
+                              <button *ngIf="master.pd_type_name && currentPDStatus!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.COMPLETED && currentPDStatus!=pdStatusCheck.QC_COMPLETED" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Schedule" matTooltipPosition="above" (click)="scheduleDetails(master)"><mat-icon>schedule</mat-icon></button>
+                              <button *ngIf="master.pd_type_name && currentPDStatus!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.TRIGGERED && currentPDStatus!=pdStatusCheck.DRAFT && enableStartPD" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Discussion" matTooltipPosition="above" (click)="getPDStart(viewID)"><mat-icon>question_answer</mat-icon></button>
+                              <button *ngIf="master.pd_type_name && currentPDStatus===pdStatusCheck.QC_COMPLETED" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="PD Report" matTooltipPosition="above" (click)="getPDIDReport(viewID)"><mat-icon>ballot</mat-icon></button>
+                              <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon"  type="button" matTooltip="Close" matTooltipPosition="above" (click)="loadPdListCompoent()"><mat-icon>close</mat-icon></button>  
+                                </div> 
+                          </div>
+                     </div>
+                  </mat-card-content>
+                  <hr>
+            <mat-card-content>
+              <div *ngFor="let master of pdMasterData">
+                  <div fxLayout="row" fxLayoutWrap="wrap" class="mb-3">
+                        <div fxFlex="60">
+                          <div fxLayout="row">
+                          <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100" class="profile-center">
+                             <div fxFlex="10">
+                               <span><i class="fa-1x fa fa-suitcase" style="width: 37px;padding: 8px 9px 8px 9px;border-bottom: 2px solid red;"></i></span>
+                             </div> 
+                             <div fxFlex="90"> 
+                                <span *ngIf="master.product_name"> {{master.product_name}}<span *ngIf="master.subproduct_name"> /  {{master.subproduct_name}} </span></span>
+                             </div>
+                          </div>
+                        </div>
+                         <div fxLayout="row">
+                          <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100" class="profile-center">
+                           <span *ngIf="master.loan_amount"><i class="fa-1x fa fa-rupee" style="width: 37px;padding: 8px 9px 8px 9px;border-bottom: 2px solid red;"></i>&nbsp; {{master.loan_amount}}</span>
+                          </div>
+                        </div>
+                         <div fxLayout="row">
+                          <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100" class="profile-center">
+                          <span *ngIf="master.pd_type_name"><i class="fa-1x fa fa-check-circle" style="width: 37px;padding: 8px 9px 8px 9px;border-bottom: 2px solid red;"></i>&nbsp; {{master.pd_type_name}}</span>
+                          </div>
+                        </div>
+                          <div fxLayout="row">
+                            <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100" class="profile-center">
+                                 <div fxFlex="10">
+                                   <span><i class="fa-1x fa fa-map-marker" style="width: 37px;padding: 8px 9px 8px 9px;border-bottom: 2px solid red;"></i></span>
+                                 </div> 
+                                 <div fxFlex="90">                        
+                              <span *ngIf="master.state_name" class="hover-icon"> {{master.addressline1}}, {{master.city_name}},<br>{{master.state_name}}-{{master.pincode}} </span>
+                                 </div>
+                            </div>
+                          </div>    
+                      <!--<div fxLayout="row">
+                        <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100" class="profile-center">
+                          <span><i class="fa-1x fa fa-suitcase" style="width: 37px;padding: 8px 9px 8px 9px;border-bottom: 2px solid red;"></i>&nbsp; {{master.addressline1}}</span>
+                        </div>
+                      </div>-->
+                    </div>
+                    <div fxFlex="40">                       
+                     <div *ngIf="master.pd_contact_person || master.pd_contact_mobileno" style="background-color:#e3dbdb;padding:9px;">
+                        <h4 class="ma-0" style="font-size:13px;padding-bottom:5px;color:red;"><span>Lender Contact Details</span></h4>
+                                  
+                              <div fxLayout="row">
+                              <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100" class="profile-center">
+                                <span *ngIf="master.pd_contact_person"> <i class="fa-1x fa fa-user" style="padding: 8px 13px 8px 13px;border-bottom: 2px solid red;"></i>&nbsp; {{master.pd_contact_person}}</span>
+                              </div>
+                              </div>
+                              <div fxLayout="row">
+                                <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100" class="profile-center">                                 
+                                <span *ngIf="master.pd_contact_mobileno"> <i class="fa-1x fa fa-phone" style="padding: 8px 13px 8px 13px;border-bottom: 2px solid red;"></i>&nbsp; {{master.pd_contact_mobileno}}</span> 
+                              </div>
+                              </div>
+                         </div>
+                         <br>
+                         <div fxLayout="row" *ngIf="master.remarks" style="background-color:#e3dbdb;padding:15px;">
+                        <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100" class="profile-center">
+                            <h4 class="ma-0" style="font-size:13px;padding-bottom:5px;color:red;"><span> Remarks  </span></h4>
+                            
+                             <span>{{master.remarks}}</span>
+                        </div>
+                      </div>
+                      <div fxLayout="row" class="cardEdit" *ngIf="currentPDStatus==pdStatusCheck.DRAFT || currentPDStatus==pdStatusCheck.TRIGGERED || currentPDStatus==pdStatusCheck.ALLOCATED || currentPDStatus==pdStatusCheck.SCHEDULED">
+                        <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100" class="profile-center">                                            
+                          <button mat-raised-button mat-button-sm mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="editPdMaster(master)"><mat-icon>edit</mat-icon></button>                 
+                        </div>
+                       </div>
+                  </div>
+                  </div>                  
+              </div>
+            </mat-card-content>
+               </figure>
+            </div>
+         </div>
+      </mat-card>
+      <mat-card class="p-2">
+         <h4>PD Details</h4>
+         <mat-tab-group class="mt-2">
+            <mat-tab>
+               <ng-template mat-tab-label>Applicants</ng-template>
+                  <mat-card>
               <div class="cardEdit" *ngIf="currentPDStatus==pdStatusCheck.DRAFT || currentPDStatus==pdStatusCheck.TRIGGERED || currentPDStatus==pdStatusCheck.ALLOCATED || currentPDStatus==pdStatusCheck.SCHEDULED">
                 <button mat-raised-button mat-button-sm mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="editPdApplicant(pdApplicantData)"><mat-icon>edit</mat-icon></button>
               </div>
@@ -90,19 +145,19 @@
                 <mat-list *ngFor="let applicant of pdApplicantData">
                   <mat-list-item style="height:68px !important;">
                     <p><span *ngIf="applicant.applicant_name!=null" class="mb-2 text-center hover-icon">
-                            <i class="fa-1x fa fa-user-o"></i>
+                            <i class="fa-1x fa fa-user-o" style="width: 37px;padding: 8px 9px 8px 9px;border-bottom: 2px solid red;"></i>
                             &nbsp;{{applicant.applicant_name}} 
                       </span> &nbsp;&nbsp;&nbsp;
                       <span *ngIf="applicant.mobile_no != '' && applicant.mobile_no != null" class="mb-2 text-center hover-icon">
-                            <i class="fa-1x fa fa-phone"></i>
+                            <i class="fa-1x fa fa-phone" style="width: 37px;padding: 8px 9px 8px 9px;border-bottom: 2px solid red;"></i>
                             &nbsp;{{applicant.mobile_no}} 
                       </span> &nbsp;&nbsp;&nbsp;
                       <span *ngIf="applicant.landline != '' && applicant.landline != 'null-null' && applicant.landline != null " class="mb-2 text-center hover-icon">
-                        <i class="fa-1x fa fa-phone"></i>
+                        <i class="fa-1x fa fa-phone" style="width: 37px;padding: 8px 9px 8px 9px;border-bottom: 2px solid red;"></i>
                         &nbsp;<span matPrefix>+91</span>{{applicant.landline}}
                       </span>
-                      <br><span *ngIf="applicant.applicant_type=='1';else codetails" style="font-size:12px;">Main Applicant </span>
-                      <ng-template #codetails><span>{{applicant.relation_name}}</span></ng-template>
+                      <span *ngIf="applicant.applicant_type=='1';else codetails" style="font-size:12px;">( Main Applicant ) </span>
+                      <ng-template #codetails><span>( {{applicant.relation_name}} )</span></ng-template>
                     </p>
                   </mat-list-item>
                 </mat-list>
@@ -113,17 +168,16 @@
                 </mat-card-content>
               </ng-template>
             </mat-card>
-          </div>
-          <div fxFlex.xs="100" class="m-gap p-gap" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="100" fxFlex.xl="100">
-            <!-- applicant card  -->
-            <mat-card class="minheight">
-              <div class="cardEdit" *ngIf="currentPDStatus==pdStatusCheck.DRAFT || currentPDStatus==pdStatusCheck.TRIGGERED || currentPDStatus==pdStatusCheck.ALLOCATED || currentPDStatus==pdStatusCheck.SCHEDULED">
+            </mat-tab>
+            <mat-tab>
+               <ng-template mat-tab-label>Additional Requirements</ng-template>
+                 <mat-card>
+                <div class="cardEdit" *ngIf="currentPDStatus==pdStatusCheck.DRAFT || currentPDStatus==pdStatusCheck.TRIGGERED || currentPDStatus==pdStatusCheck.ALLOCATED || currentPDStatus==pdStatusCheck.SCHEDULED">
                 <button mat-raised-button mat-button-sm mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="editAdditionalRequirement(pdAdditionalReqData)"><mat-icon>edit</mat-icon></button>
-              </div>
-              <mat-card-header>
+              </div>             
+         <mat-card-header>
                 <mat-card-title style="color:red !important;">Additional Requirements</mat-card-title>
               </mat-card-header>
-
               <mat-card-content *ngIf="pdAdditionalReqData.length>0; else noRequirement">
                 <mat-list *ngFor="let requirement of pdAdditionalReqData">
                   <mat-list-item>
@@ -137,41 +191,30 @@
                 </mat-card-content>
               </ng-template>
             </mat-card>
-          </div>
-          <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50" class="m-gap p-gap">
-            <!-- pd documents card -->
-            <mat-expansion-panel *ngIf="pdDocumentsData.length>0; else nodocument">
-              <mat-expansion-panel-header>
-                <mat-panel-title class="text-xs-left" style="color:red !important;">
-                  <h6 class="mt-0">Documents</h6>
-                </mat-panel-title>
-              </mat-expansion-panel-header>
-              <mat-list *ngFor="let documents of pdDocumentsData">
+            </mat-tab>
+            <mat-tab>
+               <ng-template mat-tab-label>Documents</ng-template>
+               <div *ngIf="pdDocumentsData.length>0; else nodocument">
+                <mat-list *ngFor="let documents of pdDocumentsData">
                 <mat-list-item>
                   <!--<p><span><i class="fa-1x fa fa-file"></i>  {{documents.pd_document_title}} </span></p> -->
                   <a href="{{documents.doc_url}}" target="_blank"><i class="fa-1x fa fa-file"></i> {{documents.pd_document_title}}</a>
-                  <!---- <span class="mb-2 text-center hover-icon">  &nbsp;{{documents.pd_document_name}} </span> -->
+                  <!-- <span class="mb-2 text-center hover-icon">  &nbsp;{{documents.pd_document_name}} </span> -->
                 </mat-list-item>
               </mat-list>
-            </mat-expansion-panel>
+               </div>
             <ng-template #nodocument>
               <mat-card>
                 <mat-card-content>
                   <p>No Document</p>
                 </mat-card-content>
               </mat-card>
-            </ng-template>
-          </div>
-          <div class="m-gap p-gap" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50">
-            <!--pd logs card  -->
-            <mat-expansion-panel *ngIf="masterPdLogsData.length>0; else nohistory">
-              <mat-expansion-panel-header>
-                <mat-panel-title class="text-xs-left" style="color:red !important;">
-                  <h6 class="mt-0"> PD History</h6>
-                </mat-panel-title>
-
-              </mat-expansion-panel-header>
-              <mat-list class="m-gap p-gap" *ngFor="let master of masterPdLogsData">
+            </ng-template>               
+            </mat-tab>
+            <mat-tab>
+               <ng-template mat-tab-label>PD History</ng-template>
+               <div *ngIf="masterPdLogsData.length>0; else nohistory">
+                <mat-list class="m-gap p-gap" *ngFor="let master of masterPdLogsData">
                 <mat-list-item>
                   <span style="font-size:15px;"><span style="color:#908f8f">{{master.time}}</span> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                   <span style="color:#908f8f"> <i> {{master.user}} </i>  </span><br> <span>{{master.log}}</span> </span>
@@ -179,9 +222,7 @@
                 </mat-list-item>
 
               </mat-list>
-
-            </mat-expansion-panel>
-
+                   </div>
             <ng-template #nohistory>
               <mat-card>
                 <mat-card-content>
@@ -189,10 +230,10 @@
                 </mat-card-content>
               </mat-card>
             </ng-template>
-
-          </div>
-          <div class="m-gap p-gap" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50">
-            <mat-card>
+            </mat-tab>
+             <mat-tab>
+               <ng-template mat-tab-label>QC Notes</ng-template>
+                 <mat-card>
               <div style="color:red !important;">
                 <h6>QC Notes</h6>
               </div>
@@ -200,9 +241,12 @@
                 {{ pdMasterData[0]?.qc_remarks}}</p>
 
             </mat-card>
-          </div>
-          <div *ngIf="pdMasterData[0]?.pd_status === 'QC_COMPLETED'" class="m-gap p-gap" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="50"
-            fxFlex.lg="50" fxFlex.xl="50">
+     
+            </mat-tab>
+             <mat-tab>
+               <ng-template mat-tab-label>QC Remarks</ng-template>
+                    <div *ngIf="pdMasterData[0]?.pd_status === 'QC_COMPLETED'" class="m-gap p-gap" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100"
+            fxFlex.lg="100" fxFlex.xl="100">
             <mat-card>
               <div style="color:red !important;">
                 <h6>QC Remarks</h6>
@@ -222,11 +266,11 @@
                 {{ pdMasterData[0]?.qc_feedback}}
               </div>
             </mat-card>
-          </div>
-        </div>
-      </mat-card-content>
-    </div>
-  </mat-card-content>
+          </div> 
+            </mat-tab>
+         </mat-tab-group>
+      </mat-card>
+   </mat-card-content>
 </mat-card>
 
-<!-- <notifier-container></notifier-container> -->
\ No newline at end of file
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.scss
index bdf8de1d6..0c83a24b0 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.scss
@@ -8,4 +8,26 @@
 }
 ::ng-deep .body-container{
     padding: 0rem !important;
-}
\ No newline at end of file
+}
+
+
+:host {
+  margin-left: -5px;
+  margin-right: -5px;
+  margin-top: -5px;
+  display: block;
+}
+.wrapper {
+  margin: 6px;
+}
+
+.content-data{
+    h2{
+        font-size: 1.5rem;
+    }
+}
+@media(max-width:767px){
+    .profile-center{
+        text-align: center;
+    }
+}

From dbc5678bca0541f6b5dd1eec31c6cbfbc8777c76 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Sat, 5 Jan 2019 20:00:13 +0530
Subject: [PATCH 18/29] business form changes

---
 .../business-info.component.html              | 92 +++++++------------
 .../business-info.component.scss              |  3 +
 .../business-info/business-info.component.ts  | 42 ++++++---
 3 files changed, 69 insertions(+), 68 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
index eb4f59014..0f63263f9 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
@@ -102,24 +102,35 @@
                                                         [formGroupName]="i">
                                                         <mat-card-content>
                                                             <mat-form-field style="width: 45%;">
-                                                                <input matInput placeholder="Name"
-                                                                    formControlName="partner_name" required>
+                                                                    <mat-select placeholder="Name" formControlName="partner_name" style="width: 90%;" (selectionChange)="changePartnerGroup(members.value.partner_name,i)" required>
+                                                                        <mat-option *ngFor="let app_par of applicants" [value]="app_par.applicant_name">{{app_par.applicant_name | titlecase}}</mat-option>
+                                                                        <mat-option value="Others">Others</mat-option>
+                                                                    </mat-select>
                                                             </mat-form-field>
-                                                            <mat-form-field style="width: 45%;">
+                                                            <mat-form-field style="width: 45%;" *ngIf="members.value.partner_name=='Others'">
+                                                                <input matInput placeholder="Specify Others"
+                                                                    formControlName="partner_other_name" required>                                                            
+                                                            </mat-form-field>
+                                                            <mat-form-field style="width: 45%;" *ngIf="businessForm.controls.business_entity_type.value!='3' && businessForm.controls.business_entity_type.value!='8' && businessForm.controls.business_entity_type.value!=''">
                                                                 <input matInput placeholder="Share of Profit / Shareholding (%)" (keypress)="keyPress($event)"
-                                                                    formControlName="shareholding" required>
+                                                                    formControlName="shareholding">
                                                             </mat-form-field>
                                                             <p style="padding-left: 2% !important">No of Years in Current Business</p>
                                                             <mat-form-field style="width: 20%;">
-                                                                <input matInput type="number" placeholder="Year" formControlName="current_business_experiance_year"  required min='0'>
+                                                                <input matInput type="number" placeholder="Year" formControlName="current_business_experiance_year" (keyup)="getWorkExperience(members.value,i)"  required min='0'>
                                                             </mat-form-field>
                                                             <mat-form-field style="width: 21%;">
                                                                 <input matInput type="number" placeholder="Month" formControlName="current_business_experiance_month" required min='0' max='12'>
                                                             </mat-form-field>
                                                             <mat-form-field style="width: 35%;">
-                                                                <input matInput placeholder="Total Business Experience"
-                                                                    formControlName="total_business_experiance" required>
+                                                                <input matInput type="number" placeholder="Total Work Experience"
+                                                                    formControlName="total_business_experiance" (keyup)="getWorkExperience(members.value,i)" required>
                                                             </mat-form-field>
+                                                            <mat-form-field style="width: 82%;" *ngIf="members.value.total_business_previous_experience!=undefined">
+                                                                    <input matInput placeholder="Previous Work Experience Details"
+                                                                        formControlName="total_business_previous_experience" required>
+                                                                </mat-form-field>
+                                                            
                                                             <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="addPartnerDetails()"
                                                             matTooltip="Add More" matTooltipPosition="above" color="primary"  *ngIf="i==0">
                                                                 <mat-icon>add</mat-icon>
@@ -280,8 +291,8 @@
                                                                <div formArrayName="india_where_sale_done">
                                                                 <div fxLayout="row nowrap" *ngFor="let saleList of manufacturing.get('india_where_sale_done').controls; let s = index" [formGroupName]="s">
                                                                     <!-- this is for other than pan india -->
-                                                                    <div fxFlex="100" *ngIf="manufacturing.value.pan_india_options=='No'">
-                                                                            <mat-form-field style="width:35%;">
+                                                                    <div class="state-margin" fxFlex="100" *ngIf="manufacturing.value.pan_india_options=='No'">
+                                                                            <mat-form-field style="width:34%;">
                                                                                     <mat-select  placeholder="State" formControlName="state_name" required>
                                                                                         <mat-option *ngFor="let SL of stateList" [value]="SL.state_id">
                                                                                             {{SL.state_name}}
@@ -361,8 +372,8 @@
                                                                                                             </mat-form-field>
                                                                                                         </div>    
                                                                                                         <div formArrayName="india_where_sale_done">
-                                                                                                        <div fxLayout="row nowrap" *ngFor="let saleList of manufacturing.get('india_where_sale_done').controls; let s = index" [formGroupName]="s">
-                                                                                                                <mat-form-field style="width:35%;">
+                                                                                                        <div class="state-margin" fxLayout="row nowrap" *ngFor="let saleList of manufacturing.get('india_where_sale_done').controls; let s = index" [formGroupName]="s">
+                                                                                                                <mat-form-field style="width:34%;">
                                                                                                                         <mat-select  placeholder="State" formControlName="state_name" required>
                                                                                                                             <mat-option *ngFor="let SL of stateList" [value]="SL.state_id">
                                                                                                                                 {{SL.state_name}}
@@ -475,9 +486,8 @@
                                                             </mat-form-field>
                                                             <ng-container *ngIf="retail.value.india_where_sale_done !=undefined && retail.value.countries_where_export_done ==undefined">
                                                                <div formArrayName="india_where_sale_done">
-                                                                <div fxLayout="row nowrap"  *ngFor="let saleList of retail.get('india_where_sale_done').controls; let s = index" [formGroupName]="s">
-
-                                                                            <mat-form-field style="width:35%;">
+                                                                <div class="state-margin" fxLayout="row nowrap"  *ngFor="let saleList of retail.get('india_where_sale_done').controls; let s = index" [formGroupName]="s">
+                                                                            <mat-form-field style="width:34%;">
                                                                                     <mat-select  placeholder="State" formControlName="state_name" required>
                                                                                         <mat-option *ngFor="let SL of stateList" [value]="SL.state_id">
                                                                                             {{SL.state_name}}
@@ -558,8 +568,8 @@
                                                                                                     </mat-form-field>
                                                                                                 </div>  
                                                                                 <div formArrayName="india_where_sale_done">
-                                                                                    <div fxLayout="row nowrap" class="tab_class" *ngFor="let saleList of retail.get('india_where_sale_done').controls; let s = index" [formGroupName]="s">
-                                                                                            <mat-form-field style="width:35%;">
+                                                                                    <div fxLayout="row nowrap" class="state-margin" *ngFor="let saleList of retail.get('india_where_sale_done').controls; let s = index" [formGroupName]="s">
+                                                                                            <mat-form-field style="width:34%;">
                                                                                                     <mat-select  placeholder="State" formControlName="state_name" required>
                                                                                                         <mat-option *ngFor="let SL of stateList" [value]="SL.state_id">
                                                                                                             {{SL.state_name}}
@@ -674,9 +684,9 @@
                                                             </mat-form-field>
                                                             <ng-container *ngIf="wholesale.value.india_where_sale_done !=undefined && wholesale.value.countries_where_export_done ==undefined">
                                                                <div formArrayName="india_where_sale_done">
-                                                                <div fxLayout="row nowrap"  *ngFor="let saleList of wholesale.get('india_where_sale_done').controls; let s = index" [formGroupName]="s">
+                                                                <div class="state-margin" fxLayout="row nowrap"  *ngFor="let saleList of wholesale.get('india_where_sale_done').controls; let s = index" [formGroupName]="s">
 
-                                                                            <mat-form-field style="width:35%;">
+                                                                            <mat-form-field style="width:34%;">
                                                                                     <mat-select  placeholder="State" formControlName="state_name" required>
                                                                                         <mat-option *ngFor="let SL of stateList" [value]="SL.state_id">
                                                                                             {{SL.state_name}}
@@ -756,8 +766,8 @@
                                                                                                     </mat-form-field>
                                                                                                 </div> 
                                                                                 <div formArrayName="india_where_sale_done">
-                                                                                    <div fxLayout="row nowrap" class="tab_class" *ngFor="let saleList of wholesale.get('india_where_sale_done').controls; let s = index" [formGroupName]="s">
-                                                                                            <mat-form-field style="width:35%;">
+                                                                                    <div fxLayout="row nowrap" class="state-margin" *ngFor="let saleList of wholesale.get('india_where_sale_done').controls; let s = index" [formGroupName]="s">
+                                                                                            <mat-form-field style="width:34%;">
                                                                                                     <mat-select  placeholder="State" formControlName="state_name" required>
                                                                                                         <mat-option *ngFor="let SL of stateList" [value]="SL.state_id">
                                                                                                             {{SL.state_name}}
@@ -871,9 +881,9 @@
                                                             </mat-form-field>
                                                             <ng-container *ngIf="serviceprovider.value.india_where_sale_done !=undefined && serviceprovider.value.countries_where_export_done ==undefined">
                                                                <div formArrayName="india_where_sale_done">
-                                                                <div fxLayout="row nowrap"  *ngFor="let saleList of serviceprovider.get('india_where_sale_done').controls; let s = index" [formGroupName]="s">
+                                                                <div class="state-margin" fxLayout="row nowrap"  *ngFor="let saleList of serviceprovider.get('india_where_sale_done').controls; let s = index" [formGroupName]="s">
 
-                                                                            <mat-form-field style="width:35%;">
+                                                                            <mat-form-field style="width:34%;">
                                                                                     <mat-select  placeholder="Where, In India, Is The Service Provided" formControlName="state_name" required>
                                                                                         <mat-option *ngFor="let SL of stateList" [value]="SL.state_id">
                                                                                             {{SL.state_name}}
@@ -953,8 +963,8 @@
                                                                                                     </mat-form-field>
                                                                                                 </div> 
                                                                                     <div formArrayName="india_where_sale_done">
-                                                                                    <div fxLayout="row nowrap" class="tab_class" *ngFor="let saleList of serviceprovider.get('india_where_sale_done').controls; let s = index" [formGroupName]="s">
-                                                                                            <mat-form-field style="width:35%;">
+                                                                                    <div fxLayout="row nowrap" class="state-margin" *ngFor="let saleList of serviceprovider.get('india_where_sale_done').controls; let s = index" [formGroupName]="s">
+                                                                                            <mat-form-field style="width:34%;">
                                                                                                     <mat-select  placeholder="Where, In India, Is The Service Provided" formControlName="state_name" required>
                                                                                                         <mat-option *ngFor="let SL of stateList" [value]="SL.state_id">
                                                                                                             {{SL.state_name}}
@@ -1067,39 +1077,8 @@
                                         </mat-card-actions>
                                     </mat-card>
                                     <mat-card>
+                                            <mat-card-title>Seasonality</mat-card-title>
                                         <mat-card-content>
-                                            <div fxLayout="row nowrap">
-                                                    <mat-form-field style="width: 60%">
-                                                            <mat-select placeholder="Either Currently Running The Business / Are Loan Applicants"
-                                                                        formControlName="main_person" required>
-                                                                <!-- <mat-option value="applicants">One of the applicants</mat-option> -->
-                                                                <mat-option value="{{owner.pd_co_applicant_id}}" *ngFor="let owner of applicants">{{owner.applicant_name}}</mat-option>
-                                                                <mat-option value="Relative">Relative of An Applicant</mat-option>
-                                                                <mat-option value="Others">Others</mat-option>
-                                                            </mat-select>
-                                                        </mat-form-field>
-                                                        <mat-form-field style="width: 28%" *ngIf="businessForm.controls['main_person'].value == 'Others'">
-                                                            <input matInput placeholder="Specify other person"
-                                                                formControlName="other_main_person">
-                                                        </mat-form-field>
-                                                </div>
-                                                <div fxLayout="row nowrap">
-                                                        <mat-form-field style="width: 60%">
-                                                                <mat-select placeholder="Were They Involved In Any Other Business Before Starting This Business"
-                                                                formControlName="before_business" required>
-                                                                <mat-option value="yes">Yes</mat-option>
-                                                                <mat-option value="no">No</mat-option>
-                                                            </mat-select>
-                                                           
-
-                                                        </mat-form-field>
-                                                    </div>
-                                                    <div fxLayout="row nowrap">
-                                                        <mat-form-field style="width: 60%" *ngIf="businessForm.controls['before_business'].value == 'yes'">
-                                                                <textarea matInput placeholder="Description For Before Starting This Business"
-                                                                    formControlName="before_business_description"></textarea>
-                                                            </mat-form-field>
-                                                </div>
                                                 <div fxLayout="row wrap">
                                                         <mat-form-field style="width: 28%">
                                                                 <!-- <input matInput placeholder="Seasonality" formControlName="seasonality" required> -->
@@ -1127,7 +1106,6 @@
                                                                         
                                                                     </mat-select>
                                                                 </mat-form-field>
-                                                            
                                                             </div>
                                                             <div fxLayout="row nowrap" *ngIf="businessForm.controls['seasonality'].value == 'yes'">
                                                                     <mat-form-field style="width: 60%">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.scss
index 8d3e97896..5defc5be7 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.scss
@@ -137,4 +137,7 @@ mat-header-cell mat-cell {
   .tab_class {
       margin-top: 3%;
   }
+  .state-margin {
+      margin-left: 2%;
+  }
 
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
index c83451042..a89002bdd 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
@@ -110,7 +110,7 @@ export class BusinessInfoComponent implements OnInit {
             let businessVal = data.records;
             let constVal: any;
             //const Desgn = <FormArray>this.businessForm.controls['designation'];
-            const Partnr = <FormArray>this.businessForm.controls['partners'];
+            const Partnr: any = <FormArray>this.businessForm.controls['partners'];
             const otherDoc = <FormArray>this.businessForm.controls['documents'];
             const personRel = <FormArray>this.businessForm.controls['persons_with_relationships'];
             const businessActivityControl = <FormArray>this.businessForm.controls['select_business_activity_type'];
@@ -119,9 +119,6 @@ export class BusinessInfoComponent implements OnInit {
             const wholesaleControl: any = <FormArray>this.businessForm.controls['wholesale_trading_activity_details'];
             const serviceProviderControl: any = <FormArray>this.businessForm.controls['service_provider_activity_details'];
             const othersControl: any = <FormArray>this.businessForm.controls['others_activity_details'];
-
-
-
             if (data.status == 200) {
                 let DocArray: any;
                 // let DesgnArray = Object.keys(data.records.designation).map(function (key) {
@@ -142,8 +139,17 @@ export class BusinessInfoComponent implements OnInit {
                 if (PartnrArray.length == 0) {
                     Partnr.push(this.createPartners());
                 } else {
-                    PartnrArray.forEach(datas => {
+                    PartnrArray.forEach((datas,key) => {
                         Partnr.push(this.createPartners());
+                        if(datas.partner_name=='Others') {
+                            Partnr.controls[key].addControl('partner_other_name', new FormControl('', Validators.required))
+                        }
+                        if(parseInt(datas.total_business_experiance) > parseInt(datas.current_business_experiance_year)) {
+                            Partnr.controls[key].addControl('total_business_previous_experience', new FormControl('', Validators.required))
+                        }
+                        else {
+                            Partnr.controls[key].removeControl('total_business_previous_experience')
+                        }
                     });
                 }
                 if (data.records.other_documents == 'yes') {
@@ -355,7 +361,6 @@ export class BusinessInfoComponent implements OnInit {
             }
             else {
                 businessVal.retail_trading_activity_details=[];
-
             }
 
                 // update whole sale details
@@ -603,10 +608,6 @@ export class BusinessInfoComponent implements OnInit {
             other_documents: ['', Validators.compose([Validators.required])],
             documents: this.fb.array([]),
             business_remarks: ['', Validators.compose([Validators.required])],
-            main_person: ['', Validators.compose([Validators.required])],
-            other_main_person: [''],
-            before_business: ['', Validators.compose([Validators.required])],
-            before_business_description: [''],
             //any_delays: ['', Validators.compose([Validators.required])],
             persons_with_relationships:this.fb.array([]),
             select_business_activity_type: this.fb.array([]),
@@ -870,7 +871,7 @@ export class BusinessInfoComponent implements OnInit {
     createPartners(): FormGroup {
         return this.fb.group({
             partner_name: ['', Validators.compose([Validators.required])],
-            shareholding: ['', Validators.compose([Validators.required])],
+            shareholding: [''],
             current_business_experiance_year: ['', Validators.compose([Validators.required])],
             current_business_experiance_month: ['', Validators.compose([Validators.required])],
             total_business_experiance: ['', Validators.compose([Validators.required])],
@@ -1174,6 +1175,25 @@ export class BusinessInfoComponent implements OnInit {
         let othersControl = <FormArray>this.businessForm.controls['others_activity_details'];
         othersControl.push(this.createOthersActivity());
     }
+
+    // update partner group other form control
+    changePartnerGroup(value,key) {
+        let control: any = this.businessForm.get('partners') as FormArray;
+        value=='Others' ? control.controls[key].addControl('partner_other_name', new FormControl('', Validators.required)) : control.controls[key].removeControl('partner_other_name');
+    }
+    // get work experience based on create form control
+    getWorkExperience(event, key) {
+        let current_experience = event.current_business_experiance_year=='' ? 0 : parseInt(event.current_business_experiance_year);
+        let total_experience = event.total_business_experiance=='' ? 0 : parseInt(event.total_business_experiance);
+        let control: any = this.businessForm.get('partners') as FormArray;
+        if(total_experience > current_experience) {
+            control.controls[key].addControl('total_business_previous_experience', new FormControl('', Validators.required))
+        }
+        else {
+            control.controls[key].removeControl('total_business_previous_experience')
+        }
+
+    }
     submitDetails() {
        // let family: any = [];
         if (!this.businessForm.valid) {

From 603e57f80f15697d8ff41eaf214d650da11c9131 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Sat, 5 Jan 2019 20:27:39 +0530
Subject: [PATCH 19/29] business changes

---
 .../start-pd/forms/business-info/business-info.component.html | 2 +-
 .../start-pd/forms/business-info/business-info.component.ts   | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
index 0f63263f9..7ade2f1da 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
@@ -1143,7 +1143,7 @@
                                 </mat-card>
                                 <mat-card>
                                     <mat-card-header>
-                                        <mat-card-title>No of Employees Sighted Ny PD Officer During His Visit </mat-card-title>
+                                        <mat-card-title>No of Employees Sighted By PD Officer During His Visit </mat-card-title>
                                     </mat-card-header>
                                     <mat-card-content class="matcard">
                                         <mat-form-field>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
index a89002bdd..3b57ff65a 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
@@ -1189,6 +1189,10 @@ export class BusinessInfoComponent implements OnInit {
         if(total_experience > current_experience) {
             control.controls[key].addControl('total_business_previous_experience', new FormControl('', Validators.required))
         }
+        else if(total_experience < current_experience) {
+            control.controls[key].controls['total_business_experiance'].setValue(current_experience);
+            control.controls[key].removeControl('total_business_previous_experience')
+        }
         else {
             control.controls[key].removeControl('total_business_previous_experience')
         }

From 29a4d7119e17c0376df49fb4c3548ebe052a0f47 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Sat, 5 Jan 2019 22:18:57 +0530
Subject: [PATCH 20/29] address : ps

---
 .../forms/address/address.component.html      | 138 +++++----
 .../forms/address/address.component.ts        | 267 +++++-------------
 2 files changed, 129 insertions(+), 276 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html
index 76ae7e05c..b11ab1d5b 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html
@@ -108,7 +108,7 @@
                                             
                                         <div *ngIf="addressForm.controls['address_ownership'].value == 3 " fxFlex="33">
                                                 <mat-form-field style="width: 80%;">
-                                                    <input matInput placeholder="What is the monthly rent paid?" formControlName="rent_amt" autocomplete="off" (keypress)="keyPress($event)" (keyup)="inWords($event,'')">
+                                                    <input matInput placeholder="What is the monthly rent paid?" formControlName="rent_amt" autocomplete="off" (keypress)="keyPress($event)" (keyup)="inWordsForRent($event)">
                                                     <mat-hint align="start" style="font-size:70%" *ngIf="addressForm.controls['rent_amt'].value != ''">{{"&#8377;"}} {{rentAmtInwords}} Only</mat-hint>
                                                 </mat-form-field>
 
@@ -169,80 +169,72 @@
                                         </mat-select>
                                     </mat-form-field>--(Customer Behaviour)-->
 
-                                 
-                                  
-                                                
+                         
+                                            <mat-card *ngIf="addressForm.controls['bussiness_activity'].value == 'yes'">
+                                                    
+                                                    <div formArrayName="additional_address_units">
+                                                                    <div *ngFor="let item of addressForm.controls.additional_address_units['controls']; let i=index" >
+                                                                            <mat-card-header><p>Additional Unit #{{i+1}}</p></mat-card-header>
+                                                                        <mat-card-content class="matcard" [formGroup]="item">
 
-                                     <!-- <mat-form-field *ngIf="addressForm.controls['bussiness_activity'].value == 'yes'" style="width: 100%"> -->
-                                            <!-- <mat-select placeholder="Bussiness Type" formControlName="bussiness_address_type">
-                                                <mat-option value="{{m_addressType.address_type_id}}"
-                                                                    *ngFor="let m_addressType of addressData">{{m_addressType.address_type}}
-                                                </mat-option>
-                                            </mat-select> -->
-                                            <!-- <mat-select placeholder="Type of Premises" formControlName="bussiness_address_type" multiple>
-                                                <mat-option  *ngFor="let m_addressType of addressData"  [value]="m_addressType.address_type_id" (onSelectionChange)="SelectedPremises($event)" > {{m_addressType.address_type}} </mat-option>
-                                            </mat-select>
-                                    </mat-form-field> -->
-                                    <label *ngIf="addressForm.controls['bussiness_activity'].value == 'yes'"> Type of Premises </label>
-                                    <div fxLayout="row wrap" class="example-section" *ngIf="addressForm.controls['bussiness_activity'].value == 'yes'">
-                                            <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="25" fxFlex.lg="25" fxFlex.xl="25" *ngFor="let at of addressData;let i = index;"> <!---- [formGroupName]="i"> -->
-                                                <mat-checkbox class="example-margin" color="primary" [value]="at.address_type_id" (change)="SelectedPremises($event)" [checked]="at.status==1 ? true:false">{{at.address_type}}</mat-checkbox>
-                                            </div>
-                                    </div>
-                                                        
-                                    <!-- <mat-form-field *ngIf="PremisesOtherFlag == true" style="width: 40%">
-                                        <input matInput placeholder="Specify Premises Type" formControlName="bussiness_address_type_others"  (change)="otherValueset()" autocomplete="off">
-                                    </mat-form-field> -->
-                                    <span *ngIf="PremisesOtherFlag == true">
-                                            <br>    
-                                                <mat-form-field  style="width: 40%">
-                                                    <input matInput placeholder="Specify Premises Type" formControlName="bussiness_address_type_others"  (change)="otherValueset()" autocomplete="off">
-                                                </mat-form-field>
-                                    </span>                
-                                
+                                                                                <mat-form-field  style="width: 40%">
+                                                                                        <mat-select placeholder="Type of Premises" formControlName="premises_type">
+                                                                                                <mat-option  *ngFor="let m_addressType of addressData"  [value]="m_addressType.address_type_id"> {{m_addressType.address_type}} </mat-option>
+                                                                                        </mat-select>
+                                                                                    </mat-form-field>
+                                                                                    <mat-form-field  *ngIf="item.get('premises_type').value == 12"  style="width: 40%">
+                                                                                        <input matInput placeholder="Specify Premises Type" formControlName="premises_type_others"  autocomplete="off">
+                                                                                    </mat-form-field>
+                                                                                <mat-form-field style="width: 40%;">
+                                                                                        <input matInput placeholder="Number Of Additional Units"
+                                                                                               formControlName="no_of_additional_units" autocomplete="off">
+                                                                                </mat-form-field>
+                                                                                <mat-form-field style="width: 40%;">
+                          
+                                                                                        <input matInput placeholder="Location/City"
+                                                                                        formControlName="premises_city" autocomplete="off">
+                                                                                        
+                                                                                </mat-form-field>
+                                                                                
+                                                                                <mat-form-field style="width: 40%;">
+                                                                                        <mat-select placeholder="Ownership" formControlName="premises_ownership">
+                                                                                            <mat-option value="{{ownerShip.id}}" *ngFor="let ownerShip of ownerShipData">
+                                                                                                {{ownerShip.name}}
+                                                                                            </mat-option>
+                                                                                        </mat-select>
+                                                                                </mat-form-field>
+                                                                                
+                                                                                <!-- <mat-form-field *ngIf="addressForm.controls['premises_ownership'].value == 4 "> -->
+                                                                                <mat-form-field *ngIf="item.get('premises_ownership').value == 4" style="width: 40%;">
+                                                                                    <input matInput placeholder="Specify Ownership" formControlName="premises_ownership_others" autocomplete="off">
+                                                                                </mat-form-field>
+                                                                                <mat-form-field *ngIf="item.get('premises_ownership').value == 3" style="width: 40%;">
+                                                                                  <input matInput placeholder="What is the monthly rent paid?" formControlName="premises_rent_amt" autocomplete="off" (keypress)="keyPress($event)" (keyup)="inWords($event,i)">
+                                                                                  <mat-hint align="start" style="font-size:70%" *ngIf="item.get('premises_rent_amt').value != ''">{{"&#8377;"}} {{premisesRentAmtInwords[i]}} Only</mat-hint>
+                                                                              </mat-form-field>
+                                                                                <mat-form-field style="width: 40%">
+                                                                                        <input matInput placeholder="Remarks"
+                                                                                                formControlName="premises_remarks" style="width: 65%;" autocomplete="off">
+                                                                                </mat-form-field>
+                                                                        
+                                            
+                                                                            
+                                                                        <button type="button" matTooltip="Add More Neighbour Details" class="mr-1 mb-1 hover-icon"  matTooltipPosition="above" mat-raised-button mat-icon-button *ngIf="i==0"
+                                                                                    (click)="addUnits($event)"
+                                                                                   color="primary" style="float: right;">
+                                                                                <mat-icon>add</mat-icon>
+                                                                        </button>
+                                                                        <button type="button" matTooltip="Delete" class="mr-1 mb-1 hover-icon"  matTooltipPosition="above" mat-raised-button mat-icon-button *ngIf="i>0"
+                                                                                     (click)="removeUnits(i)"
+                                                                                    style="float: right;">
+                                                                                <mat-icon>delete</mat-icon>
+                                                                        </button>
+                                                                        </mat-card-content>
+                                                                        
+                                                                    </div>
+                                                                </div>
+                                            </mat-card>
 
-                                    <span *ngIf="addressForm.controls['bussiness_activity'].value == 'yes'" formArrayName="additional_premises">
-                                        <div 
-                                        *ngFor="let item of addressForm.controls.additional_premises['controls']; let i = index;" [formGroupName]="i">
-                                      
-                                                <p>{{i+1}} . {{PremisesLabel[i]}}</p>
-                                                
-                                                      <mat-form-field style="width: 40%;">
-                                                              <input matInput placeholder="Number Of Additional Units"
-                                                                     formControlName="no_of_additional_units" autocomplete="off">
-                                                      </mat-form-field>
-                                                      <mat-form-field *ngIf="item.get('no_of_additional_units').value > 2" style="width: 40%;">
-
-                                                              <mat-select  placeholder="City" formControlName="premises_city" multiple > <!-- (selectionChange)="relationChanged($event)"> -->
-                                                                  <mat-option *ngFor="let CL of cityData" [value]="CL.city_id">
-                                                                      {{CL.name}}
-                                                                  </mat-option>
-                                                              </mat-select>
-                                                              
-                                                      </mat-form-field>
-                                                      
-                                                      <mat-form-field *ngIf="item.get('no_of_additional_units').value <= 2  && item.get('no_of_additional_units').value != '' " style="width: 40%;">
-                                                              <mat-select placeholder="Ownership" formControlName="premises_ownership">
-                                                                  <mat-option value="{{ownerShip.id}}" *ngFor="let ownerShip of ownerShipData">
-                                                                      {{ownerShip.name}}
-                                                                  </mat-option>
-                                                              </mat-select>
-                                                      </mat-form-field>
-                                                      
-                                                      <!-- <mat-form-field *ngIf="addressForm.controls['premises_ownership'].value == 4 "> -->
-                                                      <mat-form-field *ngIf="item.get('premises_ownership').value == 4" style="width: 40%;">
-                                                          <input matInput placeholder="Specify Ownership" formControlName="premises_ownership_others" autocomplete="off">
-                                                      </mat-form-field>
-                                                      <mat-form-field *ngIf="item.get('premises_ownership').value == 3" style="width: 40%;">
-                                                        <input matInput placeholder="What is the monthly rent paid?" formControlName="premises_rent_amt" autocomplete="off" (keypress)="keyPress($event)" (keyup)="inWords($event,i)">
-                                                        <mat-hint align="start" style="font-size:70%" *ngIf="item.get('premises_rent_amt').value != ''">{{"&#8377;"}} {{premisesRentAmtInwords[i]}} Only</mat-hint>
-                                                    </mat-form-field>
-                                                      <mat-form-field style="width: 40%">
-                                                              <input matInput placeholder="Remarks"
-                                                                      formControlName="premises_remarks" style="width: 65%;" autocomplete="off">
-                                                      </mat-form-field>
-                                              </div>
-                                            </span>   
                                     <!--- Don't Remove To replace atlast of the PD Completion and creating new form (Neighbourhood check) --
                                     <mat-card>
                                         <mat-card-header>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts
index e9b0220b0..522a191b1 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts
@@ -115,21 +115,24 @@ export class AddressComponent implements OnInit {
         this._pd.retriveForm(params).subscribe(data => {
             console.log('data', data);
             //const control = <FormArray>this.addressForm.controls['neighbourhood'];
-            const additionalPremisesControl = <FormArray>this.addressForm.controls['additional_premises'];
+            const control = <FormArray>this.addressForm.controls['additional_address_units'];
+            //const additionalPremisesControl = <FormArray>this.addressForm.controls['additional_premises'];
            if(data.status == 200) {
-            //    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.selectedAddressType(data.records.address_type);
+               let selectedAddressType = this.addressData.filter(element =>element.address_type_id == data.records.address_type);
+               this.selectedAddressType(selectedAddressType);
+
                if(data.records.address_type == 12) {
                 this.addressForm.controls.address_type_others.setValue(data.records.address_type_others);
                 this.selectedAddressType(data.records.address_type_others);
                }
+
                this.addressForm.controls.comment_locality.setValue(data.records.comment_locality);
+
                if(data.records.comment_locality == 10){
                 this.addressForm.controls.other_comment_locality.setValue(data.records.other_comment_locality);
                }
@@ -153,47 +156,36 @@ export class AddressComponent implements OnInit {
                 this.addressForm.controls.bussiness_activity_remark.setValue('');
                }
                this.addressForm.controls.bussiness_activity.setValue(data.records.bussiness_activity);
-               
-            if(data.records.bussiness_activity == 'yes' && data.records.bussiness_address_type !=null) {
+
                this.addressForm.controls.business_years.setValue(data.records.business_years);
                this.addressForm.controls.business_month.setValue(data.records.business_month);
-                               
-                let that = this;
-                this.bussiness_address_type = [];
-  
-                this.bussiness_address_type = (Object.keys(data.records.bussiness_address_type).map(function(key)
-                {   
-                  return data.records.bussiness_address_type[key].premises_types;
-                }))
-                
-                this.additional_premises = Object.keys(data.records.additional_premises).map(function(key)
-                {
-                    return data.records.additional_premises[key];
-                })
+
+               if(data.records.bussiness_activity == 'yes') {
+                // const control = <FormArray>this.addressForm.controls['additional_address_units'];
+               
+                    var resultOfUnits = Object.keys(data.records.additional_address_units).map(function (key) {
+                        return data.records.additional_address_units[key];
+                    });
+                    //console.log(resultOfUnits);
+
+                            if (resultOfUnits.length == 0) {
+                                control.push(this.createUnits());
+                            } else {
+                                resultOfUnits.forEach((datas,index) => {
+                                    this.premisesRentAmtInwords[index] = this._pd.convertNumberToWords(datas.premises_rent_amt);
+                                    control.push(this.createUnits());
+                                });
+                                this.addressForm.controls.additional_address_units.setValue(resultOfUnits);
+                            }
                  
                }
-               this.additional_premises.forEach((item,index)=>
-               {  
-                console.log(item);
-                console.log(index);
-                //this.premisesRentAmtInwords[index] = this._pd.convertNumberToWords(item.premises_rent_amt);
-                });
 
-               this.selectedValue(this.bussiness_address_type,this.additional_premises);
                if (data.records.locality_others) {
                    this.addressForm.controls.locality_others.setValue(data.records.locality_others);
                }
-
-            //    if (result.length == 0) {
-            //        control.push(this.createNeighbour());
-            //    } else {
-            //        result.forEach(datas => {
-            //            control.push(this.createNeighbour());
-            //        });
-            //        this.addressForm.controls.neighbourhood.setValue(result);
-            //    }
            } else {
                //control.push(this.createNeighbour());
+               control.push(this.createUnits());
            }
         });
     }
@@ -210,6 +202,7 @@ export class AddressComponent implements OnInit {
             other_comment_locality : [''],
             //customer_behaviour: ['', Validators.compose([Validators.required])],
             //neighbourhood: this.fb.array([]),
+            additional_address_units: this.fb.array([]),
             address_form_remark:[''],
             address_ownership:[''],
             other_ownership:[''],
@@ -221,7 +214,7 @@ export class AddressComponent implements OnInit {
             business_month:[''],
             bussiness_address_type:[''],
             bussiness_address_type_others: [''],
-            additional_premises: this.fb.array([])
+            //additional_premises: this.fb.array([])
         });
         this.address = this.addressForm.controls['address'];
         this.addressType = this.addressForm.controls['address_type'];
@@ -249,16 +242,28 @@ export class AddressComponent implements OnInit {
     //         is_owner: ['', Validators.compose([Validators.required])],
     //     });
     // }
-    createPremises(): FormGroup {
+    createUnits(): FormGroup {
         return this.fb.group({
             no_of_additional_units: [''],
+            premises_type: [''],
+            premises_type_others: [''],
             premises_city: [''],
-            premises_remarks: [''],
             premises_ownership: [''],
             premises_ownership_others: [''],
             premises_rent_amt:[''],
+            premises_remarks: [''],
         });
-   }
+    }
+//     createPremises(): FormGroup {
+//         return this.fb.group({
+//             no_of_additional_units: [''],
+//             premises_city: [''],
+//             premises_remarks: [''],
+//             premises_ownership: [''],
+//             premises_ownership_others: [''],
+//             premises_rent_amt:[''],
+//         });
+//    }
     getMasterDetails(table:string,type:number){
         this._pd.getAllMasterDatas(table).subscribe(data => {
             data.records.forEach(val => {
@@ -316,6 +321,17 @@ export class AddressComponent implements OnInit {
         const control = <FormArray>this.addressForm.controls['neighbourhood'];
         control.removeAt(index);
     }*/
+
+    addUnits() {
+        const control = <FormArray>this.addressForm.controls['additional_address_units'];
+        control.push(this.createUnits());
+    }
+
+    removeUnits(index) {
+        const control = <FormArray>this.addressForm.controls['additional_address_units'];
+        control.removeAt(index);
+    }
+
     onSubmit() {
         
         if (!this.addressForm.valid) {
@@ -338,6 +354,7 @@ export class AddressComponent implements OnInit {
         records.other_comment_locality = this.other_comment_locality.value;
         //records.customer_behaviour = this.commentlocality.value;
         //records.neighbourhood = this.addressForm.controls.neighbourhood.value;
+        
         records.address_form_remark = this.addressForm.controls.address_form_remark.value;
         records.address_ownership = this.ownership.value;
         records.other_ownership = this.other_ownership.value;
@@ -348,37 +365,10 @@ export class AddressComponent implements OnInit {
         records.business_years = this.business_years.value;
         records.business_month = this.business_month.value;
 
-        if (this.bussinessActivity.value == 'yes') {
-
-            // records.bussiness_address_type = this.addressForm.controls.bussiness_address_type.value;
-            records.bussiness_address_type = this.formPremisesArray;
-
-            if (records.bussiness_address_type == 12) {
-                records.bussiness_address_type_others = this.addressForm.controls.bussiness_address_type_others.value;
-            }
+        if (this.bussinessActivity.value == 'yes') {            
+            records.additional_address_units = this.addressForm.controls.additional_address_units.value;
         }
 
-        // console.log('this.addressForm.controls.additional_premises.value',this.addressForm.controls.additional_premises.value);
-
-        this.addressForm.controls.additional_premises.value.forEach((val,index)=>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  
-        {
-                if(val.premises_city != '' && val.premises_city != null){
-                    this.formPremisesCityArray = [];
-                        val.premises_city.forEach(option => {
-                            this.formPremisesCityArray.push({additional_premises_city: option});
-                    });
-            this.addressForm.controls.additional_premises.value[index].premises_city = this.formPremisesCityArray;
-                }
-                else{
-                    this.formPremisesCityArray = [];
-                        
-                            this.addressForm.controls.additional_premises.value[index].premises_city = null;
-                    
-                }
-            });
-            
-        records.additional_premises = this.addressForm.controls.additional_premises.value;
- 
         records.pdid = this.pdid;
         records.formid = '5';
         // records.fk_createdby = '250';
@@ -393,138 +383,11 @@ export class AddressComponent implements OnInit {
         });
     }
 
-    // relationChanged(event) {
-    //     this.formPremisesCityArray = [];
-    //     event.value.forEach(option => {
-    //         this.formPremisesCityArray.push({city: option});
-    //     });
-    // }
     selectedAddressType(e: any){
-        // console.log(e);
         this.placeholderName = 'Was any business activity seen at the '+e+' during PD visit?';
     }
-    SelectedPremises($event){
 
-        let premisesData = $event.source.value;
-        
-          
-        if($event.checked === true ){
-      
-            //this.formPremisesArray.push({member: $event.source.value});
-            //this.selectedSegmentDatas.push(CustomerSegmentName.name);            
-        
-      
-        
-      
-            this.formPremisesArray.push({premises_types: $event.source.value});
-      
-            
-            const control = <FormArray>this.addressForm.controls['additional_premises'];
-            let array = this.addressData.filter(data => data.address_type_id == premisesData)[0];
-            
-            if(premisesData == 12){
-                this.PremisesOtherFlag = true;
-                // this.PremisesLabel[this.z] = this.pdQuestionAddress.get('bussiness_address_type_others').value;
-                 control.push(this.createPremises());
-                
-            }
-            else{
-                this.PremisesLabel[this.z] = array.address_type;
-            control.push(this.createPremises());
-                
-            }
-            //console.log(this.PremisesLabel);
-            this.z++;
-      
-            
-            
-      
-      
-            
-          }
-          else if($event.checked === false ){   
-            
-            if(premisesData == 12){
-                this.PremisesOtherFlag = false;
-            }
-            
-            let index = this.formPremisesArray.findIndex(form=>form.premises_types== $event.source.value);
-            //console.log(index);
-            const control = <FormArray>this.addressForm.controls['additional_premises'];
-            control.removeAt(index); 
-            this.PremisesLabel.splice(index,1);     
-            //console.log(this.z);
-            this.z--;
-          }
-      
-        }
-      
-    getCity(e)
-  { 
-    this.cityData = [];
-        e.forEach(val=>
-          {
-              this.cityData.push({additional_premises_city:val});
-          });
-          //console.log(this.cityData);
-  }
-  otherValueset()
-  {
-    let z = this.z;
-    this.PremisesLabel[z-1] = this.addressForm.get('bussiness_address_type_others').value;    
-  }
 
-        selectedValue(e,data)
-        {
-          
-          let premisesData = e ;
-           this.tempArr = [];
-           let that = this;
-           this.addressData = Object.keys(this.addressData).map(function(key)
-           {
-               that.addressData[key].status = 0;
-              return that.addressData[key];
-           })
-         
-          premisesData.forEach((val,index)=>
-              {
-         
-                this.z++;
-         
-                this.formPremisesArray.push({premises_types: val});
-    
-                  this.tempArr.push(this.addressData.filter(add=>add.address_type_id==val)[0]);
-                  
-                  this.PremisesLabel[index] = this.tempArr[index].address_type;
-                 
-                if(data[index] !==undefined && data[index].premises_ownership < 2 ){
-                  data[index].premises_city = Object.keys(data[index].premises_city).map(function(key)
-                  {
-                        return data[index].premises_city[key].additional_premises_city;
-                  });
-                    //data[index].premises_city = data[index].premises_city.additional_premises_city;
-                }
-                  this.addressData.forEach(data=>
-                    {
-                      if(data.address_type_id == val)
-                      {
-                        data.status = 1;
-                      }
-                    });
-                  
-              });
-              
-              const control = <FormArray>this.addressForm.controls['additional_premises'] as FormArray;
-             
-              //  control.removeAt(0);
-              this.tempArr.forEach((item,index)=>
-              {  
-                  control.push(this.createPremises());
-              });
-                
-              this.addressForm.controls['additional_premises'].setValue(data);
-        }
-    
     validateAllFormFields(formGroup: FormGroup) {
         Object.keys(formGroup.controls).forEach(field => {
             const control = formGroup.get(field);
@@ -535,6 +398,7 @@ export class AddressComponent implements OnInit {
             }
         });
     }
+    
     ConvertMonthintoYear(e){
     
         let business_year = this.addressForm.controls.business_years.value;
@@ -557,13 +421,10 @@ export class AddressComponent implements OnInit {
       }
 
       inWords(e,i){ 
-          console.log(e);
-          console.log(i);
-        if(i != ''){
             this.premisesRentAmtInwords[i] = this._pd.convertNumberToWords(e.target.value);
-        }
-        else if(i == '' ){
-            this.rentAmtInwords = this._pd.convertNumberToWords(e.target.value);
-        }
+      }
+
+      inWordsForRent(e){
+        this.rentAmtInwords = this._pd.convertNumberToWords(e.target.value);
       }
 }
\ No newline at end of file

From 3b6117a0b2ccb3116b74ff8fde6c60e6b328d559 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Sun, 6 Jan 2019 17:09:22 +0530
Subject: [PATCH 21/29]  business label change and validation : ps

---
 .../business-info.component.html              |  69 ++++++++---
 .../business-info/business-info.component.ts  | 109 ++++++++++++++++++
 2 files changed, 164 insertions(+), 14 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
index 7ade2f1da..6f580abe2 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
@@ -342,7 +342,13 @@
                                                                             <div fxLayout="row nowrap"  *ngFor="let countryList of manufacturing.get('countries_where_export_done').controls; let c = index" [formGroupName]="c">
                                                                                     
                                                                                         <mat-form-field style="width:35%;">
-                                                                                                <input matInput placeholder="Countries Where The Export Is Being Done" formControlName="country_name" >
+                                                                                            {{country}}
+                                                                                                <!-- <input matInput placeholder="Countries Where The Export Is Being Done" formControlName="country_name" > -->
+                                                                                                <mat-select  placeholder="Countries Where The Export Is Being Done" formControlName="country_name">
+                                                                                                    <mat-option *ngFor="let CL of countryDataList" [value]="CL.state_id">
+                                                                                                        {{CL.state_name}}
+                                                                                                    </mat-option>                                                            
+                                                                                                </mat-select>
                                                                                             </mat-form-field>
                                                                                             <mat-form-field style="width:45%;">
                                                                                                     <input matInput placeholder="Approx % of Sale" formControlName="approx_sale" required>
@@ -419,7 +425,12 @@
                                                                                                 <mat-tab label="Export" formArrayName="countries_where_export_done">
                                                                                                         <div fxLayout="row nowrap" class="tab_class" *ngFor="let countryList of manufacturing.get('countries_where_export_done').controls; let c = index" [formGroupName]="c">
                                                                                                                 <mat-form-field style="width:35%;">
-                                                                                                                        <input matInput placeholder="Countries Where The Export Is Being Done" formControlName="country_name" >
+                                                                                                                        <!-- <input matInput placeholder="Countries Where The Export Is Being Done" formControlName="country_name" > -->
+                                                                                                                        <mat-select  placeholder="Countries Where The Export Is Being Done" formControlName="country_name">
+                                                                                                                            <mat-option *ngFor="let CL of countryDataList" [value]="CL.state_id">
+                                                                                                                                {{CL.state_name}}
+                                                                                                                            </mat-option>                                                            
+                                                                                                                        </mat-select>
                                                                                                                     </mat-form-field>
                                                                                                                     <mat-form-field style="width:45%;">
                                                                                                                             <input matInput placeholder="Approx % of Sale" formControlName="approx_sale" required>
@@ -446,8 +457,8 @@
                                                 </mat-card-content>
                                                 <mat-card-actions>
                                                         <mat-form-field style="width: 92%">
-                                                                <mat-label>Description of Manufacturing</mat-label>
-                                                                <textarea matInput placeholder="Description of Manufacturing" formControlName="description"></textarea>
+                                                                <mat-label>Description of Manufacturing Product</mat-label>
+                                                                <textarea matInput placeholder="Description of Manufacturing Product" formControlName="description"></textarea>
                                                               </mat-form-field>
                                                 </mat-card-actions>
                                             </mat-card>
@@ -537,7 +548,12 @@
                                                                             <div fxLayout="row nowrap"  *ngFor="let countryList of retail.get('countries_where_export_done').controls; let c = index" [formGroupName]="c">
                                                                                     
                                                                                         <mat-form-field style="width:35%;">
-                                                                                                <input matInput placeholder="Countries Where The Export Is Being Done" formControlName="country_name" >
+                                                                                                <!-- <input matInput placeholder="Countries Where The Export Is Being Done" formControlName="country_name" > -->
+                                                                                                <mat-select  placeholder="Countries Where The Export Is Being Done" formControlName="country_name">
+                                                                                                    <mat-option *ngFor="let CL of countryDataList" [value]="CL.state_id">
+                                                                                                        {{CL.state_name}}
+                                                                                                    </mat-option>                                                            
+                                                                                                </mat-select>
                                                                                             </mat-form-field>
                                                                                             <mat-form-field style="width:45%;">
                                                                                                     <input matInput placeholder="Approx % of Sale" formControlName="approx_sale" required>
@@ -616,7 +632,12 @@
                                                                             <mat-tab label="Export" formArrayName="countries_where_export_done">
                                                                                     <div fxLayout="row nowrap" class="tab_class" *ngFor="let countryList of retail.get('countries_where_export_done').controls; let c = index" [formGroupName]="c">
                                                                                             <mat-form-field style="width:35%;">
-                                                                                                    <input matInput placeholder="Countries Where The Export Is Being Done" formControlName="country_name" >
+                                                                                                    <!-- <input matInput placeholder="Countries Where The Export Is Being Done" formControlName="country_name" > -->
+                                                                                                    <mat-select  placeholder="Countries Where The Export Is Being Done" formControlName="country_name">
+                                                                                                        <mat-option *ngFor="let CL of countryDataList" [value]="CL.state_id">
+                                                                                                            {{CL.state_name}}
+                                                                                                        </mat-option>                                                            
+                                                                                                    </mat-select>
                                                                                                 </mat-form-field>
                                                                                                 <mat-form-field style="width:45%;">
                                                                                                         <input matInput placeholder="Approx % of Sale" formControlName="approx_sale" required>
@@ -644,8 +665,8 @@
                                                 </mat-card-content>
                                                 <mat-card-actions>
                                                         <mat-form-field style="width: 92%">
-                                                                <mat-label>Description of Retail Trading</mat-label>
-                                                                <textarea matInput placeholder="Description of Retail Trading" formControlName="description"></textarea>
+                                                                <mat-label>Description of Retail Trading Product</mat-label>
+                                                                <textarea matInput placeholder="Description of Retail Trading Product" formControlName="description"></textarea>
                                                               </mat-form-field>
                                                 </mat-card-actions>
                                             </mat-card>
@@ -736,7 +757,12 @@
                                                                             <div fxLayout="row nowrap"  *ngFor="let countryList of wholesale.get('countries_where_export_done').controls; let c = index" [formGroupName]="c">
                                                                                     
                                                                                         <mat-form-field style="width:35%;">
-                                                                                                <input matInput placeholder="Countries Where The Export Is Being Done" formControlName="country_name" >
+                                                                                                <!-- <input matInput placeholder="Countries Where The Export Is Being Done" formControlName="country_name" > -->
+                                                                                                <mat-select  placeholder="Countries Where The Export Is Being Done" formControlName="country_name">
+                                                                                                    <mat-option *ngFor="let CL of countryDataList" [value]="CL.state_id">
+                                                                                                        {{CL.state_name}}
+                                                                                                    </mat-option>                                                            
+                                                                                                </mat-select>
                                                                                             </mat-form-field>
                                                                                             <mat-form-field style="width:45%;">
                                                                                                     <input matInput placeholder="Approx % of Sale" formControlName="approx_sale" required>
@@ -813,7 +839,12 @@
                                                                             <mat-tab label="Export" formArrayName="countries_where_export_done">
                                                                                     <div fxLayout="row nowrap" class="tab_class" *ngFor="let countryList of wholesale.get('countries_where_export_done').controls; let c = index" [formGroupName]="c">
                                                                                             <mat-form-field style="width:35%;">
-                                                                                                    <input matInput placeholder="Countries Where The Export Is Being Done" formControlName="country_name" >
+                                                                                                    <!-- <input matInput placeholder="Countries Where The Export Is Being Done" formControlName="country_name" > -->
+                                                                                                    <mat-select  placeholder="Countries Where The Export Is Being Done" formControlName="country_name">
+                                                                                                        <mat-option *ngFor="let CL of countryDataList" [value]="CL.state_id">
+                                                                                                            {{CL.state_name}}
+                                                                                                        </mat-option>                                                            
+                                                                                                    </mat-select>
                                                                                                 </mat-form-field>
                                                                                                 <mat-form-field style="width:45%;">
                                                                                                         <input matInput placeholder="Approx % of Sale" formControlName="approx_sale" required>
@@ -841,8 +872,8 @@
                                                 </mat-card-content>
                                                 <mat-card-actions>
                                                         <mat-form-field style="width: 92%">
-                                                                <mat-label>Description of Wholesale Trade</mat-label>
-                                                                <textarea matInput placeholder="Description of Wholesale Trade" formControlName="description"></textarea>
+                                                                <mat-label>Description of Wholesale Trade Product</mat-label>
+                                                                <textarea matInput placeholder="Description of Wholesale Trade Product" formControlName="description"></textarea>
                                                               </mat-form-field>
                                                 </mat-card-actions>
                                             </mat-card>
@@ -933,7 +964,12 @@
                                                                             <div fxLayout="row nowrap"  *ngFor="let countryList of serviceprovider.get('countries_where_export_done').controls; let c = index" [formGroupName]="c">
                                                                                     
                                                                                         <mat-form-field style="width:35%;">
-                                                                                                <input matInput placeholder="Countries Where Services Are Being Exported" formControlName="country_name" >
+                                                                                                <!-- <input matInput placeholder="Countries Where Services Are Being Exported" formControlName="country_name" > -->
+                                                                                                <mat-select  placeholder="Countries Where The Export Is Being Done" formControlName="country_name">
+                                                                                                    <mat-option *ngFor="let CL of countryDataList" [value]="CL.state_id">
+                                                                                                        {{CL.state_name}}
+                                                                                                    </mat-option>                                                            
+                                                                                                </mat-select>
                                                                                             </mat-form-field>
                                                                                             <mat-form-field style="width:45%;">
                                                                                                     <input matInput placeholder="Approx % of Revenue From Service" formControlName="approx_sale" required>
@@ -1012,7 +1048,12 @@
                                                                             <mat-tab label="Export" formArrayName="countries_where_export_done">
                                                                                     <div fxLayout="row nowrap" class="tab_class" *ngFor="let countryList of serviceprovider.get('countries_where_export_done').controls; let c = index" [formGroupName]="c">
                                                                                             <mat-form-field style="width:35%;">
-                                                                                                    <input matInput placeholder="Countries Where Services Are Being Exported" formControlName="country_name" >
+                                                                                                    <!-- <input matInput placeholder="Countries Where Services Are Being Exported" formControlName="country_name" > -->
+                                                                                                    <mat-select  placeholder="Countries Where The Export Is Being Done" formControlName="country_name">
+                                                                                                        <mat-option *ngFor="let CL of countryDataList" [value]="CL.state_id">
+                                                                                                            {{CL.state_name}}
+                                                                                                        </mat-option>                                                            
+                                                                                                    </mat-select>
                                                                                                 </mat-form-field>
                                                                                                 <mat-form-field style="width:45%;">
                                                                                                         <input matInput placeholder="Approx % of Revenue From Service" formControlName="approx_sale" required>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
index 3b57ff65a..40851a41a 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
@@ -41,6 +41,7 @@ export class BusinessInfoComponent implements OnInit {
     //industryData: any = [];
     activityData: any = [];
     stateList: any = [];
+    countryDataList : any = [];
     relativeNames: any;
     applicants: any;
     public businessForm: FormGroup;
@@ -96,6 +97,7 @@ export class BusinessInfoComponent implements OnInit {
         //this.getIndustry();
         this.getActivity();
         this.getStateCityList();
+        this.getCountryDataList();
         this.initBusinessForm();
         this.getCompanyRelation();
         this.getCompanyListForBusiness();
@@ -1106,6 +1108,17 @@ export class BusinessInfoComponent implements OnInit {
       });
         }
 
+        getCountryDataList(){
+            let master_name = 'STATE';
+            this._pd.getAllMasterDatas(master_name).subscribe(data => {
+                data.records.forEach(val => {
+                    if (val.isactive == 1) {
+                        this.countryDataList.push(val);
+                    }
+                })
+            }); 
+        }
+
     // add and create person with relationship details
     createPersonRelationhip(details: any):FormGroup {
         return this.fb.group({
@@ -1198,13 +1211,108 @@ export class BusinessInfoComponent implements OnInit {
         }
 
     }
+
+    /**
+     * This Function For validate For Appx. sale based on Type OF Activities
+     */
+    validateAppxSales(records){
+        
+        console.log(records.manufacturing_activity_details.length);
+
+        //this Variable For Validation
+        let validationFlag : number = 0;
+
+        //type 1: Checking manufacturing_activity_details 
+        if(records.manufacturing_activity_details.length > 0){
+
+            records.manufacturing_activity_details.forEach((val,index) => {
+                
+                let ManufacturingArray = Object.keys(val.countries_where_export_done).map(function (key) {
+                    return val.countries_where_export_done[key];
+                });
+                let total = ManufacturingArray.reduce((sum, item) => sum + +item.approx_sale, 0);
+                if(total > 100 || total < 100){
+                    validationFlag++;
+                }
+
+            });
+            
+        }
+
+        //type 3 checking wholesale_trading_activity_details
+        if(records.wholesale_trading_activity_details.length > 0){
+
+            records.wholesale_trading_activity_details.forEach((val,index) => {
+                
+                let WholesaleTradingArray = Object.keys(val.countries_where_export_done).map(function (key) {
+                    return val.countries_where_export_done[key];
+                });
+                let total = WholesaleTradingArray.reduce((sum, item) => sum + +item.approx_sale, 0);
+                if(total > 100 || total < 100){
+                    validationFlag++;
+                }
+
+            });
+            
+        }
+
+        //type 2 checking retail_trading_activity_details
+        if(records.retail_trading_activity_details.length > 0){
+
+            records.retail_trading_activity_details.forEach((val,index) => {
+                
+                let RetailTradingArray = Object.keys(val.countries_where_export_done).map(function (key) {
+                    return val.countries_where_export_done[key];
+                });
+                let total = RetailTradingArray.reduce((sum, item) => sum + +item.approx_sale, 0);
+                if(total > 100 || total < 100){
+                    validationFlag++;
+                }
+
+            });
+            
+        }
+
+
+        //type 4 checking service_provider_activity_details
+        if(records.service_provider_activity_details.length > 0){
+
+            records.service_provider_activity_details.forEach((val,index) => {
+                
+                let ServiceProviderArray = Object.keys(val.countries_where_export_done).map(function (key) {
+                    return val.countries_where_export_done[key];
+                });
+                let total = ServiceProviderArray.reduce((sum, item) => sum + +item.approx_sale, 0);
+                if(total > 100 || total < 100){
+                    validationFlag++;
+                }
+
+            });
+            
+        }
+
+        //validationFlag is greater then 0 means its display the notifer as warning
+        if(validationFlag > 0){
+            this.notifier.notify('warning',"Approximate sales doesn't add upto 100%");
+            return;
+        }
+
+    }
+
     submitDetails() {
        // let family: any = [];
+       //console.log(this.businessForm.value);
+       
         if (!this.businessForm.valid) {
+            //console.log(' Requried validation error');
              return;
         }
        // let design: any;
         let records = this.businessForm.value;
+        
+        //to check the Appx. sale validation.
+        this.validateAppxSales(records);
+        
         if (records.other_documents == 'no') {
             delete records.documents;
         }
@@ -1269,6 +1377,7 @@ export class BusinessInfoComponent implements OnInit {
 
   // filter max sale options
   filterMaxSaleState(datasource: any,filterValues:any){
+      console.log('filterMaxSaleState',filterValues);
       if(filterValues){
         let getOriginalStateList = datasource.map(dval => dval.state_id);
         let getStateValues = filterValues.filter(val =>val.state_name).map(mapVal => mapVal.state_name);

From 88d6675c6001fd9ecaf9fdc83c8c9a26ab114c4b Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Sun, 6 Jan 2019 19:37:54 +0530
Subject: [PATCH 22/29] business : ps

---
 .../business-info.component.html              |  32 ++---
 .../business-info/business-info.component.ts  | 116 +++++++++++++++---
 2 files changed, 115 insertions(+), 33 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
index 6f580abe2..1e2149147 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
@@ -345,8 +345,8 @@
                                                                                             {{country}}
                                                                                                 <!-- <input matInput placeholder="Countries Where The Export Is Being Done" formControlName="country_name" > -->
                                                                                                 <mat-select  placeholder="Countries Where The Export Is Being Done" formControlName="country_name">
-                                                                                                    <mat-option *ngFor="let CL of countryDataList" [value]="CL.state_id">
-                                                                                                        {{CL.state_name}}
+                                                                                                    <mat-option *ngFor="let CL of countryDataList" [value]="CL.country_id">
+                                                                                                        {{CL.country_name}}
                                                                                                     </mat-option>                                                            
                                                                                                 </mat-select>
                                                                                             </mat-form-field>
@@ -427,8 +427,8 @@
                                                                                                                 <mat-form-field style="width:35%;">
                                                                                                                         <!-- <input matInput placeholder="Countries Where The Export Is Being Done" formControlName="country_name" > -->
                                                                                                                         <mat-select  placeholder="Countries Where The Export Is Being Done" formControlName="country_name">
-                                                                                                                            <mat-option *ngFor="let CL of countryDataList" [value]="CL.state_id">
-                                                                                                                                {{CL.state_name}}
+                                                                                                                            <mat-option *ngFor="let CL of countryDataList" [value]="CL.country_id">
+                                                                                                                                {{CL.country_name}}
                                                                                                                             </mat-option>                                                            
                                                                                                                         </mat-select>
                                                                                                                     </mat-form-field>
@@ -550,8 +550,8 @@
                                                                                         <mat-form-field style="width:35%;">
                                                                                                 <!-- <input matInput placeholder="Countries Where The Export Is Being Done" formControlName="country_name" > -->
                                                                                                 <mat-select  placeholder="Countries Where The Export Is Being Done" formControlName="country_name">
-                                                                                                    <mat-option *ngFor="let CL of countryDataList" [value]="CL.state_id">
-                                                                                                        {{CL.state_name}}
+                                                                                                    <mat-option *ngFor="let CL of countryDataList" [value]="CL.country_id">
+                                                                                                        {{CL.country_name}}
                                                                                                     </mat-option>                                                            
                                                                                                 </mat-select>
                                                                                             </mat-form-field>
@@ -634,8 +634,8 @@
                                                                                             <mat-form-field style="width:35%;">
                                                                                                     <!-- <input matInput placeholder="Countries Where The Export Is Being Done" formControlName="country_name" > -->
                                                                                                     <mat-select  placeholder="Countries Where The Export Is Being Done" formControlName="country_name">
-                                                                                                        <mat-option *ngFor="let CL of countryDataList" [value]="CL.state_id">
-                                                                                                            {{CL.state_name}}
+                                                                                                        <mat-option *ngFor="let CL of countryDataList" [value]="CL.country_id">
+                                                                                                            {{CL.country_name}}
                                                                                                         </mat-option>                                                            
                                                                                                     </mat-select>
                                                                                                 </mat-form-field>
@@ -759,8 +759,8 @@
                                                                                         <mat-form-field style="width:35%;">
                                                                                                 <!-- <input matInput placeholder="Countries Where The Export Is Being Done" formControlName="country_name" > -->
                                                                                                 <mat-select  placeholder="Countries Where The Export Is Being Done" formControlName="country_name">
-                                                                                                    <mat-option *ngFor="let CL of countryDataList" [value]="CL.state_id">
-                                                                                                        {{CL.state_name}}
+                                                                                                    <mat-option *ngFor="let CL of countryDataList" [value]="CL.country_id">
+                                                                                                        {{CL.country_name}}
                                                                                                     </mat-option>                                                            
                                                                                                 </mat-select>
                                                                                             </mat-form-field>
@@ -841,8 +841,8 @@
                                                                                             <mat-form-field style="width:35%;">
                                                                                                     <!-- <input matInput placeholder="Countries Where The Export Is Being Done" formControlName="country_name" > -->
                                                                                                     <mat-select  placeholder="Countries Where The Export Is Being Done" formControlName="country_name">
-                                                                                                        <mat-option *ngFor="let CL of countryDataList" [value]="CL.state_id">
-                                                                                                            {{CL.state_name}}
+                                                                                                        <mat-option *ngFor="let CL of countryDataList" [value]="CL.country_id">
+                                                                                                            {{CL.country_name}}
                                                                                                         </mat-option>                                                            
                                                                                                     </mat-select>
                                                                                                 </mat-form-field>
@@ -966,8 +966,8 @@
                                                                                         <mat-form-field style="width:35%;">
                                                                                                 <!-- <input matInput placeholder="Countries Where Services Are Being Exported" formControlName="country_name" > -->
                                                                                                 <mat-select  placeholder="Countries Where The Export Is Being Done" formControlName="country_name">
-                                                                                                    <mat-option *ngFor="let CL of countryDataList" [value]="CL.state_id">
-                                                                                                        {{CL.state_name}}
+                                                                                                    <mat-option *ngFor="let CL of countryDataList" [value]="CL.country_id">
+                                                                                                        {{CL.country_name}}
                                                                                                     </mat-option>                                                            
                                                                                                 </mat-select>
                                                                                             </mat-form-field>
@@ -1050,8 +1050,8 @@
                                                                                             <mat-form-field style="width:35%;">
                                                                                                     <!-- <input matInput placeholder="Countries Where Services Are Being Exported" formControlName="country_name" > -->
                                                                                                     <mat-select  placeholder="Countries Where The Export Is Being Done" formControlName="country_name">
-                                                                                                        <mat-option *ngFor="let CL of countryDataList" [value]="CL.state_id">
-                                                                                                            {{CL.state_name}}
+                                                                                                        <mat-option *ngFor="let CL of countryDataList" [value]="CL.country_id">
+                                                                                                            {{CL.country_name}}
                                                                                                         </mat-option>                                                            
                                                                                                     </mat-select>
                                                                                                 </mat-form-field>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
index 40851a41a..706e33840 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
@@ -41,7 +41,67 @@ export class BusinessInfoComponent implements OnInit {
     //industryData: any = [];
     activityData: any = [];
     stateList: any = [];
-    countryDataList : any = [];
+    // countryDataList : any = [];
+
+     // let datas = {
+      
+    countryDataList : any = [
+          {
+            "country_id": 1,
+            "country_name": "India"
+          },
+          {
+            "country_id": 2,
+            "country_name": "China"
+          },
+          {
+            "country_id": 3,
+            "country_name": "U.S.A"
+          },{
+            "country_id": 5,
+            "country_name": "Afghanistan"
+        },{
+            "country_id": 6,
+            "country_name": "Albania	"
+        },{
+            "country_id": 7,
+            "country_name": "Algeria	"
+        },{
+            "country_id": 8,
+            "country_name": "Andorra	"
+        },{
+            "country_id": 8,
+            "country_name": "Angola	"
+        },{
+            "country_id": 9,
+            "country_name": "Antigua "
+        },{
+            "country_id": 10,
+            "country_name": "Argentina"	
+        },{
+            "country_id": 11,
+            "country_name": "Armenia	"
+        },{
+            "country_id": 12,
+            "country_name": "Australia	"
+        },{
+            "country_id": 13,
+            "country_name": "Austria	"
+        },{
+            "country_id": 14,
+            "country_name": "Azerbaijan"	
+        },{
+            "country_id": 15,
+            "country_name": "Bahamas	"
+        },{
+            "country_id": 16,
+            "country_name": "Bahrain	"
+        },{
+            "country_id": 4,
+            "country_name":"Bangladesh"}
+        ];
+      
+
     relativeNames: any;
     applicants: any;
     public businessForm: FormGroup;
@@ -49,6 +109,7 @@ export class BusinessInfoComponent implements OnInit {
     existCompanyList: any = [];
    // businessEntityTypeList: any=["Private Limited Company","Proprietorship","Partnership","Limited Liability Partnership (LLP)","One Person Company (OPC)","Hindu Undivided Family (HUF)","Society","Cooperative","Trust","Public Ltd Company","Others"]
    businessEntityTypeList: any =[]; 
+   filterCityList : any = [];
    // this is for automatic bind entitity name for display 
     //sourceNames: any = {"Private Limited Company": 'Director / Shareholder Details',"Proprietorship": 'Proprietor Details', "Sole Proprietorship": 'Proprietor Details',"Partnership": 'Partner Details',"Limited Liability Partnership (LLP)": 'Partner Details',"One Person Company (OPC)": 'Director Details',"Hindu Undivided Family (HUF)": 'Karta Details',"Society": 'Member Details',"Cooperative": 'Member Details',"Trust": 'Trustee Details',"Public Ltd Company": 'Director / Shareholder Details','Individual':'Self',"Others": 'Other Enitity Details'};
     sourceNames: {[k: string]: any} = {};
@@ -97,7 +158,7 @@ export class BusinessInfoComponent implements OnInit {
         //this.getIndustry();
         this.getActivity();
         this.getStateCityList();
-        this.getCountryDataList();
+        //this.getCountryDataList();
         this.initBusinessForm();
         this.getCompanyRelation();
         this.getCompanyListForBusiness();
@@ -1108,16 +1169,16 @@ export class BusinessInfoComponent implements OnInit {
       });
         }
 
-        getCountryDataList(){
-            let master_name = 'STATE';
-            this._pd.getAllMasterDatas(master_name).subscribe(data => {
-                data.records.forEach(val => {
-                    if (val.isactive == 1) {
-                        this.countryDataList.push(val);
-                    }
-                })
-            }); 
-        }
+        // getCountryDataList(){
+        //     let master_name = 'STATE';
+        //     this._pd.getAllMasterDatas(master_name).subscribe(data => {
+        //         data.records.forEach(val => {
+        //             if (val.isactive == 1) {
+        //                 this.countryDataList.push(val);
+        //             }
+        //         })
+        //     }); 
+        // }
 
     // add and create person with relationship details
     createPersonRelationhip(details: any):FormGroup {
@@ -1217,7 +1278,7 @@ export class BusinessInfoComponent implements OnInit {
      */
     validateAppxSales(records){
         
-        console.log(records.manufacturing_activity_details.length);
+        //console.log(records.manufacturing_activity_details.length);
 
         //this Variable For Validation
         let validationFlag : number = 0;
@@ -1377,7 +1438,7 @@ export class BusinessInfoComponent implements OnInit {
 
   // filter max sale options
   filterMaxSaleState(datasource: any,filterValues:any){
-      console.log('filterMaxSaleState',filterValues);
+    this.filterCityList = filterValues;
       if(filterValues){
         let getOriginalStateList = datasource.map(dval => dval.state_id);
         let getStateValues = filterValues.filter(val =>val.state_name).map(mapVal => mapVal.state_name);
@@ -1389,15 +1450,36 @@ export class BusinessInfoComponent implements OnInit {
         return setStateFilter.length > 0 ? setStateFilter : [];
       }
   }
-  // filter max sale cities options
-  filterMaxSaleCities(datasource: any,filterValues:any) {
+
+  filterMaxSaleCities(datasource: any,filterValues:any) {  
+     // console.log(datasource);
       if(filterValues){
-        let getOriginalStateList = datasource.map(dval => dval.state_id);
+        let getOriginalStateList = datasource.map(dval => dval.state_id);//only stateid have this
         let setCityFilter = filterValues.map(x => {
              let findIndex = getOriginalStateList.indexOf(x);
              findIndex = datasource[findIndex].cities;
              return findIndex;
         });
+
+         //console.log(this.filterCityList);
+         //let temp = this.filterCityList.filter(val =>val.city_name).map(mapVal => mapVal.city_name)
+         //console.log('temp',temp);
+         let getFilteredCityValues = [].concat.apply([],this.filterCityList.filter(val =>val.city_name).map(mapVal => mapVal.city_name));
+
+        //  console.log('asd',getFilteredCityValues);
+        //  console.log(setCityFilter);
+
+        //  let setStateFilter2: any=[];
+        //  setStateFilter2 = getFilteredCityValues.map(x => {
+        //         let findIndex = setCityFilter.indexOf(x);
+        //         return datasource[findIndex];
+        // });
+//        console.log(setStateFilter2);
+        //  let setCityFilter2 = getFilteredCityValues.filter(
+        //     d => d == setCityFilter.city_id);
+        // console.log(setCityFilter2);
+        // console.log(this.filterCityList.city_name);
+        
         let merged = [].concat.apply([], setCityFilter);
         return merged.length > 0 ? merged : [];
       }

From 7447c9eb4cf28eeed4c7918d355a7c94df502b69 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Sun, 6 Jan 2019 22:06:11 +0530
Subject: [PATCH 23/29] country dropdown : ps

---
 .../business-info/business-info.component.ts  | 89 ++++---------------
 1 file changed, 15 insertions(+), 74 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
index 706e33840..86cf842cf 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
@@ -41,66 +41,7 @@ export class BusinessInfoComponent implements OnInit {
     //industryData: any = [];
     activityData: any = [];
     stateList: any = [];
-    // countryDataList : any = [];
-
-     // let datas = {
-      
-    countryDataList : any = [
-          {
-            "country_id": 1,
-            "country_name": "India"
-          },
-          {
-            "country_id": 2,
-            "country_name": "China"
-          },
-          {
-            "country_id": 3,
-            "country_name": "U.S.A"
-          },{
-            "country_id": 5,
-            "country_name": "Afghanistan"
-        },{
-            "country_id": 6,
-            "country_name": "Albania	"
-        },{
-            "country_id": 7,
-            "country_name": "Algeria	"
-        },{
-            "country_id": 8,
-            "country_name": "Andorra	"
-        },{
-            "country_id": 8,
-            "country_name": "Angola	"
-        },{
-            "country_id": 9,
-            "country_name": "Antigua "
-        },{
-            "country_id": 10,
-            "country_name": "Argentina"	
-        },{
-            "country_id": 11,
-            "country_name": "Armenia	"
-        },{
-            "country_id": 12,
-            "country_name": "Australia	"
-        },{
-            "country_id": 13,
-            "country_name": "Austria	"
-        },{
-            "country_id": 14,
-            "country_name": "Azerbaijan"	
-        },{
-            "country_id": 15,
-            "country_name": "Bahamas	"
-        },{
-            "country_id": 16,
-            "country_name": "Bahrain	"
-        },{
-            "country_id": 4,
-            "country_name":"Bangladesh"}
-        ];
-      
+    countryDataList : any = [];  
 
     relativeNames: any;
     applicants: any;
@@ -158,7 +99,7 @@ export class BusinessInfoComponent implements OnInit {
         //this.getIndustry();
         this.getActivity();
         this.getStateCityList();
-        //this.getCountryDataList();
+        this.getCountryDataList();
         this.initBusinessForm();
         this.getCompanyRelation();
         this.getCompanyListForBusiness();
@@ -1169,16 +1110,16 @@ export class BusinessInfoComponent implements OnInit {
       });
         }
 
-        // getCountryDataList(){
-        //     let master_name = 'STATE';
-        //     this._pd.getAllMasterDatas(master_name).subscribe(data => {
-        //         data.records.forEach(val => {
-        //             if (val.isactive == 1) {
-        //                 this.countryDataList.push(val);
-        //             }
-        //         })
-        //     }); 
-        // }
+        getCountryDataList(){
+            let master_name = 'COUNTRY';
+            this._pd.getAllMasterDatas(master_name).subscribe(data => {
+                data.records.forEach(val => {
+                    if (val.isactive == 1) {
+                        this.countryDataList.push(val);
+                    }
+                })
+            }); 
+        }
 
     // add and create person with relationship details
     createPersonRelationhip(details: any):FormGroup {
@@ -1452,7 +1393,7 @@ export class BusinessInfoComponent implements OnInit {
   }
 
   filterMaxSaleCities(datasource: any,filterValues:any) {  
-     // console.log(datasource);
+    //   console.log(datasource);
       if(filterValues){
         let getOriginalStateList = datasource.map(dval => dval.state_id);//only stateid have this
         let setCityFilter = filterValues.map(x => {
@@ -1472,9 +1413,9 @@ export class BusinessInfoComponent implements OnInit {
         //  let setStateFilter2: any=[];
         //  setStateFilter2 = getFilteredCityValues.map(x => {
         //         let findIndex = setCityFilter.indexOf(x);
-        //         return datasource[findIndex];
+        //         return datasource[findIndex].cities;
         // });
-//        console.log(setStateFilter2);
+        // console.log(setStateFilter2);
         //  let setCityFilter2 = getFilteredCityValues.filter(
         //     d => d == setCityFilter.city_id);
         // console.log(setCityFilter2);

From ea560e7d85e96d31bc7512b763236f72b423e52d Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Mon, 7 Jan 2019 12:03:29 +0530
Subject: [PATCH 24/29] UI changes

---
 .../list-pd/view-pd/view-pd.component.html    | 106 +++++++++---------
 1 file changed, 52 insertions(+), 54 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
index ff83913e9..8acb7c867 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
@@ -3,11 +3,11 @@
    <mat-card-content>
       <mat-card class="p-2 mb-2" style="height: 370px !important;">
          <div fxLayout="row" fxLayoutWrap="wrap" class="mb-3">
-            <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="25" fxFlex.xl="25" class="profile-center" style="text-align:center;">
+            <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="60" fxFlex.lg="30" fxFlex.xl="30" class="profile-center" style="text-align:center;">
                <!--<div class="mb-1">
                   <img src="assets/images/userpic.jpg" width="100" height="100" alt="" class="radius-circle">
                </div>-->
-               <mat-card style="padding: 15px;box-shadow: 0 5px 11px 0 rgba(0,0,0,.18), 0 4px 15px 0 rgba(0,0,0,.15) !important;">
+               <mat-card style="padding: 15px;height: 290px;width: 280px;box-shadow: 0 5px 11px 0 rgba(0,0,0,.18), 0 4px 15px 0 rgba(0,0,0,.15) !important;">
                 <div  *ngFor="let master of pdMasterData" class="ml-xs mr-xs">
                 <h4 class="ma-0">{{master.lender_short_name}}</h4>
                 <small>{{master.branch_name}}</small>
@@ -15,15 +15,18 @@
                 <small> {{master.lender_applicant_id}}</small> <br>
                 <small>{{master.pd_date_of_initiation}}</small><br>
                 <br>
-                <button mat-raised-button  color="primary">
+                <button #no_btn mat-raised-button  color="primary">
                 <span *ngIf="master.pd_status==pdStatusCheck.SCHEDULED" style="text-align:left">{{master.pd_status | titlecase}}</span>
                 <span *ngIf="master.pd_status!=pdStatusCheck.SCHEDULED && master.pd_status!=pdStatusCheck.QC_COMPLETED " style="text-align:left">{{master.pd_status | titlecase}}</span>
                 <span *ngIf="master.pd_status==pdStatusCheck.QC_COMPLETED " style="text-align:left">QC Completed</span>
-                </button><br>
-                <small *ngIf="master.pd_status==pdStatusCheck.SCHEDULED">{{master.scheduled_on}}</small>
+                </button>&nbsp;&nbsp;
+                 <button *ngIf="master.pd_type_name && currentPDStatus==pdStatusCheck.DRAFT" mat-raised-button  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Trigger" matTooltipPosition="above" (click)="editPdMaster(master)"><mat-icon>save</mat-icon></button>
+                 <br>
                 <small *ngIf="master.pd_allocated_to && master.fk_pd_type==1" style="text-align:left" matTooltip="PD Officer" matTooltipPosition="above">{{master.pd_allocated_to | titlecase}}</small>
                 <small *ngIf="master.executive_name && master.centralofficer && master.fk_pd_type==2" style="text-align:left" matTooltip="PD Officer" matTooltipPosition="above">{{master.executive_name | titlecase}}/{{master.centralofficer | titlecase}}</small> 
-                <small *ngIf="master.centralofficer && master.fk_pd_type==3" style="text-align:left" matTooltip="PD Officer" matTooltipPosition="above">{{master.centralofficer | titlecase}}</small>   
+                <small *ngIf="master.centralofficer && master.fk_pd_type==3" style="text-align:left" matTooltip="PD Officer" matTooltipPosition="above">{{master.centralofficer | titlecase}}<br></small>  
+                
+                <small *ngIf="master.pd_status==pdStatusCheck.SCHEDULED">{{master.scheduled_on}}</small> 
                
                 </div>
               </div> 
@@ -34,14 +37,12 @@
                <a href="javascript:;" class="block mt-xs mb-xs">www.example.com</a>
                <button mat-raised-button color="primary">Edit Profile</button>-->
             </div>
-            <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="75" fxFlex.xl="75" class="content-data">
+            <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="70" fxFlex.xl="70" class="content-data">
                <figure>
                   <mat-card-content style="padding:0px !important;">                      
                      <div *ngFor="let master of pdMasterData" class="ml-xs mr-xs">
                      <div fxLayout="row">  
-                        <div fxFlex="100" style="text-align: right;">
-                                                        <button *ngIf="master.pd_type_name && currentPDStatus==pdStatusCheck.DRAFT" mat-raised-button  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Trigger" matTooltipPosition="above" (click)="editPdMaster(master)"><mat-icon>save</mat-icon></button>
-
+                        <div fxFlex="100" style="text-align: right;">                             
                               <button  *ngIf="master.pd_type_name && currentPDStatus!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.COMPLETED && currentPDStatus!=pdStatusCheck.QC_COMPLETED" mat-raised-button  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate" matTooltipPosition="above" (click)="pdAllocationTo(master)"><mat-icon>verified_user</mat-icon></button>
                               <button *ngIf="master.pd_type_name && currentPDStatus!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.COMPLETED && currentPDStatus!=pdStatusCheck.QC_COMPLETED" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Schedule" matTooltipPosition="above" (click)="scheduleDetails(master)"><mat-icon>schedule</mat-icon></button>
                               <button *ngIf="master.pd_type_name && currentPDStatus!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.TRIGGERED && currentPDStatus!=pdStatusCheck.DRAFT && enableStartPD" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Discussion" matTooltipPosition="above" (click)="getPDStart(viewID)"><mat-icon>question_answer</mat-icon></button>
@@ -68,12 +69,22 @@
                         </div>
                          <div fxLayout="row">
                           <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100" class="profile-center">
-                           <span *ngIf="master.loan_amount"><i class="fa-1x fa fa-rupee" style="width: 37px;padding: 8px 9px 8px 9px;border-bottom: 2px solid red;"></i>&nbsp; {{master.loan_amount}}</span>
+                            <div fxFlex="10">
+                              <span><i class="fa-1x fa fa-rupee" style="width: 37px;padding: 8px 9px 8px 9px;border-bottom: 2px solid red;"></i></span>
+                            </div>
+                            <div fxFlex="90">
+                           <span *ngIf="master.loan_amount"> {{master.loan_amount}}</span>
+                            </div>
                           </div>
                         </div>
                          <div fxLayout="row">
                           <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100" class="profile-center">
-                          <span *ngIf="master.pd_type_name"><i class="fa-1x fa fa-check-circle" style="width: 37px;padding: 8px 9px 8px 9px;border-bottom: 2px solid red;"></i>&nbsp; {{master.pd_type_name}}</span>
+                            <div fxFlex="10">
+                              <span><i class="fa-1x fa fa-check-circle" style="width: 37px;padding: 8px 9px 8px 9px;border-bottom: 2px solid red;"></i></span>
+                            </div>
+                            <div fxFlex="90">
+                              <span *ngIf="master.pd_type_name"> {{master.pd_type_name}}</span>
+                            </div>
                           </div>
                         </div>
                           <div fxLayout="row">
@@ -82,7 +93,7 @@
                                    <span><i class="fa-1x fa fa-map-marker" style="width: 37px;padding: 8px 9px 8px 9px;border-bottom: 2px solid red;"></i></span>
                                  </div> 
                                  <div fxFlex="90">                        
-                              <span *ngIf="master.state_name" class="hover-icon"> {{master.addressline1}}, {{master.city_name}},<br>{{master.state_name}}-{{master.pincode}} </span>
+                              <span *ngIf="master.state_name" class="hover-icon"> {{master.addressline1}},<br> {{master.city_name}},<br>{{master.state_name}}-{{master.pincode}} </span>
                                  </div>
                             </div>
                           </div>    
@@ -132,8 +143,7 @@
          <h4>PD Details</h4>
          <mat-tab-group class="mt-2">
             <mat-tab>
-               <ng-template mat-tab-label>Applicants</ng-template>
-                  <mat-card>
+               <ng-template mat-tab-label>Applicants</ng-template> 
               <div class="cardEdit" *ngIf="currentPDStatus==pdStatusCheck.DRAFT || currentPDStatus==pdStatusCheck.TRIGGERED || currentPDStatus==pdStatusCheck.ALLOCATED || currentPDStatus==pdStatusCheck.SCHEDULED">
                 <button mat-raised-button mat-button-sm mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="editPdApplicant(pdApplicantData)"><mat-icon>edit</mat-icon></button>
               </div>
@@ -166,12 +176,10 @@
                 <mat-card-content>
                   <p>No Applicant</p>
                 </mat-card-content>
-              </ng-template>
-            </mat-card>
+              </ng-template> 
             </mat-tab>
             <mat-tab>
-               <ng-template mat-tab-label>Additional Requirements</ng-template>
-                 <mat-card>
+               <ng-template mat-tab-label>Additional Requirements</ng-template> 
                 <div class="cardEdit" *ngIf="currentPDStatus==pdStatusCheck.DRAFT || currentPDStatus==pdStatusCheck.TRIGGERED || currentPDStatus==pdStatusCheck.ALLOCATED || currentPDStatus==pdStatusCheck.SCHEDULED">
                 <button mat-raised-button mat-button-sm mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="editAdditionalRequirement(pdAdditionalReqData)"><mat-icon>edit</mat-icon></button>
               </div>             
@@ -189,8 +197,7 @@
                 <mat-card-content>
                   <p>No Additional Requirements</p>
                 </mat-card-content>
-              </ng-template>
-            </mat-card>
+              </ng-template> 
             </mat-tab>
             <mat-tab>
                <ng-template mat-tab-label>Documents</ng-template>
@@ -203,51 +210,25 @@
                 </mat-list-item>
               </mat-list>
                </div>
-            <ng-template #nodocument>
-              <mat-card>
+            <ng-template #nodocument> 
                 <mat-card-content>
                   <p>No Document</p>
-                </mat-card-content>
-              </mat-card>
+                </mat-card-content> 
             </ng-template>               
-            </mat-tab>
-            <mat-tab>
-               <ng-template mat-tab-label>PD History</ng-template>
-               <div *ngIf="masterPdLogsData.length>0; else nohistory">
-                <mat-list class="m-gap p-gap" *ngFor="let master of masterPdLogsData">
-                <mat-list-item>
-                  <span style="font-size:15px;"><span style="color:#908f8f">{{master.time}}</span> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                  <span style="color:#908f8f"> <i> {{master.user}} </i>  </span><br> <span>{{master.log}}</span> </span>
-
-                </mat-list-item>
-
-              </mat-list>
-                   </div>
-            <ng-template #nohistory>
-              <mat-card>
-                <mat-card-content>
-                  <p>No History</p>
-                </mat-card-content>
-              </mat-card>
-            </ng-template>
             </mat-tab>
              <mat-tab>
-               <ng-template mat-tab-label>QC Notes</ng-template>
-                 <mat-card>
+               <ng-template mat-tab-label>QC Notes</ng-template> 
               <div style="color:red !important;">
                 <h6>QC Notes</h6>
               </div>
               <p>
-                {{ pdMasterData[0]?.qc_remarks}}</p>
-
-            </mat-card>
+                {{ pdMasterData[0]?.qc_remarks}}</p> 
      
             </mat-tab>
              <mat-tab>
                <ng-template mat-tab-label>QC Remarks</ng-template>
                     <div *ngIf="pdMasterData[0]?.pd_status === 'QC_COMPLETED'" class="m-gap p-gap" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100"
-            fxFlex.lg="100" fxFlex.xl="100">
-            <mat-card>
+            fxFlex.lg="100" fxFlex.xl="100"> 
               <div style="color:red !important;">
                 <h6>QC Remarks</h6>
               </div>
@@ -264,10 +245,27 @@
               <br>
               <div style="display: inline-block;">
                 {{ pdMasterData[0]?.qc_feedback}}
-              </div>
-            </mat-card>
+              </div> 
           </div> 
             </mat-tab>
+              <mat-tab>
+               <ng-template mat-tab-label>PD History</ng-template>
+               <div *ngIf="masterPdLogsData.length>0; else nohistory">
+                <mat-list class="m-gap p-gap" *ngFor="let master of masterPdLogsData">
+                <mat-list-item>
+                  <span style="font-size:15px;"><span style="color:#908f8f">{{master.time}}&nbsp;</span>
+                  <span style="color:#908f8f"> <i> {{master.user}} </i>  </span><br> <span>{{master.log}}</span> </span>
+
+                </mat-list-item>
+
+              </mat-list>
+                   </div>
+            <ng-template #nohistory> 
+                <mat-card-content>
+                  <p>No History</p>
+                </mat-card-content> 
+            </ng-template>
+            </mat-tab>
          </mat-tab-group>
       </mat-card>
    </mat-card-content>

From ec314c86d33f1be56c4397b9f3adca53680de4af Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Mon, 7 Jan 2019 12:07:09 +0530
Subject: [PATCH 25/29] UI changes

---
 .../manage-pd/list-pd/view-pd/view-pd.component.html            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
index 8acb7c867..444ea4dba 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
@@ -15,7 +15,7 @@
                 <small> {{master.lender_applicant_id}}</small> <br>
                 <small>{{master.pd_date_of_initiation}}</small><br>
                 <br>
-                <button #no_btn mat-raised-button  color="primary">
+                <button mat-raised-button  color="primary">
                 <span *ngIf="master.pd_status==pdStatusCheck.SCHEDULED" style="text-align:left">{{master.pd_status | titlecase}}</span>
                 <span *ngIf="master.pd_status!=pdStatusCheck.SCHEDULED && master.pd_status!=pdStatusCheck.QC_COMPLETED " style="text-align:left">{{master.pd_status | titlecase}}</span>
                 <span *ngIf="master.pd_status==pdStatusCheck.QC_COMPLETED " style="text-align:left">QC Completed</span>

From 30b9b6fa324639a08f3e576684308922ffef1f90 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Mon, 7 Jan 2019 12:13:34 +0530
Subject: [PATCH 26/29] business : ps

---
 .../business-info/business-info.component.ts  | 214 +++++++++---------
 1 file changed, 112 insertions(+), 102 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
index 86cf842cf..e3b18498e 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
@@ -1217,93 +1217,18 @@ export class BusinessInfoComponent implements OnInit {
     /**
      * This Function For validate For Appx. sale based on Type OF Activities
      */
-    validateAppxSales(records){
+    // validateAppxSales(records){
         
-        //console.log(records.manufacturing_activity_details.length);
+    //     //console.log(records.manufacturing_activity_details.length);
 
-        //this Variable For Validation
-        let validationFlag : number = 0;
+    //     //this Variable For Validation
+        
 
-        //type 1: Checking manufacturing_activity_details 
-        if(records.manufacturing_activity_details.length > 0){
-
-            records.manufacturing_activity_details.forEach((val,index) => {
-                
-                let ManufacturingArray = Object.keys(val.countries_where_export_done).map(function (key) {
-                    return val.countries_where_export_done[key];
-                });
-                let total = ManufacturingArray.reduce((sum, item) => sum + +item.approx_sale, 0);
-                if(total > 100 || total < 100){
-                    validationFlag++;
-                }
-
-            });
-            
-        }
-
-        //type 3 checking wholesale_trading_activity_details
-        if(records.wholesale_trading_activity_details.length > 0){
-
-            records.wholesale_trading_activity_details.forEach((val,index) => {
-                
-                let WholesaleTradingArray = Object.keys(val.countries_where_export_done).map(function (key) {
-                    return val.countries_where_export_done[key];
-                });
-                let total = WholesaleTradingArray.reduce((sum, item) => sum + +item.approx_sale, 0);
-                if(total > 100 || total < 100){
-                    validationFlag++;
-                }
-
-            });
-            
-        }
-
-        //type 2 checking retail_trading_activity_details
-        if(records.retail_trading_activity_details.length > 0){
-
-            records.retail_trading_activity_details.forEach((val,index) => {
-                
-                let RetailTradingArray = Object.keys(val.countries_where_export_done).map(function (key) {
-                    return val.countries_where_export_done[key];
-                });
-                let total = RetailTradingArray.reduce((sum, item) => sum + +item.approx_sale, 0);
-                if(total > 100 || total < 100){
-                    validationFlag++;
-                }
-
-            });
-            
-        }
-
-
-        //type 4 checking service_provider_activity_details
-        if(records.service_provider_activity_details.length > 0){
-
-            records.service_provider_activity_details.forEach((val,index) => {
-                
-                let ServiceProviderArray = Object.keys(val.countries_where_export_done).map(function (key) {
-                    return val.countries_where_export_done[key];
-                });
-                let total = ServiceProviderArray.reduce((sum, item) => sum + +item.approx_sale, 0);
-                if(total > 100 || total < 100){
-                    validationFlag++;
-                }
-
-            });
-            
-        }
-
-        //validationFlag is greater then 0 means its display the notifer as warning
-        if(validationFlag > 0){
-            this.notifier.notify('warning',"Approximate sales doesn't add upto 100%");
-            return;
-        }
-
-    }
+    // }
 
     submitDetails() {
        // let family: any = [];
-       //console.log(this.businessForm.value);
+       console.log(this.businessForm.value);
        
         if (!this.businessForm.valid) {
             //console.log(' Requried validation error');
@@ -1313,7 +1238,7 @@ export class BusinessInfoComponent implements OnInit {
         let records = this.businessForm.value;
         
         //to check the Appx. sale validation.
-        this.validateAppxSales(records);
+        // this.validateAppxSales(records);
         
         if (records.other_documents == 'no') {
             delete records.documents;
@@ -1324,6 +1249,88 @@ export class BusinessInfoComponent implements OnInit {
         if (records.ownership_others == '') {
             delete records.ownership_others;
         }
+
+
+        let validationFlag : number = 0;
+
+        //type 1: Checking manufacturing_activity_details 
+        if(records.manufacturing_activity_details.length > 0){
+
+           
+            records.manufacturing_activity_details.forEach((val,index) => {
+                if(records.manufacturing_activity_details.area_of_sale != "Within India"){     
+                let ManufacturingArray = Object.keys(val.countries_where_export_done).map(function (key) {
+                    return val.countries_where_export_done[key];
+                });
+                let total = ManufacturingArray.reduce((sum, item) => sum + +item.approx_sale, 0);
+                if(total > 100 || total < 100){
+                    validationFlag++;
+                }
+            }
+            });
+           
+            
+        }
+
+        //type 3 checking wholesale_trading_activity_details
+        if(records.wholesale_trading_activity_details.length > 0){
+
+            
+            records.wholesale_trading_activity_details.forEach((val,index) => {
+                if(records.wholesale_trading_activity_details.area_of_sale != "Within India"){    
+                let WholesaleTradingArray = Object.keys(val.countries_where_export_done).map(function (key) {
+                    return val.countries_where_export_done[key];
+                });
+                let total = WholesaleTradingArray.reduce((sum, item) => sum + +item.approx_sale, 0);
+                if(total > 100 || total < 100){
+                    validationFlag++;
+                }
+            }
+            });
+           
+        }
+
+        //type 2 checking retail_trading_activity_details
+        if(records.retail_trading_activity_details.length > 0){
+
+            records.retail_trading_activity_details.forEach((val,index) => {
+                if(records.retail_trading_activity_details.area_of_sale != "Within India"){    
+                let RetailTradingArray = Object.keys(val.countries_where_export_done).map(function (key) {
+                    return val.countries_where_export_done[key];
+                });
+                let total = RetailTradingArray.reduce((sum, item) => sum + +item.approx_sale, 0);
+                if(total > 100 || total < 100){
+                    validationFlag++;
+                }
+            }
+            });
+          
+        }
+
+
+        //type 4 checking service_provider_activity_details
+        if(records.service_provider_activity_details.length > 0){
+
+            records.service_provider_activity_details.forEach((val,index) => {
+                if(records.service_provider_activity_details.area_of_sale != "Within India"){
+                
+                let ServiceProviderArray = Object.keys(val.countries_where_export_done).map(function (key) {
+                    return val.countries_where_export_done[key];
+                });
+                let total = ServiceProviderArray.reduce((sum, item) => sum + +item.approx_sale, 0);
+                if(total > 100 || total < 100){
+                    validationFlag++;
+                }
+            }
+            });
+        
+        }
+
+        //validationFlag is greater then 0 means its display the notifer as warning
+        if(validationFlag > 0){
+            this.notifier.notify('warning',"Approximate sales doesn't add upto 100%");
+            return;
+        }
         
         records.select_business_activity_type = records.select_business_activity_type.filter(value=>value.exist_status==1);
         this._pd.saveForm(records).subscribe(data => {
@@ -1393,36 +1400,39 @@ export class BusinessInfoComponent implements OnInit {
   }
 
   filterMaxSaleCities(datasource: any,filterValues:any) {  
-    //   console.log(datasource);
+    console.log('Whole  State data',datasource); //  Whole  State data
+    console.log('Filtered state id',filterValues); // Filtered state id
       if(filterValues){
-        let getOriginalStateList = datasource.map(dval => dval.state_id);//only stateid have this
+
+        let getOriginalStateList = datasource.map(dval => dval.state_id);
+        console.log('Whole State id from Datasources',getOriginalStateList)//Whole State id from Datasources
+        
         let setCityFilter = filterValues.map(x => {
              let findIndex = getOriginalStateList.indexOf(x);
              findIndex = datasource[findIndex].cities;
              return findIndex;
         });
 
-         //console.log(this.filterCityList);
-         //let temp = this.filterCityList.filter(val =>val.city_name).map(mapVal => mapVal.city_name)
-         //console.log('temp',temp);
-         let getFilteredCityValues = [].concat.apply([],this.filterCityList.filter(val =>val.city_name).map(mapVal => mapVal.city_name));
-
-        //  console.log('asd',getFilteredCityValues);
-        //  console.log(setCityFilter);
-
-        //  let setStateFilter2: any=[];
-        //  setStateFilter2 = getFilteredCityValues.map(x => {
-        //         let findIndex = setCityFilter.indexOf(x);
-        //         return datasource[findIndex].cities;
-        // });
-        // console.log(setStateFilter2);
-        //  let setCityFilter2 = getFilteredCityValues.filter(
-        //     d => d == setCityFilter.city_id);
-        // console.log(setCityFilter2);
-        // console.log(this.filterCityList.city_name);
+        // console.log('Filtered City Array Based on State Wise',setCityFilter)//Filtered City Array
+        // console.log('Previous filtered City id List ',this.filterCityList);
         
         let merged = [].concat.apply([], setCityFilter);
+        let getFilteredCityValues = [].concat.apply([],this.filterCityList.filter(val =>val.city_name).map(mapVal => mapVal.city_name));
+        let getOriginalCityList = merged.map(dval => dval.city_id);
+        
+        let Filter: any=[];
+
+        Filter = getFilteredCityValues.map(x => {
+            let findIndex = getOriginalCityList.indexOf(x);
+            findIndex = merged[findIndex];
+            console.log('findIndex',findIndex);
+            //return findIndex.filter(x => x !== undefined);
+        });
+
+        Filter = getFilteredCityValues.filter(x => x !== undefined);
+
         return merged.length > 0 ? merged : [];
+        //return Filter.length > 0 ? Filter : [];
       }
   }
 

From fc0126f635c346944beaa6b01c5f2029aa2e6058 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Mon, 7 Jan 2019 15:55:55 +0530
Subject: [PATCH 27/29] required removed : ps

---
 .../assets-info/assets-info.component.html    | 27 ++++++++++--
 .../assets-info/assets-info.component.ts      | 12 +++---
 .../banking-details.component.html            | 22 +++++-----
 .../banking-details.component.ts              | 25 +++++------
 .../business-info-group.component.ts          |  2 +-
 .../business-info.component.html              |  2 +-
 .../business-info/business-info.component.ts  | 24 +++++------
 .../final-remarks.component.html              |  2 +-
 .../final-remarks/final-remarks.component.ts  |  2 +-
 .../general-info/general-info.component.html  |  2 +-
 .../general-info/general-info.component.ts    |  4 +-
 .../lender-representative.component.ts        |  8 ++--
 .../loan-details/loan-details.component.html  | 28 ++++++-------
 .../loan-details/loan-details.component.ts    | 22 +++++-----
 .../neighbour-hood.component.html             |  2 +-
 .../neighbour-hood.component.ts               | 20 ++++-----
 .../other-income/other-income.component.html  |  8 ++--
 .../other-income/other-income.component.ts    | 10 ++---
 .../rental-info/rental-info.component.html    |  2 +-
 .../rental-info/rental-info.component.ts      | 42 +++++++++----------
 .../start-pd/forms/stock/stock.component.ts   | 10 ++---
 21 files changed, 146 insertions(+), 130 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html
index 35a61dc4e..6df10da6f 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html
@@ -13,7 +13,7 @@
 
 
         <mat-tab-group>
-            <mat-tab label="Business Asset Questions">
+            <mat-tab label="Assets Used For  Business">
                 <ng-template matTabContent>
                       <div fxLayout="row wrap">
                               <div fxFlex="100">
@@ -220,7 +220,7 @@
                                                                         
                                                                           <mat-form-field *ngIf="sup.get('business_assets_mode').value == 1 || sup.get('business_assets_mode').value == 2 || sup.get('business_assets_mode').value == 3 || sup.get('business_assets_mode').value == 4 || sup.get('business_assets_mode').value == 5" style="width:30%">
                                                                               <!-- <input matInput placeholder="Name of the Business Owner" formControlName="business_name_of_the_owner" autocomplete="off"> -->
-                                                                              <mat-select placeholder="Name of the Business Owner"
+                                                                              <mat-select placeholder="Asset Owned by"
                                                                               formControlName="business_name_of_the_owner" required>
                                                                               <mat-option [value]="company.company_name" *ngFor="let company of existCompanyList">{{company.company_name | titlecase}}</mat-option>
                                                                               <!-- <mat-option value="Others">Others</mat-option> -->
@@ -229,7 +229,16 @@
                                                                         </div>
                                                                     
                                                               
-
+                                                  
+                                                                        <span *ngIf="sup.get('business_assets_mode').value != ''">
+                                                                          <mat-form-field style="width:30%">
+                                                                    
+                                                                                <mat-label>Purchase Year</mat-label>
+                                                                                <input matInput autocomplete="off" placeholder="YYYY eg.2018" formControlName="business_purchase_year" (keypress)="keyPress($event)">
+                                                                                <mat-error> Invalid year format</mat-error>
+                                                                        
+                                                                          </mat-form-field>
+                                                                        </span>
                                                   <span *ngIf="sup.get('business_assets_mode').value == 1 || sup.get('business_assets_mode').value == 2 || sup.get('business_assets_mode').value == 3 || sup.get('business_assets_mode').value == 4 || sup.get('business_assets_mode').value == 5">
                                                       <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
                                                         
@@ -290,7 +299,7 @@
                       </div>
                 </ng-template>
               </mat-tab>
-              <mat-tab label="Other Asset Questions">
+              <mat-tab label="Other Personal Assets">
                   <ng-template matTabContent>
                         <div fxLayout="row wrap">
                                 <div fxFlex="100">
@@ -536,6 +545,16 @@
                                                             </mat-form-field>
                                                         </div>
                                                       
+                                                        <span *ngIf="sup.get('assets_mode').value != ''">
+                                                        <mat-form-field style="width:30%">
+                                                                    
+                                                            <mat-label>Purchase Year</mat-label>
+                                                            <input matInput autocomplete="off" placeholder="YYYY eg.2018" formControlName="purchase_year" (keypress)="keyPress($event)">
+                                                            <mat-error> Invalid year format</mat-error>
+                                                          
+                                                         </mat-form-field>
+                                                         </span>
+
                                                         <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
               
                                                             <mat-form-field *ngIf="sup.get('assets_mode').value == 1 || sup.get('assets_mode').value == 2 || sup.get('assets_mode').value == 3 || sup.get('assets_mode').value == 4 || sup.get('assets_mode').value == 5" style="width:95%">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts
index d5b07223c..cd9c51767 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts
@@ -378,7 +378,7 @@ public m_investmentType = [];
       name_of_the_owner: [''],
       other_owner:[''],
       relation: [''],
-      //purchase_year: [''],
+      purchase_year: ['',Validators.compose([Validators.minLength(4),Validators.maxLength(4)])],
       //purchase_month: [''],
       emi: [''],
       emi_paid: [''],
@@ -396,7 +396,7 @@ public m_investmentType = [];
       business_name_of_the_owner: [],
       //other_owner:[''],
       //relation:[''],
-      //purchase_year: [''],
+      business_purchase_year: ['',Validators.compose([Validators.minLength(4),Validators.maxLength(4)])],
       //purchase_month: [''],
       business_emi: [''],
       business_emi_paid: [''],
@@ -639,7 +639,7 @@ public m_investmentType = [];
       name_of_the_owner: [data.name_of_the_owner],
       other_owner:[data.other_owner || ''],
       relation: [data.relation || ''],
-      // purchase_year: [data.purchase_year],
+      purchase_year: [data.purchase_year],
       // purchase_month: [data.purchase_month],
       emi: [data.emi || 0],
       emi_paid: [data.emi_paid || ''],
@@ -658,7 +658,7 @@ public m_investmentType = [];
       business_name_of_the_owner: [data.business_name_of_the_owner],
       // other_owner:[data.other_owner || ''],
       // relation: [data.relation || ''],
-      // purchase_year: [data.purchase_year],
+      business_purchase_year: [data. business_purchase_year],
       // purchase_month: [data.purchase_month],
       business_emi: [data.business_emi || 0],
       business_emi_paid: [data.business_emi_paid || ''],
@@ -688,7 +688,7 @@ public m_investmentType = [];
           name_of_the_owner: val.name_of_the_owner,
           other_owner:val.other_owner,
           relation: val.relation,
-          // purchase_year: val.purchase_year,
+          purchase_year: val.purchase_year,
           // purchase_month: val.purchase_month,
           emi: val.emi,
           emi_paid: val.emi_paid,
@@ -723,7 +723,7 @@ public m_investmentType = [];
           business_name_of_the_owner: val.business_name_of_the_owner,
           // other_owner: val.other_owner,
           // relation : val.relation,
-          // purchase_year: val.purchase_year,
+          business_purchase_year: val. business_purchase_year,
           // purchase_month: val.purchase_month,
           business_emi: val.business_emi,
           business_emi_paid: val.business_emi_paid,
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html
index 5f49171f5..40ddb996e 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html
@@ -95,7 +95,7 @@
                                     </mat-panel-title>
                                 </mat-expansion-panel-header>
                                 <mat-form-field>
-                                    <mat-select placeholder="Applicant Name" formControlName="applicant_name" required (selectionChange)="selectedBorrower($event.value,i)">    
+                                    <mat-select placeholder="Applicant Name" formControlName="applicant_name"  (selectionChange)="selectedBorrower($event.value,i)">    
                                         <mat-option value="{{owner.pd_co_applicant_id}}" *ngFor="let owner of applicants">{{owner.applicant_name}}</mat-option>
                                     </mat-select>
                                 </mat-form-field>
@@ -106,14 +106,14 @@
 
                                 <!-- <mat-form-field>
                                         <input matInput placeholder="Applicant Name"
-                                           formControlName="applicant_name" required>
+                                           formControlName="applicant_name">
                                      </mat-form-field> -->
                                 <!-- <mat-form-field>
-                                        <input matInput placeholder="Bank Name" formControlName="bank_name" required>
+                                        <input matInput placeholder="Bank Name" formControlName="bank_name" >
                                      </mat-form-field> -->
 
                                 <mat-form-field>
-                                    <mat-select placeholder="Bank Name" formControlName="bank_name" required>
+                                    <mat-select placeholder="Bank Name" formControlName="bank_name" >
                                             <mat-option *ngFor="let btLen of m_btLenderList" [value]="btLen.bt_lender_list_id">{{ btLen.lender_name }}</mat-option>
                                     </mat-select>
                                 </mat-form-field>
@@ -124,7 +124,7 @@
 
                 
                                 <mat-form-field>
-                                    <mat-select (selectionChange)="selectedAccTypeChanges($event.value,i)" placeholder="Account Type" formControlName="account_type" required >
+                                    <mat-select (selectionChange)="selectedAccTypeChanges($event.value,i)" placeholder="Account Type" formControlName="account_type"  >
                                     <mat-option *ngFor="let prop of m_accountType" [value]="prop.id">{{ prop.name }}</mat-option>
                                   </mat-select>
                                     <!--<mat-select placeholder="Account Type"
@@ -139,7 +139,7 @@
 
                                 <mat-form-field *ngIf="pd_cus_segment!='SAL'">
                                         <mat-select placeholder="Is this the main business account"
-                                                    formControlName="is_main" required>
+                                                    formControlName="is_main" >
                                             <mat-option value="Yes">Yes</mat-option>
                                             <mat-option value="No">No</mat-option>
                                         </mat-select>
@@ -148,7 +148,7 @@
                                 <div fxLayout="row" fxLayoutAlign="start none">
                                         <mat-form-field style="width: 35%;" *ngIf="salaryField">
                                             <mat-select placeholder="Salary Credited in this account"
-                                                        formControlName="salary" required>
+                                                        formControlName="salary" >
                                                 <mat-option value="Yes">Yes</mat-option>
                                                 <mat-option value="No">No</mat-option>
                                                 <mat-option value="NA">NA</mat-option>
@@ -163,17 +163,17 @@
                                 </div>
                                 <!-- <mat-form-field>
                                     <input matInput placeholder="Approximate Vintage"
-                                           formControlName="vintage" required>
+                                           formControlName="vintage" >
                                 </mat-form-field>-->
                                 <div>
                                         <label>Number of Years / Months since account was started</label>
                                         <br>
                                         <div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none">
                                             <mat-form-field>
-                                                <input matInput autocomplete="off" placeholder="Year(s)" formControlName="vintage_year" required (keypress)="keyPress($event)">
+                                                <input matInput autocomplete="off" placeholder="Year(s)" formControlName="vintage_year"  (keypress)="keyPress($event)">
                                             </mat-form-field>
                                             <mat-form-field>
-                                                <input matInput autocomplete="off" placeholder="Month(s)" formControlName="vintage_month" required (keypress)="keyPress($event)" (change)="ConvertMonthintoYear(itemrow,$event.target.value)">
+                                                <input matInput autocomplete="off" placeholder="Month(s)" formControlName="vintage_month"  (keypress)="keyPress($event)" (change)="ConvertMonthintoYear(itemrow,$event.target.value)">
                                             </mat-form-field>
                                         </div>
                                 </div>
@@ -294,7 +294,7 @@
         <div fxFlex="60" class="pb-0 text-sm-left" align="left">
                 <mat-form-field appearance="outline" style="width: 100%">
                   <mat-label>Remarks</mat-label>
-                  <textarea matInput placeholder="Remarks" formControlName="banking_form_remark" required></textarea>
+                  <textarea matInput placeholder="Remarks" formControlName="banking_form_remark" ></textarea>
                 </mat-form-field>
               </div>
       <div fxFlex="40" align="end">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts
index 6eba35463..3238505df 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts
@@ -149,20 +149,20 @@ export class BankingDetailsComponent implements OnInit {
 
     createBankarray() {
         return this.fb.group({
-            applicant_name: ['', Validators.compose([Validators.required])],
+            applicant_name: [''],
             other_applicant : [''],
-            bank_name: ['', Validators.compose([Validators.required])],
+            bank_name: [''],
             other_bank: [''],
-            account_type: ['', Validators.compose([Validators.required])],
-            //salary: ['', Validators.compose([Validators.required])],
-            salary: this.pd_cus_segment.substring(0,2) == 'SE' ? [''] : ['', Validators.compose([Validators.required])],
-            limit: ['', Validators.compose([Validators.required])],
-            //is_main: ['', Validators.compose([Validators.required])],
-            //is_main: [this.pd_cus_segment == 'SAL' ? '' : '', Validators.compose([Validators.required])],
+            account_type: [''],
+            //salary: [''],
+            salary: this.pd_cus_segment.substring(0,2) == 'SE' ? [''] : [''],
+            limit: [''],
+            //is_main: [''],
+            //is_main: [this.pd_cus_segment == 'SAL' ? '' : ''],
             //is_main:[''],
-            is_main: this.pd_cus_segment == 'SAL' ? [''] : ['', Validators.compose([Validators.required])],
-            vintage_year: ['', Validators.compose([Validators.required])],
-            vintage_month: ['', Validators.compose([Validators.required])],
+            is_main: this.pd_cus_segment == 'SAL' ? [''] : [''],
+            vintage_year: [''],
+            vintage_month: [''],
         });
 
     }
@@ -190,9 +190,6 @@ export class BankingDetailsComponent implements OnInit {
     }
 
     bankSubmit() {
-        if (!this.bankingForm.valid) {
-                return;
-            }
             let records: any = {};
             records.pdid = this.pdid;
             records.formid = '7';
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.ts
index 8e3afd45b..30ecde6c7 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.ts
@@ -16,7 +16,7 @@ import {BusinessInfoComponent} from './../../forms/business-info/business-info.c
   styleUrls: ['./business-info-group.component.scss']
 })
 export class BusinessInfoGroupComponent implements OnInit {
-  pageTitle: string ="Business Informations";
+  pageTitle: string ="Business Information";
   existCompanyList: any = [];
   pdid: number;
   form_id: number;
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
index 1e2149147..60b6fbffb 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
@@ -1454,7 +1454,7 @@
             <div fxFlex="60" class="pb-0 text-sm-left" align="left">
                     <mat-form-field appearance="outline" style="width: 100%">
                       <mat-label>Remarks</mat-label>
-                      <textarea matInput placeholder="Remarks" formControlName="business_remarks" required></textarea>
+                      <textarea matInput placeholder="Remarks" formControlName="business_remarks"></textarea>
                     </mat-form-field>
                   </div>
           <div fxFlex="40" align="end">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
index e3b18498e..fdc457dc4 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
@@ -611,7 +611,7 @@ export class BusinessInfoComponent implements OnInit {
             esic_regn: ['', Validators.compose([Validators.required])],
             other_documents: ['', Validators.compose([Validators.required])],
             documents: this.fb.array([]),
-            business_remarks: ['', Validators.compose([Validators.required])],
+            business_remarks: [''],
             //any_delays: ['', Validators.compose([Validators.required])],
             persons_with_relationships:this.fb.array([]),
             select_business_activity_type: this.fb.array([]),
@@ -1116,6 +1116,7 @@ export class BusinessInfoComponent implements OnInit {
                 data.records.forEach(val => {
                     if (val.isactive == 1) {
                         this.countryDataList.push(val);
+                        console.log(this.countryDataList);
                     }
                 })
             }); 
@@ -1227,6 +1228,7 @@ export class BusinessInfoComponent implements OnInit {
     // }
 
     submitDetails() {
+    
        // let family: any = [];
        console.log(this.businessForm.value);
        
@@ -1256,9 +1258,8 @@ export class BusinessInfoComponent implements OnInit {
         //type 1: Checking manufacturing_activity_details 
         if(records.manufacturing_activity_details.length > 0){
 
-           
             records.manufacturing_activity_details.forEach((val,index) => {
-                if(records.manufacturing_activity_details.area_of_sale != "Within India"){     
+                if(val.area_of_sale!= "Within India"){      
                 let ManufacturingArray = Object.keys(val.countries_where_export_done).map(function (key) {
                     return val.countries_where_export_done[key];
                 });
@@ -1266,7 +1267,7 @@ export class BusinessInfoComponent implements OnInit {
                 if(total > 100 || total < 100){
                     validationFlag++;
                 }
-            }
+               }
             });
            
             
@@ -1275,9 +1276,8 @@ export class BusinessInfoComponent implements OnInit {
         //type 3 checking wholesale_trading_activity_details
         if(records.wholesale_trading_activity_details.length > 0){
 
-            
             records.wholesale_trading_activity_details.forEach((val,index) => {
-                if(records.wholesale_trading_activity_details.area_of_sale != "Within India"){    
+                if(val.area_of_sale != "Within India"){    
                 let WholesaleTradingArray = Object.keys(val.countries_where_export_done).map(function (key) {
                     return val.countries_where_export_done[key];
                 });
@@ -1294,7 +1294,7 @@ export class BusinessInfoComponent implements OnInit {
         if(records.retail_trading_activity_details.length > 0){
 
             records.retail_trading_activity_details.forEach((val,index) => {
-                if(records.retail_trading_activity_details.area_of_sale != "Within India"){    
+                if(val.area_of_sale != "Within India"){    
                 let RetailTradingArray = Object.keys(val.countries_where_export_done).map(function (key) {
                     return val.countries_where_export_done[key];
                 });
@@ -1312,7 +1312,7 @@ export class BusinessInfoComponent implements OnInit {
         if(records.service_provider_activity_details.length > 0){
 
             records.service_provider_activity_details.forEach((val,index) => {
-                if(records.service_provider_activity_details.area_of_sale != "Within India"){
+                if(val.area_of_sale != "Within India"){
                 
                 let ServiceProviderArray = Object.keys(val.countries_where_export_done).map(function (key) {
                     return val.countries_where_export_done[key];
@@ -1400,12 +1400,12 @@ export class BusinessInfoComponent implements OnInit {
   }
 
   filterMaxSaleCities(datasource: any,filterValues:any) {  
-    console.log('Whole  State data',datasource); //  Whole  State data
-    console.log('Filtered state id',filterValues); // Filtered state id
+    // console.log('Whole  State data',datasource); //  Whole  State data
+    // console.log('Filtered state id',filterValues); // Filtered state id
       if(filterValues){
 
         let getOriginalStateList = datasource.map(dval => dval.state_id);
-        console.log('Whole State id from Datasources',getOriginalStateList)//Whole State id from Datasources
+        // console.log('Whole State id from Datasources',getOriginalStateList)//Whole State id from Datasources
         
         let setCityFilter = filterValues.map(x => {
              let findIndex = getOriginalStateList.indexOf(x);
@@ -1425,7 +1425,7 @@ export class BusinessInfoComponent implements OnInit {
         Filter = getFilteredCityValues.map(x => {
             let findIndex = getOriginalCityList.indexOf(x);
             findIndex = merged[findIndex];
-            console.log('findIndex',findIndex);
+            // console.log('findIndex',findIndex);
             //return findIndex.filter(x => x !== undefined);
         });
 
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html
index ac1751e44..1adb8ff8b 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html
@@ -20,7 +20,7 @@
             <div fxFlex="60" class="pb-0 text-sm-left" align="left">
                 <mat-form-field appearance="outline" style="width: 100%">
                     <mat-label>Remarks</mat-label>
-                    <textarea matInput placeholder="Remarks" formControlName="final_form_remarks"></textarea>
+                    <textarea matInput placeholder="Remarks" formControlName="final_form_remarks" required></textarea>
                 </mat-form-field>
             </div>
             <div fxFlex="40" align="end">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts
index 870138844..236cb9d79 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts
@@ -55,7 +55,7 @@ export class FinalRemarksComponent implements OnInit {
       pdid: [this.pdid],
       formid: ['20'],
       final_custormer_remark_type : [],
-      final_form_remarks: []
+      final_form_remarks: ['',Validators.required]
     });
     this.getM_Type();
   }
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
index e6e6f6e03..22ae6aeb9 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
@@ -274,7 +274,7 @@
             <div fxFlex="60" class="pb-0 text-sm-left" align="left">
                     <mat-form-field appearance="outline" style="width: 100%">
                       <mat-label>Remarks</mat-label>
-                      <textarea matInput placeholder="Remarks" formControlName="general_remark" required></textarea>
+                      <textarea matInput placeholder="Remarks" formControlName="general_remark"></textarea>
                     </mat-form-field>
                   </div>
           <div fxFlex="40" align="end">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts
index 59f119594..41408795e 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts
@@ -251,7 +251,7 @@ export class GeneralInfoComponent implements OnInit {
     createCompanies(elementValue:any) {
       return this._fb.group({
         company_order_id: [elementValue.company_order_id],
-        company_name: [elementValue.company_name,Validators.required],
+        company_name: [elementValue.company_name],
         is_active: [elementValue.is_active]
     });
     }
@@ -361,7 +361,7 @@ export class GeneralInfoComponent implements OnInit {
       // create multiple company relation
       createMultipleCompanyRelation(elementValue: any) {
         return this._fb.group({
-          company_name: [elementValue.company_name,Validators.required],
+          company_name: [elementValue.company_name],
           company_relationship: [elementValue.company_relationship],
           company_other_relationship:[elementValue.company_other_relationship]
         });
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.ts
index 8530de8d8..6ff4bfdc8 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.ts
@@ -82,8 +82,8 @@ export class LenderRepresentativeComponent implements OnInit {
   }
   public initRepresentative(): void {
       this.representativeForm = this.fb.group({
-        lender_representative_accompany: ['', Validators.compose([Validators.required])],
-        representative_remarks: ['', Validators.compose([Validators.required])],
+        lender_representative_accompany: [''],
+        representative_remarks: [''],
         lender_representative_details: this.fb.array([]),
       });
   }
@@ -99,8 +99,8 @@ export class LenderRepresentativeComponent implements OnInit {
   }
   createLRDetail() {
       return this.fb.group({
-        lender_representative_who_accompanies : ['', Validators.compose([Validators.required])],
-        lender_representative_carry_loan_files: ['', Validators.compose([Validators.required])],
+        lender_representative_who_accompanies : [''],
+        lender_representative_carry_loan_files: [''],
       });
   }
  
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html
index be93ee4b2..02c4e8e7b 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html
@@ -20,13 +20,13 @@
                                      <div fxLayout="row wrap">
                                         <div fxFlex="33">
                                              <mat-form-field style="width: 80%">
-                                            <input matInput placeholder="Loan Amount Applied for ? " formControlName="loan_amount" (keypress)="keyPress($event)" (keyup)="inWords($event,1)" (change)="loanCalc()" required autocomplete="off">
+                                            <input matInput placeholder="Loan Amount Applied for ? " formControlName="loan_amount" (keypress)="keyPress($event)" (keyup)="inWords($event,1)" (change)="loanCalc()"  autocomplete="off">
                                             <mat-hint align="start" style="font-size:70%" *ngIf="loanDetailsForm.controls['loan_amount'].value != ''">{{"&#8377;"}} {{loanAmtInWords}} Only</mat-hint>
                                         </mat-form-field>
                                         </div>
                                         <div fxFlex="33">
                                               <mat-form-field style="width: 80%">
-                                            <mat-select multiple (selectionChange)="endUserChange($event.value)" placeholder="What is the end use" formControlName="end_use" required>
+                                            <mat-select multiple (selectionChange)="endUserChange($event.value)" placeholder="What is the end use" formControlName="end_use" >
                                                 <mat-option *ngFor="let enduse of m_endUseofLoad" [value]="enduse.subproduct_id">{{ enduse.name }}</mat-option>
                                             </mat-select>
                                             <!--<mat-select multiple placeholder="What is the end use"
@@ -53,7 +53,7 @@
                                         <div fxFlex="33">
                                              <mat-form-field style="width: 80%">
                                             <mat-select placeholder="Is there a balance transfer ? " (selectionChange)="selectedBalancesTransferChanges($event)"
-                                                        formControlName="is_transfer" required >
+                                                        formControlName="is_transfer"  >
                                                 <mat-option value="yes">Yes</mat-option>
                                                 <mat-option value="no">No</mat-option>
                                             </mat-select>
@@ -65,12 +65,12 @@
                                        
                                         <div *ngIf="loanDetailsForm.controls['is_transfer'].value == 'yes' && loanDetailsForm.controls['is_transfer'].value != ''">
                                         <mat-form-field  style="width: 60%">
-                                                <input matInput placeholder="What is the amount required for Balance Transfer ? " (keypress)="keyPress($event)" formControlName="balance_transfer_amount" (keyup)="inWords($event,2)" (change)="loanCalc()" autocomplete="off">
+                                                <input matInput placeholder="What is the amount  for Balance Transfer ? " (keypress)="keyPress($event)" formControlName="balance_transfer_amount" (keyup)="inWords($event,2)" (change)="loanCalc()" autocomplete="off">
                                                 <mat-hint align="start" style="font-size:70%" *ngIf="loanDetailsForm.controls['loan_amount'].value != ''">{{"&#8377;"}} {{balTxrfAmtInWords}} Only</mat-hint>
                                             </mat-form-field>
                                         <mat-form-field style="width:30%">
                                             <mat-select  placeholder="Is there a Top Up"
-                                                        formControlName="is_topup" required>
+                                                        formControlName="is_topup" >
                                                 <mat-option value="yes">Yes</mat-option>
                                                 <mat-option value="no">No</mat-option>
                                             </mat-select>
@@ -98,12 +98,12 @@
                                     <div *ngIf="loanDetailsForm.controls['is_transfer'].value != 'yes' && loanDetailsForm.controls['is_transfer'].value != '' ">
                                         
                                         <mat-form-field style="width: 30%">
-                                            <input matInput placeholder="Amount of Own Contribution" formControlName="own_contribution" (keypress)="keyPress($event)" required (keyup)="inWords($event,4)" autocomplete="off">
+                                            <input matInput placeholder="Amount of Own Contribution" formControlName="own_contribution" (keypress)="keyPress($event)"  (keyup)="inWords($event,4)" autocomplete="off">
                                             <mat-hint align="start" style="font-size:70%" *ngIf="loanDetailsForm.controls['own_contribution'].value != ''">{{"&#8377;"}} {{ownContributionInWords}} Only</mat-hint>
                                         </mat-form-field>
                                         
                                         <mat-form-field style="width: 30%">
-                                            <mat-select (selectionChange)="sourceChange($event.value)" placeholder="Source of Own Contribution" formControlName="source" required multiple>
+                                            <mat-select (selectionChange)="sourceChange($event.value)" placeholder="Source of Own Contribution" formControlName="source"  multiple>
                                                 <mat-option *ngFor="let sour of m_sourceofamount" [value]="sour.id">{{ sour.name }}</mat-option>
                                             </mat-select>
                                         </mat-form-field>
@@ -134,7 +134,7 @@
 
     
                                     <mat-form-field  style="width: 60%">
-                                        <input matInput placeholder="EMI Amount Comfortable Paying" formControlName="emi_level" (keypress)="keyPress($event)" (keyup)="inWords($event,6)" required autocomplete="off">
+                                        <input matInput placeholder="EMI Amount Comfortable Paying" formControlName="emi_level" (keypress)="keyPress($event)" (keyup)="inWords($event,6)"  autocomplete="off">
                                         <mat-hint align="start" style="font-size:70%" *ngIf="loanDetailsForm.controls['emi_level'].value != ''">{{"&#8377;"}} {{emiAmtInWords}} Only</mat-hint>
                                     </mat-form-field>
 <!-- <div *ngIf="productAbbr === 'HL' || productAbbr === 'LL' || productAbbr === 'LAP' "> -->
@@ -142,7 +142,7 @@
         <mat-card-header><p>Details of Property being Mortgaged</p></mat-card-header>
         <mat-card-content class="matcard">
             <mat-form-field>
-                <mat-select placeholder="Type of Property" formControlName="property_type" (selectionChange)="mortage_type($event.value)" required>
+                <mat-select placeholder="Type of Property" formControlName="property_type" (selectionChange)="mortage_type($event.value)" >
                     <mat-option *ngFor="let typeprop of m_mortageTypeProperty" [value]="typeprop.mortage_property_id">{{ typeprop.property_name }}</mat-option>
                 </mat-select>
             </mat-form-field>
@@ -169,7 +169,7 @@
             </mat-form-field>
             <mat-form-field>
                 <mat-select multiple placeholder="Name of Owner"
-                            formControlName="owner_name" (selectionChange)="ownerNameChange($event)" required>
+                            formControlName="owner_name" (selectionChange)="ownerNameChange($event)" >
                     <mat-option value="{{owner.pd_co_applicant_id}}" *ngFor="let owner of applicants">{{owner.applicant_name}}</mat-option>
                     <mat-option value="Others">Others (Please Specify)</mat-option>
                 </mat-select>
@@ -180,7 +180,7 @@
             </mat-form-field>
 
             <mat-form-field>
-                <mat-select placeholder="Status of Construction" formControlName="construction_status" required>
+                <mat-select placeholder="Status of Construction" formControlName="construction_status" >
                         <mat-option *ngFor="let status of m_statusofCunstruction" [value]="status.id">{{ status.name }}</mat-option>
                 </mat-select>
             </mat-form-field>
@@ -199,12 +199,12 @@
                                                 
                                                 <mat-form-field>
                                                     <input matInput placeholder="Estimate Market Value as Per Customer"
-                                                        formControlName="emv_per_customer" (keypress)="keyPress($event)" (keyup)="inWords($event,7)" required autocomplete="off">
+                                                        formControlName="emv_per_customer" (keypress)="keyPress($event)" (keyup)="inWords($event,7)"  autocomplete="off">
                                                         <mat-hint align="start" style="font-size:70%" *ngIf="loanDetailsForm.controls['emv_per_customer'].value != ''">{{"&#8377;"}} {{emvAmtInWords}} Only</mat-hint>
                                                 </mat-form-field>
                                                 <!-- <mat-form-field>
                                                     <input matInput placeholder="Value as Per Agreement"
-                                                        formControlName="value_per_agreement" (keypress)="keyPress($event)" required (keyup)="inWords($event,3)">
+                                                        formControlName="value_per_agreement" (keypress)="keyPress($event)"  (keyup)="inWords($event,3)">
                                                         <mat-hint align="start" style="font-size:70%" *ngIf="loanDetailsForm.controls['loan_amount'].value != ''">{{"&#8377;"}} {{valAsPerAgmtInWords}} Only</mat-hint>
                                                 </mat-form-field> -->
                                             </mat-card-content>
@@ -319,7 +319,7 @@
             <mat-form-field appearance="outline" style="width: 100%">
                 <mat-label>Remarks</mat-label>
                 
-                <textarea matInput placeholder="Remarks" formControlName="loandetails_remarks" required></textarea>
+                <textarea matInput placeholder="Remarks" formControlName="loandetails_remarks" ></textarea>
             </mat-form-field>
         </div>
 
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts
index 4aad78fb4..015cce3a0 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts
@@ -339,11 +339,11 @@ getM_sourceofamount() {
     public initloanDetailsForm(): void {
         this.loanDetailsForm = this.fb.group({
 
-            loan_amount: [this.exist_loan_amt, Validators.compose([Validators.required])],
-            end_use: ['', Validators.compose([Validators.required])],
+            loan_amount: [this.exist_loan_amt],
+            end_use: [''],
             end_use_other: [''],
-            is_transfer: ['', Validators.compose([Validators.required])],
-            //is_topup: ['', Validators.compose([Validators.required])],
+            is_transfer: [''],
+            //is_topup: [''],
             is_topup: [''],
             balance_transfer_amount: [''],
             topup_amount: [''],
@@ -355,16 +355,16 @@ getM_sourceofamount() {
             other_source:[''],
             personal_loan_source:[''],
             //lender_name_type: [''],
-            emi_level: ['', Validators.compose([Validators.required])],
-            property_type: ['', Validators.compose([Validators.required])],
+            emi_level: [''],
+            property_type: [''],
             property_type_others:[''],
-            owner_name: ['', Validators.compose([Validators.required])],
+            owner_name: [''],
             other_owners_name :[''],
-            construction_status: ['', Validators.compose([Validators.required])],
+            construction_status: [''],
             //percentage_of_construction : [''],
-            emv_per_customer: ['', Validators.compose([Validators.required])],
-            //value_per_agreement: ['', Validators.compose([Validators.required])],
-            loandetails_remarks: ['', Validators.compose([Validators.required])],
+            emv_per_customer: [''],
+            //value_per_agreement: [''],
+            loandetails_remarks: [''],
         });
     }
     // endUserChange(event) {
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html
index 528d8679f..07da3fb2a 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html
@@ -142,7 +142,7 @@
     <div fxFlex="60" class="pb-0 text-sm-left" align="left">
         <mat-form-field appearance="outline" style="width: 100%">
           <mat-label>Remarks</mat-label>
-          <textarea matInput autocomplete="off" placeholder="Remarks" formControlName="neighbour_reference_remark" required></textarea>
+          <textarea matInput autocomplete="off" placeholder="Remarks" formControlName="neighbour_reference_remark" ></textarea>
         </mat-form-field>
       </div>
     <div fxFlex="40" align="end">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts
index 77e17bc98..20d8ddad3 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts
@@ -137,17 +137,17 @@ export class NeighbourHoodComponent implements OnInit {
     let stdcode =  elementValue.landline.substr(0,stdcodesearch);
     let landline = elementValue.landline.substr(+stdcodesearch + 1,8);
     return this._fb.group({
-      reference_name: [elementValue.reference_name, Validators.required],
-      mobile: [elementValue.mobile,Validators.compose([Validators.required,Validators.minLength(10),Validators.maxLength(10)])],
+      reference_name: [elementValue.reference_name],
+      mobile: [elementValue.mobile,Validators.compose([Validators.minLength(10),Validators.maxLength(10)])],
       std_code: [stdcode,Validators.compose([Validators.minLength(2),Validators.maxLength(4)])],
       landline: [landline,Validators.compose([Validators.minLength(6),Validators.maxLength(8)])],
-      location:[elementValue.location,Validators.required],
-      relationship_with:[elementValue.relationship_with,Validators.required],
+      location:[elementValue.location],
+      relationship_with:[elementValue.relationship_with],
       others: [elementValue.others],
-      year_relation_applicant:[elementValue.year_relation_applicant,Validators.required],
-      months_relation_applicant:[elementValue.months_relation_applicant,Validators.required],
-      business_volume_amount:[elementValue.business_volume_amount,Validators.required],
-      business_volume_unit:[elementValue.business_volume_unit, Validators.required],
+      year_relation_applicant:[elementValue.year_relation_applicant],
+      months_relation_applicant:[elementValue.months_relation_applicant],
+      business_volume_amount:[elementValue.business_volume_amount],
+      business_volume_unit:[elementValue.business_volume_unit],
       others_unit : [elementValue.others_unit],
       reference_final_remarks:[elementValue.reference_final_remarks],
       specify_final_remark : [elementValue.specify_final_remark],
@@ -173,8 +173,8 @@ export class NeighbourHoodComponent implements OnInit {
   // create neighbourhood form array
   createNeighbourhood(elementValue:any){
     return this._fb.group({
-      neighbourhood_name: [elementValue.neighbourhood_name, Validators.required],
-      do_know: [elementValue.do_know,Validators.required],
+      neighbourhood_name: [elementValue.neighbourhood_name],
+      do_know: [elementValue.do_know],
       how_long_do_know: [elementValue.how_long_do_know],
       is_applicant_owner: [elementValue.is_applicant_owner],
   });
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html
index 71273a104..90b38fce9 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html
@@ -38,7 +38,7 @@
                                         <mat-card-content class="matcard">
                                             <mat-form-field style="width:25%">
                                                 <mat-select placeholder="Source"
-                                                            formControlName="source" required>
+                                                            formControlName="source">
                                                     <mat-option value="{{src.id}}" *ngFor="let src of sourceData">{{src.name}}</mat-option>
                                                     <!-- <mat-option value="rental_income">Rental Income</mat-option>
                                                     <mat-option value="interest_income">Interest Income</mat-option>
@@ -54,12 +54,12 @@
                                             </mat-form-field>
         
                                             <mat-form-field style="width:25%">
-                                                <input matInput autocomplete="off" placeholder="Amount" formControlName="amount" (keypress)="keyPress($event)" required (keyup)="inWords($event,i)">  
+                                                <input matInput autocomplete="off" placeholder="Amount" formControlName="amount" (keypress)="keyPress($event)" (keyup)="inWords($event,i)">  
                                                 <mat-hint align="start" style="font-size:70%" *ngIf="details.get('amount').value != ''">{{"&#8377;"}} {{amtInwords[i]}} Only</mat-hint>
                                             </mat-form-field>
 
                                             <mat-form-field style="width:25%">
-                                                    <mat-select placeholder="Frequency" formControlName="frequency" required>
+                                                    <mat-select placeholder="Frequency" formControlName="frequency">
                                                         <mat-option value="{{frq.frequency_id}}" *ngFor="let frq of frequencyData">{{frq.name}}</mat-option>
                                                     </mat-select>
                                             </mat-form-field>
@@ -198,7 +198,7 @@
             <div fxFlex="60" class="pb-0 text-sm-left" align="left">
                     <mat-form-field appearance="outline" style="width: 100%">
                       <mat-label>Remarks</mat-label>
-                      <textarea matInput autocomplete="off" placeholder="Remarks" formControlName="otherincome_remarks" required></textarea>
+                      <textarea matInput autocomplete="off" placeholder="Remarks" formControlName="otherincome_remarks"></textarea>
                     </mat-form-field>
             </div>
             <div fxFlex="40" align="end">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts
index ec3b4d063..f9d71fff0 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts
@@ -112,8 +112,8 @@ public viewerOptions: any = {
     }
     public initOtherincomeForm(): void {
         this.otherIncomeForm = this.fb.group({
-            other_income: ['', Validators.compose([Validators.required])],
-            otherincome_remarks: ['', Validators.compose([Validators.required])],
+            other_income: [''],
+            otherincome_remarks: [''],
             income_details: this.fb.array([])
         });
     }
@@ -129,10 +129,10 @@ public viewerOptions: any = {
     }
     createDetail() {
         return this.fb.group({
-            source: ['', Validators.compose([Validators.required])],
+            source: [''],
             others_source : [''],
-            amount: ['', Validators.compose([Validators.required])],
-            frequency: ['', Validators.compose([Validators.required])],
+            amount: [''],
+            frequency: [''],
             others_frequency : ['']
         });
     }
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.html
index c419c40d6..7302a038e 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.html
@@ -305,7 +305,7 @@
       <div fxFlex="60" class="pb-0 text-sm-left" align="left">
                 <!-- <mat-form-field appearance="outline" style="width: 100%">
                   <mat-label>Remarks</mat-label>
-                  <textarea matInput placeholder="Remarks" formControlName="personal_info_form_remark" required></textarea>
+                  <textarea matInput placeholder="Remarks" formControlName="personal_info_form_remark" ></textarea>
                 </mat-form-field> -->
       </div>
       <div fxFlex="40" align="end">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.ts
index 72ba6052e..57dfaafdc 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.ts
@@ -108,32 +108,32 @@ export class RentalInfoComponent implements OnInit {
             pdid: this.pdid,
             formid: this.form_id,
             fk_createdby: this.pdid,
-            person_met: ['', Validators.compose([Validators.required])],
-            property_own: ['', Validators.compose([Validators.required])],
-            nature_property: ['', Validators.compose([Validators.required])],
+            person_met: [''],
+            property_own: [''],
+            nature_property: [''],
             rental_home: this._fb.array([])
         });
     }
 
     createpropertyArray() {
         this.propertyList = this._fb.group({
-            complete_add: ['', Validators.compose([Validators.required])],
-            area_of_property: ['', Validators.compose([Validators.required])],
-            structure_property: ['', Validators.compose([Validators.required])],
-            total_room: ['', Validators.compose([Validators.required])],
-            is_rent: ['', Validators.compose([Validators.required])],
+            complete_add: [''],
+            area_of_property: [''],
+            structure_property: [''],
+            total_room: [''],
+            is_rent: [''],
             date_agreement: [''],
             date_validity: [''],
             rent_agreement: [''],
             actual_rent: [''],
             photo_areegment: [''],
-            bank: ['', Validators.compose([Validators.required])],
-            cash: ['', Validators.compose([Validators.required])],
-            rent_each_floor: ['', Validators.compose([Validators.required])],
-            total_rent: ['', Validators.compose([Validators.required])],
-            related_doc_owner: ['', Validators.compose([Validators.required])],
-            property_photographs: ['', Validators.compose([Validators.required])],
-            third_party_check: ['', Validators.compose([Validators.required])],
+            bank: [''],
+            cash: [''],
+            rent_each_floor: [''],
+            total_rent: [''],
+            related_doc_owner: [''],
+            property_photographs: [''],
+            third_party_check: [''],
             details_tenants: this._fb.array([this.createTenatsArray()]),
         });
         return this.propertyList;
@@ -141,12 +141,12 @@ export class RentalInfoComponent implements OnInit {
 
     createTenatsArray() {
         return this._fb.group({
-            name: ['', Validators.compose([Validators.required])],
-            mobile_no: ['', Validators.compose([Validators.required])],
-            tenants_seen: ['', Validators.compose([Validators.required])],
-            tenants_con_owner: ['', Validators.compose([Validators.required])],
-            staying_since: ['', Validators.compose([Validators.required])],
-            rent_paid: ['', Validators.compose([Validators.required])],
+            name: [''],
+            mobile_no: [''],
+            tenants_seen: [''],
+            tenants_con_owner: [''],
+            staying_since: [''],
+            rent_paid: [''],
         });
     }
 
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts
index a21ee4ad0..cbd3a7e76 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts
@@ -349,7 +349,7 @@ export class StockComponent implements OnInit {
       })
 
       // this.stockForms = this.fb.group({
-      //     stock_remarks: ['', Validators.compose([Validators.required])],
+      //     stock_remarks: [''],
       //     raw_materials: this.fb.array([]),
       //     finished_goods: this.fb.array([]),
       //     traded_goods: this.fb.array([])
@@ -563,8 +563,8 @@ tradingFormCreation(val) {
 
   createGoods2() {
       return this.fb.group({
-          goods_name: ['', Validators.compose([Validators.required])],
-          goods_observed: ['', Validators.compose([Validators.required])],
+          goods_name: [''],
+          goods_observed: [''],
           goods_quantity: [''],
           goods_value: [''],
           finished_goods_value: [''],
@@ -601,8 +601,8 @@ tradingFormCreation(val) {
   
   createTradedGoods2() {
       return this.fb.group({
-          traded_goods_name: ['', Validators.compose([Validators.required])],
-          traded_goods_observed: ['', Validators.compose([Validators.required])],
+          traded_goods_name: [''],
+          traded_goods_observed: [''],
           traded_goods_quantity: [''],
           estimated_traded_goods_value: [''],
           traded_goods_value: [''],

From fe95c3be4ac9b555d85d34fdc3f0dcc16c9cb087 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Mon, 7 Jan 2019 17:37:55 +0530
Subject: [PATCH 28/29] general : ps

---
 .../forms/general-info/general-info.component.html         | 3 ++-
 .../start-pd/forms/general-info/general-info.component.ts  | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
index 22ae6aeb9..26a2ea193 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
@@ -88,7 +88,8 @@
                             <ng-container matColumnDef="applicant_name">
                                     <mat-header-cell *matHeaderCellDef> Name </mat-header-cell>
                                     <mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i"> 
-                                    
+                                    <!-- {{details.value | json}} -->
+                                     <!-- <input type="hidden" [value]="delivery_extry" /> -->
                                      {{details.value.applicant_name | titlecase}}
                                 </mat-cell>
                             </ng-container>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts
index 41408795e..9011ccfbf 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts
@@ -242,9 +242,11 @@ export class GeneralInfoComponent implements OnInit {
     }
     createPersonsWithRelationships(elementValue:any){
       return this._fb.group({
+        pd_co_applicant_id: [elementValue.pd_co_applicant_id],
         applicant_name: [elementValue.applicant_name],
         relationship:[elementValue.relationship],
         relation_to:[elementValue.relation_to],
+        individuals_order_id: [elementValue.individuals_order_id],
     });
     }
     // create companies
@@ -402,8 +404,9 @@ export class GeneralInfoComponent implements OnInit {
               individualsControl.push(this.createIndividulas(element));
               console.log('Foreach Entry Count with Incremented',this.count);
               console.log('Final Count',this.count);
+              
               let relationControl = <FormArray>this._generalForm.controls['persons_with_relationships'];
-              let applicant_details: any= {'applicant_name':element.applicant_name,'relationship':'','relation_to':''};
+              let applicant_details: any= {'pd_co_applicant_id':element.pd_co_applicant_id,'applicant_name':element.applicant_name,'relationship':'','relation_to':'','individuals_order_id':element.individuals_order_id};
               relationControl.push(this.createPersonsWithRelationships(applicant_details));
 
               // let relationControl2 = <FormArray>this._generalForm.controls['applicant_relation'];
@@ -448,7 +451,7 @@ export class GeneralInfoComponent implements OnInit {
         saveRecords.company_with_relationships=formData.company_with_relationships;
         //saveRecords.applicant_relation=formData.applicant_relation;
         saveRecords.general_remark=formData.general_remark;
-        //console.log(saveRecords);
+        // console.log(saveRecords);
         this._pd.savePDFormDetailsWithID(saveRecords).subscribe(
           dataresult => {
             if (dataresult.status == 200) {

From d3ce0ea3c9b4af91b43cb350efca8e9b78ba84af Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Mon, 7 Jan 2019 19:15:02 +0530
Subject: [PATCH 29/29] general and business form changes

---
 .../business-info-group/business-info-group.component.html    | 2 +-
 .../start-pd/forms/business-info/business-info.component.html | 4 ++--
 .../start-pd/forms/general-info/general-info.component.html   | 2 +-
 .../start-pd/forms/general-info/general-info.component.ts     | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.html
index a5a1581a8..59b4577a5 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.html
@@ -9,7 +9,7 @@
   <mat-dialog-content>
     <mat-card *ngFor="let companyList of existCompanyList">
         <mat-card-header>
-            <mat-card-title class="p-text">{{companyList.company_name | titlecase}}</mat-card-title>
+            <mat-card-title class="p-text">{{companyList.company_name}}</mat-card-title>
         </mat-card-header>
         <mat-card-content>
         <div fxLayout="row wrap" class="child_mat_card">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
index 60b6fbffb..d19993c86 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
@@ -26,7 +26,7 @@
                                 <mat-form-field style="width: 45%;">
                                 <mat-select placeholder="Name in Which The Business is Run"
                                             formControlName="profession_name" required>
-                                    <mat-option [value]="company.company_name" *ngFor="let company of existCompanyList">{{company.company_name | titlecase}}</mat-option>
+                                    <mat-option [value]="company.company_name" *ngFor="let company of existCompanyList">{{company.company_name}}</mat-option>
                                     <!-- <mat-option value="Others">Others</mat-option> -->
                                 </mat-select>
                                 </mat-form-field>
@@ -37,7 +37,7 @@
                                     <mat-form-field style="width: 45%;">
                                             <mat-select placeholder="Business Entity Type"
                                                         formControlName="business_entity_type" required>
-                                                <mat-option [value]="entity.business_entity_type_id" *ngFor="let entity of businessEntityTypeList">{{entity.business_entity_type_name | titlecase}}</mat-option>
+                                                <mat-option [value]="entity.business_entity_type_id" *ngFor="let entity of businessEntityTypeList">{{entity.business_entity_type_name}}</mat-option>
                                             </mat-select>
                                     </mat-form-field>
                                     <mat-form-field style="width: 45%;" *ngIf="businessForm.controls.business_entity_type.value=='11'">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
index 26a2ea193..a143d746d 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
@@ -168,7 +168,7 @@
                                 <mat-select placeholder="Company / Firm" formControlName="relation_to_company" style="width: 75%;">
                                     <mat-option>Select</mat-option>  
                                             <mat-option *ngFor="let comp of companyList" [value]="comp.company_order_id">
-                                                {{comp.company_name | titlecase}}
+                                                {{comp.company_name}}
                                             </mat-option>
                                             <mat-option value="0" > Not Applicable </mat-option>
                                 </mat-select>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts
index 9011ccfbf..c7ef5161b 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts
@@ -254,6 +254,7 @@ export class GeneralInfoComponent implements OnInit {
       return this._fb.group({
         company_order_id: [elementValue.company_order_id],
         company_name: [elementValue.company_name],
+        company_messrs_name: ['M/s'],
         is_active: [elementValue.is_active]
     });
     }