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

59
bookie/src/app/product/product-detail/product-detail.component.html
View File

@ -5,43 +5,68 @@
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div fxLayout="row" fxLayoutAlign="space-around start" fxLayout.lt-md="column" fxLayoutGap="20px"
fxLayoutGap.lt-md="0px">
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex>
<mat-label>Code</mat-label>
<input matInput placeholder="Code" formControlName="code">
<input matInput placeholder="Code" formControlName="code" />
</mat-form-field>
</div>
<div fxLayout="row" fxLayoutAlign="space-around start" fxLayout.lt-md="column" fxLayoutGap="20px"
fxLayoutGap.lt-md="0px">
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex="75">
<mat-label>Name</mat-label>
<input matInput #name placeholder="Name" formControlName="name">
<input matInput #name placeholder="Name" formControlName="name" />
</mat-form-field>
<mat-form-field fxFlex="25">
<mat-label>Units</mat-label>
<input matInput placeholder="Units" formControlName="units">
<input matInput placeholder="Units" formControlName="units" />
</mat-form-field>
</div>
<div fxLayout="row" fxLayoutAlign="space-around start" fxLayout.lt-md="column" fxLayoutGap="20px"
fxLayoutGap.lt-md="0px">
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex>
<mat-label>Price</mat-label>
<input matInput type="number" placeholder="Price" formControlName="price">
<input matInput type="number" placeholder="Price" formControlName="price" />
</mat-form-field>
<mat-form-field fxFlex>
<mat-label>Quantity</mat-label>
<input matInput type="number" placeholder="Quantity" formControlName="quantity">
<input matInput type="number" placeholder="Quantity" formControlName="quantity" />
</mat-form-field>
</div>
<div fxLayout="row" fxLayoutAlign="space-around start" fxLayout.lt-md="column" fxLayoutGap="20px"
fxLayoutGap.lt-md="0px">
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-checkbox formControlName="hasHappyHour">Has Happy Hour?</mat-checkbox>
<mat-checkbox formControlName="isNotAvailable">Is Not Available?</mat-checkbox>
<mat-checkbox formControlName="isActive">Is Active?</mat-checkbox>
</div>
<div fxLayout="row" fxLayoutAlign="space-around start" fxLayout.lt-md="column" fxLayoutGap="20px"
fxLayoutGap.lt-md="0px">
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex>
<mat-label>Menu Category</mat-label>
<mat-select placeholder="Menu Category" formControlName="menuCategory">
@ -63,7 +88,9 @@
</mat-card-content>
<mat-card-actions>
<button mat-raised-button color="primary" (click)="save()">Save</button>
<button mat-raised-button color="warn" (click)="confirmDelete()" *ngIf="!!item.id">Delete</button>
<button mat-raised-button color="warn" (click)="confirmDelete()" *ngIf="!!item.id">
Delete
</button>
</mat-card-actions>
</mat-card>
</div>

9
bookie/src/app/product/product-detail/product-detail.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 {ProductDetailComponent} from './product-detail.component';
import { ProductDetailComponent } from './product-detail.component';
describe('ProductDetailComponent', () => {
let component: ProductDetailComponent;
@ -8,9 +8,8 @@ describe('ProductDetailComponent', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ProductDetailComponent]
})
.compileComponents();
declarations: [ProductDetailComponent],
}).compileComponents();
}));
beforeEach(() => {

72
bookie/src/app/product/product-detail/product-detail.component.ts
View File

@ -1,18 +1,19 @@
import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
import { ToasterService } from '../../core/toaster.service';
import { ActivatedRoute, Router } from '@angular/router';
import { ProductService } from '../product.service';
import { Product } from '../../core/product';
import { MenuCategory } from '../../core/menu-category';
import { ConfirmDialogComponent } from '../../shared/confirm-dialog/confirm-dialog.component';
import { MatDialog } from '@angular/material/dialog';
import { FormBuilder, FormGroup } from '@angular/forms';
import { MatDialog } from '@angular/material/dialog';
import { ActivatedRoute, Router } from '@angular/router';
import { MenuCategory } from '../../core/menu-category';
import { Product } from '../../core/product';
import { SaleCategory } from '../../core/sale-category';
import { ToasterService } from '../../core/toaster.service';
import { ConfirmDialogComponent } from '../../shared/confirm-dialog/confirm-dialog.component';
import { ProductService } from '../product.service';
@Component({
selector: 'app-product-detail',
templateUrl: './product-detail.component.html',
styleUrls: ['./product-detail.component.css']
styleUrls: ['./product-detail.component.css'],
})
export class ProductDetailComponent implements OnInit, AfterViewInit {
@ViewChild('name', { static: true }) nameElement: ElementRef;
@ -27,14 +28,14 @@ export class ProductDetailComponent implements OnInit, AfterViewInit {
private dialog: MatDialog,
private fb: FormBuilder,
private toaster: ToasterService,
private ser: ProductService
private ser: ProductService,
) {
this.createForm();
}
createForm() {
this.form = this.fb.group({
code: {value: '', disabled: true},
code: { value: '', disabled: true },
name: '',
units: '',
menuCategory: '',
@ -43,17 +44,18 @@ export class ProductDetailComponent implements OnInit, AfterViewInit {
hasHappyHour: '',
isNotAvailable: '',
quantity: '',
isActive: ''
isActive: '',
});
}
ngOnInit() {
this.route.data
.subscribe((data: { item: Product, menuCategories: MenuCategory[], saleCategories: SaleCategory[] }) => {
this.route.data.subscribe(
(data: { item: Product; menuCategories: MenuCategory[]; saleCategories: SaleCategory[] }) => {
this.menuCategories = data.menuCategories;
this.saleCategories = data.saleCategories;
this.showItem(data.item);
});
},
);
}
showItem(item: Product) {
@ -68,7 +70,7 @@ export class ProductDetailComponent implements OnInit, AfterViewInit {
hasHappyHour: this.item.hasHappyHour,
isNotAvailable: this.item.isNotAvailable,
quantity: this.item.quantity || '',
isActive: this.item.isActive
isActive: this.item.isActive,
});
}
@ -79,35 +81,33 @@ export class ProductDetailComponent implements OnInit, AfterViewInit {
}
save() {
this.ser.saveOrUpdate(this.getItem())
.subscribe(
(result) => {
this.toaster.show('Success', '');
this.router.navigateByUrl('/products');
},
(error) => {
this.toaster.show('Danger', error.error);
}
);
this.ser.saveOrUpdate(this.getItem()).subscribe(
() => {
this.toaster.show('Success', '');
this.router.navigateByUrl('/products');
},
(error) => {
this.toaster.show('Danger', error.error);
},
);
}
delete() {
this.ser.delete(this.item.id)
.subscribe(
(result) => {
this.toaster.show('Success', '');
this.router.navigateByUrl('/products');
},
(error) => {
this.toaster.show('Danger', error.error);
}
);
this.ser.delete(this.item.id).subscribe(
() => {
this.toaster.show('Success', '');
this.router.navigateByUrl('/products');
},
(error) => {
this.toaster.show('Danger', error.error);
},
);
}
confirmDelete(): void {
const dialogRef = this.dialog.open(ConfirmDialogComponent, {
width: '250px',
data: {title: 'Delete Product?', content: 'Are you sure? This cannot be undone.'}
data: { title: 'Delete Product?', content: 'Are you sure? This cannot be undone.' },
});
dialogRef.afterClosed().subscribe((result: boolean) => {

6
bookie/src/app/product/product-list-resolver.service.spec.ts
View File

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

20
bookie/src/app/product/product-list-resolver.service.ts
View File

@ -1,18 +1,18 @@
import {Injectable} from '@angular/core';
import {ActivatedRouteSnapshot, Resolve, RouterStateSnapshot} from '@angular/router';
import {Product} from '../core/product';
import {Observable} from 'rxjs/internal/Observable';
import {ProductService} from './product.service';
import { Injectable } from '@angular/core';
import { Resolve } from '@angular/router';
import { Observable } from 'rxjs/internal/Observable';
import { Product } from '../core/product';
import { ProductService } from './product.service';
@Injectable({
providedIn: 'root'
providedIn: 'root',
})
export class ProductListResolver implements Resolve<Product[]> {
constructor(private ser: ProductService) {}
constructor(private ser: ProductService) {
}
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<Product[]> {
resolve(): Observable<Product[]> {
return this.ser.list();
}
}

39
bookie/src/app/product/product-list/product-list-datasource.ts
View File

@ -1,52 +1,53 @@
import { DataSource } from '@angular/cdk/collections';
import { map, tap } from 'rxjs/operators';
import { merge, Observable } from 'rxjs';
import { Product } from '../../core/product';
import { map, tap } from 'rxjs/operators';
import { Product } from '../../core/product';
export class ProductListDataSource extends DataSource<Product> {
public data: Product[];
public viewData: Product[];
private filterValue: string;
constructor(private readonly filter: Observable<string>, private readonly dataObs: Observable<Product[]>) {
constructor(
private readonly filter: Observable<string>,
private readonly dataObs: Observable<Product[]>,
) {
super();
this.data = [];
this.viewData = [];
this.filter = filter.pipe(
tap(x => this.filterValue = x)
tap((x) => {
this.filterValue = x;
}),
);
this.dataObs = dataObs.pipe(
tap(x => this.data = x)
tap((x) => {
this.data = x;
}),
);
}
connect(): Observable<Product[]> {
const dataMutations = [
this.dataObs,
this.filter
];
const dataMutations = [this.dataObs, this.filter];
return merge(...dataMutations).pipe(
map((x: any) => {
map(() => {
this.viewData = this.getFilteredData([...this.data]);
return this.viewData;
})
}),
);
}
disconnect() {
}
disconnect() {}
private getFilteredData(data: Product[]): Product[] {
const filter = (this.filterValue === undefined) ? '' : this.filterValue;
const filter = this.filterValue === undefined ? '' : this.filterValue;
if (filter === '') {
return data;
} else {
return data.filter(x => {
return x.menuCategory.id === filter;
}
);
}
return data.filter((x) => {
return x.menuCategory.id === filter;
});
}
}

77
bookie/src/app/product/product-list/product-list.component.html
View File

@ -14,43 +14,60 @@
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div fxLayout="row" fxLayoutAlign="space-around start" fxLayout.lt-md="column" fxLayoutGap="20px"
fxLayoutGap.lt-md="0px">
<mat-form-field fxFlex>
<mat-label>Product Type</mat-label>
<mat-select placeholder="Menu Category" formControlName="menuCategory" (selectionChange)="filterOn($event)">
<mat-option>-- All Products --</mat-option>
<mat-option *ngFor="let mc of menuCategories" [value]="mc.id">
{{ mc.name }}
</mat-option>
</mat-select>
</mat-form-field>
</div>
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex>
<mat-label>Product Type</mat-label>
<mat-select
placeholder="Menu Category"
formControlName="menuCategory"
(selectionChange)="filterOn($event)"
>
<mat-option>-- All Products --</mat-option>
<mat-option *ngFor="let mc of menuCategories" [value]="mc.id">
{{ mc.name }}
</mat-option>
</mat-select>
</mat-form-field>
</div>
</form>
<mat-table #table cdkDropList [dataSource]="dataSource" [cdkDropListData]="dataSource" aria-label="Elements" (cdkDropListDropped)="dropTable($event)">
<mat-table
#table
cdkDropList
[dataSource]="dataSource"
[cdkDropListData]="dataSource"
aria-label="Elements"
(cdkDropListDropped)="dropTable($event)"
>
<!-- Name Column -->
<ng-container matColumnDef="name">
<mat-header-cell *matHeaderCellDef>Name</mat-header-cell>
<mat-cell *matCellDef="let row"><a [routerLink]="['/products', row.id]">{{row.name}} ({{row.units}})</a></mat-cell>
<mat-cell *matCellDef="let row"
><a [routerLink]="['/products', row.id]">{{ row.name }} ({{ row.units }})</a></mat-cell
>
</ng-container>
<!-- Price Column -->
<ng-container matColumnDef="price">
<mat-header-cell *matHeaderCellDef>Price</mat-header-cell>
<mat-cell *matCellDef="let row">{{row.price | currency:'INR'}}</mat-cell>
<mat-cell *matCellDef="let row">{{ row.price | currency: 'INR' }}</mat-cell>
</ng-container>
<!-- Menu Category Column -->
<ng-container matColumnDef="menuCategory">
<mat-header-cell *matHeaderCellDef>Menu Category</mat-header-cell>
<mat-cell *matCellDef="let row">{{row.menuCategory.name}}</mat-cell>
<mat-cell *matCellDef="let row">{{ row.menuCategory.name }}</mat-cell>
</ng-container>
<!-- Sale Category Column -->
<ng-container matColumnDef="saleCategory">
<mat-header-cell *matHeaderCellDef>Sale Category</mat-header-cell>
<mat-cell *matCellDef="let row">{{row.saleCategory.name}}</mat-cell>
<mat-cell *matCellDef="let row">{{ row.saleCategory.name }}</mat-cell>
</ng-container>
<!-- Info Column -->
@ -60,34 +77,38 @@
<div layout="row">
<div flex>
<mat-icon>
{{ row.hasHappyHour ? "sentiment_satisfied_alt" : "sentiment_dissatisfied" }}
{{ row.hasHappyHour ? 'sentiment_satisfied_alt' : 'sentiment_dissatisfied' }}
</mat-icon>
<b> {{ row.hasHappyHour ? "Happy Hour" : "Regular" }}</b>
<b> {{ row.hasHappyHour ? 'Happy Hour' : 'Regular' }}</b>
</div>
<div flex>
<mat-icon>
{{ row.isNotAvailable ? "pause" : "play_arrow" }}
{{ row.isNotAvailable ? 'pause' : 'play_arrow' }}
</mat-icon>
<b> {{ row.isNotAvailable ? "Not Available" : "Available" }}</b>
<b> {{ row.isNotAvailable ? 'Not Available' : 'Available' }}</b>
</div>
<div flex>
<mat-icon>
{{ row.isActive ? "visibility" : "visibility_off" }}
{{ row.isActive ? 'visibility' : 'visibility_off' }}
</mat-icon>
<b> {{ row.isActive ? "Active" : "Deactivated" }}</b>
<b> {{ row.isActive ? 'Active' : 'Deactivated' }}</b>
</div>
</div>
</mat-cell>
</ng-container>
<!-- Yield Column -->
<!-- Yield Column -->
<ng-container matColumnDef="quantity">
<mat-header-cell *matHeaderCellDef>Quantity</mat-header-cell>
<mat-cell *matCellDef="let row">{{row.quantity | currency:'INR'}}</mat-cell>
<mat-cell *matCellDef="let row">{{ row.quantity | currency: 'INR' }}</mat-cell>
</ng-container>
<mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
<mat-row *matRowDef="let row; columns: displayedColumns;" cdkDrag [cdkDragData]="row"></mat-row>
<mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
<mat-row
*matRowDef="let row; columns: displayedColumns"
cdkDrag
[cdkDragData]="row"
></mat-row>
</mat-table>
</mat-card-content>
</mat-card>

9
bookie/src/app/product/product-list/product-list.component.spec.ts
View File

@ -1,6 +1,6 @@
import {ComponentFixture, fakeAsync, TestBed} from '@angular/core/testing';
import { ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing';
import {ProductListComponent} from './product-list.component';
import { ProductListComponent } from './product-list.component';
describe('ProductListComponent', () => {
let component: ProductListComponent;
@ -8,9 +8,8 @@ describe('ProductListComponent', () => {
beforeEach(fakeAsync(() => {
TestBed.configureTestingModule({
declarations: [ProductListComponent]
})
.compileComponents();
declarations: [ProductListComponent],
}).compileComponents();
fixture = TestBed.createComponent(ProductListComponent);
component = fixture.componentInstance;

69
bookie/src/app/product/product-list/product-list.component.ts
View File

@ -1,19 +1,21 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { FormBuilder, FormGroup } from '@angular/forms';
import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop';
import { ProductListDataSource } from './product-list-datasource';
import { Product } from '../../core/product';
import { ToCsvService } from '../../shared/to-csv.service';
import { ToasterService } from '../../core/toaster.service';
import { ProductService } from '../product.service';
import { MenuCategory } from '../../core/menu-category';
import { Component, OnInit } from '@angular/core';
import { FormBuilder, FormGroup } from '@angular/forms';
import { ActivatedRoute } from '@angular/router';
import { BehaviorSubject } from 'rxjs';
import { MenuCategory } from '../../core/menu-category';
import { Product } from '../../core/product';
import { ToasterService } from '../../core/toaster.service';
import { ToCsvService } from '../../shared/to-csv.service';
import { ProductService } from '../product.service';
import { ProductListDataSource } from './product-list-datasource';
@Component({
selector: 'app-product-list',
templateUrl: './product-list.component.html',
styleUrls: ['./product-list.component.css']
styleUrls: ['./product-list.component.css'],
})
export class ProductListComponent implements OnInit {
dataSource: ProductListDataSource;
@ -23,17 +25,24 @@ export class ProductListComponent implements OnInit {
data: BehaviorSubject<Product[]>;
menuCategories: MenuCategory[];
/** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */
displayedColumns: string[] = ['name', 'price', 'menuCategory', 'saleCategory', 'info', 'quantity'];
displayedColumns: string[] = [
'name',
'price',
'menuCategory',
'saleCategory',
'info',
'quantity',
];
constructor(
private route: ActivatedRoute,
private fb: FormBuilder,
private toaster: ToasterService,
private toCsv: ToCsvService,
private ser: ProductService
private ser: ProductService,
) {
this.form = this.fb.group({
menuCategory: ''
menuCategory: '',
});
this.filter = new BehaviorSubject('');
this.data = new BehaviorSubject([]);
@ -48,10 +57,9 @@ export class ProductListComponent implements OnInit {
ngOnInit() {
this.dataSource = new ProductListDataSource(this.filter, this.data);
this.route.data
.subscribe((data: { list: Product[], menuCategories: MenuCategory[] }) => {
this.loadData(data.list, data.menuCategories);
});
this.route.data.subscribe((data: { list: Product[]; menuCategories: MenuCategory[] }) => {
this.loadData(data.list, data.menuCategories);
});
}
loadData(list: Product[], menuCategories: MenuCategory[]) {
@ -60,16 +68,15 @@ export class ProductListComponent implements OnInit {
}
updateSortOrder() {
this.ser.updateSortOrder(this.dataSource.viewData)
.subscribe(
(result: Product[]) => {
this.toaster.show('Success', '');
this.loadData(result, this.menuCategories);
},
(error) => {
this.toaster.show('Danger', error.error);
}
);
this.ser.updateSortOrder(this.dataSource.viewData).subscribe(
(result: Product[]) => {
this.toaster.show('Success', '');
this.loadData(result, this.menuCategories);
},
(error) => {
this.toaster.show('Danger', error.error);
},
);
}
dropTable(event: CdkDragDrop<ProductListDataSource>) {
@ -78,17 +85,19 @@ export class ProductListComponent implements OnInit {
this.data.next(this.list);
}
exportCsv() {
exportCsv() {
const headers = {
Code: 'code',
Name: 'name',
Units: 'units',
Price: 'price',
MenuCategory: 'menuCategory',
SaleCategory: 'saleCategory'
SaleCategory: 'saleCategory',
};
const csvData = new Blob([this.toCsv.toCsv(headers, this.dataSource.viewData)], {type: 'text/csv;charset=utf-8;'});
const csvData = new Blob([this.toCsv.toCsv(headers, this.dataSource.viewData)], {
type: 'text/csv;charset=utf-8;',
});
const link = document.createElement('a');
link.href = window.URL.createObjectURL(csvData);
link.setAttribute('download', 'products.csv');

6
bookie/src/app/product/product-resolver.service.spec.ts
View File

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

20
bookie/src/app/product/product-resolver.service.ts
View File

@ -1,18 +1,18 @@
import {Injectable} from '@angular/core';
import {ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot} from '@angular/router';
import {ProductService} from './product.service';
import {Product} from '../core/product';
import {Observable} from 'rxjs/internal/Observable';
import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, Resolve } from '@angular/router';
import { Observable } from 'rxjs/internal/Observable';
import { Product } from '../core/product';
import { ProductService } from './product.service';
@Injectable({
providedIn: 'root'
providedIn: 'root',
})
export class ProductResolver implements Resolve<Product> {
constructor(private ser: ProductService) {}
constructor(private ser: ProductService, private router: Router) {
}
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<Product> {
resolve(route: ActivatedRouteSnapshot): Observable<Product> {
const id = route.paramMap.get('id');
return this.ser.get(id);
}

6
bookie/src/app/product/product.service.spec.ts
View File

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

94
bookie/src/app/product/product.service.ts
View File

@ -1,87 +1,93 @@
import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/internal/Observable';
import { catchError } from 'rxjs/operators';
import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
import { Product } from '../core/product';
import { ErrorLoggerService } from '../core/error-logger.service';
import { Product } from '../core/product';
const httpOptions = {
headers: new HttpHeaders({'Content-Type': 'application/json'})
headers: new HttpHeaders({ 'Content-Type': 'application/json' }),
};
const url = '/api/products';
const serviceName = 'ProductService';
@Injectable({providedIn: 'root'})
@Injectable({ providedIn: 'root' })
export class ProductService {
constructor(private http: HttpClient, private log: ErrorLoggerService) {
}
constructor(private http: HttpClient, private log: ErrorLoggerService) {}
get(id: string): Observable<Product> {
const getUrl: string = (id === null) ? `${url}` : `${url}/${id}`;
return <Observable<Product>>this.http.get<Product>(getUrl)
.pipe(
catchError(this.log.handleError(serviceName, `get id=${id}`))
);
const getUrl: string = id === null ? `${url}` : `${url}/${id}`;
return <Observable<Product>>(
this.http
.get<Product>(getUrl)
.pipe(catchError(this.log.handleError(serviceName, `get id=${id}`)))
);
}
list(): Observable<Product[]> {
return <Observable<Product[]>>this.http.get<Product[]>(`${url}/list`)
.pipe(
catchError(this.log.handleError(serviceName, 'list'))
);
return <Observable<Product[]>>(
this.http
.get<Product[]>(`${url}/list`)
.pipe(catchError(this.log.handleError(serviceName, 'list')))
);
}
listIsActiveOfCategory(id: string): Observable<Product[]> {
const options = {params: new HttpParams().set('mc', id).set('a', 'true')};
return <Observable<Product[]>>this.http.get<Product[]>(`${url}/query`, options)
.pipe(
catchError(this.log.handleError(serviceName, 'listIsActiveOfCategory'))
);
const options = { params: new HttpParams().set('mc', id).set('a', 'true') };
return <Observable<Product[]>>(
this.http
.get<Product[]>(`${url}/query`, options)
.pipe(catchError(this.log.handleError(serviceName, 'listIsActiveOfCategory')))
);
}
save(product: Product): Observable<Product> {
return <Observable<Product>>this.http.post<Product>(`${url}`, product, httpOptions)
.pipe(
catchError(this.log.handleError(serviceName, 'save'))
);
return <Observable<Product>>(
this.http
.post<Product>(`${url}`, product, httpOptions)
.pipe(catchError(this.log.handleError(serviceName, 'save')))
);
}
update(product: Product): Observable<Product> {
return <Observable<Product>>this.http.put<Product>(`${url}/${product.id}`, product, httpOptions)
.pipe(
catchError(this.log.handleError(serviceName, 'update'))
);
return <Observable<Product>>(
this.http
.put<Product>(`${url}/${product.id}`, product, httpOptions)
.pipe(catchError(this.log.handleError(serviceName, 'update')))
);
}
updateSortOrder(list: Product[]): Observable<Product[]> {
return <Observable<Product[]>>this.http.post<Product[]>(`${url}/list`, list, httpOptions)
.pipe(
catchError(this.log.handleError(serviceName, 'updateSortOrder'))
);
return <Observable<Product[]>>(
this.http
.post<Product[]>(`${url}/list`, list, httpOptions)
.pipe(catchError(this.log.handleError(serviceName, 'updateSortOrder')))
);
}
saveOrUpdate(product: Product): Observable<Product> {
if (!product.id) {
return this.save(product);
} else {
return this.update(product);
}
return this.update(product);
}
delete(id: string): Observable<Product> {
return <Observable<Product>>this.http.delete<Product>(`${url}/${id}`, httpOptions)
.pipe(
catchError(this.log.handleError(serviceName, 'delete'))
);
return <Observable<Product>>(
this.http
.delete<Product>(`${url}/${id}`, httpOptions)
.pipe(catchError(this.log.handleError(serviceName, 'delete')))
);
}
balance(id: string, date: string): Observable<number> {
const options = {params: new HttpParams().set('d', date)};
return <Observable<number>>this.http.get<number>(`${url}/balance`, options)
.pipe(
catchError(this.log.handleError(serviceName, 'balance'))
);
const options = { params: new HttpParams().set('d', date) };
return <Observable<number>>(
this.http
.get<number>(`${url}/balance`, options)
.pipe(catchError(this.log.handleError(serviceName, 'balance')))
);
}
}

2
bookie/src/app/product/products-routing.module.spec.ts
View File

@ -1,4 +1,4 @@
import {ProductsRoutingModule} from './products-routing.module';
import { ProductsRoutingModule } from './products-routing.module';
describe('ProductsRoutingModule', () => {
let productsRoutingModule: ProductsRoutingModule;

50
bookie/src/app/product/products-routing.module.ts
View File

@ -1,70 +1,60 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { ProductListResolver } from './product-list-resolver.service';
import { ProductResolver } from './product-resolver.service';
import { ProductDetailComponent } from './product-detail/product-detail.component';
import { ProductListComponent } from './product-list/product-list.component';
import { AuthGuard } from '../auth/auth-guard.service';
import { MenuCategoryListResolver } from '../menu-category/menu-category-list-resolver.service';
import { SaleCategoryListResolver } from '../sale-category/sale-category-list-resolver.service';
import { ProductDetailComponent } from './product-detail/product-detail.component';
import { ProductListResolver } from './product-list-resolver.service';
import { ProductListComponent } from './product-list/product-list.component';
import { ProductResolver } from './product-resolver.service';
const productsRoutes: Routes = [
{
path: '',
component: ProductListComponent,
canActivate: [AuthGuard],
data: {
permission: 'Products'
permission: 'Products',
},
resolve: {
list: ProductListResolver,
menuCategories: MenuCategoryListResolver
}
menuCategories: MenuCategoryListResolver,
},
},
{
path: 'new',
component: ProductDetailComponent,
canActivate: [AuthGuard],
data: {
permission: 'Products'
permission: 'Products',
},
resolve: {
item: ProductResolver,
menuCategories: MenuCategoryListResolver,
saleCategories: SaleCategoryListResolver
}
saleCategories: SaleCategoryListResolver,
},
},
{
path: ':id',
component: ProductDetailComponent,
canActivate: [AuthGuard],
data: {
permission: 'Products'
permission: 'Products',
},
resolve: {
item: ProductResolver,
menuCategories: MenuCategoryListResolver,
saleCategories: SaleCategoryListResolver
}
}
saleCategories: SaleCategoryListResolver,
},
},
];
@NgModule({
imports: [
CommonModule,
RouterModule.forChild(productsRoutes)
],
exports: [
RouterModule
],
providers: [
ProductListResolver,
ProductResolver
]
imports: [CommonModule, RouterModule.forChild(productsRoutes)],
exports: [RouterModule],
providers: [ProductListResolver, ProductResolver],
})
export class ProductsRoutingModule {
}
export class ProductsRoutingModule {}

2
bookie/src/app/product/products.module.spec.ts
View File

@ -1,4 +1,4 @@
import {ProductsModule} from './products.module';
import { ProductsModule } from './products.module';
describe('ProductsModule', () => {
let productsModule: ProductsModule;

30
bookie/src/app/product/products.module.ts
View File

@ -1,9 +1,9 @@
import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {ProductListComponent} from './product-list/product-list.component';
import {ProductDetailComponent} from './product-detail/product-detail.component';
import {ProductsRoutingModule} from './products-routing.module';
import { DragDropModule } from '@angular/cdk/drag-drop';
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 { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
import { MatCheckboxModule } from '@angular/material/checkbox';
@ -13,10 +13,10 @@ import { MatInputModule } from '@angular/material/input';
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
import { MatSelectModule } from '@angular/material/select';
import { MatTableModule } from '@angular/material/table';
import { CdkTableModule } from '@angular/cdk/table';
import { ReactiveFormsModule } from '@angular/forms';
import { FlexLayoutModule } from '@angular/flex-layout';
import { DragDropModule } from '@angular/cdk/drag-drop';
import { ProductDetailComponent } from './product-detail/product-detail.component';
import { ProductListComponent } from './product-list/product-list.component';
import { ProductsRoutingModule } from './products-routing.module';
@NgModule({
imports: [
@ -34,12 +34,8 @@ import { DragDropModule } from '@angular/cdk/drag-drop';
MatSelectModule,
MatCheckboxModule,
ReactiveFormsModule,
ProductsRoutingModule
ProductsRoutingModule,
],
declarations: [
ProductListComponent,
ProductDetailComponent
]
declarations: [ProductListComponent, ProductDetailComponent],
})
export class ProductsModule {
}
export class ProductsModule {}