Dashboard : ps
This commit is contained in:
parent
ab8bdfec07
commit
b453d4d1d6
@ -20,15 +20,12 @@
|
||||
<mat-card>
|
||||
<mat-card-title>
|
||||
<div fxFlex.gt-sm="25" fxFlex="100">
|
||||
<div fxFlex.gt-sm="75" fxFlex="100">
|
||||
{{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 fxFlex.gt-sm="25" fxFlex="100">
|
||||
<ngx-mat-drp (selectedDateRangeChanged)="updateRange($event)" (change)="onChange($event,'One')" [options]="options" #dateRangePicker></ngx-mat-drp>
|
||||
|
||||
</div>
|
||||
<div fxFlex.gt-sm="25" fxFlex="100">
|
||||
<!-- <mat-form-field >
|
||||
|
||||
@ -126,15 +126,20 @@ export class DashboardComponent {
|
||||
const toMin = new Date(today.getFullYear(), today.getMonth()-1, 1);
|
||||
const toMax = new Date(today.getFullYear(), today.getMonth()+2, 0);
|
||||
|
||||
const resetRange = {fromDate: today, toDate: today};
|
||||
this.dateRangePicker.resetDates(resetRange); // will trigger selectedDateRangeChanged
|
||||
const thismonth = new Date(today.getFullYear(), today.getMonth(), 0);
|
||||
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.options = {
|
||||
presets: this.presets,
|
||||
format: 'mediumDate',
|
||||
range: {fromDate:today, toDate: today},
|
||||
range: {fromDate:toMin, toDate: fromMax},
|
||||
applyLabel: "Submit",
|
||||
calendarOverlayConfig: {
|
||||
shouldCloseOnBackdropClick: false,
|
||||
@ -142,7 +147,7 @@ export class DashboardComponent {
|
||||
},
|
||||
placeholder: "Date",
|
||||
cancelLabel: "Cancel",
|
||||
excludeWeekends:true,
|
||||
excludeWeekends:false,
|
||||
fromMinMax: {fromDate:fromMin, toDate:fromMax},
|
||||
toMinMax: {fromDate:toMin, toDate:toMax}
|
||||
};
|
||||
|
||||
@ -53,7 +53,12 @@ export class DashboardService {
|
||||
// }
|
||||
|
||||
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', {
|
||||
"fromdate":fromdate,
|
||||
"todate": todate,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user