From ac868257b74fa22586bd0b690a70088580c3927d Mon Sep 17 00:00:00 2001 From: Amritanshu Date: Fri, 4 Aug 2023 21:00:26 +0530 Subject: [PATCH] Chore: Reformatted everthing Fix: Product ledger was not totalling. This is because for some reason, pydantic was sending the data as string when the field was nullable --- .../account-detail.component.html | 15 +--- .../account-list/account-list.component.ts | 9 +-- .../src/app/account/account-routing.module.ts | 9 +-- .../src/app/account/account-type.service.ts | 6 +- overlord/src/app/app-routing.module.ts | 67 +++++------------ .../attendance/attendance-routing.module.ts | 6 +- .../app/attendance/attendance.component.html | 25 ++----- .../src/app/attendance/attendance.module.ts | 7 +- .../src/app/attendance/attendance.service.ts | 4 +- .../src/app/auth/login/login.component.html | 11 +-- .../balance-sheet/balance-sheet-datasource.ts | 3 +- .../balance-sheet-routing.module.ts | 6 +- .../balance-sheet.component.html | 8 +- .../app/balance-sheet/balance-sheet.module.ts | 7 +- .../batch-integrity-report-routing.module.ts | 3 +- .../batch-integrity-report.component.html | 3 +- .../batch-integrity-report.module.ts | 7 +- .../batch-integrity-report.service.spec.ts | 9 +-- .../batch-integrity-report.service.ts | 4 +- .../batch-integrity-resolver.service.spec.ts | 9 +-- .../app/cash-flow/cash-flow-routing.module.ts | 6 +- .../app/cash-flow/cash-flow.component.html | 12 +-- .../src/app/cash-flow/cash-flow.module.ts | 7 +- .../src/app/cash-flow/cash-flow.service.ts | 6 +- .../client-detail/client-detail.component.ts | 5 +- .../client-list/client-list-datasource.ts | 3 +- .../src/app/client/client-routing.module.ts | 6 +- .../closing-stock/closing-stock-datasource.ts | 3 +- .../closing-stock-routing.module.ts | 6 +- .../closing-stock.component.html | 47 +++--------- .../closing-stock/closing-stock.component.ts | 21 ++---- .../app/closing-stock/closing-stock.module.ts | 7 +- .../closing-stock/closing-stock.service.ts | 8 +- .../app/core/nav-bar/nav-bar.component.html | 10 +-- overlord/src/app/core/voucher.service.ts | 4 +- .../cost-centre-list-datasource.ts | 3 +- .../cost-centre/cost-centre-routing.module.ts | 9 +-- .../app/cost-centre/cost-centre.service.ts | 4 +- .../src/app/daybook/daybook-datasource.ts | 3 +- .../src/app/daybook/daybook-routing.module.ts | 3 +- .../src/app/daybook/daybook.component.html | 12 +-- overlord/src/app/daybook/daybook.component.ts | 10 +-- overlord/src/app/daybook/daybook.module.ts | 7 +- .../employee-attendance-routing.module.ts | 6 +- .../employee-attendance.component.html | 21 ++---- .../employee-attendance.component.ts | 4 +- .../employee-attendance.module.ts | 7 +- .../employee-attendance.service.ts | 14 +--- .../employee-benefits-routing.module.ts | 6 +- .../employee-benefits.component.html | 56 +++----------- .../employee-benefits.component.ts | 21 ++---- .../employee-benefits.module.ts | 7 +- .../employee-functions-routing.module.ts | 3 +- .../employee-functions.component.html | 26 +------ .../employee-functions.component.ts | 8 +- .../employee-functions.module.ts | 7 +- .../employee-functions.service.ts | 4 +- .../employee-detail.component.html | 11 +-- .../employee-detail.component.ts | 12 +-- .../employee-list/employee-list-datasource.ts | 3 +- .../employee-list/employee-list.component.ts | 16 +--- .../app/employee/employee-routing.module.ts | 9 +-- overlord/src/app/employee/employee.service.ts | 4 +- .../app/entries/entries-resolver.service.ts | 23 ++---- .../src/app/entries/entries-routing.module.ts | 3 +- .../src/app/entries/entries.component.html | 20 +---- overlord/src/app/entries/entries.component.ts | 10 +-- overlord/src/app/entries/entries.module.ts | 7 +- .../app/incentive/incentive-routing.module.ts | 6 +- .../app/incentive/incentive.component.html | 35 ++------- .../src/app/incentive/incentive.component.ts | 27 +++---- .../src/app/incentive/incentive.module.ts | 7 +- .../src/app/issue/issue-dialog.component.html | 8 +- .../src/app/issue/issue-dialog.component.ts | 7 +- overlord/src/app/issue/issue-grid.service.ts | 4 +- .../src/app/issue/issue-routing.module.ts | 6 +- overlord/src/app/issue/issue.component.html | 33 ++------- overlord/src/app/issue/issue.component.ts | 10 +-- overlord/src/app/issue/issue.module.ts | 7 +- .../app/journal/journal-dialog.component.html | 12 +-- .../src/app/journal/journal-routing.module.ts | 6 +- .../src/app/journal/journal.component.html | 35 ++------- overlord/src/app/journal/journal.component.ts | 18 +---- overlord/src/app/journal/journal.module.ts | 7 +- overlord/src/app/ledger/ledger-datasource.ts | 3 +- .../src/app/ledger/ledger-routing.module.ts | 6 +- overlord/src/app/ledger/ledger.component.html | 32 ++------ overlord/src/app/ledger/ledger.module.ts | 7 +- .../net-transactions-datasource.ts | 3 +- .../net-transactions-routing.module.ts | 3 +- .../net-transactions.component.html | 12 +-- .../net-transactions.module.ts | 7 +- .../non-contract-purchase-routing.module.ts | 3 +- .../non-contract-purchase.component.html | 8 +- .../non-contract-purchase.service.spec.ts | 9 +-- .../non-contract-purchase.service.ts | 4 +- .../app/payment/payment-dialog.component.html | 12 +-- .../src/app/payment/payment-routing.module.ts | 6 +- .../src/app/payment/payment.component.html | 35 ++------- overlord/src/app/payment/payment.component.ts | 14 +--- overlord/src/app/payment/payment.module.ts | 7 +- .../period-detail.component.html | 18 +---- .../src/app/period/period-routing.module.ts | 9 +-- ...roduct-group-list-resolver.service.spec.ts | 9 +-- .../product-group-list-datasource.ts | 3 +- .../product-group-routing.module.ts | 9 +-- .../product-group/product-group.service.ts | 4 +- .../product-ledger-datasource.ts | 11 ++- .../app/product-ledger/product-ledger-item.ts | 16 ++-- .../product-ledger-routing.module.ts | 6 +- .../product-ledger.component.html | 62 +++++----------- .../product-ledger.component.ts | 14 ++-- .../product-ledger/product-ledger.module.ts | 7 +- .../product-ledger/product-ledger.service.ts | 6 +- .../product-detail-dialog.component.html | 8 +- .../product-detail.component.html | 16 +--- .../product-list/product-list-datasource.ts | 15 ++-- .../product-list/product-list.component.html | 3 +- .../product-list/product-list.component.ts | 5 +- .../src/app/product/product-routing.module.ts | 9 +-- overlord/src/app/product/product.service.ts | 8 +- .../app/profit-loss/profit-loss-datasource.ts | 3 +- .../profit-loss/profit-loss-routing.module.ts | 3 +- .../profit-loss/profit-loss.component.html | 4 +- .../src/app/profit-loss/profit-loss.module.ts | 7 +- .../purchase-entries-datasource.ts | 3 +- .../purchase-entries-routing.module.ts | 3 +- .../purchase-entries.component.html | 12 +-- .../purchase-entries.component.ts | 11 +-- .../purchase-entries.module.ts | 7 +- .../purchase-return-dialog.component.html | 8 +- .../purchase-return-dialog.component.ts | 7 +- .../purchase-return-routing.module.ts | 6 +- .../purchase-return.component.html | 47 +++--------- .../purchase-return.component.ts | 5 +- .../purchase-return/purchase-return.module.ts | 7 +- .../purchase/purchase-dialog.component.html | 8 +- .../app/purchase/purchase-routing.module.ts | 6 +- .../src/app/purchase/purchase.component.html | 47 +++--------- .../src/app/purchase/purchase.component.ts | 13 +--- overlord/src/app/purchase/purchase.module.ts | 7 +- .../src/app/purchases/purchases-datasource.ts | 3 +- .../app/purchases/purchases-routing.module.ts | 3 +- .../app/purchases/purchases.component.html | 16 ++-- .../src/app/purchases/purchases.module.ts | 7 +- .../rate-contract-detail.component.html | 39 ++-------- ...ate-contract-list-resolver.service.spec.ts | 9 +-- .../rate-contract-list-datasource.ts | 3 +- .../rate-contract-list.component.html | 8 +- .../rate-contract-routing.module.ts | 9 +-- .../rate-contract/rate-contract.service.ts | 4 +- .../raw-material-cost-datasource.ts | 3 +- .../raw-material-cost-routing.module.ts | 6 +- .../raw-material-cost.component.html | 20 ++--- .../raw-material-cost.module.ts | 7 +- .../raw-material-cost.service.ts | 6 +- .../app/receipt/receipt-dialog.component.html | 12 +-- .../src/app/receipt/receipt-routing.module.ts | 6 +- .../src/app/receipt/receipt.component.html | 35 ++------- overlord/src/app/receipt/receipt.component.ts | 14 +--- overlord/src/app/receipt/receipt.module.ts | 7 +- ...ipe-template-list-resolver.service.spec.ts | 9 +-- .../recipe-template-list-datasource.ts | 3 +- .../recipe-template-routing.module.ts | 9 +-- .../recipe-template/recipe-template.module.ts | 7 +- .../recipe-template.service.ts | 4 +- .../recipe-detail.component.html | 13 +--- .../recipe-detail/recipe-detail.component.ts | 8 +- .../recipe-list/recipe-list.component.html | 17 +---- .../recipe-list/recipe-list.component.ts | 11 +-- .../src/app/recipe/recipe-routing.module.ts | 9 +-- .../role/role-list/role-list-datasource.ts | 3 +- overlord/src/app/role/role-routing.module.ts | 9 +-- .../app/settings/settings-routing.module.ts | 3 +- .../src/app/settings/settings.component.html | 74 ++++--------------- overlord/src/app/settings/settings.module.ts | 7 +- overlord/src/app/settings/settings.service.ts | 16 +--- .../src/app/settings/voucher-type.service.ts | 6 +- .../confirm-dialog.component.html | 4 +- overlord/src/app/shared/image.service.ts | 4 +- overlord/src/app/shared/shared.module.ts | 8 +- overlord/src/app/shared/to-csv.service.ts | 4 +- .../stock-movement-datasource.ts | 3 +- .../stock-movement-routing.module.ts | 3 +- .../stock-movement.component.html | 13 +--- .../stock-movement/stock-movement.module.ts | 7 +- .../trial-balance/trial-balance-datasource.ts | 3 +- .../trial-balance-routing.module.ts | 6 +- .../trial-balance.component.html | 8 +- .../app/trial-balance/trial-balance.module.ts | 7 +- .../user-detail/user-detail.component.html | 4 +- .../user/user-list/user-list-datasource.ts | 3 +- .../user/user-list/user-list.component.html | 3 +- overlord/src/app/user/user-routing.module.ts | 9 +-- 194 files changed, 513 insertions(+), 1580 deletions(-) diff --git a/overlord/src/app/account/account-detail/account-detail.component.html b/overlord/src/app/account/account-detail/account-detail.component.html index 0405ce93..6a81203b 100644 --- a/overlord/src/app/account/account-detail/account-detail.component.html +++ b/overlord/src/app/account/account-detail/account-detail.component.html @@ -2,12 +2,7 @@ Account - + {{ item.isStarred ? 'star' : 'star_border' }} @@ -38,9 +33,7 @@
Is Active? - Is Reconcilable? + Is Reconcilable?
@@ -56,8 +49,6 @@ - + diff --git a/overlord/src/app/account/account-list/account-list.component.ts b/overlord/src/app/account/account-list/account-list.component.ts index 16701eff..8077675f 100644 --- a/overlord/src/app/account/account-list/account-list.component.ts +++ b/overlord/src/app/account/account-list/account-list.component.ts @@ -37,10 +37,7 @@ export class AccountListComponent implements OnInit, AfterViewInit { filter: new FormControl('', { nonNullable: true }), }); // Listen to Filter Change - this.filter = this.form.controls.filter.valueChanges.pipe( - debounceTime(150), - distinctUntilChanged(), - ); + this.filter = this.form.controls.filter.valueChanges.pipe(debounceTime(150), distinctUntilChanged()); this.dataSource = new AccountListDataSource(this.list, this.filter); } @@ -49,9 +46,7 @@ export class AccountListComponent implements OnInit, AfterViewInit { this.route.data.subscribe((value) => { const data = value as { list: Account[]; accountTypes: AccountType[] }; this.accountTypes = data.accountTypes; - data.list.forEach( - (x) => (x.typeName = this.accountTypes.find((y) => y.id === x.type)?.name ?? ''), - ); + data.list.forEach((x) => (x.typeName = this.accountTypes.find((y) => y.id === x.type)?.name ?? '')); this.list = data.list; }); this.dataSource = new AccountListDataSource(this.list, this.filter, this.paginator, this.sort); diff --git a/overlord/src/app/account/account-routing.module.ts b/overlord/src/app/account/account-routing.module.ts index bc36711f..71749d6d 100644 --- a/overlord/src/app/account/account-routing.module.ts +++ b/overlord/src/app/account/account-routing.module.ts @@ -16,8 +16,7 @@ const accountRoutes: Routes = [ path: '', component: AccountListComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Accounts', @@ -31,8 +30,7 @@ const accountRoutes: Routes = [ path: 'new', component: AccountDetailComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Accounts', @@ -47,8 +45,7 @@ const accountRoutes: Routes = [ path: ':id', component: AccountDetailComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Accounts', diff --git a/overlord/src/app/account/account-type.service.ts b/overlord/src/app/account/account-type.service.ts index f55e219b..18db7360 100644 --- a/overlord/src/app/account/account-type.service.ts +++ b/overlord/src/app/account/account-type.service.ts @@ -19,8 +19,8 @@ export class AccountTypeService { ) {} list(): Observable { - return this.http - .get(url) - .pipe(catchError(this.log.handleError(serviceName, 'list'))) as Observable; + return this.http.get(url).pipe(catchError(this.log.handleError(serviceName, 'list'))) as Observable< + AccountType[] + >; } } diff --git a/overlord/src/app/app-routing.module.ts b/overlord/src/app/app-routing.module.ts index ba05bbab..e4cda8e9 100644 --- a/overlord/src/app/app-routing.module.ts +++ b/overlord/src/app/app-routing.module.ts @@ -13,20 +13,16 @@ const appRoutes: Routes = [ }, { path: 'attendance', - loadChildren: () => - import('./attendance/attendance.module').then((mod) => mod.AttendanceModule), + loadChildren: () => import('./attendance/attendance.module').then((mod) => mod.AttendanceModule), }, { path: 'balance-sheet', - loadChildren: () => - import('./balance-sheet/balance-sheet.module').then((mod) => mod.BalanceSheetModule), + loadChildren: () => import('./balance-sheet/balance-sheet.module').then((mod) => mod.BalanceSheetModule), }, { path: 'batch-integrity-report', loadChildren: () => - import('./batch-integrity-report/batch-integrity-report.module').then( - (mod) => mod.BatchIntegrityReportModule, - ), + import('./batch-integrity-report/batch-integrity-report.module').then((mod) => mod.BatchIntegrityReportModule), }, { path: 'cash-flow', @@ -38,13 +34,11 @@ const appRoutes: Routes = [ }, { path: 'closing-stock', - loadChildren: () => - import('./closing-stock/closing-stock.module').then((mod) => mod.ClosingStockModule), + loadChildren: () => import('./closing-stock/closing-stock.module').then((mod) => mod.ClosingStockModule), }, { path: 'cost-centres', - loadChildren: () => - import('./cost-centre/cost-centre.module').then((mod) => mod.CostCentreModule), + loadChildren: () => import('./cost-centre/cost-centre.module').then((mod) => mod.CostCentreModule), }, { path: 'daybook', @@ -57,28 +51,21 @@ const appRoutes: Routes = [ { path: 'employee-attendance', loadChildren: () => - import('./employee-attendance/employee-attendance.module').then( - (mod) => mod.EmployeeAttendanceModule, - ), + import('./employee-attendance/employee-attendance.module').then((mod) => mod.EmployeeAttendanceModule), }, { path: 'employee-benefits', loadChildren: () => - import('./employee-benefits/employee-benefits.module').then( - (mod) => mod.EmployeeBenefitsModule, - ), + import('./employee-benefits/employee-benefits.module').then((mod) => mod.EmployeeBenefitsModule), }, { path: 'employee-functions', loadChildren: () => - import('./employee-functions/employee-functions.module').then( - (mod) => mod.EmployeeFunctionsModule, - ), + import('./employee-functions/employee-functions.module').then((mod) => mod.EmployeeFunctionsModule), }, { path: 'rate-contracts', - loadChildren: () => - import('./rate-contract/rate-contract.module').then((mod) => mod.RateContractModule), + loadChildren: () => import('./rate-contract/rate-contract.module').then((mod) => mod.RateContractModule), }, { path: 'recipes', @@ -86,8 +73,7 @@ const appRoutes: Routes = [ }, { path: 'recipe-templates', - loadChildren: () => - import('./recipe-template/recipe-template.module').then((mod) => mod.RecipeTemplateModule), + loadChildren: () => import('./recipe-template/recipe-template.module').then((mod) => mod.RecipeTemplateModule), }, { path: 'roles', @@ -111,15 +97,12 @@ const appRoutes: Routes = [ }, { path: 'net-transactions', - loadChildren: () => - import('./net-transactions/net-transactions.module').then((mod) => mod.NetTransactionsModule), + loadChildren: () => import('./net-transactions/net-transactions.module').then((mod) => mod.NetTransactionsModule), }, { path: 'non-contract-purchase', loadChildren: () => - import('./non-contact-purchase/non-contract-purchase.module').then( - (mod) => mod.NonContractPurchaseModule, - ), + import('./non-contact-purchase/non-contract-purchase.module').then((mod) => mod.NonContractPurchaseModule), }, { path: 'payment', @@ -135,18 +118,15 @@ const appRoutes: Routes = [ }, { path: 'product-groups', - loadChildren: () => - import('./product-group/product-group.module').then((mod) => mod.ProductGroupModule), + loadChildren: () => import('./product-group/product-group.module').then((mod) => mod.ProductGroupModule), }, { path: 'product-ledger', - loadChildren: () => - import('./product-ledger/product-ledger.module').then((mod) => mod.ProductLedgerModule), + loadChildren: () => import('./product-ledger/product-ledger.module').then((mod) => mod.ProductLedgerModule), }, { path: 'profit-loss', - loadChildren: () => - import('./profit-loss/profit-loss.module').then((mod) => mod.ProfitLossModule), + loadChildren: () => import('./profit-loss/profit-loss.module').then((mod) => mod.ProfitLossModule), }, { path: 'purchase', @@ -154,8 +134,7 @@ const appRoutes: Routes = [ }, { path: 'purchase-entries', - loadChildren: () => - import('./purchase-entries/purchase-entries.module').then((mod) => mod.PurchaseEntriesModule), + loadChildren: () => import('./purchase-entries/purchase-entries.module').then((mod) => mod.PurchaseEntriesModule), }, { path: 'purchases', @@ -163,10 +142,7 @@ const appRoutes: Routes = [ }, { path: 'raw-material-cost', - loadChildren: () => - import('./raw-material-cost/raw-material-cost.module').then( - (mod) => mod.RawMaterialCostModule, - ), + loadChildren: () => import('./raw-material-cost/raw-material-cost.module').then((mod) => mod.RawMaterialCostModule), }, { path: 'receipt', @@ -174,8 +150,7 @@ const appRoutes: Routes = [ }, { path: 'purchase-return', - loadChildren: () => - import('./purchase-return/purchase-return.module').then((mod) => mod.PurchaseReturnModule), + loadChildren: () => import('./purchase-return/purchase-return.module').then((mod) => mod.PurchaseReturnModule), }, { path: 'settings', @@ -183,13 +158,11 @@ const appRoutes: Routes = [ }, { path: 'stock-movement', - loadChildren: () => - import('./stock-movement/stock-movement.module').then((mod) => mod.StockMovementModule), + loadChildren: () => import('./stock-movement/stock-movement.module').then((mod) => mod.StockMovementModule), }, { path: 'trial-balance', - loadChildren: () => - import('./trial-balance/trial-balance.module').then((mod) => mod.TrialBalanceModule), + loadChildren: () => import('./trial-balance/trial-balance.module').then((mod) => mod.TrialBalanceModule), }, { path: 'entries', diff --git a/overlord/src/app/attendance/attendance-routing.module.ts b/overlord/src/app/attendance/attendance-routing.module.ts index 94f58be9..5e0fff3e 100644 --- a/overlord/src/app/attendance/attendance-routing.module.ts +++ b/overlord/src/app/attendance/attendance-routing.module.ts @@ -13,8 +13,7 @@ const attendanceRoutes: Routes = [ path: '', component: AttendanceComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Attendance', @@ -29,8 +28,7 @@ const attendanceRoutes: Routes = [ path: ':date', component: AttendanceComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Attendance', diff --git a/overlord/src/app/attendance/attendance.component.html b/overlord/src/app/attendance/attendance.component.html index e5845458..6e1c1fd5 100644 --- a/overlord/src/app/attendance/attendance.component.html +++ b/overlord/src/app/attendance/attendance.component.html @@ -7,19 +7,11 @@
Date - + - +
@@ -63,9 +55,7 @@ Prints {{ row.prints }} - new_releases @@ -83,16 +73,11 @@ - + - + diff --git a/overlord/src/app/attendance/attendance.module.ts b/overlord/src/app/attendance/attendance.module.ts index 41c91b65..4066e626 100644 --- a/overlord/src/app/attendance/attendance.module.ts +++ b/overlord/src/app/attendance/attendance.module.ts @@ -8,12 +8,7 @@ import { MatButtonModule } from '@angular/material/button'; import { MatCardModule } from '@angular/material/card'; import { MatCheckboxModule } from '@angular/material/checkbox'; import { MatChipsModule } from '@angular/material/chips'; -import { - DateAdapter, - MAT_DATE_FORMATS, - MAT_DATE_LOCALE, - MatNativeDateModule, -} from '@angular/material/core'; +import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; diff --git a/overlord/src/app/attendance/attendance.service.ts b/overlord/src/app/attendance/attendance.service.ts index d7112b3f..677d0640 100644 --- a/overlord/src/app/attendance/attendance.service.ts +++ b/overlord/src/app/attendance/attendance.service.ts @@ -21,9 +21,7 @@ export class AttendanceService { const getUrl: string = date === null ? url : `${url}/${date}`; return this.http .get(getUrl) - .pipe( - catchError(this.log.handleError(serviceName, `get date=${date}`)), - ) as Observable; + .pipe(catchError(this.log.handleError(serviceName, `get date=${date}`))) as Observable; } save(attendance: Attendance): Observable { diff --git a/overlord/src/app/auth/login/login.component.html b/overlord/src/app/auth/login/login.component.html index 214e1427..533beb85 100644 --- a/overlord/src/app/auth/login/login.component.html +++ b/overlord/src/app/auth/login/login.component.html @@ -13,15 +13,8 @@
Password - - {{ - hide ? 'visibility' : 'visibility_off' - }} + + {{ hide ? 'visibility' : 'visibility_off' }}
diff --git a/overlord/src/app/balance-sheet/balance-sheet-datasource.ts b/overlord/src/app/balance-sheet/balance-sheet-datasource.ts index 20209714..4b27ed79 100644 --- a/overlord/src/app/balance-sheet/balance-sheet-datasource.ts +++ b/overlord/src/app/balance-sheet/balance-sheet-datasource.ts @@ -8,8 +8,7 @@ import { map } from 'rxjs/operators'; import { BalanceSheetItem } from './balance-sheet-item'; /** Simple sort comparator for example ID/Name columns (for client-side sorting). */ -const compare = (a: string | number, b: string | number, isAsc: boolean) => - (a < b ? -1 : 1) * (isAsc ? 1 : -1); +const compare = (a: string | number, b: string | number, isAsc: boolean) => (a < b ? -1 : 1) * (isAsc ? 1 : -1); export class BalanceSheetDataSource extends DataSource { constructor( public data: BalanceSheetItem[], diff --git a/overlord/src/app/balance-sheet/balance-sheet-routing.module.ts b/overlord/src/app/balance-sheet/balance-sheet-routing.module.ts index 8c29140b..c78d55ca 100644 --- a/overlord/src/app/balance-sheet/balance-sheet-routing.module.ts +++ b/overlord/src/app/balance-sheet/balance-sheet-routing.module.ts @@ -12,8 +12,7 @@ const balanceSheetRoutes: Routes = [ path: '', component: BalanceSheetComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Balance Sheet', @@ -27,8 +26,7 @@ const balanceSheetRoutes: Routes = [ path: ':date', component: BalanceSheetComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Balance Sheet', diff --git a/overlord/src/app/balance-sheet/balance-sheet.component.html b/overlord/src/app/balance-sheet/balance-sheet.component.html index 5717ca63..ee412e37 100644 --- a/overlord/src/app/balance-sheet/balance-sheet.component.html +++ b/overlord/src/app/balance-sheet/balance-sheet.component.html @@ -38,9 +38,7 @@ Amount - {{ - row.subAmount | currency: 'INR' | clear - }} + {{ row.subAmount | currency: 'INR' | clear }} {{ info.footer?.subAmount | currency: 'INR' | clear }} @@ -49,9 +47,7 @@ Total - {{ - row.amount | currency: 'INR' | clear - }} + {{ row.amount | currency: 'INR' | clear }} {{ info.footer?.amount | currency: 'INR' | clear }} diff --git a/overlord/src/app/balance-sheet/balance-sheet.module.ts b/overlord/src/app/balance-sheet/balance-sheet.module.ts index aff406ad..34317b42 100644 --- a/overlord/src/app/balance-sheet/balance-sheet.module.ts +++ b/overlord/src/app/balance-sheet/balance-sheet.module.ts @@ -5,12 +5,7 @@ import { ReactiveFormsModule } from '@angular/forms'; 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 { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; diff --git a/overlord/src/app/batch-integrity-report/batch-integrity-report-routing.module.ts b/overlord/src/app/batch-integrity-report/batch-integrity-report-routing.module.ts index fa3a2af5..ad816449 100644 --- a/overlord/src/app/batch-integrity-report/batch-integrity-report-routing.module.ts +++ b/overlord/src/app/batch-integrity-report/batch-integrity-report-routing.module.ts @@ -12,8 +12,7 @@ const batchIntegrityRoutes: Routes = [ path: '', component: BatchIntegrityReportComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Product Ledger', diff --git a/overlord/src/app/batch-integrity-report/batch-integrity-report.component.html b/overlord/src/app/batch-integrity-report/batch-integrity-report.component.html index 4a74afac..e7b2d18a 100644 --- a/overlord/src/app/batch-integrity-report/batch-integrity-report.component.html +++ b/overlord/src/app/batch-integrity-report/batch-integrity-report.component.html @@ -19,8 +19,7 @@
  • - {{ detail.type }} on {{ detail.date }} of - {{ detail.quantity }} @ + {{ detail.type }} on {{ detail.date }} of {{ detail.quantity }} @ {{ detail.price | currency: 'INR' }}
diff --git a/overlord/src/app/batch-integrity-report/batch-integrity-report.module.ts b/overlord/src/app/batch-integrity-report/batch-integrity-report.module.ts index 17df11b8..c7694f0a 100644 --- a/overlord/src/app/batch-integrity-report/batch-integrity-report.module.ts +++ b/overlord/src/app/batch-integrity-report/batch-integrity-report.module.ts @@ -6,12 +6,7 @@ import { ReactiveFormsModule } from '@angular/forms'; 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 { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatExpansionModule } from '@angular/material/expansion'; import { MatIconModule } from '@angular/material/icon'; diff --git a/overlord/src/app/batch-integrity-report/batch-integrity-report.service.spec.ts b/overlord/src/app/batch-integrity-report/batch-integrity-report.service.spec.ts index cf349ccc..f2347459 100644 --- a/overlord/src/app/batch-integrity-report/batch-integrity-report.service.spec.ts +++ b/overlord/src/app/batch-integrity-report/batch-integrity-report.service.spec.ts @@ -11,10 +11,7 @@ describe('BatchIntegrityService', () => { }); }); - it('should be created', inject( - [BatchIntegrityReportService], - (service: BatchIntegrityReportService) => { - expect(service).toBeTruthy(); - }, - )); + it('should be created', inject([BatchIntegrityReportService], (service: BatchIntegrityReportService) => { + expect(service).toBeTruthy(); + })); }); diff --git a/overlord/src/app/batch-integrity-report/batch-integrity-report.service.ts b/overlord/src/app/batch-integrity-report/batch-integrity-report.service.ts index c043fecf..0e08c7e5 100644 --- a/overlord/src/app/batch-integrity-report/batch-integrity-report.service.ts +++ b/overlord/src/app/batch-integrity-report/batch-integrity-report.service.ts @@ -22,8 +22,6 @@ export class BatchIntegrityReportService { const url = '/api/batch-integrity'; return this.http .post(url, {}) - .pipe(catchError(this.log.handleError(serviceName, 'batchIntegrity'))) as Observable< - BatchIntegrity[] - >; + .pipe(catchError(this.log.handleError(serviceName, 'batchIntegrity'))) as Observable; } } diff --git a/overlord/src/app/batch-integrity-report/batch-integrity-resolver.service.spec.ts b/overlord/src/app/batch-integrity-report/batch-integrity-resolver.service.spec.ts index bb655037..fee58b7e 100644 --- a/overlord/src/app/batch-integrity-report/batch-integrity-resolver.service.spec.ts +++ b/overlord/src/app/batch-integrity-report/batch-integrity-resolver.service.spec.ts @@ -11,10 +11,7 @@ describe('BatchIntegrityResolverService', () => { }); }); - it('should be created', inject( - [BatchIntegrityResolverService], - (service: BatchIntegrityResolverService) => { - expect(service).toBeTruthy(); - }, - )); + it('should be created', inject([BatchIntegrityResolverService], (service: BatchIntegrityResolverService) => { + expect(service).toBeTruthy(); + })); }); diff --git a/overlord/src/app/cash-flow/cash-flow-routing.module.ts b/overlord/src/app/cash-flow/cash-flow-routing.module.ts index d3dd24b2..21e7d116 100644 --- a/overlord/src/app/cash-flow/cash-flow-routing.module.ts +++ b/overlord/src/app/cash-flow/cash-flow-routing.module.ts @@ -12,8 +12,7 @@ const cashFlowRoutes: Routes = [ path: '', component: CashFlowComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Cash Flow', @@ -27,8 +26,7 @@ const cashFlowRoutes: Routes = [ path: ':id', component: CashFlowComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Cash Flow', diff --git a/overlord/src/app/cash-flow/cash-flow.component.html b/overlord/src/app/cash-flow/cash-flow.component.html index 62af6023..20b6a9a8 100644 --- a/overlord/src/app/cash-flow/cash-flow.component.html +++ b/overlord/src/app/cash-flow/cash-flow.component.html @@ -29,9 +29,7 @@ - +
@@ -39,9 +37,7 @@ Name {{ row.name }} @@ -50,9 +46,7 @@ Amount - {{ - row.amount | currency: 'INR' | clear - }} + {{ row.amount | currency: 'INR' | clear }} diff --git a/overlord/src/app/cash-flow/cash-flow.module.ts b/overlord/src/app/cash-flow/cash-flow.module.ts index c5049b09..60d4d0f1 100644 --- a/overlord/src/app/cash-flow/cash-flow.module.ts +++ b/overlord/src/app/cash-flow/cash-flow.module.ts @@ -5,12 +5,7 @@ import { ReactiveFormsModule } from '@angular/forms'; 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 { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; diff --git a/overlord/src/app/cash-flow/cash-flow.service.ts b/overlord/src/app/cash-flow/cash-flow.service.ts index 65ffda64..e945e792 100644 --- a/overlord/src/app/cash-flow/cash-flow.service.ts +++ b/overlord/src/app/cash-flow/cash-flow.service.ts @@ -19,11 +19,7 @@ export class CashFlowService { private log: ErrorLoggerService, ) {} - list( - id: string | null, - startDate: string | null, - finishDate: string | null, - ): Observable { + list(id: string | null, startDate: string | null, finishDate: string | null): Observable { const options = { params: new HttpParams() }; if (startDate !== null) { options.params = options.params.set('s', startDate); diff --git a/overlord/src/app/client/client-detail/client-detail.component.ts b/overlord/src/app/client/client-detail/client-detail.component.ts index ec310a8c..9d1a2313 100644 --- a/overlord/src/app/client/client-detail/client-detail.component.ts +++ b/overlord/src/app/client/client-detail/client-detail.component.ts @@ -32,10 +32,7 @@ export class ClientDetailComponent implements OnInit, AfterViewInit { private ser: ClientService, ) { this.form = new FormGroup({ - code: new FormControl( - { value: '(Auto)', disabled: true }, - { nonNullable: true }, - ), + code: new FormControl({ value: '(Auto)', disabled: true }, { nonNullable: true }), name: new FormControl(null), enabled: new FormControl(false, { nonNullable: true }), otp: new FormControl(null), diff --git a/overlord/src/app/client/client-list/client-list-datasource.ts b/overlord/src/app/client/client-list/client-list-datasource.ts index ed33c810..92702ead 100644 --- a/overlord/src/app/client/client-list/client-list-datasource.ts +++ b/overlord/src/app/client/client-list/client-list-datasource.ts @@ -8,8 +8,7 @@ import { map } from 'rxjs/operators'; import { Client } from '../client'; /** Simple sort comparator for example ID/Name columns (for client-side sorting). */ -const compare = (a: string | number, b: string | number, isAsc: boolean) => - (a < b ? -1 : 1) * (isAsc ? 1 : -1); +const compare = (a: string | number, b: string | number, isAsc: boolean) => (a < b ? -1 : 1) * (isAsc ? 1 : -1); export class ClientListDataSource extends DataSource { constructor( public data: Client[], diff --git a/overlord/src/app/client/client-routing.module.ts b/overlord/src/app/client/client-routing.module.ts index b91fd00d..af24a351 100644 --- a/overlord/src/app/client/client-routing.module.ts +++ b/overlord/src/app/client/client-routing.module.ts @@ -14,8 +14,7 @@ const clientRoutes: Routes = [ path: '', component: ClientListComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Cost Centres', @@ -28,8 +27,7 @@ const clientRoutes: Routes = [ path: ':id', component: ClientDetailComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Cost Centres', diff --git a/overlord/src/app/closing-stock/closing-stock-datasource.ts b/overlord/src/app/closing-stock/closing-stock-datasource.ts index aa81605f..79bc83da 100644 --- a/overlord/src/app/closing-stock/closing-stock-datasource.ts +++ b/overlord/src/app/closing-stock/closing-stock-datasource.ts @@ -8,8 +8,7 @@ import { map } from 'rxjs/operators'; import { ClosingStockItem } from './closing-stock-item'; /** Simple sort comparator for example ID/Name columns (for client-side sorting). */ -const compare = (a: string | number, b: string | number, isAsc: boolean) => - (a < b ? -1 : 1) * (isAsc ? 1 : -1); +const compare = (a: string | number, b: string | number, isAsc: boolean) => (a < b ? -1 : 1) * (isAsc ? 1 : -1); export class ClosingStockDataSource extends DataSource { constructor( public data: ClosingStockItem[], diff --git a/overlord/src/app/closing-stock/closing-stock-routing.module.ts b/overlord/src/app/closing-stock/closing-stock-routing.module.ts index 1659598b..0772437b 100644 --- a/overlord/src/app/closing-stock/closing-stock-routing.module.ts +++ b/overlord/src/app/closing-stock/closing-stock-routing.module.ts @@ -13,8 +13,7 @@ const closingStockRoutes: Routes = [ path: '', component: ClosingStockComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Closing Stock', @@ -29,8 +28,7 @@ const closingStockRoutes: Routes = [ path: ':date', component: ClosingStockComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Closing Stock', diff --git a/overlord/src/app/closing-stock/closing-stock.component.html b/overlord/src/app/closing-stock/closing-stock.component.html index 2aeb1b75..9bc0fcf0 100644 --- a/overlord/src/app/closing-stock/closing-stock.component.html +++ b/overlord/src/app/closing-stock/closing-stock.component.html @@ -30,17 +30,9 @@ - + - + Product @@ -55,12 +47,8 @@ - Closing Stock - {{ - row.quantity | number: '0.2-2' - }} + Closing Stock + {{ row.quantity | number: '0.2-2' }} @@ -69,12 +57,7 @@ Physical - + @@ -108,12 +91,8 @@ - Amount - {{ - row.amount | currency: 'INR' - }} + Amount + {{ row.amount | currency: 'INR' }} @@ -131,9 +110,7 @@ - + - diff --git a/overlord/src/app/closing-stock/closing-stock.component.ts b/overlord/src/app/closing-stock/closing-stock.component.ts index d7412188..82fb935d 100644 --- a/overlord/src/app/closing-stock/closing-stock.component.ts +++ b/overlord/src/app/closing-stock/closing-stock.component.ts @@ -41,15 +41,7 @@ export class ClosingStockComponent implements OnInit { }>; /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */ - displayedColumns = [ - 'product', - 'group', - 'quantity', - 'physical', - 'variance', - 'department', - 'amount', - ]; + displayedColumns = ['product', 'group', 'quantity', 'physical', 'variance', 'department', 'amount']; costCentres: CostCentre[]; @@ -66,9 +58,9 @@ export class ClosingStockComponent implements OnInit { this.form = new FormGroup({ date: new FormControl(new Date(), { nonNullable: true }), costCentre: new FormControl(null), - stocks: new FormArray< - FormGroup<{ physical: FormControl; costCentre: FormControl }> - >([]), + stocks: new FormArray; costCentre: FormControl }>>( + [], + ), }); } @@ -181,10 +173,7 @@ export class ClosingStockComponent implements OnInit { if (this.info.posted && this.auth.allowed('edit-posted-vouchers')) { return true; } - return ( - this.info.user.id === (this.auth.user as User).id || - this.auth.allowed("edit-other-user's-vouchers") - ); + return this.info.user.id === (this.auth.user as User).id || this.auth.allowed("edit-other-user's-vouchers"); } post() { diff --git a/overlord/src/app/closing-stock/closing-stock.module.ts b/overlord/src/app/closing-stock/closing-stock.module.ts index 81d8a83a..d22ad7d3 100644 --- a/overlord/src/app/closing-stock/closing-stock.module.ts +++ b/overlord/src/app/closing-stock/closing-stock.module.ts @@ -6,12 +6,7 @@ import { ReactiveFormsModule } from '@angular/forms'; 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 { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; diff --git a/overlord/src/app/closing-stock/closing-stock.service.ts b/overlord/src/app/closing-stock/closing-stock.service.ts index 9ec95332..f326ee6d 100644 --- a/overlord/src/app/closing-stock/closing-stock.service.ts +++ b/overlord/src/app/closing-stock/closing-stock.service.ts @@ -40,17 +40,13 @@ export class ClosingStockService { const options = { params: new HttpParams().set('d', costCentre) }; return this.http .post(`${url}/${date}`, {}, options) - .pipe( - catchError(this.log.handleError(serviceName, 'Post Voucher')), - ) as Observable; + .pipe(catchError(this.log.handleError(serviceName, 'Post Voucher'))) as Observable; } delete(date: string, costCentre: string): Observable { const options = { params: new HttpParams().set('d', costCentre) }; return this.http .delete(`${url}/${date}`, options) - .pipe( - catchError(this.log.handleError(serviceName, 'Delete Voucher')), - ) as Observable; + .pipe(catchError(this.log.handleError(serviceName, 'Delete Voucher'))) as Observable; } } diff --git a/overlord/src/app/core/nav-bar/nav-bar.component.html b/overlord/src/app/core/nav-bar/nav-bar.component.html index 7ec899a6..b6cdce0f 100644 --- a/overlord/src/app/core/nav-bar/nav-bar.component.html +++ b/overlord/src/app/core/nav-bar/nav-bar.component.html @@ -19,9 +19,7 @@ Profit and Loss Balance Sheet Net Transactions - All Entries + All Entries @@ -69,11 +67,7 @@ Clients Settings - diff --git a/overlord/src/app/core/voucher.service.ts b/overlord/src/app/core/voucher.service.ts index 83ee2175..6da3331a 100644 --- a/overlord/src/app/core/voucher.service.ts +++ b/overlord/src/app/core/voucher.service.ts @@ -48,9 +48,7 @@ export class VoucherService { } return this.http .get(`${url}/${endpoint}`, options) - .pipe( - catchError(this.log.handleError(serviceName, 'Get Voucher of Type')), - ) as Observable; + .pipe(catchError(this.log.handleError(serviceName, 'Get Voucher of Type'))) as Observable; } getIncentive(date: string): Observable { diff --git a/overlord/src/app/cost-centre/cost-centre-list/cost-centre-list-datasource.ts b/overlord/src/app/cost-centre/cost-centre-list/cost-centre-list-datasource.ts index 2dac725d..6ece1a9c 100644 --- a/overlord/src/app/cost-centre/cost-centre-list/cost-centre-list-datasource.ts +++ b/overlord/src/app/cost-centre/cost-centre-list/cost-centre-list-datasource.ts @@ -8,8 +8,7 @@ import { map } from 'rxjs/operators'; import { CostCentre } from '../../core/cost-centre'; /** Simple sort comparator for example ID/Name columns (for client-side sorting). */ -const compare = (a: string | number, b: string | number, isAsc: boolean) => - (a < b ? -1 : 1) * (isAsc ? 1 : -1); +const compare = (a: string | number, b: string | number, isAsc: boolean) => (a < b ? -1 : 1) * (isAsc ? 1 : -1); export class CostCentreListDataSource extends DataSource { constructor( public data: CostCentre[], diff --git a/overlord/src/app/cost-centre/cost-centre-routing.module.ts b/overlord/src/app/cost-centre/cost-centre-routing.module.ts index 9f2c4264..d0ae1543 100644 --- a/overlord/src/app/cost-centre/cost-centre-routing.module.ts +++ b/overlord/src/app/cost-centre/cost-centre-routing.module.ts @@ -14,8 +14,7 @@ const costCentreRoutes: Routes = [ path: '', component: CostCentreListComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Cost Centres', @@ -28,8 +27,7 @@ const costCentreRoutes: Routes = [ path: 'new', component: CostCentreDetailComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Cost Centres', @@ -42,8 +40,7 @@ const costCentreRoutes: Routes = [ path: ':id', component: CostCentreDetailComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Cost Centres', diff --git a/overlord/src/app/cost-centre/cost-centre.service.ts b/overlord/src/app/cost-centre/cost-centre.service.ts index 842709c0..f4dec3e7 100644 --- a/overlord/src/app/cost-centre/cost-centre.service.ts +++ b/overlord/src/app/cost-centre/cost-centre.service.ts @@ -22,9 +22,7 @@ export class CostCentreService { const getUrl: string = id === null ? `${url}` : `${url}/${id}`; return this.http .get(getUrl) - .pipe( - catchError(this.log.handleError(serviceName, `get id=${id}`)), - ) as Observable; + .pipe(catchError(this.log.handleError(serviceName, `get id=${id}`))) as Observable; } list(): Observable { diff --git a/overlord/src/app/daybook/daybook-datasource.ts b/overlord/src/app/daybook/daybook-datasource.ts index e8173003..faf34d73 100644 --- a/overlord/src/app/daybook/daybook-datasource.ts +++ b/overlord/src/app/daybook/daybook-datasource.ts @@ -8,8 +8,7 @@ import { map } from 'rxjs/operators'; import { DaybookItem } from './daybook-item'; /** Simple sort comparator for example ID/Name columns (for client-side sorting). */ -const compare = (a: string | number, b: string | number, isAsc: boolean) => - (a < b ? -1 : 1) * (isAsc ? 1 : -1); +const compare = (a: string | number, b: string | number, isAsc: boolean) => (a < b ? -1 : 1) * (isAsc ? 1 : -1); export class DaybookDataSource extends DataSource { constructor( public data: DaybookItem[], diff --git a/overlord/src/app/daybook/daybook-routing.module.ts b/overlord/src/app/daybook/daybook-routing.module.ts index 98a75d5b..8eadcf5f 100644 --- a/overlord/src/app/daybook/daybook-routing.module.ts +++ b/overlord/src/app/daybook/daybook-routing.module.ts @@ -12,8 +12,7 @@ const daybookRoutes: Routes = [ path: '', component: DaybookComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Daybook', diff --git a/overlord/src/app/daybook/daybook.component.html b/overlord/src/app/daybook/daybook.component.html index 993a4b3f..6de10961 100644 --- a/overlord/src/app/daybook/daybook.component.html +++ b/overlord/src/app/daybook/daybook.component.html @@ -29,9 +29,7 @@ - + @@ -64,9 +62,7 @@ Amount - {{ - row.debitAmount | currency: 'INR' - }} + {{ row.debitAmount | currency: 'INR' }} @@ -78,9 +74,7 @@ Amount - {{ - row.creditAmount | currency: 'INR' - }} + {{ row.creditAmount | currency: 'INR' }} diff --git a/overlord/src/app/daybook/daybook.component.ts b/overlord/src/app/daybook/daybook.component.ts index c08505cb..29f45eae 100644 --- a/overlord/src/app/daybook/daybook.component.ts +++ b/overlord/src/app/daybook/daybook.component.ts @@ -25,15 +25,7 @@ export class DaybookComponent implements OnInit { selectedRowId = ''; /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */ - displayedColumns = [ - 'date', - 'type', - 'narration', - 'debitText', - 'debitAmount', - 'creditText', - 'creditAmount', - ]; + displayedColumns = ['date', 'type', 'narration', 'debitText', 'debitAmount', 'creditText', 'creditAmount']; constructor( private route: ActivatedRoute, diff --git a/overlord/src/app/daybook/daybook.module.ts b/overlord/src/app/daybook/daybook.module.ts index a2b5c990..04cba02e 100644 --- a/overlord/src/app/daybook/daybook.module.ts +++ b/overlord/src/app/daybook/daybook.module.ts @@ -7,12 +7,7 @@ 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 { 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'; diff --git a/overlord/src/app/employee-attendance/employee-attendance-routing.module.ts b/overlord/src/app/employee-attendance/employee-attendance-routing.module.ts index 679884cc..e0ef2143 100644 --- a/overlord/src/app/employee-attendance/employee-attendance-routing.module.ts +++ b/overlord/src/app/employee-attendance/employee-attendance-routing.module.ts @@ -13,8 +13,7 @@ const employeeEmployeeAttendanceRoutes: Routes = [ path: '', component: EmployeeAttendanceComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Attendance', @@ -29,8 +28,7 @@ const employeeEmployeeAttendanceRoutes: Routes = [ path: ':id', component: EmployeeAttendanceComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Attendance', diff --git a/overlord/src/app/employee-attendance/employee-attendance.component.html b/overlord/src/app/employee-attendance/employee-attendance.component.html index f12de662..e78c5e6b 100644 --- a/overlord/src/app/employee-attendance/employee-attendance.component.html +++ b/overlord/src/app/employee-attendance/employee-attendance.component.html @@ -47,14 +47,10 @@ [displayWith]="displayFn" (optionSelected)="selected($event)" > - {{ - employee.name - }} + {{ employee.name }} - + @@ -80,9 +76,7 @@ Prints {{ row.prints }} - new_releases @@ -100,16 +94,11 @@ - + - + diff --git a/overlord/src/app/employee-attendance/employee-attendance.component.ts b/overlord/src/app/employee-attendance/employee-attendance.component.ts index eeff482d..ec4a9fe1 100644 --- a/overlord/src/app/employee-attendance/employee-attendance.component.ts +++ b/overlord/src/app/employee-attendance/employee-attendance.component.ts @@ -26,9 +26,7 @@ import { EmployeeAttendanceService } from './employee-attendance.service'; export class EmployeeAttendanceComponent implements OnInit, AfterViewInit { @ViewChild('employeeElement', { static: true }) employeeElement?: ElementRef; public employeeAttendanceObservable = new BehaviorSubject([]); - dataSource: EmployeeAttendanceDataSource = new EmployeeAttendanceDataSource( - this.employeeAttendanceObservable, - ); + dataSource: EmployeeAttendanceDataSource = new EmployeeAttendanceDataSource(this.employeeAttendanceObservable); form: FormGroup<{ startDate: FormControl; diff --git a/overlord/src/app/employee-attendance/employee-attendance.module.ts b/overlord/src/app/employee-attendance/employee-attendance.module.ts index 201dc4c5..2a45df19 100644 --- a/overlord/src/app/employee-attendance/employee-attendance.module.ts +++ b/overlord/src/app/employee-attendance/employee-attendance.module.ts @@ -8,12 +8,7 @@ import { MatButtonModule } from '@angular/material/button'; import { MatCardModule } from '@angular/material/card'; import { MatCheckboxModule } from '@angular/material/checkbox'; import { MatChipsModule } from '@angular/material/chips'; -import { - DateAdapter, - MAT_DATE_FORMATS, - MAT_DATE_LOCALE, - MatNativeDateModule, -} from '@angular/material/core'; +import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; diff --git a/overlord/src/app/employee-attendance/employee-attendance.service.ts b/overlord/src/app/employee-attendance/employee-attendance.service.ts index 3771e945..dd820015 100644 --- a/overlord/src/app/employee-attendance/employee-attendance.service.ts +++ b/overlord/src/app/employee-attendance/employee-attendance.service.ts @@ -17,11 +17,7 @@ export class EmployeeAttendanceService { private log: ErrorLoggerService, ) {} - get( - id: string | null, - startDate: string | null, - finishDate: string | null, - ): Observable { + get(id: string | null, startDate: string | null, finishDate: string | null): Observable { const getUrl: string = id === null ? url : `${url}/${id}`; const options = { params: new HttpParams() }; if (startDate !== null) { @@ -32,9 +28,7 @@ export class EmployeeAttendanceService { } return this.http .get(getUrl, options) - .pipe( - catchError(this.log.handleError(serviceName, `get id=${id}`)), - ) as Observable; + .pipe(catchError(this.log.handleError(serviceName, `get id=${id}`))) as Observable; } save(employeeAttendance: EmployeeAttendance): Observable { @@ -44,8 +38,6 @@ export class EmployeeAttendanceService { const { id } = employeeAttendance.employee; return this.http .post(`${url}/${id}`, employeeAttendance) - .pipe( - catchError(this.log.handleError(serviceName, 'save')), - ) as Observable; + .pipe(catchError(this.log.handleError(serviceName, 'save'))) as Observable; } } diff --git a/overlord/src/app/employee-benefits/employee-benefits-routing.module.ts b/overlord/src/app/employee-benefits/employee-benefits-routing.module.ts index b8c25a6d..06de72d0 100644 --- a/overlord/src/app/employee-benefits/employee-benefits-routing.module.ts +++ b/overlord/src/app/employee-benefits/employee-benefits-routing.module.ts @@ -12,8 +12,7 @@ const employeeBenefitsRoutes: Routes = [ path: '', component: EmployeeBenefitsComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'employee-benefit', @@ -27,8 +26,7 @@ const employeeBenefitsRoutes: Routes = [ path: ':id', component: EmployeeBenefitsComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'employee-benefit', diff --git a/overlord/src/app/employee-benefits/employee-benefits.component.html b/overlord/src/app/employee-benefits/employee-benefits.component.html index b634ba55..450ffc84 100644 --- a/overlord/src/app/employee-benefits/employee-benefits.component.html +++ b/overlord/src/app/employee-benefits/employee-benefits.component.html @@ -7,21 +7,12 @@
Date - +
-
+
Employee - {{ - employee.name - }} + {{ employee.name }} @@ -52,9 +41,7 @@ - +
@@ -78,49 +65,37 @@ GrossSalary - {{ - row.grossSalary | currency: 'INR' - }} + {{ row.grossSalary | currency: 'INR' }} DaysWorked - {{ - row.daysWorked | number: '1.2-2' - }} + {{ row.daysWorked | number: '1.2-2' }} Esi EE - {{ - row.esiEmployee | currency: 'INR' - }} + {{ row.esiEmployee | currency: 'INR' }} Pf EE - {{ - row.pfEmployee | currency: 'INR' - }} + {{ row.pfEmployee | currency: 'INR' }} Esi ER - {{ - row.esiEmployer | currency: 'INR' - }} + {{ row.esiEmployer | currency: 'INR' }} Pf ER - {{ - row.pfEmployer | currency: 'INR' - }} + {{ row.pfEmployer | currency: 'INR' }} @@ -150,20 +125,13 @@ > {{ voucher.posted ? 'Posted' : 'Post' }} - Created on {{ voucher.creationDate | localTime }} and Last Edited on - {{ voucher.lastEditDate | localTime }} by - {{ voucher.user.name }}{{ voucher.lastEditDate | localTime }} by {{ voucher.user.name }}. {{ voucher.poster ? 'Posted by ' + voucher.poster : '' }} diff --git a/overlord/src/app/employee-benefits/employee-benefits.component.ts b/overlord/src/app/employee-benefits/employee-benefits.component.ts index 1d9dd682..4bf42afd 100644 --- a/overlord/src/app/employee-benefits/employee-benefits.component.ts +++ b/overlord/src/app/employee-benefits/employee-benefits.component.ts @@ -85,10 +85,8 @@ export class EmployeeBenefitsComponent implements OnInit, AfterViewInit { const limit = 15000; const employeeRate = 0.12; const employerRate = 0.12 + 0.011 + 0.005 + 0.0001; - const employee = - grossSalary > limit ? 0 : Math.ceil((employeeRate * grossSalary * daysWorked) / daysInMonth); - const employer = - grossSalary > limit ? 0 : Math.ceil((employerRate * grossSalary * daysWorked) / daysInMonth); + const employee = grossSalary > limit ? 0 : Math.ceil((employeeRate * grossSalary * daysWorked) / daysInMonth); + const employer = grossSalary > limit ? 0 : Math.ceil((employerRate * grossSalary * daysWorked) / daysInMonth); return { ee: employee, er: employer, both: employee + employer }; } @@ -96,10 +94,8 @@ export class EmployeeBenefitsComponent implements OnInit, AfterViewInit { const limit = 21000; const employeeRate = 0.0175; const employerRate = 0.0475; - const employee = - grossSalary > limit ? 0 : Math.ceil((employeeRate * grossSalary * daysWorked) / daysInMonth); - const employer = - grossSalary > limit ? 0 : Math.ceil((employerRate * grossSalary * daysWorked) / daysInMonth); + const employee = grossSalary > limit ? 0 : Math.ceil((employeeRate * grossSalary * daysWorked) / daysInMonth); + const employer = grossSalary > limit ? 0 : Math.ceil((employerRate * grossSalary * daysWorked) / daysInMonth); return { ee: employee, er: employer, both: employee + employer }; } @@ -142,9 +138,7 @@ export class EmployeeBenefitsComponent implements OnInit, AfterViewInit { } addRow() { - const oldFiltered = this.voucher.employeeBenefits.filter( - (x) => x.employee.id === (this.employee as Employee).id, - ); + const oldFiltered = this.voucher.employeeBenefits.filter((x) => x.employee.id === (this.employee as Employee).id); if (oldFiltered.length) { this.toaster.show('Danger', 'Employee has already been added'); return; @@ -198,10 +192,7 @@ export class EmployeeBenefitsComponent implements OnInit, AfterViewInit { if (this.voucher.posted && this.auth.allowed('edit-posted-vouchers')) { return true; } - return ( - this.voucher.user.id === (this.auth.user as User).id || - this.auth.allowed("edit-other-user's-vouchers") - ); + return this.voucher.user.id === (this.auth.user as User).id || this.auth.allowed("edit-other-user's-vouchers"); } post() { diff --git a/overlord/src/app/employee-benefits/employee-benefits.module.ts b/overlord/src/app/employee-benefits/employee-benefits.module.ts index fbad22c0..1571d91f 100644 --- a/overlord/src/app/employee-benefits/employee-benefits.module.ts +++ b/overlord/src/app/employee-benefits/employee-benefits.module.ts @@ -7,12 +7,7 @@ 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 { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; diff --git a/overlord/src/app/employee-functions/employee-functions-routing.module.ts b/overlord/src/app/employee-functions/employee-functions-routing.module.ts index b74509ab..f4a31d98 100644 --- a/overlord/src/app/employee-functions/employee-functions-routing.module.ts +++ b/overlord/src/app/employee-functions/employee-functions-routing.module.ts @@ -11,8 +11,7 @@ const employeeFunctionsRoutes: Routes = [ path: '', component: EmployeeFunctionsComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'employee-benefit', diff --git a/overlord/src/app/employee-functions/employee-functions.component.html b/overlord/src/app/employee-functions/employee-functions.component.html index 99025332..58756fa2 100644 --- a/overlord/src/app/employee-functions/employee-functions.component.html +++ b/overlord/src/app/employee-functions/employee-functions.component.html @@ -22,12 +22,7 @@ > -
@@ -67,18 +62,10 @@ - Download Attendance - Download Fingerprints @@ -91,12 +78,7 @@
-
diff --git a/overlord/src/app/employee-functions/employee-functions.component.ts b/overlord/src/app/employee-functions/employee-functions.component.ts index 77e24586..374662e5 100644 --- a/overlord/src/app/employee-functions/employee-functions.component.ts +++ b/overlord/src/app/employee-functions/employee-functions.component.ts @@ -73,9 +73,7 @@ export class EmployeeFunctionsComponent { attendanceRecordUrl() { const startDate = (this.attendanceRecordForm.value.startDate ?? moment()).format('DD-MMM-YYYY'); - const finishDate = (this.attendanceRecordForm.value.finishDate ?? moment()).format( - 'DD-MMM-YYYY', - ); + const finishDate = (this.attendanceRecordForm.value.finishDate ?? moment()).format('DD-MMM-YYYY'); if (!startDate || !finishDate) { // this.toaster.show('Danger', 'Please choose a start and finish date.'); return ''; @@ -85,9 +83,7 @@ export class EmployeeFunctionsComponent { fingerPrintUrl() { const startDate = (this.attendanceRecordForm.value.startDate ?? moment()).format('DD-MMM-YYYY'); - const finishDate = (this.attendanceRecordForm.value.finishDate ?? moment()).format( - 'DD-MMM-YYYY', - ); + const finishDate = (this.attendanceRecordForm.value.finishDate ?? moment()).format('DD-MMM-YYYY'); if (!startDate || !finishDate) { // this.toaster.show('Danger', 'Please choose a start and finish date.'); return ''; diff --git a/overlord/src/app/employee-functions/employee-functions.module.ts b/overlord/src/app/employee-functions/employee-functions.module.ts index d995f435..56cfe91d 100644 --- a/overlord/src/app/employee-functions/employee-functions.module.ts +++ b/overlord/src/app/employee-functions/employee-functions.module.ts @@ -7,12 +7,7 @@ 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 { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; diff --git a/overlord/src/app/employee-functions/employee-functions.service.ts b/overlord/src/app/employee-functions/employee-functions.service.ts index d1e9d4a2..5fb4027d 100644 --- a/overlord/src/app/employee-functions/employee-functions.service.ts +++ b/overlord/src/app/employee-functions/employee-functions.service.ts @@ -27,8 +27,6 @@ export class EmployeeFunctionsService { fd.append('fingerprints', fingerprintFile); return this.http .post(url, fd) - .pipe( - catchError(this.log.handleError(serviceName, 'uploadFingerprints')), - ) as Observable; + .pipe(catchError(this.log.handleError(serviceName, 'uploadFingerprints'))) as Observable; } } diff --git a/overlord/src/app/employee/employee-detail/employee-detail.component.html b/overlord/src/app/employee/employee-detail/employee-detail.component.html index da6b45af..5a04edb9 100644 --- a/overlord/src/app/employee/employee-detail/employee-detail.component.html +++ b/overlord/src/app/employee/employee-detail/employee-detail.component.html @@ -2,12 +2,7 @@ Employee - + {{ item.isStarred ? 'star' : 'star_border' }} @@ -85,8 +80,6 @@ - + diff --git a/overlord/src/app/employee/employee-detail/employee-detail.component.ts b/overlord/src/app/employee/employee-detail/employee-detail.component.ts index 1b07fa51..353d3a4d 100644 --- a/overlord/src/app/employee/employee-detail/employee-detail.component.ts +++ b/overlord/src/app/employee/employee-detail/employee-detail.component.ts @@ -75,12 +75,8 @@ export class EmployeeDetailComponent implements OnInit, AfterViewInit { points: this.item.points || '', isActive: this.item.isActive, costCentre: this.item.costCentre.id ?? '', - joiningDate: this.item.joiningDate - ? moment(this.item.joiningDate, 'DD-MMM-YYYY').toDate() - : new Date(), - leavingDate: this.item.isActive - ? null - : moment(this.item.leavingDate, 'DD-MMM-YYYY').toDate(), + joiningDate: this.item.joiningDate ? moment(this.item.joiningDate, 'DD-MMM-YYYY').toDate() : new Date(), + leavingDate: this.item.isActive ? null : moment(this.item.leavingDate, 'DD-MMM-YYYY').toDate(), }); } @@ -138,9 +134,7 @@ export class EmployeeDetailComponent implements OnInit, AfterViewInit { this.item.isActive = formValue.isActive ?? true; this.item.costCentre.id = formValue.costCentre ?? ''; this.item.joiningDate = moment(formValue.joiningDate).format('DD-MMM-YYYY'); - this.item.leavingDate = this.item.isActive - ? null - : moment(formValue.leavingDate).format('DD-MMM-YYYY'); + this.item.leavingDate = this.item.isActive ? null : moment(formValue.leavingDate).format('DD-MMM-YYYY'); return this.item; } } diff --git a/overlord/src/app/employee/employee-list/employee-list-datasource.ts b/overlord/src/app/employee/employee-list/employee-list-datasource.ts index 42837303..fd8a9922 100644 --- a/overlord/src/app/employee/employee-list/employee-list-datasource.ts +++ b/overlord/src/app/employee/employee-list/employee-list-datasource.ts @@ -8,8 +8,7 @@ import { map, tap } from 'rxjs/operators'; import { Employee } from '../employee'; /** Simple sort comparator for example ID/Name columns (for client-side sorting). */ -const compare = (a: string | number, b: string | number, isAsc: boolean) => - (a < b ? -1 : 1) * (isAsc ? 1 : -1); +const compare = (a: string | number, b: string | number, isAsc: boolean) => (a < b ? -1 : 1) * (isAsc ? 1 : -1); export class EmployeeListDataSource extends DataSource { private filterValue = ''; diff --git a/overlord/src/app/employee/employee-list/employee-list.component.ts b/overlord/src/app/employee/employee-list/employee-list.component.ts index e66919af..13507565 100644 --- a/overlord/src/app/employee/employee-list/employee-list.component.ts +++ b/overlord/src/app/employee/employee-list/employee-list.component.ts @@ -29,16 +29,7 @@ export class EmployeeListComponent implements OnInit, AfterViewInit { list: Employee[] = []; /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */ - displayedColumns = [ - 'code', - 'name', - 'designation', - 'salary', - 'points', - 'department', - 'joiningDate', - 'leavingDate', - ]; + displayedColumns = ['code', 'name', 'designation', 'salary', 'points', 'department', 'joiningDate', 'leavingDate']; constructor( private route: ActivatedRoute, @@ -47,10 +38,7 @@ export class EmployeeListComponent implements OnInit, AfterViewInit { this.form = new FormGroup({ filter: new FormControl('', { nonNullable: true }), }); - this.filter = this.form.controls.filter.valueChanges.pipe( - debounceTime(150), - distinctUntilChanged(), - ); + this.filter = this.form.controls.filter.valueChanges.pipe(debounceTime(150), distinctUntilChanged()); this.dataSource = new EmployeeListDataSource(this.list, this.filter); } diff --git a/overlord/src/app/employee/employee-routing.module.ts b/overlord/src/app/employee/employee-routing.module.ts index 7cc7517d..7dbfdc37 100644 --- a/overlord/src/app/employee/employee-routing.module.ts +++ b/overlord/src/app/employee/employee-routing.module.ts @@ -15,8 +15,7 @@ const employeeRoutes: Routes = [ path: '', component: EmployeeListComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Employees', @@ -29,8 +28,7 @@ const employeeRoutes: Routes = [ path: 'new', component: EmployeeDetailComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Employees', @@ -44,8 +42,7 @@ const employeeRoutes: Routes = [ path: ':id', component: EmployeeDetailComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Employees', diff --git a/overlord/src/app/employee/employee.service.ts b/overlord/src/app/employee/employee.service.ts index 25a8dccd..8b055992 100644 --- a/overlord/src/app/employee/employee.service.ts +++ b/overlord/src/app/employee/employee.service.ts @@ -59,8 +59,6 @@ export class EmployeeService { const options = { params: new HttpParams().set('q', term) }; return this.http .get(`${url}/query`, options) - .pipe(catchError(this.log.handleError(serviceName, 'autocomplete'))) as Observable< - Employee[] - >; + .pipe(catchError(this.log.handleError(serviceName, 'autocomplete'))) as Observable; } } diff --git a/overlord/src/app/entries/entries-resolver.service.ts b/overlord/src/app/entries/entries-resolver.service.ts index 455e4f02..219c4358 100644 --- a/overlord/src/app/entries/entries-resolver.service.ts +++ b/overlord/src/app/entries/entries-resolver.service.ts @@ -14,25 +14,12 @@ export class EntriesResolver { resolve(route: ActivatedRouteSnapshot): Observable { const start_date = route.queryParamMap.get('s'); const finish_date = route.queryParamMap.get('f'); - const posted = - route.queryParamMap.get('p') === null ? null : route.queryParamMap.get('p') === 'true'; - const page_size = - route.queryParamMap.get('ps') === null ? 50 : +(route.queryParamMap.get('ps') as string); - const page_index = - route.queryParamMap.get('pi') === null ? 0 : +(route.queryParamMap.get('pi') as string); + const posted = route.queryParamMap.get('p') === null ? null : route.queryParamMap.get('p') === 'true'; + const page_size = route.queryParamMap.get('ps') === null ? 50 : +(route.queryParamMap.get('ps') as string); + const page_index = route.queryParamMap.get('pi') === null ? 0 : +(route.queryParamMap.get('pi') as string); const sort = route.queryParamMap.get('a') ?? 'date'; const direction = route.queryParamMap.get('d') ?? 'desc'; - const issue_vouchers = - route.queryParamMap.get('i') === null ? false : route.queryParamMap.get('i') === 'true'; - return this.ser.list( - start_date, - finish_date, - posted, - page_size, - page_index, - sort, - direction, - issue_vouchers, - ); + const issue_vouchers = route.queryParamMap.get('i') === null ? false : route.queryParamMap.get('i') === 'true'; + return this.ser.list(start_date, finish_date, posted, page_size, page_index, sort, direction, issue_vouchers); } } diff --git a/overlord/src/app/entries/entries-routing.module.ts b/overlord/src/app/entries/entries-routing.module.ts index e1336d50..dd6ca554 100644 --- a/overlord/src/app/entries/entries-routing.module.ts +++ b/overlord/src/app/entries/entries-routing.module.ts @@ -12,8 +12,7 @@ const entriesRoutes: Routes = [ path: '', component: EntriesComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Ledger', diff --git a/overlord/src/app/entries/entries.component.html b/overlord/src/app/entries/entries.component.html index 2e1aa7f0..4ea836ed 100644 --- a/overlord/src/app/entries/entries.component.html +++ b/overlord/src/app/entries/entries.component.html @@ -7,23 +7,13 @@
Create / Last Edit Date From - + Create / Last Edit Date Till - + @@ -32,11 +22,7 @@
- + Posted Not Posted All diff --git a/overlord/src/app/entries/entries.component.ts b/overlord/src/app/entries/entries.component.ts index fbdaebe6..adff8aee 100644 --- a/overlord/src/app/entries/entries.component.ts +++ b/overlord/src/app/entries/entries.component.ts @@ -26,15 +26,7 @@ export class EntriesComponent implements OnInit { issue: FormControl; }>; - displayedColumns = [ - 'date', - 'voucherType', - 'narration', - 'debitNames', - 'creditNames', - 'amount', - 'user', - ]; + displayedColumns = ['date', 'voucherType', 'narration', 'debitNames', 'creditNames', 'amount', 'user']; posted: boolean | null = null; issue = false; diff --git a/overlord/src/app/entries/entries.module.ts b/overlord/src/app/entries/entries.module.ts index 45402c28..68abaad3 100644 --- a/overlord/src/app/entries/entries.module.ts +++ b/overlord/src/app/entries/entries.module.ts @@ -6,12 +6,7 @@ import { ReactiveFormsModule } from '@angular/forms'; 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 { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatExpansionModule } from '@angular/material/expansion'; import { MatIconModule } from '@angular/material/icon'; diff --git a/overlord/src/app/incentive/incentive-routing.module.ts b/overlord/src/app/incentive/incentive-routing.module.ts index 19ec2320..18a7642b 100644 --- a/overlord/src/app/incentive/incentive-routing.module.ts +++ b/overlord/src/app/incentive/incentive-routing.module.ts @@ -12,8 +12,7 @@ const incentiveRoutes: Routes = [ path: '', component: IncentiveComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'incentive', @@ -27,8 +26,7 @@ const incentiveRoutes: Routes = [ path: ':id', component: IncentiveComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'incentive', diff --git a/overlord/src/app/incentive/incentive.component.html b/overlord/src/app/incentive/incentive.component.html index b10ee4a4..fd19181b 100644 --- a/overlord/src/app/incentive/incentive.component.html +++ b/overlord/src/app/incentive/incentive.component.html @@ -7,13 +7,7 @@
Date - + @@ -45,9 +39,7 @@ DaysWorked - {{ - row.daysWorked | number: '1.2-2' - }} + {{ row.daysWorked | number: '1.2-2' }} @@ -58,13 +50,7 @@ - + @@ -75,9 +61,7 @@ Amount - {{ - amount(row) | currency: 'INR' - }} + {{ amount(row) | currency: 'INR' }} @@ -97,20 +81,13 @@ > {{ voucher.posted ? 'Posted' : 'Post' }} - Created on {{ voucher.creationDate | localTime }} and Last Edited on - {{ voucher.lastEditDate | localTime }} by - {{ voucher.user.name }}{{ voucher.lastEditDate | localTime }} by {{ voucher.user.name }}. {{ voucher.poster ? 'Posted by ' + voucher.poster : '' }} diff --git a/overlord/src/app/incentive/incentive.component.ts b/overlord/src/app/incentive/incentive.component.ts index 30e78405..5c6c92b8 100644 --- a/overlord/src/app/incentive/incentive.component.ts +++ b/overlord/src/app/incentive/incentive.component.ts @@ -54,16 +54,14 @@ export class IncentiveComponent implements OnInit { incentives: new FormArray }>>([]), }); // Listen to Date Change - this.form.controls.date.valueChanges - .pipe(map((x) => moment(x).format('DD-MMM-YYYY'))) - .subscribe((x) => { - if (x !== this.voucher.date && !this.voucher.id) { - return this.ser.getIncentive(x).subscribe((voucher: Voucher) => { - this.loadVoucher(voucher); - }); - } - return ''; - }); + this.form.controls.date.valueChanges.pipe(map((x) => moment(x).format('DD-MMM-YYYY'))).subscribe((x) => { + if (x !== this.voucher.date && !this.voucher.id) { + return this.ser.getIncentive(x).subscribe((voucher: Voucher) => { + this.loadVoucher(voucher); + }); + } + return ''; + }); } ngOnInit() { @@ -90,9 +88,7 @@ export class IncentiveComponent implements OnInit { } totalPoints() { - return this.voucher.incentives - .map((item) => item.daysWorked * item.points) - .reduce((sum, item) => sum + item); + return this.voucher.incentives.map((item) => item.daysWorked * item.points).reduce((sum, item) => sum + item); } pointValue() { @@ -129,10 +125,7 @@ export class IncentiveComponent implements OnInit { if (this.voucher.posted && this.auth.allowed('edit-posted-vouchers')) { return true; } - return ( - this.voucher.user.id === (this.auth.user as User).id || - this.auth.allowed("edit-other-user's-vouchers") - ); + return this.voucher.user.id === (this.auth.user as User).id || this.auth.allowed("edit-other-user's-vouchers"); } post() { diff --git a/overlord/src/app/incentive/incentive.module.ts b/overlord/src/app/incentive/incentive.module.ts index 4672c51f..b7d28821 100644 --- a/overlord/src/app/incentive/incentive.module.ts +++ b/overlord/src/app/incentive/incentive.module.ts @@ -7,12 +7,7 @@ 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 { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; diff --git a/overlord/src/app/issue/issue-dialog.component.html b/overlord/src/app/issue/issue-dialog.component.html index 3b76fa75..18dcc5af 100644 --- a/overlord/src/app/issue/issue-dialog.component.html +++ b/overlord/src/app/issue/issue-dialog.component.html @@ -18,9 +18,7 @@ [displayWith]="displayFn" (optionSelected)="batchSelected($event)" > - {{ - batch.name - }} + {{ batch.name }} @@ -31,8 +29,6 @@
- +
diff --git a/overlord/src/app/issue/issue-dialog.component.ts b/overlord/src/app/issue/issue-dialog.component.ts index 2776453c..41e04e85 100644 --- a/overlord/src/app/issue/issue-dialog.component.ts +++ b/overlord/src/app/issue/issue-dialog.component.ts @@ -38,9 +38,7 @@ export class IssueDialogComponent implements OnInit { this.batches = this.form.controls.batch.valueChanges.pipe( debounceTime(150), distinctUntilChanged(), - switchMap((x) => - x === null ? observableOf([]) : this.batchSer.autocomplete(this.data.date, x), - ), + switchMap((x) => (x === null ? observableOf([]) : this.batchSer.autocomplete(this.data.date, x))), ); } @@ -68,8 +66,7 @@ export class IssueDialogComponent implements OnInit { this.data.inventory.rate = this.batch.rate; this.data.inventory.tax = this.batch.tax; this.data.inventory.discount = this.batch.discount; - this.data.inventory.amount = - quantity * this.batch.rate * (1 + this.batch.tax) * (1 - this.batch.discount); + this.data.inventory.amount = quantity * this.batch.rate * (1 + this.batch.tax) * (1 - this.batch.discount); this.dialogRef.close(this.data.inventory); } } diff --git a/overlord/src/app/issue/issue-grid.service.ts b/overlord/src/app/issue/issue-grid.service.ts index 9e2eed5d..054e308b 100644 --- a/overlord/src/app/issue/issue-grid.service.ts +++ b/overlord/src/app/issue/issue-grid.service.ts @@ -21,8 +21,6 @@ export class IssueGridService { issueGrid(date: string): Observable { return this.http .get(`${url}/${date}`) - .pipe(catchError(this.log.handleError(serviceName, 'autocomplete'))) as Observable< - IssueGridItem[] - >; + .pipe(catchError(this.log.handleError(serviceName, 'autocomplete'))) as Observable; } } diff --git a/overlord/src/app/issue/issue-routing.module.ts b/overlord/src/app/issue/issue-routing.module.ts index 9bd75ce5..ad8709a7 100644 --- a/overlord/src/app/issue/issue-routing.module.ts +++ b/overlord/src/app/issue/issue-routing.module.ts @@ -13,8 +13,7 @@ const issueRoutes: Routes = [ path: '', component: IssueComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Issue', @@ -29,8 +28,7 @@ const issueRoutes: Routes = [ path: ':id', component: IssueComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Issue', diff --git a/overlord/src/app/issue/issue.component.html b/overlord/src/app/issue/issue.component.html index ff447c2b..79481751 100644 --- a/overlord/src/app/issue/issue.component.html +++ b/overlord/src/app/issue/issue.component.html @@ -39,10 +39,7 @@
-
+
Product - {{ - batch.name - }} + {{ batch.name }} @@ -69,9 +64,7 @@ - +
@@ -89,9 +82,7 @@ Quantity - {{ - row.quantity | number: '1.2-2' - }} + {{ row.quantity | number: '1.2-2' }} @@ -103,9 +94,7 @@ Amount - {{ - row.amount | currency: 'INR' - }} + {{ row.amount | currency: 'INR' }} @@ -134,16 +123,8 @@ - - + diff --git a/overlord/src/app/issue/issue.component.ts b/overlord/src/app/issue/issue.component.ts index 600ce849..93ef52a2 100644 --- a/overlord/src/app/issue/issue.component.ts +++ b/overlord/src/app/issue/issue.component.ts @@ -217,10 +217,7 @@ export class IssueComponent implements OnInit, AfterViewInit, OnDestroy { updateView() { this.inventoryObservable.next(this.voucher.inventories); - const amount = round( - Math.abs(this.voucher.inventories.map((x) => x.amount).reduce((p, c) => p + c, 0)), - 2, - ); + const amount = round(Math.abs(this.voucher.inventories.map((x) => x.amount).reduce((p, c) => p + c, 0)), 2); this.form.controls.amount.setValue(amount); } @@ -261,10 +258,7 @@ export class IssueComponent implements OnInit, AfterViewInit, OnDestroy { if (this.voucher.posted && this.auth.allowed('edit-posted-vouchers')) { return true; } - return ( - this.voucher.user.id === (this.auth.user as User).id || - this.auth.allowed("edit-other-user's-vouchers") - ); + return this.voucher.user.id === (this.auth.user as User).id || this.auth.allowed("edit-other-user's-vouchers"); } save() { diff --git a/overlord/src/app/issue/issue.module.ts b/overlord/src/app/issue/issue.module.ts index e1ee27bf..4e5e9850 100644 --- a/overlord/src/app/issue/issue.module.ts +++ b/overlord/src/app/issue/issue.module.ts @@ -7,12 +7,7 @@ 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 { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; diff --git a/overlord/src/app/journal/journal-dialog.component.html b/overlord/src/app/journal/journal-dialog.component.html index 8072a2cd..ed06571e 100644 --- a/overlord/src/app/journal/journal-dialog.component.html +++ b/overlord/src/app/journal/journal-dialog.component.html @@ -19,8 +19,8 @@ autocomplete="off" /> - Balance as on Date: {{ accBal.date | currency: 'INR' | accounting }} / - Final balance: {{ accBal.total | currency: 'INR' | accounting }} + Balance as on Date: {{ accBal.date | currency: 'INR' | accounting }} / Final balance: + {{ accBal.total | currency: 'INR' | accounting }} - {{ - account.name - }} + {{ account.name }} Amount @@ -42,8 +40,6 @@
- +
diff --git a/overlord/src/app/journal/journal-routing.module.ts b/overlord/src/app/journal/journal-routing.module.ts index 74a96538..86df6af2 100644 --- a/overlord/src/app/journal/journal-routing.module.ts +++ b/overlord/src/app/journal/journal-routing.module.ts @@ -12,8 +12,7 @@ const journalRoutes: Routes = [ path: '', component: JournalComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Journal', @@ -27,8 +26,7 @@ const journalRoutes: Routes = [ path: ':id', component: JournalComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Journal', diff --git a/overlord/src/app/journal/journal.component.html b/overlord/src/app/journal/journal.component.html index 501eb6d8..5acf202c 100644 --- a/overlord/src/app/journal/journal.component.html +++ b/overlord/src/app/journal/journal.component.html @@ -29,10 +29,7 @@ -
+
Dr @@ -50,8 +47,8 @@ autocomplete="off" /> - Balance as on Date: {{ accBal.date | currency: 'INR' | accounting }} / - Final balance: {{ accBal.total | currency: 'INR' | accounting }} + Balance as on Date: {{ accBal.date | currency: 'INR' | accounting }} / Final balance: + {{ accBal.total | currency: 'INR' | accounting }} - {{ - account.name - }} + {{ account.name }} Amount @@ -70,9 +65,7 @@ ₹  - +
@@ -90,9 +83,7 @@ Amount - {{ - row.amount | currency: 'INR' - }} + {{ row.amount | currency: 'INR' }} @@ -116,11 +107,7 @@
-
+
- diff --git a/overlord/src/app/journal/journal.component.ts b/overlord/src/app/journal/journal.component.ts index 63018b3a..b5c3de5f 100644 --- a/overlord/src/app/journal/journal.component.ts +++ b/overlord/src/app/journal/journal.component.ts @@ -172,9 +172,7 @@ export class JournalComponent implements OnInit, AfterViewInit, OnDestroy { if (this.account === null || amount.amount === 0) { return; } - const oldFiltered = this.voucher.journals.filter( - (x) => x.account.id === (this.account as Account).id, - ); + const oldFiltered = this.voucher.journals.filter((x) => x.account.id === (this.account as Account).id); const old = oldFiltered.length ? oldFiltered[0] : null; if (old) { const a = old.debit * old.amount + amount.debit * amount.amount; @@ -195,10 +193,7 @@ export class JournalComponent implements OnInit, AfterViewInit, OnDestroy { } resetAddRow() { - const amount = round( - Math.abs(this.voucher.journals.map((x) => x.debit * x.amount).reduce((p, c) => p + c)), - 2, - ); + const amount = round(Math.abs(this.voucher.journals.map((x) => x.debit * x.amount).reduce((p, c) => p + c)), 2); this.form.controls.addRow.reset({ debit: this.form.value.addRow?.debit ?? 1, account: null, @@ -242,9 +237,7 @@ export class JournalComponent implements OnInit, AfterViewInit, OnDestroy { deleteRow(row: Journal) { this.voucher.journals.splice(this.voucher.journals.indexOf(row), 1); this.journalObservable.next(this.voucher.journals); - const amount = Math.abs( - this.voucher.journals.map((x) => x.debit * x.amount).reduce((p, c) => p + c, 0), - ); + const amount = Math.abs(this.voucher.journals.map((x) => x.debit * x.amount).reduce((p, c) => p + c, 0)); this.form.controls.addRow.patchValue({ amount: `${amount}`, }); @@ -257,10 +250,7 @@ export class JournalComponent implements OnInit, AfterViewInit, OnDestroy { if (this.voucher.posted && this.auth.allowed('edit-posted-vouchers')) { return true; } - return ( - this.voucher.user.id === (this.auth.user as User).id || - this.auth.allowed("edit-other-user's-vouchers") - ); + return this.voucher.user.id === (this.auth.user as User).id || this.auth.allowed("edit-other-user's-vouchers"); } post() { diff --git a/overlord/src/app/journal/journal.module.ts b/overlord/src/app/journal/journal.module.ts index f1f5972f..f04eb5e2 100644 --- a/overlord/src/app/journal/journal.module.ts +++ b/overlord/src/app/journal/journal.module.ts @@ -7,12 +7,7 @@ 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 { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; diff --git a/overlord/src/app/ledger/ledger-datasource.ts b/overlord/src/app/ledger/ledger-datasource.ts index 65771834..06caf393 100644 --- a/overlord/src/app/ledger/ledger-datasource.ts +++ b/overlord/src/app/ledger/ledger-datasource.ts @@ -8,8 +8,7 @@ import { map } from 'rxjs/operators'; import { LedgerItem } from './ledger-item'; /** Simple sort comparator for example ID/Name columns (for client-side sorting). */ -const compare = (a: string | number, b: string | number, isAsc: boolean) => - (a < b ? -1 : 1) * (isAsc ? 1 : -1); +const compare = (a: string | number, b: string | number, isAsc: boolean) => (a < b ? -1 : 1) * (isAsc ? 1 : -1); export class LedgerDataSource extends DataSource { constructor( public data: LedgerItem[], diff --git a/overlord/src/app/ledger/ledger-routing.module.ts b/overlord/src/app/ledger/ledger-routing.module.ts index 085345b4..41cde0cd 100644 --- a/overlord/src/app/ledger/ledger-routing.module.ts +++ b/overlord/src/app/ledger/ledger-routing.module.ts @@ -12,8 +12,7 @@ const ledgerRoutes: Routes = [ path: '', component: LedgerComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Ledger', @@ -27,8 +26,7 @@ const ledgerRoutes: Routes = [ path: ':id', component: LedgerComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Ledger', diff --git a/overlord/src/app/ledger/ledger.component.html b/overlord/src/app/ledger/ledger.component.html index d3441dfe..c0a6f342 100644 --- a/overlord/src/app/ledger/ledger.component.html +++ b/overlord/src/app/ledger/ledger.component.html @@ -52,14 +52,10 @@ [displayWith]="displayFn" (optionSelected)="selected($event)" > - {{ - account.name - }} + {{ account.name }} - +
@@ -96,34 +92,22 @@ Debit - {{ - row.debit | currency: 'INR' | clear - }} - {{ - debit | currency: 'INR' - }} + {{ row.debit | currency: 'INR' | clear }} + {{ debit | currency: 'INR' }} Credit - {{ - row.credit | currency: 'INR' | clear - }} - {{ - credit | currency: 'INR' - }} + {{ row.credit | currency: 'INR' | clear }} + {{ credit | currency: 'INR' }} Running - {{ - row.running | currency: 'INR' | accounting - }} - {{ - running | currency: 'INR' | accounting - }} + {{ row.running | currency: 'INR' | accounting }} + {{ running | currency: 'INR' | accounting }} diff --git a/overlord/src/app/ledger/ledger.module.ts b/overlord/src/app/ledger/ledger.module.ts index ef2bad5f..3f5a67cb 100644 --- a/overlord/src/app/ledger/ledger.module.ts +++ b/overlord/src/app/ledger/ledger.module.ts @@ -7,12 +7,7 @@ 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 { 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'; diff --git a/overlord/src/app/net-transactions/net-transactions-datasource.ts b/overlord/src/app/net-transactions/net-transactions-datasource.ts index 8d1ac35e..86528951 100644 --- a/overlord/src/app/net-transactions/net-transactions-datasource.ts +++ b/overlord/src/app/net-transactions/net-transactions-datasource.ts @@ -8,8 +8,7 @@ import { map } from 'rxjs/operators'; import { NetTransactionsItem } from './net-transactions-item'; /** Simple sort comparator for example ID/Name columns (for client-side sorting). */ -const compare = (a: string | number, b: string | number, isAsc: boolean) => - (a < b ? -1 : 1) * (isAsc ? 1 : -1); +const compare = (a: string | number, b: string | number, isAsc: boolean) => (a < b ? -1 : 1) * (isAsc ? 1 : -1); export class NetTransactionsDataSource extends DataSource { constructor( public data: NetTransactionsItem[], diff --git a/overlord/src/app/net-transactions/net-transactions-routing.module.ts b/overlord/src/app/net-transactions/net-transactions-routing.module.ts index 8be2b613..f39ed972 100644 --- a/overlord/src/app/net-transactions/net-transactions-routing.module.ts +++ b/overlord/src/app/net-transactions/net-transactions-routing.module.ts @@ -12,8 +12,7 @@ const netTransactionsRoutes: Routes = [ path: '', component: NetTransactionsComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Net Transactions', diff --git a/overlord/src/app/net-transactions/net-transactions.component.html b/overlord/src/app/net-transactions/net-transactions.component.html index 03b64d0c..e123233d 100644 --- a/overlord/src/app/net-transactions/net-transactions.component.html +++ b/overlord/src/app/net-transactions/net-transactions.component.html @@ -29,9 +29,7 @@ - +
@@ -50,17 +48,13 @@ Debit - {{ - row.debit | currency: 'INR' | accounting - }} + {{ row.debit | currency: 'INR' | accounting }} Credit - {{ - row.credit | currency: 'INR' | accounting - }} + {{ row.credit | currency: 'INR' | accounting }} diff --git a/overlord/src/app/net-transactions/net-transactions.module.ts b/overlord/src/app/net-transactions/net-transactions.module.ts index 1e340775..7a6fc47f 100644 --- a/overlord/src/app/net-transactions/net-transactions.module.ts +++ b/overlord/src/app/net-transactions/net-transactions.module.ts @@ -7,12 +7,7 @@ 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 { 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'; diff --git a/overlord/src/app/non-contact-purchase/non-contract-purchase-routing.module.ts b/overlord/src/app/non-contact-purchase/non-contract-purchase-routing.module.ts index 9ae4d4c4..00f08bf5 100644 --- a/overlord/src/app/non-contact-purchase/non-contract-purchase-routing.module.ts +++ b/overlord/src/app/non-contact-purchase/non-contract-purchase-routing.module.ts @@ -12,8 +12,7 @@ const nonContractPurchaseRoutes: Routes = [ path: '', component: NonContractPurchaseComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Product Ledger', diff --git a/overlord/src/app/non-contact-purchase/non-contract-purchase.component.html b/overlord/src/app/non-contact-purchase/non-contract-purchase.component.html index e2dfb65f..58754f26 100644 --- a/overlord/src/app/non-contact-purchase/non-contract-purchase.component.html +++ b/overlord/src/app/non-contact-purchase/non-contract-purchase.component.html @@ -27,17 +27,13 @@ Contract - {{ - row.contractPrice | currency: 'INR' - }} + {{ row.contractPrice | currency: 'INR' }} Purchase - {{ - row.purchasePrice | currency: 'INR' - }} + {{ row.purchasePrice | currency: 'INR' }} diff --git a/overlord/src/app/non-contact-purchase/non-contract-purchase.service.spec.ts b/overlord/src/app/non-contact-purchase/non-contract-purchase.service.spec.ts index c68562c3..b9165ffa 100644 --- a/overlord/src/app/non-contact-purchase/non-contract-purchase.service.spec.ts +++ b/overlord/src/app/non-contact-purchase/non-contract-purchase.service.spec.ts @@ -11,10 +11,7 @@ describe('NonContractPurchaseService', () => { }); }); - it('should be created', inject( - [NonContractPurchaseService], - (service: NonContractPurchaseService) => { - expect(service).toBeTruthy(); - }, - )); + it('should be created', inject([NonContractPurchaseService], (service: NonContractPurchaseService) => { + expect(service).toBeTruthy(); + })); }); diff --git a/overlord/src/app/non-contact-purchase/non-contract-purchase.service.ts b/overlord/src/app/non-contact-purchase/non-contract-purchase.service.ts index b16cffbc..4b46290f 100644 --- a/overlord/src/app/non-contact-purchase/non-contract-purchase.service.ts +++ b/overlord/src/app/non-contact-purchase/non-contract-purchase.service.ts @@ -22,8 +22,6 @@ export class NonContractPurchaseService { nonContractPurchase(): Observable { return this.http .post(url, {}) - .pipe(catchError(this.log.handleError(serviceName, 'nonContractPurchase'))) as Observable< - NonContractPurchase[] - >; + .pipe(catchError(this.log.handleError(serviceName, 'nonContractPurchase'))) as Observable; } } diff --git a/overlord/src/app/payment/payment-dialog.component.html b/overlord/src/app/payment/payment-dialog.component.html index 1a4371c9..74f1a68d 100644 --- a/overlord/src/app/payment/payment-dialog.component.html +++ b/overlord/src/app/payment/payment-dialog.component.html @@ -13,8 +13,8 @@ autocomplete="off" /> - Balance as on Date: {{ accBal.date | currency: 'INR' | accounting }} / - Final balance: {{ accBal.total | currency: 'INR' | accounting }} + Balance as on Date: {{ accBal.date | currency: 'INR' | accounting }} / Final balance: + {{ accBal.total | currency: 'INR' | accounting }} - {{ - account.name - }} + {{ account.name }} Amount @@ -36,8 +34,6 @@
- +
diff --git a/overlord/src/app/payment/payment-routing.module.ts b/overlord/src/app/payment/payment-routing.module.ts index 38f1ef58..aabd46cb 100644 --- a/overlord/src/app/payment/payment-routing.module.ts +++ b/overlord/src/app/payment/payment-routing.module.ts @@ -13,8 +13,7 @@ const paymentRoutes: Routes = [ path: '', component: PaymentComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'journal', @@ -29,8 +28,7 @@ const paymentRoutes: Routes = [ path: ':id', component: PaymentComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'journal', diff --git a/overlord/src/app/payment/payment.component.html b/overlord/src/app/payment/payment.component.html index b2f60dbe..45ef43b1 100644 --- a/overlord/src/app/payment/payment.component.html +++ b/overlord/src/app/payment/payment.component.html @@ -42,10 +42,7 @@
-
+
Account - Balance as on Date: {{ accBal.date | currency: 'INR' | accounting }} / - Final balance: {{ accBal.total | currency: 'INR' | accounting }} + Balance as on Date: {{ accBal.date | currency: 'INR' | accounting }} / Final balance: + {{ accBal.total | currency: 'INR' | accounting }} - {{ - account.name - }} + {{ account.name }} Amount @@ -77,9 +72,7 @@ ₹  - +
@@ -91,9 +84,7 @@ Amount - {{ - row.amount | currency: 'INR' - }} + {{ row.amount | currency: 'INR' }} @@ -117,11 +108,7 @@
-
+
- diff --git a/overlord/src/app/payment/payment.component.ts b/overlord/src/app/payment/payment.component.ts index 8d2ebee6..fe0e1690 100644 --- a/overlord/src/app/payment/payment.component.ts +++ b/overlord/src/app/payment/payment.component.ts @@ -184,9 +184,7 @@ export class PaymentComponent implements OnInit, AfterViewInit, OnDestroy { if (this.account === null || amount <= 0) { return; } - const oldFiltered = this.voucher.journals.filter( - (x) => x.account.id === (this.account as Account).id, - ); + const oldFiltered = this.voucher.journals.filter((x) => x.account.id === (this.account as Account).id); const old = oldFiltered.length ? oldFiltered[0] : null; if (old && (old.debit === -1 || old.id === this.paymentJournal.id)) { return; @@ -221,10 +219,7 @@ export class PaymentComponent implements OnInit, AfterViewInit, OnDestroy { updateView() { const journals = this.voucher.journals.filter((x) => x.debit === 1); this.journalObservable.next(journals); - this.paymentJournal.amount = round( - Math.abs(journals.map((x) => x.amount).reduce((p, c) => p + c, 0)), - 2, - ); + this.paymentJournal.amount = round(Math.abs(journals.map((x) => x.amount).reduce((p, c) => p + c, 0)), 2); this.form.controls.paymentAmount.setValue(this.paymentJournal.amount); } @@ -265,10 +260,7 @@ export class PaymentComponent implements OnInit, AfterViewInit, OnDestroy { if (this.voucher.posted && this.auth.allowed('edit-posted-vouchers')) { return true; } - return ( - this.voucher.user.id === (this.auth.user as User).id || - this.auth.allowed("edit-other-user's-vouchers") - ); + return this.voucher.user.id === (this.auth.user as User).id || this.auth.allowed("edit-other-user's-vouchers"); } post() { diff --git a/overlord/src/app/payment/payment.module.ts b/overlord/src/app/payment/payment.module.ts index 3b826a99..3086d45b 100644 --- a/overlord/src/app/payment/payment.module.ts +++ b/overlord/src/app/payment/payment.module.ts @@ -7,12 +7,7 @@ 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 { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; diff --git a/overlord/src/app/period/period-detail/period-detail.component.html b/overlord/src/app/period/period-detail/period-detail.component.html index 40321006..b119ef37 100644 --- a/overlord/src/app/period/period-detail/period-detail.component.html +++ b/overlord/src/app/period/period-detail/period-detail.component.html @@ -7,12 +7,7 @@
Valid From - + @@ -20,12 +15,7 @@
Valid Till - + @@ -34,8 +24,6 @@ - + diff --git a/overlord/src/app/period/period-routing.module.ts b/overlord/src/app/period/period-routing.module.ts index 5a7a5252..0ee021c7 100644 --- a/overlord/src/app/period/period-routing.module.ts +++ b/overlord/src/app/period/period-routing.module.ts @@ -15,8 +15,7 @@ const periodRoutes: Routes = [ path: '', component: PeriodListComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Recipes', @@ -29,8 +28,7 @@ const periodRoutes: Routes = [ path: 'new', component: PeriodDetailComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Recipes', @@ -44,8 +42,7 @@ const periodRoutes: Routes = [ path: ':id', component: PeriodDetailComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Recipes', diff --git a/overlord/src/app/product-group/product-group-list-resolver.service.spec.ts b/overlord/src/app/product-group/product-group-list-resolver.service.spec.ts index b4753054..f46a3c66 100644 --- a/overlord/src/app/product-group/product-group-list-resolver.service.spec.ts +++ b/overlord/src/app/product-group/product-group-list-resolver.service.spec.ts @@ -12,10 +12,7 @@ describe('ProductGroupListResolver', () => { }); }); - it('should be created', inject( - [ProductGroupListResolver], - (service: ProductGroupListResolver) => { - expect(service).toBeTruthy(); - }, - )); + it('should be created', inject([ProductGroupListResolver], (service: ProductGroupListResolver) => { + expect(service).toBeTruthy(); + })); }); diff --git a/overlord/src/app/product-group/product-group-list/product-group-list-datasource.ts b/overlord/src/app/product-group/product-group-list/product-group-list-datasource.ts index afa990b1..7d053950 100644 --- a/overlord/src/app/product-group/product-group-list/product-group-list-datasource.ts +++ b/overlord/src/app/product-group/product-group-list/product-group-list-datasource.ts @@ -8,8 +8,7 @@ import { map } from 'rxjs/operators'; import { ProductGroup } from '../../core/product-group'; /** Simple sort comparator for example ID/Name columns (for client-side sorting). */ -const compare = (a: string | number, b: string | number, isAsc: boolean) => - (a < b ? -1 : 1) * (isAsc ? 1 : -1); +const compare = (a: string | number, b: string | number, isAsc: boolean) => (a < b ? -1 : 1) * (isAsc ? 1 : -1); export class ProductGroupListDataSource extends DataSource { constructor( public data: ProductGroup[], diff --git a/overlord/src/app/product-group/product-group-routing.module.ts b/overlord/src/app/product-group/product-group-routing.module.ts index 0830f7f8..ac7e09d3 100644 --- a/overlord/src/app/product-group/product-group-routing.module.ts +++ b/overlord/src/app/product-group/product-group-routing.module.ts @@ -14,8 +14,7 @@ const productGroupRoutes: Routes = [ path: '', component: ProductGroupListComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Cost Centres', @@ -28,8 +27,7 @@ const productGroupRoutes: Routes = [ path: 'new', component: ProductGroupDetailComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Cost Centres', @@ -42,8 +40,7 @@ const productGroupRoutes: Routes = [ path: ':id', component: ProductGroupDetailComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Cost Centres', diff --git a/overlord/src/app/product-group/product-group.service.ts b/overlord/src/app/product-group/product-group.service.ts index 217e78bd..de4cc245 100644 --- a/overlord/src/app/product-group/product-group.service.ts +++ b/overlord/src/app/product-group/product-group.service.ts @@ -22,9 +22,7 @@ export class ProductGroupService { const getUrl: string = id === null ? `${url}` : `${url}/${id}`; return this.http .get(getUrl) - .pipe( - catchError(this.log.handleError(serviceName, `get id=${id}`)), - ) as Observable; + .pipe(catchError(this.log.handleError(serviceName, `get id=${id}`))) as Observable; } list(): Observable { diff --git a/overlord/src/app/product-ledger/product-ledger-datasource.ts b/overlord/src/app/product-ledger/product-ledger-datasource.ts index ddf08515..6d827988 100644 --- a/overlord/src/app/product-ledger/product-ledger-datasource.ts +++ b/overlord/src/app/product-ledger/product-ledger-datasource.ts @@ -8,8 +8,7 @@ import { map } from 'rxjs/operators'; import { ProductLedgerItem } from './product-ledger-item'; /** Simple sort comparator for example ID/Name columns (for client-side sorting). */ -const compare = (a: string | number, b: string | number, isAsc: boolean) => - (a < b ? -1 : 1) * (isAsc ? 1 : -1); +const compare = (a: string | number, b: string | number, isAsc: boolean) => (a < b ? -1 : 1) * (isAsc ? 1 : -1); export class ProductLedgerDataSource extends DataSource { constructor( public data: ProductLedgerItem[], @@ -63,13 +62,13 @@ export class ProductLedgerDataSource extends DataSource { case 'date': return compare(a.date, b.date, isAsc); case 'debitQuantity': - return compare(+a.debitQuantity, +b.debitQuantity, isAsc); + return compare(Number(a.debitQuantity ?? '0'), Number(b.debitQuantity ?? '0'), isAsc); case 'debitAmount': - return compare(+a.debitAmount, +b.debitAmount, isAsc); + return compare(Number(a.debitAmount ?? '0'), Number(b.debitAmount ?? '0'), isAsc); case 'creditQuantity': - return compare(+a.creditQuantity, +b.creditQuantity, isAsc); + return compare(Number(a.creditQuantity ?? '0'), Number(b.creditQuantity ?? '0'), isAsc); case 'creditAmount': - return compare(+a.creditAmount, +b.creditAmount, isAsc); + return compare(Number(a.creditAmount ?? '0'), Number(b.creditAmount ?? '0'), isAsc); default: return 0; } diff --git a/overlord/src/app/product-ledger/product-ledger-item.ts b/overlord/src/app/product-ledger/product-ledger-item.ts index 74b06cc4..a3d5a3bc 100644 --- a/overlord/src/app/product-ledger/product-ledger-item.ts +++ b/overlord/src/app/product-ledger/product-ledger-item.ts @@ -4,11 +4,11 @@ export class ProductLedgerItem { name: string; type: string; narration: string; - debitQuantity: number; - debitAmount: number; + debitQuantity: number | null; + debitAmount: number | null; debitUnit: string; - creditQuantity: number; - creditAmount: number; + creditQuantity: number | null; + creditAmount: number | null; creditUnit: string; runningQuantity: number; runningAmount: number; @@ -21,11 +21,11 @@ export class ProductLedgerItem { this.name = ''; this.type = ''; this.narration = ''; - this.debitQuantity = 0; - this.debitAmount = 0; + this.debitQuantity = null; + this.debitAmount = null; this.debitUnit = ''; - this.creditQuantity = 0; - this.creditAmount = 0; + this.creditQuantity = null; + this.creditAmount = null; this.creditUnit = ''; this.runningQuantity = 0; this.runningAmount = 0; diff --git a/overlord/src/app/product-ledger/product-ledger-routing.module.ts b/overlord/src/app/product-ledger/product-ledger-routing.module.ts index 81e229c1..104f9d42 100644 --- a/overlord/src/app/product-ledger/product-ledger-routing.module.ts +++ b/overlord/src/app/product-ledger/product-ledger-routing.module.ts @@ -12,8 +12,7 @@ const productLedgerRoutes: Routes = [ path: '', component: ProductLedgerComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Product Ledger', @@ -27,8 +26,7 @@ const productLedgerRoutes: Routes = [ path: ':id', component: ProductLedgerComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Product Ledger', diff --git a/overlord/src/app/product-ledger/product-ledger.component.html b/overlord/src/app/product-ledger/product-ledger.component.html index 55418ec8..9f9765b9 100644 --- a/overlord/src/app/product-ledger/product-ledger.component.html +++ b/overlord/src/app/product-ledger/product-ledger.component.html @@ -52,14 +52,10 @@ [displayWith]="displayFn" (optionSelected)="selected($event)" > - {{ - product.name - }} + {{ product.name }} - +
@@ -95,70 +91,48 @@ - Debit Quantity + Dr. Quantity {{ row.debitQuantity | number: '1.2-2' }} {{ row.debitUnit }} - {{ - debitQuantity | number: '1.2-2' - }} + {{ debitQuantity | number: '1.2-2' }} - Amount - {{ - row.debitAmount | currency: 'INR' - }} - {{ - debitAmount | currency: 'INR' - }} + Dr. Amount + {{ row.debitAmount | currency: 'INR' }} + {{ debitAmount | currency: 'INR' }} - Credit + Cr. Quantity {{ row.creditQuantity | number: '1.2-2' }} {{ row.creditUnit }} - {{ - creditQuantity | number: '1.2-2' - }} + {{ creditQuantity | number: '1.2-2' }} - Credit - {{ - row.creditAmount | currency: 'INR' - }} - {{ - creditAmount | currency: 'INR' - }} + Cr. Amount + {{ row.creditAmount | currency: 'INR' }} + {{ creditAmount | currency: 'INR' }} - Running - {{ - row.runningQuantity | number: '1.2-2' - }} - {{ - runningQuantity | number: '1.2-2' - }} + Quantity + {{ row.runningQuantity | number: '1.2-2' }} + {{ runningQuantity | number: '1.2-2' }} - Running - {{ - row.runningAmount | currency: 'INR' - }} - {{ - runningAmount | currency: 'INR' - }} + Amount + {{ row.runningAmount | currency: 'INR' }} + {{ runningAmount | currency: 'INR' }} diff --git a/overlord/src/app/product-ledger/product-ledger.component.ts b/overlord/src/app/product-ledger/product-ledger.component.ts index 1b743f94..f161d198 100644 --- a/overlord/src/app/product-ledger/product-ledger.component.ts +++ b/overlord/src/app/product-ledger/product-ledger.component.ts @@ -73,9 +73,7 @@ export class ProductLedgerComponent implements OnInit, AfterViewInit { this.products = this.form.controls.product.valueChanges.pipe( debounceTime(150), distinctUntilChanged(), - switchMap((x) => - x === null ? observableOf([]) : this.productSer.autocompleteProduct(x, null), - ), + switchMap((x) => (x === null ? observableOf([]) : this.productSer.autocompleteProduct(x, null))), ); } @@ -115,12 +113,12 @@ export class ProductLedgerComponent implements OnInit, AfterViewInit { this.runningAmount = 0; this.info.body.forEach((item) => { if (item.type !== 'Opening Balance') { - this.debitAmount += item.debitAmount; - this.creditQuantity += item.creditQuantity; - this.creditAmount += item.creditAmount; + this.debitAmount += Number(item.debitAmount ?? '0'); + this.creditQuantity += Number(item.creditQuantity ?? '0'); + this.creditAmount += Number(item.creditAmount ?? '0'); } - this.runningQuantity += item.debitQuantity - item.creditQuantity; - this.runningAmount += item.debitAmount - item.creditAmount; + this.runningQuantity += Number(item.debitQuantity ?? '0') - Number(item.creditQuantity ?? '0'); + this.runningAmount += Number(item.debitAmount ?? '0') - Number(item.creditAmount ?? '0'); item.runningQuantity = this.runningQuantity; item.runningAmount = this.runningAmount; }); diff --git a/overlord/src/app/product-ledger/product-ledger.module.ts b/overlord/src/app/product-ledger/product-ledger.module.ts index 1a0ed1d8..1318ebf3 100644 --- a/overlord/src/app/product-ledger/product-ledger.module.ts +++ b/overlord/src/app/product-ledger/product-ledger.module.ts @@ -7,12 +7,7 @@ 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 { 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'; diff --git a/overlord/src/app/product-ledger/product-ledger.service.ts b/overlord/src/app/product-ledger/product-ledger.service.ts index b8cd55e3..249014c5 100644 --- a/overlord/src/app/product-ledger/product-ledger.service.ts +++ b/overlord/src/app/product-ledger/product-ledger.service.ts @@ -19,11 +19,7 @@ export class ProductLedgerService { private log: ErrorLoggerService, ) {} - list( - id: string | null, - startDate: string | null, - finishDate: string | null, - ): Observable { + list(id: string | null, startDate: string | null, finishDate: string | null): Observable { const listUrl = id === null ? url : `${url}/${id}`; const options = { params: new HttpParams() }; if (startDate !== null) { diff --git a/overlord/src/app/product/product-detail/product-detail-dialog.component.html b/overlord/src/app/product/product-detail/product-detail-dialog.component.html index 6c66e006..eb22cb6a 100644 --- a/overlord/src/app/product/product-detail/product-detail-dialog.component.html +++ b/overlord/src/app/product/product-detail/product-detail-dialog.component.html @@ -1,9 +1,7 @@

Edit Product SKU

-
+
Units @@ -28,8 +26,6 @@
- +
diff --git a/overlord/src/app/product/product-detail/product-detail.component.html b/overlord/src/app/product/product-detail/product-detail.component.html index 930b609e..69d6e2d3 100644 --- a/overlord/src/app/product/product-detail/product-detail.component.html +++ b/overlord/src/app/product/product-detail/product-detail.component.html @@ -21,9 +21,7 @@
- Is Purchased? + Is Purchased? Is Sold? Is Active?
@@ -87,17 +85,13 @@ Cost Price - {{ - row.costPrice | currency: 'INR' - }} + {{ row.costPrice | currency: 'INR' }} Sale Price - {{ - row.salePrice | currency: 'INR' - }} + {{ row.salePrice | currency: 'INR' }} @@ -119,8 +113,6 @@ - + diff --git a/overlord/src/app/product/product-list/product-list-datasource.ts b/overlord/src/app/product/product-list/product-list-datasource.ts index 5755a2d8..c7ee9382 100644 --- a/overlord/src/app/product/product-list/product-list-datasource.ts +++ b/overlord/src/app/product/product-list/product-list-datasource.ts @@ -51,9 +51,9 @@ export class ProductListDataSource extends DataSource { return this.filterValue.split(' ').reduce( (p: Product[], c: string) => p.filter((x) => { - const productString = `${x.code} ${x.name} ${x.productGroup?.name}${ - x.isPurchased ? ' purchased' : ' made' - }${x.isSold ? 'sold' : 'used'}${x.isActive ? 'active' : 'deactive'}`.toLowerCase(); + const productString = `${x.code} ${x.name} ${x.productGroup?.name}${x.isPurchased ? ' purchased' : ' made'}${ + x.isSold ? 'sold' : 'used' + }${x.isActive ? 'active' : 'deactive'}`.toLowerCase(); return productString.indexOf(c) !== -1; }), Object.assign([], data), @@ -83,11 +83,7 @@ export class ProductListDataSource extends DataSource { case 'name': return compare(a.name, b.name, isAsc); case 'productGroup': - return compare( - (a.productGroup as ProductGroup).name, - (b.productGroup as ProductGroup).name, - isAsc, - ); + return compare((a.productGroup as ProductGroup).name, (b.productGroup as ProductGroup).name, isAsc); default: return 0; } @@ -96,5 +92,4 @@ export class ProductListDataSource extends DataSource { } /** Simple sort comparator for example ID/Name columns (for client-side sorting). */ -const compare = (a: string | number, b: string | number, isAsc: boolean) => - (a < b ? -1 : 1) * (isAsc ? 1 : -1); +const compare = (a: string | number, b: string | number, isAsc: boolean) => (a < b ? -1 : 1) * (isAsc ? 1 : -1); diff --git a/overlord/src/app/product/product-list/product-list.component.html b/overlord/src/app/product/product-list/product-list.component.html index 7ade60a3..0788b09d 100644 --- a/overlord/src/app/product/product-list/product-list.component.html +++ b/overlord/src/app/product/product-list/product-list.component.html @@ -28,8 +28,7 @@
  • {{ row.name }} ({{ - showExtended ? sku.fraction + ' ' + row.fractionUnits + ' = 1 ' : '' + >{{ row.name }} ({{ showExtended ? sku.fraction + ' ' + row.fractionUnits + ' = 1 ' : '' }}{{ sku.units }})
    • diff --git a/overlord/src/app/product/product-list/product-list.component.ts b/overlord/src/app/product/product-list/product-list.component.ts index b1e9436f..4241cd99 100644 --- a/overlord/src/app/product/product-list/product-list.component.ts +++ b/overlord/src/app/product/product-list/product-list.component.ts @@ -40,10 +40,7 @@ export class ProductListComponent implements OnInit, AfterViewInit { this.form = new FormGroup({ filter: new FormControl('', { nonNullable: true }), }); - this.filter = this.form.controls.filter.valueChanges.pipe( - debounceTime(150), - distinctUntilChanged(), - ); + this.filter = this.form.controls.filter.valueChanges.pipe(debounceTime(150), distinctUntilChanged()); this.dataSource = new ProductListDataSource(this.list, this.filter); } diff --git a/overlord/src/app/product/product-routing.module.ts b/overlord/src/app/product/product-routing.module.ts index 46b86fca..71aea44d 100644 --- a/overlord/src/app/product/product-routing.module.ts +++ b/overlord/src/app/product/product-routing.module.ts @@ -15,8 +15,7 @@ const productRoutes: Routes = [ path: '', component: ProductListComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Products', @@ -29,8 +28,7 @@ const productRoutes: Routes = [ path: 'new', component: ProductDetailComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Products', @@ -44,8 +42,7 @@ const productRoutes: Routes = [ path: ':id', component: ProductDetailComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Products', diff --git a/overlord/src/app/product/product.service.ts b/overlord/src/app/product/product.service.ts index 8fdf76e0..f6680596 100644 --- a/overlord/src/app/product/product.service.ts +++ b/overlord/src/app/product/product.service.ts @@ -64,9 +64,7 @@ export class ProductService { } return this.http .get(`${url}/q-product`, options) - .pipe(catchError(this.log.handleError(serviceName, 'autocomplete'))) as Observable< - ProductSku[] - >; + .pipe(catchError(this.log.handleError(serviceName, 'autocomplete'))) as Observable; } autocompleteSku( @@ -86,8 +84,6 @@ export class ProductService { } return this.http .get(`${url}/q-sku`, options) - .pipe(catchError(this.log.handleError(serviceName, 'autocomplete'))) as Observable< - ProductSku[] - >; + .pipe(catchError(this.log.handleError(serviceName, 'autocomplete'))) as Observable; } } diff --git a/overlord/src/app/profit-loss/profit-loss-datasource.ts b/overlord/src/app/profit-loss/profit-loss-datasource.ts index c422fe65..94918161 100644 --- a/overlord/src/app/profit-loss/profit-loss-datasource.ts +++ b/overlord/src/app/profit-loss/profit-loss-datasource.ts @@ -8,8 +8,7 @@ import { map } from 'rxjs/operators'; import { ProfitLossItem } from './profit-loss-item'; /** Simple sort comparator for example ID/Name columns (for client-side sorting). */ -const compare = (a: string | number, b: string | number, isAsc: boolean) => - (a < b ? -1 : 1) * (isAsc ? 1 : -1); +const compare = (a: string | number, b: string | number, isAsc: boolean) => (a < b ? -1 : 1) * (isAsc ? 1 : -1); export class ProfitLossDataSource extends DataSource { constructor( public data: ProfitLossItem[], diff --git a/overlord/src/app/profit-loss/profit-loss-routing.module.ts b/overlord/src/app/profit-loss/profit-loss-routing.module.ts index fa0f6ef7..9c55251e 100644 --- a/overlord/src/app/profit-loss/profit-loss-routing.module.ts +++ b/overlord/src/app/profit-loss/profit-loss-routing.module.ts @@ -12,8 +12,7 @@ const profitLossRoutes: Routes = [ path: '', component: ProfitLossComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Profit & Loss', diff --git a/overlord/src/app/profit-loss/profit-loss.component.html b/overlord/src/app/profit-loss/profit-loss.component.html index 609fd157..587226bb 100644 --- a/overlord/src/app/profit-loss/profit-loss.component.html +++ b/overlord/src/app/profit-loss/profit-loss.component.html @@ -29,9 +29,7 @@ - +
diff --git a/overlord/src/app/profit-loss/profit-loss.module.ts b/overlord/src/app/profit-loss/profit-loss.module.ts index ac503ef0..23d0b426 100644 --- a/overlord/src/app/profit-loss/profit-loss.module.ts +++ b/overlord/src/app/profit-loss/profit-loss.module.ts @@ -7,12 +7,7 @@ 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 { 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'; diff --git a/overlord/src/app/purchase-entries/purchase-entries-datasource.ts b/overlord/src/app/purchase-entries/purchase-entries-datasource.ts index d61ae810..1432aa1f 100644 --- a/overlord/src/app/purchase-entries/purchase-entries-datasource.ts +++ b/overlord/src/app/purchase-entries/purchase-entries-datasource.ts @@ -8,8 +8,7 @@ import { map } from 'rxjs/operators'; import { PurchaseEntriesItem } from './purchase-entries-item'; /** Simple sort comparator for example ID/Name columns (for client-side sorting). */ -const compare = (a: string | number, b: string | number, isAsc: boolean) => - (a < b ? -1 : 1) * (isAsc ? 1 : -1); +const compare = (a: string | number, b: string | number, isAsc: boolean) => (a < b ? -1 : 1) * (isAsc ? 1 : -1); export class PurchaseEntriesDataSource extends DataSource { constructor( public data: PurchaseEntriesItem[], diff --git a/overlord/src/app/purchase-entries/purchase-entries-routing.module.ts b/overlord/src/app/purchase-entries/purchase-entries-routing.module.ts index 885985a8..9435f478 100644 --- a/overlord/src/app/purchase-entries/purchase-entries-routing.module.ts +++ b/overlord/src/app/purchase-entries/purchase-entries-routing.module.ts @@ -12,8 +12,7 @@ const purchaseEntriesRoutes: Routes = [ path: '', component: PurchaseEntriesComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Purchase Entries', diff --git a/overlord/src/app/purchase-entries/purchase-entries.component.html b/overlord/src/app/purchase-entries/purchase-entries.component.html index 4030d3ed..a7c240f1 100644 --- a/overlord/src/app/purchase-entries/purchase-entries.component.html +++ b/overlord/src/app/purchase-entries/purchase-entries.component.html @@ -29,9 +29,7 @@ - +
@@ -58,9 +56,7 @@ Quantity - {{ - row.quantity | number: '1.2-2' - }} + {{ row.quantity | number: '1.2-2' }} @@ -78,9 +74,7 @@ Discount - {{ - row.discount | percent: '1.2-2' - }} + {{ row.discount | percent: '1.2-2' }} diff --git a/overlord/src/app/purchase-entries/purchase-entries.component.ts b/overlord/src/app/purchase-entries/purchase-entries.component.ts index 64d5626e..82880c82 100644 --- a/overlord/src/app/purchase-entries/purchase-entries.component.ts +++ b/overlord/src/app/purchase-entries/purchase-entries.component.ts @@ -25,16 +25,7 @@ export class PurchaseEntriesComponent implements OnInit { selectedRowId = ''; /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */ - displayedColumns = [ - 'date', - 'supplier', - 'product', - 'quantity', - 'rate', - 'tax', - 'discount', - 'amount', - ]; + displayedColumns = ['date', 'supplier', 'product', 'quantity', 'rate', 'tax', 'discount', 'amount']; constructor( private route: ActivatedRoute, diff --git a/overlord/src/app/purchase-entries/purchase-entries.module.ts b/overlord/src/app/purchase-entries/purchase-entries.module.ts index f49b1be8..20f4ae71 100644 --- a/overlord/src/app/purchase-entries/purchase-entries.module.ts +++ b/overlord/src/app/purchase-entries/purchase-entries.module.ts @@ -7,12 +7,7 @@ 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 { 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'; diff --git a/overlord/src/app/purchase-return/purchase-return-dialog.component.html b/overlord/src/app/purchase-return/purchase-return-dialog.component.html index f1f377b7..3b373f88 100644 --- a/overlord/src/app/purchase-return/purchase-return-dialog.component.html +++ b/overlord/src/app/purchase-return/purchase-return-dialog.component.html @@ -18,9 +18,7 @@ [displayWith]="displayFn" (optionSelected)="batchSelected($event)" > - {{ - batch.name - }} + {{ batch.name }} @@ -31,8 +29,6 @@
- +
diff --git a/overlord/src/app/purchase-return/purchase-return-dialog.component.ts b/overlord/src/app/purchase-return/purchase-return-dialog.component.ts index c75c5f10..4295a715 100644 --- a/overlord/src/app/purchase-return/purchase-return-dialog.component.ts +++ b/overlord/src/app/purchase-return/purchase-return-dialog.component.ts @@ -38,9 +38,7 @@ export class PurchaseReturnDialogComponent implements OnInit { this.batches = this.form.controls.batch.valueChanges.pipe( debounceTime(150), distinctUntilChanged(), - switchMap((x) => - x === null ? observableOf([]) : this.batchSer.autocomplete(this.data.date, x), - ), + switchMap((x) => (x === null ? observableOf([]) : this.batchSer.autocomplete(this.data.date, x))), ); } @@ -68,8 +66,7 @@ export class PurchaseReturnDialogComponent implements OnInit { this.data.inventory.rate = this.batch.rate; this.data.inventory.tax = this.batch.tax; this.data.inventory.discount = this.batch.discount; - this.data.inventory.amount = - quantity * this.batch.rate * (1 + this.batch.tax) * (1 - this.batch.discount); + this.data.inventory.amount = quantity * this.batch.rate * (1 + this.batch.tax) * (1 - this.batch.discount); this.dialogRef.close(this.data.inventory); } } diff --git a/overlord/src/app/purchase-return/purchase-return-routing.module.ts b/overlord/src/app/purchase-return/purchase-return-routing.module.ts index 810ac80d..db7f3c77 100644 --- a/overlord/src/app/purchase-return/purchase-return-routing.module.ts +++ b/overlord/src/app/purchase-return/purchase-return-routing.module.ts @@ -12,8 +12,7 @@ const purchaseReturnRoutes: Routes = [ path: '', component: PurchaseReturnComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Purchase Return', @@ -27,8 +26,7 @@ const purchaseReturnRoutes: Routes = [ path: ':id', component: PurchaseReturnComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Purchase Return', diff --git a/overlord/src/app/purchase-return/purchase-return.component.html b/overlord/src/app/purchase-return/purchase-return.component.html index 934a48c7..3981c860 100644 --- a/overlord/src/app/purchase-return/purchase-return.component.html +++ b/overlord/src/app/purchase-return/purchase-return.component.html @@ -39,8 +39,8 @@ autocomplete="off" /> - Balance as on Date: {{ accBal.date | currency: 'INR' | accounting }} / - Final balance: {{ accBal.total | currency: 'INR' | accounting }} + Balance as on Date: {{ accBal.date | currency: 'INR' | accounting }} / Final balance: + {{ accBal.total | currency: 'INR' | accounting }} - {{ - account.name - }} + {{ account.name }} @@ -60,10 +58,7 @@
-
+
Product - {{ - batch.name - }} + {{ batch.name }} @@ -90,9 +83,7 @@ - +
@@ -104,9 +95,7 @@ Quantity - {{ - row.quantity | number: '1.2-2' - }} + {{ row.quantity | number: '1.2-2' }} @@ -124,17 +113,13 @@ Discount - {{ - row.discount | percent: '1.2-2' - }} + {{ row.discount | percent: '1.2-2' }} Amount - {{ - row.amount | currency: 'INR' - }} + {{ row.amount | currency: 'INR' }} @@ -158,11 +143,7 @@
-
+
- diff --git a/overlord/src/app/purchase-return/purchase-return.component.ts b/overlord/src/app/purchase-return/purchase-return.component.ts index 3c46d7aa..5154c4ba 100644 --- a/overlord/src/app/purchase-return/purchase-return.component.ts +++ b/overlord/src/app/purchase-return/purchase-return.component.ts @@ -261,10 +261,7 @@ export class PurchaseReturnComponent implements OnInit, AfterViewInit, OnDestroy if (this.voucher.posted && this.auth.allowed('edit-posted-vouchers')) { return true; } - return ( - this.voucher.user.id === (this.auth.user as User).id || - this.auth.allowed("edit-other-user's-vouchers") - ); + return this.voucher.user.id === (this.auth.user as User).id || this.auth.allowed("edit-other-user's-vouchers"); } post() { diff --git a/overlord/src/app/purchase-return/purchase-return.module.ts b/overlord/src/app/purchase-return/purchase-return.module.ts index 12389758..82075e69 100644 --- a/overlord/src/app/purchase-return/purchase-return.module.ts +++ b/overlord/src/app/purchase-return/purchase-return.module.ts @@ -7,12 +7,7 @@ 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 { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; diff --git a/overlord/src/app/purchase/purchase-dialog.component.html b/overlord/src/app/purchase/purchase-dialog.component.html index cb090f60..bfd26fb0 100644 --- a/overlord/src/app/purchase/purchase-dialog.component.html +++ b/overlord/src/app/purchase/purchase-dialog.component.html @@ -18,9 +18,7 @@ [displayWith]="displayFn" (optionSelected)="productSelected($event)" > - {{ - product.name - }} + {{ product.name }} @@ -43,8 +41,6 @@
- +
diff --git a/overlord/src/app/purchase/purchase-routing.module.ts b/overlord/src/app/purchase/purchase-routing.module.ts index 2b1f4e7b..e52cd2bd 100644 --- a/overlord/src/app/purchase/purchase-routing.module.ts +++ b/overlord/src/app/purchase/purchase-routing.module.ts @@ -12,8 +12,7 @@ const purchaseRoutes: Routes = [ path: '', component: PurchaseComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Purchase', @@ -27,8 +26,7 @@ const purchaseRoutes: Routes = [ path: ':id', component: PurchaseComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Purchase', diff --git a/overlord/src/app/purchase/purchase.component.html b/overlord/src/app/purchase/purchase.component.html index 15062fc0..d28a9adb 100644 --- a/overlord/src/app/purchase/purchase.component.html +++ b/overlord/src/app/purchase/purchase.component.html @@ -39,8 +39,8 @@ autocomplete="off" /> - Balance as on Date: {{ accBal.date | currency: 'INR' | accounting }} / - Final balance: {{ accBal.total | currency: 'INR' | accounting }} + Balance as on Date: {{ accBal.date | currency: 'INR' | accounting }} / Final balance: + {{ accBal.total | currency: 'INR' | accounting }} - {{ - account.name - }} + {{ account.name }} @@ -60,10 +58,7 @@
-
+
Product - {{ - product.name - }} + {{ product.name }} @@ -102,9 +95,7 @@ - +
@@ -116,9 +107,7 @@ Quantity - {{ - row.quantity | number: '1.2-2' - }} + {{ row.quantity | number: '1.2-2' }} @@ -136,17 +125,13 @@ Discount - {{ - row.discount | percent: '1.2-2' - }} + {{ row.discount | percent: '1.2-2' }} Amount - {{ - row.amount | currency: 'INR' - }} + {{ row.amount | currency: 'INR' }} @@ -170,11 +155,7 @@
-
+
- diff --git a/overlord/src/app/purchase/purchase.component.ts b/overlord/src/app/purchase/purchase.component.ts index c3d17aab..0ea20ac4 100644 --- a/overlord/src/app/purchase/purchase.component.ts +++ b/overlord/src/app/purchase/purchase.component.ts @@ -210,15 +210,11 @@ export class PurchaseComponent implements OnInit, AfterViewInit, OnDestroy { ? (this.product.costPrice as number) : this.math.parseAmount(formValue.price, 2); const tax = this.product.isRateContracted ? 0 : this.math.parseAmount(formValue.tax, 5); - const discount = this.product.isRateContracted - ? 0 - : this.math.parseAmount(formValue.discount, 5); + const discount = this.product.isRateContracted ? 0 : this.math.parseAmount(formValue.discount, 5); if ((price as number) <= 0 || (tax as number) < 0 || (discount as number) < 0) { return; } - const oldFiltered = this.voucher.inventories.filter( - (x) => x.batch?.sku.id === (this.product as ProductSku).id, - ); + const oldFiltered = this.voucher.inventories.filter((x) => x.batch?.sku.id === (this.product as ProductSku).id); if (oldFiltered.length) { this.toaster.show('Danger', 'Product already added'); return; @@ -291,10 +287,7 @@ export class PurchaseComponent implements OnInit, AfterViewInit, OnDestroy { if (this.voucher.posted && this.auth.allowed('edit-posted-vouchers')) { return true; } - return ( - this.voucher.user.id === (this.auth.user as User).id || - this.auth.allowed("edit-other-user's-vouchers") - ); + return this.voucher.user.id === (this.auth.user as User).id || this.auth.allowed("edit-other-user's-vouchers"); } post() { diff --git a/overlord/src/app/purchase/purchase.module.ts b/overlord/src/app/purchase/purchase.module.ts index 68de665a..9b272815 100644 --- a/overlord/src/app/purchase/purchase.module.ts +++ b/overlord/src/app/purchase/purchase.module.ts @@ -7,12 +7,7 @@ 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 { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; diff --git a/overlord/src/app/purchases/purchases-datasource.ts b/overlord/src/app/purchases/purchases-datasource.ts index e164d038..24d8b2b8 100644 --- a/overlord/src/app/purchases/purchases-datasource.ts +++ b/overlord/src/app/purchases/purchases-datasource.ts @@ -8,8 +8,7 @@ import { map } from 'rxjs/operators'; import { PurchasesItem } from './purchases-item'; /** Simple sort comparator for example ID/Name columns (for client-side sorting). */ -const compare = (a: string | number, b: string | number, isAsc: boolean) => - (a < b ? -1 : 1) * (isAsc ? 1 : -1); +const compare = (a: string | number, b: string | number, isAsc: boolean) => (a < b ? -1 : 1) * (isAsc ? 1 : -1); export class PurchasesDataSource extends DataSource { constructor( public data: PurchasesItem[], diff --git a/overlord/src/app/purchases/purchases-routing.module.ts b/overlord/src/app/purchases/purchases-routing.module.ts index a65c541a..1379fb78 100644 --- a/overlord/src/app/purchases/purchases-routing.module.ts +++ b/overlord/src/app/purchases/purchases-routing.module.ts @@ -12,8 +12,7 @@ const purchasesRoutes: Routes = [ path: '', component: PurchasesComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Purchases', diff --git a/overlord/src/app/purchases/purchases.component.html b/overlord/src/app/purchases/purchases.component.html index 9ca2019b..32e1094f 100644 --- a/overlord/src/app/purchases/purchases.component.html +++ b/overlord/src/app/purchases/purchases.component.html @@ -29,9 +29,7 @@ - +
@@ -39,11 +37,9 @@ Product {{ row.name }}{{ + row.name + }} {{ info.footer.name }} @@ -53,9 +49,7 @@ Quantity - {{ - row.quantity | number: '1.2-2' - }} + {{ row.quantity | number: '1.2-2' }} {{ info.footer.quantity | number: '1.2-2' }} diff --git a/overlord/src/app/purchases/purchases.module.ts b/overlord/src/app/purchases/purchases.module.ts index 04baf734..2d973147 100644 --- a/overlord/src/app/purchases/purchases.module.ts +++ b/overlord/src/app/purchases/purchases.module.ts @@ -7,12 +7,7 @@ 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 { 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'; diff --git a/overlord/src/app/rate-contract/rate-contract-detail/rate-contract-detail.component.html b/overlord/src/app/rate-contract/rate-contract-detail/rate-contract-detail.component.html index 8a9611e7..87e56b33 100644 --- a/overlord/src/app/rate-contract/rate-contract-detail/rate-contract-detail.component.html +++ b/overlord/src/app/rate-contract/rate-contract-detail/rate-contract-detail.component.html @@ -7,13 +7,7 @@
Date - + @@ -33,40 +27,25 @@ [displayWith]="displayFn" (optionSelected)="accountSelected($event)" > - {{ - account.name - }} + {{ account.name }}
Valid From - + Valid Till - +
-
+
Product - {{ - product.name - }} + {{ product.name }} Price - +
diff --git a/overlord/src/app/rate-contract/rate-contract-list-resolver.service.spec.ts b/overlord/src/app/rate-contract/rate-contract-list-resolver.service.spec.ts index a4b1175b..277abc79 100644 --- a/overlord/src/app/rate-contract/rate-contract-list-resolver.service.spec.ts +++ b/overlord/src/app/rate-contract/rate-contract-list-resolver.service.spec.ts @@ -12,10 +12,7 @@ describe('RateContractListResolver', () => { }); }); - it('should be created', inject( - [RateContractListResolver], - (service: RateContractListResolver) => { - expect(service).toBeTruthy(); - }, - )); + it('should be created', inject([RateContractListResolver], (service: RateContractListResolver) => { + expect(service).toBeTruthy(); + })); }); diff --git a/overlord/src/app/rate-contract/rate-contract-list/rate-contract-list-datasource.ts b/overlord/src/app/rate-contract/rate-contract-list/rate-contract-list-datasource.ts index 2468fb06..4912c758 100644 --- a/overlord/src/app/rate-contract/rate-contract-list/rate-contract-list-datasource.ts +++ b/overlord/src/app/rate-contract/rate-contract-list/rate-contract-list-datasource.ts @@ -8,8 +8,7 @@ import { map } from 'rxjs/operators'; import { RateContract } from '../rate-contract'; /** Simple sort comparator for example ID/Name columns (for client-side sorting). */ -const compare = (a: string | number, b: string | number, isAsc: boolean) => - (a < b ? -1 : 1) * (isAsc ? 1 : -1); +const compare = (a: string | number, b: string | number, isAsc: boolean) => (a < b ? -1 : 1) * (isAsc ? 1 : -1); export class RateContractListDatasource extends DataSource { constructor( public data: RateContract[], diff --git a/overlord/src/app/rate-contract/rate-contract-list/rate-contract-list.component.html b/overlord/src/app/rate-contract/rate-contract-list/rate-contract-list.component.html index 05dbff1a..5fb9d8ea 100644 --- a/overlord/src/app/rate-contract/rate-contract-list/rate-contract-list.component.html +++ b/overlord/src/app/rate-contract/rate-contract-list/rate-contract-list.component.html @@ -14,9 +14,7 @@ Vendor {{ row.vendor.name }} // {{ row.date }}{{ row.vendor.name }} // {{ row.date }} @@ -31,9 +29,7 @@ Products
    -
  • - {{ item.sku.name }} @ {{ item.price | currency: 'INR' }} -
    • +
  • {{ item.sku.name }} @ {{ item.price | currency: 'INR' }}
 diff --git a/overlord/src/app/rate-contract/rate-contract-routing.module.ts b/overlord/src/app/rate-contract/rate-contract-routing.module.ts index 1fcb9066..5382740f 100644 --- a/overlord/src/app/rate-contract/rate-contract-routing.module.ts +++ b/overlord/src/app/rate-contract/rate-contract-routing.module.ts @@ -14,8 +14,7 @@ const rateContractRoutes: Routes = [ path: '', component: RateContractListComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Rate Contracts', @@ -28,8 +27,7 @@ const rateContractRoutes: Routes = [ path: 'new', component: RateContractDetailComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Rate Contracts', @@ -42,8 +40,7 @@ const rateContractRoutes: Routes = [ path: ':id', component: RateContractDetailComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Rate Contracts', diff --git a/overlord/src/app/rate-contract/rate-contract.service.ts b/overlord/src/app/rate-contract/rate-contract.service.ts index 5695072c..26d88c5a 100644 --- a/overlord/src/app/rate-contract/rate-contract.service.ts +++ b/overlord/src/app/rate-contract/rate-contract.service.ts @@ -23,9 +23,7 @@ export class RateContractService { const getUrl: string = id === null ? `${url}` : `${url}/${id}`; return this.http .get(getUrl) - .pipe( - catchError(this.log.handleError(serviceName, `get id=${id}`)), - ) as Observable; + .pipe(catchError(this.log.handleError(serviceName, `get id=${id}`))) as Observable; } list(): Observable { diff --git a/overlord/src/app/raw-material-cost/raw-material-cost-datasource.ts b/overlord/src/app/raw-material-cost/raw-material-cost-datasource.ts index 3e8c6a76..e3a27c3d 100644 --- a/overlord/src/app/raw-material-cost/raw-material-cost-datasource.ts +++ b/overlord/src/app/raw-material-cost/raw-material-cost-datasource.ts @@ -8,8 +8,7 @@ import { map } from 'rxjs/operators'; import { RawMaterialCostItem } from './raw-material-cost-item'; /** Simple sort comparator for example ID/Name columns (for client-side sorting). */ -const compare = (a: string | number, b: string | number, isAsc: boolean) => - (a < b ? -1 : 1) * (isAsc ? 1 : -1); +const compare = (a: string | number, b: string | number, isAsc: boolean) => (a < b ? -1 : 1) * (isAsc ? 1 : -1); export class RawMaterialCostDataSource extends DataSource { constructor( public data: RawMaterialCostItem[], diff --git a/overlord/src/app/raw-material-cost/raw-material-cost-routing.module.ts b/overlord/src/app/raw-material-cost/raw-material-cost-routing.module.ts index 646340d1..45fb6572 100644 --- a/overlord/src/app/raw-material-cost/raw-material-cost-routing.module.ts +++ b/overlord/src/app/raw-material-cost/raw-material-cost-routing.module.ts @@ -12,8 +12,7 @@ const rawMaterialCostRoutes: Routes = [ path: '', component: RawMaterialCostComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Raw Material Cost', @@ -27,8 +26,7 @@ const rawMaterialCostRoutes: Routes = [ path: ':id', component: RawMaterialCostComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Raw Material Cost', diff --git a/overlord/src/app/raw-material-cost/raw-material-cost.component.html b/overlord/src/app/raw-material-cost/raw-material-cost.component.html index 046a999e..b05a07a7 100644 --- a/overlord/src/app/raw-material-cost/raw-material-cost.component.html +++ b/overlord/src/app/raw-material-cost/raw-material-cost.component.html @@ -34,9 +34,7 @@ - +
@@ -60,27 +58,21 @@ Issue {{ row.issue | currency: 'INR' }} - {{ - info.footer?.issue | currency: 'INR' - }} + {{ info.footer?.issue | currency: 'INR' }} Sale {{ row.sale | currency: 'INR' }} - {{ - info.footer?.sale | currency: 'INR' - }} + {{ info.footer?.sale | currency: 'INR' }} RMC {{ row.rmc | percent: '1.2-2' }} - {{ - info.footer?.rmc | percent: '1.2-2' - }} + {{ info.footer?.rmc | percent: '1.2-2' }} @@ -93,9 +85,7 @@ Quantity - {{ - row.quantity | number: '1.2-2' - }} + {{ row.quantity | number: '1.2-2' }} diff --git a/overlord/src/app/raw-material-cost/raw-material-cost.module.ts b/overlord/src/app/raw-material-cost/raw-material-cost.module.ts index 94c37bac..39e9d0d9 100644 --- a/overlord/src/app/raw-material-cost/raw-material-cost.module.ts +++ b/overlord/src/app/raw-material-cost/raw-material-cost.module.ts @@ -7,12 +7,7 @@ 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 { 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'; diff --git a/overlord/src/app/raw-material-cost/raw-material-cost.service.ts b/overlord/src/app/raw-material-cost/raw-material-cost.service.ts index 2ecc62d0..d5940eb3 100644 --- a/overlord/src/app/raw-material-cost/raw-material-cost.service.ts +++ b/overlord/src/app/raw-material-cost/raw-material-cost.service.ts @@ -19,11 +19,7 @@ export class RawMaterialCostService { private log: ErrorLoggerService, ) {} - list( - id: string | null, - startDate: string | null, - finishDate: string | null, - ): Observable { + list(id: string | null, startDate: string | null, finishDate: string | null): Observable { const options = { params: new HttpParams() }; if (startDate !== null) { options.params = options.params.set('s', startDate); diff --git a/overlord/src/app/receipt/receipt-dialog.component.html b/overlord/src/app/receipt/receipt-dialog.component.html index 58e7c5a2..582aef4e 100644 --- a/overlord/src/app/receipt/receipt-dialog.component.html +++ b/overlord/src/app/receipt/receipt-dialog.component.html @@ -13,8 +13,8 @@ autocomplete="off" /> - Balance as on Date: {{ accBal.date | currency: 'INR' | accounting }} / - Final balance: {{ accBal.total | currency: 'INR' | accounting }} + Balance as on Date: {{ accBal.date | currency: 'INR' | accounting }} / Final balance: + {{ accBal.total | currency: 'INR' | accounting }} - {{ - account.name - }} + {{ account.name }} Amount @@ -36,8 +34,6 @@
- +
diff --git a/overlord/src/app/receipt/receipt-routing.module.ts b/overlord/src/app/receipt/receipt-routing.module.ts index b084fae4..102df19b 100644 --- a/overlord/src/app/receipt/receipt-routing.module.ts +++ b/overlord/src/app/receipt/receipt-routing.module.ts @@ -13,8 +13,7 @@ const receiptRoutes: Routes = [ path: '', component: ReceiptComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'journal', @@ -29,8 +28,7 @@ const receiptRoutes: Routes = [ path: ':id', component: ReceiptComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'journal', diff --git a/overlord/src/app/receipt/receipt.component.html b/overlord/src/app/receipt/receipt.component.html index e6b780d2..11b25902 100644 --- a/overlord/src/app/receipt/receipt.component.html +++ b/overlord/src/app/receipt/receipt.component.html @@ -42,10 +42,7 @@
-
+
Account - Balance as on Date: {{ accBal.date | currency: 'INR' | accounting }} / - Final balance: {{ accBal.total | currency: 'INR' | accounting }} + Balance as on Date: {{ accBal.date | currency: 'INR' | accounting }} / Final balance: + {{ accBal.total | currency: 'INR' | accounting }} - {{ - account.name - }} + {{ account.name }} Amount @@ -77,9 +72,7 @@ ₹  - +
@@ -91,9 +84,7 @@ Amount - {{ - row.amount | currency: 'INR' - }} + {{ row.amount | currency: 'INR' }} @@ -117,11 +108,7 @@
-
+
- diff --git a/overlord/src/app/receipt/receipt.component.ts b/overlord/src/app/receipt/receipt.component.ts index 805d3845..ff5edfd4 100644 --- a/overlord/src/app/receipt/receipt.component.ts +++ b/overlord/src/app/receipt/receipt.component.ts @@ -183,9 +183,7 @@ export class ReceiptComponent implements OnInit, AfterViewInit, OnDestroy { if (this.account === null || amount <= 0) { return; } - const oldFiltered = this.voucher.journals.filter( - (x) => x.account.id === (this.account as Account).id, - ); + const oldFiltered = this.voucher.journals.filter((x) => x.account.id === (this.account as Account).id); const old = oldFiltered.length ? oldFiltered[0] : null; if (old && (old.debit === 1 || old.id === this.receiptJournal.id)) { return; @@ -220,10 +218,7 @@ export class ReceiptComponent implements OnInit, AfterViewInit, OnDestroy { updateView() { const journals = this.voucher.journals.filter((x) => x.debit === -1); this.journalObservable.next(journals); - this.receiptJournal.amount = round( - Math.abs(journals.map((x) => x.amount).reduce((p, c) => p + c, 0)), - 2, - ); + this.receiptJournal.amount = round(Math.abs(journals.map((x) => x.amount).reduce((p, c) => p + c, 0)), 2); this.form.controls.receiptAmount.setValue(this.receiptJournal.amount); } @@ -264,10 +259,7 @@ export class ReceiptComponent implements OnInit, AfterViewInit, OnDestroy { if (this.voucher.posted && this.auth.allowed('edit-posted-vouchers')) { return true; } - return ( - this.voucher.user.id === (this.auth.user as User).id || - this.auth.allowed("edit-other-user's-vouchers") - ); + return this.voucher.user.id === (this.auth.user as User).id || this.auth.allowed("edit-other-user's-vouchers"); } post() { diff --git a/overlord/src/app/receipt/receipt.module.ts b/overlord/src/app/receipt/receipt.module.ts index a8a8a3a9..662172c5 100644 --- a/overlord/src/app/receipt/receipt.module.ts +++ b/overlord/src/app/receipt/receipt.module.ts @@ -7,12 +7,7 @@ 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 { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; diff --git a/overlord/src/app/recipe-template/recipe-template-list-resolver.service.spec.ts b/overlord/src/app/recipe-template/recipe-template-list-resolver.service.spec.ts index f387186f..14e44904 100644 --- a/overlord/src/app/recipe-template/recipe-template-list-resolver.service.spec.ts +++ b/overlord/src/app/recipe-template/recipe-template-list-resolver.service.spec.ts @@ -12,10 +12,7 @@ describe('RecipeTemplateListResolver', () => { }); }); - it('should be created', inject( - [RecipeTemplateListResolver], - (service: RecipeTemplateListResolver) => { - expect(service).toBeTruthy(); - }, - )); + it('should be created', inject([RecipeTemplateListResolver], (service: RecipeTemplateListResolver) => { + expect(service).toBeTruthy(); + })); }); diff --git a/overlord/src/app/recipe-template/recipe-template-list/recipe-template-list-datasource.ts b/overlord/src/app/recipe-template/recipe-template-list/recipe-template-list-datasource.ts index 8090dc2d..b6b5ec11 100644 --- a/overlord/src/app/recipe-template/recipe-template-list/recipe-template-list-datasource.ts +++ b/overlord/src/app/recipe-template/recipe-template-list/recipe-template-list-datasource.ts @@ -8,8 +8,7 @@ import { map } from 'rxjs/operators'; import { RecipeTemplate } from '../recipe-template'; /** Simple sort comparator for example ID/Name columns (for client-side sorting). */ -const compare = (a: string | number, b: string | number, isAsc: boolean) => - (a < b ? -1 : 1) * (isAsc ? 1 : -1); +const compare = (a: string | number, b: string | number, isAsc: boolean) => (a < b ? -1 : 1) * (isAsc ? 1 : -1); export class RecipeTemplateListDataSource extends DataSource { constructor( public data: RecipeTemplate[], diff --git a/overlord/src/app/recipe-template/recipe-template-routing.module.ts b/overlord/src/app/recipe-template/recipe-template-routing.module.ts index 4b79b32e..9c98ab66 100644 --- a/overlord/src/app/recipe-template/recipe-template-routing.module.ts +++ b/overlord/src/app/recipe-template/recipe-template-routing.module.ts @@ -14,8 +14,7 @@ const recipeTemplateRoutes: Routes = [ path: '', component: RecipeTemplateListComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Recipes', @@ -28,8 +27,7 @@ const recipeTemplateRoutes: Routes = [ path: 'new', component: RecipeTemplateDetailComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Recipes', @@ -42,8 +40,7 @@ const recipeTemplateRoutes: Routes = [ path: ':id', component: RecipeTemplateDetailComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Recipes', diff --git a/overlord/src/app/recipe-template/recipe-template.module.ts b/overlord/src/app/recipe-template/recipe-template.module.ts index 585743fb..2c8ead43 100644 --- a/overlord/src/app/recipe-template/recipe-template.module.ts +++ b/overlord/src/app/recipe-template/recipe-template.module.ts @@ -5,12 +5,7 @@ import { ReactiveFormsModule } from '@angular/forms'; 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 { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; diff --git a/overlord/src/app/recipe-template/recipe-template.service.ts b/overlord/src/app/recipe-template/recipe-template.service.ts index ba81be42..bbf2c8ba 100644 --- a/overlord/src/app/recipe-template/recipe-template.service.ts +++ b/overlord/src/app/recipe-template/recipe-template.service.ts @@ -23,9 +23,7 @@ export class RecipeTemplateService { const getUrl: string = id === null ? url : `${url}/${id}`; return this.http .get(getUrl) - .pipe( - catchError(this.log.handleError(serviceName, `get id=${id}`)), - ) as Observable; + .pipe(catchError(this.log.handleError(serviceName, `get id=${id}`))) as Observable; } list(): Observable { diff --git a/overlord/src/app/recipe/recipe-detail/recipe-detail.component.html b/overlord/src/app/recipe/recipe-detail/recipe-detail.component.html index 137d4147..534efd41 100644 --- a/overlord/src/app/recipe/recipe-detail/recipe-detail.component.html +++ b/overlord/src/app/recipe/recipe-detail/recipe-detail.component.html @@ -40,9 +40,7 @@ [displayWith]="displayProduct" (optionSelected)="productSelected($event)" > - {{ - product.name - }} + {{ product.name }} @@ -50,10 +48,7 @@
-
+
Ingredient ₹  - +
diff --git a/overlord/src/app/recipe/recipe-detail/recipe-detail.component.ts b/overlord/src/app/recipe/recipe-detail/recipe-detail.component.ts index e04fc3cf..4680add4 100644 --- a/overlord/src/app/recipe/recipe-detail/recipe-detail.component.ts +++ b/overlord/src/app/recipe/recipe-detail/recipe-detail.component.ts @@ -94,9 +94,7 @@ export class RecipeDetailComponent implements OnInit, AfterViewInit { map((x) => (x !== null && x.length >= 1 ? x : null)), debounceTime(150), distinctUntilChanged(), - switchMap((x) => - x === null ? observableOf([]) : this.productSer.autocompleteProduct(x, null), - ), + switchMap((x) => (x === null ? observableOf([]) : this.productSer.autocompleteProduct(x, null))), ); } @@ -166,9 +164,7 @@ export class RecipeDetailComponent implements OnInit, AfterViewInit { if (this.ingredient === null || quantity <= 0 || rate <= 0) { return; } - const oldFiltered = this.item.items.filter( - (x) => x.product.id === (this.ingredient as ProductSku).id, - ); + const oldFiltered = this.item.items.filter((x) => x.product.id === (this.ingredient as ProductSku).id); if (oldFiltered.length) { this.toaster.show('Danger', 'Product already added'); return; diff --git a/overlord/src/app/recipe/recipe-list/recipe-list.component.html b/overlord/src/app/recipe/recipe-list/recipe-list.component.html index ae2173f9..a4f73081 100644 --- a/overlord/src/app/recipe/recipe-list/recipe-list.component.html +++ b/overlord/src/app/recipe/recipe-list/recipe-list.component.html @@ -16,17 +16,12 @@
- - {{ p.validFrom }} to {{ p.validTill }} - + {{ p.validFrom }} to {{ p.validTill }} Product Type - + -- All Products -- {{ mc.name }} @@ -65,13 +60,7 @@ - + diff --git a/overlord/src/app/recipe/recipe-list/recipe-list.component.ts b/overlord/src/app/recipe/recipe-list/recipe-list.component.ts index 858fc8e8..3c99e0a6 100644 --- a/overlord/src/app/recipe/recipe-list/recipe-list.component.ts +++ b/overlord/src/app/recipe/recipe-list/recipe-list.component.ts @@ -54,20 +54,13 @@ export class RecipeListComponent implements OnInit { } ngOnInit() { - this.dataSource = new RecipeListDatasource( - this.productGroupFilter, - this.data, - this.paginator, - this.sort, - ); + this.dataSource = new RecipeListDatasource(this.productGroupFilter, this.data, this.paginator, this.sort); // this.dataSource = new RecipeListDatasource(this.validFromFilter, this.validTillFilter, this.productGroupFilter, this.data); this.route.data.subscribe((value) => { const data = value as { list: Recipe[]; productGroups: ProductGroup[]; periods: Period[] }; this.productGroups = data.productGroups; this.periods = data.periods; - const period = - this.periods.find((x) => x.id === this.route.snapshot.queryParamMap.get('p')) || - this.periods[0]; + const period = this.periods.find((x) => x.id === this.route.snapshot.queryParamMap.get('p')) || this.periods[0]; this.form.setValue({ period: period, diff --git a/overlord/src/app/recipe/recipe-routing.module.ts b/overlord/src/app/recipe/recipe-routing.module.ts index d8edc784..01889bb4 100644 --- a/overlord/src/app/recipe/recipe-routing.module.ts +++ b/overlord/src/app/recipe/recipe-routing.module.ts @@ -16,8 +16,7 @@ const recipeRoutes: Routes = [ path: '', component: RecipeListComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Recipes', @@ -33,8 +32,7 @@ const recipeRoutes: Routes = [ path: 'new', component: RecipeDetailComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Recipes', @@ -48,8 +46,7 @@ const recipeRoutes: Routes = [ path: ':id', component: RecipeDetailComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Recipes', diff --git a/overlord/src/app/role/role-list/role-list-datasource.ts b/overlord/src/app/role/role-list/role-list-datasource.ts index 3dc09a1e..06e67262 100644 --- a/overlord/src/app/role/role-list/role-list-datasource.ts +++ b/overlord/src/app/role/role-list/role-list-datasource.ts @@ -8,8 +8,7 @@ import { map } from 'rxjs/operators'; import { Role } from '../role'; /** Simple sort comparator for example ID/Name columns (for client-side sorting). */ -const compare = (a: string | number, b: string | number, isAsc: boolean) => - (a < b ? -1 : 1) * (isAsc ? 1 : -1); +const compare = (a: string | number, b: string | number, isAsc: boolean) => (a < b ? -1 : 1) * (isAsc ? 1 : -1); export class RoleListDatasource extends DataSource { constructor( public data: Role[], diff --git a/overlord/src/app/role/role-routing.module.ts b/overlord/src/app/role/role-routing.module.ts index 262e2a60..79a00d7c 100644 --- a/overlord/src/app/role/role-routing.module.ts +++ b/overlord/src/app/role/role-routing.module.ts @@ -14,8 +14,7 @@ const roleRoutes: Routes = [ path: '', component: RoleListComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Users', @@ -28,8 +27,7 @@ const roleRoutes: Routes = [ path: 'new', component: RoleDetailComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Users', @@ -42,8 +40,7 @@ const roleRoutes: Routes = [ path: ':id', component: RoleDetailComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Users', diff --git a/overlord/src/app/settings/settings-routing.module.ts b/overlord/src/app/settings/settings-routing.module.ts index 5425a512..2e730501 100644 --- a/overlord/src/app/settings/settings-routing.module.ts +++ b/overlord/src/app/settings/settings-routing.module.ts @@ -15,8 +15,7 @@ const settingsRoutes: Routes = [ path: '', component: SettingsComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Maintenance', // 'Lock Date' diff --git a/overlord/src/app/settings/settings.component.html b/overlord/src/app/settings/settings.component.html index 8e480182..7d2360b1 100644 --- a/overlord/src/app/settings/settings.component.html +++ b/overlord/src/app/settings/settings.component.html @@ -4,24 +4,13 @@
- Lock Older - + Lock Older + Is Rolling Date - + @@ -31,14 +20,8 @@
- Lock Newer - + Lock Newer + Is Rolling @@ -64,9 +47,7 @@ [formGroupName]="i" class="flex flex-row justify-around content-start items-start" > - {{ - at.name - }} + {{ at.name }}
@@ -76,32 +57,20 @@ [formGroupName]="j" class="flex flex-row justify-around content-start items-start" > - {{ - vt.name - }} + {{ vt.name }}
Valid From - + Valid Till - + @@ -109,14 +78,7 @@ Index - +
@@ -158,11 +120,9 @@ Lock Dates {{ !!row.start.days ? row.start.days : '' - }}{{ !!row.start.date ? row.start.date : '' + >{{ !!row.start.days ? row.start.days : '' }}{{ !!row.start.date ? row.start.date : '' }}{{ !row.start.days && !row.start.date ? '\u221E' : '' }} - - {{ !!row.finish.days ? row.finish.days : '' - }}{{ !!row.finish.date ? row.finish.date : '' + {{ !!row.finish.days ? row.finish.days : '' }}{{ !!row.finish.date ? row.finish.date : '' }}{{ !row.finish.days && !row.finish.date ? '\u221E' : '' }} @@ -202,12 +162,7 @@ -
@@ -219,8 +174,7 @@ - Maintenance mode is ENABLED by user - {{ maintenance.user }}ENABLED by user {{ maintenance.user }}. diff --git a/overlord/src/app/settings/settings.module.ts b/overlord/src/app/settings/settings.module.ts index 4c75d3c0..7356b026 100644 --- a/overlord/src/app/settings/settings.module.ts +++ b/overlord/src/app/settings/settings.module.ts @@ -7,12 +7,7 @@ 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 { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; diff --git a/overlord/src/app/settings/settings.service.ts b/overlord/src/app/settings/settings.service.ts index cbf6fe4c..061c19e2 100644 --- a/overlord/src/app/settings/settings.service.ts +++ b/overlord/src/app/settings/settings.service.ts @@ -20,36 +20,28 @@ export class SettingsService { const url = '/api/lock-information'; return this.http .get<[LockInfo]>(url) - .pipe(catchError(this.log.handleError(serviceName, 'getLockInformation'))) as Observable< - [LockInfo] - >; + .pipe(catchError(this.log.handleError(serviceName, 'getLockInformation'))) as Observable<[LockInfo]>; } setLockInformation(lockInformation: LockInfo): Observable { const url = '/api/lock-information'; return this.http .post(url, lockInformation) - .pipe(catchError(this.log.handleError(serviceName, 'setLockInformation'))) as Observable< - LockInfo[] - >; + .pipe(catchError(this.log.handleError(serviceName, 'setLockInformation'))) as Observable; } deleteLockInformation(id: string): Observable { const url = '/api/lock-information'; return this.http .delete(`${url}/${id}`) - .pipe(catchError(this.log.handleError(serviceName, 'deleteLockInformation'))) as Observable< - LockInfo[] - >; + .pipe(catchError(this.log.handleError(serviceName, 'deleteLockInformation'))) as Observable; } rebaseDatabase(date: string): Observable> { const url = '/api/rebase'; return this.http .post>(`${url}/${date}`, {}) - .pipe(catchError(this.log.handleError(serviceName, 'rebaseDatabase'))) as Observable< - Record - >; + .pipe(catchError(this.log.handleError(serviceName, 'rebaseDatabase'))) as Observable>; } setMaintenance(enable: boolean): Observable<{ enabled: boolean; user: string }> { diff --git a/overlord/src/app/settings/voucher-type.service.ts b/overlord/src/app/settings/voucher-type.service.ts index e3d1a0a7..9b5a9e10 100644 --- a/overlord/src/app/settings/voucher-type.service.ts +++ b/overlord/src/app/settings/voucher-type.service.ts @@ -19,8 +19,8 @@ export class VoucherTypeService { ) {} list(): Observable { - return this.http - .get(url) - .pipe(catchError(this.log.handleError(serviceName, 'list'))) as Observable; + return this.http.get(url).pipe(catchError(this.log.handleError(serviceName, 'list'))) as Observable< + AccountType[] + >; } } diff --git a/overlord/src/app/shared/confirm-dialog/confirm-dialog.component.html b/overlord/src/app/shared/confirm-dialog/confirm-dialog.component.html index 62c5e7e8..d30ef731 100644 --- a/overlord/src/app/shared/confirm-dialog/confirm-dialog.component.html +++ b/overlord/src/app/shared/confirm-dialog/confirm-dialog.component.html @@ -3,8 +3,6 @@ {{ data.content }}
- +
diff --git a/overlord/src/app/shared/image.service.ts b/overlord/src/app/shared/image.service.ts index 8e10a114..efbbb1a3 100644 --- a/overlord/src/app/shared/image.service.ts +++ b/overlord/src/app/shared/image.service.ts @@ -50,9 +50,7 @@ export class ImageService { of(target.result), this.resizeImage(target.result as string, 100, 150), this.resizeImage(target.result as string, 825, 1170), - ).subscribe((val) => - voucher.files.push(new DbFile({ thumbnail: val[1], resized: val[2] })), - ); + ).subscribe((val) => voucher.files.push(new DbFile({ thumbnail: val[1], resized: val[2] }))); }; reader.readAsDataURL(file); } diff --git a/overlord/src/app/shared/shared.module.ts b/overlord/src/app/shared/shared.module.ts index bb593393..645ef3d9 100644 --- a/overlord/src/app/shared/shared.module.ts +++ b/overlord/src/app/shared/shared.module.ts @@ -11,13 +11,7 @@ import { LocalTimePipe } from './local-time.pipe'; @NgModule({ imports: [CommonModule, MatButtonModule, MatDialogModule], - declarations: [ - ConfirmDialogComponent, - ImageDialogComponent, - AccountingPipe, - ClearPipe, - LocalTimePipe, - ], + declarations: [ConfirmDialogComponent, ImageDialogComponent, AccountingPipe, ClearPipe, LocalTimePipe], exports: [AccountingPipe, ClearPipe, LocalTimePipe], }) export class SharedModule {} diff --git a/overlord/src/app/shared/to-csv.service.ts b/overlord/src/app/shared/to-csv.service.ts index cdf8a2b2..3eb8da4d 100644 --- a/overlord/src/app/shared/to-csv.service.ts +++ b/overlord/src/app/shared/to-csv.service.ts @@ -10,9 +10,7 @@ export class ToCsvService { const header = Object.keys(headers); const replacer = (key: string, value: string | number | null) => (value === null ? '' : value); const csv = data.map((row) => - header - .map((fieldName) => JSON.stringify((row as ToCsvType)[headers[fieldName]], replacer)) - .join(','), + header.map((fieldName) => JSON.stringify((row as ToCsvType)[headers[fieldName]], replacer)).join(','), ); csv.unshift(header.join(',')); return csv.join('\r\n'); diff --git a/overlord/src/app/stock-movement/stock-movement-datasource.ts b/overlord/src/app/stock-movement/stock-movement-datasource.ts index a8711a08..7bbaaf56 100644 --- a/overlord/src/app/stock-movement/stock-movement-datasource.ts +++ b/overlord/src/app/stock-movement/stock-movement-datasource.ts @@ -8,8 +8,7 @@ import { map } from 'rxjs/operators'; import { StockMovementItem } from './stock-movement-item'; /** Simple sort comparator for example ID/Name columns (for client-side sorting). */ -const compare = (a: string | number, b: string | number, isAsc: boolean) => - (a < b ? -1 : 1) * (isAsc ? 1 : -1); +const compare = (a: string | number, b: string | number, isAsc: boolean) => (a < b ? -1 : 1) * (isAsc ? 1 : -1); export class StockMovementDataSource extends DataSource { constructor( public data: StockMovementItem[], diff --git a/overlord/src/app/stock-movement/stock-movement-routing.module.ts b/overlord/src/app/stock-movement/stock-movement-routing.module.ts index 667cc409..6ed6af23 100644 --- a/overlord/src/app/stock-movement/stock-movement-routing.module.ts +++ b/overlord/src/app/stock-movement/stock-movement-routing.module.ts @@ -12,8 +12,7 @@ const stockMovementRoutes: Routes = [ path: '', component: StockMovementComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Stock Movement', diff --git a/overlord/src/app/stock-movement/stock-movement.component.html b/overlord/src/app/stock-movement/stock-movement.component.html index b370a16b..f8ba0fe6 100644 --- a/overlord/src/app/stock-movement/stock-movement.component.html +++ b/overlord/src/app/stock-movement/stock-movement.component.html @@ -29,9 +29,7 @@ - +
@@ -45,10 +43,7 @@ Name - + {{ row.name }} @@ -63,9 +58,7 @@ Purchase - {{ - row.purchase | number: '1.2-2' - }} + {{ row.purchase | number: '1.2-2' }} diff --git a/overlord/src/app/stock-movement/stock-movement.module.ts b/overlord/src/app/stock-movement/stock-movement.module.ts index bdefef51..1757a4a5 100644 --- a/overlord/src/app/stock-movement/stock-movement.module.ts +++ b/overlord/src/app/stock-movement/stock-movement.module.ts @@ -7,12 +7,7 @@ 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 { 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'; diff --git a/overlord/src/app/trial-balance/trial-balance-datasource.ts b/overlord/src/app/trial-balance/trial-balance-datasource.ts index 6ff46a20..38e2e74f 100644 --- a/overlord/src/app/trial-balance/trial-balance-datasource.ts +++ b/overlord/src/app/trial-balance/trial-balance-datasource.ts @@ -8,8 +8,7 @@ import { map } from 'rxjs/operators'; import { TrialBalanceItem } from './trial-balance-item'; /** Simple sort comparator for example ID/Name columns (for client-side sorting). */ -const compare = (a: string | number, b: string | number, isAsc: boolean) => - (a < b ? -1 : 1) * (isAsc ? 1 : -1); +const compare = (a: string | number, b: string | number, isAsc: boolean) => (a < b ? -1 : 1) * (isAsc ? 1 : -1); export class TrialBalanceDataSource extends DataSource { constructor( public data: TrialBalanceItem[], diff --git a/overlord/src/app/trial-balance/trial-balance-routing.module.ts b/overlord/src/app/trial-balance/trial-balance-routing.module.ts index c4d698f3..fc585b01 100644 --- a/overlord/src/app/trial-balance/trial-balance-routing.module.ts +++ b/overlord/src/app/trial-balance/trial-balance-routing.module.ts @@ -12,8 +12,7 @@ const trialBalanceRoutes: Routes = [ path: '', component: TrialBalanceComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Trial Balance', @@ -27,8 +26,7 @@ const trialBalanceRoutes: Routes = [ path: ':date', component: TrialBalanceComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Trial Balance', diff --git a/overlord/src/app/trial-balance/trial-balance.component.html b/overlord/src/app/trial-balance/trial-balance.component.html index 367f0ead..335b0d4f 100644 --- a/overlord/src/app/trial-balance/trial-balance.component.html +++ b/overlord/src/app/trial-balance/trial-balance.component.html @@ -36,17 +36,13 @@ Debit - {{ - row.debit | currency: 'INR' | accounting - }} + {{ row.debit | currency: 'INR' | accounting }} Credit - {{ - row.credit | currency: 'INR' | accounting - }} + {{ row.credit | currency: 'INR' | accounting }} diff --git a/overlord/src/app/trial-balance/trial-balance.module.ts b/overlord/src/app/trial-balance/trial-balance.module.ts index 890f57e5..1c28433f 100644 --- a/overlord/src/app/trial-balance/trial-balance.module.ts +++ b/overlord/src/app/trial-balance/trial-balance.module.ts @@ -6,12 +6,7 @@ import { ReactiveFormsModule } from '@angular/forms'; 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 { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core'; import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatIconModule } from '@angular/material/icon'; import { MatInputModule } from '@angular/material/input'; diff --git a/overlord/src/app/user/user-detail/user-detail.component.html b/overlord/src/app/user/user-detail/user-detail.component.html index a3d2c1c6..904143f3 100644 --- a/overlord/src/app/user/user-detail/user-detail.component.html +++ b/overlord/src/app/user/user-detail/user-detail.component.html @@ -15,9 +15,7 @@ Password - {{ - hide ? 'visibility' : 'visibility_off' - }} + {{ hide ? 'visibility' : 'visibility_off' }}
diff --git a/overlord/src/app/user/user-list/user-list-datasource.ts b/overlord/src/app/user/user-list/user-list-datasource.ts index 7b4f7094..86661fa8 100644 --- a/overlord/src/app/user/user-list/user-list-datasource.ts +++ b/overlord/src/app/user/user-list/user-list-datasource.ts @@ -8,8 +8,7 @@ import { map } from 'rxjs/operators'; import { User } from '../../core/user'; /** Simple sort comparator for example ID/Name columns (for client-side sorting). */ -const compare = (a: string | number, b: string | number, isAsc: boolean) => - (a < b ? -1 : 1) * (isAsc ? 1 : -1); +const compare = (a: string | number, b: string | number, isAsc: boolean) => (a < b ? -1 : 1) * (isAsc ? 1 : -1); export class UserListDataSource extends DataSource { constructor( diff --git a/overlord/src/app/user/user-list/user-list.component.html b/overlord/src/app/user/user-list/user-list.component.html index 6a305039..b300d23a 100644 --- a/overlord/src/app/user/user-list/user-list.component.html +++ b/overlord/src/app/user/user-list/user-list.component.html @@ -38,8 +38,7 @@ Last Login {{ row.lastDevice }} @ - {{ row.lastDate ? (row.lastDate | localTime) : 'Never' }}{{ row.lastDevice }} @ {{ row.lastDate ? (row.lastDate | localTime) : 'Never' }} diff --git a/overlord/src/app/user/user-routing.module.ts b/overlord/src/app/user/user-routing.module.ts index 5cd439f1..c43b743d 100644 --- a/overlord/src/app/user/user-routing.module.ts +++ b/overlord/src/app/user/user-routing.module.ts @@ -14,8 +14,7 @@ const userRoutes: Routes = [ path: '', component: UserListComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Users', @@ -28,8 +27,7 @@ const userRoutes: Routes = [ path: 'new', component: UserDetailComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], data: { permission: 'Users', @@ -42,8 +40,7 @@ const userRoutes: Routes = [ path: ':id', component: UserDetailComponent, canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => - inject(AuthGuard).canActivate(route, state), + (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), ], resolve: { item: (route: ActivatedRouteSnapshot) => inject(UserResolver).resolve(route),