diff --git a/docker/app/Dockerfile b/docker/app/Dockerfile index d988434a..cb3f6f69 100644 --- a/docker/app/Dockerfile +++ b/docker/app/Dockerfile @@ -9,8 +9,8 @@ RUN cd /app/overlord \ ADD https://git.tanshu.com/api/v1/repos/tanshu/brewman/tags /tags.json RUN git clone --single-branch --depth 1 --branch latest https://git.tanshu.com/tanshu/brewman.git /app WORKDIR /app/overlord -RUN mv /node_modules /app/overlord/ \ - && /app/overlord/node_modules/.bin/ng build +RUN mv /node_modules /app/bookie/ \ + && /app/bookie/node_modules/.bin/ng build FROM python:3.11 @@ -27,7 +27,7 @@ ENV LANG en_IN ENV LC_ALL en_IN # Install Poetry -RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/install-poetry.py | POETRY_HOME=/opt/poetry python && \ +RUN curl -sSL https://install.python-poetry.org | POETRY_HOME=/opt/poetry python - && \ cd /usr/local/bin && \ ln -s /opt/poetry/bin/poetry && \ poetry config virtualenvs.create false diff --git a/overlord/.eslintrc.json b/overlord/.eslintrc.json index 80c6b5af..52b87c86 100644 --- a/overlord/.eslintrc.json +++ b/overlord/.eslintrc.json @@ -13,7 +13,6 @@ "plugin:@typescript-eslint/recommended", "plugin:@angular-eslint/recommended", "plugin:@angular-eslint/template/process-inline-templates", - "plugin:@angular-eslint/recommended--extra", "prettier" ], "plugins": [ diff --git a/overlord/.prettierrc.js b/overlord/.prettierrc.js index 1597d252..88e181cf 100644 --- a/overlord/.prettierrc.js +++ b/overlord/.prettierrc.js @@ -1,8 +1,7 @@ module.exports = { - trailingComma: "all", tabWidth: 2, semi: true, singleQuote: true, bracketSpacing: true, - printWidth: 100 + printWidth: 120 }; diff --git a/overlord/package.json b/overlord/package.json index 30972a29..c33792a1 100644 --- a/overlord/package.json +++ b/overlord/package.json @@ -14,61 +14,60 @@ }, "private": true, "dependencies": { - "@angular/animations": "^15.2.6", - "@angular/cdk": "^15.2.6", - "@angular/common": "^15.2.6", - "@angular/compiler": "^15.2.6", - "@angular/core": "^15.2.6", - "@angular/forms": "^15.2.6", - "@angular/material": "^15.2.6", - "@angular/material-moment-adapter": "^15.2.6", - "@angular/platform-browser": "^15.2.6", - "@angular/platform-browser-dynamic": "^15.2.6", - "@angular/router": "^15.2.6", + "@angular/animations": "^16.1.6", + "@angular/cdk": "^16.1.5", + "@angular/common": "^16.1.6", + "@angular/compiler": "^16.1.6", + "@angular/core": "^16.1.6", + "@angular/forms": "^16.1.6", + "@angular/material": "^16.1.5", + "@angular/material-moment-adapter": "^16.1.5", + "@angular/platform-browser": "^16.1.6", + "@angular/platform-browser-dynamic": "^16.1.6", + "@angular/router": "^16.1.6", "@ngx-loading-bar/core": "^6.0.2", "@ngx-loading-bar/http-client": "^6.0.2", "@ngx-loading-bar/router": "^6.0.2", "@types/mousetrap": "1.6.11", - "angular2-hotkeys": "^13.2.0", - "mathjs": "^11.8.0", + "angular2-hotkeys": "^15.0.0", + "mathjs": "^11.9.0", "moment": "^2.29.4", "rxjs": "~7.8.0", - "tslib": "^2.5.0", - "zone.js": "~0.12.0" + "tslib": "^2.6.0", + "zone.js": "~0.13.1" }, "devDependencies": { - "@angular-devkit/build-angular": "^15.2.5", - "@angular-eslint/builder": "^15.2.1", - "@angular-eslint/eslint-plugin": "^15.2.1", - "@angular-eslint/eslint-plugin-template": "^15.2.1", - "@angular-eslint/schematics": "^15.2.1", - "@angular-eslint/template-parser": "^15.2.1", - "@angular/cli": "^15.2.5", - "@angular/compiler-cli": "^15.2.6", - "@angular/language-service": "^15.2.6", - "@types/jasmine": "~4.3.0", - "@typescript-eslint/eslint-plugin": "^5.57.1", - "@typescript-eslint/parser": "^5.57.1", + "@angular-devkit/build-angular": "^16.1.5", + "@angular-eslint/builder": "^16.1.0", + "@angular-eslint/eslint-plugin": "^16.1.0", + "@angular-eslint/eslint-plugin-template": "^16.1.0", + "@angular-eslint/schematics": "^16.1.0", + "@angular-eslint/template-parser": "^16.1.0", + "@angular/cli": "^16.1.5", + "@angular/compiler-cli": "^16.1.6", + "@angular/language-service": "^16.1.6", + "@types/jasmine": "~4.3.5", + "@typescript-eslint/eslint-plugin": "^6.1.0", + "@typescript-eslint/parser": "^6.1.0", "autoprefixer": "^10.4.14", - "eslint": "^8.37.0", + "eslint": "^8.39.0", "eslint-config-prettier": "^8.7.0", "eslint-plugin-import": "^2.27.5", - "eslint-plugin-unused-imports": "^2.0.0", + "eslint-plugin-unused-imports": "^3.0.0", "husky": "^8.0.2", - "jasmine-core": "~4.5.0", + "jasmine-core": "~5.1.0", "jasmine-spec-reporter": "7.0.0", - "karma": "^6.4.1", - "karma-chrome-launcher": "~3.1.1", - "karma-coverage": "~2.2.0", + "karma": "^6.4.2", + "karma-chrome-launcher": "~3.2.0", + "karma-coverage": "~2.2.1", "karma-jasmine": "~5.1.0", - "karma-jasmine-html-reporter": "^2.0.0", - "lint-staged": "^13.1.0", - "postcss": "^8.4.21", - "prettier": "^2.8.7", + "karma-jasmine-html-reporter": "^2.1.0", + "lint-staged": "^13.2.3", + "postcss": "^8.4.27", + "prettier": "^3.0.0", "standard-version": "^9.5.0", - "tailwindcss": "^3.3.1", - "ts-node": "^9.1.1", - "typescript": "~4.9.4" + "tailwindcss": "^3.3.3", + "typescript": "~5.1.6" }, "husky": { "hooks": { diff --git a/overlord/src/app/account/account-type.service.ts b/overlord/src/app/account/account-type.service.ts index ae4f6292..f55e219b 100644 --- a/overlord/src/app/account/account-type.service.ts +++ b/overlord/src/app/account/account-type.service.ts @@ -13,7 +13,10 @@ const serviceName = 'AccountTypeService'; providedIn: 'root', }) export class AccountTypeService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} list(): Observable { return this.http diff --git a/overlord/src/app/attendance/attendance-type.service.ts b/overlord/src/app/attendance/attendance-type.service.ts index 1ca1101e..ada42d78 100644 --- a/overlord/src/app/attendance/attendance-type.service.ts +++ b/overlord/src/app/attendance/attendance-type.service.ts @@ -12,7 +12,10 @@ const serviceName = 'AttendanceTypeService'; @Injectable({ providedIn: 'root' }) export class AttendanceTypeService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} list(): Observable { return this.http diff --git a/overlord/src/app/attendance/attendance.service.ts b/overlord/src/app/attendance/attendance.service.ts index 74a54773..d7112b3f 100644 --- a/overlord/src/app/attendance/attendance.service.ts +++ b/overlord/src/app/attendance/attendance.service.ts @@ -12,7 +12,10 @@ const serviceName = 'AttendanceService'; @Injectable({ providedIn: 'root' }) export class AttendanceService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} get(date: string | null): Observable { const getUrl: string = date === null ? url : `${url}/${date}`; diff --git a/overlord/src/app/auth/logout/logout.component.ts b/overlord/src/app/auth/logout/logout.component.ts index 1db6997f..47dcc34d 100644 --- a/overlord/src/app/auth/logout/logout.component.ts +++ b/overlord/src/app/auth/logout/logout.component.ts @@ -9,7 +9,11 @@ import { AuthService } from '../auth.service'; template: '', }) export class LogoutComponent implements OnInit { - constructor(private auth: AuthService, private router: Router, private toaster: ToasterService) {} + constructor( + private auth: AuthService, + private router: Router, + private toaster: ToasterService, + ) {} ngOnInit() { this.auth.logout(); diff --git a/overlord/src/app/balance-sheet/balance-sheet.component.html b/overlord/src/app/balance-sheet/balance-sheet.component.html index d27512d5..5717ca63 100644 --- a/overlord/src/app/balance-sheet/balance-sheet.component.html +++ b/overlord/src/app/balance-sheet/balance-sheet.component.html @@ -39,10 +39,10 @@ Amount {{ - row.subAmount | currency : 'INR' | clear + row.subAmount | currency: 'INR' | clear }} {{ info.footer?.subAmount | currency : 'INR' | clear }} + >{{ info.footer?.subAmount | currency: 'INR' | clear }} @@ -50,10 +50,10 @@ Total {{ - row.amount | currency : 'INR' | clear + row.amount | currency: 'INR' | clear }} {{ info.footer?.amount | currency : 'INR' | clear }} + >{{ info.footer?.amount | currency: 'INR' | clear }} diff --git a/overlord/src/app/balance-sheet/balance-sheet.component.ts b/overlord/src/app/balance-sheet/balance-sheet.component.ts index 0646a344..0dc42fd4 100644 --- a/overlord/src/app/balance-sheet/balance-sheet.component.ts +++ b/overlord/src/app/balance-sheet/balance-sheet.component.ts @@ -25,7 +25,10 @@ export class BalanceSheetComponent implements OnInit { /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */ displayedColumns = ['group', 'name', 'subAmount', 'total']; - constructor(private route: ActivatedRoute, private router: Router) { + constructor( + private route: ActivatedRoute, + private router: Router, + ) { this.form = new FormGroup({ date: new FormControl(new Date(), { nonNullable: true }), }); diff --git a/overlord/src/app/balance-sheet/balance-sheet.service.ts b/overlord/src/app/balance-sheet/balance-sheet.service.ts index 70fee5e8..ca404000 100644 --- a/overlord/src/app/balance-sheet/balance-sheet.service.ts +++ b/overlord/src/app/balance-sheet/balance-sheet.service.ts @@ -14,7 +14,10 @@ const serviceName = 'BalanceSheetService'; providedIn: 'root', }) export class BalanceSheetService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} list(date: string | null): Observable { const listUrl = date === null ? url : `${url}/${date}`; 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 af3613d5..4a74afac 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 @@ -8,7 +8,7 @@ Batch - {{ row.product }} dated {{ row.date }} @ {{ row.price | currency : 'INR' }} is showing + {{ row.product }} dated {{ row.date }} @ {{ row.price | currency: 'INR' }} is showing {{ row.showing }} instead of {{ row.actual }} @@ -21,7 +21,7 @@
  • {{ detail.type }} on {{ detail.date }} of {{ detail.quantity }} @ - {{ detail.price | currency : 'INR' }} + {{ detail.price | currency: 'INR' }}
    • diff --git a/overlord/src/app/batch-integrity-report/batch-integrity-report.component.ts b/overlord/src/app/batch-integrity-report/batch-integrity-report.component.ts index 425ba6b9..d2666811 100644 --- a/overlord/src/app/batch-integrity-report/batch-integrity-report.component.ts +++ b/overlord/src/app/batch-integrity-report/batch-integrity-report.component.ts @@ -14,7 +14,10 @@ export class BatchIntegrityReportComponent implements OnInit { dataSource: BatchIntegrityReportDatasource = new BatchIntegrityReportDatasource(this.info); displayedColumns = ['batch', 'details']; - constructor(private route: ActivatedRoute, private router: Router) {} + constructor( + private route: ActivatedRoute, + private router: Router, + ) {} ngOnInit() { this.route.data.subscribe((value) => { 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 a4b96621..c043fecf 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 @@ -13,7 +13,10 @@ const serviceName = 'BatchIntegrityReportService'; providedIn: 'root', }) export class BatchIntegrityReportService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} batchIntegrity(): Observable { const url = '/api/batch-integrity'; diff --git a/overlord/src/app/cash-flow/cash-flow.component.html b/overlord/src/app/cash-flow/cash-flow.component.html index e3981313..62af6023 100644 --- a/overlord/src/app/cash-flow/cash-flow.component.html +++ b/overlord/src/app/cash-flow/cash-flow.component.html @@ -51,7 +51,7 @@ Amount {{ - row.amount | currency : 'INR' | clear + row.amount | currency: 'INR' | clear }} diff --git a/overlord/src/app/cash-flow/cash-flow.component.ts b/overlord/src/app/cash-flow/cash-flow.component.ts index c290c4fb..3ad12d6e 100644 --- a/overlord/src/app/cash-flow/cash-flow.component.ts +++ b/overlord/src/app/cash-flow/cash-flow.component.ts @@ -22,7 +22,10 @@ export class CashFlowComponent implements OnInit { /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */ displayedColumns = ['name', 'amount']; - constructor(private route: ActivatedRoute, private router: Router) { + constructor( + private route: ActivatedRoute, + private router: Router, + ) { this.form = new FormGroup({ startDate: new FormControl(new Date(), { nonNullable: true }), finishDate: new FormControl(new Date(), { nonNullable: true }), diff --git a/overlord/src/app/cash-flow/cash-flow.service.ts b/overlord/src/app/cash-flow/cash-flow.service.ts index 627e792f..65ffda64 100644 --- a/overlord/src/app/cash-flow/cash-flow.service.ts +++ b/overlord/src/app/cash-flow/cash-flow.service.ts @@ -14,7 +14,10 @@ const serviceName = 'CashFlowService'; providedIn: 'root', }) export class CashFlowService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} list( id: string | 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 3ac5a5fa..ed33c810 100644 --- a/overlord/src/app/client/client-list/client-list-datasource.ts +++ b/overlord/src/app/client/client-list/client-list-datasource.ts @@ -11,7 +11,11 @@ import { Client } from '../client'; 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[], private paginator?: MatPaginator, private sort?: MatSort) { + constructor( + public data: Client[], + private paginator?: MatPaginator, + private sort?: MatSort, + ) { super(); } diff --git a/overlord/src/app/client/client.service.ts b/overlord/src/app/client/client.service.ts index 96c7de53..707d5ff3 100644 --- a/overlord/src/app/client/client.service.ts +++ b/overlord/src/app/client/client.service.ts @@ -14,7 +14,10 @@ const serviceName = 'ClientService'; providedIn: 'root', }) export class ClientService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} get(id: string | null): Observable { const getUrl: string = id === null ? url : `${url}/${id}`; diff --git a/overlord/src/app/closing-stock/closing-stock.component.html b/overlord/src/app/closing-stock/closing-stock.component.html index d54dcc21..2aeb1b75 100644 --- a/overlord/src/app/closing-stock/closing-stock.component.html +++ b/overlord/src/app/closing-stock/closing-stock.component.html @@ -59,7 +59,7 @@ >Closing Stock {{ - row.quantity | number : '0.2-2' + row.quantity | number: '0.2-2' }} @@ -83,7 +83,7 @@ Variance {{ - row.quantity - row.physical | number : '0.2-2' + row.quantity - row.physical | number: '0.2-2' }} @@ -112,7 +112,7 @@ >Amount {{ - row.amount | currency : 'INR' + row.amount | currency: 'INR' }} diff --git a/overlord/src/app/closing-stock/closing-stock.service.ts b/overlord/src/app/closing-stock/closing-stock.service.ts index 4132db96..9ec95332 100644 --- a/overlord/src/app/closing-stock/closing-stock.service.ts +++ b/overlord/src/app/closing-stock/closing-stock.service.ts @@ -14,7 +14,10 @@ const serviceName = 'ClosingStockService'; providedIn: 'root', }) export class ClosingStockService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} list(date: string | null, costCentre: string | null): Observable { const listUrl = date === null ? url : `${url}/${date}`; diff --git a/overlord/src/app/core/account.service.ts b/overlord/src/app/core/account.service.ts index 4aa098c9..656afa66 100644 --- a/overlord/src/app/core/account.service.ts +++ b/overlord/src/app/core/account.service.ts @@ -12,7 +12,10 @@ const serviceName = 'AccountService'; @Injectable({ providedIn: 'root' }) export class AccountService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} get(id: string | null): Observable { const getUrl: string = id === null ? `${url}` : `${url}/${id}`; diff --git a/overlord/src/app/core/batch.service.ts b/overlord/src/app/core/batch.service.ts index 2b62239e..f36b62b5 100644 --- a/overlord/src/app/core/batch.service.ts +++ b/overlord/src/app/core/batch.service.ts @@ -11,7 +11,10 @@ const serviceName = 'BatchService'; @Injectable({ providedIn: 'root' }) export class BatchService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} autocomplete(date: string, term: string): Observable { const options = { params: new HttpParams().set('q', term).set('d', date) }; diff --git a/overlord/src/app/core/nav-bar/nav-bar.component.ts b/overlord/src/app/core/nav-bar/nav-bar.component.ts index dbfa5d07..fa1b0cc3 100644 --- a/overlord/src/app/core/nav-bar/nav-bar.component.ts +++ b/overlord/src/app/core/nav-bar/nav-bar.component.ts @@ -9,7 +9,10 @@ import { AuthService } from '../../auth/auth.service'; styleUrls: ['./nav-bar.component.css'], }) export class NavBarComponent { - constructor(private router: Router, public auth: AuthService) {} + constructor( + private router: Router, + public auth: AuthService, + ) {} logout() { this.auth.logout(); diff --git a/overlord/src/app/core/voucher.service.ts b/overlord/src/app/core/voucher.service.ts index 9699879f..83ee2175 100644 --- a/overlord/src/app/core/voucher.service.ts +++ b/overlord/src/app/core/voucher.service.ts @@ -13,7 +13,10 @@ const serviceName = 'VoucherService'; providedIn: 'root', }) export class VoucherService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} static dataURLtoBlob(dataURL: string) { const re = /^data:([\w/\-.]+);\w+,(.*)$/; 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 1ec7c19b..2dac725d 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 @@ -11,7 +11,11 @@ import { CostCentre } from '../../core/cost-centre'; 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[], private paginator?: MatPaginator, private sort?: MatSort) { + constructor( + public data: CostCentre[], + private paginator?: MatPaginator, + private sort?: MatSort, + ) { super(); } diff --git a/overlord/src/app/cost-centre/cost-centre.service.ts b/overlord/src/app/cost-centre/cost-centre.service.ts index 756e8fe1..842709c0 100644 --- a/overlord/src/app/cost-centre/cost-centre.service.ts +++ b/overlord/src/app/cost-centre/cost-centre.service.ts @@ -13,7 +13,10 @@ const serviceName = 'CostCentreService'; providedIn: 'root', }) export class CostCentreService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} get(id: string | null): Observable { const getUrl: string = id === null ? `${url}` : `${url}/${id}`; diff --git a/overlord/src/app/daybook/daybook.component.html b/overlord/src/app/daybook/daybook.component.html index e27417b0..993a4b3f 100644 --- a/overlord/src/app/daybook/daybook.component.html +++ b/overlord/src/app/daybook/daybook.component.html @@ -65,7 +65,7 @@ Amount {{ - row.debitAmount | currency : 'INR' + row.debitAmount | currency: 'INR' }} @@ -79,7 +79,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 a344994c..c08505cb 100644 --- a/overlord/src/app/daybook/daybook.component.ts +++ b/overlord/src/app/daybook/daybook.component.ts @@ -35,7 +35,10 @@ export class DaybookComponent implements OnInit { 'creditAmount', ]; - constructor(private route: ActivatedRoute, private router: Router) { + constructor( + private route: ActivatedRoute, + private router: Router, + ) { this.form = new FormGroup({ startDate: new FormControl(new Date(), { nonNullable: true }), finishDate: new FormControl(new Date(), { nonNullable: true }), diff --git a/overlord/src/app/daybook/daybook.service.ts b/overlord/src/app/daybook/daybook.service.ts index db8a4f43..574dfd3f 100644 --- a/overlord/src/app/daybook/daybook.service.ts +++ b/overlord/src/app/daybook/daybook.service.ts @@ -14,7 +14,10 @@ const serviceName = 'DaybookService'; providedIn: 'root', }) export class DaybookService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} list(startDate: string | null, finishDate: string | null): Observable { const startDateWithSlash = startDate ? `/${startDate}` : ''; diff --git a/overlord/src/app/employee-attendance/employee-attendance.service.ts b/overlord/src/app/employee-attendance/employee-attendance.service.ts index c6eaef10..3771e945 100644 --- a/overlord/src/app/employee-attendance/employee-attendance.service.ts +++ b/overlord/src/app/employee-attendance/employee-attendance.service.ts @@ -12,7 +12,10 @@ const serviceName = 'EmployeeAttendanceService'; @Injectable({ providedIn: 'root' }) export class EmployeeAttendanceService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} get( id: string | null, diff --git a/overlord/src/app/employee-benefits/employee-benefits.component.html b/overlord/src/app/employee-benefits/employee-benefits.component.html index 1fbdeb6a..b634ba55 100644 --- a/overlord/src/app/employee-benefits/employee-benefits.component.html +++ b/overlord/src/app/employee-benefits/employee-benefits.component.html @@ -79,7 +79,7 @@ GrossSalary {{ - row.grossSalary | currency : 'INR' + row.grossSalary | currency: 'INR' }} @@ -87,7 +87,7 @@ DaysWorked {{ - row.daysWorked | number : '1.2-2' + row.daysWorked | number: '1.2-2' }} @@ -95,7 +95,7 @@ Esi EE {{ - row.esiEmployee | currency : 'INR' + row.esiEmployee | currency: 'INR' }} @@ -103,7 +103,7 @@ Pf EE {{ - row.pfEmployee | currency : 'INR' + row.pfEmployee | currency: 'INR' }} @@ -111,7 +111,7 @@ Esi ER {{ - row.esiEmployer | currency : 'INR' + row.esiEmployer | currency: 'INR' }} @@ -119,7 +119,7 @@ Pf ER {{ - row.pfEmployer | currency : 'INR' + row.pfEmployer | currency: 'INR' }} diff --git a/overlord/src/app/employee-functions/employee-functions.component.ts b/overlord/src/app/employee-functions/employee-functions.component.ts index 58e8297c..77e24586 100644 --- a/overlord/src/app/employee-functions/employee-functions.component.ts +++ b/overlord/src/app/employee-functions/employee-functions.component.ts @@ -25,7 +25,10 @@ export class EmployeeFunctionsComponent { fingerprintFile: File | null = null; - constructor(private toaster: ToasterService, private ser: EmployeeFunctionsService) { + constructor( + private toaster: ToasterService, + private ser: EmployeeFunctionsService, + ) { const startDate = moment().date(1); const finishDate = moment().date(startDate.daysInMonth()); this.creditSalaryForm = new FormGroup({ diff --git a/overlord/src/app/employee-functions/employee-functions.service.ts b/overlord/src/app/employee-functions/employee-functions.service.ts index 9cc26806..d1e9d4a2 100644 --- a/overlord/src/app/employee-functions/employee-functions.service.ts +++ b/overlord/src/app/employee-functions/employee-functions.service.ts @@ -9,7 +9,10 @@ const serviceName = 'EmployeeFunctionsService'; @Injectable({ providedIn: 'root' }) export class EmployeeFunctionsService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} creditSalary(month: string): Observable { const url = '/api/credit-salary'; diff --git a/overlord/src/app/employee/employee-list/employee-list.component.html b/overlord/src/app/employee/employee-list/employee-list.component.html index 53c5f063..7d2b3a0e 100644 --- a/overlord/src/app/employee/employee-list/employee-list.component.html +++ b/overlord/src/app/employee/employee-list/employee-list.component.html @@ -47,13 +47,13 @@ Salary - {{ row.salary | currency : 'INR' }} + {{ row.salary | currency: 'INR' }} Points - {{ row.points | number : '1.2-2' }} + {{ row.points | number: '1.2-2' }} 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 bd522e0f..e66919af 100644 --- a/overlord/src/app/employee/employee-list/employee-list.component.ts +++ b/overlord/src/app/employee/employee-list/employee-list.component.ts @@ -40,7 +40,10 @@ export class EmployeeListComponent implements OnInit, AfterViewInit { 'leavingDate', ]; - constructor(private route: ActivatedRoute, private toCsv: ToCsvService) { + constructor( + private route: ActivatedRoute, + private toCsv: ToCsvService, + ) { this.form = new FormGroup({ filter: new FormControl('', { nonNullable: true }), }); diff --git a/overlord/src/app/employee/employee.service.ts b/overlord/src/app/employee/employee.service.ts index ca2d9072..25a8dccd 100644 --- a/overlord/src/app/employee/employee.service.ts +++ b/overlord/src/app/employee/employee.service.ts @@ -12,7 +12,10 @@ const serviceName = 'EmployeeService'; @Injectable({ providedIn: 'root' }) export class EmployeeService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} get(id: string | null): Observable { const getUrl: string = id === null ? `${url}` : `${url}/${id}`; diff --git a/overlord/src/app/entries/entries.component.html b/overlord/src/app/entries/entries.component.html index 90d97777..2e1aa7f0 100644 --- a/overlord/src/app/entries/entries.component.html +++ b/overlord/src/app/entries/entries.component.html @@ -96,7 +96,7 @@ Amount - {{ row.amount | currency : 'INR' }} + {{ row.amount | currency: 'INR' }} diff --git a/overlord/src/app/entries/entries.component.ts b/overlord/src/app/entries/entries.component.ts index 3ca9abcc..fbdaebe6 100644 --- a/overlord/src/app/entries/entries.component.ts +++ b/overlord/src/app/entries/entries.component.ts @@ -38,7 +38,10 @@ export class EntriesComponent implements OnInit { posted: boolean | null = null; issue = false; - constructor(private route: ActivatedRoute, private router: Router) { + constructor( + private route: ActivatedRoute, + private router: Router, + ) { this.form = new FormGroup({ startDate: new FormControl(new Date(), { nonNullable: true }), finishDate: new FormControl(new Date(), { nonNullable: true }), diff --git a/overlord/src/app/entries/entries.service.ts b/overlord/src/app/entries/entries.service.ts index 7ba0cb15..e4c93465 100644 --- a/overlord/src/app/entries/entries.service.ts +++ b/overlord/src/app/entries/entries.service.ts @@ -14,7 +14,10 @@ const serviceName = 'EntriesService'; providedIn: 'root', }) export class EntriesService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} list( start_date: string | null, diff --git a/overlord/src/app/incentive/incentive.component.html b/overlord/src/app/incentive/incentive.component.html index 1c19b413..b10ee4a4 100644 --- a/overlord/src/app/incentive/incentive.component.html +++ b/overlord/src/app/incentive/incentive.component.html @@ -19,9 +19,9 @@
    - Total Incentive: {{ voucher.incentive | number : '1.2-2' }} Total Points: - {{ totalPoints() | number : '1.2-2' }} Point Value: - {{ pointValue() | number : '1.2-2' }} + Total Incentive: {{ voucher.incentive | number: '1.2-2' }} Total Points: + {{ totalPoints() | number: '1.2-2' }} Point Value: + {{ pointValue() | number: '1.2-2' }}
    @@ -46,7 +46,7 @@ DaysWorked {{ - row.daysWorked | number : '1.2-2' + row.daysWorked | number: '1.2-2' }} @@ -76,7 +76,7 @@ Amount {{ - amount(row) | currency : 'INR' + amount(row) | currency: 'INR' }} diff --git a/overlord/src/app/issue/issue-grid.service.ts b/overlord/src/app/issue/issue-grid.service.ts index 97662656..9e2eed5d 100644 --- a/overlord/src/app/issue/issue-grid.service.ts +++ b/overlord/src/app/issue/issue-grid.service.ts @@ -13,7 +13,10 @@ const serviceName = 'IssueGridService'; providedIn: 'root', }) export class IssueGridService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} issueGrid(date: string): Observable { return this.http diff --git a/overlord/src/app/issue/issue.component.html b/overlord/src/app/issue/issue.component.html index c33a439e..ff447c2b 100644 --- a/overlord/src/app/issue/issue.component.html +++ b/overlord/src/app/issue/issue.component.html @@ -90,21 +90,21 @@ Quantity {{ - row.quantity | number : '1.2-2' + row.quantity | number: '1.2-2' }} Rate - {{ row.rate | currency : 'INR' }} + {{ row.rate | currency: 'INR' }} Amount {{ - row.amount | currency : 'INR' + row.amount | currency: 'INR' }} @@ -174,7 +174,7 @@ Amount - {{ row.amount | currency : 'INR' }} + {{ row.amount | currency: 'INR' }} diff --git a/overlord/src/app/journal/journal-dialog.component.html b/overlord/src/app/journal/journal-dialog.component.html index b1cd3c83..8072a2cd 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 }} - 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 }} Amount {{ - row.amount | currency : 'INR' + row.amount | currency: 'INR' }} diff --git a/overlord/src/app/ledger/ledger-datasource.ts b/overlord/src/app/ledger/ledger-datasource.ts index b6c74094..65771834 100644 --- a/overlord/src/app/ledger/ledger-datasource.ts +++ b/overlord/src/app/ledger/ledger-datasource.ts @@ -11,7 +11,11 @@ import { LedgerItem } from './ledger-item'; 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[], private paginator?: MatPaginator, private sort?: MatSort) { + constructor( + public data: LedgerItem[], + private paginator?: MatPaginator, + private sort?: MatSort, + ) { super(); } diff --git a/overlord/src/app/ledger/ledger.component.html b/overlord/src/app/ledger/ledger.component.html index 94ffcf95..d3441dfe 100644 --- a/overlord/src/app/ledger/ledger.component.html +++ b/overlord/src/app/ledger/ledger.component.html @@ -97,10 +97,10 @@ Debit {{ - row.debit | currency : 'INR' | clear + row.debit | currency: 'INR' | clear }} {{ - debit | currency : 'INR' + debit | currency: 'INR' }} @@ -108,10 +108,10 @@ Credit {{ - row.credit | currency : 'INR' | clear + row.credit | currency: 'INR' | clear }} {{ - credit | currency : 'INR' + credit | currency: 'INR' }} @@ -119,10 +119,10 @@ Running {{ - row.running | currency : 'INR' | accounting + row.running | currency: 'INR' | accounting }} {{ - running | currency : 'INR' | accounting + running | currency: 'INR' | accounting }} diff --git a/overlord/src/app/ledger/ledger.service.ts b/overlord/src/app/ledger/ledger.service.ts index 74d7defe..eb451e21 100644 --- a/overlord/src/app/ledger/ledger.service.ts +++ b/overlord/src/app/ledger/ledger.service.ts @@ -14,7 +14,10 @@ const serviceName = 'LedgerService'; providedIn: 'root', }) export class LedgerService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} list(id: string | null, startDate: string | null, finishDate: string | null): Observable { const listUrl = id === null ? url : `${url}/${id}`; diff --git a/overlord/src/app/net-transactions/net-transactions.component.html b/overlord/src/app/net-transactions/net-transactions.component.html index 6d32644e..03b64d0c 100644 --- a/overlord/src/app/net-transactions/net-transactions.component.html +++ b/overlord/src/app/net-transactions/net-transactions.component.html @@ -51,7 +51,7 @@ Debit {{ - row.debit | currency : 'INR' | accounting + row.debit | currency: 'INR' | accounting }} @@ -59,7 +59,7 @@ Credit {{ - row.credit | currency : 'INR' | accounting + row.credit | currency: 'INR' | accounting }} diff --git a/overlord/src/app/net-transactions/net-transactions.component.ts b/overlord/src/app/net-transactions/net-transactions.component.ts index 1dad0ee2..dde58b04 100644 --- a/overlord/src/app/net-transactions/net-transactions.component.ts +++ b/overlord/src/app/net-transactions/net-transactions.component.ts @@ -27,7 +27,10 @@ export class NetTransactionsComponent implements OnInit { /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */ displayedColumns = ['type', 'name', 'debit', 'credit']; - constructor(private route: ActivatedRoute, private router: Router) { + constructor( + private route: ActivatedRoute, + private router: Router, + ) { this.form = new FormGroup({ startDate: new FormControl(new Date(), { nonNullable: true }), finishDate: new FormControl(new Date(), { nonNullable: true }), diff --git a/overlord/src/app/net-transactions/net-transactions.service.ts b/overlord/src/app/net-transactions/net-transactions.service.ts index 236d4f29..cc6671ee 100644 --- a/overlord/src/app/net-transactions/net-transactions.service.ts +++ b/overlord/src/app/net-transactions/net-transactions.service.ts @@ -14,7 +14,10 @@ const serviceName = 'NetTransactionsService'; providedIn: 'root', }) export class NetTransactionsService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} list(startDate: string | null, finishDate: string | null): Observable { const startDateWithSlash = startDate ? `/${startDate}` : ''; 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 6409198c..e2dfb65f 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 @@ -28,7 +28,7 @@ Contract {{ - row.contractPrice | currency : 'INR' + row.contractPrice | currency: 'INR' }} @@ -36,7 +36,7 @@ Purchase {{ - row.purchasePrice | currency : 'INR' + row.purchasePrice | currency: 'INR' }} diff --git a/overlord/src/app/non-contact-purchase/non-contract-purchase.component.ts b/overlord/src/app/non-contact-purchase/non-contract-purchase.component.ts index e1577ba6..8d8a11a4 100644 --- a/overlord/src/app/non-contact-purchase/non-contract-purchase.component.ts +++ b/overlord/src/app/non-contact-purchase/non-contract-purchase.component.ts @@ -14,7 +14,10 @@ export class NonContractPurchaseComponent implements OnInit { dataSource: NonContractPurchaseDatasource = new NonContractPurchaseDatasource(this.info); displayedColumns = ['date', 'vendor', 'product', 'contractPrice', 'purchasePrice']; - constructor(private route: ActivatedRoute, private router: Router) {} + constructor( + private route: ActivatedRoute, + private router: Router, + ) {} ngOnInit() { this.route.data.subscribe((value) => { 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 56437c32..b16cffbc 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 @@ -14,7 +14,10 @@ const serviceName = 'NonContractPurchaseService'; providedIn: 'root', }) export class NonContractPurchaseService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} nonContractPurchase(): Observable { return this.http diff --git a/overlord/src/app/payment/payment-dialog.component.html b/overlord/src/app/payment/payment-dialog.component.html index ef39e590..1a4371c9 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 }} - 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 }} Amount {{ - row.amount | currency : 'INR' + row.amount | currency: 'INR' }} diff --git a/overlord/src/app/period/period.service.ts b/overlord/src/app/period/period.service.ts index 1396ebcf..7e6fc20b 100644 --- a/overlord/src/app/period/period.service.ts +++ b/overlord/src/app/period/period.service.ts @@ -12,7 +12,10 @@ const serviceName = 'PeriodService'; @Injectable({ providedIn: 'root' }) export class PeriodService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} get(id: string | null): Observable { const getUrl: string = id === null ? `${url}` : `${url}/${id}`; diff --git a/overlord/src/app/product-group/product-group.service.ts b/overlord/src/app/product-group/product-group.service.ts index e2adac76..217e78bd 100644 --- a/overlord/src/app/product-group/product-group.service.ts +++ b/overlord/src/app/product-group/product-group.service.ts @@ -13,7 +13,10 @@ const serviceName = 'ProductGroupService'; providedIn: 'root', }) export class ProductGroupService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} get(id: string | null): Observable { const getUrl: string = id === null ? `${url}` : `${url}/${id}`; diff --git a/overlord/src/app/product-ledger/product-ledger.component.html b/overlord/src/app/product-ledger/product-ledger.component.html index 2f5ba2f5..55418ec8 100644 --- a/overlord/src/app/product-ledger/product-ledger.component.html +++ b/overlord/src/app/product-ledger/product-ledger.component.html @@ -99,10 +99,10 @@ >Debit Quantity {{ row.debitQuantity | number : '1.2-2' }} {{ row.debitUnit }}{{ row.debitQuantity | number: '1.2-2' }} {{ row.debitUnit }} {{ - debitQuantity | number : '1.2-2' + debitQuantity | number: '1.2-2' }} @@ -110,10 +110,10 @@ Amount {{ - row.debitAmount | currency : 'INR' + row.debitAmount | currency: 'INR' }} {{ - debitAmount | currency : 'INR' + debitAmount | currency: 'INR' }} @@ -121,10 +121,10 @@ Credit {{ row.creditQuantity | number : '1.2-2' }} {{ row.creditUnit }}{{ row.creditQuantity | number: '1.2-2' }} {{ row.creditUnit }} {{ - creditQuantity | number : '1.2-2' + creditQuantity | number: '1.2-2' }} @@ -132,10 +132,10 @@ Credit {{ - row.creditAmount | currency : 'INR' + row.creditAmount | currency: 'INR' }} {{ - creditAmount | currency : 'INR' + creditAmount | currency: 'INR' }} @@ -143,10 +143,10 @@ Running {{ - row.runningQuantity | number : '1.2-2' + row.runningQuantity | number: '1.2-2' }} {{ - runningQuantity | number : '1.2-2' + runningQuantity | number: '1.2-2' }} @@ -154,10 +154,10 @@ Running {{ - row.runningAmount | currency : 'INR' + row.runningAmount | currency: 'INR' }} {{ - runningAmount | currency : 'INR' + runningAmount | currency: 'INR' }} diff --git a/overlord/src/app/product-ledger/product-ledger.service.ts b/overlord/src/app/product-ledger/product-ledger.service.ts index d8639391..b8cd55e3 100644 --- a/overlord/src/app/product-ledger/product-ledger.service.ts +++ b/overlord/src/app/product-ledger/product-ledger.service.ts @@ -14,7 +14,10 @@ const serviceName = 'ProductLedgerService'; providedIn: 'root', }) export class ProductLedgerService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} list( id: string | null, 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 2491e06f..930b609e 100644 --- a/overlord/src/app/product/product-detail/product-detail.component.html +++ b/overlord/src/app/product/product-detail/product-detail.component.html @@ -88,7 +88,7 @@ Cost Price {{ - row.costPrice | currency : 'INR' + row.costPrice | currency: 'INR' }} @@ -96,7 +96,7 @@ Sale Price {{ - row.salePrice | currency : 'INR' + row.salePrice | currency: 'INR' }} 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 be0b4d2e..7ade60a3 100644 --- a/overlord/src/app/product/product-list/product-list.component.html +++ b/overlord/src/app/product/product-list/product-list.component.html @@ -43,7 +43,7 @@
    • - {{ sku.costPrice | currency : 'INR' }} + {{ sku.costPrice | currency: 'INR' }}
    @@ -55,7 +55,7 @@
    • - {{ sku.productYield | percent : '1.2-2' }} + {{ sku.productYield | percent: '1.2-2' }}
    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 53ee7194..b1e9436f 100644 --- a/overlord/src/app/product/product-list/product-list.component.ts +++ b/overlord/src/app/product/product-list/product-list.component.ts @@ -32,7 +32,10 @@ export class ProductListComponent implements OnInit, AfterViewInit { private _showExtended = true; - constructor(private route: ActivatedRoute, private toCsv: ToCsvService) { + constructor( + private route: ActivatedRoute, + private toCsv: ToCsvService, + ) { this.showExtended = true; this.form = new FormGroup({ filter: new FormControl('', { nonNullable: true }), diff --git a/overlord/src/app/product/product.service.ts b/overlord/src/app/product/product.service.ts index d1c306dd..8fdf76e0 100644 --- a/overlord/src/app/product/product.service.ts +++ b/overlord/src/app/product/product.service.ts @@ -12,7 +12,10 @@ const serviceName = 'ProductService'; @Injectable({ providedIn: 'root' }) export class ProductService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} get(id: string | null): Observable { const getUrl: string = id === null ? `${url}` : `${url}/${id}`; diff --git a/overlord/src/app/profit-loss/profit-loss.component.html b/overlord/src/app/profit-loss/profit-loss.component.html index 2abd822b..609fd157 100644 --- a/overlord/src/app/profit-loss/profit-loss.component.html +++ b/overlord/src/app/profit-loss/profit-loss.component.html @@ -52,18 +52,18 @@ Amount - {{ row.amount | currency : 'INR' }} + {{ row.amount | currency: 'INR' }} - {{ info.footer.amount | currency : 'INR' }} + {{ info.footer.amount | currency: 'INR' }} Total - {{ row.total | currency : 'INR' }} + {{ row.total | currency: 'INR' }} - {{ info.footer.total | currency : 'INR' }} + {{ info.footer.total | currency: 'INR' }} diff --git a/overlord/src/app/profit-loss/profit-loss.component.ts b/overlord/src/app/profit-loss/profit-loss.component.ts index e93bfdc4..24a1bcd9 100644 --- a/overlord/src/app/profit-loss/profit-loss.component.ts +++ b/overlord/src/app/profit-loss/profit-loss.component.ts @@ -27,7 +27,10 @@ export class ProfitLossComponent implements OnInit { /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */ displayedColumns = ['group', 'name', 'amount', 'total']; - constructor(private route: ActivatedRoute, private router: Router) { + constructor( + private route: ActivatedRoute, + private router: Router, + ) { this.form = new FormGroup({ startDate: new FormControl(new Date(), { nonNullable: true }), finishDate: new FormControl(new Date(), { nonNullable: true }), diff --git a/overlord/src/app/profit-loss/profit-loss.service.ts b/overlord/src/app/profit-loss/profit-loss.service.ts index 74e1e49e..6db728c8 100644 --- a/overlord/src/app/profit-loss/profit-loss.service.ts +++ b/overlord/src/app/profit-loss/profit-loss.service.ts @@ -14,7 +14,10 @@ const serviceName = 'ProfitLossService'; providedIn: 'root', }) export class ProfitLossService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} list(startDate: string | null, finishDate: string | null): Observable { const startDateWithSlash = startDate ? `/${startDate}` : ''; diff --git a/overlord/src/app/purchase-entries/purchase-entries.component.html b/overlord/src/app/purchase-entries/purchase-entries.component.html index 034aad80..4030d3ed 100644 --- a/overlord/src/app/purchase-entries/purchase-entries.component.html +++ b/overlord/src/app/purchase-entries/purchase-entries.component.html @@ -59,34 +59,34 @@ Quantity {{ - row.quantity | number : '1.2-2' + row.quantity | number: '1.2-2' }} Rate - {{ row.rate | currency : 'INR' }} + {{ row.rate | currency: 'INR' }} Tax - {{ row.tax | percent : '1.2-2' }} + {{ row.tax | percent: '1.2-2' }} Discount {{ - row.discount | percent : '1.2-2' + row.discount | percent: '1.2-2' }} Amount - {{ row.amount | currency : 'INR' }} + {{ row.amount | currency: 'INR' }} diff --git a/overlord/src/app/purchase-entries/purchase-entries.component.ts b/overlord/src/app/purchase-entries/purchase-entries.component.ts index 351bd1f5..64d5626e 100644 --- a/overlord/src/app/purchase-entries/purchase-entries.component.ts +++ b/overlord/src/app/purchase-entries/purchase-entries.component.ts @@ -36,7 +36,10 @@ export class PurchaseEntriesComponent implements OnInit { 'amount', ]; - constructor(private route: ActivatedRoute, private router: Router) { + constructor( + private route: ActivatedRoute, + private router: Router, + ) { this.form = new FormGroup({ startDate: new FormControl(new Date(), { nonNullable: true }), finishDate: new FormControl(new Date(), { nonNullable: true }), diff --git a/overlord/src/app/purchase-entries/purchase-entries.service.ts b/overlord/src/app/purchase-entries/purchase-entries.service.ts index fa1fc8c9..6f496792 100644 --- a/overlord/src/app/purchase-entries/purchase-entries.service.ts +++ b/overlord/src/app/purchase-entries/purchase-entries.service.ts @@ -14,7 +14,10 @@ const serviceName = 'PurchaseEntriesService'; providedIn: 'root', }) export class PurchaseEntriesService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} list(startDate: string | null, finishDate: string | null): Observable { const startDateWithSlash = startDate ? `/${startDate}` : ''; diff --git a/overlord/src/app/purchase-return/purchase-return.component.html b/overlord/src/app/purchase-return/purchase-return.component.html index af5fb38a..934a48c7 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 }} Quantity {{ - row.quantity | number : '1.2-2' + row.quantity | number: '1.2-2' }} Rate - {{ row.rate | currency : 'INR' }} + {{ row.rate | currency: 'INR' }} Tax - {{ row.tax | percent : '1.2-2' }} + {{ row.tax | percent: '1.2-2' }} Discount {{ - row.discount | percent : '1.2-2' + row.discount | percent: '1.2-2' }} @@ -133,7 +133,7 @@ Amount {{ - row.amount | currency : 'INR' + row.amount | currency: 'INR' }} diff --git a/overlord/src/app/purchase/purchase.component.html b/overlord/src/app/purchase/purchase.component.html index 4760ba83..15062fc0 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 }} Quantity {{ - row.quantity | number : '1.2-2' + row.quantity | number: '1.2-2' }} Rate - {{ row.rate | currency : 'INR' }} + {{ row.rate | currency: 'INR' }} Tax - {{ row.tax | percent : '1.2-2' }} + {{ row.tax | percent: '1.2-2' }} Discount {{ - row.discount | percent : '1.2-2' + row.discount | percent: '1.2-2' }} @@ -145,7 +145,7 @@ Amount {{ - row.amount | currency : 'INR' + row.amount | currency: 'INR' }} diff --git a/overlord/src/app/purchases/purchases.component.html b/overlord/src/app/purchases/purchases.component.html index cfdd2a9e..9ca2019b 100644 --- a/overlord/src/app/purchases/purchases.component.html +++ b/overlord/src/app/purchases/purchases.component.html @@ -54,28 +54,28 @@ Quantity {{ - row.quantity | number : '1.2-2' + row.quantity | number: '1.2-2' }} - {{ info.footer.quantity | number : '1.2-2' }} + {{ info.footer.quantity | number: '1.2-2' }} Rate - {{ row.rate | currency : 'INR' }} + {{ row.rate | currency: 'INR' }} - {{ info.footer.rate | currency : 'INR' }} + {{ info.footer.rate | currency: 'INR' }} Amount - {{ row.amount | currency : 'INR' }} + {{ row.amount | currency: 'INR' }} - {{ info.footer.amount | currency : 'INR' }} + {{ info.footer.amount | currency: 'INR' }} diff --git a/overlord/src/app/purchases/purchases.component.ts b/overlord/src/app/purchases/purchases.component.ts index f565d231..288022c5 100644 --- a/overlord/src/app/purchases/purchases.component.ts +++ b/overlord/src/app/purchases/purchases.component.ts @@ -28,7 +28,10 @@ export class PurchasesComponent implements OnInit { /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */ displayedColumns = ['product', 'quantity', 'rate', 'amount']; - constructor(private route: ActivatedRoute, private router: Router) { + constructor( + private route: ActivatedRoute, + private router: Router, + ) { this.form = new FormGroup({ startDate: new FormControl(new Date(), { nonNullable: true }), finishDate: new FormControl(new Date(), { nonNullable: true }), diff --git a/overlord/src/app/purchases/purchases.service.ts b/overlord/src/app/purchases/purchases.service.ts index 6ad1dff8..8b23eec6 100644 --- a/overlord/src/app/purchases/purchases.service.ts +++ b/overlord/src/app/purchases/purchases.service.ts @@ -14,7 +14,10 @@ const serviceName = 'PurchasesService'; providedIn: 'root', }) export class PurchasesService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} list(startDate: string | null, finishDate: string | null): Observable { const startDateWithSlash = startDate ? `/${startDate}` : ''; 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 1fb3c79f..8a9611e7 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 @@ -106,9 +106,7 @@ Price - {{ - row.price | currency : 'INR' - }} + {{ row.price | currency: 'INR' }} 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 24820371..05dbff1a 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 @@ -32,7 +32,7 @@
    • - {{ item.sku.name }} @ {{ item.price | currency : 'INR' }} + {{ item.sku.name }} @ {{ item.price | currency: 'INR' }}
    diff --git a/overlord/src/app/rate-contract/rate-contract.service.ts b/overlord/src/app/rate-contract/rate-contract.service.ts index 3d76be1e..5695072c 100644 --- a/overlord/src/app/rate-contract/rate-contract.service.ts +++ b/overlord/src/app/rate-contract/rate-contract.service.ts @@ -14,7 +14,10 @@ const serviceName = 'RateContractService'; providedIn: 'root', }) export class RateContractService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} get(id: string | null): Observable { const getUrl: string = id === null ? `${url}` : `${url}/${id}`; 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 f6cce829..046a999e 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 @@ -59,27 +59,27 @@ Issue - {{ row.issue | currency : 'INR' }} + {{ row.issue | currency: 'INR' }} {{ - info.footer?.issue | currency : 'INR' + info.footer?.issue | currency: 'INR' }} Sale - {{ row.sale | currency : 'INR' }} + {{ row.sale | currency: 'INR' }} {{ - info.footer?.sale | currency : 'INR' + info.footer?.sale | currency: 'INR' }} RMC - {{ row.rmc | percent : '1.2-2' }} + {{ row.rmc | percent: '1.2-2' }} {{ - info.footer?.rmc | percent : '1.2-2' + info.footer?.rmc | percent: '1.2-2' }} @@ -94,7 +94,7 @@ Quantity {{ - row.quantity | number : '1.2-2' + row.quantity | number: '1.2-2' }} @@ -102,14 +102,14 @@ Net - {{ row.net | currency : 'INR' }} + {{ row.net | currency: 'INR' }} Gross - {{ row.gross | currency : 'INR' }} + {{ row.gross | currency: 'INR' }} diff --git a/overlord/src/app/raw-material-cost/raw-material-cost.component.ts b/overlord/src/app/raw-material-cost/raw-material-cost.component.ts index decd3c8a..c9f6dab0 100644 --- a/overlord/src/app/raw-material-cost/raw-material-cost.component.ts +++ b/overlord/src/app/raw-material-cost/raw-material-cost.component.ts @@ -36,7 +36,11 @@ export class RawMaterialCostComponent implements OnInit { columnsNoId = ['name', 'issue', 'sale', 'rmc']; columnsId = ['name', 'group', 'quantity', 'net', 'gross']; - constructor(private route: ActivatedRoute, private router: Router, private toCsv: ToCsvService) { + constructor( + private route: ActivatedRoute, + private router: Router, + private toCsv: ToCsvService, + ) { this.form = new FormGroup({ startDate: new FormControl(new Date(), { nonNullable: true }), finishDate: new FormControl(new Date(), { nonNullable: true }), 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 e6e43e42..2ecc62d0 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 @@ -14,7 +14,10 @@ const serviceName = 'RawMaterialCostService'; providedIn: 'root', }) export class RawMaterialCostService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} list( id: string | null, diff --git a/overlord/src/app/receipt/receipt-dialog.component.html b/overlord/src/app/receipt/receipt-dialog.component.html index 4929a276..58e7c5a2 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 }} - 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 }} Amount {{ - row.amount | currency : 'INR' + row.amount | currency: 'INR' }} diff --git a/overlord/src/app/recipe-template/recipe-template.service.ts b/overlord/src/app/recipe-template/recipe-template.service.ts index 6b5a0481..ba81be42 100644 --- a/overlord/src/app/recipe-template/recipe-template.service.ts +++ b/overlord/src/app/recipe-template/recipe-template.service.ts @@ -14,7 +14,10 @@ const serviceName = 'RecipeTemplateService'; providedIn: 'root', }) export class RecipeTemplateService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} get(id: string | null): Observable { const getUrl: string = id === null ? url : `${url}/${id}`; 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 deb606e2..137d4147 100644 --- a/overlord/src/app/recipe/recipe-detail/recipe-detail.component.html +++ b/overlord/src/app/recipe/recipe-detail/recipe-detail.component.html @@ -104,7 +104,7 @@ Quantity {{ row.quantity | number : '1.2-2' }} {{ row.product.fractionUnits }}{{ row.quantity | number: '1.2-2' }} {{ row.product.fractionUnits }} 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 065f9d22..858fc8e8 100644 --- a/overlord/src/app/recipe/recipe-list/recipe-list.component.ts +++ b/overlord/src/app/recipe/recipe-list/recipe-list.component.ts @@ -35,7 +35,10 @@ export class RecipeListComponent implements OnInit { /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */ displayedColumns = ['name', 'yield', 'date', 'source']; - constructor(private route: ActivatedRoute, private router: Router) { + constructor( + private route: ActivatedRoute, + private router: Router, + ) { this.form = new FormGroup({ period: new FormControl(new Period(), { nonNullable: true }), productGroup: new FormControl(null), diff --git a/overlord/src/app/recipe/recipe.service.ts b/overlord/src/app/recipe/recipe.service.ts index 68b5dea3..ca030d64 100644 --- a/overlord/src/app/recipe/recipe.service.ts +++ b/overlord/src/app/recipe/recipe.service.ts @@ -12,7 +12,10 @@ const serviceName = 'RecipeService'; @Injectable({ providedIn: 'root' }) export class RecipeService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} get(id: string | null): Observable { const getUrl: string = id === null ? `${url}` : `${url}/${id}`; 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 f9983df5..3dc09a1e 100644 --- a/overlord/src/app/role/role-list/role-list-datasource.ts +++ b/overlord/src/app/role/role-list/role-list-datasource.ts @@ -11,7 +11,11 @@ import { Role } from '../role'; 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[], private paginator?: MatPaginator, private sort?: MatSort) { + constructor( + public data: Role[], + private paginator?: MatPaginator, + private sort?: MatSort, + ) { super(); } diff --git a/overlord/src/app/role/role.service.ts b/overlord/src/app/role/role.service.ts index 4eb28bcd..c505f363 100644 --- a/overlord/src/app/role/role.service.ts +++ b/overlord/src/app/role/role.service.ts @@ -14,7 +14,10 @@ const serviceName = 'RoleService'; providedIn: 'root', }) export class RoleService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} get(id: string | null): Observable { const getUrl: string = id === null ? `${url}` : `${url}/${id}`; diff --git a/overlord/src/app/settings/settings.service.ts b/overlord/src/app/settings/settings.service.ts index e3844784..cbf6fe4c 100644 --- a/overlord/src/app/settings/settings.service.ts +++ b/overlord/src/app/settings/settings.service.ts @@ -11,7 +11,10 @@ const serviceName = 'SettingsService'; @Injectable({ providedIn: 'root' }) export class SettingsService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} getLockInformation(): Observable<[LockInfo]> { const url = '/api/lock-information'; diff --git a/overlord/src/app/settings/voucher-type.service.ts b/overlord/src/app/settings/voucher-type.service.ts index 1b8004e3..e3d1a0a7 100644 --- a/overlord/src/app/settings/voucher-type.service.ts +++ b/overlord/src/app/settings/voucher-type.service.ts @@ -13,7 +13,10 @@ const serviceName = 'VoucherTypeService'; providedIn: 'root', }) export class VoucherTypeService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} list(): Observable { return this.http diff --git a/overlord/src/app/stock-movement/stock-movement.component.html b/overlord/src/app/stock-movement/stock-movement.component.html index 2be201fe..b370a16b 100644 --- a/overlord/src/app/stock-movement/stock-movement.component.html +++ b/overlord/src/app/stock-movement/stock-movement.component.html @@ -57,31 +57,27 @@ Opening - {{ - row.opening | number : '1.2-2' - }} + {{ row.opening | number: '1.2-2' }} Purchase {{ - row.purchase | number : '1.2-2' + row.purchase | number: '1.2-2' }} Issue - {{ row.issue | number : '1.2-2' }} + {{ row.issue | number: '1.2-2' }} Closing - {{ - row.closing | number : '1.2-2' - }} + {{ row.closing | number: '1.2-2' }} diff --git a/overlord/src/app/stock-movement/stock-movement.component.ts b/overlord/src/app/stock-movement/stock-movement.component.ts index 979a3ced..3a0beb0e 100644 --- a/overlord/src/app/stock-movement/stock-movement.component.ts +++ b/overlord/src/app/stock-movement/stock-movement.component.ts @@ -27,7 +27,10 @@ export class StockMovementComponent implements OnInit { /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */ displayedColumns = ['group', 'name', 'opening', 'purchase', 'issue', 'closing']; - constructor(private route: ActivatedRoute, private router: Router) { + constructor( + private route: ActivatedRoute, + private router: Router, + ) { this.form = new FormGroup({ startDate: new FormControl(new Date(), { nonNullable: true }), finishDate: new FormControl(new Date(), { nonNullable: true }), diff --git a/overlord/src/app/stock-movement/stock-movement.service.ts b/overlord/src/app/stock-movement/stock-movement.service.ts index 6531ffe4..dda3552e 100644 --- a/overlord/src/app/stock-movement/stock-movement.service.ts +++ b/overlord/src/app/stock-movement/stock-movement.service.ts @@ -14,7 +14,10 @@ const serviceName = 'StockMovementService'; providedIn: 'root', }) export class StockMovementService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} list(startDate: string | null, finishDate: string | null): Observable { const startDateWithSlash = startDate ? `/${startDate}` : ''; diff --git a/overlord/src/app/trial-balance/trial-balance.component.html b/overlord/src/app/trial-balance/trial-balance.component.html index da6c24dd..367f0ead 100644 --- a/overlord/src/app/trial-balance/trial-balance.component.html +++ b/overlord/src/app/trial-balance/trial-balance.component.html @@ -37,7 +37,7 @@ Debit {{ - row.debit | currency : 'INR' | accounting + row.debit | currency: 'INR' | accounting }} @@ -45,7 +45,7 @@ Credit {{ - row.credit | currency : 'INR' | accounting + row.credit | currency: 'INR' | accounting }} diff --git a/overlord/src/app/trial-balance/trial-balance.component.ts b/overlord/src/app/trial-balance/trial-balance.component.ts index 70f336d4..971fb171 100644 --- a/overlord/src/app/trial-balance/trial-balance.component.ts +++ b/overlord/src/app/trial-balance/trial-balance.component.ts @@ -25,7 +25,10 @@ export class TrialBalanceComponent implements OnInit { /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */ displayedColumns = ['type', 'name', 'debit', 'credit']; - constructor(private route: ActivatedRoute, private router: Router) { + constructor( + private route: ActivatedRoute, + private router: Router, + ) { this.form = new FormGroup({ date: new FormControl(new Date(), { nonNullable: true }), }); diff --git a/overlord/src/app/trial-balance/trial-balance.service.ts b/overlord/src/app/trial-balance/trial-balance.service.ts index 642b4117..ae9cadbd 100644 --- a/overlord/src/app/trial-balance/trial-balance.service.ts +++ b/overlord/src/app/trial-balance/trial-balance.service.ts @@ -14,7 +14,10 @@ const serviceName = 'TrialBalanceService'; providedIn: 'root', }) export class TrialBalanceService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} list(date: string | null): Observable { const listUrl = date === null ? url : `${url}/${date}`; 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 c20074c7..7b4f7094 100644 --- a/overlord/src/app/user/user-list/user-list-datasource.ts +++ b/overlord/src/app/user/user-list/user-list-datasource.ts @@ -12,7 +12,11 @@ const compare = (a: string | number, b: string | number, isAsc: boolean) => (a < b ? -1 : 1) * (isAsc ? 1 : -1); export class UserListDataSource extends DataSource { - constructor(public data: User[], private paginator?: MatPaginator, private sort?: MatSort) { + constructor( + public data: User[], + private paginator?: MatPaginator, + private sort?: MatSort, + ) { super(); } diff --git a/overlord/src/app/user/user.service.ts b/overlord/src/app/user/user.service.ts index d3a882d5..314b3fac 100644 --- a/overlord/src/app/user/user.service.ts +++ b/overlord/src/app/user/user.service.ts @@ -13,7 +13,10 @@ const serviceName = 'UserService'; providedIn: 'root', }) export class UserService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} get(id: string | null): Observable { const getUrl: string = id === null ? `${url}` : `${url}/${id}`;