Blacked and isorted the python files

Prettied and eslinted the typescript/html files

bookie/src/app/discount-report/discount-report-datasource.ts

@@ -1,10 +1,9 @@
 import { DataSource } from '@angular/cdk/collections';
 import { Observable, of as observableOf } from 'rxjs';
-import { DiscountReportItem } from './discount-report';
 
+import { DiscountReportItem } from './discount-report-item';
 
 export class DiscountReportDataSource extends DataSource<DiscountReportItem> {
-
   constructor(public data: DiscountReportItem[]) {
     super();
   }
@@ -13,6 +12,5 @@ export class DiscountReportDataSource extends DataSource<DiscountReportItem> {
     return observableOf(this.data);
   }
 
-  disconnect() {
-  }
+  disconnect() {}
 }

bookie/src/app/discount-report/discount-report-item.ts

@@ -0,0 +1,4 @@
+export class DiscountReportItem {
+  name: string;
+  amount: number;
+}

bookie/src/app/discount-report/discount-report-resolver.service.spec.ts

@@ -1,11 +1,11 @@
-import {inject, TestBed} from '@angular/core/testing';
+import { inject, TestBed } from '@angular/core/testing';
 
-import {DiscountReportResolver} from './discount-report-resolver.service';
+import { DiscountReportResolver } from './discount-report-resolver.service';
 
 describe('DiscountReportResolver', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
-      providers: [DiscountReportResolver]
+      providers: [DiscountReportResolver],
     });
   });
 

bookie/src/app/discount-report/discount-report-resolver.service.ts

@@ -1,18 +1,17 @@
-import {Injectable} from '@angular/core';
-import {ActivatedRouteSnapshot, Resolve, RouterStateSnapshot} from '@angular/router';
-import {Observable} from 'rxjs/internal/Observable';
-import {DiscountReport} from './discount-report';
-import {DiscountReportService} from './discount-report.service';
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, Resolve } from '@angular/router';
+import { Observable } from 'rxjs/internal/Observable';
+
+import { DiscountReport } from './discount-report';
+import { DiscountReportService } from './discount-report.service';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class DiscountReportResolver implements Resolve<DiscountReport> {
+  constructor(private ser: DiscountReportService) {}
 
-  constructor(private ser: DiscountReportService) {
-  }
-
-  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<DiscountReport> {
+  resolve(route: ActivatedRouteSnapshot): Observable<DiscountReport> {
     const startDate = route.queryParamMap.get('startDate') || null;
     const finishDate = route.queryParamMap.get('finishDate') || null;
     return this.ser.get(startDate, finishDate);

bookie/src/app/discount-report/discount-report-routing.module.spec.ts

@@ -1,4 +1,4 @@
-import {DiscountReportRoutingModule} from './discount-report-routing.module';
+import { DiscountReportRoutingModule } from './discount-report-routing.module';
 
 describe('DiscountReportRoutingModule', () => {
   let discountReportRoutingModule: DiscountReportRoutingModule;

bookie/src/app/discount-report/discount-report-routing.module.ts

@@ -1,8 +1,10 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { DiscountReportResolver } from './discount-report-resolver.service';
+
 import { AuthGuard } from '../auth/auth-guard.service';
+
+import { DiscountReportResolver } from './discount-report-resolver.service';
 import { DiscountReportComponent } from './discount-report.component';
 
 const discountReportRoutes: Routes = [
@@ -11,27 +13,18 @@ const discountReportRoutes: Routes = [
     component: DiscountReportComponent,
     canActivate: [AuthGuard],
     data: {
-      permission: 'Discount Report'
+      permission: 'Discount Report',
     },
     resolve: {
-      info: DiscountReportResolver
+      info: DiscountReportResolver,
     },
-    runGuardsAndResolvers: 'always'
-  }
+    runGuardsAndResolvers: 'always',
+  },
 ];
 
 @NgModule({
-  imports: [
-    CommonModule,
-    RouterModule.forChild(discountReportRoutes)
-
-  ],
-  exports: [
-    RouterModule
-  ],
-  providers: [
-    DiscountReportResolver
-  ]
+  imports: [CommonModule, RouterModule.forChild(discountReportRoutes)],
+  exports: [RouterModule],
+  providers: [DiscountReportResolver],
 })
-export class DiscountReportRoutingModule {
-}
+export class DiscountReportRoutingModule {}

bookie/src/app/discount-report/discount-report.component.html

@@ -7,17 +7,34 @@
   </mat-card-title-group>
   <mat-card-content>
     <form [formGroup]="form" fxLayout="column">
-      <div fxLayout="row" fxLayout.lt-md="column" fxLayoutGap="20px" fxLayoutGap.lt-md="0px"
-           fxLayoutAlign="space-around start">
+      <div
+        fxLayout="row"
+        fxLayout.lt-md="column"
+        fxLayoutGap="20px"
+        fxLayoutGap.lt-md="0px"
+        fxLayoutAlign="space-around start"
+      >
         <mat-form-field fxFlex="40">
-          <input matInput [matDatepicker]="startDate" (focus)="startDate.open()" placeholder="Start Date"
-                 formControlName="startDate" autocomplete="off">
+          <input
+            matInput
+            [matDatepicker]="startDate"
+            (focus)="startDate.open()"
+            placeholder="Start Date"
+            formControlName="startDate"
+            autocomplete="off"
+          />
           <mat-datepicker-toggle matSuffix [for]="startDate"></mat-datepicker-toggle>
           <mat-datepicker #startDate></mat-datepicker>
         </mat-form-field>
         <mat-form-field fxFlex="40">
-          <input matInput [matDatepicker]="finishDate" (focus)="finishDate.open()" placeholder="Finish Date"
-                 formControlName="finishDate" autocomplete="off">
+          <input
+            matInput
+            [matDatepicker]="finishDate"
+            (focus)="finishDate.open()"
+            placeholder="Finish Date"
+            formControlName="finishDate"
+            autocomplete="off"
+          />
           <mat-datepicker-toggle matSuffix [for]="finishDate"></mat-datepicker-toggle>
           <mat-datepicker #finishDate></mat-datepicker>
         </mat-form-field>
@@ -25,20 +42,19 @@
       </div>
     </form>
     <mat-table #table [dataSource]="dataSource" aria-label="Elements">
-
       <!-- Name Column -->
       <ng-container matColumnDef="name">
         <mat-header-cell *matHeaderCellDef>Name</mat-header-cell>
-        <mat-cell *matCellDef="let row">{{row.name}}</mat-cell>
+        <mat-cell *matCellDef="let row">{{ row.name }}</mat-cell>
       </ng-container>
 
       <!-- Amount Column -->
       <ng-container matColumnDef="amount">
         <mat-header-cell *matHeaderCellDef class="right">Amount</mat-header-cell>
-        <mat-cell *matCellDef="let row" class="right">{{row.amount | currency:'INR'}}</mat-cell>
+        <mat-cell *matCellDef="let row" class="right">{{ row.amount | currency: 'INR' }}</mat-cell>
       </ng-container>
       <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
-      <mat-row *matRowDef="let row; columns: displayedColumns;"></mat-row>
+      <mat-row *matRowDef="let row; columns: displayedColumns"></mat-row>
     </mat-table>
   </mat-card-content>
 </mat-card>

bookie/src/app/discount-report/discount-report.component.spec.ts

@@ -1,6 +1,6 @@
-import {async, ComponentFixture, TestBed} from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import {DiscountReportComponent} from './discount-report.component';
+import { DiscountReportComponent } from './discount-report.component';
 
 describe('DiscountReportComponent', () => {
   let component: DiscountReportComponent;
@@ -8,9 +8,8 @@ describe('DiscountReportComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [DiscountReportComponent]
-    })
-      .compileComponents();
+      declarations: [DiscountReportComponent],
+    }).compileComponents();
   }));
 
   beforeEach(() => {

bookie/src/app/discount-report/discount-report.component.ts

@@ -2,14 +2,16 @@ import { Component, OnInit } from '@angular/core';
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import * as moment from 'moment';
-import { DiscountReportDataSource } from './discount-report-datasource';
-import { DiscountReport } from './discount-report';
+
 import { ToCsvService } from '../shared/to-csv.service';
 
+import { DiscountReport } from './discount-report';
+import { DiscountReportDataSource } from './discount-report-datasource';
+
 @Component({
   selector: 'app-discount-report',
   templateUrl: './discount-report.component.html',
-  styleUrls: ['./discount-report.component.css']
+  styleUrls: ['./discount-report.component.css'],
 })
 export class DiscountReportComponent implements OnInit {
   dataSource: DiscountReportDataSource;
@@ -19,27 +21,24 @@ export class DiscountReportComponent implements OnInit {
   /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */
   displayedColumns = ['name', 'amount'];
 
-
   constructor(
     private route: ActivatedRoute,
     private router: Router,
     private fb: FormBuilder,
-    private toCsv: ToCsvService
+    private toCsv: ToCsvService,
   ) {
     this.createForm();
-
   }
 
   ngOnInit() {
-    this.route.data
-      .subscribe((data: { info: DiscountReport }) => {
-        this.info = data.info;
-        this.form.setValue({
-          startDate: moment(this.info.startDate, 'DD-MMM-YYYY').toDate(),
-          finishDate: moment(this.info.finishDate, 'DD-MMM-YYYY').toDate()
-        });
-        this.dataSource = new DiscountReportDataSource(this.info.amounts);
+    this.route.data.subscribe((data: { info: DiscountReport }) => {
+      this.info = data.info;
+      this.form.setValue({
+        startDate: moment(this.info.startDate, 'DD-MMM-YYYY').toDate(),
+        finishDate: moment(this.info.finishDate, 'DD-MMM-YYYY').toDate(),
       });
+      this.dataSource = new DiscountReportDataSource(this.info.amounts);
+    });
   }
 
   show() {
@@ -47,15 +46,15 @@ export class DiscountReportComponent implements OnInit {
     this.router.navigate(['discount-report'], {
       queryParams: {
         startDate: info.startDate,
-        finishDate: info.finishDate
-      }
+        finishDate: info.finishDate,
+      },
     });
   }
 
   createForm() {
     this.form = this.fb.group({
       startDate: '',
-      finishDate: ''
+      finishDate: '',
     });
   }
 
@@ -64,16 +63,18 @@ export class DiscountReportComponent implements OnInit {
 
     return {
       startDate: moment(formModel.startDate).format('DD-MMM-YYYY'),
-      finishDate: moment(formModel.finishDate).format('DD-MMM-YYYY')
+      finishDate: moment(formModel.finishDate).format('DD-MMM-YYYY'),
     };
   }
 
   exportCsv() {
     const headers = {
       Name: 'name',
-      Amount: 'amount'
+      Amount: 'amount',
     };
-    const csvData = new Blob([this.toCsv.toCsv(headers, this.dataSource.data)], {type: 'text/csv;charset=utf-8;'});
+    const csvData = new Blob([this.toCsv.toCsv(headers, this.dataSource.data)], {
+      type: 'text/csv;charset=utf-8;',
+    });
     const link = document.createElement('a');
     link.href = window.URL.createObjectURL(csvData);
     link.setAttribute('download', 'discount-report.csv');

bookie/src/app/discount-report/discount-report.module.spec.ts

@@ -1,4 +1,4 @@
-import {DiscountReportModule} from './discount-report.module';
+import { DiscountReportModule } from './discount-report.module';
 
 describe('DiscountReportModule', () => {
   let discountReportModule: DiscountReportModule;

bookie/src/app/discount-report/discount-report.module.ts

@@ -1,22 +1,29 @@
-import { NgModule } from '@angular/core';
+import { A11yModule } from '@angular/cdk/a11y';
+import { CdkTableModule } from '@angular/cdk/table';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { FlexLayoutModule } from '@angular/flex-layout';
+import { ReactiveFormsModule } from '@angular/forms';
+import { MomentDateAdapter } from '@angular/material-moment-adapter';
 import { MatAutocompleteModule } from '@angular/material/autocomplete';
 import { MatButtonModule } from '@angular/material/button';
 import { MatCardModule } from '@angular/material/card';
-import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core';
+import {
+  DateAdapter,
+  MAT_DATE_FORMATS,
+  MAT_DATE_LOCALE,
+  MatNativeDateModule,
+} from '@angular/material/core';
 import { MatDatepickerModule } from '@angular/material/datepicker';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatIconModule } from '@angular/material/icon';
 import { MatInputModule } from '@angular/material/input';
 import { MatTableModule } from '@angular/material/table';
-import { SharedModule} from '../shared/shared.module';
-import { ReactiveFormsModule } from '@angular/forms';
-import { CdkTableModule } from '@angular/cdk/table';
+
+import { SharedModule } from '../shared/shared.module';
+
 import { DiscountReportRoutingModule } from './discount-report-routing.module';
 import { DiscountReportComponent } from './discount-report.component';
-import { MomentDateAdapter } from '@angular/material-moment-adapter';
-import { A11yModule } from '@angular/cdk/a11y';
-import { FlexLayoutModule } from '@angular/flex-layout';
 
 export const MY_FORMATS = {
   parse: {
@@ -47,15 +54,12 @@ export const MY_FORMATS = {
     MatTableModule,
     ReactiveFormsModule,
     SharedModule,
-    DiscountReportRoutingModule
-  ],
-  declarations: [
-    DiscountReportComponent
+    DiscountReportRoutingModule,
   ],
+  declarations: [DiscountReportComponent],
   providers: [
-    {provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE]},
-    {provide: MAT_DATE_FORMATS, useValue: MY_FORMATS},
-  ]
+    { provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE] },
+    { provide: MAT_DATE_FORMATS, useValue: MY_FORMATS },
+  ],
 })
-export class DiscountReportModule {
-}
+export class DiscountReportModule {}

bookie/src/app/discount-report/discount-report.service.spec.ts

@@ -1,11 +1,11 @@
-import {inject, TestBed} from '@angular/core/testing';
+import { inject, TestBed } from '@angular/core/testing';
 
-import {DiscountReportService} from './discount-report.service';
+import { DiscountReportService } from './discount-report.service';
 
 describe('DiscountReportService', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
-      providers: [DiscountReportService]
+      providers: [DiscountReportService],
     });
   });
 

bookie/src/app/discount-report/discount-report.service.ts

@@ -1,36 +1,33 @@
+import { HttpClient, HttpParams } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { catchError } from 'rxjs/operators';
 import { Observable } from 'rxjs/internal/Observable';
-import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
-import { DiscountReport } from './discount-report';
+import { catchError } from 'rxjs/operators';
+
 import { ErrorLoggerService } from '../core/error-logger.service';
 
-const httpOptions = {
-  headers: new HttpHeaders({'Content-Type': 'application/json'})
-};
+import { DiscountReport } from './discount-report';
 
 const url = '/api/discount-report';
 const serviceName = 'DiscountReportService';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class DiscountReportService {
-
-  constructor(private http: HttpClient, private log: ErrorLoggerService) {
-  }
+  constructor(private http: HttpClient, private log: ErrorLoggerService) {}
 
   get(startDate: string, finishDate): Observable<DiscountReport> {
-    const options = {params: new HttpParams()};
+    const options = { params: new HttpParams() };
     if (startDate !== null) {
       options.params = options.params.set('s', startDate);
     }
     if (finishDate !== null) {
       options.params = options.params.set('f', finishDate);
     }
-    return <Observable<DiscountReport>>this.http.get<DiscountReport>(url, options)
-      .pipe(
-        catchError(this.log.handleError(serviceName, 'get'))
-      );
+    return <Observable<DiscountReport>>(
+      this.http
+        .get<DiscountReport>(url, options)
+        .pipe(catchError(this.log.handleError(serviceName, 'get')))
+    );
   }
 }

bookie/src/app/discount-report/discount-report.ts

@@ -1,7 +1,4 @@
-export class DiscountReportItem {
-  name: string;
-  amount: number;
-}
+import { DiscountReportItem } from './discount-report-item';
 
 export class DiscountReport {
   startDate: string;