Feature: Tax Regimes are added so that different bills with different series can be printed for Different regimes such as VAT and GST
Chore: Model relationships updated to make them simpler Chore: Bill printing majorly refactored for it Due to the sheer depth of the changes. There can be showstoppers. Please test it carefully
This commit is contained in:
@ -0,0 +1,3 @@
|
||||
.right-align {
|
||||
text-align: right;
|
||||
}
|
||||
@ -0,0 +1,47 @@
|
||||
<mat-card class="flex-auto lg:max-w-[50%]">
|
||||
<mat-card-header>
|
||||
<mat-card-title>Regime</mat-card-title>
|
||||
</mat-card-header>
|
||||
<mat-card-content>
|
||||
<form [formGroup]="form" class="flex flex-col">
|
||||
<div class="flex flex-row justify-around content-start items-start">
|
||||
<mat-form-field class="flex-auto">
|
||||
<mat-label>Name</mat-label>
|
||||
<input matInput #nameElement formControlName="name" (keyup.enter)="save()" />
|
||||
</mat-form-field>
|
||||
</div>
|
||||
<div class="flex flex-row justify-around content-start items-start">
|
||||
<mat-form-field class="flex-auto">
|
||||
<mat-label>Header</mat-label>
|
||||
<input matInput formControlName="header" />
|
||||
</mat-form-field>
|
||||
</div>
|
||||
<div class="flex flex-row justify-around content-start items-start">
|
||||
<mat-form-field class="flex-auto">
|
||||
<mat-label>Prefix</mat-label>
|
||||
<input matInput formControlName="prefix" />
|
||||
</mat-form-field>
|
||||
</div>
|
||||
</form>
|
||||
</mat-card-content>
|
||||
<mat-card-actions>
|
||||
<button
|
||||
mat-raised-button
|
||||
[disabled]="item.isFixture"
|
||||
color="primary"
|
||||
class="mr-5"
|
||||
(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>
|
||||
@ -0,0 +1,24 @@
|
||||
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
|
||||
|
||||
import { RegimeDetailComponent } from './regime-detail.component';
|
||||
|
||||
describe('RegimeDetailComponent', () => {
|
||||
let component: RegimeDetailComponent;
|
||||
let fixture: ComponentFixture<RegimeDetailComponent>;
|
||||
|
||||
beforeEach(waitForAsync(() => {
|
||||
TestBed.configureTestingModule({
|
||||
declarations: [RegimeDetailComponent],
|
||||
}).compileComponents();
|
||||
}));
|
||||
|
||||
beforeEach(() => {
|
||||
fixture = TestBed.createComponent(RegimeDetailComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
109
bookie/src/app/regimes/regime-detail/regime-detail.component.ts
Normal file
109
bookie/src/app/regimes/regime-detail/regime-detail.component.ts
Normal file
@ -0,0 +1,109 @@
|
||||
import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
|
||||
import { FormControl, FormGroup } from '@angular/forms';
|
||||
import { MatDialog } from '@angular/material/dialog';
|
||||
import { ActivatedRoute, Router } from '@angular/router';
|
||||
|
||||
import { Regime } from '../../core/regime';
|
||||
import { ToasterService } from '../../core/toaster.service';
|
||||
import { ConfirmDialogComponent } from '../../shared/confirm-dialog/confirm-dialog.component';
|
||||
import { RegimeService } from '../regime.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-regime-detail',
|
||||
templateUrl: './regime-detail.component.html',
|
||||
styleUrls: ['./regime-detail.component.css'],
|
||||
})
|
||||
export class RegimeDetailComponent implements OnInit, AfterViewInit {
|
||||
@ViewChild('nameElement', { static: true }) nameElement?: ElementRef;
|
||||
form: FormGroup<{
|
||||
name: FormControl<string>;
|
||||
header: FormControl<string>;
|
||||
prefix: FormControl<string>;
|
||||
}>;
|
||||
|
||||
item: Regime = new Regime();
|
||||
|
||||
constructor(
|
||||
private route: ActivatedRoute,
|
||||
private router: Router,
|
||||
private dialog: MatDialog,
|
||||
private toaster: ToasterService,
|
||||
private ser: RegimeService,
|
||||
) {
|
||||
// Create form
|
||||
this.form = new FormGroup({
|
||||
name: new FormControl<string>('', { nonNullable: true }),
|
||||
header: new FormControl<string>('', { nonNullable: true }),
|
||||
prefix: new FormControl<string>('', { nonNullable: true }),
|
||||
});
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
this.route.data.subscribe((value) => {
|
||||
const data = value as { item: Regime };
|
||||
this.showItem(data.item);
|
||||
});
|
||||
}
|
||||
|
||||
showItem(item: Regime) {
|
||||
this.item = item;
|
||||
this.form.setValue({
|
||||
name: this.item.name ?? '',
|
||||
header: this.item.header ?? '',
|
||||
prefix: this.item.prefix ?? '',
|
||||
});
|
||||
}
|
||||
|
||||
ngAfterViewInit() {
|
||||
setTimeout(() => {
|
||||
if (this.nameElement !== undefined) {
|
||||
this.nameElement.nativeElement.focus();
|
||||
}
|
||||
}, 0);
|
||||
}
|
||||
|
||||
save() {
|
||||
this.ser.saveOrUpdate(this.getItem()).subscribe(
|
||||
() => {
|
||||
this.toaster.show('Success', '');
|
||||
this.router.navigateByUrl('/regimes');
|
||||
},
|
||||
(error) => {
|
||||
this.toaster.show('Error', error);
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
delete() {
|
||||
this.ser.delete(this.item.id as number).subscribe(
|
||||
() => {
|
||||
this.toaster.show('Success', '');
|
||||
this.router.navigateByUrl('/regimes');
|
||||
},
|
||||
(error) => {
|
||||
this.toaster.show('Error', error);
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
confirmDelete(): void {
|
||||
const dialogRef = this.dialog.open(ConfirmDialogComponent, {
|
||||
width: '250px',
|
||||
data: { title: 'Delete Regime?', content: 'Are you sure? This cannot be undone.' },
|
||||
});
|
||||
|
||||
dialogRef.afterClosed().subscribe((result: boolean) => {
|
||||
if (result) {
|
||||
this.delete();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
getItem(): Regime {
|
||||
const formModel = this.form.value;
|
||||
this.item.name = formModel.name ?? '';
|
||||
this.item.header = formModel.header ?? '';
|
||||
this.item.prefix = formModel.prefix ?? '';
|
||||
return this.item;
|
||||
}
|
||||
}
|
||||
15
bookie/src/app/regimes/regime-list-resolver.service.spec.ts
Normal file
15
bookie/src/app/regimes/regime-list-resolver.service.spec.ts
Normal file
@ -0,0 +1,15 @@
|
||||
import { inject, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { RegimeListResolver } from './regime-list-resolver.service';
|
||||
|
||||
describe('RegimeListResolverService', () => {
|
||||
beforeEach(() => {
|
||||
TestBed.configureTestingModule({
|
||||
providers: [RegimeListResolver],
|
||||
});
|
||||
});
|
||||
|
||||
it('should be created', inject([RegimeListResolver], (service: RegimeListResolver) => {
|
||||
expect(service).toBeTruthy();
|
||||
}));
|
||||
});
|
||||
18
bookie/src/app/regimes/regime-list-resolver.service.ts
Normal file
18
bookie/src/app/regimes/regime-list-resolver.service.ts
Normal file
@ -0,0 +1,18 @@
|
||||
import { Injectable } from '@angular/core';
|
||||
import { Resolve } from '@angular/router';
|
||||
import { Observable } from 'rxjs';
|
||||
|
||||
import { Regime } from '../core/regime';
|
||||
|
||||
import { RegimeService } from './regime.service';
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root',
|
||||
})
|
||||
export class RegimeListResolver implements Resolve<Regime[]> {
|
||||
constructor(private ser: RegimeService) {}
|
||||
|
||||
resolve(): Observable<Regime[]> {
|
||||
return this.ser.list();
|
||||
}
|
||||
}
|
||||
16
bookie/src/app/regimes/regime-list/regime-list-datasource.ts
Normal file
16
bookie/src/app/regimes/regime-list/regime-list-datasource.ts
Normal file
@ -0,0 +1,16 @@
|
||||
import { DataSource } from '@angular/cdk/collections';
|
||||
import { Observable, of as observableOf } from 'rxjs';
|
||||
|
||||
import { Regime } from '../../core/regime';
|
||||
|
||||
export class RegimeListDataSource extends DataSource<Regime> {
|
||||
constructor(public data: Regime[]) {
|
||||
super();
|
||||
}
|
||||
|
||||
connect(): Observable<Regime[]> {
|
||||
return observableOf(this.data);
|
||||
}
|
||||
|
||||
disconnect() {}
|
||||
}
|
||||
@ -0,0 +1,43 @@
|
||||
<mat-card>
|
||||
<mat-card-header>
|
||||
<mat-card-title-group>
|
||||
<mat-card-title>Regimes</mat-card-title>
|
||||
<a mat-button [routerLink]="['/regimes', 'new']">
|
||||
<mat-icon>add_box</mat-icon>
|
||||
Add
|
||||
</a>
|
||||
</mat-card-title-group>
|
||||
</mat-card-header>
|
||||
<mat-card-content>
|
||||
<mat-table #table [dataSource]="dataSource" aria-label="Elements">
|
||||
<!-- Name Column -->
|
||||
<ng-container matColumnDef="name">
|
||||
<mat-header-cell *matHeaderCellDef>Name</mat-header-cell>
|
||||
<mat-cell *matCellDef="let row"
|
||||
><a [routerLink]="['/regimes', row.id]">{{ row.name }}</a></mat-cell
|
||||
>
|
||||
</ng-container>
|
||||
|
||||
<!-- Header Column -->
|
||||
<ng-container matColumnDef="header">
|
||||
<mat-header-cell *matHeaderCellDef>Header</mat-header-cell>
|
||||
<mat-cell *matCellDef="let row">{{ row.header }}</mat-cell>
|
||||
</ng-container>
|
||||
|
||||
<!-- Prefix Column -->
|
||||
<ng-container matColumnDef="prefix">
|
||||
<mat-header-cell *matHeaderCellDef>Prefix</mat-header-cell>
|
||||
<mat-cell *matCellDef="let row">{{ row.prefix }}</mat-cell>
|
||||
</ng-container>
|
||||
|
||||
<!-- Is Fixture Column -->
|
||||
<ng-container matColumnDef="isFixture">
|
||||
<mat-header-cell *matHeaderCellDef>Is 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-table>
|
||||
</mat-card-content>
|
||||
</mat-card>
|
||||
@ -0,0 +1,22 @@
|
||||
import { ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { RegimeListComponent } from './regime-list.component';
|
||||
|
||||
describe('RegimeListComponent', () => {
|
||||
let component: RegimeListComponent;
|
||||
let fixture: ComponentFixture<RegimeListComponent>;
|
||||
|
||||
beforeEach(fakeAsync(() => {
|
||||
TestBed.configureTestingModule({
|
||||
declarations: [RegimeListComponent],
|
||||
}).compileComponents();
|
||||
|
||||
fixture = TestBed.createComponent(RegimeListComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
}));
|
||||
|
||||
it('should compile', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
28
bookie/src/app/regimes/regime-list/regime-list.component.ts
Normal file
28
bookie/src/app/regimes/regime-list/regime-list.component.ts
Normal file
@ -0,0 +1,28 @@
|
||||
import { Component, OnInit } from '@angular/core';
|
||||
import { ActivatedRoute } from '@angular/router';
|
||||
|
||||
import { Regime } from '../../core/regime';
|
||||
|
||||
import { RegimeListDataSource } from './regime-list-datasource';
|
||||
|
||||
@Component({
|
||||
selector: 'app-regime-list',
|
||||
templateUrl: './regime-list.component.html',
|
||||
styleUrls: ['./regime-list.component.css'],
|
||||
})
|
||||
export class RegimeListComponent implements OnInit {
|
||||
list: Regime[] = [];
|
||||
dataSource: RegimeListDataSource = new RegimeListDataSource(this.list);
|
||||
/** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */
|
||||
displayedColumns = ['name', 'header', 'prefix', 'isFixture'];
|
||||
|
||||
constructor(private route: ActivatedRoute) {}
|
||||
|
||||
ngOnInit() {
|
||||
this.route.data.subscribe((value) => {
|
||||
const data = value as { list: Regime[] };
|
||||
this.list = data.list;
|
||||
});
|
||||
this.dataSource = new RegimeListDataSource(this.list);
|
||||
}
|
||||
}
|
||||
15
bookie/src/app/regimes/regime-resolver.service.spec.ts
Normal file
15
bookie/src/app/regimes/regime-resolver.service.spec.ts
Normal file
@ -0,0 +1,15 @@
|
||||
import { inject, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { RegimeResolver } from './regime-resolver.service';
|
||||
|
||||
describe('RegimeResolver', () => {
|
||||
beforeEach(() => {
|
||||
TestBed.configureTestingModule({
|
||||
providers: [RegimeResolver],
|
||||
});
|
||||
});
|
||||
|
||||
it('should be created', inject([RegimeResolver], (service: RegimeResolver) => {
|
||||
expect(service).toBeTruthy();
|
||||
}));
|
||||
});
|
||||
19
bookie/src/app/regimes/regime-resolver.service.ts
Normal file
19
bookie/src/app/regimes/regime-resolver.service.ts
Normal file
@ -0,0 +1,19 @@
|
||||
import { Injectable } from '@angular/core';
|
||||
import { ActivatedRouteSnapshot, Resolve } from '@angular/router';
|
||||
import { Observable } from 'rxjs';
|
||||
|
||||
import { Regime } from '../core/regime';
|
||||
|
||||
import { RegimeService } from './regime.service';
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root',
|
||||
})
|
||||
export class RegimeResolver implements Resolve<Regime> {
|
||||
constructor(private ser: RegimeService) {}
|
||||
|
||||
resolve(route: ActivatedRouteSnapshot): Observable<Regime> {
|
||||
const id = route.paramMap.get('id');
|
||||
return this.ser.get(id ? +id : null);
|
||||
}
|
||||
}
|
||||
15
bookie/src/app/regimes/regime.service.spec.ts
Normal file
15
bookie/src/app/regimes/regime.service.spec.ts
Normal file
@ -0,0 +1,15 @@
|
||||
import { inject, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { RegimeService } from './regime.service';
|
||||
|
||||
describe('RegimeService', () => {
|
||||
beforeEach(() => {
|
||||
TestBed.configureTestingModule({
|
||||
providers: [RegimeService],
|
||||
});
|
||||
});
|
||||
|
||||
it('should be created', inject([RegimeService], (service: RegimeService) => {
|
||||
expect(service).toBeTruthy();
|
||||
}));
|
||||
});
|
||||
58
bookie/src/app/regimes/regime.service.ts
Normal file
58
bookie/src/app/regimes/regime.service.ts
Normal file
@ -0,0 +1,58 @@
|
||||
import { HttpClient, HttpHeaders } from '@angular/common/http';
|
||||
import { Injectable } from '@angular/core';
|
||||
import { Observable } from 'rxjs';
|
||||
import { catchError } from 'rxjs/operators';
|
||||
|
||||
import { ErrorLoggerService } from '../core/error-logger.service';
|
||||
import { Regime } from '../core/regime';
|
||||
|
||||
const httpOptions = {
|
||||
headers: new HttpHeaders({ 'Content-Type': 'application/json' }),
|
||||
};
|
||||
const url = '/api/regimes';
|
||||
const serviceName = 'RegimeService';
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root',
|
||||
})
|
||||
export class RegimeService {
|
||||
constructor(private http: HttpClient, private log: ErrorLoggerService) {}
|
||||
|
||||
get(id: number | null): Observable<Regime> {
|
||||
const getUrl: string = id === null ? url : `${url}/${id}`;
|
||||
return this.http
|
||||
.get<Regime>(getUrl)
|
||||
.pipe(catchError(this.log.handleError(serviceName, `get id=${id}`))) as Observable<Regime>;
|
||||
}
|
||||
|
||||
list(): Observable<Regime[]> {
|
||||
return this.http
|
||||
.get<Regime[]>(`${url}/list`)
|
||||
.pipe(catchError(this.log.handleError(serviceName, 'list'))) as Observable<Regime[]>;
|
||||
}
|
||||
|
||||
save(regime: Regime): Observable<Regime> {
|
||||
return this.http
|
||||
.post<Regime>(url, regime, httpOptions)
|
||||
.pipe(catchError(this.log.handleError(serviceName, 'save'))) as Observable<Regime>;
|
||||
}
|
||||
|
||||
update(regime: Regime): Observable<Regime> {
|
||||
return this.http
|
||||
.put<Regime>(`${url}/${regime.id}`, regime, httpOptions)
|
||||
.pipe(catchError(this.log.handleError(serviceName, 'update'))) as Observable<Regime>;
|
||||
}
|
||||
|
||||
saveOrUpdate(regime: Regime): Observable<Regime> {
|
||||
if (!regime.id) {
|
||||
return this.save(regime);
|
||||
}
|
||||
return this.update(regime);
|
||||
}
|
||||
|
||||
delete(id: number): Observable<Regime> {
|
||||
return this.http
|
||||
.delete<Regime>(`${url}/${id}`, httpOptions)
|
||||
.pipe(catchError(this.log.handleError(serviceName, 'delete'))) as Observable<Regime>;
|
||||
}
|
||||
}
|
||||
13
bookie/src/app/regimes/regimes-routing.module.spec.ts
Normal file
13
bookie/src/app/regimes/regimes-routing.module.spec.ts
Normal file
@ -0,0 +1,13 @@
|
||||
import { RegimesRoutingModule } from './regimes-routing.module';
|
||||
|
||||
describe('RegimesRoutingModule', () => {
|
||||
let regimesRoutingModule: RegimesRoutingModule;
|
||||
|
||||
beforeEach(() => {
|
||||
regimesRoutingModule = new RegimesRoutingModule();
|
||||
});
|
||||
|
||||
it('should create an instance', () => {
|
||||
expect(regimesRoutingModule).toBeTruthy();
|
||||
});
|
||||
});
|
||||
53
bookie/src/app/regimes/regimes-routing.module.ts
Normal file
53
bookie/src/app/regimes/regimes-routing.module.ts
Normal file
@ -0,0 +1,53 @@
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { NgModule } from '@angular/core';
|
||||
import { RouterModule, Routes } from '@angular/router';
|
||||
|
||||
import { AuthGuard } from '../auth/auth-guard.service';
|
||||
|
||||
import { RegimeDetailComponent } from './regime-detail/regime-detail.component';
|
||||
import { RegimeListComponent } from './regime-list/regime-list.component';
|
||||
import { RegimeListResolver } from './regime-list-resolver.service';
|
||||
import { RegimeResolver } from './regime-resolver.service';
|
||||
|
||||
const regimesRoutes: Routes = [
|
||||
{
|
||||
path: '',
|
||||
component: RegimeListComponent,
|
||||
canActivate: [AuthGuard],
|
||||
data: {
|
||||
permission: 'Regimes',
|
||||
},
|
||||
resolve: {
|
||||
list: RegimeListResolver,
|
||||
},
|
||||
},
|
||||
{
|
||||
path: 'new',
|
||||
component: RegimeDetailComponent,
|
||||
canActivate: [AuthGuard],
|
||||
data: {
|
||||
permission: 'Regimes',
|
||||
},
|
||||
resolve: {
|
||||
item: RegimeResolver,
|
||||
},
|
||||
},
|
||||
{
|
||||
path: ':id',
|
||||
component: RegimeDetailComponent,
|
||||
canActivate: [AuthGuard],
|
||||
data: {
|
||||
permission: 'Regimes',
|
||||
},
|
||||
resolve: {
|
||||
item: RegimeResolver,
|
||||
},
|
||||
},
|
||||
];
|
||||
|
||||
@NgModule({
|
||||
imports: [CommonModule, RouterModule.forChild(regimesRoutes)],
|
||||
exports: [RouterModule],
|
||||
providers: [RegimeListResolver, RegimeResolver],
|
||||
})
|
||||
export class RegimesRoutingModule {}
|
||||
13
bookie/src/app/regimes/regimes.module.spec.ts
Normal file
13
bookie/src/app/regimes/regimes.module.spec.ts
Normal file
@ -0,0 +1,13 @@
|
||||
import { RegimesModule } from './regimes.module';
|
||||
|
||||
describe('RegimesModule', () => {
|
||||
let regimesModule: RegimesModule;
|
||||
|
||||
beforeEach(() => {
|
||||
regimesModule = new RegimesModule();
|
||||
});
|
||||
|
||||
it('should create an instance', () => {
|
||||
expect(regimesModule).toBeTruthy();
|
||||
});
|
||||
});
|
||||
31
bookie/src/app/regimes/regimes.module.ts
Normal file
31
bookie/src/app/regimes/regimes.module.ts
Normal file
@ -0,0 +1,31 @@
|
||||
import { CdkTableModule } from '@angular/cdk/table';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { NgModule } from '@angular/core';
|
||||
import { ReactiveFormsModule } from '@angular/forms';
|
||||
import { MatButtonModule } from '@angular/material/button';
|
||||
import { MatCardModule } from '@angular/material/card';
|
||||
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 { RegimeDetailComponent } from './regime-detail/regime-detail.component';
|
||||
import { RegimeListComponent } from './regime-list/regime-list.component';
|
||||
import { RegimesRoutingModule } from './regimes-routing.module';
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule,
|
||||
CdkTableModule,
|
||||
MatButtonModule,
|
||||
MatCardModule,
|
||||
MatIconModule,
|
||||
MatInputModule,
|
||||
MatProgressSpinnerModule,
|
||||
MatTableModule,
|
||||
ReactiveFormsModule,
|
||||
RegimesRoutingModule,
|
||||
],
|
||||
declarations: [RegimeListComponent, RegimeDetailComponent],
|
||||
})
|
||||
export class RegimesModule {}
|
||||
Reference in New Issue
Block a user