tanshu/barker
1
0
Fork 0
Code Issues 1 Pull Requests Releases 4 Activity

Chore: Upgrade to Angular v18

Browse Source 
Chore: Upgrade to Python 3.12
Chore: Upgrade to psycopg3
This commit is contained in:
Amritanshu Agrawal
2024-06-03 13:22:56 +05:30
parent 56c1be5e05
commit 010e9a84db
573 changed files with 5727 additions and 6528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
bookie/src/app/cashier-report/active-cashiers-resolver.service.ts
View File

@ -1,20 +0,0 @@
import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot } from '@angular/router';
import { Observable } from 'rxjs';
import { User } from '../core/user';
import { CashierReportService } from './cashier-report.service';
@Injectable({
providedIn: 'root',
})
export class ActiveCashiersResolver {
constructor(private ser: CashierReportService) {}
resolve(route: ActivatedRouteSnapshot): Observable<User[]> {
const startDate = route.queryParamMap.get('startDate') ?? null;
const finishDate = route.queryParamMap.get('finishDate') ?? null;
return this.ser.activeCashiers(startDate, finishDate);
}
}

0
bookie/src/app/cashier-report/active-cashiers-resolver.service.spec.ts → bookie/src/app/cashier-report/active-cashiers.resolver.spec.ts
View File

12
bookie/src/app/cashier-report/active-cashiers.resolver.ts Normal file
View File

@ -0,0 +1,12 @@
import { inject } from '@angular/core';
import { ResolveFn } from '@angular/router';
import { User } from '../core/user';
import { CashierReportService } from './cashier-report.service';
export const activeCashiersResolver: ResolveFn<User[]> = (route) => {
const startDate = route.queryParamMap.get('startDate') ?? null;
const finishDate = route.queryParamMap.get('finishDate') ?? null;
return inject(CashierReportService).activeCashiers(startDate, finishDate);
};

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

@ -1,20 +0,0 @@
import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot } from '@angular/router';
import { Observable } from 'rxjs';
import { CashierReport } from './cashier-report';
import { CashierReportService } from './cashier-report.service';
@Injectable({
providedIn: 'root',
})
export class CashierReportResolver {
constructor(private ser: CashierReportService) {}
resolve(route: ActivatedRouteSnapshot): Observable<CashierReport> {
const id = route.paramMap.get('id');
const startDate = route.queryParamMap.get('startDate') ?? null;
const finishDate = route.queryParamMap.get('finishDate') ?? null;
return this.ser.list(id, startDate, finishDate);
}
}

13
bookie/src/app/cashier-report/cashier-report-routing.module.spec.ts
View File

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

45
bookie/src/app/cashier-report/cashier-report-routing.module.ts
View File

@ -1,45 +0,0 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { AuthGuard } from '../auth/auth-guard.service';
import { ActiveCashiersResolver } from './active-cashiers-resolver.service';
import { CashierReportResolver } from './cashier-report-resolver.service';
import { CashierReportComponent } from './cashier-report.component';
const cashierReportRoutes: Routes = [
{
path: '',
component: CashierReportComponent,
canActivate: [AuthGuard],
data: {
permission: 'Cashier Report',
},
resolve: {
info: CashierReportResolver,
cashiers: ActiveCashiersResolver,
},
runGuardsAndResolvers: 'always',
},
{
path: ':id',
component: CashierReportComponent,
canActivate: [AuthGuard],
data: {
permission: 'Cashier Report',
},
resolve: {
info: CashierReportResolver,
cashiers: ActiveCashiersResolver,
},
runGuardsAndResolvers: 'always',
},
];
@NgModule({
imports: [CommonModule, RouterModule.forChild(cashierReportRoutes)],
exports: [RouterModule],
providers: [CashierReportResolver],
})
export class CashierReportRoutingModule {}

8
bookie/src/app/cashier-report/cashier-report.component.html
View File

@ -44,9 +44,11 @@
<mat-label>Cashier</mat-label>
<mat-select formControlName="cashier">
<mat-option>-- Cashier --</mat-option>
<mat-option *ngFor="let ac of activeCashiers" [value]="ac.id">
{{ ac.name }}
</mat-option>
@for (ac of activeCashiers; track ac) {
<mat-option [value]="ac.id">
{{ ac.name }}
</mat-option>
}
</mat-select>
</mat-form-field>
<button mat-raised-button class="flex-auto basis-1/5" color="primary" (click)="show()">Show</button>

2
bookie/src/app/cashier-report/cashier-report.component.spec.ts
View File

@ -8,7 +8,7 @@ describe('CashierReportComponent', () => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [CashierReportComponent],
imports: [CashierReportComponent],
}).compileComponents();
}));

65
bookie/src/app/cashier-report/cashier-report.component.ts
View File

@ -1,7 +1,28 @@
import { CurrencyPipe } from '@angular/common';
import { Component, OnInit } from '@angular/core';
import { FormControl, FormGroup } from '@angular/forms';
import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms';
import { MatIconButton, MatButton } from '@angular/material/button';
import { MatCard, MatCardHeader, MatCardTitleGroup, MatCardTitle, MatCardContent } from '@angular/material/card';
import { MatOption } from '@angular/material/core';
import { MatDatepickerInput, MatDatepickerToggle, MatDatepicker } from '@angular/material/datepicker';
import { MatFormField, MatLabel, MatSuffix } from '@angular/material/form-field';
import { MatIcon } from '@angular/material/icon';
import { MatInput } from '@angular/material/input';
import { MatSelect } from '@angular/material/select';
import {
MatTable,
MatColumnDef,
MatHeaderCellDef,
MatHeaderCell,
MatCellDef,
MatCell,
MatHeaderRowDef,
MatHeaderRow,
MatRowDef,
MatRow,
} from '@angular/material/table';
import { ActivatedRoute, Router } from '@angular/router';
import * as moment from 'moment';
import moment from 'moment';
import { ToasterService } from '../core/toaster.service';
import { User } from '../core/user';
@ -15,6 +36,38 @@ import { CashierReportService } from './cashier-report.service';
selector: 'app-cashier-report',
templateUrl: './cashier-report.component.html',
styleUrls: ['./cashier-report.component.css'],
standalone: true,
imports: [
MatCard,
MatCardHeader,
MatCardTitleGroup,
MatCardTitle,
MatIconButton,
MatIcon,
MatCardContent,
ReactiveFormsModule,
MatFormField,
MatLabel,
MatInput,
MatDatepickerInput,
MatDatepickerToggle,
MatSuffix,
MatDatepicker,
MatSelect,
MatOption,
MatButton,
MatTable,
MatColumnDef,
MatHeaderCellDef,
MatHeaderCell,
MatCellDef,
MatCell,
MatHeaderRowDef,
MatHeaderRow,
MatRowDef,
MatRow,
CurrencyPipe,
],
})
export class CashierReportComponent implements OnInit {
activeCashiers: User[] = [];
@ -73,14 +126,14 @@ export class CashierReportComponent implements OnInit {
}
print() {
this.ser.print(this.info.cashier.id as string, this.info.startDate, this.info.finishDate).subscribe(
() => {
this.ser.print(this.info.cashier.id as string, this.info.startDate, this.info.finishDate).subscribe({
next: () => {
this.toaster.show('', 'Successfully Printed');
},
(error) => {
error: (error) => {
this.toaster.show('Error', error);
},
);
});
}
getInfo(): CashierReport {

13
bookie/src/app/cashier-report/cashier-report.module.spec.ts
View File

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

68
bookie/src/app/cashier-report/cashier-report.module.ts
View File

@ -1,68 +0,0 @@
import { A11yModule } from '@angular/cdk/a11y';
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { ReactiveFormsModule } from '@angular/forms';
import { MatAutocompleteModule } from '@angular/material/autocomplete';
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
import { MatCheckboxModule } from '@angular/material/checkbox';
import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core';
import { MatDatepickerModule } from '@angular/material/datepicker';
import { MatFormFieldModule } from '@angular/material/form-field';
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 { MatSelectModule } from '@angular/material/select';
import { MatSortModule } from '@angular/material/sort';
import { MatTableModule } from '@angular/material/table';
import { MomentDateAdapter } from '@angular/material-moment-adapter';
import { SharedModule } from '../shared/shared.module';
import { CashierReportRoutingModule } from './cashier-report-routing.module';
import { CashierReportComponent } from './cashier-report.component';
export const MY_FORMATS = {
parse: {
dateInput: 'DD-MMM-YYYY',
},
display: {
dateInput: 'DD-MMM-YYYY',
monthYearLabel: 'MMM YYYY',
dateA11yLabel: 'DD-MMM-YYYY',
monthYearA11yLabel: 'MMM YYYY',
},
};
@NgModule({
imports: [
A11yModule,
CommonModule,
CdkTableModule,
MatAutocompleteModule,
MatButtonModule,
MatCardModule,
MatCheckboxModule,
MatDatepickerModule,
MatFormFieldModule,
MatIconModule,
MatInputModule,
MatNativeDateModule,
MatPaginatorModule,
MatProgressSpinnerModule,
MatSelectModule,
MatSortModule,
MatTableModule,
ReactiveFormsModule,
SharedModule,
CashierReportRoutingModule,
],
declarations: [CashierReportComponent],
providers: [
{ provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE] },
{ provide: MAT_DATE_FORMATS, useValue: MY_FORMATS },
],
})
export class CashierReportModule {}

0
bookie/src/app/cashier-report/cashier-report-resolver.service.spec.ts → bookie/src/app/cashier-report/cashier-report.resolver.spec.ts
View File

12
bookie/src/app/cashier-report/cashier-report.resolver.ts Normal file
View File

@ -0,0 +1,12 @@
import { inject } from '@angular/core';
import { ResolveFn } from '@angular/router';
import { CashierReport } from './cashier-report';
import { CashierReportService } from './cashier-report.service';
export const cashierReportResolver: ResolveFn<CashierReport> = (route) => {
const id = route.paramMap.get('id');
const startDate = route.queryParamMap.get('startDate') ?? null;
const finishDate = route.queryParamMap.get('finishDate') ?? null;
return inject(CashierReportService).list(id, startDate, finishDate);
};

36
bookie/src/app/cashier-report/cashier-report.routes.ts Normal file
View File

@ -0,0 +1,36 @@
import { Routes } from '@angular/router';
import { authGuard } from '../auth/auth-guard.service';
import { activeCashiersResolver } from './active-cashiers.resolver';
import { CashierReportComponent } from './cashier-report.component';
import { cashierReportResolver } from './cashier-report.resolver';
export const routes: Routes = [
{
path: '',
component: CashierReportComponent,
canActivate: [authGuard],
data: {
permission: 'Cashier Report',
},
resolve: {
info: cashierReportResolver,
cashiers: activeCashiersResolver,
},
runGuardsAndResolvers: 'always',
},
{
path: ':id',
component: CashierReportComponent,
canActivate: [authGuard],
data: {
permission: 'Cashier Report',
},
resolve: {
info: cashierReportResolver,
cashiers: activeCashiersResolver,
},
runGuardsAndResolvers: 'always',
},
];