entity and pd trigger UI changes

ng6-seed/src/app/pd-triger/add-pd/add-pd.component.html

@@ -106,16 +106,21 @@
                                 <input matInput placeholder="Pincode" formControlName="pincode" required>
                                 <mat-error *ngIf="pdMain.pincode.hasError('required')">Pincode is required.</mat-error>
                         </mat-form-field> 
-                                        <mat-slide-toggle formControlName="allocation_type"
+						  <div class="ml-xs mr-xs" style="width: 100%;" fxLayout="row" >
-                                        class="example-margin" id="type"
+							   <h4 mat-dialog-title style="width: 14%;margin-top: 0%;">Allocation</h4>
-                                        [(ngModel)]="allocationTypeCheck" (change)="changeAllocationType(allocationTypeCheck)"
+								<div style="width: 20%;"> <mat-slide-toggle formControlName="allocation_type"
-                                        checked="allocationTypeModel==1 ? false:allocationTypeModel==2 ? false:allocationTypeModel==3 ? true"> {{allocationLabel}}  
+															class="example-margin" id="type"
-                                    </mat-slide-toggle> 
+															[(ngModel)]="allocationTypeCheck" (change)="changeAllocationType(allocationTypeCheck)"
-                                    <mat-slide-toggle *ngIf="allocationTypeModel==1 || allocationTypeModel==2" formControlName="sub_allocation_type"
+															checked="allocationTypeModel==1 ? false:allocationTypeModel==2 ? false:allocationTypeModel==3 ? true"> {{allocationLabel}}  
-                                        class="example-margin" id="subType"
+														</mat-slide-toggle> </div>
-                                        [(ngModel)]="subAllocationTypeCheck" (change)="changeSubAllocationType(subAllocationTypeCheck)" 
+								<div style="width: 20%;">
-                                        checked="allocationTypeModel==1 ? false:allocationTypeModel==2 ? true"> {{subAllocationLabel}} 
+									<mat-slide-toggle *ngIf="allocationTypeModel==1 || allocationTypeModel==2" formControlName="sub_allocation_type"
-                                    </mat-slide-toggle>
+															class="example-margin" id="subType"
+															[(ngModel)]="subAllocationTypeCheck" (change)="changeSubAllocationType(subAllocationTypeCheck)" 
+															checked="allocationTypeModel==1 ? false:allocationTypeModel==2 ? true"> {{subAllocationLabel}} 
+														</mat-slide-toggle>
+									</div>
+        </div>
 						 
                 </div>
              </mat-card>
@@ -134,7 +139,7 @@
                             </mat-form-field>     
                             <mat-form-field style="width: 100%">
                                 <input matInput placeholder="Email" formControlName="email" type="email" required>
-                                <mat-error *ngIf="pdMain.email.hasError('required')">Email is required.</mat-error>
+                                <mat-error *ngIf="pdMain.email.hasError('required')">Email number is required.</mat-error>
 
                 </mat-form-field>
                 
@@ -148,6 +153,7 @@
           </div>
         </div>
         <div fxLayout="row" fxLayoutWrap="wrap" formArrayName="items" *ngFor="let coDetails of pdCoApplicant.controls; let i = index;">
+		
             <div class="column" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100">
                  
                   <mat-card class="p-2">
@@ -173,8 +179,10 @@
 					
             <div class="column" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100">
                   <mat-card class="p-2" style="opacity: 0.5;">
+				  <h5>Co-Applicant</h5>
                           <!-- <button _ngcontent-c29="" class="mr-1 mb-2 mat-fab1 mat-accent" mat-fab="" (click)="addCoApplicant(createWithLongContent)"><span class="mat-button-wrapper"><mat-icon _ngcontent-c29="" class="mat-icon material-icons" role="img" aria-hidden="true">add</mat-icon></span><div class="mat-button-ripple mat-ripple mat-button-ripple-round" matripple=""></div><div class="mat-button-focus-overlay"></div></button> -->
-                          <button _ngcontent-c39="" class="mr-1 mb-1 mat-button" type="button"><span style="opacity: 0.5;" (click)="addCoApplicant()" class="mat-button-wrapper">Add More Co-Applicant</span><div class="mat-button-ripple mat-ripple" matripple=""></div><div class="mat-button-focus-overlay"></div></button>
+                                      <!--<button mat-fab class="mr-1 mb-1" color="primary" (click)="addCoApplicant()"><mat-icon>add</mat-icon></button>-->
+					   <button  mat-fab class="mr-1 mb-1"  color="primary" style="opacity: 0.5;" (click)="addCoApplicant()"><mat-icon>add</mat-icon><div class="mat-button-ripple mat-ripple" matripple=""></div><div class="mat-button-focus-overlay"></div></button> 
                           <!-- <button mat-raised-button mat-button-sm color="primary" (click)="addCoApplicant()" type="button">Add More Co-Applicant</button> -->
         
                        </mat-card>
@@ -185,10 +193,11 @@
             <div class="column" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100">
             
              <mat-card class="p-2" formArrayName="documents">
+			 <h5>Document</h5>
                 <mat-list>
                     <mat-list-item>
                 <!-- <button mat-raised-button mat-button-sm color="primary"  type="button">Add Document</button> -->
-                <button _ngcontent-c39="" class="mr-1 mb-1 mat-button" type="button"><span style="opacity: 0.5;" (click)="addMoreDocs()" class="mat-button-wrapper">Add Document</span><div class="mat-button-ripple mat-ripple" matripple=""></div><div class="mat-button-focus-overlay"></div></button>
+                <button mat-fab class="mr-1 mb-1"  color="primary" style="opacity: 0.5;" (click)="addMoreDocs()" class="mat-button-wrapper"><mat-icon>add</mat-icon><div class="mat-button-ripple mat-ripple" matripple=""></div><div class="mat-button-focus-overlay"></div></button>
 
               </mat-list-item>
               </mat-list>
@@ -204,9 +213,7 @@
                                             <input type="file" title="Browse Document" (change)="fileSelectionEvent($event,d)" formControlName="documentFile">
                               </mat-list-item>
                               <mat-list-item>
-                                    <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="removeItem(d)"
+                                  <button mat-button color="accent" (click)="removeItem(d)" type="button">Remove</button>
-                                    (click)="loadPdListCompoent()"><mat-icon>delete</mat-icon></button>
-                                  <!-- <button mat-button color="accent" (click)="removeItem(d)" type="button">Remove</button> -->
                                 </mat-list-item>
                             </mat-list>
                           </mat-card>
@@ -227,4 +234,4 @@
       </mat-card-actions>
        </form>
       </mat-card>
-      <notifier-container></notifier-container>                  
+                  

ng6-seed/src/app/pd-triger/edit-pd-applicant/edit-pd-applicant.component.html

@@ -70,5 +70,4 @@
 </mat-card-actions>
  </form>
 </mat-card>
-<notifier-container></notifier-container>                  
             

ng6-seed/src/app/pd-triger/edit-pd-master/edit-pd-master.component.html

@@ -115,4 +115,3 @@
   </mat-card-actions>
  </form>
 </mat-card>
-<notifier-container></notifier-container>                  

ng6-seed/src/app/pd-triger/edit-pd-master/edit-pd-master.component.ts

@@ -21,7 +21,7 @@ export class EditPdMasterComponent implements OnInit {
   @Input() masterChild: any;
   @Output() loadPdView = new EventEmitter<string>();
   public _EditPDtriggerForm:FormGroup;
-  private notifier: NotifierService;
+  public notifier: NotifierService;
   constructor(private _fb: FormBuilder,
     private _pd: PdTrigerService, notifier: NotifierService,) {
       this.notifier=notifier

ng6-seed/src/app/pd-triger/list-pd/list-pd.component.html

@@ -1,19 +1,21 @@
 <div align="right" *ngIf="showParentComponent"> 
-    <button mat-button (click)="addPdDetails()" color="primary">ADD PD</button>
+	 <button mat-fab class="mr-1 mb-1" color="primary"  (click)="addPdDetails()"><mat-icon>add</mat-icon></button>
+			
   </div>
 <mat-card *ngIf="showParentComponent">
   <mat-tab-group>
     <mat-tab>
-      <ng-template mat-tab-label>All PD Details</ng-template>
+      <ng-template mat-tab-label>All</ng-template>
+      <mat-card-content>
           <div class="card-comment-widget">
               <mat-list *ngIf="pdList.length > 0">
                  <mat-list-item  *ngFor="let details of dataSource.connect() | async">
-                    <img mat-list-avatar src="assets/images/face3.jpg" alt="">
+                    <img mat-list-avatar src="assets/images/lime.jpg" alt="">
                     <!-- {{details.applicat_details[0].applicant_name}} -->
                     <p mat-line>{{details.applicat_details[0].applicant_name}} </p>
                     
-                    <p mat-line>{{details.lender_full_name}} &nbsp;&nbsp;&nbsp;{{details.lender_applicant_id}} &nbsp;&nbsp;{{details.pd_date_of_initiation}}</p>
+                    <p mat-line><a style="padding-right: 7%;">{{details.lender_full_name}} </a><a style="padding-right: 7%">{{details.lender_applicant_id}}</a>{{details.pd_date_of_initiation}}</p>
-                    <p mat-line>{{details.product_abbr}}/{{details.subproduct_abbr}}/{{details.customer_segment_abbr}}&nbsp;&nbsp;<span class="hover-icon"><i class="fa-1x fa fa-rupee">&nbsp;</i>{{details.loan_amount}}</span>&nbsp;&nbsp;<span class="hover-icon"><i class="fa-1x fa fa-map-marker"> </i> &nbsp;{{details.city_name}}/{{details.state_name}}-{{details.pincode}}</span></p>
+                    <p mat-line><a style="padding-right: 7%;">{{details.product_abbr}}/{{details.subproduct_abbr}}/{{details.customer_segment_abbr}}</a><a style="padding-right: 7%;"><span class="hover-icon"><i class="fa-1x fa fa-rupee">&nbsp;</i>{{details.loan_amount}}</span></a><span class="hover-icon"><i class="fa-1x fa fa-map-marker"> </i> &nbsp;{{details.city_name}}/{{details.state_name}}-{{details.pincode}}</span></p>
                     <!-- <span class="text-mat mat-text-muted">Chennai</span> -->
 
                    <!-- <div class="comment-time">
@@ -28,26 +30,26 @@
                         
             
                       </div>
-                      <mat-divider></mat-divider>
-                 </mat-list-item>
                       
+                 </mat-list-item>
+                 <hr>
                  </mat-list>
                  <mat-list *ngIf="recordStatus">
                   <mat-list-item>
                     <p mat-line>No Record Found ...</p>
 
                   </mat-list-item>
-                  
                  </mat-list>
            </div>
+      </mat-card-content>
 
       <mat-card-actions *ngIf="!recordStatus">
-        <mat-paginator #paginator [length]="pdList.length" [pageIndex]="pageIndex" [pageSize]="pageSize"
+        <mat-paginator #paginator class="mat-elevation-z1" [length]="pdList.length" [pageIndex]="pageIndex" [pageSize]="pageSize"
         [pageSizeOptions]="[5, 10, 25, 100]" (page)="pageEvent = $event; pageChange($event)">
       </mat-paginator>      
     </mat-card-actions>
     </mat-tab>
-    <!-- <mat-tab>
+   <!-- <mat-tab>
       <ng-template mat-tab-label>Confirmed PD Details</ng-template>
       <mat-card-content>
         <mat-grid-list cols="2" [rowHeight]="ratio" gutterSize="4px">
@@ -61,11 +63,11 @@
           </mat-form-field>
         </div>
       </mat-card-content>
-    </mat-tab>
+    </mat-tab>-->
     <mat-tab>
-      <ng-template mat-tab-label>In Progress PD Details</ng-template>
+      <ng-template mat-tab-label>In Progress </ng-template>
       <mat-card-content>
-        <mat-grid-list cols="2" rowHeight="fit" [gutterSize]="ratioGutter"
+        <!--<mat-grid-list cols="2" rowHeight="fit" [gutterSize]="ratioGutter"
                       [style.height]="fitListHeight">
           <mat-grid-tile *ngFor="let tile of tiles" [style.background]="'#F1EBBA'">
             {{tile.text}}
@@ -78,9 +80,47 @@
           <mat-form-field>
             <input matInput placeholder="Change gutter" type="number" [(ngModel)]="ratioGutter">
           </mat-form-field>
-        </div>
+        </div>-->
       </mat-card-content>
-    </mat-tab> -->
+    </mat-tab>
+	<mat-tab>
+      <ng-template mat-tab-label>Scheduled </ng-template>
+      <mat-card-content>
+        <!--<mat-grid-list cols="2" rowHeight="fit" [gutterSize]="ratioGutter"
+                      [style.height]="fitListHeight">
+          <mat-grid-tile *ngFor="let tile of tiles" [style.background]="'#F1EBBA'">
+            {{tile.text}}
+          </mat-grid-tile>
+        </mat-grid-list>
+        <div  fxLayout="row" fxLayoutAlign="start center" class="mt-2">
+          <mat-form-field>
+            <input matInput placeholder="Change list height" [(ngModel)]="fitListHeight">
+          </mat-form-field>
+          <mat-form-field>
+            <input matInput placeholder="Change gutter" type="number" [(ngModel)]="ratioGutter">
+          </mat-form-field>
+        </div>-->
+      </mat-card-content>
+    </mat-tab>
+	<mat-tab>
+      <ng-template mat-tab-label>Completed </ng-template>
+      <mat-card-content>
+        <!--<mat-grid-list cols="2" rowHeight="fit" [gutterSize]="ratioGutter"
+                      [style.height]="fitListHeight">
+          <mat-grid-tile *ngFor="let tile of tiles" [style.background]="'#F1EBBA'">
+            {{tile.text}}
+          </mat-grid-tile>
+        </mat-grid-list>
+        <div  fxLayout="row" fxLayoutAlign="start center" class="mt-2">
+          <mat-form-field>
+            <input matInput placeholder="Change list height" [(ngModel)]="fitListHeight">
+          </mat-form-field>
+          <mat-form-field>
+            <input matInput placeholder="Change gutter" type="number" [(ngModel)]="ratioGutter">
+          </mat-form-field>
+        </div>-->
+      </mat-card-content>
+    </mat-tab>
     
   </mat-tab-group>
 </mat-card>

ng6-seed/src/app/pd-triger/list-pd/list-pd.component.ts

@@ -1,6 +1,6 @@
 import { Component, ViewChild, OnInit, ViewEncapsulation, EventEmitter, Output } from '@angular/core';
-import { MatPaginator, MatSort, MatTableDataSource, PageEvent } from '@angular/material';
 import { PdTrigerService } from '../pd-service/pd-triger.service';
+import { MatPaginator, MatSort, MatTableDataSource, PageEvent } from '@angular/material';
 
 @Component({
   selector: 'app-list-pd',
@@ -109,9 +109,6 @@ export class ListPdComponent implements OnInit {
           }
         }, error => this.errorMessage = <any> error);
   }
-  ngAfterViewInit() {
-    this.dataSource.paginator = this.paginator;
-  }
   addPdDetails(){
     this.showParentComponent=false
     this.showEditComponent=false
@@ -152,7 +149,6 @@ export class ListPdComponent implements OnInit {
           this.pdListData = data.records;
           this.dataLength = data.records.length;
           this.dataSource.data = this.pdListData;
-          this.recordStatus=false;
           
         }
         else{

ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.html

@@ -1,27 +0,0 @@
-  <mat-card>
-    <mat-card-header>
-      <mat-card-title>{{pageTitle}}</mat-card-title>
-    </mat-card-header>
-    <mat-card-content>
-
-    <form [formGroup]="_pdAllocationForm" (submit)="onSubmit()">
-      <!--<div class="form-group">-->
-      <div fxLayout="row" fxLayoutAlign="start none">
-        <mat-form-field class="ml-xs example-full-width">
-          <mat-select placeholder="Select Name" formControlName="allocation_id">
-            <mat-option *ngFor="let ct of pdOfficerList" [value]="ct">{{ ct.categroy_name }}</mat-option>
-          </mat-select>
-          <mat-error *ngIf="readForm.allocation_id.hasError('required')" class="mat-text-warn">Select name.</mat-error>
-        </mat-form-field>
-      </div>
-      <div class="row" style="text-align:right;">
-        <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button"
-          (click)="closeAllocationComponent()"><mat-icon>close</mat-icon></button>
-        <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="submit"><mat-icon>save</mat-icon></button>
-      </div>
-      <!--</div>-->
-    </form>
-    </mat-card-content>
-  </mat-card>
-
-<notifier-container></notifier-container>

ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.spec.ts

@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { PdAllocationComponent } from './pd-allocation.component';
-
-describe('PdAllocationComponent', () => {
-  let component: PdAllocationComponent;
-  let fixture: ComponentFixture<PdAllocationComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ PdAllocationComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(PdAllocationComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.ts

@@ -1,85 +0,0 @@
-import { Component, OnInit, Inject } from '@angular/core';
-import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
-import { FormBuilder, FormGroup, Validators, FormControl, FormArray } from '@angular/forms';
-import { NotifierService } from 'angular-notifier';
-import { PdTrigerService } from '../pd-service/pd-triger.service';
-
-@Component({
-  selector: 'app-pd-allocation',
-  templateUrl: './pd-allocation.component.html',
-  styleUrls: ['./pd-allocation.component.scss']
-})
-export class PdAllocationComponent implements OnInit {
-  public pageTitle: string = "PD Allocation To";
-  public _pdAllocationForm: FormGroup;
-  public pdOfficerList: any = [];
-  errorMessage: any;
-  notifier : NotifierService;
-  constructor( notifier: NotifierService,
-    private _fb: FormBuilder,
-    private dialogRef: MatDialogRef<PdAllocationComponent>,
-    private _pd: PdTrigerService,
-    @Inject(MAT_DIALOG_DATA) public data: any) { 
-    this.notifier=notifier;
-    console.log(this.data)
-    this.getPDOfficerList();
-  }
-
-  ngOnInit() {
-    this._pdAllocationForm = this._fb.group({
-      pd_primary_id: [null],
-      allocation_id: [null, Validators.compose([Validators.required])],
-    });
-  }
-
-// convenience getter for easy access to form fields
-get readForm() { return this._pdAllocationForm.controls; }
-
-// pd officer list
-  getPDOfficerList(){
-    this._pd.getPdOfficerList().subscribe(
-      data => {
-        if (data.status == 200) {
-         this.pdOfficerList=data.records.pd_master_details;
-      
-        }
-  }, error => this.errorMessage = <any> error);
-    
-  }
-  /** To Save/Edited Popup Data */
-  onSubmit() {
-    // stop here if form is invalid
-    if (this._pdAllocationForm.invalid) {
-      this.errorMessage = "Please Fill All Mandate Fields.";
-      return;
-    } else {
-      var updateData = this._pdAllocationForm.value;
-
-      //To Remove The "Null" With Key also
-      Object.keys(updateData).forEach((key) => (updateData[key] == null) && delete updateData[key]);
-
-      //Add BRANCH data with help Service File
-      this._pd.updatePdOfficer(updateData).subscribe(
-        result => {
-          if (result.status == 200) {
-            this.notifier.notify('success', 'Your Changes Updated.!');
-            this.dialogRef.close();
-          }
-          else {
-            this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
-            this.errorMessage = "Something Wents Wrong Try Again.!";
-          }
-        }, error => {
-          this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
-          this.errorMessage = "Some Thing Wents Wrong Try Again.!";
-          this.dialogRef.close();
-        });
-      //After Saving the BRANCH data then popup close
-      // this.dialogRef.close();
-    }
-  }
-/** For Popup Close Button */
-closeAllocationComponent(): void {
-  this.dialogRef.close();
-}
-}

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

@@ -21,7 +21,7 @@ export interface Master {
 export class PdTrigerService {
 
   private  apiUrl = "http://ssa.sineedge.com/sparqapi/api/";
-  //private  apiUrl = "http://192.168.15.5:9999/AWSEC2/sparqapi/api/";
+  //private  apiUrl = "http://192.168.0.17:9999/AWSEC2/sparqapi/api/";
 
   
   
@@ -113,6 +113,7 @@ export class PdTrigerService {
                   updatePdApplicant(editData:any):Observable<any>{
                    // editData.fk_updatedby = this._aws.getlocale();
                    // editData.updatedon = currentdate;
+                   console.log(editData)
                     return this._http.post<any>(this.apiUrl+"updatePDApplicants",{"pd_applicant_details":editData})
     
                     .pipe(
@@ -120,24 +121,10 @@ export class PdTrigerService {
                          )
                       }
                   
-                // get pd allocation to details
-                getPdOfficerList(): Observable<any> {
-                  return this._http.get<any>(this.apiUrl+"getListPDOfficers")
-                  .pipe(
-                         catchError(this.handleError('operation', []))
-                       )
-                    }
-                    // update pd officer
-                    updatePdOfficer(updateData: any): Observable<any> {
-                      return this._http.post<any>(this.apiUrl+"updatePDApplicants",{"pd_applicant_details":updateData})
-                      .pipe(
-                             catchError(this.handleError('operation', []))
-                           )
-                        }
   
-      private handleError<T>(operation = 'operation', result?: T) {
+  private handleError<T>(operation = 'operation', result?: T) {
-        return (error: any): Observable<T> => {
+    return (error: any): Observable<T> => {
-          return of(result as T);
+      return of(result as T);
-        };
+    };
-      }
+  }
 }

ng6-seed/src/app/pd-triger/pd-triger.module.ts

@@ -19,8 +19,6 @@ import { MatTooltipModule } from '@angular/material/tooltip';
 
 import { NgxMatSelectSearchModule } from 'ngx-mat-select-search';
 import { NotifierModule, NotifierOptions } from 'angular-notifier';
-import {MatDatepickerModule} from '@angular/material/datepicker';
-
 
 import 'hammerjs';
 import { PdTrigerRoutes } from './pd-triger-routing.module';
@@ -31,11 +29,10 @@ import { EditPdComponent } from './edit-pd/edit-pd.component';
 import { ViewPdComponent } from './view-pd/view-pd.component';
 import { EditPdMasterComponent } from './edit-pd-master/edit-pd-master.component';
 import { EditPdApplicantComponent } from './edit-pd-applicant/edit-pd-applicant.component';
-import { PdAllocationComponent } from './pd-allocation/pd-allocation.component';
 /**
  * Custom angular notifier options
  */
-const customNotifierOptions: NotifierOptions = {
+const pdCustomNotifierOptions: NotifierOptions = {
   position: {
 		horizontal: {
 			position: 'right',
@@ -79,7 +76,7 @@ const customNotifierOptions: NotifierOptions = {
   imports: [
     CommonModule,
     RouterModule.forChild(PdTrigerRoutes),
-    NotifierModule.withConfig(customNotifierOptions),
+    NotifierModule.withConfig(pdCustomNotifierOptions),
     MatCardModule,
     MatIconModule,
     MatInputModule,
@@ -97,10 +94,9 @@ const customNotifierOptions: NotifierOptions = {
     FileUploadModule,
     TreeModule,
     MatDialogModule,MatSortModule,
-    NgxMatSelectSearchModule,MatTooltipModule, MatDatepickerModule,
+    NgxMatSelectSearchModule,MatTooltipModule,
   ],
-  declarations: [AddPdComponent, ListPdComponent, EditPdComponent, ViewPdComponent, EditPdMasterComponent, EditPdApplicantComponent, PdAllocationComponent],
+  declarations: [AddPdComponent, ListPdComponent, EditPdComponent, ViewPdComponent, EditPdMasterComponent, EditPdApplicantComponent],
-  entryComponents: [PdAllocationComponent],
   providers: [PdTrigerService]
 })
 export class PdTrigerModule { }

ng6-seed/src/app/pd-triger/view-pd/view-pd.component.html

@@ -1,13 +1,14 @@
-<div class="row" style="text-align:left;">
+<!-- <pre>{{pdMasterData | json}}</pre>
+  <pre>{{pdApplicantData | json}}</pre>
+  <pre>{{pdDocumentsData | json}}</pre>
+  <pre>{{pdLogsData | json}}</pre> -->
+  <!-- pd master card -->
+  <div class="row" style="text-align:right;">
     <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon"  type="button" (click)="loadPdListCompoent()"><mat-icon>close</mat-icon></button>        
-      
 </div>
 <div *ngIf="!showEditMasterComponent">
 <mat-card *ngFor="let master of pdMasterData">
     <div class="cardEdit">
-        <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="pdAllocationTo(master)"><mat-icon>directions_run</mat-icon></button>
-        <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button"><mat-icon>schedule</mat-icon></button>
-
         <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="editPdMaster(master)"><mat-icon>edit</mat-icon></button>
       </div>
     <mat-card-header>
@@ -17,7 +18,6 @@
         <mat-card-subtitle 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-subtitle>
         
       </mat-card-header>
-      <mat-divider></mat-divider>
     <mat-card-content>
       <p>{{master.product_name}} / {{master.subproduct_name}}</p>
       <p><span>{{master.pd_type_name}}&nbsp;&nbsp;&nbsp;{{master.pd_allocation_type_name}} &nbsp;&nbsp;&nbsp;{{master.pd_allocated_to}}</span></p>
@@ -40,7 +40,7 @@
     <mat-card-header>
         <mat-card-title>Applicants</mat-card-title>
       </mat-card-header>
-      <mat-divider></mat-divider>
+    <mat-card-content>
       <mat-list *ngFor="let applicant of pdApplicantData">
         <mat-list-item>
           <p><span *ngIf="applicant.applicant_name!=null" class="mb-2 text-center hover-icon">
@@ -53,31 +53,31 @@
   
 
         </mat-list-item>
+        
       </mat-list>
     
+    </mat-card-content>
    
   </mat-card>
   <app-edit-pd-applicant *ngIf="showEditApplicantComponent" [applicantChild]="editApplicantData" (loadPdView)="updateViewComponent($event)"></app-edit-pd-applicant>
   <!-- pd documents details -->
   <mat-card>
-      <!-- <div class="cardEdit">
+      <div class="cardEdit">
-          <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon"><mat-icon>edit</mat-icon></button>
+          <button mat-raised-button mat-button-sm mat-icon-button class="mr-1 mb-1 hover-icon"><mat-icon>edit</mat-icon></button>
-        </div> -->
+        </div>
     <mat-card-header>
         <mat-card-title>Documents</mat-card-title>
         <!-- <mat-card-subtitle><i class="fa-1x fa fa-map-marker"> </i> &nbsp;{{master.city_name}} / {{master.state_name}}-{{master.pincode}}</mat-card-subtitle> -->
       </mat-card-header>
-      <mat-divider></mat-divider>
+    <mat-card-content>
       <mat-list *ngFor="let documents of pdDocumentsData">
         <mat-list-item>
-            <p><span>
-            {{documents.pd_document_title}} </span> &nbsp;&nbsp;&nbsp;<span class="mb-2 text-center hover-icon">
-                <i class="fa-1x fa fa-file"></i>
-            &nbsp;{{documents.pd_document_name}} </span> 
-              </p>
         </mat-list-item>
+        
       </mat-list>
-      </mat-card>
+    
+    </mat-card-content>
+  </mat-card>
   <!-- pd logs card -->
   <mat-card>
     <mat-card-header>
@@ -86,11 +86,4 @@
     <mat-card-content>
     
     </mat-card-content>
-    
   </mat-card>
-  
-<!-- <mat-form-field>
-  <input matInput [matDatepicker]="picker" placeholder="Choose a date">
-  <mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle>
-  <mat-datepicker #picker></mat-datepicker>
-</mat-form-field> -->

ng6-seed/src/app/pd-triger/view-pd/view-pd.component.scss

@@ -1,3 +1,3 @@
 .cardEdit {
-    display: inline;float:right;
+    display: inline;float:right;padding-top:3%;
 }

ng6-seed/src/app/pd-triger/view-pd/view-pd.component.ts

@@ -1,9 +1,8 @@
 import { Component, OnInit,ViewEncapsulation, EventEmitter, Input, Output } from '@angular/core';
-import {  MatDialog } from '@angular/material';
 import { FormBuilder, FormGroup, Validators, FormControl, FormArray } from '@angular/forms';
+import { CustomValidators } from 'ng2-validation';
 import { NotifierService } from 'angular-notifier';
 import { PdTrigerService } from '../pd-service/pd-triger.service';
-import { PdAllocationComponent } from '../pd-allocation/pd-allocation.component';
 @Component({
   selector: 'app-view-pd',
   templateUrl: './view-pd.component.html',
@@ -26,7 +25,7 @@ export class ViewPdComponent implements OnInit {
   @Output() loadParent = new EventEmitter<string>();
   public _EditPDtriggerForm:FormGroup;
   constructor(private _fb: FormBuilder,
-    private _pd: PdTrigerService, notifier:NotifierService, private dialog: MatDialog,) {
+    private _pd: PdTrigerService, notifier:NotifierService) {
    this.notifier=notifier
    }
 
@@ -43,7 +42,6 @@ export class ViewPdComponent implements OnInit {
       if (data.status == 200) {
        this.pdMasterData=data.records.pd_master_details;
        this.pdApplicantData= data.records.applicants_details;
-       this.pdDocumentsData=data.records.pd_documnets;
        this.pdLogsData=data.records.pd_logs;
       }
 }, error => this.errorMessage = <any> error);
@@ -61,18 +59,6 @@ export class ViewPdComponent implements OnInit {
     this.editApplicantData=applicantData;
     this.showEditApplicantComponent=!this.showEditApplicantComponent;
   }
-  // pd allocation to
-  // edit questions master details popup model
-  pdAllocationTo(pdID:any) {
-    const dialogRef = this.dialog.open(PdAllocationComponent, {
-      data: pdID,
-      disableClose: true
-    });
-    dialogRef.afterClosed()
-      .subscribe(dataresult => {
-        //this.getQuestionsMasters();
-      });
-  }
   updateViewComponent(editBack:string) {
     
  if(editBack=='1'){

ng6-seed/src/app/settings/entity/entity-add/entity.add.component.html

@@ -1,13 +1,14 @@
 <div style="max-height: 580px;">
+<form [formGroup]="_addQuesFrom" (submit)="onSubmit()">
     <mat-card style="padding: 6px;">
         <div class="ml-xs mr-xs" style="width: 100%;" fxLayout="row" fxLayoutAlign="center">
             <h2 mat-dialog-title style="width: 50%;">{{pageTitle}}</h2>
             <div style="width: 20%;"></div>
             <div style="width: 30%;text-align:right;">
-                <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button>
+                <button mat-raised-button mat-icon-button color="primary" class="mr-1 mb-1 hover-icon" matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button>
             </div>
         </div>
-        <form [formGroup]="_addQuesFrom" (submit)="onSubmit()">
+        
             <!--<div class="form-group">-->
 
             <div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start">
@@ -18,7 +19,6 @@
                     <mat-error *ngIf="submitted && f.fk_entity_type_id.hasError('required')" class="mat-text-warn">You must Select Entity Type.</mat-error>
                 </mat-form-field>
             </div> 
-            <hr>
             <div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start">
 
                 <mat-form-field fxFlex="0 1 auto" class="ml-xs">
@@ -65,8 +65,16 @@
 
             <div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start">
                 <mat-form-field fxFlex="0 1 auto" class="ml-xs">
-                    <input matInput placeholder="Address" formControlName="addressline1">
+                    <input matInput placeholder="Address 1" formControlName="addressline1">
                     <mat-error *ngIf="submitted && f.addressline1.hasError('required')" class="mat-text-warn">You must Include Address.</mat-error>
+                </mat-form-field>
+				<mat-form-field fxFlex="0 1 auto" class="ml-xs">
+                    <input matInput placeholder="Address 2" formControlName="addressline2">
+                    <!--<mat-error *ngIf="submitted && f.addressline2.hasError('required')" class="mat-text-warn">You must Include Address.</mat-error>-->
+                </mat-form-field>
+				<mat-form-field fxFlex="0 1 auto" class="ml-xs">
+                    <input matInput placeholder="Address 3" formControlName="addressline3">
+                   <!-- <mat-error *ngIf="submitted && f.addressline3.hasError('required')" class="mat-text-warn">You must Include Address.</mat-error>-->
                 </mat-form-field>
                 <mat-form-field fxFlex="0 1 auto" class="ml-xs">
                     <input matInput placeholder="Pincode" formControlName="pincode">
@@ -82,8 +90,8 @@
                 </mat-form-field>
 
                 <mat-form-field fxFlex="0 1 auto" class="ml-xs">
-                    <input matInput placeholder="Alternet Email" formControlName="alt_email">
+                    <input matInput placeholder="Alternate Email" formControlName="alt_email">
-                    <mat-error *ngIf="submitted && f.alt_email.hasError('required')" class="mat-text-warn">You must Select Alternet Email.</mat-error>
+                   <!-- <mat-error *ngIf="submitted && f.alt_email.hasError('required')" class="mat-text-warn">You must Select Alternet Email.</mat-error>-->
                 </mat-form-field>
 
                 <mat-form-field fxFlex="0 1 auto" class="ml-xs">
@@ -93,7 +101,7 @@
 
                 <mat-form-field fxFlex="0 1 auto" class="ml-xs">
                     <input matInput placeholder="Mobile Number" formControlName="mobile_no">
-                    <mat-error *ngIf="submitted && f.mobile_no.hasError('required')" class="mat-text-warn">You must Include Mobile Number.</mat-error>
+                  <!--  <mat-error *ngIf="submitted && f.mobile_no.hasError('required')" class="mat-text-warn">You must Include Mobile Number.</mat-error>-->
                 </mat-form-field>
             </div>
 
@@ -103,10 +111,12 @@
                     <mat-error *ngIf="submitted && f.remarks.hasError('required')" class="mat-text-warn">You must Include Remarks.</mat-error>
                 </mat-form-field>
             </div>
- <hr>
+			</mat-card>
+			 <mat-card style="padding: 6px;">
+			 <h2 mat-dialog-title style="width: 50%;">{{subTitle1}}</h2>
             <div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start">
                 <mat-form-field fxFlex="0 1 auto" class="ml-xs">
-                    <input matInput placeholder="Pan Number" formControlName="pan">
+                    <input matInput placeholder="PAN Number" formControlName="pan">
                     <mat-error *ngIf="submitted && f.pan.hasError('required')" class="mat-text-warn">You must Include Pan Number.</mat-error>
                 </mat-form-field>
 
@@ -124,8 +134,10 @@
                     <mat-error *ngIf="submitted && f.tat.hasError('required')" class="mat-text-warn">You must Include TAT.</mat-error>
                 </mat-form-field>
             </div>
-             <hr>
+			</mat-card>
+			 <mat-card style="padding: 6px;">
         <div fxLayout="row wrap" fxLayoutAlign="start none">
+		<h2 mat-dialog-title style="width: 50%;">{{subTitle2}}</h2>
           <div formArrayName="entity_child" class="example-full-width">
             <div *ngFor="let answ of _addQuesFrom.controls.entity_child['controls']; let i=index">
               <div [formGroupName]="i">
@@ -157,8 +169,9 @@
                 </div>
               </div>
             </div>
-            <button mat-button color="primary" matTooltip="Add More Answer" matTooltipPosition="above" (click)="addLanguage($event); false">Add More</button>
+           <!-- <button mat-button color="primary" matTooltip="Add More Answer" matTooltipPosition="above" (click)="addLanguage($event); false">Add More</button>-->
-           </div>
+            <button mat-fab class="mr-1 mb-1" color="primary" matTooltip="Add More Contact Person" matTooltipPosition="above" (click)="addLanguage($event); false"><mat-icon>add</mat-icon></button>
+			 </div>
         </div>
         
             <!--Error List Shown Here-->
@@ -172,8 +185,9 @@
                 <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit"><mat-icon>save</mat-icon></button>
             </div>
             <!--</div>-->
+			</mat-card>
         </form>
-    </mat-card>
+    
 </div>
 
 

ng6-seed/src/app/settings/entity/entity-add/entity.add.component.ts

@@ -36,7 +36,9 @@ import { EntityService } from './../../service/entity/entity.service';
 })
 export class EntityAddComponent implements OnInit {
 
-  public pageTitle: string = "Add Entity Master Details";
+  public pageTitle: string = "Entity";
+  public subTitle1: string = "Tax Info";
+  public subTitle2: string = "Contacts";
   public _addQuesFrom: FormGroup;
   public submitted = false;
   public categories: any = [];
@@ -73,9 +75,7 @@ export class EntityAddComponent implements OnInit {
         addressline1: [null, Validators.compose([Validators.required])],
         pincode: [null, Validators.compose([Validators.required])],
         official_email: [null, Validators.compose([Validators.required, Validators.email])], 
-        alt_email: [null, Validators.compose([Validators.required, Validators.email])],
         phone_number: [null, Validators.compose([Validators.required])], 
-        mobile_no: [null, Validators.compose([Validators.required])],
         remarks: [null, Validators.compose([Validators.required])],
         pan: [null, Validators.compose([Validators.required])],
         gst_no: [null, Validators.compose([Validators.required])],

ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.html

@@ -1,13 +1,14 @@
 <div style="max-height: 580px;">
+<form [formGroup]="_addQuesFrom" (submit)="onSubmit()">
     <mat-card style="padding: 6px;">
         <div class="ml-xs mr-xs" style="width: 100%;" fxLayout="row" fxLayoutAlign="center">
             <h2 mat-dialog-title style="width: 50%;">{{pageTitle}}</h2>
             <div style="width: 20%;"></div>
             <div style="width: 30%;text-align:right;">
-                <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button>
+                <button mat-raised-button mat-icon-button color="primary" class="mr-1 mb-1 hover-icon" matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button>
             </div>
         </div>
-        <form [formGroup]="_addQuesFrom" (submit)="onSubmit()">
+        
             <!--<div class="form-group">-->
             <div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start" style="padding: 6px 4px;">
               
@@ -18,7 +19,6 @@
                     <mat-error *ngIf="submitted && f.fk_entity_type_id.hasError('required')" class="mat-text-warn">You must Select Entity Type.</mat-error>
                 </mat-form-field>
             </div> 
-            <hr>
             <div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start" style="padding: 6px 4px;">
 
                 <mat-form-field fxFlex="0 1 auto" class="ml-xs">
@@ -65,8 +65,16 @@
 
             <div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start" style="padding: 6px 4px;">
                 <mat-form-field fxFlex="0 1 auto" class="ml-xs">
-                    <input matInput placeholder="Address" formControlName="addressline1">
+                    <input matInput placeholder="Address 1" formControlName="addressline1">
                     <mat-error *ngIf="submitted && f.addressline1.hasError('required')" class="mat-text-warn">You must Include Address.</mat-error>
+                </mat-form-field>
+				<mat-form-field fxFlex="0 1 auto" class="ml-xs">
+                    <input matInput placeholder="Address 2" formControlName="addressline2">
+                    <!--<mat-error *ngIf="submitted && f.addressline2.hasError('required')" class="mat-text-warn">You must Include Address.</mat-error>-->
+                </mat-form-field>
+				<mat-form-field fxFlex="0 1 auto" class="ml-xs">
+                    <input matInput placeholder="Address 3" formControlName="addressline3">
+                    <!--<mat-error *ngIf="submitted && f.addressline3.hasError('required')" class="mat-text-warn">You must Include Address.</mat-error>-->
                 </mat-form-field>
                 <mat-form-field fxFlex="0 1 auto" class="ml-xs">
                     <input matInput placeholder="Pincode" formControlName="pincode">
@@ -82,8 +90,8 @@
                 </mat-form-field>
 
                 <mat-form-field fxFlex="0 1 auto" class="ml-xs">
-                    <input matInput placeholder="Alternet Email" formControlName="alt_email">
+                    <input matInput placeholder="Alternate Email" formControlName="alt_email">
-                    <mat-error *ngIf="submitted && f.alt_email.hasError('required')" class="mat-text-warn">You must Select Alternet Email.</mat-error>
+                   <!-- <mat-error *ngIf="submitted && f.alt_email.hasError('required')" class="mat-text-warn">You must Select Alternet Email.</mat-error>-->
                 </mat-form-field>
 
                 <mat-form-field fxFlex="0 1 auto" class="ml-xs">
@@ -93,7 +101,7 @@
 
                 <mat-form-field fxFlex="0 1 auto" class="ml-xs">
                     <input matInput placeholder="Mobile Number" formControlName="mobile_no">
-                    <mat-error *ngIf="submitted && f.mobile_no.hasError('required')" class="mat-text-warn">You must Include Mobile Number.</mat-error>
+                  <!--  <mat-error *ngIf="submitted && f.mobile_no.hasError('required')" class="mat-text-warn">You must Include Mobile Number.</mat-error>-->
                 </mat-form-field>
             </div>
 
@@ -103,10 +111,12 @@
                     <mat-error *ngIf="submitted && f.remarks.hasError('required')" class="mat-text-warn">You must Include Remarks.</mat-error>
                 </mat-form-field>
             </div>
- <hr>
+			</mat-card>
+			 <mat-card style="padding: 6px;">			 
+			 <h2 mat-dialog-title style="width: 50%;">{{subTitle1}}</h2>
             <div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start" style="padding: 6px 4px;">
                 <mat-form-field fxFlex="0 1 auto" class="ml-xs">
-                    <input matInput placeholder="Pan Number" formControlName="pan">
+                    <input matInput placeholder="PAN Number" formControlName="pan">
                     <mat-error *ngIf="submitted && f.pan.hasError('required')" class="mat-text-warn">You must Include Pan Number.</mat-error>
                 </mat-form-field>
 
@@ -124,7 +134,10 @@
                     <mat-error *ngIf="submitted && f.tat.hasError('required')" class="mat-text-warn">You must Include TAT.</mat-error>
                 </mat-form-field>
             </div>
-             <hr>
+             </mat-card>
+			 <mat-card style="padding: 6px;">
+			 
+			 <h2 mat-dialog-title style="width: 50%;">{{subTitle2}}</h2>
         <div fxLayout="row wrap" fxLayoutAlign="start none" style="padding: 6px 4px;">
           <div formArrayName="entity_child" class="example-full-width">
             <div *ngFor="let answ of _addQuesFrom.controls.entity_child['controls']; let i=index">
@@ -160,8 +173,8 @@
                 </div>
               </div>
             </div>
-            <button mat-button color="primary" matTooltip="Add More" matTooltipPosition="above" (click)="addLanguage(null, null, null, null, null, $event); false">Add More</button>
+			<button mat-fab class="mr-1 mb-1" color="primary" matTooltip="Add More Answer" matTooltipPosition="above" (click)="addLanguage(null, null, null, null, null, $event); false"><mat-icon>add</mat-icon></button>
-           </div>
+			</div>
         </div>
         
             <!--Error List Shown Here-->
@@ -175,6 +188,7 @@
             (click)="onReset()"><mat-icon>settings_backup_restore</mat-icon></button><button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit"><mat-icon>save</mat-icon></button>
             </div>
             <!--</div>-->
-        </form>
+        
     </mat-card>
+	</form>
 </div>

ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.ts

@@ -33,7 +33,9 @@ export class EntityEditComponent implements OnInit{
 
    @Input() public childMessage: any;
 
-public pageTitle: string = "Edit Entity Master Details";
+public pageTitle: string = "Entity";
+ public subTitle1: string = "Tax Info";
+  public subTitle2: string = "Contacts";
   public _addQuesFrom: FormGroup;
   public submitted = false;
   public categories: any = [];
@@ -98,9 +100,7 @@ public pageTitle: string = "Edit Entity Master Details";
         addressline1: [this.childMessage.addressline1, Validators.compose([Validators.required])], 
         pincode: [this.childMessage.pincode, Validators.compose([Validators.required])],
         official_email: [this.childMessage.official_email, Validators.compose([Validators.required, Validators.email])], 
-        alt_email: [this.childMessage.alt_email, Validators.compose([Validators.required, Validators.email])],
         phone_number: [this.childMessage.phone_number, Validators.compose([Validators.required])], 
-        mobile_no: [this.childMessage.mobile_no, Validators.compose([Validators.required])],
         remarks: [this.childMessage.remarks, Validators.compose([Validators.required])],
         pan: [this.childMessage.pan, Validators.compose([Validators.required])],
         gst_no: [this.childMessage.gst_no, Validators.compose([Validators.required])],

ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html

@@ -1,12 +1,13 @@
 <div *ngIf="listView">
   <mat-card>
 
-    <mat-card class="mat-elevation-z1">
+   
         <div style="margin: 6px; padding: 4px;">
-          <div class="p_title" style="font-size: 16px; font-style: bold;">Entity Master</div>
+          <div class="p_title" style="font-size: 26px; font-style: bold;">Entity Master</div>
-          <div class="sub_title" style="font-size: 11px;">List of Entity Master Details</div>
+          <!--<div class="sub_title" style="font-size: 11px;">List of Entity Master Details</div>-->
+		  <hr>
         </div>
-        <div fxLayout="row" fxLayout.xs="column" fxLayoutWrap fxLayoutAlign="center none">
+        <div fxLayout="row" fxLayout.xs="column" fxLayoutWrap fxLayoutAlign="center none" >
           <div fxFlex="80%">
             <!--<form [formGroup]="filterFormGroupCtrl">
               <div fxLayout="row" fxLayout.xs="column" fxLayoutWrap fxLayoutGap="0.5px" fxLayoutAlign="start none" style="padding: 6px;">
@@ -21,14 +22,14 @@
           </div>
           <div fxFlex="20%">
               <!--<a [routerLink]="['/'+'setting/entity/add' ]">-->
-              <button mat-stroked-button color="primary" (click)="addNewQuestion()">
+              <!--<button mat-stroked-button color="primary" (click)="addNewQuestion()">Add New Entity</button>-->
-              Add New Entity</button>
+			  <button mat-fab class="mr-1 mb-1" color="primary" (click)="addNewQuestion()"><mat-icon>add</mat-icon></button>
               <!--</a>-->
             
           </div>
         </div>
         <!--</mat-card-content>-->
-      </mat-card>
+      
 <!--
     <mat-card class="mat-elevation-z1">
       <div style="margin: 6px; padding: 4px;">
@@ -39,13 +40,13 @@
     <ng-container *ngIf="enityList.length > 0">
       <div style="padding: 0 12px;">
         <mat-card class="product-card" *ngFor="let product of dataSource.connect() | async">
-          <div fxLayout="row" fxLayoutAlign="start start" style="padding: 6px 2px;">
+          <div fxLayout="row" fxLayoutAlign="start start">
-            <div fxFlex="90%" style="padding: 12px 8px;">
+            <div fxFlex="90%" style="padding-top: 10px;">
               <div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start">
                 <div fxFlex="0 1 auto" class="ml-xs" fxFlex="10%">
                   {{ product.entity_name }}
                 </div>
-                <div fxFlex="0 1 auto" class="ml-xs" fxFlex="30%">
+                <div fxFlex="0 1 auto" class="ml-xs" fxFlex="40%">
                   <div><b>{{ product.full_name }} ({{product.short_name}})</b></div>
                   <div> {{ product.branch_name }} </div>
                   <div> {{product.city_name}}, {{product.state_name}} </div>