From a7c6c24e6636a406326f894886096071244aa198 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Thu, 15 Nov 2018 18:14:58 +0530
Subject: [PATCH 1/2] assets form frequency key name changes

---
 .../start-pd/forms/assets-info/assets-info.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/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 bb44aef7f..fd8954030 100644
--- 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
@@ -112,7 +112,7 @@
                                 <div fxFlex="33">
                                   <mat-form-field>
                                     <mat-select placeholder="Frequency" formControlName="frequency_mode">
-                                      <mat-option *ngFor="let freqn of m_freqOfPurchase" [value]="freqn.id">{{ freqn.name }}</mat-option>
+                                      <mat-option *ngFor="let freqn of m_freqOfPurchase" [value]="freqn.frequency_id">{{ freqn.name }}</mat-option>
                                     </mat-select>
                                   </mat-form-field>
                                 </div>

From a45e3b640c3e2d637f1da659f38f0bb71f145eb2 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Thu, 15 Nov 2018 18:15:36 +0530
Subject: [PATCH 2/2] merge : kms

---
 .../edit-pd-applicant.component.html             | 16 +++-------------
 .../list-pd/view-pd/view-pd.component.html       |  2 +-
 .../qc-list/qc-view/qc-view.component.html       |  2 +-
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html
index 6b83b14eb..3ae92fc5a 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html
@@ -62,19 +62,9 @@
             </mat-card>
          </div>
          </div>
-         <div fxLayout="row" fxLayoutWrap="wrap">
-  
-      <div class="column" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100">
-            <mat-card>
-              <mat-card-content>
-                    <button  mat-raised-button mat-icon-button class="mr-1 mb-1" matTooltip="Add More Co-Applicant" matTooltipPosition="above" color="primary" type="button" (click)="addCoApplicant(emptyData)"><mat-icon>add</mat-icon></button>
-                  </mat-card-content>
-                 </mat-card>
-    </div>
-   </div>
-                        
- 
- <div style="text-align: right">
+    <div style="text-align: right">
+    <button  mat-raised-button mat-icon-button class="mr-1 mb-1" matTooltip="Add More Co-Applicant" matTooltipPosition="above" color="primary" type="button" (click)="addCoApplicant(emptyData)"><mat-icon>add</mat-icon></button>
+                  
         <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Reset" matTooltipPosition="above" type="button"
         (click)="onReset()"><mat-icon>settings_backup_restore</mat-icon></button>
       
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 234582cf1..3674c3165 100644
--- 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
@@ -77,7 +77,7 @@
                      <i class="fa-1x fa fa-user-o"></i>
                  &nbsp;{{applicant.applicant_name}} </span> &nbsp;&nbsp;&nbsp;<span *ngIf="applicant.mobile_no!=null" class="mb-2 text-center hover-icon">
                      <i class="fa-1x fa fa-phone"></i>
-                 &nbsp;{{applicant.mobile_no}} </span> <br><span *ngIf="applicant.applicant_type=='1';else codetails" style="font-size:12px;">Main Applicant</span>
+                 &nbsp;{{applicant.mobile_no}} </span> <br><span *ngIf="applicant.applicant_type=='1';else codetails" style="font-size:12px;">Main Applicant <br></span>
                  <ng-template #codetails>&nbsp;&nbsp;&nbsp;<span>{{applicant.relation_name}}</span></ng-template>
                    </p>                            
                  </mat-list-item>                      
diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html
index 6d24d5113..900b3663f 100644
--- a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html
+++ b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html
@@ -69,7 +69,7 @@
                        <i class="fa-1x fa fa-user-o"></i>
                    &nbsp;{{applicant.applicant_name}} </span> &nbsp;&nbsp;&nbsp;<span *ngIf="applicant.mobile_no!=null" class="mb-2 text-center hover-icon">
                        <i class="fa-1x fa fa-phone"></i>
-                   &nbsp;{{applicant.mobile_no}} </span> <br><span *ngIf="applicant.applicant_type=='1';else codetails" style="font-size:12px;">Main Applicant</span>
+                   &nbsp;{{applicant.mobile_no}} </span> <br><span *ngIf="applicant.applicant_type=='1';else codetails" style="font-size:12px;">Main Applicant<br></span>
                    <ng-template #codetails>&nbsp;&nbsp;&nbsp;<span>{{applicant.relation_name}}</span></ng-template>
                      </p>