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

2018-10-13 18:44:36 +05:30 · 2018-10-13 18:44:36 +05:30 · e51a16c2e9
commit e51a16c2e9
parent 9b99281bd9 d489ebf773
12 changed files with 451 additions and 108 deletions
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.html
@ -40,7 +40,7 @@
                          <p>{{details.pd_date_of_initiation}} <span style="padding-left: 4%;" class="hover-icon"><i class="fa-1x fa fa-rupee">&nbsp;</i>{{details.loan_amount}}</span></p>
                        </mat-card-subtitle>
                        <mat-card-actions>
-                            <button  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  mat-raised-button mat-button-sm mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="pdAllocationTo(details)"><mat-icon>directions_run</mat-icon></button>
                          <!-- <button mat-button>Cancel</button> -->
                        </mat-card-actions>
                      </mat-card>
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.ts
@ -2,17 +2,19 @@ import { Component, ViewChild, OnInit, OnDestroy } from '@angular/core';
 import { MatPaginator, MatSort, MatTableDataSource, PageEvent } from '@angular/material';
 import { ActivatedRoute, Router } from '@angular/router';
 import { NotifierService } from 'angular-notifier';
+import {  MatDialog } from '@angular/material';
 import { PdTrigerService } from '../../../pd-service/pd-triger.service';
 import { GetGeometricLocationService } from '../../../location-service/get-geometric-location.service';
 import { ListPdComponent } from '../list-pd.component';
-
+import { PdAllocationComponent } from '../pd-allocation/pd-allocation.component';
+import { SmartPdAllocationComponent } from '../smart-pd-allocation/smart-pd-allocation.component';
@Component({
  selector: 'app-map-pd-view',
  templateUrl: './map-pd-view.component.html',
  styleUrls: ['./map-pd-view.component.scss']
 })
 export class MapPdViewComponent implements OnInit, OnDestroy {
-  
+  private notifier:NotifierService;
  lat:string
  lng:string
  mapDetails:any[] = [];
@ -30,14 +32,18 @@ public dataSource = new MatTableDataSource();
@ViewChild(MatPaginator) paginator: MatPaginator;
@ViewChild(MatSort) sort: MatSort;
 pdList:any[] = [];
-  constructor(private route: ActivatedRoute,
-    private router: Router,private _pd: PdTrigerService,private _geolocation: GetGeometricLocationService, private ListPdComponent : ListPdComponent) {
-
+  constructor(notifier:NotifierService,private route: ActivatedRoute,
+    private router: Router,private _pd: PdTrigerService,private dialog: MatDialog,private _geolocation: GetGeometricLocationService, private ListPdComponent : ListPdComponent) {
+      this.notifier=notifier
   }

  ngOnInit() {
    this.ListPdComponent.showListView(false);
    this.recordStatus=false
+    this.loadPdDetails();
+  }
+
+  loadPdDetails(){
    this._pd.getPdDetails()
    .subscribe(
        data => {
@ -85,6 +91,34 @@ pdList:any[] = [];
    this.ListPdComponent.showListView(true);
    this.router.navigate([ '../../' ], { relativeTo: this.route });

+  }
+
+   // pd allocation to
+   pdAllocationTo(pdData:any) {
+    if(pdData.fk_pd_type != 2){
+      const dialogRef = this.dialog.open(PdAllocationComponent, {
+        data: pdData,
+        disableClose: true
+      });
+      dialogRef.afterClosed()
+      .subscribe(dataresult => {
+       // this.notifier.notify('success', 'Successfully allocated.!');
+        this.loadPdDetails();
+      });
+    }
+    else if(pdData.fk_pd_type == 2){
+      const dialogRef = this.dialog.open(SmartPdAllocationComponent, {
+        data: pdData,
+        disableClose: true
+      });
+      dialogRef.afterClosed()
+      .subscribe(dataresult => {
+      //  this.notifier.notify('success', 'Successfully allocated.!');
+        this.loadPdDetails();
+      });
+    }
+   
+   
  }
  ngOnDestroy(): void {
    this.ListPdComponent.showListView(true);
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.html
@ -1,4 +1,8 @@
 <div style="max-height: 480px;">
+    <div 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>
+  
+    </div>
  <mat-card style="width: 580px; padding: 2px;">
    <mat-card-header>
      <mat-card-title>{{pageTitle}}</mat-card-title>
@ -28,13 +32,14 @@
              <p>PD officer not available..</p>
            </mat-list-item>
        </mat-list>
-      <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 (click)="updatePdOfficer(selectedItem)" class="mr-1 mb-1 hover-icon" type="button"><mat-icon>save</mat-icon></button>
-      </div>
+      
    <!-- </form> -->
    </mat-card-content>
+    <mat-card-actions>
+        <div style="text-align:right;">
+            <button mat-raised-button mat-icon-button (click)="updatePdOfficer(selectedItem)" class="mr-1 mb-1 hover-icon" type="button"><mat-icon>save</mat-icon></button>
+          </div>
+    </mat-card-actions>
  </mat-card>
 </div>
 <notifier-container></notifier-container>
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.ts
@ -43,7 +43,8 @@ export class PdAllocationComponent implements OnInit {
    this._pd.getPdOfficerList(pdID).subscribe(
      data => {
        if (data.status == 200) {
-         this.pdOfficerList=data.records;
+          this.pdOfficerList= data.records.filter(item => item.fk_pd_type_id != 2);
+
      
        }
  }, error => this.errorMessage = <any> error);
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/smart-pd-allocation/smart-pd-allocation.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/smart-pd-allocation/smart-pd-allocation.component.html
@ -0,0 +1,95 @@
+<div style="max-height: 480px;">
+  <div 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>
+
+  </div>
+    
+    <mat-card style="width: 580px; padding: 2px;" [style.display]="showFirstCard ? 'block' : 'none'">
+      <mat-card-header>
+        <mat-card-title>{{pageTitle}}</mat-card-title>
+      </mat-card-header>
+      <mat-card-content>
+  
+      <!-- <form [formGroup]="_pdAllocationForm" (submit)="onSubmit()"> -->
+        <mat-list *ngIf="pdOfficerList.length > 0" >
+            <mat-radio-group>
+            <mat-list-item *ngFor="let officer of pdOfficerList; ">
+              <p><mat-radio-button [value]="officer" (change)="selectPdOfficer(officer)"></mat-radio-button>
+                  {{officer.first_name}}
+                </p>
+                <p style="padding-left: 8%;">
+                    <span matBadge="{{officer.allocated}}" matBadgeOverlap="false" matBadgeColor="accent">Allocated</span>
+                  </p>
+                  <p style="padding-left: 8%;">
+                      <span matBadge="{{officer.scheduled}}" matBadgeOverlap="false" >Scheduled</span>
+                    </p>
+                    <p style="padding-left: 8%;">
+                        <span matBadge="{{officer.inprogress}}" matBadgeOverlap="false" matBadgeColor="warn">Inprogress</span>
+                      </p>
+                    
+            </mat-list-item>
+          </mat-radio-group>
+          </mat-list>
+          <mat-list *ngIf="pdOfficerList.length == 0">
+              <mat-list-item>
+                <p>PD officer not available..</p>
+              </mat-list-item>
+          </mat-list>
+        
+      <!-- </form> -->
+      </mat-card-content>
+      <mat-card-actions>
+          <div style="text-align:right;">
+              <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" [disabled]="selectedItem.length==0" (click)="getSecondCard()"><mat-icon>arrow_forward</mat-icon></button>
+
+          </div>
+      </mat-card-actions>
+    </mat-card>
+    <mat-card style="width: 580px; padding: 2px;" [style.display]="showSecondCard ? 'block' : 'none'">
+        <mat-card-header>
+          <mat-card-title>{{pageTitle2}}</mat-card-title>
+        </mat-card-header>
+        <mat-card-content>
+            
+            <mat-list *ngIf="pdExcutiveList.length > 0">
+                <mat-radio-group>
+                <mat-list-item *ngFor="let excutive of pdExcutiveList">
+                  <p><mat-radio-button [value]="excutive" (change)="selectExcutiveOfficer(excutive)"></mat-radio-button>
+                      {{excutive.first_name}}
+                    </p>
+                    <p style="padding-left: 8%;">
+                        <span matBadge="{{excutive.allocated}}" matBadgeOverlap="false" matBadgeColor="accent">Allocated</span>
+                      </p>
+                      <p style="padding-left: 8%;">
+                          <span matBadge="{{excutive.scheduled}}" matBadgeOverlap="false" >Scheduled</span>
+                        </p>
+                        <p style="padding-left: 8%;">
+                            <span matBadge="{{excutive.inprogress}}" matBadgeOverlap="false" matBadgeColor="warn">Inprogress</span>
+                          </p>
+                        
+                </mat-list-item>
+              </mat-radio-group>
+              </mat-list>
+              <mat-list *ngIf="pdExcutiveList.length == 0">
+                  <mat-list-item>
+                    <p>Excutive officer not available..</p>
+                  </mat-list-item>
+              </mat-list>
+
+          
+        <!-- </form> -->
+        </mat-card-content>
+        <mat-card-actions>
+            <div style="text-align:right;">
+                <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" [disabled]="selectedItem.length==0" (click)="getFirstCard()"><mat-icon>arrow_back</mat-icon></button>
+                <button mat-raised-button mat-icon-button (click)="updateAllocation(selectedItem,selectedItem1)" [disabled]="selectedItem.length==0 || selectedItem1.length==0" class="mr-1 mb-1 hover-icon" type="button"><mat-icon>save</mat-icon></button>
+
+            </div>
+        </mat-card-actions>
+      </mat-card>
+  </div>
+  <notifier-container></notifier-container>
+  
+  
+  
+  
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/smart-pd-allocation/smart-pd-allocation.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/smart-pd-allocation/smart-pd-allocation.component.scss
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/smart-pd-allocation/smart-pd-allocation.component.spec.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/smart-pd-allocation/smart-pd-allocation.component.spec.ts
@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { SmartPdAllocationComponent } from './smart-pd-allocation.component';
+
+describe('SmartPdAllocationComponent', () => {
+  let component: SmartPdAllocationComponent;
+  let fixture: ComponentFixture<SmartPdAllocationComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ SmartPdAllocationComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SmartPdAllocationComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/smart-pd-allocation/smart-pd-allocation.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/smart-pd-allocation/smart-pd-allocation.component.ts
@ -0,0 +1,136 @@
+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-smart-pd-allocation',
+  templateUrl: './smart-pd-allocation.component.html',
+  styleUrls: ['./smart-pd-allocation.component.scss']
+})
+export class SmartPdAllocationComponent implements OnInit {
+
+  public pageTitle: string = "Allocate To PD Officer";
+  public pageTitle2: string = "Allocate To Excutive Officer";
+  public _pdAllocationForm: FormGroup;
+  public pdOfficerList: any = [];
+  public pdExcutiveList: any = [];
+  errorMessage: any;
+  notifier : NotifierService;
+  selectedItem:any=[];
+  selectedItem1:any=[];
+  isDisabled: boolean;
+  showFirstCard: boolean;
+  showSecondCard: boolean;
+  
+  constructor( notifier: NotifierService,
+    private _fb: FormBuilder,
+    private dialogRef: MatDialogRef<SmartPdAllocationComponent>,
+    private _pd: PdTrigerService,
+    @Inject(MAT_DIALOG_DATA) public data: any) { 
+    this.notifier=notifier;
+  }
+
+  ngOnInit() {
+    this.showFirstCard=true;
+//     this.pdExcutiveList=[
+//       {
+//           "first_name": "Ramya",
+//           "allocated": "4",
+//           "scheduled":"2",
+//           "inprogress":"0",
+//     },
+//     {
+//       "first_name": "Sri Vidhya",
+//       "allocated": "5",
+//       "scheduled":"3",
+//       "inprogress":"2",
+// },
+//   ]
+//   this.pdOfficerList=[
+//     {
+//         "first_name": "Moorthy",
+//         "allocated": "4",
+//         "scheduled":"2",
+//         "inprogress":"0",
+//   },
+//   {
+//     "first_name": "Priya",
+//     "allocated": "5",
+//     "scheduled":"3",
+//     "inprogress":"2",
+// },
+// ]
+    this.isDisabled=true;
+    this.getPDOfficerList(this.data.pd_id);
+  }
+
+// pd officer list
+  getPDOfficerList(pdID:string){
+    this._pd.getPdOfficerList(pdID).subscribe(
+      data => {
+        if (data.status == 200) {
+          this.pdOfficerList= data.records.filter(item => item.fk_pd_type_id != 2);
+          this.pdExcutiveList= data.records.filter(item => item.fk_pd_type_id == 2);      
+        }
+  }, error => this.errorMessage = <any> error);
+    
+  }
+  // select pd officer list
+  selectPdOfficer(selected:any){
+    
+    this.selectedItem=selected;
+   // this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
+
+  }
+  // select excutive officer
+  selectExcutiveOfficer(selected:any){
+    this.isDisabled=false;
+    this.selectedItem1=selected;
+  }
+  /** To update pd officer*/
+  updateAllocation(pdOfficer:any,excutiveOfficer:any) {
+    if(this.isDisabled){
+      this.notifier.notify('warning', 'Please Choose Allocate To Whom.!');
+    }
+     else {
+      let updateData =  {
+        "pd_id":this.data.pd_id,
+        "fk_pd_allocated_to":pdOfficer.fk_user_id,
+        "excutive_id":excutiveOfficer.fk_user_id,
+      }
+      this._pd.updatePdOfficer(updateData).subscribe(
+        result => {
+          if (result.status == 200) {
+            this.notifier.notify('success', 'PD Allocated.!');
+            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();
+        });
+    }
+  }
+  getFirstCard() {
+    this.showSecondCard=false;
+    this.showFirstCard=true;
+    
+  }
+  getSecondCard(){
+    this.showFirstCard=false;
+    this.showSecondCard=true;
+    
+   
+  }
+/** For Popup Close Button */
+    closeAllocationComponent(): void {
+      this.dialogRef.close();
+    }
+
+}
--- 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,87 +1,115 @@
-<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>
-<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>
-        <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-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 class="mb-2" >
+        <mat-card-header>
+          <div style="width:100%;text-align: right;padding-top: 1%;">
+                <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>
+              </mat-card-header>
+        <mat-card-content>
+            <div fxLayout="row">

-      </mat-card-header>
-    <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>
-      <p><span>{{master.addressline1}}</span></p>
-      <p><span>{{master.addressline2}}</span></p>
-      <p><span>{{master.addressline3}}</span></p>
+            <div class="column" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50">
+                <!--pd master  -->
+              <mat-card *ngFor="let master of pdMasterData">
+                    <div class="cardEdit">
+                        <button 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 mat-raised-button mat-button-sm mat-icon-button class="mr-1 mb-1 hover-icon" type="button"><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>
+                      </div>
+                    <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-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>
                        
-      <p><span class="hover-icon"><i class="fa-1x fa fa-rupee">&nbsp;</i>{{master.loan_amount}}</span> &nbsp;&nbsp;&nbsp;<span>{{master.pd_status_name}}</span>&nbsp;&nbsp;&nbsp;<span>{{master.pd_date_of_initiation}}</span></p>
+                      </mat-card-header>
+                    <mat-card-content>
+                      <p>{{master.product_name}} / {{master.subproduct_name}}</p>
+                      <p><span>{{master.pd_type_name}}&nbsp;&nbsp;&nbsp;{{master.pd_allocated_to}}</span></p>
+                      <p><span>{{master.addressline1}}</span></p>
+                      <p><span>{{master.addressline2}}</span></p>
+                      <p><span>{{master.addressline3}}</span></p>
                      
-    </mat-card-content>
-  </mat-card>
+                      <p><span class="hover-icon"><i class="fa-1x fa fa-rupee">&nbsp;</i>{{master.loan_amount}}</span> &nbsp;&nbsp;&nbsp;<span>{{master.pd_status_name}}</span>&nbsp;&nbsp;&nbsp;<span>{{master.pd_date_of_initiation}}</span></p>
                     
-  <!--  applicant card -->
-  <mat-card>
-      <div class="cardEdit">
-          <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="editPdApplicant(pdApplicantData)"><mat-icon>edit</mat-icon></button>
-        </div>
-    <mat-card-header>
-        <mat-card-title>Applicants</mat-card-title>
-      </mat-card-header>
-    <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">
-            <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> &nbsp;&nbsp;&nbsp;<span *ngIf="applicant.applicant_type=='1';else codetails"> Main Applicant</span>
-        <ng-template #codetails>&nbsp;&nbsp;&nbsp;<span>{{applicant.relation}}</span></ng-template>
-          </p>
+                    </mat-card-content>
+                  </mat-card>
                          
                
-        </mat-list-item>
+              </div>
+              <div class="column" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50">
+                  <!-- applicant card  -->
+                <mat-card>
+                      <div class="cardEdit">
+                          <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>
+                    <mat-card-header>
+                        <mat-card-title>Applicants</mat-card-title>
+                      </mat-card-header>
+                    <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">
+                            <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> &nbsp;&nbsp;&nbsp;<span *ngIf="applicant.applicant_type=='1';else codetails"> Main Applicant</span>
+                        <ng-template #codetails>&nbsp;&nbsp;&nbsp;<span>{{applicant.relation}}</span></ng-template>
+                          </p>
                  
-      </mat-list>
                
-    </mat-card-content>
+                        </mat-list-item>
                        
-  </mat-card>
-  <!-- pd documents details -->
-  <mat-card>
-      <!-- <div class="cardEdit">
-          <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon"><mat-icon>edit</mat-icon></button>
-        </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-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-list>
+                    </mat-card-content>
                   
-  </mat-card>
-  <!-- pd logs card -->
-  <mat-card>
-    <mat-card-header>
-        <mat-card-title>PD History</mat-card-title>
-      </mat-card-header>
-    <mat-card-content>
+                  </mat-card>
                            
-    </mat-card-content>
-  </mat-card>
+                  
+                </div>
+                </div>
+                <div fxLayout="row">
+
+                    <div class="column" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50">
+                       <!-- pd documents card -->
+                  <mat-card>
+                      <!-- <div class="cardEdit">
+                          <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon"><mat-icon>edit</mat-icon></button>
+                        </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-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>           
+                                  
+                        
+                      </div>
+                      <div class="column" fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50">
+                          <!--pd logs card  -->
+                        <mat-card>
+                              <mat-card-header>
+                                  <mat-card-title>PD History</mat-card-title>
+                                </mat-card-header>
+                              <mat-card-content>
+                              
+                              </mat-card-content>
+                            </mat-card>
+                                    
+                          
+                        </div>
+                        </div>
+        </mat-card-content>
+      </mat-card>
  <!-- <notifier-container></notifier-container> -->

--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts
@ -5,6 +5,7 @@ import {  MatDialog } from '@angular/material';
 import { NotifierService } from 'angular-notifier';
 import { PdTrigerService } from '../../../pd-service/pd-triger.service';
 import { PdAllocationComponent } from '../pd-allocation/pd-allocation.component';
+import { SmartPdAllocationComponent } from '../smart-pd-allocation/smart-pd-allocation.component';
 import { ListPdComponent } from '../list-pd.component';
@Component({
  selector: 'app-view-pd',
@ -62,17 +63,32 @@ export class ViewPdComponent implements OnInit, OnDestroy {
   
  }
  // pd allocation to
-  // edit questions master details popup model
-  pdAllocationTo(pdID:any) {
-    const dialogRef = this.dialog.open(PdAllocationComponent, {
-      data: pdID,
-      disableClose: true
-    });
-    dialogRef.afterClosed()
+  pdAllocationTo(pdData:any) {
+    if(pdData.fk_pd_type != 2){
+      const dialogRef = this.dialog.open(PdAllocationComponent, {
+        data: pdData,
+        disableClose: true
+      });
+      dialogRef.afterClosed()
      .subscribe(dataresult => {
      //  this.notifier.notify('success', 'Successfully allocated.!');
-      //  this.viewPdDetails(this.childData)
+        this.viewPdDetails(this.viewID)
      });
+    }
+    else if(pdData.fk_pd_type == 2){
+      const dialogRef = this.dialog.open(SmartPdAllocationComponent, {
+        data: pdData,
+        disableClose: true
+      });
+      dialogRef.afterClosed()
+      .subscribe(dataresult => {
+       // this.notifier.notify('success', 'Successfully allocated.!');
+
+        this.viewPdDetails(this.viewID)
+      });
+    }
+   
+   
  }

 //   updateViewComponent(editBack:string) {
--- 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
@ -7,7 +7,7 @@ import {
  MatRadioModule, 
  MatButtonModule,MatTableModule,MatPaginatorModule,
  MatProgressBarModule,MatDialogModule, MatSortModule,
-  MatToolbarModule,MatSelectModule, MatListModule, MatGridListModule, MatTabsModule, MatCheckboxModule, MatBadgeModule, MatExpansionModule  } from '@angular/material';
+  MatToolbarModule,MatSelectModule, MatListModule, MatGridListModule, MatTabsModule, MatCheckboxModule, MatBadgeModule, MatExpansionModule, MatStepperModule  } from '@angular/material';
 import {MatSlideToggleModule} from '@angular/material/slide-toggle';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { FileUploadModule } from 'ng2-file-upload/ng2-file-upload';
@ -27,6 +27,7 @@ import { MapPdViewComponent } from './list-pd/map-pd-view/map-pd-view.component'
 import { AddPdComponent } from '../manage-pd/list-pd/add-pd/add-pd.component';
 import { ViewPdComponent } from '../manage-pd/list-pd/view-pd/view-pd.component';
 import { PdAllocationComponent } from '../manage-pd/list-pd/pd-allocation/pd-allocation.component';
+import { SmartPdAllocationComponent } from './list-pd/smart-pd-allocation/smart-pd-allocation.component';
 import { PdTrigerService } from '../pd-service/pd-triger.service';
 import { GetGeometricLocationService } from '../location-service/get-geometric-location.service';

@ -90,7 +91,7 @@ const pdCustomNotifierOptions: NotifierOptions = {
    FlexLayoutModule,
    NgxDatatableModule,
    FormsModule,MatSlideToggleModule,
-    MatSelectModule, MatListModule,MatGridListModule, MatTabsModule, MatBadgeModule, MatCheckboxModule,
+    MatSelectModule, MatListModule,MatGridListModule, MatTabsModule, MatBadgeModule, MatCheckboxModule,MatStepperModule,
    ReactiveFormsModule,
    FileUploadModule,
    TreeModule,
@ -98,7 +99,8 @@ const pdCustomNotifierOptions: NotifierOptions = {
    NgxMatSelectSearchModule,MatTooltipModule, MatExpansionModule,
    AgmCoreModule.forRoot({apiKey: 'AIzaSyBtdO5k6CRntAMJCF-H5uZjTCoSGX95cdk'}),
  ],
-  declarations: [ListPdComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent, PdAllocationComponent],
-  providers: [PdTrigerService, GetGeometricLocationService]
+  declarations: [ListPdComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent, PdAllocationComponent, SmartPdAllocationComponent],
+  providers: [PdTrigerService, GetGeometricLocationService],
+  entryComponents: [PdAllocationComponent, SmartPdAllocationComponent]
 })
 export class ManagePdModule { }
--- 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
@ -132,6 +132,7 @@ export class PdTrigerService {
          }
    // update pd officer
    updatePdOfficer(updateData: any): Observable<any> {
+      console.log(updateData)
    updateData.fk_updatedby = this._aws.getlocale();
    updateData.updatedon = currentdate;
    return this._http.post<any>(this.apiUrl+"allocatePD",{"records":updateData})