Sineedge/sparqsineedge
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dashboard : ps

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-11-17 17:30:30 +05:30
parent ab8bdfec07
commit b453d4d1d6
3 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ng6-seed/src/app/dashboard/dashboard.component.html
View File

@ -20,15 +20,12 @@
<mat-card> <mat-card>
<mat-card-title> <mat-card-title>
<div fxFlex.gt-sm="25" fxFlex="100"> <div fxFlex.gt-sm="25" fxFlex="100">
<div fxFlex.gt-sm="75" fxFlex="100"> {{dashboardTitle}}
{{dashboardTitle}}
</div>
<div fxFlex.gt-sm="25" fxFlex="100">
<ngx-mat-drp (selectedDateRangeChanged)="updateRange($event)" (change)="onChange($event,'One')" [options]="options" #dateRangePicker></ngx-mat-drp>
</div>
</div> </div>
<div fxFlex.gt-sm="25" fxFlex="100"> <div fxFlex.gt-sm="25" fxFlex="100">
<ngx-mat-drp (selectedDateRangeChanged)="updateRange($event)" (change)="onChange($event,'One')" [options]="options" #dateRangePicker></ngx-mat-drp>
</div> </div>
<div fxFlex.gt-sm="25" fxFlex="100"> <div fxFlex.gt-sm="25" fxFlex="100">
<!-- <mat-form-field > <!-- <mat-form-field >

13
ng6-seed/src/app/dashboard/dashboard.component.ts
View File

@ -126,15 +126,20 @@ export class DashboardComponent {
const toMin = new Date(today.getFullYear(), today.getMonth()-1, 1); const toMin = new Date(today.getFullYear(), today.getMonth()-1, 1);
const toMax = new Date(today.getFullYear(), today.getMonth()+2, 0); const toMax = new Date(today.getFullYear(), today.getMonth()+2, 0);
const resetRange = {fromDate: today, toDate: today}; const thismonth = new Date(today.getFullYear(), today.getMonth(), 0);
this.dateRangePicker.resetDates(resetRange); // will trigger selectedDateRangeChanged console.log(fromMin);
console.log(fromMax);
console.log(toMin);
console.log(toMax);
//const resetRange = {fromDate: today, toDate: today};
//this.dateRangePicker.resetDates(resetRange); // will trigger selectedDateRangeChanged
this.setupPresets(); this.setupPresets();
this.options = { this.options = {
presets: this.presets, presets: this.presets,
format: 'mediumDate', format: 'mediumDate',
range: {fromDate:today, toDate: today}, range: {fromDate:toMin, toDate: fromMax},
applyLabel: "Submit", applyLabel: "Submit",
calendarOverlayConfig: { calendarOverlayConfig: {
shouldCloseOnBackdropClick: false, shouldCloseOnBackdropClick: false,
@ -142,7 +147,7 @@ export class DashboardComponent {
}, },
placeholder: "Date", placeholder: "Date",
cancelLabel: "Cancel", cancelLabel: "Cancel",
excludeWeekends:true, excludeWeekends:false,
fromMinMax: {fromDate:fromMin, toDate:fromMax}, fromMinMax: {fromDate:fromMin, toDate:fromMax},
toMinMax: {fromDate:toMin, toDate:toMax} toMinMax: {fromDate:toMin, toDate:toMax}
}; };

7
ng6-seed/src/app/dashboard/dashboard.service.ts
View File

@ -53,7 +53,12 @@ export class DashboardService {
// } // }
getPDDetailForDoughnut(fromdate,todate,cityarr,lenderarr): Observable<any> { getPDDetailForDoughnut(fromdate,todate,cityarr,lenderarr): Observable<any> {
console.log(')))))');
console.log(fromdate);
console.log(todate);
console.log(cityarr);
console.log(lenderarr);
console.log('(((');
return this._http.post(this.apiUrl+'getDashBoardMaster', { return this._http.post(this.apiUrl+'getDashBoardMaster', {
"fromdate":fromdate, "fromdate":fromdate,
"todate": todate, "todate": todate,