Moved to Angular 6.0

----

Pending
* Table width for the points column in incentive
* Linting
* keyboard navigation where it was used earlier
* can remove the unused totals calculated serverside in productledger
* spinner and loading bars
* Activate Guard for Employee Function tabs
* Progress for Fingerprint uploads
* deleted reconcile and receipe features as they were not being used
* focus the right control on component load
This commit is contained in:
tanshu committed 2018-06-09 17:05:11 +05:30
1 parent b3cb01da02
commit 6be1dd5a3a
1380 files changed
+23914 -18722

No files matched your search

@@ -0,0 +1,63 @@
import {DataSource} from '@angular/cdk/collections';
import {MatPaginator, MatSort} from '@angular/material';
import {map} from 'rxjs/operators';
import {merge, Observable, of as observableOf} from 'rxjs';
import {PurchasesItem} from './purchases';
export class PurchasesDataSource extends DataSource<PurchasesItem> {
constructor(private paginator: MatPaginator, private sort: MatSort, public data: PurchasesItem[]) {
super();
}
connect(): Observable<PurchasesItem[]> {
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]));
}));
}
disconnect() {
}
private getPagedData(data: PurchasesItem[]) {
const startIndex = this.paginator.pageIndex * this.paginator.pageSize;
return data.splice(startIndex, this.paginator.pageSize);
}
private getSortedData(data: PurchasesItem[]) {
if (!this.sort.active || this.sort.direction === '') {
return data;
}
return data.sort((a, b) => {
const isAsc = this.sort.direction === 'asc';
switch (this.sort.active) {
case 'product':
return compare(a.name, b.name, isAsc);
case 'quantity':
return compare(+a.quantity, +b.quantity, isAsc);
case 'rate':
return compare(+a.rate, +b.rate, isAsc);
case 'amount':
return compare(+a.amount, +b.amount, isAsc);
default:
return 0;
}
});
}
}
/** Simple sort comparator for example ID/Name columns (for client-side sorting). */
function compare(a, b, isAsc) {
return (a < b ? -1 : 1) * (isAsc ? 1 : -1);
}
@@ -0,0 +1,15 @@
import {inject, TestBed} from '@angular/core/testing';
import {PurchasesResolver} from './purchases-resolver.service';
describe('PurchasesResolver', () => {
beforeEach(() => {
TestBed.configureTestingModule({
providers: [PurchasesResolver]
});
});
it('should be created', inject([PurchasesResolver], (service: PurchasesResolver) => {
expect(service).toBeTruthy();
}));
});
@@ -0,0 +1,20 @@
import {Injectable} from '@angular/core';
import {ActivatedRouteSnapshot, Resolve, RouterStateSnapshot} from '@angular/router';
import {Observable} from 'rxjs/internal/Observable';
import {Purchases} from './purchases';
import {PurchasesService} from './purchases.service';
@Injectable({
providedIn: 'root'
})
export class PurchasesResolver implements Resolve<Purchases> {
constructor(private ser: PurchasesService) {
}
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<Purchases> {
const startDate = route.queryParamMap.get('startDate') || null;
const finishDate = route.queryParamMap.get('finishDate') || null;
return this.ser.list(startDate, finishDate);
}
}
@@ -0,0 +1,13 @@
import {PurchasesRoutingModule} from './purchases-routing.module';
describe('PurchasesRoutingModule', () => {
let purchasesRoutingModule: PurchasesRoutingModule;
beforeEach(() => {
purchasesRoutingModule = new PurchasesRoutingModule();
});
it('should create an instance', () => {
expect(purchasesRoutingModule).toBeTruthy();
});
});
@@ -0,0 +1,37 @@
import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {RouterModule, Routes} from '@angular/router';
import {PurchasesResolver} from './purchases-resolver.service';
import {AuthGuard} from '../auth/auth-guard.service';
import {PurchasesComponent} from './purchases.component';
const purchasesRoutes: Routes = [
{
path: 'Purchases',
component: PurchasesComponent,
canActivate: [AuthGuard],
data: {
permission: 'Purchases'
},
resolve: {
info: PurchasesResolver
},
runGuardsAndResolvers: 'always'
}
];
@NgModule({
imports: [
CommonModule,
RouterModule.forChild(purchasesRoutes)
],
exports: [
RouterModule
],
providers: [
PurchasesResolver
]
})
export class PurchasesRoutingModule {
}
@@ -0,0 +1,12 @@
.right {
display: flex;
justify-content: flex-end;
}
.selected{
background: #fff3cd
}
.unposted{
background: #f8d7da
}
@@ -0,0 +1,74 @@
<mat-card>
<mat-card-title-group>
<mat-card-title>Purchases</mat-card-title>
</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">
<mat-form-field fxFlex="40">
<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">
<mat-datepicker-toggle matSuffix [for]="finishDate"></mat-datepicker-toggle>
<mat-datepicker #finishDate></mat-datepicker>
</mat-form-field>
<button fxFlex="20" mat-raised-button color="primary" (click)="show()">Show</button>
</div>
</form>
<mat-table #table [dataSource]="dataSource" matSort aria-label="Elements">
<!-- Product Column -->
<ng-container matColumnDef="product">
<mat-header-cell *matHeaderCellDef>Product</mat-header-cell>
<mat-cell *matCellDef="let row">{{row.name}}</mat-cell>
<mat-footer-cell *matFooterCellDef>
{{info.footer.name}}
</mat-footer-cell>
</ng-container>
<!-- Quantity Column -->
<ng-container matColumnDef="quantity">
<mat-header-cell *matHeaderCellDef class="right">Quantity</mat-header-cell>
<mat-cell *matCellDef="let row" class="right">{{row.quantity | number:'1.2-2'}}</mat-cell>
<mat-footer-cell *matFooterCellDef class="right">
{{info.footer.quantity | number:'1.2-2'}}
</mat-footer-cell>
</ng-container>
<!-- Rate Column -->
<ng-container matColumnDef="rate">
<mat-header-cell *matHeaderCellDef class="right">Rate</mat-header-cell>
<mat-cell *matCellDef="let row" class="right">{{row.rate | currency:'INR'}}</mat-cell>
<mat-footer-cell *matFooterCellDef class="right">
{{info.footer.rate | currency:'INR'}}
</mat-footer-cell>
</ng-container>
<!-- Amount Column -->
<ng-container matColumnDef="amount">
<mat-header-cell *matHeaderCellDef mat-sort-header class="right">Amount</mat-header-cell>
<mat-cell *matCellDef="let row" class="right">{{row.amount | currency:'INR'}}</mat-cell>
<mat-footer-cell *matFooterCellDef class="right">
{{info.footer.amount | currency:'INR'}}
</mat-footer-cell>
</ng-container>
<mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
<mat-row *matRowDef="let row; columns: displayedColumns;"></mat-row>
<mat-footer-row *matFooterRowDef="displayedColumns"></mat-footer-row>
</mat-table>
<mat-paginator #paginator
[length]="dataSource.data.length"
[pageIndex]="0"
[pageSize]="50"
[pageSizeOptions]="[25, 50, 100, 250, 300]">
</mat-paginator>
</mat-card-content>
</mat-card>
@@ -0,0 +1,25 @@
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import {PurchasesComponent} from './purchases.component';
describe('PurchasesComponent', () => {
let component: PurchasesComponent;
let fixture: ComponentFixture<PurchasesComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [PurchasesComponent]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(PurchasesComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
@@ -0,0 +1,71 @@
import {Component, OnInit, ViewChild} from '@angular/core';
import {FormBuilder, FormGroup} from '@angular/forms';
import {MatPaginator, MatSort} from '@angular/material';
import {ActivatedRoute, Router} from '@angular/router';
import * as moment from 'moment';
import {PurchasesDataSource} from './purchases-datasource';
import {Purchases, PurchasesItem} from './purchases';
@Component({
selector: 'app-purchases',
templateUrl: './purchases.component.html',
styleUrls: ['./purchases.component.css']
})
export class PurchasesComponent implements OnInit {
@ViewChild(MatPaginator) paginator: MatPaginator;
@ViewChild(MatSort) sort: MatSort;
dataSource: PurchasesDataSource;
form: FormGroup;
info: Purchases;
selectedRowId: string;
/** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */
displayedColumns = ['product', 'quantity', 'rate', 'amount'];
constructor(
private route: ActivatedRoute,
private router: Router,
private fb: FormBuilder
) {
this.createForm();
}
ngOnInit() {
this.route.data
.subscribe((data: { info: Purchases }) => {
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 PurchasesDataSource(this.paginator, this.sort, this.info.body);
});
}
show() {
const l = this.prepareSubmit();
this.router.navigate(['Purchases'], {
queryParams: {
startDate: l.startDate,
finishDate: l.finishDate
}
});
}
createForm() {
this.form = this.fb.group({
startDate: '',
finishDate: '',
});
}
prepareSubmit(): Purchases {
const formModel = this.form.value;
return {
startDate: moment(formModel.startDate).format('DD-MMM-YYYY'),
finishDate: moment(formModel.finishDate).format('DD-MMM-YYYY'),
body: [],
footer: new PurchasesItem()
};
}
}
@@ -0,0 +1,13 @@
import {PurchasesModule} from './purchases.module';
describe('PurchasesModule', () => {
let purchasesModule: PurchasesModule;
beforeEach(() => {
purchasesModule = new PurchasesModule();
});
it('should create an instance', () => {
expect(purchasesModule).toBeTruthy();
});
});
@@ -0,0 +1,75 @@
import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {
DateAdapter,
MAT_DATE_FORMATS,
MAT_DATE_LOCALE,
MatAutocompleteModule,
MatButtonModule,
MatCardModule,
MatCheckboxModule,
MatDatepickerModule,
MatFormFieldModule,
MatIconModule,
MatInputModule,
MatNativeDateModule,
MatPaginatorModule,
MatProgressSpinnerModule,
MatSortModule,
MatTableModule
} from '@angular/material';
import {SharedModule} from '../shared/shared.module';
import {ReactiveFormsModule} from '@angular/forms';
import {CdkTableModule} from '@angular/cdk/table';
import {PurchasesRoutingModule} from './purchases-routing.module';
import {PurchasesComponent} from './purchases.component';
import {MomentDateAdapter} from '@angular/material-moment-adapter';
import {A11yModule} from '@angular/cdk/a11y';
import {FlexLayoutModule, FlexModule} from '@angular/flex-layout';
export const MY_FORMATS = {
parse: {
dateInput: 'DD-MMM-YYYY',
},
display: {
dateInput: 'DD-MMM-YYYY',
monthYearLabel: 'MMM YYYY',
dateA11yLabel: 'DD-MMM-YYYY',
monthYearA11yLabel: 'MMM YYYY',
},
};
@NgModule({
imports: [
A11yModule,
CommonModule,
CdkTableModule,
FlexModule,
FlexLayoutModule,
MatAutocompleteModule,
MatButtonModule,
MatCardModule,
MatCheckboxModule,
MatDatepickerModule,
MatFormFieldModule,
MatIconModule,
MatInputModule,
MatNativeDateModule,
MatPaginatorModule,
MatProgressSpinnerModule,
MatSortModule,
MatTableModule,
ReactiveFormsModule,
SharedModule,
PurchasesRoutingModule
],
declarations: [
PurchasesComponent
],
providers: [
{provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE]},
{provide: MAT_DATE_FORMATS, useValue: MY_FORMATS},
]
})
export class PurchasesModule {
}
@@ -0,0 +1,15 @@
import {inject, TestBed} from '@angular/core/testing';
import {PurchasesService} from './purchases.service';
describe('PurchasesService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
providers: [PurchasesService]
});
});
it('should be created', inject([PurchasesService], (service: PurchasesService) => {
expect(service).toBeTruthy();
}));
});
@@ -0,0 +1,37 @@
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 {Purchases} from './purchases';
import {ErrorLoggerService} from '../core/error-logger.service';
const httpOptions = {
headers: new HttpHeaders({'Content-Type': 'application/json'})
};
const url = '/api/Purchases';
const serviceName = 'PurchasesService';
@Injectable({
providedIn: 'root'
})
export class PurchasesService {
constructor(private http: HttpClient, private log: ErrorLoggerService) {
}
list(startDate: string, finishDate): Observable<Purchases> {
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<Purchases>>this.http.get<Purchases>(url, options)
.pipe(
catchError(this.log.handleError(serviceName, 'list'))
);
}
}
+15
View File
@@ -0,0 +1,15 @@
export class PurchasesItem {
name: string;
quantity: number;
rate: number;
amount: number;
url: string;
}
export class Purchases {
startDate: string;
finishDate: string;
body: PurchasesItem[];
footer: PurchasesItem;
}