From 66b814d391d0a5c914ef945edd71aee58e575be7 Mon Sep 17 00:00:00 2001 From: saravanakumarkandasami Date: Sat, 27 Oct 2018 11:05:45 +0530 Subject: [PATCH] Dashboard --- .../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 +- ng6-seed/src/index.html | 13 +- 5 files changed, 108 insertions(+), 93 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 59cbae1cf..7145a4470 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/index.html b/ng6-seed/src/index.html index e2f577376..be4ec30e1 100644 --- a/ng6-seed/src/index.html +++ b/ng6-seed/src/index.html @@ -121,20 +121,19 @@ transform: scale3D(0, 0, 1); } } - .mat-cell,.mat-form-field{ + .mat-card-subtitle, .mat-card-content, .mat-card-header, .mat-card-title,.mat-cell,.mat-form-field{ font-size:1.2rem !important; } .mat-header-cell{ font-size:1.2rem !important; font-weight:800 !important; } - - .swal2-header { + .swal2-title, .swal2-header { text-align:left !important; - } - .swal2-title { - text-align:left !important; - } + } + .mat-card-subtitle{ + color:#000 !important; + }