tanshu/barker
1
0
Fork 0
Code Issues 1 Pull Requests Releases 4 Activity

Blacked and isorted the python files

Browse Source 
Prettied and eslinted the typescript/html files
This commit is contained in:
Amritanshu Agrawal
2020-10-11 10:56:29 +05:30
parent b31db593c2
commit d677cfb1ea
505 changed files with 7560 additions and 5650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bookie/src/app/bill-settlement-report/bill-settlement-report-datasource.ts
View File

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

6
bookie/src/app/bill-settlement-report/bill-settlement-report-item.ts Normal file
View File

@ -0,0 +1,6 @@
export class BillSettlementReportItem {
date: string;
billId: string;
amount: number;
settlement: string;
}

15
bookie/src/app/bill-settlement-report/bill-settlement-report-resolver.service.spec.ts
View File

@ -1,15 +1,18 @@
import {inject, TestBed} from '@angular/core/testing';
import { inject, TestBed } from '@angular/core/testing';
import {BillSettlementReportResolver} from './bill-settlement-report-resolver.service';
import { BillSettlementReportResolver } from './bill-settlement-report-resolver.service';
describe('BillSettlementReportResolver', () => {
beforeEach(() => {
TestBed.configureTestingModule({
providers: [BillSettlementReportResolver]
providers: [BillSettlementReportResolver],
});
});
it('should be created', inject([BillSettlementReportResolver], (service: BillSettlementReportResolver) => {
expect(service).toBeTruthy();
}));
it('should be created', inject(
[BillSettlementReportResolver],
(service: BillSettlementReportResolver) => {
expect(service).toBeTruthy();
},
));
});

19
bookie/src/app/bill-settlement-report/bill-settlement-report-resolver.service.ts
View File

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

2
bookie/src/app/bill-settlement-report/bill-settlement-report-routing.module.spec.ts
View File

@ -1,4 +1,4 @@
import {BillSettlementReportRoutingModule} from './bill-settlement-report-routing.module';
import { BillSettlementReportRoutingModule } from './bill-settlement-report-routing.module';
describe('BillSettlementReportRoutingModule', () => {
let pbillSettlementReportRoutingModule: BillSettlementReportRoutingModule;

31
bookie/src/app/bill-settlement-report/bill-settlement-report-routing.module.ts
View File

@ -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 { BillSettlementReportResolver } from './bill-settlement-report-resolver.service';
import { AuthGuard } from '../auth/auth-guard.service';
import { BillSettlementReportResolver } from './bill-settlement-report-resolver.service';
import { BillSettlementReportComponent } from './bill-settlement-report.component';
const billSettlementReportRoutes: Routes = [
@ -11,27 +13,18 @@ const billSettlementReportRoutes: Routes = [
component: BillSettlementReportComponent,
canActivate: [AuthGuard],
data: {
permission: 'Bill Settlement Report'
permission: 'Bill Settlement Report',
},
resolve: {
info: BillSettlementReportResolver
info: BillSettlementReportResolver,
},
runGuardsAndResolvers: 'always'
}
runGuardsAndResolvers: 'always',
},
];
@NgModule({
imports: [
CommonModule,
RouterModule.forChild(billSettlementReportRoutes)
],
exports: [
RouterModule
],
providers: [
BillSettlementReportResolver
]
imports: [CommonModule, RouterModule.forChild(billSettlementReportRoutes)],
exports: [RouterModule],
providers: [BillSettlementReportResolver],
})
export class BillSettlementReportRoutingModule {
}
export class BillSettlementReportRoutingModule {}

40
bookie/src/app/bill-settlement-report/bill-settlement-report.component.html
View File

@ -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,33 +42,32 @@
</div>
</form>
<mat-table #table [dataSource]="dataSource" aria-label="Elements">
<!-- Date Column -->
<ng-container matColumnDef="date">
<mat-header-cell *matHeaderCellDef>Time</mat-header-cell>
<mat-cell *matCellDef="let row">{{row.date}}</mat-cell>
<mat-cell *matCellDef="let row">{{ row.date }}</mat-cell>
</ng-container>
<!-- Bill ID Column -->
<ng-container matColumnDef="billId">
<mat-header-cell *matHeaderCellDef class="right">Bill ID</mat-header-cell>
<mat-cell *matCellDef="let row" class="right">{{row.billId}}</mat-cell>
<mat-cell *matCellDef="let row" class="right">{{ row.billId }}</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 | number:'1.2-2'}}</mat-cell>
<mat-cell *matCellDef="let row" class="right">{{ row.amount | number: '1.2-2' }}</mat-cell>
</ng-container>
<!-- Settlement Column -->
<ng-container matColumnDef="settlement">
<mat-header-cell *matHeaderCellDef class="right">Settlement</mat-header-cell>
<mat-cell *matCellDef="let row" class="right">{{row.settlement}}</mat-cell>
<mat-cell *matCellDef="let row" class="right">{{ row.settlement }}</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>

9
bookie/src/app/bill-settlement-report/bill-settlement-report.component.spec.ts
View File

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

41
bookie/src/app/bill-settlement-report/bill-settlement-report.component.ts
View File

@ -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 { BillSettlementReportDataSource } from './bill-settlement-report-datasource';
import { BillSettlementReport } from './bill-settlement-report';
import { ToCsvService } from '../shared/to-csv.service';
import { BillSettlementReport } from './bill-settlement-report';
import { BillSettlementReportDataSource } from './bill-settlement-report-datasource';
@Component({
selector: 'app-bill-settlement-report',
templateUrl: './bill-settlement-report.component.html',
styleUrls: ['./bill-settlement-report.component.css']
styleUrls: ['./bill-settlement-report.component.css'],
})
export class BillSettlementReportComponent implements OnInit {
dataSource: BillSettlementReportDataSource;
@ -19,27 +21,24 @@ export class BillSettlementReportComponent implements OnInit {
/** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */
displayedColumns = ['date', 'billId', 'amount', 'settlement'];
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: BillSettlementReport }) => {
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 BillSettlementReportDataSource(this.info.amounts);
this.route.data.subscribe((data: { info: BillSettlementReport }) => {
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 BillSettlementReportDataSource(this.info.amounts);
});
}
show() {
@ -47,15 +46,15 @@ export class BillSettlementReportComponent implements OnInit {
this.router.navigate(['bill-settlement-report'], {
queryParams: {
startDate: info.startDate,
finishDate: info.finishDate
}
finishDate: info.finishDate,
},
});
}
createForm() {
this.form = this.fb.group({
startDate: '',
finishDate: ''
finishDate: '',
});
}
@ -64,7 +63,7 @@ export class BillSettlementReportComponent 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'),
};
}
@ -73,9 +72,11 @@ export class BillSettlementReportComponent implements OnInit {
Date: 'date',
BillID: 'billId',
Amount: 'amount',
Settlement: 'settlement'
Settlement: 'settlement',
};
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', 'bill-settlement-report.csv');

2
bookie/src/app/bill-settlement-report/bill-settlement-report.module.spec.ts
View File

@ -1,4 +1,4 @@
import {BillSettlementReportModule} from './bill-settlement-report.module';
import { BillSettlementReportModule } from './bill-settlement-report.module';
describe('BillSettlementReportModule', () => {
let pbillSettlementReportModule: BillSettlementReportModule;

38
bookie/src/app/bill-settlement-report/bill-settlement-report.module.ts
View File

@ -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 { BillSettlementReportRoutingModule } from './bill-settlement-report-routing.module';
import { BillSettlementReportComponent } from './bill-settlement-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,
BillSettlementReportRoutingModule
],
declarations: [
BillSettlementReportComponent
BillSettlementReportRoutingModule,
],
declarations: [BillSettlementReportComponent],
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 BillSettlementReportModule {
}
export class BillSettlementReportModule {}

15
bookie/src/app/bill-settlement-report/bill-settlement-report.service.spec.ts
View File

@ -1,15 +1,18 @@
import {inject, TestBed} from '@angular/core/testing';
import { inject, TestBed } from '@angular/core/testing';
import {BillSettlementReportService} from './bill-settlement-report.service';
import { BillSettlementReportService } from './bill-settlement-report.service';
describe('BillSettlementReportService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
providers: [BillSettlementReportService]
providers: [BillSettlementReportService],
});
});
it('should be created', inject([BillSettlementReportService], (service: BillSettlementReportService) => {
expect(service).toBeTruthy();
}));
it('should be created', inject(
[BillSettlementReportService],
(service: BillSettlementReportService) => {
expect(service).toBeTruthy();
},
));
});

27
bookie/src/app/bill-settlement-report/bill-settlement-report.service.ts
View File

@ -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 { BillSettlementReport } from './bill-settlement-report';
import { catchError } from 'rxjs/operators';
import { ErrorLoggerService } from '../core/error-logger.service';
const httpOptions = {
headers: new HttpHeaders({'Content-Type': 'application/json'})
};
import { BillSettlementReport } from './bill-settlement-report';
const url = '/api/bill-settlement-report';
const serviceName = 'BillSettlementReportService';
@Injectable({
providedIn: 'root'
providedIn: 'root',
})
export class BillSettlementReportService {
constructor(private http: HttpClient, private log: ErrorLoggerService) {
}
constructor(private http: HttpClient, private log: ErrorLoggerService) {}
get(startDate: string, finishDate): Observable<BillSettlementReport> {
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<BillSettlementReport>>this.http.get<BillSettlementReport>(url, options)
.pipe(
catchError(this.log.handleError(serviceName, 'get'))
);
return <Observable<BillSettlementReport>>(
this.http
.get<BillSettlementReport>(url, options)
.pipe(catchError(this.log.handleError(serviceName, 'get')))
);
}
}

7
bookie/src/app/bill-settlement-report/bill-settlement-report.ts
View File

@ -1,9 +1,4 @@
export class BillSettlementReportItem {
date: string;
billId: string;
amount: number;
settlement: string;
}
import { BillSettlementReportItem } from './bill-settlement-report-item';
export class BillSettlementReport {
startDate: string;