Product Group

This commit is contained in:
Amritanshu 2019-06-16 01:39:37 +05:30
parent 459ab244ff
commit 52e978b3b0
20 changed files with 321 additions and 174 deletions

@ -89,13 +89,14 @@ class ProductGroup(Base):
is_fixture = Column('is_fixture', Boolean, nullable=False)
sort_order = Column('sort_order', Numeric, nullable=False)
def __init__(self, name, discount_limit, is_modifier_compulsory, group_type, is_active, sort_order, id=None):
def __init__(self, name, discount_limit, is_modifier_compulsory, group_type, is_active, sort_order, is_fixture=False, id=None):
self.name = name
self.discount_limit = discount_limit
self.is_modifier_compulsory = is_modifier_compulsory
self.group_type = group_type
self.is_active = is_active
self.sort_order = sort_order
self.is_fixture = is_fixture
self.id = id

@ -53,10 +53,7 @@ def includeme(config):
config.add_route("v1_product_groups_new", "/v1/product-groups/new")
config.add_route("v1_product_groups_id", "/v1/product-groups/{id}")
config.add_route("v1_product_groups_list", "/v1/product-groups")
config.add_route('product', '/Product.json')
config.add_route('product_list', '/Products.json')
config.add_route('product_id', '/Product/{id}.json')
config.add_route("v1_product_group_types_list", "/v1/product-group-types")
config.add_route('product_group', '/ProductGroup.json')
config.add_route('product_group_list', '/ProductGroups.json')

@ -1,4 +1,5 @@
import uuid
from decimal import Decimal, InvalidOperation
import transaction
from pyramid.response import Response
@ -6,37 +7,63 @@ from pyramid.view import view_config
from barker.exceptions import ValidationFailure
from barker.models import Product, ProductGroup
from barker.models.validation_exception import ValidationError
@view_config(request_method='PUT', route_name='product_group', renderer='json', permission='Products', trans=True)
@view_config(request_method='POST', route_name='v1_product_groups_new', renderer='json', permission='Products', trans=True)
def save(request):
json = request.json_body
item = ProductGroup(json['Name'], json['DiscountLimit'], json['IsModifierCompulsory'], json['GroupType'],
json['IsActive'], json['SortOrder'])
name = json.get("name", "").strip()
if name == "":
raise ValidationError("Name cannot be blank")
try:
discount_limit = Decimal(json["discountLimit"]) / 100
if discount_limit < 0 or discount_limit > 1:
raise ValidationError("Tax Rate must be a decimal >= 0 and <= 100")
except (ValueError, InvalidOperation):
raise ValidationError("Tax Rate must be a decimal >= 0 and <= 100")
is_modifier_compulsory = json.get("isModifierCompulsory", True)
group_type = json.get("group_type", "").strip()
is_active = json.get("isActive", True)
item = ProductGroup(name, discount_limit, is_modifier_compulsory, group_type, is_active, 0)
request.dbsession.add(item)
transaction.commit()
item = request.dbsession.query(ProductGroup).filter(ProductGroup.id == item.id).first()
return product_group_info(item)
return product_group_info(item.id, request.dbsession)
@view_config(request_method='POST', route_name='product_group_id', renderer='json', permission='Products', trans=True)
@view_config(request_method='PUT', route_name='v1_product_groups_id', renderer='json', permission='Products', trans=True)
def update(request):
item = request.dbsession.query(ProductGroup).filter(ProductGroup.id == uuid.UUID(request.matchdict['id'])).first()
json = request.json_body
item.name = json['Name']
item.discount_limit = json['DiscountLimit']
item.is_modifier_compulsory = json['IsModifierCompulsory']
item.group_type = json['GroupType']
item.is_active = json['IsActive']
item.sort_order = json['SortOrder']
item = (
request.dbsession.query(ProductGroup)
.filter(ProductGroup.id == uuid.UUID(request.matchdict["id"]))
.first()
)
if item.is_fixture:
raise ValidationError(
"{0} is a fixture and cannot be edited or deleted.".format(item.full_name)
)
item.name = json['name'].strip()
try:
item.discount_limit = Decimal(json["discountLimit"]) / 100
if item.discount_limit < 0 or item.discount_limit > 1:
raise ValidationError("Tax Rate must be a decimal >= 0 and <= 100")
except (ValueError, InvalidOperation):
raise ValidationError("Tax Rate must be a decimal >= 0 and <= 100")
item.is_modifier_compulsory = json.get("isModifierCompulsory", True)
item.group_type = json.get("group_type", "").strip()
item.is_active = json.get("isActive", True)
transaction.commit()
item = request.dbsession.query(ProductGroup).filter(ProductGroup.id == item.id).first()
return product_group_info(item)
return product_group_info(item.id, request.dbsession)
@view_config(request_method='DELETE', route_name='product_group_id', renderer='json', permission='Products', trans=True)
@view_config(request_method='DELETE', route_name='v1_product_groups_id', renderer='json', permission='Products', trans=True)
def delete(request):
item = request.dbsession.query(ProductGroup).filter(ProductGroup.id == uuid.UUID(request.matchdict['id'])).first()
item = (
request.dbsession.query(ProductGroup)
.filter(ProductGroup.id == uuid.UUID(request.matchdict["id"]))
.first()
)
if item is None:
response = Response("Product Group not Found")
response.status_int = 500
@ -50,30 +77,33 @@ def delete(request):
return response
@view_config(request_method='GET', route_name='product_group_id', renderer='json', permission='Authenticated')
@view_config(request_method='GET', route_name='v1_product_groups_new', renderer='json', permission='Authenticated')
def show_blank(request):
return product_group_info(None, request.dbsession)
@view_config(request_method='GET', route_name='v1_product_groups_id', renderer='json', permission='Authenticated')
def show_id(request):
id = uuid.UUID(request.matchdict['id'])
item = request.dbsession.query(ProductGroup).filter(ProductGroup.id == id).first()
return product_group_info(item)
return product_group_info(uuid.UUID(request.matchdict["id"]), request.dbsession)
@view_config(request_method='GET', route_name='product_group_list', renderer='json', permission='Authenticated')
@view_config(request_method='GET', route_name='v1_product_groups_list', renderer='json', permission='Authenticated')
def show_list(request):
list = request.dbsession.query(ProductGroup).order_by(ProductGroup.sort_order).order_by(ProductGroup.name).all()
list_ = request.dbsession.query(ProductGroup).order_by(ProductGroup.sort_order).order_by(ProductGroup.name).all()
product_groups = []
for item in list:
product_groups.append(product_group_info(item))
for item in list_:
product_groups.append(product_group_info(item, request.dbsession))
return product_groups
@view_config(request_method='GET', route_name='product_group_list', renderer='json', request_param='s',
@view_config(request_method='GET', route_name='v1_product_groups_list', renderer='json', request_param='s',
permission='Authenticated')
def sale_list(request):
list = request.dbsession.query(
list_ = request.dbsession.query(
ProductGroup
).filter(ProductGroup.is_active == True).order_by(ProductGroup.sort_order).order_by(ProductGroup.name).all()
product_groups = []
for item in list:
for item in list_:
products = request.dbsession.query(
Product
).filter(
@ -99,40 +129,52 @@ def sale_list(request):
return product_groups
@view_config(request_method='POST', route_name='product_group_list', renderer='json', permission='Products', trans=True)
@view_config(request_method='POST', route_name='v1_product_groups_list', renderer='json', permission='Products', trans=True)
def sort_order(request):
json = request.json_body
for index, item in enumerate(json):
request.dbsession.query(
ProductGroup
).filter(
ProductGroup.id == uuid.UUID(item['ProductGroupID'])
ProductGroup.id == uuid.UUID(item['id'])
).update(
{ProductGroup.sort_order: index}
)
return True
@view_config(request_method='GET', route_name='product_group_type_list', renderer='json', permission='Authenticated')
@view_config(request_method='GET', route_name='v1_product_group_types_list', renderer='json', permission='Authenticated')
def product_group_type_list(request):
list = request.dbsession.query(
list_ = request.dbsession.query(
ProductGroup.group_type
).group_by(
ProductGroup.group_type
).order_by(
ProductGroup.group_type
).all()
return [item.group_type for item in list]
return [item.group_type for item in list_]
def product_group_info(item):
def product_group_info(item, dbsession):
if item is None:
return {
'name': "",
'discountLimit': 0,
'isModifierCompulsory': False,
'groupType': "",
'isActive': True,
'isFixture': False,
'sortOrder': 0
}
if type(item) is uuid.UUID:
item = dbsession.query(ProductGroup).filter(ProductGroup.id == item).first()
return {
'ProductGroupID': item.id,
'Name': item.name,
'DiscountLimit': item.discount_limit,
'IsModifierCompulsory': item.is_modifier_compulsory,
'GroupType': item.group_type,
'IsActive': item.is_active,
'SortOrder': item.sort_order
'id': item.id,
'name': item.name,
'discountLimit': item.discount_limit,
'isModifierCompulsory': item.is_modifier_compulsory,
'groupType': item.group_type,
'isActive': item.is_active,
'isFixture': item.is_fixture,
'sortOrder': item.sort_order
}

@ -15,7 +15,7 @@ const routes: Routes = [
},
{
path: 'product-groups',
loadChildren: () => import('./product-group/product-group.module').then(mod => mod.ProductGroupModule)
loadChildren: () => import('./product-group/product-groups.module').then(mod => mod.ProductGroupsModule)
},
{
path: 'running-tables',

@ -3,7 +3,7 @@ export class ProductGroup {
name: string;
discountLimit: number;
isModifierCompulsory: boolean;
groupModifier: string;
groupType: string;
isActive: boolean;
isFixture: boolean;
sortOrder: number;

@ -10,6 +10,9 @@
<a mat-raised-button routerLink="/tables">
Tables
</a>
<a mat-raised-button routerLink="/product-groups">
Product Groups
</a>
<a mat-raised-button routerLink="/taxes">
Taxes
</a>

@ -9,13 +9,34 @@
fxLayoutGap.lt-md="0px">
<mat-form-field fxFlex>
<mat-label>Name</mat-label>
<input matInput #nameElement placeholder="Name" formControlName="name" (keyup.enter)="save()">
<input matInput #nameElement placeholder="Name" formControlName="name">
</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>Discount Limit</mat-label>
<input matInput type="number" placeholder="Discount Limit" formControlName="discountLimit" class="right-align">
<span matSuffix>%</span>
</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>Group Type</mat-label>
<input matInput placeholder="Group Type" formControlName="groupType">
</mat-form-field>
</div>
<div fxLayout="row" fxLayoutAlign="space-around start" fxLayout.lt-md="column" fxLayoutGap="20px"
fxLayoutGap.lt-md="0px">
<mat-checkbox formControlName="isModifierCompulsory">Is Modifier Compulsory?</mat-checkbox>
<mat-checkbox formControlName="isActive">Is Active?</mat-checkbox>
</div>
</form>
</mat-card-content>
<mat-card-actions>
<button mat-raised-button (click)="save()" color="primary">Save</button>
<button mat-raised-button [disabled]="item.isFixture" color="primary" (click)="save()">Save</button>
<button mat-raised-button [disabled]="item.isFixture" color="warn" (click)="confirmDelete()" *ngIf="!!item.id">Delete</button>
</mat-card-actions>
</mat-card>
</div>

@ -1,10 +1,12 @@
import {AfterViewInit, Component, ElementRef, OnInit, ViewChild} from '@angular/core';
import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
import { FormBuilder, FormGroup } from '@angular/forms';
import { ActivatedRoute, Router } from '@angular/router';
import { MatDialog } from "@angular/material";
import {ProductGroupService} from '../product-group.service';
import {ProductGroup} from '../../core/product-group';
import {ActivatedRoute, Router} from '@angular/router';
import {ToasterService} from '../../core/toaster.service';
import {FormBuilder, FormGroup} from '@angular/forms';
import { ProductGroupService } from '../product-group.service';
import { ProductGroup } from '../../core/product-group';
import { ToasterService } from '../../core/toaster.service';
import { ConfirmDialogComponent } from "../../shared/confirm-dialog/confirm-dialog.component";
@Component({
selector: 'app-product-group-detail',
@ -19,6 +21,7 @@ export class ProductGroupDetailComponent implements OnInit, AfterViewInit {
constructor(
private route: ActivatedRoute,
private router: Router,
private dialog: MatDialog,
private fb: FormBuilder,
private toaster: ToasterService,
private ser: ProductGroupService
@ -28,7 +31,11 @@ export class ProductGroupDetailComponent implements OnInit, AfterViewInit {
createForm() {
this.form = this.fb.group({
name: ''
name: '',
discountLimit: '',
isModifierCompulsory: '',
groupType: '',
isActive: ''
});
}
@ -43,6 +50,10 @@ export class ProductGroupDetailComponent implements OnInit, AfterViewInit {
this.item = item;
this.form.setValue({
name: this.item.name,
discountLimit: this.item.discountLimit,
isModifierCompulsory: this.item.isModifierCompulsory,
groupType: this.item.groupType,
isActive: this.item.isActive
});
}
@ -65,9 +76,39 @@ export class ProductGroupDetailComponent implements OnInit, AfterViewInit {
);
}
delete() {
this.ser.delete(this.item.id)
.subscribe(
(result) => {
this.toaster.show('Success', '');
this.router.navigateByUrl('/product-groups');
},
(error) => {
this.toaster.show('Danger', error.error);
}
);
}
confirmDelete(): void {
const dialogRef = this.dialog.open(ConfirmDialogComponent, {
width: '250px',
data: {title: 'Delete Product Group?', content: 'Are you sure? This cannot be undone.'}
});
dialogRef.afterClosed().subscribe((result: boolean) => {
if (result) {
this.delete();
}
});
}
getItem(): ProductGroup {
const formModel = this.form.value;
this.item.name = formModel.name;
this.item.discountLimit = +formModel.discountLimit;
this.item.isModifierCompulsory = formModel.isModifierCompulsory;
this.item.groupType = formModel.groupType;
this.item.isActive = formModel.isActive;
return this.item;
}
}

@ -1,59 +1,17 @@
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 {ProductGroup} from '../../core/product-group';
import { DataSource } from '@angular/cdk/collections';
import { Observable, of as observableOf } from 'rxjs';
import { ProductGroup } from '../../core/product-group';
export class ProductGroupListDataSource extends DataSource<ProductGroup> {
constructor(private paginator: MatPaginator, private sort: MatSort, public data: ProductGroup[]) {
constructor(public data: ProductGroup[]) {
super();
}
connect(): Observable<ProductGroup[]> {
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 observableOf(this.data);
}
disconnect() {
}
private getPagedData(data: ProductGroup[]) {
const startIndex = this.paginator.pageIndex * this.paginator.pageSize;
return data.splice(startIndex, this.paginator.pageSize);
}
private getSortedData(data: ProductGroup[]) {
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 'name':
return compare(a.name, b.name, isAsc);
case 'id':
return compare(+a.id, +b.id, 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);
}

@ -1,35 +1,55 @@
<mat-card>
<mat-card-title-group>
<mat-card-title>Product Groups</mat-card-title>
<button mat-button (click)="updateSortOrder()">
Update Order
</button>
<a mat-button [routerLink]="['/product-groups', 'new']">
<mat-icon>add_box</mat-icon>
Add
</a>
</mat-card-title-group>
<mat-card-content>
<mat-table #table [dataSource]="dataSource" matSort aria-label="Elements">
<mat-table #table cdkDropList [dataSource]="dataSource" [cdkDropListData]="dataSource" aria-label="Elements" (cdkDropListDropped)="dropTable($event)">
<!-- Name Column -->
<ng-container matColumnDef="name">
<mat-header-cell *matHeaderCellDef mat-sort-header>Name</mat-header-cell>
<mat-header-cell *matHeaderCellDef>Name</mat-header-cell>
<mat-cell *matCellDef="let row"><a [routerLink]="['/product-groups', row.id]">{{row.name}}</a></mat-cell>
</ng-container>
<!-- Discount Limit Column -->
<ng-container matColumnDef="discountLimit">
<mat-header-cell *matHeaderCellDef>Discount Limit</mat-header-cell>
<mat-cell *matCellDef="let row">{{row.discountLimit | percent:'1.2-2'}}</mat-cell>
</ng-container>
<!-- Is Modifier Compulsory Column -->
<ng-container matColumnDef="isModifierCompulsory">
<mat-header-cell *matHeaderCellDef>Modifier Compulsory?</mat-header-cell>
<mat-cell *matCellDef="let row">{{row.isModifierCompulsory}}</mat-cell>
</ng-container>
<!-- Group Type Column -->
<ng-container matColumnDef="groupType">
<mat-header-cell *matHeaderCellDef>Group Type</mat-header-cell>
<mat-cell *matCellDef="let row">{{row.groupType}}</mat-cell>
</ng-container>
<!-- Is Active Column -->
<ng-container matColumnDef="isActive">
<mat-header-cell *matHeaderCellDef>Active?</mat-header-cell>
<mat-cell *matCellDef="let row">{{row.isActive}}</mat-cell>
</ng-container>
<!-- Is Fixture Column -->
<ng-container matColumnDef="isFixture">
<mat-header-cell *matHeaderCellDef mat-sort-header>Is Fixture?</mat-header-cell>
<mat-header-cell *matHeaderCellDef>Fixture?</mat-header-cell>
<mat-cell *matCellDef="let row">{{row.isFixture}}</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;" cdkDrag [cdkDragData]="row"></mat-row>
</mat-table>
<mat-paginator #paginator
[length]="dataSource.data.length"
[pageIndex]="0"
[pageSize]="50"
[pageSizeOptions]="[25, 50, 100, 250]">
</mat-paginator>
</mat-card-content>
</mat-card>

@ -1,9 +1,11 @@
import {Component, OnInit, ViewChild} from '@angular/core';
import { MatPaginator } from '@angular/material/paginator';
import { MatSort } from '@angular/material/sort';
import {ProductGroupListDataSource} from './product-group-list-datasource';
import {ProductGroup} from '../../core/product-group';
import {ActivatedRoute} from '@angular/router';
import {Component, ElementRef, OnInit, ViewChild} from '@angular/core';
import { ProductGroupListDataSource } from './product-group-list-datasource';
import { ProductGroup } from '../../core/product-group';
import {ActivatedRoute, Router} from '@angular/router';
import {CdkDragDrop, moveItemInArray} from "@angular/cdk/drag-drop";
import {MatTable} from "@angular/material";
import {ToasterService} from "../../core/toaster.service";
import {ProductGroupService} from "../product-group.service";
@Component({
selector: 'app-product-group-list',
@ -11,21 +13,43 @@ import {ActivatedRoute} from '@angular/router';
styleUrls: ['./product-group-list.component.css']
})
export class ProductGroupListComponent implements OnInit {
@ViewChild(MatPaginator, { static: true }) paginator: MatPaginator;
@ViewChild(MatSort, { static: true }) sort: MatSort;
@ViewChild('table', { static: true }) table: MatTable<ProductGroup>;
dataSource: ProductGroupListDataSource;
list: ProductGroup[];
/** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */
displayedColumns = ['name', 'isFixture'];
displayedColumns = ['name', 'discountLimit', 'isModifierCompulsory', 'groupType', 'isActive', 'isFixture'];
constructor(private route: ActivatedRoute) {
}
constructor(
private route: ActivatedRoute,
private router: Router,
private toaster: ToasterService,
private ser: ProductGroupService
) {
}
ngOnInit() {
this.route.data
.subscribe((data: { list: ProductGroup[] }) => {
this.list = data.list;
});
this.dataSource = new ProductGroupListDataSource(this.paginator, this.sort, this.list);
this.dataSource = new ProductGroupListDataSource(this.list);
}
updateSortOrder() {
this.ser.updateSortOrder(this.list)
.subscribe(
(result) => {
this.toaster.show('Success', '');
this.router.navigateByUrl('/product-groups');
},
(error) => {
this.toaster.show('Danger', error.error);
}
);
}
dropTable(event: CdkDragDrop<ProductGroup[]>) {
const prevIndex = this.list.indexOf(event.item.data);
moveItemInArray(this.list, prevIndex, event.currentIndex);
this.table.renderRows();
}
}

@ -1,15 +1,15 @@
import {inject, TestBed} from '@angular/core/testing';
import {ProductGroupResolverService} from './product-group-resolver.service';
import {ProductGroupResolver} from './product-group-resolver.service';
describe('ProductGroupResolverService', () => {
describe('ProductGroupResolver', () => {
beforeEach(() => {
TestBed.configureTestingModule({
providers: [ProductGroupDetailResolverService]
providers: [ProductGroupResolver]
});
});
it('should be created', inject([ProductGroupDetailResolverService], (service: ProductGroupDetailResolverService) => {
it('should be created', inject([ProductGroupResolver], (service: ProductGroupResolver) => {
expect(service).toBeTruthy();
}));
});

@ -1,13 +0,0 @@
import {ProductGroupRoutingModule} from './product-group-routing.module';
describe('ProductGroupRoutingModule', () => {
let productGroupRoutingModule: ProductGroupRoutingModule;
beforeEach(() => {
productGroupRoutingModule = new ProductGroupRoutingModule();
});
it('should create an instance', () => {
expect(productGroupRoutingModule).toBeTruthy();
});
});

@ -1,13 +0,0 @@
import {ProductGroupModule} from './product-group.module';
describe('ProductGroupModule', () => {
let productGroupModule: ProductGroupModule;
beforeEach(() => {
productGroupModule = new ProductGroupModule();
});
it('should create an instance', () => {
expect(productGroupModule).toBeTruthy();
});
});

@ -8,7 +8,7 @@ import {ProductGroup} from '../core/product-group';
const httpOptions = {
headers: new HttpHeaders({'Content-Type': 'application/json'})
};
const url = '/api/product-groups';
const url = '/v1/product-groups';
const serviceName = 'ProductGroupService';
@Injectable({
@ -48,6 +48,13 @@ export class ProductGroupService {
);
}
updateSortOrder(list: ProductGroup[]): Observable<boolean> {
return <Observable<boolean>>this.http.post<ProductGroup[]>(url, list, httpOptions)
.pipe(
catchError(this.log.handleError(serviceName, 'updateSortOrder'))
);
}
saveOrUpdate(productGroup: ProductGroup): Observable<ProductGroup> {
if (!productGroup.id) {
return this.save(productGroup);

@ -0,0 +1,13 @@
import {ProductGroupsRoutingModule} from './product-groups-routing.module';
describe('ProductGroupsRoutingModule', () => {
let productGroupsRoutingModule: ProductGroupsRoutingModule;
beforeEach(() => {
productGroupsRoutingModule = new ProductGroupsRoutingModule();
});
it('should create an instance', () => {
expect(productGroupsRoutingModule).toBeTruthy();
});
});

@ -13,7 +13,7 @@ const productGroupRoutes: Routes = [
component: ProductGroupListComponent,
canActivate: [AuthGuard],
data: {
permission: 'Cost Centres'
permission: 'Products'
},
resolve: {
list: ProductGroupListResolver
@ -24,7 +24,7 @@ const productGroupRoutes: Routes = [
component: ProductGroupDetailComponent,
canActivate: [AuthGuard],
data: {
permission: 'Cost Centres'
permission: 'Products'
},
resolve: {
item: ProductGroupResolver
@ -35,7 +35,7 @@ const productGroupRoutes: Routes = [
component: ProductGroupDetailComponent,
canActivate: [AuthGuard],
data: {
permission: 'Cost Centres'
permission: 'Products'
},
resolve: {
item: ProductGroupResolver
@ -57,5 +57,5 @@ const productGroupRoutes: Routes = [
ProductGroupResolver
]
})
export class ProductGroupRoutingModule {
export class ProductGroupsRoutingModule {
}

@ -0,0 +1,13 @@
import {ProductGroupsModule} from './product-groups.module';
describe('ProductGroupsModule', () => {
let productGroupsModule: ProductGroupsModule;
beforeEach(() => {
productGroupsModule = new ProductGroupsModule();
});
it('should create an instance', () => {
expect(productGroupsModule).toBeTruthy();
});
});

@ -3,16 +3,18 @@ import {CommonModule} from '@angular/common';
import {ProductGroupListComponent} from './product-group-list/product-group-list.component';
import {ProductGroupDetailComponent} from './product-group-detail/product-group-detail.component';
import {ProductGroupRoutingModule} from './product-group-routing.module';
import {ProductGroupsRoutingModule} from './product-groups-routing.module';
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
import { MatCheckboxModule } from '@angular/material/checkbox';
import { MatIconModule } from '@angular/material/icon';
import { MatInputModule } from '@angular/material/input';
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 {CdkTableModule} from '@angular/cdk/table';
import { CdkTableModule } from '@angular/cdk/table';
import { DragDropModule } from '@angular/cdk/drag-drop';
import {FlexLayoutModule} from '@angular/flex-layout';
import {ReactiveFormsModule} from '@angular/forms';
@ -20,22 +22,24 @@ import {ReactiveFormsModule} from '@angular/forms';
imports: [
CommonModule,
CdkTableModule,
DragDropModule,
FlexLayoutModule,
MatTableModule,
MatPaginatorModule,
MatSortModule,
MatCardModule,
MatCheckboxModule,
MatProgressSpinnerModule,
MatInputModule,
MatButtonModule,
MatIconModule,
ReactiveFormsModule,
ProductGroupRoutingModule
ProductGroupsRoutingModule
],
declarations: [
ProductGroupListComponent,
ProductGroupDetailComponent
]
})
export class ProductGroupModule {
export class ProductGroupsModule {
}

@ -1,10 +1,12 @@
import {AfterViewInit, Component, ElementRef, OnInit, ViewChild} from '@angular/core';
import { AfterViewInit, Component, ElementRef, OnInit, ViewChild} from '@angular/core';
import { FormBuilder, FormGroup } from '@angular/forms';
import { ActivatedRoute, Router } from '@angular/router';
import { MatDialog} from "@angular/material/dialog";
import {TaxService} from '../tax.service';
import {Tax} from '../../core/tax';
import {ActivatedRoute, Router} from '@angular/router';
import {ToasterService} from '../../core/toaster.service';
import {FormBuilder, FormGroup} from '@angular/forms';
import { TaxService } from '../tax.service';
import { Tax } from '../../core/tax';
import { ToasterService } from '../../core/toaster.service';
import { ConfirmDialogComponent } from "../../shared/confirm-dialog/confirm-dialog.component";
@Component({
selector: 'app-tax-detail',
@ -19,6 +21,7 @@ export class TaxDetailComponent implements OnInit, AfterViewInit {
constructor(
private route: ActivatedRoute,
private router: Router,
private dialog: MatDialog,
private fb: FormBuilder,
private toaster: ToasterService,
private ser: TaxService
@ -67,10 +70,36 @@ export class TaxDetailComponent implements OnInit, AfterViewInit {
);
}
delete() {
this.ser.delete(this.item.id)
.subscribe(
(result) => {
this.toaster.show('Success', '');
this.router.navigateByUrl('/taxes');
},
(error) => {
this.toaster.show('Danger', error.error);
}
);
}
confirmDelete(): void {
const dialogRef = this.dialog.open(ConfirmDialogComponent, {
width: '250px',
data: {title: 'Delete Tax?', content: 'Are you sure? This cannot be undone.'}
});
dialogRef.afterClosed().subscribe((result: boolean) => {
if (result) {
this.delete();
}
});
}
getItem(): Tax {
const formModel = this.form.value;
this.item.name = formModel.name;
this.item.rate = formModel.rate;
this.item.rate = +formModel.rate;
return this.item;
}
}