Blacked and isorted the python files
Prettied and eslinted the typescript/html files
This commit is contained in:
1 parent
b31db593c2
commit
d677cfb1ea
505 files changed
+7559
-5649
No files matched your search
@@ -1,4 +1,4 @@
|
||||
import {MenuCategoriesRoutingModule} from './menu-categories-routing.module';
|
||||
import { MenuCategoriesRoutingModule } from './menu-categories-routing.module';
|
||||
|
||||
describe('MenuCategoriesRoutingModule', () => {
|
||||
let menuCategoriesRoutingModule: MenuCategoriesRoutingModule;
|
||||
|
||||
@@ -1,61 +1,53 @@
|
||||
import { NgModule } from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { NgModule } from '@angular/core';
|
||||
import { RouterModule, Routes } from '@angular/router';
|
||||
import { MenuCategoryListResolver } from './menu-category-list-resolver.service';
|
||||
import { MenuCategoryResolver } from './menu-category-resolver.service';
|
||||
import { MenuCategoryListComponent } from './menu-category-list/menu-category-list.component';
|
||||
import { MenuCategoryDetailComponent } from './menu-category-detail/menu-category-detail.component';
|
||||
|
||||
import { AuthGuard } from '../auth/auth-guard.service';
|
||||
|
||||
import { MenuCategoryDetailComponent } from './menu-category-detail/menu-category-detail.component';
|
||||
import { MenuCategoryListResolver } from './menu-category-list-resolver.service';
|
||||
import { MenuCategoryListComponent } from './menu-category-list/menu-category-list.component';
|
||||
import { MenuCategoryResolver } from './menu-category-resolver.service';
|
||||
|
||||
const menuCategoriesRoutes: Routes = [
|
||||
{
|
||||
path: '',
|
||||
component: MenuCategoryListComponent,
|
||||
canActivate: [AuthGuard],
|
||||
data: {
|
||||
permission: 'Products'
|
||||
permission: 'Products',
|
||||
},
|
||||
resolve: {
|
||||
list: MenuCategoryListResolver
|
||||
}
|
||||
list: MenuCategoryListResolver,
|
||||
},
|
||||
},
|
||||
{
|
||||
path: 'new',
|
||||
component: MenuCategoryDetailComponent,
|
||||
canActivate: [AuthGuard],
|
||||
data: {
|
||||
permission: 'Products'
|
||||
permission: 'Products',
|
||||
},
|
||||
resolve: {
|
||||
item: MenuCategoryResolver
|
||||
}
|
||||
item: MenuCategoryResolver,
|
||||
},
|
||||
},
|
||||
{
|
||||
path: ':id',
|
||||
component: MenuCategoryDetailComponent,
|
||||
canActivate: [AuthGuard],
|
||||
data: {
|
||||
permission: 'Products'
|
||||
permission: 'Products',
|
||||
},
|
||||
resolve: {
|
||||
item: MenuCategoryResolver
|
||||
}
|
||||
}
|
||||
item: MenuCategoryResolver,
|
||||
},
|
||||
},
|
||||
];
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule,
|
||||
RouterModule.forChild(menuCategoriesRoutes)
|
||||
|
||||
],
|
||||
exports: [
|
||||
RouterModule
|
||||
],
|
||||
providers: [
|
||||
MenuCategoryListResolver,
|
||||
MenuCategoryResolver
|
||||
]
|
||||
imports: [CommonModule, RouterModule.forChild(menuCategoriesRoutes)],
|
||||
exports: [RouterModule],
|
||||
providers: [MenuCategoryListResolver, MenuCategoryResolver],
|
||||
})
|
||||
export class MenuCategoriesRoutingModule {
|
||||
}
|
||||
export class MenuCategoriesRoutingModule {}
|
||||
@@ -1,4 +1,4 @@
|
||||
import {MenuCategoriesModule} from './menu-categories.module';
|
||||
import { MenuCategoriesModule } from './menu-categories.module';
|
||||
|
||||
describe('MenuCategoriesModule', () => {
|
||||
let menuCategoriesModule: MenuCategoriesModule;
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import { NgModule} from '@angular/core';
|
||||
import { DragDropModule } from '@angular/cdk/drag-drop';
|
||||
import { CdkTableModule } from '@angular/cdk/table';
|
||||
import { CommonModule } from '@angular/common';
|
||||
|
||||
import { MenuCategoryListComponent } from './menu-category-list/menu-category-list.component';
|
||||
import { MenuCategoryDetailComponent } from './menu-category-detail/menu-category-detail.component';
|
||||
import { MenuCategoriesRoutingModule } from './menu-categories-routing.module';
|
||||
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';
|
||||
@@ -11,10 +11,10 @@ import { MatIconModule } from '@angular/material/icon';
|
||||
import { MatInputModule } from '@angular/material/input';
|
||||
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
|
||||
import { MatTableModule } from '@angular/material/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';
|
||||
|
||||
import { MenuCategoriesRoutingModule } from './menu-categories-routing.module';
|
||||
import { MenuCategoryDetailComponent } from './menu-category-detail/menu-category-detail.component';
|
||||
import { MenuCategoryListComponent } from './menu-category-list/menu-category-list.component';
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
@@ -30,12 +30,8 @@ import { ReactiveFormsModule } from '@angular/forms';
|
||||
MatButtonModule,
|
||||
MatIconModule,
|
||||
ReactiveFormsModule,
|
||||
MenuCategoriesRoutingModule
|
||||
MenuCategoriesRoutingModule,
|
||||
],
|
||||
declarations: [
|
||||
MenuCategoryListComponent,
|
||||
MenuCategoryDetailComponent
|
||||
]
|
||||
declarations: [MenuCategoryListComponent, MenuCategoryDetailComponent],
|
||||
})
|
||||
export class MenuCategoriesModule {
|
||||
}
|
||||
export class MenuCategoriesModule {}
|
||||
+41
-10
@@ -5,30 +5,61 @@
|
||||
</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>Name</mat-label>
|
||||
<input matInput #nameElement placeholder="Name" formControlName="name">
|
||||
<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">
|
||||
<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">
|
||||
<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">
|
||||
<div
|
||||
fxLayout="row"
|
||||
fxLayoutAlign="space-around start"
|
||||
fxLayout.lt-md="column"
|
||||
fxLayoutGap="20px"
|
||||
fxLayoutGap.lt-md="0px"
|
||||
>
|
||||
<mat-checkbox formControlName="isActive">Is Active?</mat-checkbox>
|
||||
</div>
|
||||
</form>
|
||||
</mat-card-content>
|
||||
<mat-card-actions>
|
||||
<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>
|
||||
<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>
|
||||
+4
-5
@@ -1,6 +1,6 @@
|
||||
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
|
||||
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import {MenuCategoryDetailComponent} from './menu-category-detail.component';
|
||||
import { MenuCategoryDetailComponent } from './menu-category-detail.component';
|
||||
|
||||
describe('MenuCategoryDetailComponent', () => {
|
||||
let component: MenuCategoryDetailComponent;
|
||||
@@ -8,9 +8,8 @@ describe('MenuCategoryDetailComponent', () => {
|
||||
|
||||
beforeEach(async(() => {
|
||||
TestBed.configureTestingModule({
|
||||
declarations: [MenuCategoryDetailComponent]
|
||||
})
|
||||
.compileComponents();
|
||||
declarations: [MenuCategoryDetailComponent],
|
||||
}).compileComponents();
|
||||
}));
|
||||
|
||||
beforeEach(() => {
|
||||
|
||||
+28
-31
@@ -1,17 +1,17 @@
|
||||
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 { ActivatedRoute, Router } from '@angular/router';
|
||||
|
||||
import { MenuCategoryService } from '../menu-category.service';
|
||||
import { MenuCategory } from '../../core/menu-category';
|
||||
import { ToasterService } from '../../core/toaster.service';
|
||||
import { ConfirmDialogComponent } from '../../shared/confirm-dialog/confirm-dialog.component';
|
||||
import { MenuCategoryService } from '../menu-category.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-menu-category-detail',
|
||||
templateUrl: './menu-category-detail.component.html',
|
||||
styleUrls: ['./menu-category-detail.component.css']
|
||||
styleUrls: ['./menu-category-detail.component.css'],
|
||||
})
|
||||
export class MenuCategoryDetailComponent implements OnInit, AfterViewInit {
|
||||
@ViewChild('nameElement', { static: true }) nameElement: ElementRef;
|
||||
@@ -24,7 +24,7 @@ export class MenuCategoryDetailComponent implements OnInit, AfterViewInit {
|
||||
private dialog: MatDialog,
|
||||
private fb: FormBuilder,
|
||||
private toaster: ToasterService,
|
||||
private ser: MenuCategoryService
|
||||
private ser: MenuCategoryService,
|
||||
) {
|
||||
this.createForm();
|
||||
}
|
||||
@@ -33,15 +33,14 @@ export class MenuCategoryDetailComponent implements OnInit, AfterViewInit {
|
||||
this.form = this.fb.group({
|
||||
name: '',
|
||||
discountLimit: '',
|
||||
isActive: ''
|
||||
isActive: '',
|
||||
});
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
this.route.data
|
||||
.subscribe((data: { item: MenuCategory }) => {
|
||||
this.showItem(data.item);
|
||||
});
|
||||
this.route.data.subscribe((data: { item: MenuCategory }) => {
|
||||
this.showItem(data.item);
|
||||
});
|
||||
}
|
||||
|
||||
showItem(item: MenuCategory) {
|
||||
@@ -49,7 +48,7 @@ export class MenuCategoryDetailComponent implements OnInit, AfterViewInit {
|
||||
this.form.setValue({
|
||||
name: this.item.name,
|
||||
discountLimit: this.item.discountLimit,
|
||||
isActive: this.item.isActive
|
||||
isActive: this.item.isActive,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -60,35 +59,33 @@ export class MenuCategoryDetailComponent implements OnInit, AfterViewInit {
|
||||
}
|
||||
|
||||
save() {
|
||||
this.ser.saveOrUpdate(this.getItem())
|
||||
.subscribe(
|
||||
(result) => {
|
||||
this.toaster.show('Success', '');
|
||||
this.router.navigateByUrl('/menu-categories');
|
||||
},
|
||||
(error) => {
|
||||
this.toaster.show('Danger', error.error);
|
||||
}
|
||||
);
|
||||
this.ser.saveOrUpdate(this.getItem()).subscribe(
|
||||
() => {
|
||||
this.toaster.show('Success', '');
|
||||
this.router.navigateByUrl('/menu-categories');
|
||||
},
|
||||
(error) => {
|
||||
this.toaster.show('Danger', error.error);
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
delete() {
|
||||
this.ser.delete(this.item.id)
|
||||
.subscribe(
|
||||
(result) => {
|
||||
this.toaster.show('Success', '');
|
||||
this.router.navigateByUrl('/menu-categories');
|
||||
},
|
||||
(error) => {
|
||||
this.toaster.show('Danger', error.error);
|
||||
}
|
||||
);
|
||||
this.ser.delete(this.item.id).subscribe(
|
||||
() => {
|
||||
this.toaster.show('Success', '');
|
||||
this.router.navigateByUrl('/menu-categories');
|
||||
},
|
||||
(error) => {
|
||||
this.toaster.show('Danger', error.error);
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
confirmDelete(): void {
|
||||
const dialogRef = this.dialog.open(ConfirmDialogComponent, {
|
||||
width: '250px',
|
||||
data: {title: 'Delete Menu Category?', content: 'Are you sure? This cannot be undone.'}
|
||||
data: { title: 'Delete Menu Category?', content: 'Are you sure? This cannot be undone.' },
|
||||
});
|
||||
|
||||
dialogRef.afterClosed().subscribe((result: boolean) => {
|
||||
|
||||
@@ -1,14 +1,17 @@
|
||||
import {inject, TestBed} from '@angular/core/testing';
|
||||
import {MenuCategoryListResolver} from './menu-category-list-resolver.service';
|
||||
import { inject, TestBed } from '@angular/core/testing';
|
||||
import { MenuCategoryListResolver } from './menu-category-list-resolver.service';
|
||||
|
||||
describe('MenuCategoryListResolver', () => {
|
||||
beforeEach(() => {
|
||||
TestBed.configureTestingModule({
|
||||
providers: [MenuCategoryListResolver]
|
||||
providers: [MenuCategoryListResolver],
|
||||
});
|
||||
});
|
||||
|
||||
it('should be created', inject([MenuCategoryListResolver], (service: MenuCategoryListResolver) => {
|
||||
expect(service).toBeTruthy();
|
||||
}));
|
||||
it('should be created', inject(
|
||||
[MenuCategoryListResolver],
|
||||
(service: MenuCategoryListResolver) => {
|
||||
expect(service).toBeTruthy();
|
||||
},
|
||||
));
|
||||
});
|
||||
@@ -1,18 +1,18 @@
|
||||
import { Injectable } from '@angular/core';
|
||||
import { ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot } from '@angular/router';
|
||||
import { MenuCategory } from '../core/menu-category';
|
||||
import { Resolve } from '@angular/router';
|
||||
import { Observable } from 'rxjs/internal/Observable';
|
||||
|
||||
import { MenuCategory } from '../core/menu-category';
|
||||
|
||||
import { MenuCategoryService } from './menu-category.service';
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root'
|
||||
providedIn: 'root',
|
||||
})
|
||||
export class MenuCategoryListResolver implements Resolve<MenuCategory[]> {
|
||||
constructor(private ser: MenuCategoryService) {}
|
||||
|
||||
constructor(private ser: MenuCategoryService, private router: Router) {
|
||||
}
|
||||
|
||||
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<MenuCategory[]> {
|
||||
resolve(): Observable<MenuCategory[]> {
|
||||
return this.ser.list();
|
||||
}
|
||||
}
|
||||
@@ -1,15 +1,18 @@
|
||||
import { DataSource } from '@angular/cdk/collections';
|
||||
import { Observable } from 'rxjs';
|
||||
import { MenuCategory } from '../../core/menu-category';
|
||||
import { tap } from 'rxjs/operators';
|
||||
|
||||
import { MenuCategory } from '../../core/menu-category';
|
||||
|
||||
export class MenuCategoryListDatasource extends DataSource<MenuCategory> {
|
||||
private data: MenuCategory[];
|
||||
|
||||
constructor(private readonly dataObs: Observable<MenuCategory[]>) {
|
||||
super();
|
||||
this.dataObs = dataObs.pipe(
|
||||
tap(x => this.data = x)
|
||||
tap((x) => {
|
||||
this.data = x;
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -17,6 +20,5 @@ export class MenuCategoryListDatasource extends DataSource<MenuCategory> {
|
||||
return this.dataObs;
|
||||
}
|
||||
|
||||
disconnect() {
|
||||
}
|
||||
disconnect() {}
|
||||
}
|
||||
@@ -1,43 +1,53 @@
|
||||
<mat-card>
|
||||
<mat-card-title-group>
|
||||
<mat-card-title>Menu Categories</mat-card-title>
|
||||
<button mat-button (click)="updateSortOrder()">
|
||||
Update Order
|
||||
</button>
|
||||
<button mat-button (click)="updateSortOrder()">Update Order</button>
|
||||
<a mat-button [routerLink]="['/menu-categories', 'new']">
|
||||
<mat-icon>add_box</mat-icon>
|
||||
Add
|
||||
</a>
|
||||
</mat-card-title-group>
|
||||
<mat-card-content>
|
||||
<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]="['/menu-categories', row.id]">{{row.name}}</a></mat-cell>
|
||||
<mat-cell *matCellDef="let row"
|
||||
><a [routerLink]="['/menu-categories', 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>
|
||||
<mat-cell *matCellDef="let row">{{ row.discountLimit | percent: '1.2-2' }}</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>
|
||||
<mat-cell *matCellDef="let row">{{ row.isActive }}</mat-cell>
|
||||
</ng-container>
|
||||
|
||||
<!-- Is Fixture Column -->
|
||||
<ng-container matColumnDef="isFixture">
|
||||
<mat-header-cell *matHeaderCellDef>Fixture?</mat-header-cell>
|
||||
<mat-cell *matCellDef="let row">{{row.isFixture}}</mat-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;" cdkDrag [cdkDragData]="row"></mat-row>
|
||||
<mat-row
|
||||
*matRowDef="let row; columns: displayedColumns"
|
||||
cdkDrag
|
||||
[cdkDragData]="row"
|
||||
></mat-row>
|
||||
</mat-table>
|
||||
</mat-card-content>
|
||||
</mat-card>
|
||||
+4
-5
@@ -1,6 +1,6 @@
|
||||
import {ComponentFixture, fakeAsync, TestBed} from '@angular/core/testing';
|
||||
import { ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing';
|
||||
|
||||
import {MenuCategoryListComponent} from './menu-category-list.component';
|
||||
import { MenuCategoryListComponent } from './menu-category-list.component';
|
||||
|
||||
describe('MenuCategoryListComponent', () => {
|
||||
let component: MenuCategoryListComponent;
|
||||
@@ -8,9 +8,8 @@ describe('MenuCategoryListComponent', () => {
|
||||
|
||||
beforeEach(fakeAsync(() => {
|
||||
TestBed.configureTestingModule({
|
||||
declarations: [MenuCategoryListComponent]
|
||||
})
|
||||
.compileComponents();
|
||||
declarations: [MenuCategoryListComponent],
|
||||
}).compileComponents();
|
||||
|
||||
fixture = TestBed.createComponent(MenuCategoryListComponent);
|
||||
component = fixture.componentInstance;
|
||||
|
||||
@@ -1,17 +1,19 @@
|
||||
import { Component, OnInit, ViewChild } from '@angular/core';
|
||||
import { MenuCategoryListDatasource } from './menu-category-list-datasource';
|
||||
import { MenuCategory } from '../../core/menu-category';
|
||||
import { ActivatedRoute, Router } from '@angular/router';
|
||||
import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop';
|
||||
import { Component, OnInit, ViewChild } from '@angular/core';
|
||||
import { MatTable } from '@angular/material/table';
|
||||
import { ActivatedRoute, Router } from '@angular/router';
|
||||
import { BehaviorSubject } from 'rxjs';
|
||||
|
||||
import { MenuCategory } from '../../core/menu-category';
|
||||
import { ToasterService } from '../../core/toaster.service';
|
||||
import { MenuCategoryService } from '../menu-category.service';
|
||||
import { BehaviorSubject } from 'rxjs';
|
||||
|
||||
import { MenuCategoryListDatasource } from './menu-category-list-datasource';
|
||||
|
||||
@Component({
|
||||
selector: 'app-menu-category-list',
|
||||
templateUrl: './menu-category-list.component.html',
|
||||
styleUrls: ['./menu-category-list.component.css']
|
||||
styleUrls: ['./menu-category-list.component.css'],
|
||||
})
|
||||
export class MenuCategoryListComponent implements OnInit {
|
||||
@ViewChild('table', { static: true }) table: MatTable<MenuCategory>;
|
||||
@@ -25,7 +27,7 @@ export class MenuCategoryListComponent implements OnInit {
|
||||
private route: ActivatedRoute,
|
||||
private router: Router,
|
||||
private toaster: ToasterService,
|
||||
private ser: MenuCategoryService
|
||||
private ser: MenuCategoryService,
|
||||
) {
|
||||
this.data = new BehaviorSubject([]);
|
||||
this.data.subscribe((data: MenuCategory[]) => {
|
||||
@@ -34,24 +36,24 @@ export class MenuCategoryListComponent implements OnInit {
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
this.route.data
|
||||
.subscribe((data: { list: MenuCategory[] }) => {
|
||||
data.list.forEach(x => x.discountLimit = x.discountLimit / 100);
|
||||
this.data.next(data.list);
|
||||
this.route.data.subscribe((data: { list: MenuCategory[] }) => {
|
||||
data.list.forEach((x) => {
|
||||
x.discountLimit /= 100;
|
||||
});
|
||||
this.data.next(data.list);
|
||||
});
|
||||
this.dataSource = new MenuCategoryListDatasource(this.data);
|
||||
}
|
||||
|
||||
updateSortOrder() {
|
||||
this.ser.updateSortOrder(this.list)
|
||||
.subscribe(
|
||||
(result) => {
|
||||
this.toaster.show('Success', '');
|
||||
},
|
||||
(error) => {
|
||||
this.toaster.show('Danger', error.error);
|
||||
}
|
||||
);
|
||||
this.ser.updateSortOrder(this.list).subscribe(
|
||||
() => {
|
||||
this.toaster.show('Success', '');
|
||||
},
|
||||
(error) => {
|
||||
this.toaster.show('Danger', error.error);
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
dropTable(event: CdkDragDrop<MenuCategoryListDatasource>) {
|
||||
|
||||
@@ -4,7 +4,7 @@ import { MenuCategoryResolver } from './menu-category-resolver.service';
|
||||
describe('MenuCategoriesResolver', () => {
|
||||
beforeEach(() => {
|
||||
TestBed.configureTestingModule({
|
||||
providers: [MenuCategoryResolver]
|
||||
providers: [MenuCategoryResolver],
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
import { Injectable } from '@angular/core';
|
||||
import { ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot } from '@angular/router';
|
||||
import { MenuCategoryService } from './menu-category.service';
|
||||
import { MenuCategory } from '../core/menu-category';
|
||||
import { ActivatedRouteSnapshot, Resolve } from '@angular/router';
|
||||
import { Observable } from 'rxjs/internal/Observable';
|
||||
|
||||
import { MenuCategory } from '../core/menu-category';
|
||||
|
||||
import { MenuCategoryService } from './menu-category.service';
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root'
|
||||
providedIn: 'root',
|
||||
})
|
||||
export class MenuCategoryResolver implements Resolve<MenuCategory> {
|
||||
constructor(private ser: MenuCategoryService) {}
|
||||
|
||||
constructor(private ser: MenuCategoryService, private router: Router) {
|
||||
}
|
||||
|
||||
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<MenuCategory> {
|
||||
resolve(route: ActivatedRouteSnapshot): Observable<MenuCategory> {
|
||||
const id = route.paramMap.get('id');
|
||||
return this.ser.get(id);
|
||||
}
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
import {inject, TestBed} from '@angular/core/testing';
|
||||
import { inject, TestBed } from '@angular/core/testing';
|
||||
|
||||
import {MenuCategoryService} from './menu-category.service';
|
||||
import { MenuCategoryService } from './menu-category.service';
|
||||
|
||||
describe('MenuCategoryService', () => {
|
||||
beforeEach(() => {
|
||||
TestBed.configureTestingModule({
|
||||
providers: [MenuCategoryService]
|
||||
providers: [MenuCategoryService],
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@@ -1,71 +1,76 @@
|
||||
import { Injectable } from '@angular/core';
|
||||
import { HttpClient, HttpHeaders } from '@angular/common/http';
|
||||
import { ErrorLoggerService } from '../core/error-logger.service';
|
||||
import { catchError } from 'rxjs/operators';
|
||||
import { Injectable } from '@angular/core';
|
||||
import { Observable } from 'rxjs/internal/Observable';
|
||||
import { catchError } from 'rxjs/operators';
|
||||
|
||||
import { ErrorLoggerService } from '../core/error-logger.service';
|
||||
import { MenuCategory } from '../core/menu-category';
|
||||
|
||||
const httpOptions = {
|
||||
headers: new HttpHeaders({'Content-Type': 'application/json'})
|
||||
headers: new HttpHeaders({ 'Content-Type': 'application/json' }),
|
||||
};
|
||||
const url = '/api/menu-categories';
|
||||
const serviceName = 'MenuCategoryService';
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root'
|
||||
providedIn: 'root',
|
||||
})
|
||||
export class MenuCategoryService {
|
||||
constructor(private http: HttpClient, private log: ErrorLoggerService) {
|
||||
}
|
||||
constructor(private http: HttpClient, private log: ErrorLoggerService) {}
|
||||
|
||||
get(id: string): Observable<MenuCategory> {
|
||||
const getUrl: string = (id === null) ? url : `${url}/${id}`;
|
||||
return <Observable<MenuCategory>>this.http.get<MenuCategory>(getUrl)
|
||||
.pipe(
|
||||
catchError(this.log.handleError(serviceName, `get id=${id}`))
|
||||
);
|
||||
const getUrl: string = id === null ? url : `${url}/${id}`;
|
||||
return <Observable<MenuCategory>>(
|
||||
this.http
|
||||
.get<MenuCategory>(getUrl)
|
||||
.pipe(catchError(this.log.handleError(serviceName, `get id=${id}`)))
|
||||
);
|
||||
}
|
||||
|
||||
list(): Observable<MenuCategory[]> {
|
||||
return <Observable<MenuCategory[]>>this.http.get<MenuCategory[]>(`${url}/list`)
|
||||
.pipe(
|
||||
catchError(this.log.handleError(serviceName, 'list'))
|
||||
);
|
||||
return <Observable<MenuCategory[]>>(
|
||||
this.http
|
||||
.get<MenuCategory[]>(`${url}/list`)
|
||||
.pipe(catchError(this.log.handleError(serviceName, 'list')))
|
||||
);
|
||||
}
|
||||
|
||||
save(menuCategory: MenuCategory): Observable<MenuCategory> {
|
||||
return <Observable<MenuCategory>>this.http.post<MenuCategory>(url, menuCategory, httpOptions)
|
||||
.pipe(
|
||||
catchError(this.log.handleError(serviceName, 'save'))
|
||||
);
|
||||
return <Observable<MenuCategory>>(
|
||||
this.http
|
||||
.post<MenuCategory>(url, menuCategory, httpOptions)
|
||||
.pipe(catchError(this.log.handleError(serviceName, 'save')))
|
||||
);
|
||||
}
|
||||
|
||||
update(menuCategory: MenuCategory): Observable<MenuCategory> {
|
||||
return <Observable<MenuCategory>>this.http.put<MenuCategory>(`${url}/${menuCategory.id}`, menuCategory, httpOptions)
|
||||
.pipe(
|
||||
catchError(this.log.handleError(serviceName, 'update'))
|
||||
);
|
||||
return <Observable<MenuCategory>>(
|
||||
this.http
|
||||
.put<MenuCategory>(`${url}/${menuCategory.id}`, menuCategory, httpOptions)
|
||||
.pipe(catchError(this.log.handleError(serviceName, 'update')))
|
||||
);
|
||||
}
|
||||
|
||||
updateSortOrder(list: MenuCategory[]): Observable<boolean> {
|
||||
return <Observable<boolean>>this.http.post<MenuCategory[]>(url, list, httpOptions)
|
||||
.pipe(
|
||||
catchError(this.log.handleError(serviceName, 'updateSortOrder'))
|
||||
);
|
||||
return <Observable<boolean>>(
|
||||
this.http
|
||||
.post<MenuCategory[]>(url, list, httpOptions)
|
||||
.pipe(catchError(this.log.handleError(serviceName, 'updateSortOrder')))
|
||||
);
|
||||
}
|
||||
|
||||
saveOrUpdate(menuCategory: MenuCategory): Observable<MenuCategory> {
|
||||
if (!menuCategory.id) {
|
||||
return this.save(menuCategory);
|
||||
} else {
|
||||
return this.update(menuCategory);
|
||||
}
|
||||
return this.update(menuCategory);
|
||||
}
|
||||
|
||||
delete(id: string): Observable<MenuCategory> {
|
||||
return <Observable<MenuCategory>>this.http.delete<MenuCategory>(`${url}/${id}`, httpOptions)
|
||||
.pipe(
|
||||
catchError(this.log.handleError(serviceName, 'delete'))
|
||||
);
|
||||
return <Observable<MenuCategory>>(
|
||||
this.http
|
||||
.delete<MenuCategory>(`${url}/${id}`, httpOptions)
|
||||
.pipe(catchError(this.log.handleError(serviceName, 'delete')))
|
||||
);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user