From b0586cf07b2fba68995402c4d9b9ba2b1a255791 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 16 Oct 2018 11:31:26 +0530 Subject: [PATCH 1/2] smart pd changes --- .../manage-pd/list-pd/view-pd/view-pd.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git 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 index 0a422bfd9..b3c7e8372 100644 --- 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 @@ -104,7 +104,7 @@ export class ViewPdComponent implements OnInit, OnDestroy { }); } else if(pdData.fk_pd_type == 2){ - const dialogRef = this.dialog.open(PdAllocationComponent, { + const dialogRef = this.dialog.open(SmartPdAllocationComponent, { data: pdData, disableClose: true }); From 96be5bf789b80c08e40069c80b81eee748536724 Mon Sep 17 00:00:00 2001 From: saravanakumarkandasami Date: Tue, 16 Oct 2018 18:55:01 +0530 Subject: [PATCH 2/2] UI in PD team and PD trigger --- ng6-seed/src/app/dashboard/charts.data.ts | 232 --------------- .../app/dashboard/dashboard.component.html | 133 +-------- .../src/app/dashboard/dashboard.component.ts | 233 +++++++-------- .../manage-pd/list-pd/list-pd.component.html | 267 +++++++++--------- .../map-pd-view/map-pd-view.component.html | 40 +-- .../map-pd-view/map-pd-view.component.ts | 6 + .../list-pd/view-pd/view-pd.component.html | 32 ++- .../pd-team-add/pd-team-add.component.ts | 8 +- .../pd-team-edit/pd-team-edit.component.ts | 9 +- .../pd-team-list/pd-team-list.component.html | 14 +- .../pd-team-list/pd-team-list.component.ts | 39 ++- .../pd-team-manage.component.html | 14 +- .../pd-team-manage.component.ts | 9 +- .../users/register/register.component.html | 3 +- .../users/register/register.component.ts | 4 + 15 files changed, 373 insertions(+), 670 deletions(-) delete mode 100644 ng6-seed/src/app/dashboard/charts.data.ts diff --git a/ng6-seed/src/app/dashboard/charts.data.ts b/ng6-seed/src/app/dashboard/charts.data.ts deleted file mode 100644 index 5c4cbfa18..000000000 --- a/ng6-seed/src/app/dashboard/charts.data.ts +++ /dev/null @@ -1,232 +0,0 @@ -export const single = [ - { - name: 'Germany', - value: 40632 - }, - { - name: 'USA', - value: 49737 - }, - { - name: 'France', - value: 36745 - }, - { - name: 'UK', - value: 36240 - }, - { - name: 'Spain', - value: 33000 - }, - { - name: 'Italy', - value: 35800 - } -]; - -export const multi = [ - { - name: 'Germany', - series: [ - { - name: '2017', - value: 71632 - }, - { - name: '2010', - value: 40632 - }, - { - name: '2000', - value: 76953 - }, - { - name: '1990', - value: 31476 - } - ] - }, - { - name: 'USA', - series: [ - { - name: '2017', - value: 82632 - }, - { - name: '2010', - value: 49737 - }, - { - name: '2000', - value: 55986 - }, - { - name: '1990', - value: 37060 - } - ] - }, - { - name: 'France', - series: [ - { - name: '2017', - value: 51732 - }, - { - name: '2010', - value: 36745 - }, - { - name: '2000', - value: 34774 - }, - { - name: '1990', - value: 29476 - } - ] - }, - { - name: 'UK', - series: [ - { - name: '2017', - value: 95652 - }, - { - name: '2010', - value: 36240 - }, - { - name: '2000', - value: 32543 - }, - { - name: '1990', - value: 26424 - } - ] - } -]; - -export const bubble = [ - { - name: 'Germany', - series: [ - { - name: '2009', - x: new Date(2009, 0, 1), - y: 80.3, - r: 80.4 - }, - { - name: '2006', - x: new Date(2006, 0, 1), - y: 80.3, - r: 78 - }, - { - name: '1995', - x: new Date(1995, 0, 1), - y: 77.7, - r: 58.1 - }, - { - name: '1990', - x: new Date(1990, 0, 1), - y: 75.4, - r: 79 - } - ] - }, - { - name: 'USA', - series: [ - { - name: '2010', - x: new Date(2010, 0, 1), - y: 78.8, - r: 310 - }, - { - name: '2005', - x: new Date(2005, 0, 1), - y: 76.9, - r: 283 - }, - { - name: '1996', - x: new Date(1996, 0, 1), - y: 78.7, - r: 59.1 - }, - { - name: '1990', - x: new Date(1990, 0, 1), - y: 75.4, - r: 253 - } - ] - }, - { - name: 'France', - series: [ - { - name: '2008', - x: new Date(2008, 0, 1), - y: 81.4, - r: 63 - }, - { - name: '2000', - x: new Date(2000, 0, 1), - y: 79.1, - r: 59.4 - }, - { - name: '1994', - x: new Date(1994, 0, 1), - y: 76.7, - r: 58.1 - }, - { - name: '1990', - x: new Date(1990, 0, 1), - y: 77.2, - r: 56.9 - } - ] - }, - { - name: 'UK', - series: [ - { - name: '2007', - x: new Date(2007, 0, 1), - y: 80.2, - r: 62.7 - }, - { - name: '2003', - x: new Date(2003, 0, 1), - y: 77.8, - r: 58.9 - }, - { - name: '1995', - x: new Date(1995, 0, 1), - y: 78.7, - r: 59.1 - }, - { - name: '1990', - x: new Date(1990, 0, 1), - y: 75.7, - r: 57.1 - } - ] - } -]; \ No newline at end of file diff --git a/ng6-seed/src/app/dashboard/dashboard.component.html b/ng6-seed/src/app/dashboard/dashboard.component.html index 27e02bdc9..ebb4aa9c6 100644 --- a/ng6-seed/src/app/dashboard/dashboard.component.html +++ b/ng6-seed/src/app/dashboard/dashboard.component.html @@ -1,125 +1,4 @@ - - -

{{item.applicantname}}

{{item.applicantid}}

{{item.lendername}} - {{item.status}}

@@ -189,4 +68,4 @@ - --> \ No newline at end of file + \ No newline at end of file diff --git a/ng6-seed/src/app/dashboard/dashboard.component.ts b/ng6-seed/src/app/dashboard/dashboard.component.ts index f260b7b7c..abab26524 100644 --- a/ng6-seed/src/app/dashboard/dashboard.component.ts +++ b/ng6-seed/src/app/dashboard/dashboard.component.ts @@ -6,6 +6,8 @@ import { Component } from '@angular/core'; templateUrl: './dashboard.component.html', styleUrls: ['./dashboard.component.scss'] }) + + export class DashboardComponent { //public single: any[]; //public multi: any[]; @@ -26,132 +28,115 @@ export class DashboardComponent { } // //Lender wise PD Triggered - // lenderpd: Object[] = [{ - // lendername:'ICICI', - // billingaddr:'Bangalore', - // fullpd:'9', - // smartpd:'6', - // }, { - // lendername:'IOB', - // billingaddr:'Chennai', - // fullpd:'10', - // smartpd:'5', - // }, { - // lendername:'SBI', - // billingaddr:'Pune', - // fullpd:'16', - // smartpd:'3', - // }, ]; + lenderpd: Object[] = [{ + lendername:'ICICI', + billingaddr:'Bangalore', + fullpd:'9', + smartpd:'6', + }, { + lendername:'IOB', + billingaddr:'Chennai', + fullpd:'10', + smartpd:'5', + }, { + lendername:'SBI', + billingaddr:'Pune', + fullpd:'16', + smartpd:'3', + }, ]; - // multi: Object[] = [ - // { - // name: 'Full', - // series: [ - // { - // name: 'Triggered', - // value: 50 - // }, - // { - // name: 'Allocated', - // value: 29 - // }, - // { - // name: 'Schudled', - // value: 45 - // }, - // { - // name: 'InProgress', - // value: 67 - // }, - // { - // name: 'Completed', - // value: 34 - // },{ - // name: 'QC Completed', - // value: 22 - // } - // ] - // }, - // { - // name: 'Smart', - // series: [ - // { - // name: 'Triggred', - // value: 60 - // }, - // { - // name: 'Allocated', - // value: 33 - // }, - // { - // name: 'Schudled', - // value: 76 - // }, - // { - // name: 'InProgress', - // value: 34 - // },{ - // name: 'Completed', - // value: 56 - // },{ - // name: 'QC Completed', - // value: 45 - // } - // ] - // }, - // ]; + multi: Object[] = [ + { + name: 'Full', + series: [ + { + name: 'Triggered', + value: 50 + }, + { + name: 'Allocated', + value: 29 + }, + { + name: 'Schudled', + value: 45 + }, + { + name: 'InProgress', + value: 67 + }, + { + name: 'Completed', + value: 34 + },{ + name: 'QC Completed', + value: 22 + } + ] + }, + { + name: 'Smart', + series: [ + { + name: 'Triggred', + value: 60 + }, + { + name: 'Allocated', + value: 33 + }, + { + name: 'Schudled', + value: 76 + }, + { + name: 'InProgress', + value: 34 + },{ + name: 'Completed', + value: 56 + },{ + name: 'QC Completed', + value: 45 + } + ] + }, + ]; - // //Lender wise PD Triggered - // lenderpd: Object[] = [{ - // lendername:'ICICI', - // billingaddr:'Bangalore', - // fullpd:'9', - // smartpd:'6', - // }, { - // lendername:'IOB', - // billingaddr:'Chennai', - // fullpd:'10', - // smartpd:'5', - // }, { - // lendername:'SBI', - // billingaddr:'Pune', - // fullpd:'16', - // smartpd:'3', - // }, ]; - - // //City Wise PD Triggered - // citywisepd: Object[] = [{ - // cityname: 'Bangalore', - // fullpd:'45', - // smartpd:'17', - // }, { - // cityname: 'Chennai', - // fullpd:'33', - // smartpd:'16', - // }, { - // cityname: 'Salem', - // fullpd:'22', - // smartpd:'12', - // } ]; + + //City Wise PD Triggered + citywisepd: Object[] = [{ + cityname: 'Bangalore', + fullpd:'45', + smartpd:'17', + }, { + cityname: 'Chennai', + fullpd:'33', + smartpd:'16', + }, { + cityname: 'Salem', + fullpd:'22', + smartpd:'12', + } ]; // //Same status - // message: Object[] = [{ - // applicantname: 'Saravana', - // applicantid:'ICICITN0118000354', - // lendername:'ICICI', - // status:'Allocated', - // photo: 'assets/images/face3.jpg', - // }, { - // applicantname: 'Kumaran', - // applicantid:'IOBKA0418000578', - // lendername:'IOB', - // status:'Allocated', - // photo: 'assets/images/face6.jpg', - // }, { - // applicantname: 'Priya', - // applicantid:'SBIGA0118000241', - // lendername:'SBI', - // status:'Triggered', - // photo: 'assets/images/face4.jpg', - // } ]; + message: Object[] = [{ + applicantname: 'Saravana', + applicantid:'ICICITN0118000354', + lendername:'ICICI', + status:'Allocated', + photo: 'assets/images/face3.jpg', + }, { + applicantname: 'Kumaran', + applicantid:'IOBKA0418000578', + lendername:'IOB', + status:'Allocated', + photo: 'assets/images/face6.jpg', + }, { + applicantname: 'Priya', + applicantid:'SBIGA0118000241', + lendername:'SBI', + status:'Triggered', + photo: 'assets/images/face4.jpg', + } ]; } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html index a8567c7cf..6de2b1d33 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.html @@ -1,138 +1,141 @@ -
-
- - - + + + +
+
+ + + +
+ +
+ +
- -
- - -
-
- - - - All - -
- - - - -

{{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}}

- - - -
- - - - - - -
+
+ + + + All + +
+ + + + +

{{details.applicat_details[0].applicant_name}}

- -
- - - -

No Record Found ...

- - - -
- - - - - - - - +

{{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 ...

+ + + +
+ + + + + + + + + + In Progress + + + + - In Progress - - - - - - Scheduled - - - - - - Completed - - - - - - - + Scheduled + + + + + + Completed + + + + + + + + - + + diff --git 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 index 9962e80f1..ac137994b 100644 --- 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 @@ -1,15 +1,21 @@
-
- -
+
+ + + +
+ +
+
+ - Search Options - Header subtitle - - -
+ + + + +
+ + + + {{details.applicat_details[0].applicant_name}}

 {{details.city_name}}/{{details.state_name}}-{{details.pincode}}

{{details.lender_full_name}}({{details.lender_applicant_id}})

{{details.product_abbr}}/{{details.subproduct_abbr}}/{{details.customer_segment_abbr}}

{{details.pd_date_of_initiation}}  {{details.loan_amount}}

- - - - - - - - + @@ -62,14 +65,13 @@
-
+
-
- +
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 index 4e3e91ee4..d3e1ac557 100644 --- 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 @@ -143,5 +143,11 @@ pdList:any[] = []; this.ListPdComponent.showListView(true); } + //Global filter + applyFilter(filterValue: string) { + filterValue = filterValue.trim(); // Remove whitespace + filterValue = filterValue.toLowerCase(); // Datasource defaults to lowercase matches + this.dataSource.filter = filterValue; + } } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html index ae3ea2041..c210baf8e 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html @@ -1,9 +1,13 @@ - - -
- -
- + +
+
+

PD Details

+
+
+ +
+ +
@@ -14,6 +18,7 @@ +
{{master.pd_status_name}}
@@ -29,7 +34,7 @@

{{master.addressline2}}

{{master.addressline3}}

-

 {{master.loan_amount}}    {{master.pd_status_name}}   {{master.pd_date_of_initiation}}

+

 {{master.loan_amount}}       {{master.pd_date_of_initiation}}

 @@ -53,7 +58,7 @@  {{applicant.applicant_name}}     -  {{applicant.mobile_no}}     Main Applicant +  {{applicant.mobile_no}}
Main Applicant    {{applicant.relation_name}}

@@ -64,7 +69,7 @@ -

No Applicants

 +

No Applicant

 @@ -83,6 +88,7 @@ Documents +

@@ -93,7 +99,9 @@ - + +

No Document

 + @@ -105,8 +113,10 @@ PD History - +

No History

 + + diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-add/pd-team-add.component.ts b/ng6-seed/src/app/settings/pd-team/pd-team-add/pd-team-add.component.ts index e4d53370e..e58143060 100644 --- a/ng6-seed/src/app/settings/pd-team/pd-team-add/pd-team-add.component.ts +++ b/ng6-seed/src/app/settings/pd-team/pd-team-add/pd-team-add.component.ts @@ -13,6 +13,8 @@ import { FormBuilder, import { Router } from '@angular/router'; import { empty } from 'rxjs'; +/**sweet alert */ +import Swal from 'sweetalert2'; @Component({ selector: 'app-pd-team-add', @@ -149,13 +151,13 @@ onSubmit() { if (dataresult.status == 200) { this.notifier.notify('success', 'Record Edited Successfully.!'); - alert('Success.!'); + Swal('Success.!'); this._router.navigate(['/setting/pdteam/pdteamlist']); this._pdTeamForm.reset(); } else { this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); - alert('Wrong.!'); + Swal('Wrong.!'); //alert('Some Thing Wents Wrong Try Again !'); //this.errorMessage = "Some Thing Wents Wrong Try Again !"; } @@ -195,7 +197,7 @@ onChangeCityDatas($event){ for(let data of dup_cityname){ if(data.name == cityName.name){ - alert('"'+data.name+'" Already Existing with "'+ teamname +'"'); + Swal('
"'+data.name+'" already existing with "'+ teamname +'"
'); $event.source._selected = false; mycheck++; } diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.ts b/ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.ts index 2463d5b52..e9c81fea1 100644 --- a/ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.ts +++ b/ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.ts @@ -13,7 +13,8 @@ import { NotifierService } from 'angular-notifier'; /** Here this component is like as a partent component */ import { PdTeamListComponent } from './../pd-team-list/pd-team-list.component'; - +/**sweet alert */ +import Swal from 'sweetalert2'; @Component({ selector: 'app-pd-team-edit', templateUrl: './pd-team-edit.component.html', @@ -198,7 +199,7 @@ export class PdTeamEditComponent implements OnInit { for(let data of dup_cityname){ if(data.name == cityName.name){ - alert('"'+data.name+'" Already Existing with "'+ teamname +'"'); + Swal('
"'+data.name+'" already existing with "'+ teamname +'"
'); $event.source._selected = false; mycheck=1; } @@ -245,11 +246,11 @@ export class PdTeamEditComponent implements OnInit { dataresult=>{ if (dataresult.dataStatus == true){ - alert("Data Edited Successfully"); + Swal("Data Edited Successfully"); this.notifier.notify('success', 'Record Edited Successfully.!'); } else{ - alert("SomeThing Wents Wrong Try Again !"); + Swal("SomeThing Wents Wrong Try Again !"); this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); } }); diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.html b/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.html index 4392ea103..6feb49934 100644 --- a/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.html +++ b/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.html @@ -2,7 +2,7 @@
- PD Team Masters + PD Team Master
@@ -39,24 +39,24 @@ - PD Team Name + Team {{row.team_name}} - Lender Name + Lender {{row.lender_name}} - Is Active + Active + (click)="deactive()"> + (click)="active()"> - Actions + Action diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.ts b/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.ts index d72938430..378307360 100644 --- a/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.ts +++ b/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.ts @@ -11,6 +11,8 @@ import { PdTeamService } from '../../service/masters/pd-team.service'; import { NotifierService } from 'angular-notifier'; import { Router } from '@angular/router'; +/**sweet alert */ +import Swal from 'sweetalert2'; /** Add Component */ //import { } from '../pd-team-add/pd-team-add.component; @@ -119,7 +121,42 @@ managepdteam(){ } }); } - + //Sweetalert2 for active and deactive +active(){ + Swal({ + title: 'Are you sure?', + type: 'warning', + showCancelButton: true, + confirmButtonColor: '#3085d6', + cancelButtonColor: '#d33', + confirmButtonText: 'Yes, activate it!' + }).then((result) => { + if (result.value) { + Swal( + 'Activated!', + 'success' + ) + } + }) +} +deactive() +{ + Swal({ + title: 'Are you sure?', + type: 'warning', + showCancelButton: true, + confirmButtonColor: '#3085d6', + cancelButtonColor: '#d33', + confirmButtonText: 'Yes, deactivate it!' + }).then((result) => { + if (result.value) { + Swal( + 'Deactivated!', + 'success' + ) + } + }) +} /** For Display Tables Pagination And Sorting */ ngAfterViewInit() { this.dataSource.paginator = this.paginator; diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.html b/ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.html index e31ad0925..846841f0d 100644 --- a/ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.html +++ b/ng6-seed/src/app/settings/pd-team/pd-team-manage/pd-team-manage.component.html @@ -1,10 +1,12 @@ -
-
Manage PD Team
- - -
+
+

Manage PD Team

+
+
+ +
+