From b453d4d1d682f776bbfe4b9969f5f618b66101e5 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Sat, 17 Nov 2018 17:30:30 +0530
Subject: [PATCH] Dashboard : ps

---
 .../src/app/dashboard/dashboard.component.html    | 11 ++++-------
 ng6-seed/src/app/dashboard/dashboard.component.ts | 15 ++++++++++-----
 ng6-seed/src/app/dashboard/dashboard.service.ts   |  7 ++++++-
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/ng6-seed/src/app/dashboard/dashboard.component.html b/ng6-seed/src/app/dashboard/dashboard.component.html
index 1b7358a8d..e9ced0e0b 100644
--- a/ng6-seed/src/app/dashboard/dashboard.component.html
+++ b/ng6-seed/src/app/dashboard/dashboard.component.html
@@ -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>
-                             
+                                     {{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 fxFlex.gt-sm="25" fxFlex="100">
                                     <!-- <mat-form-field >
diff --git a/ng6-seed/src/app/dashboard/dashboard.component.ts b/ng6-seed/src/app/dashboard/dashboard.component.ts
index 10c234c5f..8fc7cd27d 100644
--- a/ng6-seed/src/app/dashboard/dashboard.component.ts
+++ b/ng6-seed/src/app/dashboard/dashboard.component.ts
@@ -125,16 +125,21 @@ export class DashboardComponent {
   const fromMax = new Date(today.getFullYear(), today.getMonth()+1, 0);
   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}
                 };
diff --git a/ng6-seed/src/app/dashboard/dashboard.service.ts b/ng6-seed/src/app/dashboard/dashboard.service.ts
index bca8717dc..f9c663f5c 100644
--- a/ng6-seed/src/app/dashboard/dashboard.service.ts
+++ b/ng6-seed/src/app/dashboard/dashboard.service.ts
@@ -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,