-
-
-
-
-
- Search Options
- Header subtitle
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{details.applicat_details[0].applicant_name}}
-
-
- {{details.product_abbr}}/{{details.subproduct_abbr}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Lendor ID:{{details.lender_applicant_id}}
-Lendor Name:{{details.lender_full_name}}
-Date Of Initiation:{{details.pd_date_of_initiation}}
- -- - -
- - -No Record Found ...
- -
-
-
-
-
-
-
-
-
-
- All
-
-
-
-
-
-
-
-
-
-
- In Progress
-
-
-
-
-
- Scheduled
-
-
-
-
-
- Completed
-
-
-
-
-
-
-
-
diff --git a/ng6-seed/src/app/pd-triger/map-pd-view/map-pd-view.component.ts b/ng6-seed/src/app/pd-triger/map-pd-view/map-pd-view.component.ts
deleted file mode 100644
index 441823679..000000000
--- a/ng6-seed/src/app/pd-triger/map-pd-view/map-pd-view.component.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { Component, ViewChild, OnInit } from '@angular/core';
-import { MatPaginator, MatSort, MatTableDataSource, PageEvent } from '@angular/material';
-
-import { NotifierService } from 'angular-notifier';
-import { PdTrigerService } from '../pd-service/pd-triger.service';
-
-
-@Component({
- selector: 'app-map-pd-view',
- templateUrl: './map-pd-view.component.html',
- styleUrls: ['./map-pd-view.component.scss']
-})
-export class MapPdViewComponent implements OnInit {
- lat = -34.397;
- lng = 150.644;
- recordStatus: boolean;
- errorMessage: any;
- // pagination variable details
- length = 50;
- pageIndex = 0;
- pageSize = 10;
- pageEvent: PageEvent;
-// data source variable details
-pdListData = null;
-public dataLength: number;
-public dataSource = new MatTableDataSource();
-@ViewChild(MatPaginator) paginator: MatPaginator;
-@ViewChild(MatSort) sort: MatSort;
-pdList:any[] = [];
- constructor(private _pd: PdTrigerService) {
-
- }
-
- ngOnInit() {
- this.recordStatus=false
- this._pd.getPdDetails()
- .subscribe(
- data => {
- if (data.status == 200) {
- this.pdList = data.records;
- this.pdListData = data.records;
- this.dataLength = data.records.length;
- this.dataSource.data = this.pdListData;
-
- }
- else{
- this.pdList=[];
- this.dataLength = null;
- this.recordStatus=true;
- }
- }, error => this.errorMessage =
-
-
-
-
-
- {{pageTitle}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-- Allocated -
-- Scheduled -
-- Inprogress -
- -PD officer not available..
-
-
-
-
-
-
-
-
-
-
-
- 
- {{master.lender_full_name}} - {{master.lender_applicant_id}}
-
- {{master.city_name}} / {{master.state_name}}-{{master.pincode}}
-
-
-
-
-
-
-
-
-
-
-
-
- {{master.product_name}} / {{master.subproduct_name}}
-{{master.pd_type_name}} {{master.pd_allocation_type_name}} {{master.pd_allocated_to}}
-{{master.addressline1}}
-{{master.addressline2}}
-{{master.addressline3}}
- -{{master.pd_status_name}} {{master.pd_date_of_initiation}}
- -
-
-
- Main Applicant
-
- {{documents.pd_document_title}} -
-
-
-
-
-
+
+
+
+
+
+
diff --git a/ng6-seed/src/app/pd-triger/map-pd-view/map-pd-view.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.scss
similarity index 91%
rename from ng6-seed/src/app/pd-triger/map-pd-view/map-pd-view.component.scss
rename to ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.scss
index 3944ca03d..1cf171a27 100644
--- a/ng6-seed/src/app/pd-triger/map-pd-view/map-pd-view.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.scss
@@ -1,4 +1,4 @@
-@import "../../../assets/styles/scss/material.variables";
+@import "../../../../../assets/styles/scss/material.variables";
:host {
margin-left: -5px;
diff --git a/ng6-seed/src/app/pd-triger/map-pd-view/map-pd-view.component.spec.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.spec.ts
similarity index 100%
rename from ng6-seed/src/app/pd-triger/map-pd-view/map-pd-view.component.spec.ts
rename to ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.spec.ts
diff --git 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
new file mode 100644
index 000000000..73532956b
--- /dev/null
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/map-pd-view/map-pd-view.component.ts
@@ -0,0 +1,94 @@
+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 { PdTrigerService } from '../../../pd-service/pd-triger.service';
+import { GetGeometricLocationService } from '../../../location-service/get-geometric-location.service';
+import { ListPdComponent } from '../list-pd.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 {
+
+ lat:string
+ lng:string
+ mapDetails:any[] = [];
+ recordStatus: boolean;
+ errorMessage: any;
+ // pagination variable details
+ length = 50;
+ pageIndex = 0;
+ pageSize = 10;
+ pageEvent: PageEvent;
+// data source variable details
+pdListData = null;
+public dataLength: number;
+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) {
+
+ }
+
+ ngOnInit() {
+ this.ListPdComponent.showListView(false);
+ this.recordStatus=false
+ this._pd.getPdDetails()
+ .subscribe(
+ data => {
+ if (data.status == 200) {
+ this.pdList = data.records;
+ this.pdListData = data.records;
+ this.dataLength = data.records.length;
+ this.dataSource.data = this.pdListData;
+ this.getMapViewLocations(this.pdList);
+
+ }
+ else{
+ this.pdList=[];
+ this.dataLength = null;
+ this.recordStatus=true;
+ }
+ }, error => this.errorMessage =
+
+
+ Search Options
+ Header subtitle
+
+
+
+
+
+
+
+
+
+
+
+
+ {{details.applicat_details[0].applicant_name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{details.lender_full_name}}({{details.lender_applicant_id}})
+{{details.product_abbr}}/{{details.subproduct_abbr}}/{{details.customer_segment_abbr}}
+{{details.pd_date_of_initiation}}
+No Record Found ...
+ +
+
+
+
+
+
+ + manage-pd works! +
diff --git a/ng6-seed/src/app/pd-triger/edit-pd-applicant/edit-pd-applicant.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.component.scss similarity index 100% rename from ng6-seed/src/app/pd-triger/edit-pd-applicant/edit-pd-applicant.component.scss rename to ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.component.scss diff --git a/ng6-seed/src/app/pd-triger/edit-pd/edit-pd.component.spec.ts b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.component.spec.ts similarity index 55% rename from ng6-seed/src/app/pd-triger/edit-pd/edit-pd.component.spec.ts rename to ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.component.spec.ts index ad598b308..bd5932b0c 100644 --- a/ng6-seed/src/app/pd-triger/edit-pd/edit-pd.component.spec.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.component.spec.ts @@ -1,20 +1,20 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { EditPdComponent } from './edit-pd.component'; +import { ManagePdComponent } from './manage-pd.component'; -describe('EditPdComponent', () => { - let component: EditPdComponent; - let fixture: ComponentFixture
+
+ `
+})
+export class ManagePdComponent {
+}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.spec.ts b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.spec.ts
new file mode 100644
index 000000000..dc60f4b0e
--- /dev/null
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.spec.ts
@@ -0,0 +1,13 @@
+import { ManagePdModule } from './manage-pd.module';
+
+describe('ManagePdModule', () => {
+ let managePdModule: ManagePdModule;
+
+ beforeEach(() => {
+ managePdModule = new ManagePdModule();
+ });
+
+ it('should create an instance', () => {
+ expect(managePdModule).toBeTruthy();
+ });
+});
diff --git a/ng6-seed/src/app/pd-triger/pd-triger.module.ts b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts
similarity index 71%
rename from ng6-seed/src/app/pd-triger/pd-triger.module.ts
rename to ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts
index 4ed7f07a8..bcaa5f044 100644
--- a/ng6-seed/src/app/pd-triger/pd-triger.module.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts
@@ -1,6 +1,5 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
-import { RouterModule } from '@angular/router';
import {
MatCardModule,
MatIconModule,
@@ -18,20 +17,18 @@ import { FlexLayoutModule } from '@angular/flex-layout';
import { MatTooltipModule } from '@angular/material/tooltip';
import { NgxMatSelectSearchModule } from 'ngx-mat-select-search';
+import 'hammerjs';
import { NotifierModule, NotifierOptions } from 'angular-notifier';
import { AgmCoreModule } from '@agm/core';
-
-import 'hammerjs';
-import { PdTrigerRoutes } from './pd-triger-routing.module';
-import { AddPdComponent } from './add-pd/add-pd.component';
-import { PdTrigerService } from './pd-service/pd-triger.service';
+import { ManagePdRoutingModule } from './manage-pd.routing';
import { ListPdComponent } from './list-pd/list-pd.component';
-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';
-import { MapPdViewComponent } from './map-pd-view/map-pd-view.component';
+import { ManagePdComponent } from './manage-pd.component';
+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 { PdTrigerService } from '../pd-service/pd-triger.service';
+import { GetGeometricLocationService } from '../location-service/get-geometric-location.service';
+
/**
* Custom angular notifier options
*/
@@ -78,7 +75,7 @@ const pdCustomNotifierOptions: NotifierOptions = {
@NgModule({
imports: [
CommonModule,
- RouterModule.forChild(PdTrigerRoutes),
+ ManagePdRoutingModule,
NotifierModule.withConfig(pdCustomNotifierOptions),
MatCardModule,
MatIconModule,
@@ -100,8 +97,7 @@ const pdCustomNotifierOptions: NotifierOptions = {
NgxMatSelectSearchModule,MatTooltipModule, MatExpansionModule,
AgmCoreModule.forRoot({apiKey: 'AIzaSyBtdO5k6CRntAMJCF-H5uZjTCoSGX95cdk'}),
],
- declarations: [AddPdComponent, ListPdComponent, EditPdComponent, ViewPdComponent, EditPdMasterComponent, EditPdApplicantComponent, PdAllocationComponent, MapPdViewComponent],
- entryComponents:[PdAllocationComponent],
- providers: [PdTrigerService]
+ declarations: [ListPdComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent],
+ providers: [PdTrigerService, GetGeometricLocationService]
})
-export class PdTrigerModule { }
+export class ManagePdModule { }
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.routing.ts b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.routing.ts
new file mode 100644
index 000000000..fa000cb60
--- /dev/null
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.routing.ts
@@ -0,0 +1,41 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { ManagePdComponent } from './manage-pd.component';
+import { ListPdComponent } from './list-pd/list-pd.component';
+import { MapPdViewComponent } from './list-pd/map-pd-view/map-pd-view.component';
+import { AddPdComponent } from '../manage-pd/list-pd/add-pd/add-pd.component';
+/*
+* manage pd router
+*/
+const routes: Routes = [
+ {
+ path: '',
+ component: ManagePdComponent,
+ children: [
+ {
+ path: '',
+ pathMatch: 'full',
+ redirectTo: 'pdlist'
+ },{
+ path: 'pdlist',
+ component: ListPdComponent,
+ children: [
+ {
+ path: 'pdmaplist',
+ component: MapPdViewComponent,
+ },
+ {
+ path: 'addpd',
+ component: AddPdComponent,
+ },
+ ]
+ }
+ ]
+ }
+];
+
+@NgModule({
+ imports: [RouterModule.forChild(routes)],
+ exports: [RouterModule]
+})
+export class ManagePdRoutingModule { }
diff --git a/ng6-seed/src/app/pd-triger/pd-service/pd-triger.service.spec.ts b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.spec.ts
similarity index 100%
rename from ng6-seed/src/app/pd-triger/pd-service/pd-triger.service.spec.ts
rename to ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.spec.ts
diff --git a/ng6-seed/src/app/pd-triger/pd-service/pd-triger.service.ts b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts
similarity index 56%
rename from ng6-seed/src/app/pd-triger/pd-service/pd-triger.service.ts
rename to ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts
index dc2cbe7bb..808767907 100644
--- a/ng6-seed/src/app/pd-triger/pd-service/pd-triger.service.ts
+++ b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts
@@ -2,7 +2,7 @@
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs';//for Datatables
import { HttpClient,HttpParams } from '@angular/common/http';
-import { catchError } from 'rxjs/operators';
+import { catchError, map } from 'rxjs/operators';
import { of } from 'rxjs';
/** Imported Service Files Are., */
@@ -23,9 +23,13 @@ export class PdTrigerService {
//private apiUrl = "http://ssa.sineedge.com/sparqapi/api/";
//private apiUrl = "http://192.168.0.5:9999/AWSEC2/sparqapi/api/";
private apiUrl = "http://ssa.sineedge.com/sparqapi/api/";
-
+ MAP_API_KEY: string;
+ MAP_API_URL: string;
constructor(private _http: HttpClient,
- private _aws:AwsService) { }
+ private _aws:AwsService) {
+ this.MAP_API_KEY = 'AIzaSyBtdO5k6CRntAMJCF-H5uZjTCoSGX95cdk'
+ this.MAP_API_URL = `https://maps.googleapis.com/maps/api/geocode/json?key=${this.MAP_API_KEY}&address=`;
+ }
// get add pd master details
getAllMasterDatas(TableName:string): Observable
{{details.applicat_details[0].applicant_name}}
- -{{details.lender_full_name}} {{details.lender_applicant_id}}{{details.pd_date_of_initiation}}
-{{details.product_abbr}}/{{details.subproduct_abbr}}/{{details.customer_segment_abbr}} {{details.loan_amount}} {{details.city_name}}/{{details.state_name}}-{{details.pincode}}
- - - --
No Record Found ...
- -