Moved from tslint to eslint as tslint was depreciated.

Added prettier and also prettied all the typescript files using prettier

ESLint is using the AirBnB rules which are the most strict to lint the files.
This commit is contained in:
2020-10-01 21:28:12 +05:30
parent 40e79ff949
commit 1350870f9e
545 changed files with 8455 additions and 7036 deletions
@@ -1,34 +1,33 @@
import {DataSource} from '@angular/cdk/collections';
import { DataSource } from '@angular/cdk/collections';
import { MatPaginator } from '@angular/material/paginator';
import { MatSort } from '@angular/material/sort';
import {map} from 'rxjs/operators';
import {merge, Observable, of as observableOf} from 'rxjs';
import {NetTransactionsItem} from './net-transactions';
import { map } from 'rxjs/operators';
import { merge, Observable, of as observableOf } from 'rxjs';
import { NetTransactionsItem } from './net-transactions';
export class NetTransactionsDataSource extends DataSource<NetTransactionsItem> {
constructor(private paginator: MatPaginator, private sort: MatSort, public data: NetTransactionsItem[]) {
constructor(
private paginator: MatPaginator,
private sort: MatSort,
public data: NetTransactionsItem[],
) {
super();
}
connect(): Observable<NetTransactionsItem[]> {
const dataMutations = [
observableOf(this.data),
this.paginator.page,
this.sort.sortChange
];
const dataMutations = [observableOf(this.data), this.paginator.page, this.sort.sortChange];
// Set the paginators length
this.paginator.length = this.data.length;
return merge(...dataMutations).pipe(map(() => {
return this.getPagedData(this.getSortedData([...this.data]));
}));
return merge(...dataMutations).pipe(
map(() => {
return this.getPagedData(this.getSortedData([...this.data]));
}),
);
}
disconnect() {
}
disconnect() {}
private getPagedData(data: NetTransactionsItem[]) {
const startIndex = this.paginator.pageIndex * this.paginator.pageSize;
@@ -1,11 +1,11 @@
import {inject, TestBed} from '@angular/core/testing';
import { inject, TestBed } from '@angular/core/testing';
import {NetTransactionsResolver} from './net-transactions-resolver.service';
import { NetTransactionsResolver } from './net-transactions-resolver.service';
describe('NetTransactionsResolver', () => {
beforeEach(() => {
TestBed.configureTestingModule({
providers: [NetTransactionsResolver]
providers: [NetTransactionsResolver],
});
});
@@ -1,16 +1,14 @@
import {Injectable} from '@angular/core';
import {ActivatedRouteSnapshot, Resolve, RouterStateSnapshot} from '@angular/router';
import {Observable} from 'rxjs/internal/Observable';
import {NetTransactions} from './net-transactions';
import {NetTransactionsService} from './net-transactions.service';
import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
import { Observable } from 'rxjs/internal/Observable';
import { NetTransactions } from './net-transactions';
import { NetTransactionsService } from './net-transactions.service';
@Injectable({
providedIn: 'root'
providedIn: 'root',
})
export class NetTransactionsResolver implements Resolve<NetTransactions> {
constructor(private ser: NetTransactionsService) {
}
constructor(private ser: NetTransactionsService) {}
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<NetTransactions> {
const startDate = route.queryParamMap.get('startDate') || null;
@@ -1,4 +1,4 @@
import {NetTransactionsRoutingModule} from './net-transactions-routing.module';
import { NetTransactionsRoutingModule } from './net-transactions-routing.module';
describe('NetTransactionsRoutingModule', () => {
let netTransactionsRoutingModule: NetTransactionsRoutingModule;
@@ -1,9 +1,9 @@
import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {RouterModule, Routes} from '@angular/router';
import {NetTransactionsResolver} from './net-transactions-resolver.service';
import {AuthGuard} from '../auth/auth-guard.service';
import {NetTransactionsComponent} from './net-transactions.component';
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { RouterModule, Routes } from '@angular/router';
import { NetTransactionsResolver } from './net-transactions-resolver.service';
import { AuthGuard } from '../auth/auth-guard.service';
import { NetTransactionsComponent } from './net-transactions.component';
const netTransactionsRoutes: Routes = [
{
@@ -11,27 +11,18 @@ const netTransactionsRoutes: Routes = [
component: NetTransactionsComponent,
canActivate: [AuthGuard],
data: {
permission: 'Net Transactions'
permission: 'Net Transactions',
},
resolve: {
info: NetTransactionsResolver
info: NetTransactionsResolver,
},
runGuardsAndResolvers: 'always'
}
runGuardsAndResolvers: 'always',
},
];
@NgModule({
imports: [
CommonModule,
RouterModule.forChild(netTransactionsRoutes)
],
exports: [
RouterModule
],
providers: [
NetTransactionsResolver
]
imports: [CommonModule, RouterModule.forChild(netTransactionsRoutes)],
exports: [RouterModule],
providers: [NetTransactionsResolver],
})
export class NetTransactionsRoutingModule {
}
export class NetTransactionsRoutingModule {}
@@ -3,10 +3,10 @@
justify-content: flex-end;
}
.selected{
background: #fff3cd
.selected {
background: #fff3cd;
}
.unposted{
background: #f8d7da
.unposted {
background: #f8d7da;
}
@@ -4,17 +4,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>
@@ -22,40 +39,45 @@
</div>
</form>
<mat-table #table [dataSource]="dataSource" matSort aria-label="Elements">
<!-- Type Column -->
<ng-container matColumnDef="type">
<mat-header-cell *matHeaderCellDef mat-sort-header>Type</mat-header-cell>
<mat-cell *matCellDef="let row">{{row.type}}</mat-cell>
<mat-cell *matCellDef="let row">{{ row.type }}</mat-cell>
</ng-container>
<!-- Name Column -->
<ng-container matColumnDef="name">
<mat-header-cell *matHeaderCellDef mat-sort-header>Name</mat-header-cell>
<mat-cell *matCellDef="let row">{{row.name}}</mat-cell>
<mat-cell *matCellDef="let row">{{ row.name }}</mat-cell>
</ng-container>
<!-- Debit Column -->
<ng-container matColumnDef="debit">
<mat-header-cell *matHeaderCellDef mat-sort-header class="right">Debit</mat-header-cell>
<mat-cell *matCellDef="let row" class="right">{{row.debit | currency:'INR' | accounting}}</mat-cell>
<mat-cell *matCellDef="let row" class="right">{{
row.debit | currency: 'INR' | accounting
}}</mat-cell>
</ng-container>
<!-- Credit Column -->
<ng-container matColumnDef="credit">
<mat-header-cell *matHeaderCellDef mat-sort-header class="right">Credit</mat-header-cell>
<mat-cell *matCellDef="let row" class="right">{{row.credit | currency:'INR' | accounting}}</mat-cell>
<mat-cell *matCellDef="let row" class="right">{{
row.credit | currency: 'INR' | accounting
}}</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-paginator #paginator
[length]="dataSource.data.length"
[pageIndex]="0"
[pageSize]="50"
[pageSizeOptions]="[25, 50, 100, 250, 300]">
<mat-paginator
#paginator
[length]="dataSource.data.length"
[pageIndex]="0"
[pageSize]="50"
[pageSizeOptions]="[25, 50, 100, 250, 300]"
>
</mat-paginator>
</mat-card-content>
</mat-card>
@@ -1,6 +1,6 @@
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import {NetTransactionsComponent} from './net-transactions.component';
import { NetTransactionsComponent } from './net-transactions.component';
describe('NetTransactionsComponent', () => {
let component: NetTransactionsComponent;
@@ -8,9 +8,8 @@ describe('NetTransactionsComponent', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [NetTransactionsComponent]
})
.compileComponents();
declarations: [NetTransactionsComponent],
}).compileComponents();
}));
beforeEach(() => {
@@ -1,17 +1,17 @@
import {Component, OnInit, ViewChild} from '@angular/core';
import {FormBuilder, FormGroup} from '@angular/forms';
import { Component, OnInit, ViewChild } from '@angular/core';
import { FormBuilder, FormGroup } from '@angular/forms';
import { MatPaginator } from '@angular/material/paginator';
import { MatSort } from '@angular/material/sort';
import {ActivatedRoute, Router} from '@angular/router';
import { ActivatedRoute, Router } from '@angular/router';
import * as moment from 'moment';
import {NetTransactionsDataSource} from './net-transactions-datasource';
import {NetTransactions} from './net-transactions';
import {NetTransactionsService} from './net-transactions.service';
import { NetTransactionsDataSource } from './net-transactions-datasource';
import { NetTransactions } from './net-transactions';
import { NetTransactionsService } from './net-transactions.service';
@Component({
selector: 'app-net-transactions',
templateUrl: './net-transactions.component.html',
styleUrls: ['./net-transactions.component.css']
styleUrls: ['./net-transactions.component.css'],
})
export class NetTransactionsComponent implements OnInit {
@ViewChild(MatPaginator, { static: true }) paginator: MatPaginator;
@@ -23,24 +23,19 @@ export class NetTransactionsComponent implements OnInit {
/** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */
displayedColumns = ['type', 'name', 'debit', 'credit'];
constructor(
private route: ActivatedRoute,
private router: Router,
private fb: FormBuilder
) {
constructor(private route: ActivatedRoute, private router: Router, private fb: FormBuilder) {
this.createForm();
}
ngOnInit() {
this.route.data
.subscribe((data: { info: NetTransactions }) => {
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 NetTransactionsDataSource(this.paginator, this.sort, this.info.body);
this.route.data.subscribe((data: { info: NetTransactions }) => {
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 NetTransactionsDataSource(this.paginator, this.sort, this.info.body);
});
}
show() {
@@ -48,8 +43,8 @@ export class NetTransactionsComponent implements OnInit {
this.router.navigate(['net-transactions'], {
queryParams: {
startDate: l.startDate,
finishDate: l.finishDate
}
finishDate: l.finishDate,
},
});
}
@@ -66,7 +61,7 @@ export class NetTransactionsComponent implements OnInit {
return {
startDate: moment(formModel.startDate).format('DD-MMM-YYYY'),
finishDate: moment(formModel.finishDate).format('DD-MMM-YYYY'),
body: []
body: [],
};
}
}
@@ -1,4 +1,4 @@
import {NetTransactionsModule} from './net-transactions.module';
import { NetTransactionsModule } from './net-transactions.module';
describe('NetTransactionsModule', () => {
let netTransactionsModule: NetTransactionsModule;
@@ -1,10 +1,15 @@
import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { MatAutocompleteModule } from '@angular/material/autocomplete';
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
import { MatCheckboxModule } from '@angular/material/checkbox';
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';
@@ -13,14 +18,14 @@ import { MatPaginatorModule } from '@angular/material/paginator';
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
import { MatSortModule } from '@angular/material/sort';
import { MatTableModule } from '@angular/material/table';
import {SharedModule} from '../shared/shared.module';
import {ReactiveFormsModule} from '@angular/forms';
import {CdkTableModule} from '@angular/cdk/table';
import {NetTransactionsRoutingModule} from './net-transactions-routing.module';
import {NetTransactionsComponent} from './net-transactions.component';
import {MomentDateAdapter} from '@angular/material-moment-adapter';
import {A11yModule} from '@angular/cdk/a11y';
import {FlexLayoutModule} from '@angular/flex-layout';
import { SharedModule } from '../shared/shared.module';
import { ReactiveFormsModule } from '@angular/forms';
import { CdkTableModule } from '@angular/cdk/table';
import { NetTransactionsRoutingModule } from './net-transactions-routing.module';
import { NetTransactionsComponent } from './net-transactions.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: {
@@ -55,15 +60,12 @@ export const MY_FORMATS = {
MatTableModule,
ReactiveFormsModule,
SharedModule,
NetTransactionsRoutingModule
],
declarations: [
NetTransactionsComponent
NetTransactionsRoutingModule,
],
declarations: [NetTransactionsComponent],
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 NetTransactionsModule {
}
export class NetTransactionsModule {}
@@ -1,11 +1,11 @@
import {inject, TestBed} from '@angular/core/testing';
import { inject, TestBed } from '@angular/core/testing';
import {NetTransactionsService} from './net-transactions.service';
import { NetTransactionsService } from './net-transactions.service';
describe('NetTransactionsService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
providers: [NetTransactionsService]
providers: [NetTransactionsService],
});
});
@@ -1,32 +1,30 @@
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 {NetTransactions} from './net-transactions';
import {ErrorLoggerService} from '../core/error-logger.service';
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 { NetTransactions } from './net-transactions';
import { ErrorLoggerService } from '../core/error-logger.service';
const httpOptions = {
headers: new HttpHeaders({'Content-Type': 'application/json'})
headers: new HttpHeaders({ 'Content-Type': 'application/json' }),
};
const url = '/api/net-transactions';
const serviceName = 'NetTransactionsService';
@Injectable({
providedIn: 'root'
providedIn: 'root',
})
export class NetTransactionsService {
constructor(private http: HttpClient, private log: ErrorLoggerService) {
}
constructor(private http: HttpClient, private log: ErrorLoggerService) {}
list(startDate: string, finishDate): Observable<NetTransactions> {
startDate = startDate ? `/${startDate}` : '';
finishDate = finishDate ? `/${finishDate}` : '';
return <Observable<NetTransactions>>this.http.get<NetTransactions>(`${url}${startDate}${finishDate}`)
.pipe(
catchError(this.log.handleError(serviceName, 'list'))
);
return <Observable<NetTransactions>>(
this.http
.get<NetTransactions>(`${url}${startDate}${finishDate}`)
.pipe(catchError(this.log.handleError(serviceName, 'list')))
);
}
}
@@ -1,4 +1,3 @@
export class NetTransactionsItem {
type: string;
name: string;