From 9a50080e3c3d64fb2b2579f01606275ac7506219 Mon Sep 17 00:00:00 2001
From: dineshkumarkannan <dineshmail.kannan@gmail.com>
Date: Mon, 24 Dec 2018 15:31:15 +0530
Subject: [PATCH 1/2] other family details forms chanages : kdk

---
 .../family-details/family-details.component.html     | 12 +-----------
 .../forms/family-details/family-details.component.ts | 10 +++++-----
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html
index 56803b3fd..1da680d6a 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html
@@ -16,12 +16,7 @@
                     <div fxLayout="row wrap">
                         <div fxFlex="100">
                             <mat-card>
-                                <!-- <mat-card-title>Address Details</mat-card-title> -->
                                 <mat-card-content>
-
-                                    <!--<mat-form-field>
-                                        <input matInput placeholder="Number Of Family Members" formControlName="members" required>
-                                    </mat-form-field>-->
                                     <div>
                                         <mat-form-field>
                                             <mat-select placeholder="Select a person" formControlName="selected_person" required>
@@ -81,9 +76,6 @@
                                                     <mat-form-field>
                                                         <input matInput placeholder="Name" formControlName="family_member_name" required>
                                                     </mat-form-field>
-                                                    <!--<mat-form-field>
-                                                        <input matInput placeholder="Relationship" formControlName="family_member_relationship" required>
-                                                    </mat-form-field>-->
                                                     <mat-form-field>
                                                         <mat-select placeholder="Relationship" formControlName="family_member_relationship" required>
                                                             <mat-option value="{{relation.relationship_id}}" *ngFor="let relation of relationData">
@@ -105,8 +97,7 @@
                                                     </mat-form-field>
                                                 </div>
                                                 <div *ngIf="item.get('family_member_earning_status').value == 1">
-                                                    <!--<pre>{{ customerSegData | json}}</pre>-->
-                                                    <mat-form-field>
+                                                        <mat-form-field>
                                                         <mat-select placeholder="Segment" formControlName="earning_segment" required>
                                                             <mat-option value="{{segment.customer_segment_id}}" *ngFor="let segment of customerSegData">
                                                                 {{segment.name}}
@@ -259,7 +250,6 @@
             </mat-form-field>
         </div>
         <div fxFlex="40" align="end">
-            <!-- <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="submit" matTooltip="Save" matTooltipPosition="above"><mat-icon>save</mat-icon></button> -->
             <button type="submit" mat-raised-button mat-icon-button type="submit" matTooltip="Submit" matTooltipPosition="above" (click)="submitFamily()"><mat-icon>save</mat-icon></button>
         </div>
     </mat-dialog-actions>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts
index 5f32b8ba6..a90c465d5 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts
@@ -577,11 +577,11 @@ export class FamilyDetailsComponent implements OnInit {
 //         records.formid = '6';
 //         // records.fk_createdby = '251';
 //         console.log(JSON.stringify(records));
-//         this._pd.saveForm(records).subscribe(data => {
-//             this.notifier.notify('success', 'Saved Successfully.');
-//         }, error => {
-//             this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
-//         });
+//         // this._pd.saveForm(records).subscribe(data => {
+//         //     this.notifier.notify('success', 'Saved Successfully.');
+//         // }, error => {
+//         //     this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
+//         // });
 //     }
 //     // validateAllFormFields(formGroup: FormGroup) {
 //     //     Object.keys(formGroup.controls).forEach(field => {

From f30bb3720c559458fc9964486e69daa5b6bab576 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Mon, 24 Dec 2018 17:56:47 +0530
Subject: [PATCH 2/2] UI changes

---
 .../list-pd/start-pd/start-pd.component.html        | 13 +++++++------
 .../list-pd/start-pd/start-pd.component.scss        |  9 +++++++++
 2 files changed, 16 insertions(+), 6 deletions(-)

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 a79735f1e..17292f75b 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
@@ -16,14 +16,15 @@
     </mat-card-header>
     <mat-card-content style="max-height:100% !important;">
         <div fxLayout="row wrap" class="child_mat_card">
-        <mat-card fxFlex.xs="80" fxFlex.sm="45" fxFlex.md="30" fxFlex.lg="23" fxFlex.xl="23" *ngFor="let formButton of categoryFormButtons;let quesIndex=index" [ngStyle]="{'background-color':formButton.isAnswered == false ? '#fff' : '#4caf50' ,'color':'#fff'}" (click)="OnSelectDirectForms(formButton)">
-            <mat-card-header >
-                    <div fxFlex="90" align="left" style="padding:15px !important;">
-                        {{ (formButton.form_name.length>17)? (formButton.form_name | slice:0:17)+'..':(formButton.form_name) }}
+        <mat-card fxFlex.xs="80" fxFlex.sm="45" fxFlex.md="32" fxFlex.lg="32" fxFlex.xl="33" *ngFor="let formButton of categoryFormButtons;let quesIndex=index" [ngStyle]="{'background-color':formButton.isAnswered == false ? '#fff' : '#4caf50' ,'color':'#fff'}" (click)="OnSelectDirectForms(formButton)">
+            <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>                    
-                    <div fxFlex="20" align="end">
+                    <!--<div fxFlex="20" align="end">
                         <span style="padding: 2px 9px 3px 9px !important;" class="menu-badge mat-purple ng-star-inserted" align="center">{{quesIndex+1}}</span>
-                    </div>            
+                    </div>            -->
             </mat-card-header>
         </mat-card>                                                                                                                                          
     </div>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.scss
index ce04f2137..bd80283eb 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.scss
@@ -1,6 +1,12 @@
 // .child_mat_card mat-card {
 //      margin: 2 0%;
 // }
+   ::ng-deep .mat-card-header-text{
+        margin:0px !important;
+    }
+    .mat-purple{
+           background-color: gray !important;
+    }
 mat-card.parent_mat_card > {
     mat-card-header {
         display: flex;
@@ -11,6 +17,8 @@ mat-card.parent_mat_card > {
         max-height:52vh;
         overflow:auto;  
     }
+  
+   
     .user-thumb {
     position: absolute;
     bottom: -35%;
@@ -66,3 +74,4 @@ mat-card .child_mat_card > mat-card {
     }
        
     }
+