Chore:
Moved to Angular 16 Moved to FastAPI 0.100.0 Moved to pydantic 2.0
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
import { Injectable } from '@angular/core';
|
||||
import { ActivatedRouteSnapshot, Resolve } from '@angular/router';
|
||||
import { ActivatedRouteSnapshot } from '@angular/router';
|
||||
import { Observable } from 'rxjs';
|
||||
|
||||
import { TaxReport } from './tax-report';
|
||||
@@ -8,7 +8,7 @@ import { TaxReportService } from './tax-report.service';
|
||||
@Injectable({
|
||||
providedIn: 'root',
|
||||
})
|
||||
export class TaxReportResolver implements Resolve<TaxReport> {
|
||||
export class TaxReportResolver {
|
||||
constructor(private ser: TaxReportService) {}
|
||||
|
||||
resolve(route: ActivatedRouteSnapshot): Observable<TaxReport> {
|
||||
|
||||
@@ -47,19 +47,19 @@
|
||||
<!-- Tax Rate Column -->
|
||||
<ng-container matColumnDef="taxRate">
|
||||
<mat-header-cell *matHeaderCellDef class="right">Rate</mat-header-cell>
|
||||
<mat-cell *matCellDef="let row" class="right">{{ row.taxRate | percent : '1.2-2' }}</mat-cell>
|
||||
<mat-cell *matCellDef="let row" class="right">{{ row.taxRate | percent: '1.2-2' }}</mat-cell>
|
||||
</ng-container>
|
||||
|
||||
<!-- Sale Amount Column -->
|
||||
<ng-container matColumnDef="saleAmount">
|
||||
<mat-header-cell *matHeaderCellDef class="right">Sale</mat-header-cell>
|
||||
<mat-cell *matCellDef="let row" class="right">{{ row.saleAmount | currency : 'INR' }}</mat-cell>
|
||||
<mat-cell *matCellDef="let row" class="right">{{ row.saleAmount | currency: 'INR' }}</mat-cell>
|
||||
</ng-container>
|
||||
|
||||
<!-- Tax Amount Column -->
|
||||
<ng-container matColumnDef="taxAmount">
|
||||
<mat-header-cell *matHeaderCellDef class="right">Tax</mat-header-cell>
|
||||
<mat-cell *matCellDef="let row" class="right">{{ row.amount | currency : 'INR' }}</mat-cell>
|
||||
<mat-cell *matCellDef="let row" class="right">{{ row.amount | currency: 'INR' }}</mat-cell>
|
||||
</ng-container>
|
||||
|
||||
<mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
|
||||
|
||||
@@ -24,7 +24,11 @@ export class TaxReportComponent implements OnInit {
|
||||
/** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */
|
||||
displayedColumns = ['name', 'taxRate', 'saleAmount', 'taxAmount'];
|
||||
|
||||
constructor(private route: ActivatedRoute, private router: Router, private toCsv: ToCsvService) {
|
||||
constructor(
|
||||
private route: ActivatedRoute,
|
||||
private router: Router,
|
||||
private toCsv: ToCsvService,
|
||||
) {
|
||||
// Create form
|
||||
this.form = new FormGroup({
|
||||
startDate: new FormControl(new Date(), { nonNullable: true }),
|
||||
|
||||
@@ -14,7 +14,10 @@ const serviceName = 'TaxReportService';
|
||||
providedIn: 'root',
|
||||
})
|
||||
export class TaxReportService {
|
||||
constructor(private http: HttpClient, private log: ErrorLoggerService) {}
|
||||
constructor(
|
||||
private http: HttpClient,
|
||||
private log: ErrorLoggerService,
|
||||
) {}
|
||||
|
||||
get(startDate: string | null, finishDate: string | null): Observable<TaxReport> {
|
||||
const options = { params: new HttpParams() };
|
||||
|
||||
Reference in New Issue
Block a user