From 4672bcc29710f4dd018aef67a7e8529468178836 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Sat, 27 Oct 2018 17:55:05 +0530 Subject: [PATCH] pd tabs listing merge : kms --- .../app/dashboard/dashboard.component.html | 149 ++++++++---------- .../src/app/dashboard/dashboard.component.ts | 30 +++- .../src/app/dashboard/dashboard.module.ts | 5 +- .../list-pd/view-pd/view-pd.component.html | 4 +- .../entity-add/entity.add.component.html | 8 +- .../entity/entity-add/entity.add.component.ts | 2 +- ...ialog-add-edit-billing-info.component.html | 8 +- .../entity-edit-billing-info.component.html | 2 +- .../entity-edit-region.component.html | 5 +- .../entity-edit/entity.edit.component.html | 4 +- .../entity-list/entity.list.component.html | 23 ++- .../src/app/settings/entity/entity.module.ts | 3 +- .../questions/edit/edit.component.html | 10 +- .../template/questions/edit/edit.component.ts | 2 +- .../edit-category.component.html | 2 +- .../edit-category/edit-category.component.ts | 6 + .../edit-lender/edit-lender.component.html | 2 +- .../edit/edit-lender/edit-lender.component.ts | 6 + .../templates.list.component.html | 10 +- ng6-seed/src/index.html | 13 +- 20 files changed, 160 insertions(+), 134 deletions(-) diff --git a/ng6-seed/src/app/dashboard/dashboard.component.html b/ng6-seed/src/app/dashboard/dashboard.component.html index 0d806f948..0d36576e6 100644 --- a/ng6-seed/src/app/dashboard/dashboard.component.html +++ b/ng6-seed/src/app/dashboard/dashboard.component.html @@ -17,96 +17,83 @@ -->
-
+
- Full + Today's Details
- - + Full + +
- - -
-
- - Smart - -
- -
- - -
- - -
-
- - Tele - -
- -
- - -
+
+ Semi + + +
+
+ Tele + + +
+ +
+ + + + + Lenderwise + + + + +

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

+

Full -{{item.fullpd}} / Smart -{{item.smartpd}} / Tele - {{item.telepd}}

+ + + + + + + CityWise + + + +

{{item.cityname}}

+

Full -{{item.fullpd}} / Smart -{{item.smartpd}} / Tele - {{item.telepd}}

+ + + + + + + + + Alert warning + + + + + +

{{item.applicantname}}

+

{{item.applicantid}}

+

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

+ + + + + + + +
- - -
-
- - Lenderwise - Triggered Today -
- - - -

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

-

Full -{{item.fullpd}} / Smart -{{item.smartpd}} / Tele - {{item.telepd}}

- - - - -
-
- - Citywise - Triggered Today -
- - - -

{{item.cityname}}

-

Full -{{item.fullpd}} / Smart -{{item.smartpd}} / Tele - {{item.telepd}}

- - - - -
-
- - Alert warning - Unscheduled -
- - - - -

{{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 7d56ca23f..2303afb15 100644 --- a/ng6-seed/src/app/dashboard/dashboard.component.ts +++ b/ng6-seed/src/app/dashboard/dashboard.component.ts @@ -18,7 +18,7 @@ export class DashboardComponent { public showYAxisLabel = true; public yAxisLabel = 'PD'; view: any[]; - width = 350; + width =600; height= 250; public colorScheme = { domain: ['#673ab7', '#f44336', '#009688 ', '#2196f3', '#234278 ', '#2a1653'] @@ -30,6 +30,34 @@ export class DashboardComponent { this.view = [this.width, this.height]; } +//pie chart + single: Object[] = [ + { + name: 'Germany', + value: 40632 + }, + { + name: 'USA', + value: 49737 + }, + { + name: 'France', + value: 36745 + }, + { + name: 'UK', + value: 36240 + }, + { + name: 'Spain', + value: 33000 + }, + { + name: 'Italy', + value: 35800 + } +]; + //Full Pd Data full: Object[] = [ { diff --git a/ng6-seed/src/app/dashboard/dashboard.module.ts b/ng6-seed/src/app/dashboard/dashboard.module.ts index 771a0da1e..ac863a047 100644 --- a/ng6-seed/src/app/dashboard/dashboard.module.ts +++ b/ng6-seed/src/app/dashboard/dashboard.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { CommonModule } from '@angular/common'; -import { MatIconModule, MatCardModule, MatButtonModule, MatListModule, MatProgressBarModule, MatMenuModule } from '@angular/material'; +import { MatIconModule, MatCardModule,MatTabsModule, MatButtonModule, MatListModule, MatProgressBarModule, MatMenuModule } from '@angular/material'; import { FlexLayoutModule } from '@angular/flex-layout'; import { ChartsModule } from 'ng2-charts/ng2-charts'; @@ -9,7 +9,7 @@ import { NgxChartsModule} from '@swimlane/ngx-charts'; import { NgxDatatableModule } from '@swimlane/ngx-datatable'; import { DashboardComponent } from './dashboard.component'; -import { DashboardRoutes } from './dashboard.routing'; +import { DashboardRoutes } from './dashboard.routing'; @NgModule({ imports: [ @@ -17,6 +17,7 @@ import { DashboardRoutes } from './dashboard.routing'; RouterModule.forChild(DashboardRoutes), MatIconModule, MatCardModule, + MatTabsModule, MatButtonModule, MatListModule, MatProgressBarModule, 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 5f314f0fa..2eeaee0f3 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 @@ -5,9 +5,9 @@ {{master.pd_date_of_initiation}}
- + - +
{{master.pd_allocated_to}} -{{master.pd_status_name}}
diff --git a/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.html b/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.html index 8a13984ef..b7939606b 100644 --- a/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.html +++ b/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.html @@ -1,6 +1,6 @@
- +

{{pageTitle}}

@@ -11,10 +11,10 @@
- + {{ enti.name }} - You must Select Entity Type. + Entity Type Required.
@@ -33,7 +33,7 @@
- +
\ No newline at end of file diff --git a/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.ts b/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.ts index 103a7af08..160825999 100644 --- a/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.ts +++ b/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.ts @@ -37,7 +37,7 @@ import { EntityService } from './../../service/entity/entity.service'; }) export class EntityAddComponent implements OnInit { - public pageTitle: string = "Entity"; + public pageTitle: string = "Add New Entity"; public subTitle1: string = "Tax Info"; public subTitle2: string = "Contacts"; public _addQuesFrom: FormGroup; diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-billing-info/dialog-add-edit-billing-info.component.html b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-billing-info/dialog-add-edit-billing-info.component.html index de197c7cd..122865cdc 100644 --- a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-billing-info/dialog-add-edit-billing-info.component.html +++ b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-billing-info/dialog-add-edit-billing-info.component.html @@ -3,9 +3,9 @@ -

{{editAddType}} - Billing Information Details

-
- +

Billing Information Details

+ +
@@ -63,7 +63,7 @@
-
+
You must Include Person Name. diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-billing-info/entity-edit-billing-info.component.html b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-billing-info/entity-edit-billing-info.component.html index 1cc230026..1d27932de 100644 --- a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-billing-info/entity-edit-billing-info.component.html +++ b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-billing-info/entity-edit-billing-info.component.html @@ -1,5 +1,5 @@
- +
diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-region/entity-edit-region.component.html b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-region/entity-edit-region.component.html index f80cb252e..d9dd8b47d 100644 --- a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-region/entity-edit-region.component.html +++ b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-region/entity-edit-region.component.html @@ -42,9 +42,10 @@
- -
+
+ +
diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.html b/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.html index 267cd60f1..164d895e5 100644 --- a/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.html +++ b/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.html @@ -186,10 +186,10 @@ (click)="backToList()">close
-
Entity Details ({{this.entityNameRecord.entity_name}})
+
Entity Details ({{this.entityNameRecord.entity_name}})

-
+
diff --git a/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html b/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html index 355e784e1..32b8be9c7 100644 --- a/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html +++ b/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html @@ -1,14 +1,11 @@
- -
-
Entity Master
-
-
-
+ +
-
+ Entity Master +
- +
@@ -21,9 +18,9 @@ {{ product.entity_name }}
-
{{ product.full_name }} ({{product.short_name}})
+
{{ product.full_name }} ({{product.short_name}})
{{ product.branch_name }}
-
{{product.city_name}}, {{product.state_name}}
+
{{product.city_name}}, {{product.state_name}}
{{ product.phone_number }}
@@ -34,9 +31,9 @@
-
+
- +
@@ -46,7 +43,7 @@
No Record Found ...
+ [pageSizeOptions]="[5, 10, 25, 50, 100]" (page)="pageEvent = $event; pageChange($event)" showFirstLastButtons>
diff --git a/ng6-seed/src/app/settings/entity/entity.module.ts b/ng6-seed/src/app/settings/entity/entity.module.ts index 2c753d9cd..1f37cf8ed 100644 --- a/ng6-seed/src/app/settings/entity/entity.module.ts +++ b/ng6-seed/src/app/settings/entity/entity.module.ts @@ -35,7 +35,7 @@ import { EntityEditBillingInfoComponent } from './entity-edit/entity-edit-billin import { DialogAddEditBillingInfo } from './entity-edit/entity-edit-billing-info/entity-edit-billing-info.component'; import { EntityEditVendorCityInfoComponent } from './entity-edit/entity-edit-vendor-city-info/entity-edit-vendor-city-info.component'; - +import { MatTooltipModule } from '@angular/material/tooltip'; /** * Custom angular notifier options */ @@ -93,6 +93,7 @@ const customNotifierOptions: NotifierOptions = { MatProgressBarModule,MatDialogModule, MatSortModule, MatToolbarModule,MatSelectModule,MatListModule, MatMenuModule, MatCheckboxModule, + MatTooltipModule, MatTabsModule, MatChipsModule, MatExpansionModule, diff --git a/ng6-seed/src/app/template/questions/edit/edit.component.html b/ng6-seed/src/app/template/questions/edit/edit.component.html index 1df0e8b87..e12eb9c4d 100644 --- a/ng6-seed/src/app/template/questions/edit/edit.component.html +++ b/ng6-seed/src/app/template/questions/edit/edit.component.html @@ -38,6 +38,11 @@ You must Select Answer Type.
+
+ Active/InActive + +
@@ -65,10 +70,7 @@
-
- Active/InActive -
+ +
\ No newline at end of file diff --git a/ng6-seed/src/app/template/templates/templates-list/edit/edit-category/edit-category.component.ts b/ng6-seed/src/app/template/templates/templates-list/edit/edit-category/edit-category.component.ts index d49a929c1..82ed34c83 100644 --- a/ng6-seed/src/app/template/templates/templates-list/edit/edit-category/edit-category.component.ts +++ b/ng6-seed/src/app/template/templates/templates-list/edit/edit-category/edit-category.component.ts @@ -233,6 +233,12 @@ export class EditCategoryComponent implements OnInit, OnDestroy, AfterViewInit { return seenDuplicate; } + reset() { + const arr = this._editTempCategoryFrom.controls.temp_category; + arr.controls.splice(0); + this.getTemplateCategoryDetails(); + } + ngOnDestroy(): void { //Called once, before the instance is destroyed. //Add 'implements OnDestroy' to the class. diff --git a/ng6-seed/src/app/template/templates/templates-list/edit/edit-lender/edit-lender.component.html b/ng6-seed/src/app/template/templates/templates-list/edit/edit-lender/edit-lender.component.html index 3051cb3da..37b72530b 100644 --- a/ng6-seed/src/app/template/templates/templates-list/edit/edit-lender/edit-lender.component.html +++ b/ng6-seed/src/app/template/templates/templates-list/edit/edit-lender/edit-lender.component.html @@ -48,7 +48,7 @@
- +
\ No newline at end of file diff --git a/ng6-seed/src/app/template/templates/templates-list/edit/edit-lender/edit-lender.component.ts b/ng6-seed/src/app/template/templates/templates-list/edit/edit-lender/edit-lender.component.ts index 781a76274..86b705623 100644 --- a/ng6-seed/src/app/template/templates/templates-list/edit/edit-lender/edit-lender.component.ts +++ b/ng6-seed/src/app/template/templates/templates-list/edit/edit-lender/edit-lender.component.ts @@ -207,6 +207,12 @@ export class EditLenderComponent implements OnInit { } } + reset() { + const arr = this._editTempLenderFrom.controls.temp_lender; + arr.controls.splice(0); + this.getTemplateLenderDetails(); + } + checkDuplicateInObject(inputArray) { let seenDuplicate = false; diff --git a/ng6-seed/src/app/template/templates/templates-list/templates.list.component.html b/ng6-seed/src/app/template/templates/templates-list/templates.list.component.html index 1c5bcb485..13f6947ae 100644 --- a/ng6-seed/src/app/template/templates/templates-list/templates.list.component.html +++ b/ng6-seed/src/app/template/templates/templates-list/templates.list.component.html @@ -6,9 +6,7 @@
Template Master - - -