From 5b1d626ba229956079539ffc6ce0f7b5410057a6 Mon Sep 17 00:00:00 2001 From: saravanakumarkandasami Date: Fri, 12 Oct 2018 16:56:45 +0530 Subject: [PATCH] UI changes --- .../app/dashboard/dashboard.component.html | 172 +++++++++++++++++- .../src/app/dashboard/dashboard.component.ts | 53 ++++++ .../branch-dialog.component.html | 6 +- .../branch-list/branch-list.component.html | 2 +- .../city-dialog/city-dialog.component.html | 6 +- ...comments-on-locality-dialog.component.html | 2 +- .../company-dialog.component.html | 24 +-- .../customer-behaviour-dialog.component.html | 2 +- .../customer-segment-dialog.component.html | 4 +- .../designation-dialog.component.html | 4 +- .../frequency-dialog.component.html | 2 +- ...ustry_classification-dialog.component.html | 2 +- .../lender-hierarchy-dialog.component.html | 2 +- .../members-occupation-dialog.component.html | 2 +- ...pd-location-approach-dialog.component.html | 4 +- .../pd-type-dialog.component.html | 4 +- .../product-dialog.component.html | 4 +- .../question-category-dialog.component.html | 2 +- .../regions-dialog.component.html | 2 +- .../relation-ship-dialog.component.html | 2 +- .../states-dialog.component.html | 8 +- .../sub-product-dialog.component.html | 6 +- .../title-dialog/title-dialog.component.html | 2 +- .../activity-dialog.component.html | 2 +- .../uom/uom-dialog/uom-dialog.component.html | 2 +- .../service/masters/pd-team.service.ts | 4 +- .../users/user-list/user-list.component.html | 6 +- .../users/user-list/user-list.component.ts | 9 +- 28 files changed, 280 insertions(+), 60 deletions(-) diff --git a/ng6-seed/src/app/dashboard/dashboard.component.html b/ng6-seed/src/app/dashboard/dashboard.component.html index 6b07abff7..d02b0aefb 100644 --- a/ng6-seed/src/app/dashboard/dashboard.component.html +++ b/ng6-seed/src/app/dashboard/dashboard.component.html @@ -1,5 +1,171 @@
-

- Dashboard! -

+
+
+ +
+
+

PD Triggered

+
+
+
+

Full PD

+

13

+
+
+

Smart PD

+

13

+
+
+
+ +
+
+ +
+
+

PD Allocated

+
+
+
+

Full PD

+

33

+
+
+

Smart PD

+

5

+
+
+
+ +
+
+ +
+
+

PD Scheduled

+
+
+
+

Full PD

+

20

+
+
+

Smart PD

+

6

+
+
+
+ +
+
+ +
+
+ +
+
+

PD Progress

+
+
+
+

Full PD

+

34

+
+
+

Smart PD

+

9

+
+
+
+ +
+
+ +
+
+

PD Completed

+
+
+
+

Full PD

+

65

+
+
+

Smart PD

+

24

+
+
+
+ +
+
+ +
+
+

QC Completed

+
+
+
+

Full PD

+

47

+
+
+

Smart PD

+

29

+
+
+
+ +
+
+ +
+
+ + Lender + PD Triggered Today +
+ + + +

{{item.lendername}} / {{item.billingaddr}}

+

Full PD -{{item.fullpd}} / Smart PD -{{item.smartpd}}

+ + + + +
+
+ + Citywise + PD Triggered Today +
+ + + +

{{item.cityname}}

+

Full PD -{{item.fullpd}} / Smart PD -{{item.smartpd}}

+ + + + +
+
+ + Information + PD In Same Status +
+ + + + +

{{item.applicantname}}

+

{{item.applicantid}}

+

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

+ + + + +
+
\ 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 de294a8f4..d22f38292 100644 --- a/ng6-seed/src/app/dashboard/dashboard.component.ts +++ b/ng6-seed/src/app/dashboard/dashboard.component.ts @@ -9,4 +9,57 @@ export class DashboardComponent { constructor() { } + //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', + }, ]; + + //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', + }, ]; } diff --git a/ng6-seed/src/app/settings/masters/component/branch/branch-dialog/branch-dialog.component.html b/ng6-seed/src/app/settings/masters/component/branch/branch-dialog/branch-dialog.component.html index c35582094..da96ed323 100644 --- a/ng6-seed/src/app/settings/masters/component/branch/branch-dialog/branch-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/branch/branch-dialog/branch-dialog.component.html @@ -17,11 +17,11 @@ fxLayoutAlign="center">
- + {{ cd.name }} - You must Pickup City Name. + City Name Required.
@@ -29,7 +29,7 @@ fxLayoutAlign="center">
- You must inculde a Branch Name + Branch Name Required
diff --git a/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.html b/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.html index d7fb9940b..58640ef98 100644 --- a/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.html +++ b/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.html @@ -17,7 +17,7 @@ - + diff --git a/ng6-seed/src/app/settings/masters/component/city/city-dialog/city-dialog.component.html b/ng6-seed/src/app/settings/masters/component/city/city-dialog/city-dialog.component.html index 4d1ddc672..c18a1fa26 100644 --- a/ng6-seed/src/app/settings/masters/component/city/city-dialog/city-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/city/city-dialog/city-dialog.component.html @@ -31,17 +31,17 @@ fxLayoutAlign="center">
- + {{ sd.name }} - You must Pickup State Name. + State Name Required.
- You must include a Name. + City Name Required.
diff --git a/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-dialog/comments-on-locality-dialog.component.html b/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-dialog/comments-on-locality-dialog.component.html index 4de4790c4..da88ac6b3 100644 --- a/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-dialog/comments-on-locality-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-dialog/comments-on-locality-dialog.component.html @@ -32,7 +32,7 @@ fxLayoutAlign="center">
- You must include a Rating. + Rating Required.
diff --git a/ng6-seed/src/app/settings/masters/component/company/company-dialog/company-dialog.component.html b/ng6-seed/src/app/settings/masters/component/company/company-dialog/company-dialog.component.html index 618130537..f0df83f71 100644 --- a/ng6-seed/src/app/settings/masters/component/company/company-dialog/company-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/company/company-dialog/company-dialog.component.html @@ -16,38 +16,38 @@
- You must include a Name. + Company Name Required.
- - You must include a addressline1. + + Company Address Line1 Required.
- - You must include a Name. + + Company Address Line2 Required.
- - You must include a Name. + + Company Address Line3 Required.
- + {{ cd.name }} - You must include a City. + City Name Required.
@@ -55,7 +55,7 @@
- pincode should be in 6 digit format + Pincode should be in 6 digit format Your pincode must be at least 5 characters long. @@ -65,10 +65,10 @@
- + {{ sd.name }} - You must Pickup a State. + State Name Required.
diff --git a/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-dialog/customer-behaviour-dialog.component.html b/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-dialog/customer-behaviour-dialog.component.html index 7198faac0..c445f8fe6 100644 --- a/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-dialog/customer-behaviour-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-dialog/customer-behaviour-dialog.component.html @@ -34,7 +34,7 @@ fxLayoutAlign="center">
- You must include a Name. + Description Required.
diff --git a/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-dialog/customer-segment-dialog.component.html b/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-dialog/customer-segment-dialog.component.html index af713ed41..98f96e5e6 100644 --- a/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-dialog/customer-segment-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-dialog/customer-segment-dialog.component.html @@ -34,7 +34,7 @@ fxLayoutAlign="center">
- You must include a Name. + Name Required.
@@ -42,7 +42,7 @@ fxLayoutAlign="center">
- You must include a Abbrevation. + Abbrevation Required.
diff --git a/ng6-seed/src/app/settings/masters/component/designation/designation-dialog/designation-dialog.component.html b/ng6-seed/src/app/settings/masters/component/designation/designation-dialog/designation-dialog.component.html index fd3e2e99a..c50de886e 100644 --- a/ng6-seed/src/app/settings/masters/component/designation/designation-dialog/designation-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/designation/designation-dialog/designation-dialog.component.html @@ -32,7 +32,7 @@ fxLayoutAlign="center">
- You must include a Name. + Name Required.
@@ -42,7 +42,7 @@ fxLayoutAlign="center">
- You must include a Short Name. + Short Name Required.
diff --git a/ng6-seed/src/app/settings/masters/component/frequency/frequency-dialog/frequency-dialog.component.html b/ng6-seed/src/app/settings/masters/component/frequency/frequency-dialog/frequency-dialog.component.html index caa3b9348..706429f5d 100644 --- a/ng6-seed/src/app/settings/masters/component/frequency/frequency-dialog/frequency-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/frequency/frequency-dialog/frequency-dialog.component.html @@ -34,7 +34,7 @@ fxLayoutAlign="center">
- You must include a Name. + Frequency Name Required.
diff --git a/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-dialog/industry_classification-dialog.component.html b/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-dialog/industry_classification-dialog.component.html index 9fae64052..5cae4c53a 100644 --- a/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-dialog/industry_classification-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-dialog/industry_classification-dialog.component.html @@ -33,7 +33,7 @@ fxLayoutAlign="center">
- You must include a Classified Name. + Classified Name Required.
diff --git a/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-dialog/lender-hierarchy-dialog.component.html b/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-dialog/lender-hierarchy-dialog.component.html index e176790fd..3fba64166 100644 --- a/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-dialog/lender-hierarchy-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-dialog/lender-hierarchy-dialog.component.html @@ -32,7 +32,7 @@ fxLayoutAlign="center">
- You must include a Lender Hierarchy Name. + Lender Hierarchy Name Required.
diff --git a/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-dialog/members-occupation-dialog.component.html b/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-dialog/members-occupation-dialog.component.html index 21bb919a7..c6ca49362 100644 --- a/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-dialog/members-occupation-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-dialog/members-occupation-dialog.component.html @@ -32,7 +32,7 @@ fxLayout="row">
- You must include a Name. + Name Required.
diff --git a/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-dialog/pd-location-approach-dialog.component.html b/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-dialog/pd-location-approach-dialog.component.html index bf39530f1..bf100ef8e 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-dialog/pd-location-approach-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-dialog/pd-location-approach-dialog.component.html @@ -33,8 +33,8 @@ fxLayoutAlign="center">
- - You must include a Description. + + Description Required.
diff --git a/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-dialog/pd-type-dialog.component.html b/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-dialog/pd-type-dialog.component.html index bbc649150..643c7122a 100644 --- a/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-dialog/pd-type-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-dialog/pd-type-dialog.component.html @@ -33,8 +33,8 @@ fxLayoutAlign="center">
- - You must include a type_name. + + Type Name Required.
diff --git a/ng6-seed/src/app/settings/masters/component/product/product-dialog/product-dialog.component.html b/ng6-seed/src/app/settings/masters/component/product/product-dialog/product-dialog.component.html index 5793c6d43..bd8c0551a 100644 --- a/ng6-seed/src/app/settings/masters/component/product/product-dialog/product-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/product/product-dialog/product-dialog.component.html @@ -32,7 +32,7 @@ fxLayoutAlign="center">
- You must include a Product name. + Product Name Required.
@@ -41,7 +41,7 @@ fxLayoutAlign="center"> - You must include a Product abbrevation. + Product Abbrevation Required.
diff --git a/ng6-seed/src/app/settings/masters/component/question-category/question-category-dialog/question-category-dialog.component.html b/ng6-seed/src/app/settings/masters/component/question-category/question-category-dialog/question-category-dialog.component.html index 4158e2813..b54a9f9fd 100644 --- a/ng6-seed/src/app/settings/masters/component/question-category/question-category-dialog/question-category-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/question-category/question-category-dialog/question-category-dialog.component.html @@ -16,7 +16,7 @@ fxLayoutAlign="center">
- You must include a category name. + Category Name Required.
diff --git a/ng6-seed/src/app/settings/masters/component/regions/regions-dialog/regions-dialog.component.html b/ng6-seed/src/app/settings/masters/component/regions/regions-dialog/regions-dialog.component.html index 92891a919..f652efa2a 100644 --- a/ng6-seed/src/app/settings/masters/component/regions/regions-dialog/regions-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/regions/regions-dialog/regions-dialog.component.html @@ -34,7 +34,7 @@ fxLayoutAlign="center">
- You must include a Name. + Name Required.
diff --git a/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-dialog/relation-ship-dialog.component.html b/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-dialog/relation-ship-dialog.component.html index 415e9ff95..3cce82541 100644 --- a/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-dialog/relation-ship-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-dialog/relation-ship-dialog.component.html @@ -34,7 +34,7 @@ fxLayoutAlign="center">
- You must include a Name. + Name Required.
diff --git a/ng6-seed/src/app/settings/masters/component/states/states-dialog/states-dialog.component.html b/ng6-seed/src/app/settings/masters/component/states/states-dialog/states-dialog.component.html index 78827813d..fe54686e3 100644 --- a/ng6-seed/src/app/settings/masters/component/states/states-dialog/states-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/states/states-dialog/states-dialog.component.html @@ -32,17 +32,17 @@ fxLayoutAlign="center">
- + {{ sd.name }} - You must include a Region. + Region Name Required.
- You must include a Name. + Name Required.
@@ -58,7 +58,7 @@ fxLayoutAlign="center">
- You must include a Code. + Code Required.
diff --git a/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-dialog/sub-product-dialog.component.html b/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-dialog/sub-product-dialog.component.html index e0193cf07..55cb0254d 100644 --- a/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-dialog/sub-product-dialog.component.html +++ b/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-dialog/sub-product-dialog.component.html @@ -41,10 +41,10 @@ fxLayoutAlign="center"> -->
- + {{ sd.name }} - You must include a Product name. + Product Name Required.
@@ -83,6 +83,6 @@ - +
diff --git a/ng6-seed/src/app/settings/users/user-list/user-list.component.ts b/ng6-seed/src/app/settings/users/user-list/user-list.component.ts index c9fafe84b..29f23fae9 100644 --- a/ng6-seed/src/app/settings/users/user-list/user-list.component.ts +++ b/ng6-seed/src/app/settings/users/user-list/user-list.component.ts @@ -5,6 +5,8 @@ import { MatPaginator, MatTableDataSource,MatSort } from '@angular/material'; import { UserService } from '../../service/user.service'; import { DataSource } from '@angular/cdk/table'; import { CognitoService } from '../../../AwsService/cognito.service'; + + @Component({ selector: 'app-user-list', templateUrl: './user-list.component.html', @@ -17,7 +19,9 @@ export class UserListComponent implements OnInit { @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; - + color="primary"; + // pagination variable details + pageSize = 10; userdata: any = []; loader: boolean = false; @@ -41,9 +45,6 @@ export class UserListComponent implements OnInit { } - - - ngOnInit() { delete this.aws.localUserId;