From 09b762d154cb854eade44ebdad52ee899e020701 Mon Sep 17 00:00:00 2001 From: Amritanshu Date: Sat, 22 Jul 2023 09:19:48 +0530 Subject: [PATCH] Chore: Moved to Angular 16 Moved to FastAPI 0.100.0 Moved to pydantic 2.0 --- barker/barker/core/config.py | 7 +- .../barker/schemas/bill_settlement_report.py | 39 +++++----- barker/barker/schemas/cashier_report.py | 46 ++++++----- barker/barker/schemas/customer.py | 30 ++------ barker/barker/schemas/device.py | 29 ++++--- barker/barker/schemas/discount_item.py | 6 +- barker/barker/schemas/discount_report.py | 27 ++++--- barker/barker/schemas/guest_book.py | 62 +++++++-------- barker/barker/schemas/header_footer.py | 6 +- barker/barker/schemas/login_history.py | 7 +- barker/barker/schemas/master.py | 32 ++++---- barker/barker/schemas/menu_category.py | 23 ++---- .../barker/schemas/menu_engineering_report.py | 27 ++++--- barker/barker/schemas/merge_move.py | 22 ++---- barker/barker/schemas/modifier.py | 20 ++--- barker/barker/schemas/modifier_category.py | 24 ++---- barker/barker/schemas/permission.py | 8 +- barker/barker/schemas/printer.py | 21 ++--- barker/barker/schemas/product.py | 36 ++++----- barker/barker/schemas/product_link.py | 12 +-- barker/barker/schemas/receive_payment.py | 11 +-- barker/barker/schemas/regime.py | 20 ++--- barker/barker/schemas/role.py | 26 ++----- barker/barker/schemas/sale_category.py | 28 ++----- barker/barker/schemas/sale_report.py | 27 ++++--- barker/barker/schemas/section.py | 23 ++---- barker/barker/schemas/section_printer.py | 10 +-- barker/barker/schemas/settle_option.py | 7 +- barker/barker/schemas/split.py | 7 +- barker/barker/schemas/table.py | 22 ++---- barker/barker/schemas/tax.py | 25 ++---- barker/barker/schemas/tax_report.py | 27 ++++--- .../barker/schemas/update_product_prices.py | 20 ++--- barker/barker/schemas/user.py | 36 ++++----- barker/barker/schemas/voucher.py | 49 ++++-------- barker/pyproject.toml | 28 +++---- bookie/.eslintrc.json | 1 - bookie/.prettierrc.js | 1 - bookie/package.json | 76 +++++++++---------- bookie/src/app/auth/auth-guard.service.ts | 10 ++- bookie/src/app/auth/auth.service.ts | 5 +- .../beer-sale-report-resolver.service.ts | 4 +- .../beer-sale-report.component.ts | 6 +- .../beer-sale-report.service.ts | 5 +- ...bill-settlement-report-resolver.service.ts | 4 +- .../bill-settlement-report.component.html | 2 +- .../bill-settlement-report.component.ts | 6 +- .../bill-settlement-report.service.ts | 5 +- .../active-cashiers-resolver.service.ts | 4 +- .../cashier-report-resolver.service.ts | 4 +- .../cashier-report.component.html | 2 +- .../cashier-report/cashier-report.service.ts | 5 +- .../customer-detail.component.html | 2 +- .../customer-list-resolver.service.ts | 3 +- .../customer-list.component.html | 2 +- .../customers/customer-resolver.service.ts | 4 +- bookie/src/app/customers/customer.service.ts | 5 +- .../devices/device-list-resolver.service.ts | 3 +- .../app/devices/device-resolver.service.ts | 4 +- bookie/src/app/devices/device.service.ts | 5 +- .../discount-report-resolver.service.ts | 4 +- .../discount-report.component.html | 2 +- .../discount-report.service.ts | 5 +- .../guest-book-detail-resolver.service.ts | 4 +- .../guest-book-list-resolver.service.ts | 3 +- .../src/app/guest-book/guest-book.service.ts | 5 +- .../header-footer-resolver.service.ts | 3 +- .../header-footer/header-footer.service.ts | 5 +- .../menu-category-list-resolver.service.ts | 3 +- .../menu-category-resolver.service.ts | 4 +- .../menu-category/menu-category.service.ts | 5 +- ...enu-engineering-report-resolver.service.ts | 4 +- .../menu-engineering-report.component.html | 6 +- .../menu-engineering-report.service.ts | 5 +- ...modifier-category-list-resolver.service.ts | 3 +- .../modifier-category-resolver.service.ts | 4 +- .../modifier-category.service.ts | 5 +- .../modifier-list-resolver.service.ts | 3 +- .../modifier-list/modifier-list-datasource.ts | 5 +- .../modifier-list.component.html | 2 +- .../modifier-list/modifier-list.component.ts | 5 +- .../modifiers/modifier-resolver.service.ts | 4 +- bookie/src/app/modifiers/modifier.service.ts | 5 +- bookie/src/app/nav-bar/nav-bar.component.ts | 5 +- .../printers/printer-list-resolver.service.ts | 3 +- .../app/printers/printer-resolver.service.ts | 4 +- bookie/src/app/printers/printer.service.ts | 5 +- .../product-sale-report-resolver.service.ts | 4 +- .../product-sale-report.component.html | 10 +-- .../product-sale-report.service.ts | 5 +- ...product-updates-report-resolver.service.ts | 4 +- .../product-updates-report.component.ts | 6 +- .../product-updates-report.service.ts | 5 +- .../product/product-list-resolver.service.ts | 3 +- .../product-list/product-list.component.html | 4 +- .../app/product/product-resolver.service.ts | 4 +- bookie/src/app/product/product.service.ts | 5 +- .../regimes/regime-list-resolver.service.ts | 3 +- .../app/regimes/regime-resolver.service.ts | 4 +- bookie/src/app/regimes/regime.service.ts | 5 +- .../app/roles/role-list-resolver.service.ts | 9 ++- bookie/src/app/roles/role-resolver.service.ts | 4 +- bookie/src/app/roles/role.service.ts | 5 +- .../product-list-resolver.service.ts | 4 +- .../sale-category-detail.component.html | 2 +- .../sale-category-list-resolver.service.ts | 3 +- .../sale-category-list.component.html | 4 +- .../sale-category-resolver.service.ts | 4 +- .../sale-category/sale-category.service.ts | 5 +- .../sale-report-resolver.service.ts | 4 +- .../sale-report/sale-report.component.html | 2 +- .../app/sale-report/sale-report.service.ts | 5 +- .../app/sales/bills/bill-resolver.service.ts | 4 +- .../src/app/sales/bills/bills.component.html | 10 +-- .../bills/update-table-resolver.service.ts | 4 +- bookie/src/app/sales/bills/voucher.service.ts | 5 +- .../app/sales/can-deactivate-bill.guard.ts | 3 +- .../discount/customer-discounts.service.ts | 5 +- .../sales/discount/discount.component.html | 4 +- .../menu-categories-resolver.service.ts | 3 +- bookie/src/app/sales/pax/pax.component.ts | 5 +- .../products/products-resolver.service.ts | 9 ++- .../sales/products/products.component.html | 2 +- .../app/sales/products/products.component.ts | 5 +- .../receive-payment.component.html | 4 +- .../receive-payment.component.ts | 2 +- .../running-tables-resolver.service.ts | 3 +- .../running-tables.component.html | 2 +- .../tables-dialog.component.html | 2 +- .../section-printer-resolver.service.ts | 4 +- .../section-printer.service.ts | 5 +- .../sections/section-list-resolver.service.ts | 3 +- .../app/sections/section-resolver.service.ts | 4 +- bookie/src/app/sections/section.service.ts | 5 +- ...fill-customer-discount-resolver.service.ts | 3 +- bookie/src/app/settings/settings.service.ts | 5 +- .../settle-option-list-resolver.service.ts | 3 +- .../settle-option-resolver.service.ts | 4 +- .../settle-option/settle-option.service.ts | 5 +- .../image-dialog/image-dialog.component.ts | 5 +- .../app/tables/table-list-resolver.service.ts | 3 +- .../src/app/tables/table-resolver.service.ts | 4 +- bookie/src/app/tables/table.service.ts | 5 +- .../tax-report/tax-report-resolver.service.ts | 4 +- .../app/tax-report/tax-report.component.html | 6 +- .../app/tax-report/tax-report.component.ts | 6 +- .../src/app/tax-report/tax-report.service.ts | 5 +- .../app/taxes/tax-list-resolver.service.ts | 3 +- .../taxes/tax-list/tax-list.component.html | 2 +- bookie/src/app/taxes/tax-resolver.service.ts | 4 +- bookie/src/app/taxes/tax.service.ts | 5 +- .../temporal-product-list-resolver.service.ts | 3 +- .../temporal-product-list.component.html | 4 +- .../temporal-product-resolver.service.ts | 4 +- .../temporal-product.service.ts | 5 +- .../update-product-prices-resolver.service.ts | 4 +- .../update-product-prices.component.html | 2 +- .../update-product-prices.service.ts | 5 +- .../app/users/user-list-resolver.service.ts | 3 +- bookie/src/app/users/user-resolver.service.ts | 4 +- bookie/src/app/users/user.service.ts | 5 +- 161 files changed, 693 insertions(+), 753 deletions(-) diff --git a/barker/barker/core/config.py b/barker/barker/core/config.py index 12c33f4..743ae1b 100644 --- a/barker/barker/core/config.py +++ b/barker/barker/core/config.py @@ -1,7 +1,7 @@ import secrets from dotenv import load_dotenv -from pydantic import BaseSettings +from pydantic_settings import BaseSettings, SettingsConfigDict class Settings(BaseSettings): @@ -27,10 +27,7 @@ class Settings(BaseSettings): WORKER_REDIS_HOST: str = "127.0.0.1" WORKER_REDIS_PORT: int = 6379 WORKER_QUEUE_NAME: str = "arq:queue" - - class Config: - case_sensitive = True - env_file = ".env" + model_config = SettingsConfigDict(case_sensitive=True, env_file=".env") load_dotenv() diff --git a/barker/barker/schemas/bill_settlement_report.py b/barker/barker/schemas/bill_settlement_report.py index f497759..34a1a48 100644 --- a/barker/barker/schemas/bill_settlement_report.py +++ b/barker/barker/schemas/bill_settlement_report.py @@ -1,49 +1,54 @@ from datetime import date, datetime from decimal import Decimal -from pydantic import BaseModel, validator +from pydantic import BaseModel, ConfigDict, field_serializer, field_validator from . import to_camel class BillSettlementItem(BaseModel): - date: datetime + date_: datetime bill_id: str settlement: str amount: Decimal + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel - json_encoders = { - datetime: lambda v: v.strftime("%d-%b-%Y %H:%M"), - } - - @validator("date", pre=True) + @field_validator("date_", mode="before") + @classmethod def parse_date(cls, value): if isinstance(value, datetime): return value return datetime.strptime(value, "%d-%b-%Y %H:%M") + @field_serializer("date_") + def serialize_date(self, value: datetime, _info): + return value.strftime("%d-%b-%Y %H:%M") + class BillSettlement(BaseModel): start_date: date finish_date: date amounts: list[BillSettlementItem] + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel - json_encoders = {datetime: lambda v: v.strftime("%d-%b-%Y %H:%M"), date: lambda v: v.strftime("%d-%b-%Y")} - - @validator("start_date", pre=True) + @field_validator("start_date", mode="before") + @classmethod def parse_start_date(cls, value): if isinstance(value, date): return value return datetime.strptime(value, "%d-%b-%Y").date() - @validator("finish_date", pre=True) + @field_serializer("start_date") + def serialize_start_date(self, value: date, _info): + return value.strftime("%d-%b-%Y") + + @field_validator("finish_date", mode="before") + @classmethod def parse_finish_date(cls, value): if isinstance(value, date): return value return datetime.strptime(value, "%d-%b-%Y").date() + + @field_serializer("finish_date") + def serialize_finish_date(self, value: date, _info): + return value.strftime("%d-%b-%Y") diff --git a/barker/barker/schemas/cashier_report.py b/barker/barker/schemas/cashier_report.py index 9904877..4301290 100644 --- a/barker/barker/schemas/cashier_report.py +++ b/barker/barker/schemas/cashier_report.py @@ -1,7 +1,7 @@ from datetime import date, datetime from decimal import Decimal -from pydantic import BaseModel, validator +from pydantic import BaseModel, ConfigDict, field_serializer, field_validator from . import to_camel from .user import UserLink @@ -10,24 +10,19 @@ from .user import UserLink class NameAmount(BaseModel): name: str amount: Decimal - - class Config: - anystr_strip_whitespace = True + model_config = ConfigDict(str_strip_whitespace=True) class SettleOptionSchema(BaseModel): def __hash__(self): - return hash(self.id) + return hash(self.id_) def __eq__(self, other): - return self.id == other.id + return self.id_ == other.id_ - id: int + id_: int name: str - - class Config: - fields = {"id": "id"} - anystr_strip_whitespace = True + model_config = ConfigDict(alias_generator=to_camel, str_strip_whitespace=True) class InfoItem(BaseModel): @@ -35,12 +30,10 @@ class InfoItem(BaseModel): bill_id: str customer: str amount: Decimal + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel - - @validator("date", pre=True) + @field_validator("date", mode="before") + @classmethod def parse_date(cls, value): if isinstance(value, datetime): return value @@ -55,21 +48,26 @@ class CashierReport(BaseModel): user: UserLink amounts: list[NameAmount] info: dict[str, list[InfoItem]] + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) - class Config: - fields = {"id_": "id"} - anystr_strip_whitespace = True - alias_generator = to_camel - json_encoders = {datetime: lambda v: v.strftime("%d-%b-%Y %H:%M"), date: lambda v: v.strftime("%d-%b-%Y")} - - @validator("start_date", pre=True) + @field_validator("start_date", mode="before") + @classmethod def parse_start_date(cls, value): if isinstance(value, date): return value return datetime.strptime(value, "%d-%b-%Y").date() - @validator("finish_date", pre=True) + @field_serializer("start_date") + def serialize_start_date(self, value: date, _info): + return value.strftime("%d-%b-%Y") + + @field_validator("finish_date", mode="before") + @classmethod def parse_finish_date(cls, value): if isinstance(value, date): return value return datetime.strptime(value, "%d-%b-%Y").date() + + @field_serializer("finish_date") + def serialize_finish_date(self, value: date, _info): + return value.strftime("%d-%b-%Y") diff --git a/barker/barker/schemas/customer.py b/barker/barker/schemas/customer.py index 0b8cf61..2382474 100644 --- a/barker/barker/schemas/customer.py +++ b/barker/barker/schemas/customer.py @@ -2,7 +2,7 @@ import uuid from decimal import Decimal -from pydantic import BaseModel, Field +from pydantic import BaseModel, ConfigDict, Field from . import to_camel @@ -12,45 +12,31 @@ class CustomerDiscount(BaseModel): name: str discount: Decimal = Field(ge=0, multiple_of=0.0001, default=0, le=1) limit: Decimal = Field(ge=0, multiple_of=0.0001, default=0, le=1) - - class Config: - alias_generator = to_camel + model_config = ConfigDict(alias_generator=to_camel) class CustomerIn(BaseModel): name: str = Field(..., min_length=1) # phone: str = Field(..., min_length=1) phone: str - address: str | None + address: str | None = None print_in_bill: bool discounts: list[CustomerDiscount] - - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) class Customer(CustomerIn): id_: uuid.UUID - - class Config: - fields = {"id_": "id"} - anystr_strip_whitespace = True - alias_generator = to_camel + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) class CustomerLink(BaseModel): id_: uuid.UUID = Field(...) - name: str | None - - class Config: - fields = {"id_": "id"} + name: str | None = None + model_config = ConfigDict(alias_generator=to_camel) class CustomerBlank(CustomerIn): name: str - - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) diff --git a/barker/barker/schemas/device.py b/barker/barker/schemas/device.py index f0f1989..47bd454 100644 --- a/barker/barker/schemas/device.py +++ b/barker/barker/schemas/device.py @@ -2,7 +2,7 @@ import uuid from datetime import datetime -from pydantic import BaseModel, Field +from pydantic import BaseModel, ConfigDict, Field, field_serializer from . import to_camel from .section import SectionLink @@ -12,29 +12,26 @@ class DeviceIn(BaseModel): name: str = Field(..., min_length=1) enabled: bool section: SectionLink - - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) class Device(DeviceIn): id_: uuid.UUID creation_date: datetime last_user: str - last_date: datetime | None + last_date: datetime | None = None + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) - class Config: - fields = {"id_": "id"} - anystr_strip_whitespace = True - alias_generator = to_camel - json_encoders = {datetime: lambda v: v.strftime("%d-%b-%Y %H:%M")} + @field_serializer("creation_date") + def serialize_creation_date(self, value: datetime, _info): + return value.strftime("%d-%b-%Y %H:%M") + + @field_serializer("last_date") + def serialize_last_date(self, value: datetime | None, _info): + return None if value is None else value.strftime("%d-%b-%Y %H:%M") class DeviceLink(BaseModel): id_: uuid.UUID = Field(...) - name: str | None - - class Config: - fields = {"id_": "id"} - alias_generator = to_camel + name: str | None = None + model_config = ConfigDict(alias_generator=to_camel) diff --git a/barker/barker/schemas/discount_item.py b/barker/barker/schemas/discount_item.py index 99e044e..b4ed915 100644 --- a/barker/barker/schemas/discount_item.py +++ b/barker/barker/schemas/discount_item.py @@ -3,7 +3,7 @@ import uuid from decimal import Decimal from barker.schemas import to_camel -from pydantic import BaseModel, Field +from pydantic import BaseModel, ConfigDict, Field class DiscountItem(BaseModel): @@ -12,6 +12,4 @@ class DiscountItem(BaseModel): discount: Decimal | None = Field(ge=0, multiple_of=0.0001, default=0, le=1) limit: Decimal customer: Decimal - - class Config: - alias_generator = to_camel + model_config = ConfigDict(alias_generator=to_camel) diff --git a/barker/barker/schemas/discount_report.py b/barker/barker/schemas/discount_report.py index 5b14806..72eefc8 100644 --- a/barker/barker/schemas/discount_report.py +++ b/barker/barker/schemas/discount_report.py @@ -1,7 +1,7 @@ from datetime import date, datetime from decimal import Decimal -from pydantic import BaseModel, validator +from pydantic import BaseModel, ConfigDict, field_serializer, field_validator from . import to_camel @@ -9,30 +9,33 @@ from . import to_camel class DiscountReportItem(BaseModel): name: str amount: Decimal - - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) class DiscountReport(BaseModel): start_date: date finish_date: date amounts: list[DiscountReportItem] + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel - json_encoders = {datetime: lambda v: v.strftime("%d-%b-%Y %H:%M"), date: lambda v: v.strftime("%d-%b-%Y")} - - @validator("start_date", pre=True) + @field_validator("start_date", mode="before") + @classmethod def parse_start_date(cls, value): if isinstance(value, date): return value return datetime.strptime(value, "%d-%b-%Y").date() - @validator("finish_date", pre=True) + @field_serializer("start_date") + def serialize_start_date(self, value: date, _info): + return value.strftime("%d-%b-%Y") + + @field_validator("finish_date", mode="before") + @classmethod def parse_finish_date(cls, value): if isinstance(value, date): return value return datetime.strptime(value, "%d-%b-%Y").date() + + @field_serializer("finish_date") + def serialize_finish_date(self, value: date, _info): + return value.strftime("%d-%b-%Y") diff --git a/barker/barker/schemas/guest_book.py b/barker/barker/schemas/guest_book.py index 8855d2f..1cca05c 100644 --- a/barker/barker/schemas/guest_book.py +++ b/barker/barker/schemas/guest_book.py @@ -2,7 +2,7 @@ import uuid from datetime import date, datetime -from pydantic import BaseModel, Field, validator +from pydantic import BaseModel, ConfigDict, Field, field_serializer, field_validator from . import to_camel @@ -10,37 +10,28 @@ from . import to_camel class GuestBookIn(BaseModel): name: str phone: str - address: str | None + address: str | None = None pax: int = Field(ge=0) date_: datetime - @validator("date_", pre=True) + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) + + @field_validator("date_", mode="before") + @classmethod def parse_date(cls, value): if isinstance(value, datetime): return value return datetime.strptime(value, "%d-%b-%Y %H:%M") - class Config: - fields = {"id_": "id"} - anystr_strip_whitespace = True - alias_generator = to_camel - json_encoders = {datetime: lambda v: v.strftime("%d-%b-%Y %H:%M")} + @field_serializer("date_") + def serialize_date(self, value: datetime, _info): + return value.strftime("%d-%b-%Y %H:%M") class GuestBook(GuestBookIn): id_: uuid.UUID - @validator("date_", pre=True) - def parse_date(cls, value): - if isinstance(value, datetime): - return value - return datetime.strptime(value, "%d-%b-%Y %H:%M") - - class Config: - fields = {"id_": "id"} - anystr_strip_whitespace = True - alias_generator = to_camel - json_encoders = {datetime: lambda v: v.strftime("%d-%b-%Y %H:%M")} + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) class GuestBookListItem(BaseModel): @@ -50,36 +41,37 @@ class GuestBookListItem(BaseModel): phone: str pax: int date_: datetime - status: str | None - table_id: uuid.UUID | None - voucher_id: uuid.UUID | None - table_name: str | None + status: str | None = None + table_id: uuid.UUID | None = None + voucher_id: uuid.UUID | None = None + table_name: str | None = None - @validator("date_", pre=True) + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) + + @field_validator("date_", mode="before") + @classmethod def parse_date(cls, value): if isinstance(value, datetime): return value return datetime.strptime(value, "%d-%b-%Y %H:%M") - class Config: - fields = {"id_": "id"} - anystr_strip_whitespace = True - alias_generator = to_camel - json_encoders = {datetime: lambda v: v.strftime("%d-%b-%Y %H:%M"), date: lambda v: v.strftime("%d-%b-%Y")} + @field_serializer("date_") + def serialize_date(self, value: datetime, _info): + return value.strftime("%d-%b-%Y %H:%M") class GuestBookList(BaseModel): date_: date list: list[GuestBookListItem] + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) - @validator("date_", pre=True) + @field_validator("date_", mode="before") + @classmethod def parse_date(cls, value): if isinstance(value, date): return value return datetime.strptime(value, "%d-%b-%Y").date() - class Config: - fields = {"id_": "id"} - anystr_strip_whitespace = True - alias_generator = to_camel - json_encoders = {datetime: lambda v: v.strftime("%d-%b-%Y %H:%M"), date: lambda v: v.strftime("%d-%b-%Y")} + @field_serializer("date_") + def serialize_date(self, value: date, _info): + return value.strftime("%d-%b-%Y") diff --git a/barker/barker/schemas/header_footer.py b/barker/barker/schemas/header_footer.py index 49a63bc..fe8c5ce 100644 --- a/barker/barker/schemas/header_footer.py +++ b/barker/barker/schemas/header_footer.py @@ -1,6 +1,6 @@ import uuid -from pydantic import BaseModel +from pydantic import BaseModel, ConfigDict from . import to_camel @@ -9,6 +9,4 @@ class HeaderFooter(BaseModel): id_: uuid.UUID name: str text: str - - class Config: - alias_generator = to_camel + model_config = ConfigDict(alias_generator=to_camel) diff --git a/barker/barker/schemas/login_history.py b/barker/barker/schemas/login_history.py index b985576..35abbc0 100644 --- a/barker/barker/schemas/login_history.py +++ b/barker/barker/schemas/login_history.py @@ -3,7 +3,7 @@ import uuid from datetime import datetime from barker.schemas import to_camel -from pydantic import BaseModel +from pydantic import BaseModel, ConfigDict class LoginHistory(BaseModel): @@ -11,7 +11,4 @@ class LoginHistory(BaseModel): user_id: uuid.UUID client_id: uuid.UUID date: datetime - - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) diff --git a/barker/barker/schemas/master.py b/barker/barker/schemas/master.py index fcdc2be..1fb9191 100644 --- a/barker/barker/schemas/master.py +++ b/barker/barker/schemas/master.py @@ -3,7 +3,7 @@ import uuid from datetime import date, datetime from decimal import Decimal -from pydantic import BaseModel, Field, validator +from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator from . import to_camel @@ -12,11 +12,7 @@ class AccountBase(BaseModel): name: str = Field(..., min_length=1) is_starred: bool is_active: bool - - class Config: - fields = {"id_": "id"} - anystr_strip_whitespace = True - alias_generator = to_camel + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) class AccountIn(AccountBase): @@ -35,26 +31,28 @@ class EmployeeIn(AccountBase): salary: int = Field(ge=0) points: Decimal = Field(ge=0, lt=1000, multiple_of=0.01) joining_date: date - leaving_date: date | None + leaving_date: date | None = None - @validator("joining_date", pre=True) + @field_validator("joining_date", mode="before") + @classmethod def parse_joining_date(cls, value): return datetime.strptime(value, "%d-%b-%Y").date() - @validator("leaving_date", pre=True) + @field_validator("leaving_date", mode="before") + @classmethod def parse_leaving_date(cls, value): if value is None or value == "": return None else: return datetime.strptime(value, "%d-%b-%Y").date() - @validator("leaving_date") - def leaving_date_more_than_joining_date(cls, v, values, **kwargs): - if values["is_active"]: - return None - if v < values["joining_date"]: + @model_validator(mode="after") + def leaving_date_more_than_joining_date(self) -> "EmployeeIn": + if self.is_active: + self.leaving_date = None + elif self.leaving_date < self.joining_date: raise ValueError("Leaving Date cannot be less than Joining Date") - return v + return self class Employee(EmployeeIn): @@ -72,6 +70,4 @@ class DbSetting(BaseModel): class AccountType(BaseModel): id_: int name: str - - class Config: - fields = {"id_": "id"} + model_config = ConfigDict(alias_generator=to_camel) diff --git a/barker/barker/schemas/menu_category.py b/barker/barker/schemas/menu_category.py index 2dd7eec..29adf88 100644 --- a/barker/barker/schemas/menu_category.py +++ b/barker/barker/schemas/menu_category.py @@ -1,6 +1,6 @@ import uuid -from pydantic import BaseModel, Field +from pydantic import BaseModel, ConfigDict, Field from . import to_camel from .product_link import ProductLink @@ -10,33 +10,22 @@ class MenuCategoryIn(BaseModel): name: str = Field(..., min_length=1) is_active: bool is_fixture: bool - - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) class MenuCategory(MenuCategoryIn): id_: uuid.UUID sort_order: int - - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) class MenuCategoryBlank(MenuCategoryIn): name: str - - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) class MenuCategoryLink(BaseModel): id_: uuid.UUID = Field(...) - name: str | None + name: str | None = None products: list[ProductLink] - - class Config: - fields = {"id_": "id"} + model_config = ConfigDict(alias_generator=to_camel) diff --git a/barker/barker/schemas/menu_engineering_report.py b/barker/barker/schemas/menu_engineering_report.py index bc9e6e2..1021768 100644 --- a/barker/barker/schemas/menu_engineering_report.py +++ b/barker/barker/schemas/menu_engineering_report.py @@ -3,7 +3,7 @@ import uuid from datetime import date, datetime from decimal import Decimal -from pydantic import BaseModel, validator +from pydantic import BaseModel, ConfigDict, field_serializer, field_validator from . import to_camel @@ -19,30 +19,33 @@ class MeItem(BaseModel): sales: Decimal quantity_percent: Decimal sales_percent: Decimal - - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) class MeReport(BaseModel): start_date: date finish_date: date amounts: list[MeItem] + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel - json_encoders = {datetime: lambda v: v.strftime("%d-%b-%Y %H:%M"), date: lambda v: v.strftime("%d-%b-%Y")} - - @validator("start_date", pre=True) + @field_validator("start_date", mode="before") + @classmethod def parse_start_date(cls, value): if isinstance(value, date): return value return datetime.strptime(value, "%d-%b-%Y").date() - @validator("finish_date", pre=True) + @field_serializer("start_date") + def serialize_start_date(self, value: date, _info): + return value.strftime("%d-%b-%Y") + + @field_validator("finish_date", mode="before") + @classmethod def parse_finish_date(cls, value): if isinstance(value, date): return value return datetime.strptime(value, "%d-%b-%Y").date() + + @field_serializer("finish_date") + def serialize_finish_date(self, value: date, _info): + return value.strftime("%d-%b-%Y") diff --git a/barker/barker/schemas/merge_move.py b/barker/barker/schemas/merge_move.py index bcd00a9..0ee0c7d 100644 --- a/barker/barker/schemas/merge_move.py +++ b/barker/barker/schemas/merge_move.py @@ -1,6 +1,6 @@ import uuid -from pydantic import BaseModel +from pydantic import BaseModel, ConfigDict from . import to_camel @@ -10,36 +10,24 @@ class MergeKot(BaseModel): kot_id: uuid.UUID table_id: uuid.UUID new_voucher_id: uuid.UUID - - class Config: - alias_generator = to_camel - fields = {"id_": "id"} + model_config = ConfigDict(alias_generator=to_camel) class MoveKot(BaseModel): voucher_id: uuid.UUID kot_id: uuid.UUID table_id: uuid.UUID - - class Config: - alias_generator = to_camel - fields = {"id_": "id"} + model_config = ConfigDict(alias_generator=to_camel) class MergeTable(BaseModel): voucher_id: uuid.UUID table_id: uuid.UUID new_voucher_id: uuid.UUID - - class Config: - alias_generator = to_camel - fields = {"id_": "id"} + model_config = ConfigDict(alias_generator=to_camel) class MoveTable(BaseModel): voucher_id: uuid.UUID table_id: uuid.UUID - - class Config: - alias_generator = to_camel - fields = {"id_": "id"} + model_config = ConfigDict(alias_generator=to_camel) diff --git a/barker/barker/schemas/modifier.py b/barker/barker/schemas/modifier.py index fe67a2d..d05a389 100644 --- a/barker/barker/schemas/modifier.py +++ b/barker/barker/schemas/modifier.py @@ -2,7 +2,7 @@ import uuid from decimal import Decimal -from pydantic import BaseModel, Field +from pydantic import BaseModel, ConfigDict, Field from . import to_camel from .modifier_category import ModifierCategoryLink @@ -14,11 +14,7 @@ class ModifierIn(BaseModel): price: Decimal = Field(ge=0, multiple_of=0.01, default=0) is_active: bool modifier_category: ModifierCategoryLink - - class Config: - fields = {"id_": "id"} - anystr_strip_whitespace = True - alias_generator = to_camel + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) class Modifier(ModifierIn): @@ -27,10 +23,8 @@ class Modifier(ModifierIn): class ModifierLink(BaseModel): id_: uuid.UUID = Field(...) - name: str | None - - class Config: - fields = {"id_": "id"} + name: str | None = None + model_config = ConfigDict(alias_generator=to_camel) class ModifierBlank(BaseModel): @@ -38,8 +32,4 @@ class ModifierBlank(BaseModel): show_in_bill: bool price: Decimal is_active: bool - - class Config: - fields = {"id_": "id"} - anystr_strip_whitespace = True - alias_generator = to_camel + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) diff --git a/barker/barker/schemas/modifier_category.py b/barker/barker/schemas/modifier_category.py index e510788..5ea7bf8 100644 --- a/barker/barker/schemas/modifier_category.py +++ b/barker/barker/schemas/modifier_category.py @@ -1,6 +1,6 @@ import uuid -from pydantic import BaseModel, Field +from pydantic import BaseModel, ConfigDict, Field from . import to_camel from .menu_category import MenuCategoryLink @@ -12,33 +12,21 @@ class ModifierCategoryIn(BaseModel): maximum: int | None = Field(ge=0) is_active: bool menu_categories: list[MenuCategoryLink] - - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) class ModifierCategory(ModifierCategoryIn): id_: uuid.UUID sort_order: int - - class Config: - fields = {"id_": "id"} - anystr_strip_whitespace = True - alias_generator = to_camel + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) class ModifierCategoryBlank(ModifierCategoryIn): name: str - - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) class ModifierCategoryLink(BaseModel): id_: uuid.UUID = Field(...) - name: str | None - - class Config: - fields = {"id_": "id"} + name: str | None = None + model_config = ConfigDict(alias_generator=to_camel) diff --git a/barker/barker/schemas/permission.py b/barker/barker/schemas/permission.py index cb0310d..fec2968 100644 --- a/barker/barker/schemas/permission.py +++ b/barker/barker/schemas/permission.py @@ -1,12 +1,12 @@ import uuid -from pydantic import BaseModel +from pydantic import BaseModel, ConfigDict + +from . import to_camel class PermissionItem(BaseModel): id_: uuid.UUID name: str enabled: bool - - class Config: - fields = {"id_": "id"} + model_config = ConfigDict(alias_generator=to_camel) diff --git a/barker/barker/schemas/printer.py b/barker/barker/schemas/printer.py index 029a0df..32a4b3e 100644 --- a/barker/barker/schemas/printer.py +++ b/barker/barker/schemas/printer.py @@ -1,6 +1,6 @@ import uuid -from pydantic import BaseModel, Field +from pydantic import BaseModel, ConfigDict, Field from . import to_camel @@ -9,31 +9,20 @@ class PrinterIn(BaseModel): name: str = Field(..., min_length=1) address: str = Field(..., min_length=1) cut_code: str - - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) class Printer(PrinterIn): id_: uuid.UUID - - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) class PrinterBlank(PrinterIn): name: str address: str - - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) class PrinterLink(BaseModel): id_: uuid.UUID = Field(...) - - class Config: - fields = {"id_": "id"} + model_config = ConfigDict(alias_generator=to_camel) diff --git a/barker/barker/schemas/product.py b/barker/barker/schemas/product.py index 21be394..d4dea02 100644 --- a/barker/barker/schemas/product.py +++ b/barker/barker/schemas/product.py @@ -3,7 +3,7 @@ import uuid from datetime import date, datetime from decimal import Decimal -from pydantic import BaseModel, Field, validator +from pydantic import BaseModel, ConfigDict, Field, field_serializer, field_validator from . import to_camel from .menu_category import MenuCategoryLink @@ -21,24 +21,18 @@ class ProductIn(BaseModel): quantity: Decimal = Field(ge=0, multiple_of=0.01, default=0) is_active: bool sort_order: int - - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) class Product(ProductIn): id_: uuid.UUID version_id: uuid.UUID - valid_from: date | None - valid_till: date | None + valid_from: date | None = None + valid_till: date | None = None + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel - json_encoders = {date: lambda v: v.strftime("%d-%b-%Y")} - - @validator("valid_from", pre=True) + @field_validator("valid_from", mode="before") + @classmethod def parse_valid_from(cls, value): if value is None: return None @@ -46,7 +40,12 @@ class Product(ProductIn): return value return datetime.strptime(value, "%d-%b-%Y").date() - @validator("valid_till", pre=True) + @field_serializer("valid_from") + def serialize_valid_from(self, value: date | None, _info): + return None if value is None else value.strftime("%d-%b-%Y") + + @field_validator("valid_till", mode="before") + @classmethod def parse_valid_till(cls, value): if value is None: return None @@ -54,6 +53,10 @@ class Product(ProductIn): return value return datetime.strptime(value, "%d-%b-%Y").date() + @field_serializer("valid_till") + def serialize_valid_till(self, value: date | None, _info): + return None if value is None else value.strftime("%d-%b-%Y") + class ProductBlank(BaseModel): name: str @@ -64,7 +67,4 @@ class ProductBlank(BaseModel): quantity: Decimal is_active: bool sort_order: int - - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) diff --git a/barker/barker/schemas/product_link.py b/barker/barker/schemas/product_link.py index 51f2476..7a65995 100644 --- a/barker/barker/schemas/product_link.py +++ b/barker/barker/schemas/product_link.py @@ -1,12 +1,12 @@ import uuid -from pydantic import BaseModel, Field +from pydantic import BaseModel, ConfigDict, Field + +from . import to_camel class ProductLink(BaseModel): id_: uuid.UUID = Field(...) - name: str | None - enabled: bool | None - - class Config: - fields = {"id_": "id"} + name: str | None = None + enabled: bool | None = None + model_config = ConfigDict(alias_generator=to_camel) diff --git a/barker/barker/schemas/receive_payment.py b/barker/barker/schemas/receive_payment.py index 7efe0bb..2b0cee9 100644 --- a/barker/barker/schemas/receive_payment.py +++ b/barker/barker/schemas/receive_payment.py @@ -1,6 +1,6 @@ from decimal import Decimal -from pydantic import BaseModel +from pydantic import BaseModel, ConfigDict from . import to_camel @@ -8,15 +8,10 @@ from . import to_camel class ReceivePaymentItem(BaseModel): id_: int amount: Decimal - - class Config: - fields = {"id_": "id"} + model_config = ConfigDict(alias_generator=to_camel) class ReceivePayment(BaseModel): reason: str amounts: list[ReceivePaymentItem] - - class Config: - alias_generator = to_camel - anystr_strip_whitespace = True + model_config = ConfigDict(alias_generator=to_camel, str_strip_whitespace=True) diff --git a/barker/barker/schemas/regime.py b/barker/barker/schemas/regime.py index 1670a39..58ae16e 100644 --- a/barker/barker/schemas/regime.py +++ b/barker/barker/schemas/regime.py @@ -1,4 +1,4 @@ -from pydantic import BaseModel, Field +from pydantic import BaseModel, ConfigDict, Field from . import to_camel @@ -8,30 +8,22 @@ class RegimeIn(BaseModel): header: str prefix: str = Field(..., min_length=1) is_fixture: bool - - class Config: - alias_generator = to_camel + model_config = ConfigDict(alias_generator=to_camel) class Regime(RegimeIn): id_: int - - class Config: - alias_generator = to_camel + model_config = ConfigDict(alias_generator=to_camel) class RegimeBlank(RegimeIn): name: str header: str prefix: str - - class Config: - alias_generator = to_camel + model_config = ConfigDict(alias_generator=to_camel) class RegimeLink(BaseModel): id_: int = Field(...) - name: str | None - - class Config: - fields = {"id_": "id"} + name: str | None = None + model_config = ConfigDict(alias_generator=to_camel) diff --git a/barker/barker/schemas/role.py b/barker/barker/schemas/role.py index 462a7b3..f499d74 100644 --- a/barker/barker/schemas/role.py +++ b/barker/barker/schemas/role.py @@ -1,46 +1,36 @@ import uuid from barker.schemas.permission import PermissionItem -from pydantic import BaseModel, Field +from pydantic import BaseModel, ConfigDict, Field + +from . import to_camel class RoleIn(BaseModel): name: str = Field(..., min_length=1) permissions: list[PermissionItem] - - class Config: - anystr_strip_whitespace = True + model_config = ConfigDict(str_strip_whitespace=True) class Role(RoleIn): id_: uuid.UUID - - class Config: - anystr_strip_whitespace = True - fields = {"id_": "id"} + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) class RoleBlank(RoleIn): name: str - - class Config: - anystr_strip_whitespace = True + model_config = ConfigDict(str_strip_whitespace=True) class RoleList(BaseModel): id_: uuid.UUID name: str permissions: list[str] - - class Config: - fields = {"id_": "id"} - anystr_strip_whitespace = True + model_config = ConfigDict(alias_generator=to_camel, str_strip_whitespace=True) class RoleItem(BaseModel): id_: uuid.UUID name: str enabled: bool - - class Config: - fields = {"id_": "id"} + model_config = ConfigDict(alias_generator=to_camel) diff --git a/barker/barker/schemas/sale_category.py b/barker/barker/schemas/sale_category.py index 32249f9..81915af 100644 --- a/barker/barker/schemas/sale_category.py +++ b/barker/barker/schemas/sale_category.py @@ -2,7 +2,7 @@ import uuid from decimal import Decimal -from pydantic import BaseModel, Field +from pydantic import BaseModel, ConfigDict, Field from . import to_camel from .tax import TaxLink @@ -12,27 +12,18 @@ class SaleCategoryIn(BaseModel): name: str = Field(..., min_length=1) discount_limit: Decimal = Field(ge=0, multiple_of=0.0001, default=0, le=1) tax: TaxLink = Field(...) - - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) class SaleCategory(SaleCategoryIn): id_: uuid.UUID - - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) class SaleCategoryBlank(BaseModel): name: str discount_limit: Decimal - - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) class SaleCategoryForDiscount(BaseModel): @@ -40,15 +31,10 @@ class SaleCategoryForDiscount(BaseModel): name: str discount_limit: Decimal discount: Decimal - - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) class SaleCategoryLink(BaseModel): id_: uuid.UUID = Field(...) - name: str | None - - class Config: - fields = {"id_": "id"} + name: str | None = None + model_config = ConfigDict(alias_generator=to_camel) diff --git a/barker/barker/schemas/sale_report.py b/barker/barker/schemas/sale_report.py index 5cd55b5..74a7aa0 100644 --- a/barker/barker/schemas/sale_report.py +++ b/barker/barker/schemas/sale_report.py @@ -1,7 +1,7 @@ from datetime import date, datetime from decimal import Decimal -from pydantic import BaseModel, validator +from pydantic import BaseModel, ConfigDict, field_serializer, field_validator from . import to_camel from .user import UserLink @@ -10,10 +10,7 @@ from .user import UserLink class SaleReportItem(BaseModel): name: str amount: Decimal - - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) class SaleReport(BaseModel): @@ -21,20 +18,26 @@ class SaleReport(BaseModel): finish_date: date amounts: list[SaleReportItem] user: UserLink + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel - json_encoders = {datetime: lambda v: v.strftime("%d-%b-%Y %H:%M"), date: lambda v: v.strftime("%d-%b-%Y")} - - @validator("start_date", pre=True) + @field_validator("start_date", mode="before") + @classmethod def parse_start_date(cls, value): if isinstance(value, date): return value return datetime.strptime(value, "%d-%b-%Y").date() - @validator("finish_date", pre=True) + @field_serializer("start_date") + def serialize_start_date(self, value: date, _info): + return value.strftime("%d-%b-%Y") + + @field_validator("finish_date", mode="before") + @classmethod def parse_finish_date(cls, value): if isinstance(value, date): return value return datetime.strptime(value, "%d-%b-%Y").date() + + @field_serializer("finish_date") + def serialize_finish_date(self, value: date, _info): + return value.strftime("%d-%b-%Y") diff --git a/barker/barker/schemas/section.py b/barker/barker/schemas/section.py index 9e14d6a..da4d301 100644 --- a/barker/barker/schemas/section.py +++ b/barker/barker/schemas/section.py @@ -1,33 +1,26 @@ import uuid -from pydantic import BaseModel, Field +from pydantic import BaseModel, ConfigDict, Field + +from . import to_camel class SectionIn(BaseModel): name: str = Field(..., min_length=1) - - class Config: - anystr_strip_whitespace = True + model_config = ConfigDict(str_strip_whitespace=True) class Section(SectionIn): id_: uuid.UUID - - class Config: - anystr_strip_whitespace = True - fields = {"id_": "id"} + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) class SectionBlank(BaseModel): name: str - - class Config: - anystr_strip_whitespace = True + model_config = ConfigDict(str_strip_whitespace=True) class SectionLink(BaseModel): id_: uuid.UUID = Field(...) - name: str | None - - class Config: - fields = {"id_": "id"} + name: str | None = None + model_config = ConfigDict(alias_generator=to_camel) diff --git a/barker/barker/schemas/section_printer.py b/barker/barker/schemas/section_printer.py index 647348c..71dfb0d 100644 --- a/barker/barker/schemas/section_printer.py +++ b/barker/barker/schemas/section_printer.py @@ -1,4 +1,4 @@ -from pydantic import BaseModel, Field +from pydantic import BaseModel, ConfigDict, Field from . import to_camel from .printer import PrinterLink @@ -6,9 +6,7 @@ from .sale_category import SaleCategoryLink class SectionPrinter(BaseModel): - sale_category: SaleCategoryLink | None - printer: PrinterLink | None + sale_category: SaleCategoryLink | None = None + printer: PrinterLink | None = None copies: int = Field(ge=0) - - class Config: - alias_generator = to_camel + model_config = ConfigDict(alias_generator=to_camel) diff --git a/barker/barker/schemas/settle_option.py b/barker/barker/schemas/settle_option.py index e115fbc..eb2f028 100644 --- a/barker/barker/schemas/settle_option.py +++ b/barker/barker/schemas/settle_option.py @@ -1,4 +1,4 @@ -from pydantic import BaseModel +from pydantic import BaseModel, ConfigDict from ..models.reporting_level import ReportingLevel from ..models.voucher_type import VoucherType @@ -12,7 +12,4 @@ class SettleOption(BaseModel): reporting_level: ReportingLevel has_reason: bool is_fixture: bool - - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) diff --git a/barker/barker/schemas/split.py b/barker/barker/schemas/split.py index 4013f1b..306ca01 100644 --- a/barker/barker/schemas/split.py +++ b/barker/barker/schemas/split.py @@ -1,6 +1,6 @@ import uuid -from pydantic import BaseModel +from pydantic import BaseModel, ConfigDict from . import to_camel @@ -8,7 +8,4 @@ from . import to_camel class Split(BaseModel): inventories: list[uuid.UUID] table_id: uuid.UUID - - class Config: - alias_generator = to_camel - fields = {"id_": "id"} + model_config = ConfigDict(alias_generator=to_camel) diff --git a/barker/barker/schemas/table.py b/barker/barker/schemas/table.py index a497478..17cd3eb 100644 --- a/barker/barker/schemas/table.py +++ b/barker/barker/schemas/table.py @@ -1,6 +1,6 @@ import uuid -from pydantic import BaseModel, Field +from pydantic import BaseModel, ConfigDict, Field from . import to_camel from .section import SectionLink @@ -12,17 +12,12 @@ class TableIn(BaseModel): section: SectionLink is_active: bool sort_order: int - - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) class Table(TableIn): id_: uuid.UUID - - class Config: - alias_generator = to_camel + model_config = ConfigDict(alias_generator=to_camel) class TableBlank(BaseModel): @@ -30,15 +25,10 @@ class TableBlank(BaseModel): seats: int is_active: bool sort_order: int - - class Config: - alias_generator = to_camel + model_config = ConfigDict(alias_generator=to_camel) class TableLink(BaseModel): id_: uuid.UUID = Field(...) - name: str | None - - class Config: - fields = {"id_": "id"} - alias_generator = to_camel + name: str | None = None + model_config = ConfigDict(alias_generator=to_camel) diff --git a/barker/barker/schemas/tax.py b/barker/barker/schemas/tax.py index bd88a81..cad7768 100644 --- a/barker/barker/schemas/tax.py +++ b/barker/barker/schemas/tax.py @@ -3,7 +3,7 @@ import uuid from decimal import Decimal from barker.schemas.regime import RegimeLink -from pydantic import BaseModel, Field +from pydantic import BaseModel, ConfigDict, Field from . import to_camel @@ -13,34 +13,23 @@ class TaxIn(BaseModel): rate: Decimal = Field(ge=0, default=0) regime: RegimeLink = Field(...) is_fixture: bool - - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) class Tax(TaxIn): id_: uuid.UUID - - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) class TaxBlank(BaseModel): name: str rate: Decimal = Field(ge=0, default=0) is_fixture: bool - - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) class TaxLink(BaseModel): id_: uuid.UUID = Field(...) - name: str | None - rate: Decimal | None - - class Config: - fields = {"id_": "id"} + name: str | None = None + rate: Decimal | None = None + model_config = ConfigDict(alias_generator=to_camel) diff --git a/barker/barker/schemas/tax_report.py b/barker/barker/schemas/tax_report.py index 6597619..035c4d6 100644 --- a/barker/barker/schemas/tax_report.py +++ b/barker/barker/schemas/tax_report.py @@ -1,7 +1,7 @@ from datetime import date, datetime from decimal import Decimal -from pydantic import BaseModel, validator +from pydantic import BaseModel, ConfigDict, field_serializer, field_validator from . import to_camel @@ -11,30 +11,33 @@ class TaxReportItem(BaseModel): tax_rate: Decimal sale_amount: Decimal amount: Decimal - - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) class TaxReport(BaseModel): start_date: date finish_date: date amounts: list[TaxReportItem] + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel - json_encoders = {datetime: lambda v: v.strftime("%d-%b-%Y %H:%M"), date: lambda v: v.strftime("%d-%b-%Y")} - - @validator("start_date", pre=True) + @field_validator("start_date", mode="before") + @classmethod def parse_start_date(cls, value): if isinstance(value, date): return value return datetime.strptime(value, "%d-%b-%Y").date() - @validator("finish_date", pre=True) + @field_serializer("start_date") + def serialize_start_date(self, value: date, _info): + return value.strftime("%d-%b-%Y") + + @field_validator("finish_date", mode="before") + @classmethod def parse_finish_date(cls, value): if isinstance(value, date): return value return datetime.strptime(value, "%d-%b-%Y").date() + + @field_serializer("finish_date") + def serialize_finish_date(self, value: date, _info): + return value.strftime("%d-%b-%Y") diff --git a/barker/barker/schemas/update_product_prices.py b/barker/barker/schemas/update_product_prices.py index 51dac8a..dc0fbab 100644 --- a/barker/barker/schemas/update_product_prices.py +++ b/barker/barker/schemas/update_product_prices.py @@ -3,7 +3,7 @@ import uuid from datetime import date, datetime from decimal import Decimal -from pydantic import BaseModel, validator +from pydantic import BaseModel, ConfigDict, field_serializer, field_validator from . import to_camel @@ -13,22 +13,22 @@ class UpdateProductPricesItem(BaseModel): name: str old_price: Decimal new_price: Decimal - - class Config: - alias_generator = to_camel + model_config = ConfigDict(alias_generator=to_camel) class UpdateProductPrices(BaseModel): date_: date - menu_category_id: uuid.UUID | None + menu_category_id: uuid.UUID | None = None items: list[UpdateProductPricesItem] + model_config = ConfigDict(alias_generator=to_camel) - class Config: - alias_generator = to_camel - json_encoders = {date: lambda v: v.strftime("%d-%b-%Y")} - - @validator("date_", pre=True) + @field_validator("date_", mode="before") + @classmethod def parse_date(cls, value): if isinstance(value, date): return value return datetime.strptime(value, "%d-%b-%Y").date() + + @field_serializer("date_") + def serialize_date(self, value: date, _info): + return value.strftime("%d-%b-%Y") diff --git a/barker/barker/schemas/user.py b/barker/barker/schemas/user.py index d30c687..e554396 100644 --- a/barker/barker/schemas/user.py +++ b/barker/barker/schemas/user.py @@ -4,7 +4,7 @@ from datetime import datetime from barker.schemas import to_camel from barker.schemas.role import RoleItem -from pydantic import BaseModel +from pydantic import BaseModel, ConfigDict, field_serializer class UserIn(BaseModel): @@ -12,34 +12,23 @@ class UserIn(BaseModel): password: str locked_out: bool roles: list[RoleItem] - - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) class User(UserIn): id_: uuid.UUID - - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) class UserMe(UserIn): id_: str - - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) class UserLink(BaseModel): - id_: uuid.UUID | None - name: str | None - - class Config: - fields = {"id_": "id"} + id_: uuid.UUID | None = None + name: str | None = None + model_config = ConfigDict(alias_generator=to_camel) class UserList(BaseModel): @@ -47,9 +36,10 @@ class UserList(BaseModel): name: str roles: list[str] last_device: str - last_date: datetime | None + last_date: datetime | None = None - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel - json_encoders = {datetime: lambda v: v.strftime("%d-%b-%Y %H:%M")} + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) + + @field_serializer("last_date") + def serialize_last_date(self, value: datetime | None, _info): + return None if value is None else value.strftime("%d-%b-%Y %H:%M") diff --git a/barker/barker/schemas/voucher.py b/barker/barker/schemas/voucher.py index f4cf3ea..25f286d 100644 --- a/barker/barker/schemas/voucher.py +++ b/barker/barker/schemas/voucher.py @@ -2,7 +2,7 @@ import uuid from decimal import Decimal -from pydantic import BaseModel, Field, validator +from pydantic import BaseModel, ConfigDict, Field, model_validator from . import to_camel from .customer import CustomerLink @@ -13,55 +13,38 @@ from .tax import TaxLink class Inventory(BaseModel): - id_: uuid.UUID | None + id_: uuid.UUID | None = None product: ProductLink quantity: Decimal - price: Decimal | None - tax: TaxLink | None - tax_rate: Decimal | None + price: Decimal | None = None + tax: TaxLink | None = None + tax_rate: Decimal | None = None discount: Decimal = Field(ge=0, multiple_of=0.00001, le=1) is_happy_hour: bool modifiers: list[ModifierLink] - amount: Decimal | None + amount: Decimal | None = None + model_config = ConfigDict(alias_generator=to_camel) - class Config: - alias_generator = to_camel - - @validator("amount", always=True) - def calculate_amount(cls, v, values): - is_happy_hour = values["is_happy_hour"] if "is_happy_hour" in values else False - price = values["price"] if "price" in values and not is_happy_hour else 0 - quantity = values["quantity"] if "quantity" in values else 0 - discount = values["discount"] if "discount" in values else 0 - tax_rate = values["tax_rate"] if "tax_rate" in values else 0 - return round(Decimal(price * quantity * (1 - discount) * (1 + tax_rate)), 2) + @model_validator(mode="after") + def calculate_amount(self) -> "Inventory": + self.amount = round(Decimal(self.price * self.quantity * (1 - self.discount) * (1 + self.tax_rate)), 2) + return self class Kot(BaseModel): - id_: uuid.UUID | None + id_: uuid.UUID | None = None inventories: list[Inventory] - - class Config: - anystr_strip_whitespace = True - alias_generator = to_camel + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) class VoucherIn(BaseModel): pax: int table: TableLink - customer: CustomerLink | None + customer: CustomerLink | None = None kots: list[Kot] - - class Config: - fields = {"id_": "id"} - anystr_strip_whitespace = True - alias_generator = to_camel + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) class Voucher(VoucherIn): id_: uuid.UUID - - class Config: - fields = {"id_": "id"} - anystr_strip_whitespace = True - alias_generator = to_camel + model_config = ConfigDict(str_strip_whitespace=True, alias_generator=to_camel) diff --git a/barker/pyproject.toml b/barker/pyproject.toml index aeb834c..5ae9fe9 100644 --- a/barker/pyproject.toml +++ b/barker/pyproject.toml @@ -7,30 +7,30 @@ authors = ["tanshu "] [tool.poetry.dependencies] python = "^3.11" uvicorn = {extras = ["standard"], version = "^0.21.1"} -fastapi = "^0.95.0" +fastapi = {extras = ["all"], version = "^0.100.0"} python-jose = {extras = ["cryptography"], version = "^3.3.0"} passlib = {extras = ["bcrypt"], version = "^1.7.4"} -psycopg2-binary = "^2.9.5" -SQLAlchemy = "^2.0.7" +psycopg2-binary = "^2.9.6" +SQLAlchemy = "^2.0.19" python-multipart = "^0.0.6" -PyJWT = "^2.6.0" -alembic = "^1.10.2" +PyJWT = "^2.8.0" +alembic = "^1.11.1" itsdangerous = "^2.1.2" python-dotenv = "^1.0.0" -pydantic = {extras = ["dotenv"], version = "^1.10.7"} -starlette = "^0.26.1" +pydantic = {extras = ["dotenv"], version = "^2.0.3"} +starlette = "^0.27.0" arq = "^0.25.0" -aiohttp = "^3.8.4" -cryptography = "^40.0.1" -gunicorn = "^20.1.0" +aiohttp = "^3.8.5" +cryptography = "^41.0.2" +gunicorn = "^21.2.0" [tool.poetry.dev-dependencies] flake8 = "^6.0.0" -black = "^23.1.0" +black = "^23.7.0" isort = {extras = ["toml"], version = "^5.12.0"} -pre-commit = "^3.2.0" -mypy = "^1.1.1" -types-python-jose = "^3.3.4.5" +pre-commit = "^3.3.3" +mypy = "^1.4.1" +types-python-jose = "^3.3.4.8" [tool.poetry.group.dev.dependencies] tomli = "^2.0.1" diff --git a/bookie/.eslintrc.json b/bookie/.eslintrc.json index 80c6b5a..52b87c8 100644 --- a/bookie/.eslintrc.json +++ b/bookie/.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/bookie/.prettierrc.js b/bookie/.prettierrc.js index f2e1e4d..88e181c 100644 --- a/bookie/.prettierrc.js +++ b/bookie/.prettierrc.js @@ -1,5 +1,4 @@ module.exports = { - trailingComma: "all", tabWidth: 2, semi: true, singleQuote: true, diff --git a/bookie/package.json b/bookie/package.json index 0e8e42e..a6f52fa 100644 --- a/bookie/package.json +++ b/bookie/package.json @@ -13,54 +13,54 @@ }, "private": true, "dependencies": { - "@angular/animations": "^15.1.0", - "@angular/cdk": "^15.1.5", - "@angular/common": "^15.1.0", - "@angular/compiler": "^15.1.0", - "@angular/core": "^15.1.0", - "@angular/forms": "^15.1.0", - "@angular/material": "^15.1.5", - "@angular/material-moment-adapter": "^15.1.5", - "@angular/platform-browser": "^15.1.0", - "@angular/platform-browser-dynamic": "^15.1.0", - "@angular/router": "^15.1.0", - "mathjs": "^11.5.1", + "@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", + "mathjs": "^11.9.0", "moment": "^2.29.4", "rxjs": "~7.8.0", - "tslib": "^2.3.0", - "zone.js": "~0.12.0" + "tslib": "^2.6.0", + "zone.js": "^0.13.1" }, "devDependencies": { - "@angular-devkit/build-angular": "^15.1.6", - "@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.1.6", - "@angular/compiler-cli": "^15.1.0", - "@types/jasmine": "~4.3.0", - "@typescript-eslint/eslint-plugin": "^5.52.0", - "@typescript-eslint/parser": "^5.52.0", + "@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", + "@types/jasmine": "~4.3.5", + "@typescript-eslint/eslint-plugin": "^6.1.0", + "@typescript-eslint/parser": "^6.1.0", "autoprefixer": "^10.4.13", - "eslint": "^8.34.0", - "eslint-config-prettier": "^8.7.0", + "eslint": "^8.39.0", + "eslint-config-prettier": "^8.8.0", "eslint-plugin-import": "2.27.5", - "eslint-plugin-unused-imports": "^2.0.0", + "eslint-plugin-unused-imports": "^3.0.0", "husky": "^8.0.3", - "jasmine-core": "~4.5.0", + "jasmine-core": "5.0.1", "jasmine-spec-reporter": "^7.0.0", - "karma": "~6.4.0", - "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.2", - "postcss": "^8.4.21", - "prettier": "^2.8.4", + "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.2.7", - "typescript": "~4.9.4" + "tailwindcss": "^3.3.3", + "typescript": "~5.1.3" }, "husky": { "hooks": { diff --git a/bookie/src/app/auth/auth-guard.service.ts b/bookie/src/app/auth/auth-guard.service.ts index 3550851..9b2ee3c 100644 --- a/bookie/src/app/auth/auth-guard.service.ts +++ b/bookie/src/app/auth/auth-guard.service.ts @@ -1,13 +1,17 @@ import { Injectable } from '@angular/core'; -import { Router, CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router'; +import { Router, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router'; import { ToasterService } from '../core/toaster.service'; import { AuthService } from './auth.service'; @Injectable({ providedIn: 'root' }) -export class AuthGuard implements CanActivate { - constructor(private router: Router, private authService: AuthService, private toaster: ToasterService) {} +export class AuthGuard { + constructor( + private router: Router, + private authService: AuthService, + private toaster: ToasterService, + ) {} canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) { const { user } = this.authService; diff --git a/bookie/src/app/auth/auth.service.ts b/bookie/src/app/auth/auth.service.ts index 7bbe248..8d8fc73 100644 --- a/bookie/src/app/auth/auth.service.ts +++ b/bookie/src/app/auth/auth.service.ts @@ -19,7 +19,10 @@ export class AuthService { public device: Device; private currentUserSubject: BehaviorSubject = new BehaviorSubject(null); - constructor(private http: HttpClient, private cs: CookieService) { + constructor( + private http: HttpClient, + private cs: CookieService, + ) { this.checkStorage(); this.currentUser = this.currentUserSubject.asObservable(); const deviceId = this.cs.getCookie('device_id'); diff --git a/bookie/src/app/beer-sale-report/beer-sale-report-resolver.service.ts b/bookie/src/app/beer-sale-report/beer-sale-report-resolver.service.ts index 7004ff7..ae3fba5 100644 --- a/bookie/src/app/beer-sale-report/beer-sale-report-resolver.service.ts +++ b/bookie/src/app/beer-sale-report/beer-sale-report-resolver.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; +import { ActivatedRouteSnapshot } from '@angular/router'; import { Observable } from 'rxjs'; import { BeerSaleReport } from './beer-sale-report'; @@ -8,7 +8,7 @@ import { BeerSaleReportService } from './beer-sale-report.service'; @Injectable({ providedIn: 'root', }) -export class BeerSaleReportResolver implements Resolve { +export class BeerSaleReportResolver { constructor(private ser: BeerSaleReportService) {} resolve(route: ActivatedRouteSnapshot): Observable { diff --git a/bookie/src/app/beer-sale-report/beer-sale-report.component.ts b/bookie/src/app/beer-sale-report/beer-sale-report.component.ts index 82de53b..11c7f00 100644 --- a/bookie/src/app/beer-sale-report/beer-sale-report.component.ts +++ b/bookie/src/app/beer-sale-report/beer-sale-report.component.ts @@ -29,7 +29,11 @@ export class BeerSaleReportComponent implements OnInit { /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */ displayedColumns: string[] = ['date']; - constructor(private route: ActivatedRoute, private router: Router, private toCsv: ToCsvService) { + constructor( + private route: ActivatedRoute, + private router: Router, + private toCsv: ToCsvService, + ) { // Create form this.form = new FormGroup({ startDate: new FormControl(new Date(), { nonNullable: true }), diff --git a/bookie/src/app/beer-sale-report/beer-sale-report.service.ts b/bookie/src/app/beer-sale-report/beer-sale-report.service.ts index 171bfec..52b68f5 100644 --- a/bookie/src/app/beer-sale-report/beer-sale-report.service.ts +++ b/bookie/src/app/beer-sale-report/beer-sale-report.service.ts @@ -14,7 +14,10 @@ const serviceName = 'BeerSaleReportService'; providedIn: 'root', }) export class BeerSaleReportService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} get( startDate: string | null, diff --git a/bookie/src/app/bill-settlement-report/bill-settlement-report-resolver.service.ts b/bookie/src/app/bill-settlement-report/bill-settlement-report-resolver.service.ts index aaeb85d..cecd76d 100644 --- a/bookie/src/app/bill-settlement-report/bill-settlement-report-resolver.service.ts +++ b/bookie/src/app/bill-settlement-report/bill-settlement-report-resolver.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; +import { ActivatedRouteSnapshot } from '@angular/router'; import { Observable } from 'rxjs'; import { BillSettlementReport } from './bill-settlement-report'; @@ -8,7 +8,7 @@ import { BillSettlementReportService } from './bill-settlement-report.service'; @Injectable({ providedIn: 'root', }) -export class BillSettlementReportResolver implements Resolve { +export class BillSettlementReportResolver { constructor(private ser: BillSettlementReportService) {} resolve(route: ActivatedRouteSnapshot): Observable { diff --git a/bookie/src/app/bill-settlement-report/bill-settlement-report.component.html b/bookie/src/app/bill-settlement-report/bill-settlement-report.component.html index 0fac91f..7dadffe 100644 --- a/bookie/src/app/bill-settlement-report/bill-settlement-report.component.html +++ b/bookie/src/app/bill-settlement-report/bill-settlement-report.component.html @@ -53,7 +53,7 @@ Amount - {{ row.amount | number : '1.2-2' }} + {{ row.amount | number: '1.2-2' }} diff --git a/bookie/src/app/bill-settlement-report/bill-settlement-report.component.ts b/bookie/src/app/bill-settlement-report/bill-settlement-report.component.ts index b39f6e9..9fdf0a1 100644 --- a/bookie/src/app/bill-settlement-report/bill-settlement-report.component.ts +++ b/bookie/src/app/bill-settlement-report/bill-settlement-report.component.ts @@ -25,7 +25,11 @@ export class BillSettlementReportComponent implements OnInit { /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */ displayedColumns = ['date', 'billId', 'amount', 'settlement']; - constructor(private route: ActivatedRoute, private router: Router, private toCsv: ToCsvService) { + constructor( + private route: ActivatedRoute, + private router: Router, + private toCsv: ToCsvService, + ) { // Create form this.form = new FormGroup({ startDate: new FormControl(new Date(), { nonNullable: true }), diff --git a/bookie/src/app/bill-settlement-report/bill-settlement-report.service.ts b/bookie/src/app/bill-settlement-report/bill-settlement-report.service.ts index c19726b..3682997 100644 --- a/bookie/src/app/bill-settlement-report/bill-settlement-report.service.ts +++ b/bookie/src/app/bill-settlement-report/bill-settlement-report.service.ts @@ -14,7 +14,10 @@ const serviceName = 'BillSettlementReportService'; providedIn: 'root', }) export class BillSettlementReportService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} get(startDate: string | null, finishDate: string | null): Observable { const options = { params: new HttpParams() }; diff --git a/bookie/src/app/cashier-report/active-cashiers-resolver.service.ts b/bookie/src/app/cashier-report/active-cashiers-resolver.service.ts index f0063c6..df16e17 100644 --- a/bookie/src/app/cashier-report/active-cashiers-resolver.service.ts +++ b/bookie/src/app/cashier-report/active-cashiers-resolver.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; +import { ActivatedRouteSnapshot } from '@angular/router'; import { Observable } from 'rxjs'; import { User } from '../core/user'; @@ -9,7 +9,7 @@ import { CashierReportService } from './cashier-report.service'; @Injectable({ providedIn: 'root', }) -export class ActiveCashiersResolver implements Resolve { +export class ActiveCashiersResolver { constructor(private ser: CashierReportService) {} resolve(route: ActivatedRouteSnapshot): Observable { diff --git a/bookie/src/app/cashier-report/cashier-report-resolver.service.ts b/bookie/src/app/cashier-report/cashier-report-resolver.service.ts index ed169ec..42f0063 100644 --- a/bookie/src/app/cashier-report/cashier-report-resolver.service.ts +++ b/bookie/src/app/cashier-report/cashier-report-resolver.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; +import { ActivatedRouteSnapshot } from '@angular/router'; import { Observable } from 'rxjs'; import { CashierReport } from './cashier-report'; @@ -8,7 +8,7 @@ import { CashierReportService } from './cashier-report.service'; @Injectable({ providedIn: 'root', }) -export class CashierReportResolver implements Resolve { +export class CashierReportResolver { constructor(private ser: CashierReportService) {} resolve(route: ActivatedRouteSnapshot): Observable { diff --git a/bookie/src/app/cashier-report/cashier-report.component.html b/bookie/src/app/cashier-report/cashier-report.component.html index 71162c7..373a8d0 100644 --- a/bookie/src/app/cashier-report/cashier-report.component.html +++ b/bookie/src/app/cashier-report/cashier-report.component.html @@ -62,7 +62,7 @@ Amount - {{ row.amount | currency : 'INR' }} + {{ row.amount | currency: 'INR' }} diff --git a/bookie/src/app/cashier-report/cashier-report.service.ts b/bookie/src/app/cashier-report/cashier-report.service.ts index 49aa15e..ee7b969 100644 --- a/bookie/src/app/cashier-report/cashier-report.service.ts +++ b/bookie/src/app/cashier-report/cashier-report.service.ts @@ -15,7 +15,10 @@ const serviceName = 'CashierReportService'; providedIn: 'root', }) export class CashierReportService { - 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/bookie/src/app/customers/customer-detail/customer-detail.component.html b/bookie/src/app/customers/customer-detail/customer-detail.component.html index bc4d42c..daaf637 100644 --- a/bookie/src/app/customers/customer-detail/customer-detail.component.html +++ b/bookie/src/app/customers/customer-detail/customer-detail.component.html @@ -39,7 +39,7 @@ Discount on {{ r.name }} % - Max {{ r.limit | percent : '1.2-2' }} + Max {{ r.limit | percent: '1.2-2' }} diff --git a/bookie/src/app/customers/customer-list-resolver.service.ts b/bookie/src/app/customers/customer-list-resolver.service.ts index f9cbc2e..3c863dc 100644 --- a/bookie/src/app/customers/customer-list-resolver.service.ts +++ b/bookie/src/app/customers/customer-list-resolver.service.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core'; -import { Resolve } from '@angular/router'; import { Observable } from 'rxjs'; import { Customer } from '../core/customer'; @@ -9,7 +8,7 @@ import { CustomerService } from './customer.service'; @Injectable({ providedIn: 'root', }) -export class CustomerListResolver implements Resolve { +export class CustomerListResolver { constructor(private ser: CustomerService) {} resolve(): Observable { diff --git a/bookie/src/app/customers/customer-list/customer-list.component.html b/bookie/src/app/customers/customer-list/customer-list.component.html index 4bb637c..81edb1e 100644 --- a/bookie/src/app/customers/customer-list/customer-list.component.html +++ b/bookie/src/app/customers/customer-list/customer-list.component.html @@ -42,7 +42,7 @@
  • - {{ discount.name }} - {{ discount.discount | percent : '1.2-2' }} + {{ discount.name }} - {{ discount.discount | percent: '1.2-2' }}
diff --git a/bookie/src/app/customers/customer-resolver.service.ts b/bookie/src/app/customers/customer-resolver.service.ts index 64ce1cb..aeaeaa7 100644 --- a/bookie/src/app/customers/customer-resolver.service.ts +++ b/bookie/src/app/customers/customer-resolver.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; +import { ActivatedRouteSnapshot } from '@angular/router'; import { Observable } from 'rxjs'; import { Customer } from '../core/customer'; @@ -9,7 +9,7 @@ import { CustomerService } from './customer.service'; @Injectable({ providedIn: 'root', }) -export class CustomerResolver implements Resolve { +export class CustomerResolver { constructor(private ser: CustomerService) {} resolve(route: ActivatedRouteSnapshot): Observable { diff --git a/bookie/src/app/customers/customer.service.ts b/bookie/src/app/customers/customer.service.ts index fc900fc..5f5132f 100644 --- a/bookie/src/app/customers/customer.service.ts +++ b/bookie/src/app/customers/customer.service.ts @@ -16,7 +16,10 @@ const serviceName = 'CustomerService'; providedIn: 'root', }) export class CustomerService { - 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/bookie/src/app/devices/device-list-resolver.service.ts b/bookie/src/app/devices/device-list-resolver.service.ts index 5af7edd..7712e1d 100644 --- a/bookie/src/app/devices/device-list-resolver.service.ts +++ b/bookie/src/app/devices/device-list-resolver.service.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core'; -import { Resolve } from '@angular/router'; import { Observable } from 'rxjs'; import { Device } from '../core/device'; @@ -9,7 +8,7 @@ import { DeviceService } from './device.service'; @Injectable({ providedIn: 'root', }) -export class DeviceListResolver implements Resolve { +export class DeviceListResolver { constructor(private ser: DeviceService) {} resolve(): Observable { diff --git a/bookie/src/app/devices/device-resolver.service.ts b/bookie/src/app/devices/device-resolver.service.ts index 1adf1ed..15d8c4f 100644 --- a/bookie/src/app/devices/device-resolver.service.ts +++ b/bookie/src/app/devices/device-resolver.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; +import { ActivatedRouteSnapshot } from '@angular/router'; import { Observable } from 'rxjs'; import { Device } from '../core/device'; @@ -9,7 +9,7 @@ import { DeviceService } from './device.service'; @Injectable({ providedIn: 'root', }) -export class DeviceResolver implements Resolve { +export class DeviceResolver { constructor(private ser: DeviceService) {} resolve(route: ActivatedRouteSnapshot): Observable { diff --git a/bookie/src/app/devices/device.service.ts b/bookie/src/app/devices/device.service.ts index 176a711..2dbd3ae 100644 --- a/bookie/src/app/devices/device.service.ts +++ b/bookie/src/app/devices/device.service.ts @@ -13,7 +13,10 @@ const serviceName = 'DeviceService'; providedIn: 'root', }) export class DeviceService { - 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/bookie/src/app/discount-report/discount-report-resolver.service.ts b/bookie/src/app/discount-report/discount-report-resolver.service.ts index 94577a8..351c69f 100644 --- a/bookie/src/app/discount-report/discount-report-resolver.service.ts +++ b/bookie/src/app/discount-report/discount-report-resolver.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; +import { ActivatedRouteSnapshot } from '@angular/router'; import { Observable } from 'rxjs'; import { DiscountReport } from './discount-report'; @@ -8,7 +8,7 @@ import { DiscountReportService } from './discount-report.service'; @Injectable({ providedIn: 'root', }) -export class DiscountReportResolver implements Resolve { +export class DiscountReportResolver { constructor(private ser: DiscountReportService) {} resolve(route: ActivatedRouteSnapshot): Observable { diff --git a/bookie/src/app/discount-report/discount-report.component.html b/bookie/src/app/discount-report/discount-report.component.html index 8481570..d1aed88 100644 --- a/bookie/src/app/discount-report/discount-report.component.html +++ b/bookie/src/app/discount-report/discount-report.component.html @@ -51,7 +51,7 @@ Amount - {{ row.amount | currency : 'INR' }} + {{ row.amount | currency: 'INR' }} diff --git a/bookie/src/app/discount-report/discount-report.service.ts b/bookie/src/app/discount-report/discount-report.service.ts index 830b87d..7b8cc37 100644 --- a/bookie/src/app/discount-report/discount-report.service.ts +++ b/bookie/src/app/discount-report/discount-report.service.ts @@ -14,7 +14,10 @@ const serviceName = 'DiscountReportService'; providedIn: 'root', }) export class DiscountReportService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} get(startDate: string | null, finishDate: string | null): Observable { const options = { params: new HttpParams() }; diff --git a/bookie/src/app/guest-book/guest-book-detail-resolver.service.ts b/bookie/src/app/guest-book/guest-book-detail-resolver.service.ts index cc702b3..f40dac9 100644 --- a/bookie/src/app/guest-book/guest-book-detail-resolver.service.ts +++ b/bookie/src/app/guest-book/guest-book-detail-resolver.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; +import { ActivatedRouteSnapshot } from '@angular/router'; import { Observable } from 'rxjs'; import { GuestBook } from './guest-book'; @@ -8,7 +8,7 @@ import { GuestBookService } from './guest-book.service'; @Injectable({ providedIn: 'root', }) -export class GuestBookDetailResolver implements Resolve { +export class GuestBookDetailResolver { constructor(private ser: GuestBookService) {} resolve(route: ActivatedRouteSnapshot): Observable { diff --git a/bookie/src/app/guest-book/guest-book-list-resolver.service.ts b/bookie/src/app/guest-book/guest-book-list-resolver.service.ts index cca2b65..bfc33cd 100644 --- a/bookie/src/app/guest-book/guest-book-list-resolver.service.ts +++ b/bookie/src/app/guest-book/guest-book-list-resolver.service.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core'; -import { Resolve } from '@angular/router'; import { Observable } from 'rxjs'; import { GuestBookList } from './guest-book-list'; @@ -8,7 +7,7 @@ import { GuestBookService } from './guest-book.service'; @Injectable({ providedIn: 'root', }) -export class GuestBookListResolver implements Resolve { +export class GuestBookListResolver { constructor(private ser: GuestBookService) {} resolve(): Observable { diff --git a/bookie/src/app/guest-book/guest-book.service.ts b/bookie/src/app/guest-book/guest-book.service.ts index 148ffcb..35d5bfa 100644 --- a/bookie/src/app/guest-book/guest-book.service.ts +++ b/bookie/src/app/guest-book/guest-book.service.ts @@ -17,7 +17,10 @@ const serviceName = 'GuestBookService'; @Injectable({ providedIn: 'root' }) export class GuestBookService { - 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/bookie/src/app/header-footer/header-footer-resolver.service.ts b/bookie/src/app/header-footer/header-footer-resolver.service.ts index a373867..6e13135 100644 --- a/bookie/src/app/header-footer/header-footer-resolver.service.ts +++ b/bookie/src/app/header-footer/header-footer-resolver.service.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core'; -import { Resolve } from '@angular/router'; import { Observable } from 'rxjs'; import { HeaderFooter } from './header-footer'; @@ -8,7 +7,7 @@ import { HeaderFooterService } from './header-footer.service'; @Injectable({ providedIn: 'root', }) -export class HeaderFooterResolver implements Resolve { +export class HeaderFooterResolver { constructor(private ser: HeaderFooterService) {} resolve(): Observable { diff --git a/bookie/src/app/header-footer/header-footer.service.ts b/bookie/src/app/header-footer/header-footer.service.ts index aefc77c..213e7b1 100644 --- a/bookie/src/app/header-footer/header-footer.service.ts +++ b/bookie/src/app/header-footer/header-footer.service.ts @@ -17,7 +17,10 @@ const serviceName = 'HeaderFooterService'; providedIn: 'root', }) export class HeaderFooterService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} list(): Observable { return this.http.get(url).pipe(catchError(this.log.handleError(serviceName, 'list'))) as Observable< diff --git a/bookie/src/app/menu-category/menu-category-list-resolver.service.ts b/bookie/src/app/menu-category/menu-category-list-resolver.service.ts index 1c07823..4a00fd9 100644 --- a/bookie/src/app/menu-category/menu-category-list-resolver.service.ts +++ b/bookie/src/app/menu-category/menu-category-list-resolver.service.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core'; -import { Resolve } from '@angular/router'; import { Observable } from 'rxjs'; import { MenuCategory } from '../core/menu-category'; @@ -9,7 +8,7 @@ import { MenuCategoryService } from './menu-category.service'; @Injectable({ providedIn: 'root', }) -export class MenuCategoryListResolver implements Resolve { +export class MenuCategoryListResolver { constructor(private ser: MenuCategoryService) {} resolve(): Observable { diff --git a/bookie/src/app/menu-category/menu-category-resolver.service.ts b/bookie/src/app/menu-category/menu-category-resolver.service.ts index 02569b9..d9a1a10 100644 --- a/bookie/src/app/menu-category/menu-category-resolver.service.ts +++ b/bookie/src/app/menu-category/menu-category-resolver.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; +import { ActivatedRouteSnapshot } from '@angular/router'; import { Observable } from 'rxjs'; import { MenuCategory } from '../core/menu-category'; @@ -9,7 +9,7 @@ import { MenuCategoryService } from './menu-category.service'; @Injectable({ providedIn: 'root', }) -export class MenuCategoryResolver implements Resolve { +export class MenuCategoryResolver { constructor(private ser: MenuCategoryService) {} resolve(route: ActivatedRouteSnapshot): Observable { diff --git a/bookie/src/app/menu-category/menu-category.service.ts b/bookie/src/app/menu-category/menu-category.service.ts index 83269f0..d58f623 100644 --- a/bookie/src/app/menu-category/menu-category.service.ts +++ b/bookie/src/app/menu-category/menu-category.service.ts @@ -16,7 +16,10 @@ const serviceName = 'MenuCategoryService'; providedIn: 'root', }) export class MenuCategoryService { - 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/bookie/src/app/menu-engineering-report/menu-engineering-report-resolver.service.ts b/bookie/src/app/menu-engineering-report/menu-engineering-report-resolver.service.ts index 8c790cb..2d8596c 100644 --- a/bookie/src/app/menu-engineering-report/menu-engineering-report-resolver.service.ts +++ b/bookie/src/app/menu-engineering-report/menu-engineering-report-resolver.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; +import { ActivatedRouteSnapshot } from '@angular/router'; import { Observable } from 'rxjs'; import { MenuEngineeringReport } from './menu-engineering-report'; @@ -8,7 +8,7 @@ import { MenuEngineeringReportService } from './menu-engineering-report.service' @Injectable({ providedIn: 'root', }) -export class MenuEngineeringReportResolver implements Resolve { +export class MenuEngineeringReportResolver { constructor(private ser: MenuEngineeringReportService) {} resolve(route: ActivatedRouteSnapshot): Observable { diff --git a/bookie/src/app/menu-engineering-report/menu-engineering-report.component.html b/bookie/src/app/menu-engineering-report/menu-engineering-report.component.html index 6277499..df2acc7 100644 --- a/bookie/src/app/menu-engineering-report/menu-engineering-report.component.html +++ b/bookie/src/app/menu-engineering-report/menu-engineering-report.component.html @@ -62,7 +62,7 @@ Price {{ row.average | number : '1.2-2' }} / {{ row.price | number : '1.2-2' }}{{ row.average | number: '1.2-2' }} / {{ row.price | number: '1.2-2' }} @@ -82,7 +82,7 @@ Quantity {{ row.quantity | number : '1.2-2' }} ({{ row.quantityPercent | percent : '1.2-2' }}){{ row.quantity | number: '1.2-2' }} ({{ row.quantityPercent | percent: '1.2-2' }}) @@ -90,7 +90,7 @@ Sales {{ row.sales | number : '1.2-2' }} ({{ row.salesPercent | percent : '1.2-2' }}){{ row.sales | number: '1.2-2' }} ({{ row.salesPercent | percent: '1.2-2' }}) diff --git a/bookie/src/app/menu-engineering-report/menu-engineering-report.service.ts b/bookie/src/app/menu-engineering-report/menu-engineering-report.service.ts index 048dffc..34eecd9 100644 --- a/bookie/src/app/menu-engineering-report/menu-engineering-report.service.ts +++ b/bookie/src/app/menu-engineering-report/menu-engineering-report.service.ts @@ -14,7 +14,10 @@ const serviceName = 'MenuEngineeringReportService'; providedIn: 'root', }) export class MenuEngineeringReportService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} get(startDate: string | null, finishDate: string | null): Observable { const options = { params: new HttpParams() }; diff --git a/bookie/src/app/modifier-categories/modifier-category-list-resolver.service.ts b/bookie/src/app/modifier-categories/modifier-category-list-resolver.service.ts index 5fc9946..e396098 100644 --- a/bookie/src/app/modifier-categories/modifier-category-list-resolver.service.ts +++ b/bookie/src/app/modifier-categories/modifier-category-list-resolver.service.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core'; -import { Resolve } from '@angular/router'; import { Observable } from 'rxjs'; import { ModifierCategory } from '../core/modifier-category'; @@ -9,7 +8,7 @@ import { ModifierCategoryService } from './modifier-category.service'; @Injectable({ providedIn: 'root', }) -export class ModifierCategoryListResolver implements Resolve { +export class ModifierCategoryListResolver { constructor(private ser: ModifierCategoryService) {} resolve(): Observable { diff --git a/bookie/src/app/modifier-categories/modifier-category-resolver.service.ts b/bookie/src/app/modifier-categories/modifier-category-resolver.service.ts index e95deff..14ec2ff 100644 --- a/bookie/src/app/modifier-categories/modifier-category-resolver.service.ts +++ b/bookie/src/app/modifier-categories/modifier-category-resolver.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; +import { ActivatedRouteSnapshot } from '@angular/router'; import { Observable } from 'rxjs'; import { ModifierCategory } from '../core/modifier-category'; @@ -9,7 +9,7 @@ import { ModifierCategoryService } from './modifier-category.service'; @Injectable({ providedIn: 'root', }) -export class ModifierCategoryResolver implements Resolve { +export class ModifierCategoryResolver { constructor(private ser: ModifierCategoryService) {} resolve(route: ActivatedRouteSnapshot): Observable { diff --git a/bookie/src/app/modifier-categories/modifier-category.service.ts b/bookie/src/app/modifier-categories/modifier-category.service.ts index 3d0471e..8cc4215 100644 --- a/bookie/src/app/modifier-categories/modifier-category.service.ts +++ b/bookie/src/app/modifier-categories/modifier-category.service.ts @@ -16,7 +16,10 @@ const serviceName = 'ModifierCategoryService'; providedIn: 'root', }) export class ModifierCategoryService { - 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/bookie/src/app/modifiers/modifier-list-resolver.service.ts b/bookie/src/app/modifiers/modifier-list-resolver.service.ts index 3ceb17c..2928260 100644 --- a/bookie/src/app/modifiers/modifier-list-resolver.service.ts +++ b/bookie/src/app/modifiers/modifier-list-resolver.service.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core'; -import { Resolve } from '@angular/router'; import { Observable } from 'rxjs'; import { Modifier } from '../core/modifier'; @@ -9,7 +8,7 @@ import { ModifierService } from './modifier.service'; @Injectable({ providedIn: 'root', }) -export class ModifierListResolver implements Resolve { +export class ModifierListResolver { constructor(private ser: ModifierService) {} resolve(): Observable { diff --git a/bookie/src/app/modifiers/modifier-list/modifier-list-datasource.ts b/bookie/src/app/modifiers/modifier-list/modifier-list-datasource.ts index 27fe70c..cf11f73 100644 --- a/bookie/src/app/modifiers/modifier-list/modifier-list-datasource.ts +++ b/bookie/src/app/modifiers/modifier-list/modifier-list-datasource.ts @@ -10,7 +10,10 @@ export class ModifierListDataSource extends DataSource { public viewData: Modifier[]; private filterValue: string; - constructor(private readonly filter: Observable, private readonly dataObs: Observable) { + constructor( + private readonly filter: Observable, + private readonly dataObs: Observable, + ) { super(); this.data = []; this.viewData = []; diff --git a/bookie/src/app/modifiers/modifier-list/modifier-list.component.html b/bookie/src/app/modifiers/modifier-list/modifier-list.component.html index f682de4..3bff255 100644 --- a/bookie/src/app/modifiers/modifier-list/modifier-list.component.html +++ b/bookie/src/app/modifiers/modifier-list/modifier-list.component.html @@ -49,7 +49,7 @@ Price - {{ row.price | currency : 'INR' }} + {{ row.price | currency: 'INR' }} diff --git a/bookie/src/app/modifiers/modifier-list/modifier-list.component.ts b/bookie/src/app/modifiers/modifier-list/modifier-list.component.ts index 3846bb0..c5085e6 100644 --- a/bookie/src/app/modifiers/modifier-list/modifier-list.component.ts +++ b/bookie/src/app/modifiers/modifier-list/modifier-list.component.ts @@ -29,7 +29,10 @@ export class ModifierListComponent implements OnInit { /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */ displayedColumns: string[] = ['name', 'showInBill', 'price', 'isActive', 'modifierCategory']; - constructor(private route: ActivatedRoute, private router: Router) { + constructor( + private route: ActivatedRoute, + private router: Router, + ) { this.form = new FormGroup({ modifierCategory: new FormControl(''), }); diff --git a/bookie/src/app/modifiers/modifier-resolver.service.ts b/bookie/src/app/modifiers/modifier-resolver.service.ts index 6ab3d3a..20456b4 100644 --- a/bookie/src/app/modifiers/modifier-resolver.service.ts +++ b/bookie/src/app/modifiers/modifier-resolver.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; +import { ActivatedRouteSnapshot } from '@angular/router'; import { Observable } from 'rxjs'; import { Modifier } from '../core/modifier'; @@ -9,7 +9,7 @@ import { ModifierService } from './modifier.service'; @Injectable({ providedIn: 'root', }) -export class ModifierResolver implements Resolve { +export class ModifierResolver { constructor(private ser: ModifierService) {} resolve(route: ActivatedRouteSnapshot): Observable { diff --git a/bookie/src/app/modifiers/modifier.service.ts b/bookie/src/app/modifiers/modifier.service.ts index f9ca88d..7970ab5 100644 --- a/bookie/src/app/modifiers/modifier.service.ts +++ b/bookie/src/app/modifiers/modifier.service.ts @@ -15,7 +15,10 @@ const serviceName = 'ModifierService'; @Injectable({ providedIn: 'root' }) export class ModifierService { - 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/bookie/src/app/nav-bar/nav-bar.component.ts b/bookie/src/app/nav-bar/nav-bar.component.ts index 3bd3daa..f28c5f7 100644 --- a/bookie/src/app/nav-bar/nav-bar.component.ts +++ b/bookie/src/app/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/bookie/src/app/printers/printer-list-resolver.service.ts b/bookie/src/app/printers/printer-list-resolver.service.ts index 26fbf90..6112910 100644 --- a/bookie/src/app/printers/printer-list-resolver.service.ts +++ b/bookie/src/app/printers/printer-list-resolver.service.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core'; -import { Resolve } from '@angular/router'; import { Observable } from 'rxjs'; import { Printer } from '../core/printer'; @@ -9,7 +8,7 @@ import { PrinterService } from './printer.service'; @Injectable({ providedIn: 'root', }) -export class PrinterListResolver implements Resolve { +export class PrinterListResolver { constructor(private ser: PrinterService) {} resolve(): Observable { diff --git a/bookie/src/app/printers/printer-resolver.service.ts b/bookie/src/app/printers/printer-resolver.service.ts index f714ed5..c029173 100644 --- a/bookie/src/app/printers/printer-resolver.service.ts +++ b/bookie/src/app/printers/printer-resolver.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; +import { ActivatedRouteSnapshot } from '@angular/router'; import { Observable } from 'rxjs'; import { Printer } from '../core/printer'; @@ -9,7 +9,7 @@ import { PrinterService } from './printer.service'; @Injectable({ providedIn: 'root', }) -export class PrinterResolver implements Resolve { +export class PrinterResolver { constructor(private ser: PrinterService) {} resolve(route: ActivatedRouteSnapshot): Observable { diff --git a/bookie/src/app/printers/printer.service.ts b/bookie/src/app/printers/printer.service.ts index f4e9df7..35db4e1 100644 --- a/bookie/src/app/printers/printer.service.ts +++ b/bookie/src/app/printers/printer.service.ts @@ -16,7 +16,10 @@ const serviceName = 'PrinterService'; providedIn: 'root', }) export class PrinterService { - 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/bookie/src/app/product-sale-report/product-sale-report-resolver.service.ts b/bookie/src/app/product-sale-report/product-sale-report-resolver.service.ts index baf8632..d7e9d16 100644 --- a/bookie/src/app/product-sale-report/product-sale-report-resolver.service.ts +++ b/bookie/src/app/product-sale-report/product-sale-report-resolver.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; +import { ActivatedRouteSnapshot } from '@angular/router'; import { Observable } from 'rxjs'; import { ProductSaleReport } from './product-sale-report'; @@ -8,7 +8,7 @@ import { ProductSaleReportService } from './product-sale-report.service'; @Injectable({ providedIn: 'root', }) -export class ProductSaleReportResolver implements Resolve { +export class ProductSaleReportResolver { constructor(private ser: ProductSaleReportService) {} resolve(route: ActivatedRouteSnapshot): Observable { diff --git a/bookie/src/app/product-sale-report/product-sale-report.component.html b/bookie/src/app/product-sale-report/product-sale-report.component.html index 36cb1fb..d5d6458 100644 --- a/bookie/src/app/product-sale-report/product-sale-report.component.html +++ b/bookie/src/app/product-sale-report/product-sale-report.component.html @@ -51,31 +51,31 @@ Unbilled - {{ row.kot | number : '1.2-2' }} + {{ row.kot | number: '1.2-2' }} Sale - {{ row.regularBill | number : '1.2-2' }} + {{ row.regularBill | number: '1.2-2' }} No Charge - {{ row.noCharge | number : '1.2-2' }} + {{ row.noCharge | number: '1.2-2' }} Staff - {{ row.staff | number : '1.2-2' }} + {{ row.staff | number: '1.2-2' }} Cancelled - {{ row.cancel | number : '1.2-2' }} + {{ row.cancel | number: '1.2-2' }} diff --git a/bookie/src/app/product-sale-report/product-sale-report.service.ts b/bookie/src/app/product-sale-report/product-sale-report.service.ts index f73213d..9274f55 100644 --- a/bookie/src/app/product-sale-report/product-sale-report.service.ts +++ b/bookie/src/app/product-sale-report/product-sale-report.service.ts @@ -14,7 +14,10 @@ const serviceName = 'ProductSaleReportService'; providedIn: 'root', }) export class ProductSaleReportService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} get(startDate: string | null, finishDate: string | null): Observable { const options = { params: new HttpParams() }; diff --git a/bookie/src/app/product-updates-report/product-updates-report-resolver.service.ts b/bookie/src/app/product-updates-report/product-updates-report-resolver.service.ts index cccb9e5..9c610b9 100644 --- a/bookie/src/app/product-updates-report/product-updates-report-resolver.service.ts +++ b/bookie/src/app/product-updates-report/product-updates-report-resolver.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; +import { ActivatedRouteSnapshot } from '@angular/router'; import { Observable } from 'rxjs'; import { ProductUpdatesReport } from './product-updates-report'; @@ -8,7 +8,7 @@ import { ProductUpdatesReportService } from './product-updates-report.service'; @Injectable({ providedIn: 'root', }) -export class ProductUpdatesReportResolver implements Resolve { +export class ProductUpdatesReportResolver { constructor(private ser: ProductUpdatesReportService) {} resolve(route: ActivatedRouteSnapshot): Observable { diff --git a/bookie/src/app/product-updates-report/product-updates-report.component.ts b/bookie/src/app/product-updates-report/product-updates-report.component.ts index 4e80ccb..9fa0c3e 100644 --- a/bookie/src/app/product-updates-report/product-updates-report.component.ts +++ b/bookie/src/app/product-updates-report/product-updates-report.component.ts @@ -24,7 +24,11 @@ export class ProductUpdatesReportComponent implements OnInit { /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */ displayedColumns = ['details']; - constructor(private route: ActivatedRoute, private router: Router, private toCsv: ToCsvService) { + constructor( + private route: ActivatedRoute, + private router: Router, + private toCsv: ToCsvService, + ) { // Create form this.form = new FormGroup({ startDate: new FormControl(new Date(), { nonNullable: true }), diff --git a/bookie/src/app/product-updates-report/product-updates-report.service.ts b/bookie/src/app/product-updates-report/product-updates-report.service.ts index 3f5d0d1..f590235 100644 --- a/bookie/src/app/product-updates-report/product-updates-report.service.ts +++ b/bookie/src/app/product-updates-report/product-updates-report.service.ts @@ -14,7 +14,10 @@ const serviceName = 'ProductUpdatesReportService'; providedIn: 'root', }) export class ProductUpdatesReportService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} get(startDate: string | null, finishDate: string | null): Observable { const options = { params: new HttpParams() }; diff --git a/bookie/src/app/product/product-list-resolver.service.ts b/bookie/src/app/product/product-list-resolver.service.ts index faff308..e796522 100644 --- a/bookie/src/app/product/product-list-resolver.service.ts +++ b/bookie/src/app/product/product-list-resolver.service.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core'; -import { Resolve } from '@angular/router'; import { Observable } from 'rxjs'; import { Product } from '../core/product'; @@ -9,7 +8,7 @@ import { ProductService } from './product.service'; @Injectable({ providedIn: 'root', }) -export class ProductListResolver implements Resolve { +export class ProductListResolver { constructor(private ser: ProductService) {} resolve(): Observable { diff --git a/bookie/src/app/product/product-list/product-list.component.html b/bookie/src/app/product/product-list/product-list.component.html index b174b1a..4c3c9b1 100644 --- a/bookie/src/app/product/product-list/product-list.component.html +++ b/bookie/src/app/product/product-list/product-list.component.html @@ -56,7 +56,7 @@ Price - {{ row.price | currency : 'INR' }} + {{ row.price | currency: 'INR' }} @@ -95,7 +95,7 @@ Quantity - {{ row.quantity | number : '1.2-2' }} + {{ row.quantity | number: '1.2-2' }} diff --git a/bookie/src/app/product/product-resolver.service.ts b/bookie/src/app/product/product-resolver.service.ts index b415381..f8df143 100644 --- a/bookie/src/app/product/product-resolver.service.ts +++ b/bookie/src/app/product/product-resolver.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; +import { ActivatedRouteSnapshot } from '@angular/router'; import { Observable } from 'rxjs'; import { Product } from '../core/product'; @@ -9,7 +9,7 @@ import { ProductService } from './product.service'; @Injectable({ providedIn: 'root', }) -export class ProductResolver implements Resolve { +export class ProductResolver { constructor(private ser: ProductService) {} resolve(route: ActivatedRouteSnapshot): Observable { diff --git a/bookie/src/app/product/product.service.ts b/bookie/src/app/product/product.service.ts index 35bad21..c55e117 100644 --- a/bookie/src/app/product/product.service.ts +++ b/bookie/src/app/product/product.service.ts @@ -15,7 +15,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/bookie/src/app/regimes/regime-list-resolver.service.ts b/bookie/src/app/regimes/regime-list-resolver.service.ts index 3f4cb56..785f0ed 100644 --- a/bookie/src/app/regimes/regime-list-resolver.service.ts +++ b/bookie/src/app/regimes/regime-list-resolver.service.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core'; -import { Resolve } from '@angular/router'; import { Observable } from 'rxjs'; import { Regime } from '../core/regime'; @@ -9,7 +8,7 @@ import { RegimeService } from './regime.service'; @Injectable({ providedIn: 'root', }) -export class RegimeListResolver implements Resolve { +export class RegimeListResolver { constructor(private ser: RegimeService) {} resolve(): Observable { diff --git a/bookie/src/app/regimes/regime-resolver.service.ts b/bookie/src/app/regimes/regime-resolver.service.ts index 67afb4c..11926eb 100644 --- a/bookie/src/app/regimes/regime-resolver.service.ts +++ b/bookie/src/app/regimes/regime-resolver.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; +import { ActivatedRouteSnapshot } from '@angular/router'; import { Observable } from 'rxjs'; import { Regime } from '../core/regime'; @@ -9,7 +9,7 @@ import { RegimeService } from './regime.service'; @Injectable({ providedIn: 'root', }) -export class RegimeResolver implements Resolve { +export class RegimeResolver { constructor(private ser: RegimeService) {} resolve(route: ActivatedRouteSnapshot): Observable { diff --git a/bookie/src/app/regimes/regime.service.ts b/bookie/src/app/regimes/regime.service.ts index 9e776a6..fec470d 100644 --- a/bookie/src/app/regimes/regime.service.ts +++ b/bookie/src/app/regimes/regime.service.ts @@ -16,7 +16,10 @@ const serviceName = 'RegimeService'; providedIn: 'root', }) export class RegimeService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} get(id: number | null): Observable { const getUrl: string = id === null ? url : `${url}/${id}`; diff --git a/bookie/src/app/roles/role-list-resolver.service.ts b/bookie/src/app/roles/role-list-resolver.service.ts index 6141b96..e663afa 100644 --- a/bookie/src/app/roles/role-list-resolver.service.ts +++ b/bookie/src/app/roles/role-list-resolver.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Resolve, Router } from '@angular/router'; +import { Router } from '@angular/router'; import { Observable } from 'rxjs'; import { Role } from './role'; @@ -8,8 +8,11 @@ import { RoleService } from './role.service'; @Injectable({ providedIn: 'root', }) -export class RoleListResolver implements Resolve { - constructor(private ser: RoleService, private router: Router) {} +export class RoleListResolver { + constructor( + private ser: RoleService, + private router: Router, + ) {} resolve(): Observable { return this.ser.list(); diff --git a/bookie/src/app/roles/role-resolver.service.ts b/bookie/src/app/roles/role-resolver.service.ts index 5a3b15f..a0cbe23 100644 --- a/bookie/src/app/roles/role-resolver.service.ts +++ b/bookie/src/app/roles/role-resolver.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; +import { ActivatedRouteSnapshot } from '@angular/router'; import { Observable } from 'rxjs'; import { Role } from './role'; @@ -8,7 +8,7 @@ import { RoleService } from './role.service'; @Injectable({ providedIn: 'root', }) -export class RoleResolver implements Resolve { +export class RoleResolver { constructor(private ser: RoleService) {} resolve(route: ActivatedRouteSnapshot): Observable { diff --git a/bookie/src/app/roles/role.service.ts b/bookie/src/app/roles/role.service.ts index ae563db..f9c719b 100644 --- a/bookie/src/app/roles/role.service.ts +++ b/bookie/src/app/roles/role.service.ts @@ -17,7 +17,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/bookie/src/app/sale-category/product-list-resolver.service.ts b/bookie/src/app/sale-category/product-list-resolver.service.ts index 4a86906..df91d29 100644 --- a/bookie/src/app/sale-category/product-list-resolver.service.ts +++ b/bookie/src/app/sale-category/product-list-resolver.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; +import { ActivatedRouteSnapshot } from '@angular/router'; import { Observable, of as observableOf } from 'rxjs'; import { Product } from '../core/product'; @@ -8,7 +8,7 @@ import { ProductService } from '../product/product.service'; @Injectable({ providedIn: 'root', }) -export class ProductListResolver implements Resolve { +export class ProductListResolver { constructor(private ser: ProductService) {} resolve(route: ActivatedRouteSnapshot): Observable { diff --git a/bookie/src/app/sale-category/sale-category-detail/sale-category-detail.component.html b/bookie/src/app/sale-category/sale-category-detail/sale-category-detail.component.html index a2b77e7..1ea416a 100644 --- a/bookie/src/app/sale-category/sale-category-detail/sale-category-detail.component.html +++ b/bookie/src/app/sale-category/sale-category-detail/sale-category-detail.component.html @@ -51,7 +51,7 @@ Price - {{ row.price | currency : 'INR' }} + {{ row.price | currency: 'INR' }} diff --git a/bookie/src/app/sale-category/sale-category-list-resolver.service.ts b/bookie/src/app/sale-category/sale-category-list-resolver.service.ts index 0d07bd4..e5f0e42 100644 --- a/bookie/src/app/sale-category/sale-category-list-resolver.service.ts +++ b/bookie/src/app/sale-category/sale-category-list-resolver.service.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core'; -import { Resolve } from '@angular/router'; import { Observable } from 'rxjs'; import { SaleCategory } from '../core/sale-category'; @@ -9,7 +8,7 @@ import { SaleCategoryService } from './sale-category.service'; @Injectable({ providedIn: 'root', }) -export class SaleCategoryListResolver implements Resolve { +export class SaleCategoryListResolver { constructor(private ser: SaleCategoryService) {} resolve(): Observable { diff --git a/bookie/src/app/sale-category/sale-category-list/sale-category-list.component.html b/bookie/src/app/sale-category/sale-category-list/sale-category-list.component.html index 876447b..d44a6d3 100644 --- a/bookie/src/app/sale-category/sale-category-list/sale-category-list.component.html +++ b/bookie/src/app/sale-category/sale-category-list/sale-category-list.component.html @@ -21,13 +21,13 @@ Discount Limit - {{ row.discountLimit | percent : '1.2-2' }} + {{ row.discountLimit | percent: '1.2-2' }} Tax - {{ row.tax.rate | percent : '1.2-2' }} {{ row.tax.name }} + {{ row.tax.rate | percent: '1.2-2' }} {{ row.tax.name }} diff --git a/bookie/src/app/sale-category/sale-category-resolver.service.ts b/bookie/src/app/sale-category/sale-category-resolver.service.ts index cacfbd4..aefdd23 100644 --- a/bookie/src/app/sale-category/sale-category-resolver.service.ts +++ b/bookie/src/app/sale-category/sale-category-resolver.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; +import { ActivatedRouteSnapshot } from '@angular/router'; import { Observable } from 'rxjs'; import { SaleCategory } from '../core/sale-category'; @@ -9,7 +9,7 @@ import { SaleCategoryService } from './sale-category.service'; @Injectable({ providedIn: 'root', }) -export class SaleCategoryResolver implements Resolve { +export class SaleCategoryResolver { constructor(private ser: SaleCategoryService) {} resolve(route: ActivatedRouteSnapshot): Observable { diff --git a/bookie/src/app/sale-category/sale-category.service.ts b/bookie/src/app/sale-category/sale-category.service.ts index f66fcdb..4360a04 100644 --- a/bookie/src/app/sale-category/sale-category.service.ts +++ b/bookie/src/app/sale-category/sale-category.service.ts @@ -16,7 +16,10 @@ const serviceName = 'SaleCategoryService'; providedIn: 'root', }) export class SaleCategoryService { - 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/bookie/src/app/sale-report/sale-report-resolver.service.ts b/bookie/src/app/sale-report/sale-report-resolver.service.ts index 55a9042..59dc250 100644 --- a/bookie/src/app/sale-report/sale-report-resolver.service.ts +++ b/bookie/src/app/sale-report/sale-report-resolver.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; +import { ActivatedRouteSnapshot } from '@angular/router'; import { Observable } from 'rxjs'; import { SaleReport } from './sale-report'; @@ -8,7 +8,7 @@ import { SaleReportService } from './sale-report.service'; @Injectable({ providedIn: 'root', }) -export class SaleReportResolver implements Resolve { +export class SaleReportResolver { constructor(private ser: SaleReportService) {} resolve(route: ActivatedRouteSnapshot): Observable { diff --git a/bookie/src/app/sale-report/sale-report.component.html b/bookie/src/app/sale-report/sale-report.component.html index a320258..ffa5381 100644 --- a/bookie/src/app/sale-report/sale-report.component.html +++ b/bookie/src/app/sale-report/sale-report.component.html @@ -51,7 +51,7 @@ Amount - {{ row.amount | currency : 'INR' }} + {{ row.amount | currency: 'INR' }} diff --git a/bookie/src/app/sale-report/sale-report.service.ts b/bookie/src/app/sale-report/sale-report.service.ts index 5ae41f3..af41ae3 100644 --- a/bookie/src/app/sale-report/sale-report.service.ts +++ b/bookie/src/app/sale-report/sale-report.service.ts @@ -14,7 +14,10 @@ const serviceName = 'SaleReportService'; providedIn: 'root', }) export class SaleReportService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} get(startDate: string | null, finishDate: string | null): Observable { const options = { params: new HttpParams() }; diff --git a/bookie/src/app/sales/bills/bill-resolver.service.ts b/bookie/src/app/sales/bills/bill-resolver.service.ts index 7054046..387a3f7 100644 --- a/bookie/src/app/sales/bills/bill-resolver.service.ts +++ b/bookie/src/app/sales/bills/bill-resolver.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; +import { ActivatedRouteSnapshot } from '@angular/router'; import { Observable } from 'rxjs'; import { Bill } from './bill'; @@ -8,7 +8,7 @@ import { VoucherService } from './voucher.service'; @Injectable({ providedIn: 'root', }) -export class BillResolver implements Resolve { +export class BillResolver { constructor(private ser: VoucherService) {} resolve(route: ActivatedRouteSnapshot): Observable { diff --git a/bookie/src/app/sales/bills/bills.component.html b/bookie/src/app/sales/bills/bills.component.html index 7880f2d..c7655f9 100644 --- a/bookie/src/app/sales/bills/bills.component.html +++ b/bookie/src/app/sales/bills/bills.component.html @@ -130,7 +130,7 @@ {{ - bs.grossAmount | async | currency : 'INR' + bs.grossAmount | async | currency: 'INR' }} @@ -140,7 +140,7 @@ {{ - bs.hhAmount | async | currency : 'INR' + bs.hhAmount | async | currency: 'INR' }} @@ -150,7 +150,7 @@ {{ - bs.discountAmount | async | currency : 'INR' + bs.discountAmount | async | currency: 'INR' }} @@ -160,7 +160,7 @@ {{ - bs.taxAmount | async | currency : 'INR' + bs.taxAmount | async | currency: 'INR' }} @@ -170,7 +170,7 @@ {{ - bs.amount | async | currency : 'INR' + bs.amount | async | currency: 'INR' }} diff --git a/bookie/src/app/sales/bills/update-table-resolver.service.ts b/bookie/src/app/sales/bills/update-table-resolver.service.ts index 71c15fe..b167f8e 100644 --- a/bookie/src/app/sales/bills/update-table-resolver.service.ts +++ b/bookie/src/app/sales/bills/update-table-resolver.service.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; +import { ActivatedRouteSnapshot } from '@angular/router'; import { Observable, of as observableOf } from 'rxjs'; @Injectable({ providedIn: 'root', }) -export class UpdateTableResolver implements Resolve { +export class UpdateTableResolver { constructor() {} resolve(route: ActivatedRouteSnapshot): Observable { diff --git a/bookie/src/app/sales/bills/voucher.service.ts b/bookie/src/app/sales/bills/voucher.service.ts index 0f1634a..fe21391 100644 --- a/bookie/src/app/sales/bills/voucher.service.ts +++ b/bookie/src/app/sales/bills/voucher.service.ts @@ -17,7 +17,10 @@ const serviceName = 'VoucherService'; @Injectable({ providedIn: 'root' }) export class VoucherService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} get(id: string): Observable { return this.http diff --git a/bookie/src/app/sales/can-deactivate-bill.guard.ts b/bookie/src/app/sales/can-deactivate-bill.guard.ts index aa3d53e..db369ee 100644 --- a/bookie/src/app/sales/can-deactivate-bill.guard.ts +++ b/bookie/src/app/sales/can-deactivate-bill.guard.ts @@ -1,6 +1,5 @@ import { Injectable } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; -import { CanDeactivate } from '@angular/router'; import { Observable, of as observableOf } from 'rxjs'; import { map } from 'rxjs/operators'; @@ -11,7 +10,7 @@ import { BillsComponent } from './bills/bills.component'; @Injectable({ providedIn: 'root', }) -export class CanDeactivateBillGuard implements CanDeactivate { +export class CanDeactivateBillGuard { constructor(private dialog: MatDialog) {} canDeactivate(component: BillsComponent): Observable | boolean { if (component.bs.canDeactivate()) { diff --git a/bookie/src/app/sales/discount/customer-discounts.service.ts b/bookie/src/app/sales/discount/customer-discounts.service.ts index 5c8614e..a378c76 100644 --- a/bookie/src/app/sales/discount/customer-discounts.service.ts +++ b/bookie/src/app/sales/discount/customer-discounts.service.ts @@ -14,7 +14,10 @@ const serviceName = 'CustomerService'; providedIn: 'root', }) export class CustomerDiscountsService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} list(id: string | undefined): Observable { const getUrl: string = id === undefined ? `${url}` : `${url}/${id}`; diff --git a/bookie/src/app/sales/discount/discount.component.html b/bookie/src/app/sales/discount/discount.component.html index d90f85c..41228ff 100644 --- a/bookie/src/app/sales/discount/discount.component.html +++ b/bookie/src/app/sales/discount/discount.component.html @@ -15,8 +15,8 @@ % - Cust: {{ row.customer | percent : '1.2-2' }} - Max: {{ row.limit | percent : '1.2-2' }} + Cust: {{ row.customer | percent: '1.2-2' }} + Max: {{ row.limit | percent: '1.2-2' }} diff --git a/bookie/src/app/sales/menu-categories/menu-categories-resolver.service.ts b/bookie/src/app/sales/menu-categories/menu-categories-resolver.service.ts index 476f4df..fa02397 100644 --- a/bookie/src/app/sales/menu-categories/menu-categories-resolver.service.ts +++ b/bookie/src/app/sales/menu-categories/menu-categories-resolver.service.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core'; -import { Resolve } from '@angular/router'; import { Observable } from 'rxjs'; import { MenuCategory } from '../../core/menu-category'; @@ -8,7 +7,7 @@ import { MenuCategoryService } from '../../menu-category/menu-category.service'; @Injectable({ providedIn: 'root', }) -export class MenuCategoriesResolver implements Resolve { +export class MenuCategoriesResolver { constructor(private ser: MenuCategoryService) {} resolve(): Observable { diff --git a/bookie/src/app/sales/pax/pax.component.ts b/bookie/src/app/sales/pax/pax.component.ts index 408b21a..5b28591 100644 --- a/bookie/src/app/sales/pax/pax.component.ts +++ b/bookie/src/app/sales/pax/pax.component.ts @@ -12,7 +12,10 @@ export class PaxComponent implements OnInit { pax: FormControl; }>; - constructor(public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: number) { + constructor( + public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: number, + ) { // Create form this.form = new FormGroup({ pax: new FormControl(0, { nonNullable: true }), diff --git a/bookie/src/app/sales/products/products-resolver.service.ts b/bookie/src/app/sales/products/products-resolver.service.ts index e61ccdd..f3f22b1 100644 --- a/bookie/src/app/sales/products/products-resolver.service.ts +++ b/bookie/src/app/sales/products/products-resolver.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve, Router } from '@angular/router'; +import { ActivatedRouteSnapshot, Router } from '@angular/router'; import { Observable } from 'rxjs'; import { Product } from '../../core/product'; @@ -8,8 +8,11 @@ import { ProductService } from '../../product/product.service'; @Injectable({ providedIn: 'root', }) -export class ProductsResolver implements Resolve { - constructor(private ser: ProductService, private router: Router) {} +export class ProductsResolver { + constructor( + private ser: ProductService, + private router: Router, + ) {} resolve(route: ActivatedRouteSnapshot): Observable { const id = route.paramMap.get('id') as string; diff --git a/bookie/src/app/sales/products/products.component.html b/bookie/src/app/sales/products/products.component.html index 3e32aea..2af9dfa 100644 --- a/bookie/src/app/sales/products/products.component.html +++ b/bookie/src/app/sales/products/products.component.html @@ -19,7 +19,7 @@ [class.primary]="!item.hasHappyHour && !item.isNotAvailable" >

{{ item.name }}

- {{ item.price | currency : 'INR' }} + {{ item.price | currency: 'INR' }} diff --git a/bookie/src/app/sales/products/products.component.ts b/bookie/src/app/sales/products/products.component.ts index d6adfdb..7e8594b 100644 --- a/bookie/src/app/sales/products/products.component.ts +++ b/bookie/src/app/sales/products/products.component.ts @@ -12,7 +12,10 @@ import { BillService } from '../bill.service'; export class ProductsComponent implements OnInit { list: Product[] = []; - constructor(private route: ActivatedRoute, private bs: BillService) {} + constructor( + private route: ActivatedRoute, + private bs: BillService, + ) {} ngOnInit() { this.route.data.subscribe((value) => { diff --git a/bookie/src/app/sales/receive-payment/receive-payment.component.html b/bookie/src/app/sales/receive-payment/receive-payment.component.html index efb33ce..80dc400 100644 --- a/bookie/src/app/sales/receive-payment/receive-payment.component.html +++ b/bookie/src/app/sales/receive-payment/receive-payment.component.html @@ -12,14 +12,14 @@ {{ - amount | currency : 'INR' + amount | currency: 'INR' }} - {{ balance | currency : 'INR' }} + {{ balance | currency: 'INR' }} diff --git a/bookie/src/app/sales/receive-payment/receive-payment.component.ts b/bookie/src/app/sales/receive-payment/receive-payment.component.ts index 1a80f2c..10cf95e 100644 --- a/bookie/src/app/sales/receive-payment/receive-payment.component.ts +++ b/bookie/src/app/sales/receive-payment/receive-payment.component.ts @@ -64,7 +64,7 @@ export class ReceivePaymentComponent { tap((x: SettleOption[]) => (this.displayReason = x.reduce((o, n) => o || n.hasReason, this.displayReason))), tap((x: SettleOption[]) => (this.displayTable = x.length > 1)), map((x: SettleOption[]) => - x.map((y) => ({ ...y, amount: !this.displayTable ? this.amount : 0 } as ReceivePaymentItem)), + x.map((y) => ({ ...y, amount: !this.displayTable ? this.amount : 0 }) as ReceivePaymentItem), ), ) .subscribe((x) => { diff --git a/bookie/src/app/sales/running-tables/running-tables-resolver.service.ts b/bookie/src/app/sales/running-tables/running-tables-resolver.service.ts index 9a325d6..c4467d8 100644 --- a/bookie/src/app/sales/running-tables/running-tables-resolver.service.ts +++ b/bookie/src/app/sales/running-tables/running-tables-resolver.service.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core'; -import { Resolve } from '@angular/router'; import { Observable } from 'rxjs'; import { Table } from '../../core/table'; @@ -8,7 +7,7 @@ import { TableService } from '../../tables/table.service'; @Injectable({ providedIn: 'root', }) -export class RunningTablesResolver implements Resolve { +export class RunningTablesResolver { constructor(private ser: TableService) {} resolve(): Observable { diff --git a/bookie/src/app/sales/running-tables/running-tables.component.html b/bookie/src/app/sales/running-tables/running-tables.component.html index 1ee4df0..84e2b4f 100644 --- a/bookie/src/app/sales/running-tables/running-tables.component.html +++ b/bookie/src/app/sales/running-tables/running-tables.component.html @@ -17,7 +17,7 @@ {{ table.guest }} {{ table.pax ?? '-' }} / {{ table.seats }} / {{ table.section?.name }} {{ table.date }} - {{ table.amount | currency : 'INR' }} + {{ table.amount | currency: 'INR' }}

Open Bill

diff --git a/bookie/src/app/sales/tables-dialog/tables-dialog.component.html b/bookie/src/app/sales/tables-dialog/tables-dialog.component.html index 7cb7a39..dcabeb1 100644 --- a/bookie/src/app/sales/tables-dialog/tables-dialog.component.html +++ b/bookie/src/app/sales/tables-dialog/tables-dialog.component.html @@ -14,7 +14,7 @@ {{ table.guest }} {{ table.pax ?? 0 }} / {{ table.seats }} Seats {{ table.date }} - {{ table.amount | currency : 'INR' }} + {{ table.amount | currency: 'INR' }} diff --git a/bookie/src/app/section-printers/section-printer-resolver.service.ts b/bookie/src/app/section-printers/section-printer-resolver.service.ts index 885e1d7..41f84f1 100644 --- a/bookie/src/app/section-printers/section-printer-resolver.service.ts +++ b/bookie/src/app/section-printers/section-printer-resolver.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; +import { ActivatedRouteSnapshot } from '@angular/router'; import { Observable } from 'rxjs'; import { SectionPrinter } from '../core/section-printer'; @@ -9,7 +9,7 @@ import { SectionPrinterService } from './section-printer.service'; @Injectable({ providedIn: 'root', }) -export class SectionPrinterResolver implements Resolve { +export class SectionPrinterResolver { constructor(private ser: SectionPrinterService) {} resolve(route: ActivatedRouteSnapshot): Observable { diff --git a/bookie/src/app/section-printers/section-printer.service.ts b/bookie/src/app/section-printers/section-printer.service.ts index 09e89ee..494c30c 100644 --- a/bookie/src/app/section-printers/section-printer.service.ts +++ b/bookie/src/app/section-printers/section-printer.service.ts @@ -16,7 +16,10 @@ const serviceName = 'SectionPrinterService'; providedIn: 'root', }) export class SectionPrinterService { - 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/bookie/src/app/sections/section-list-resolver.service.ts b/bookie/src/app/sections/section-list-resolver.service.ts index c40b0a1..8296b60 100644 --- a/bookie/src/app/sections/section-list-resolver.service.ts +++ b/bookie/src/app/sections/section-list-resolver.service.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core'; -import { Resolve } from '@angular/router'; import { Observable } from 'rxjs'; import { Section } from '../core/section'; @@ -9,7 +8,7 @@ import { SectionService } from './section.service'; @Injectable({ providedIn: 'root', }) -export class SectionListResolver implements Resolve { +export class SectionListResolver { constructor(private ser: SectionService) {} resolve(): Observable { diff --git a/bookie/src/app/sections/section-resolver.service.ts b/bookie/src/app/sections/section-resolver.service.ts index a41231b..68be5bd 100644 --- a/bookie/src/app/sections/section-resolver.service.ts +++ b/bookie/src/app/sections/section-resolver.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; +import { ActivatedRouteSnapshot } from '@angular/router'; import { Observable } from 'rxjs'; import { Section } from '../core/section'; @@ -9,7 +9,7 @@ import { SectionService } from './section.service'; @Injectable({ providedIn: 'root', }) -export class SectionResolver implements Resolve
{ +export class SectionResolver { constructor(private ser: SectionService) {} resolve(route: ActivatedRouteSnapshot): Observable
{ diff --git a/bookie/src/app/sections/section.service.ts b/bookie/src/app/sections/section.service.ts index 02ecdf9..b63c5a9 100644 --- a/bookie/src/app/sections/section.service.ts +++ b/bookie/src/app/sections/section.service.ts @@ -16,7 +16,10 @@ const serviceName = 'SectionService'; providedIn: 'root', }) export class SectionService { - 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/bookie/src/app/settings/prefill-customer-discount-resolver.service.ts b/bookie/src/app/settings/prefill-customer-discount-resolver.service.ts index 8229c46..0c852ce 100644 --- a/bookie/src/app/settings/prefill-customer-discount-resolver.service.ts +++ b/bookie/src/app/settings/prefill-customer-discount-resolver.service.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core'; -import { Resolve } from '@angular/router'; import { Observable } from 'rxjs'; import { SettingsService } from './settings.service'; @@ -7,7 +6,7 @@ import { SettingsService } from './settings.service'; @Injectable({ providedIn: 'root', }) -export class PrefillCustomerDiscountResolver implements Resolve { +export class PrefillCustomerDiscountResolver { constructor(private ser: SettingsService) {} resolve(): Observable { diff --git a/bookie/src/app/settings/settings.service.ts b/bookie/src/app/settings/settings.service.ts index 861698e..865945b 100644 --- a/bookie/src/app/settings/settings.service.ts +++ b/bookie/src/app/settings/settings.service.ts @@ -9,7 +9,10 @@ const serviceName = 'SettingsService'; @Injectable({ providedIn: 'root' }) export class SettingsService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} getPrefillCustomerDiscount(): Observable { const url = '/api/settings/prefill-customer-discount'; diff --git a/bookie/src/app/settle-option/settle-option-list-resolver.service.ts b/bookie/src/app/settle-option/settle-option-list-resolver.service.ts index e61a9d7..b1a495e 100644 --- a/bookie/src/app/settle-option/settle-option-list-resolver.service.ts +++ b/bookie/src/app/settle-option/settle-option-list-resolver.service.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core'; -import { Resolve } from '@angular/router'; import { Observable } from 'rxjs'; import { SettleOption } from '../core/settle-option'; @@ -9,7 +8,7 @@ import { SettleOptionService } from './settle-option.service'; @Injectable({ providedIn: 'root', }) -export class SettleOptionListResolver implements Resolve { +export class SettleOptionListResolver { constructor(private ser: SettleOptionService) {} resolve(): Observable { diff --git a/bookie/src/app/settle-option/settle-option-resolver.service.ts b/bookie/src/app/settle-option/settle-option-resolver.service.ts index bf0516d..f941ab3 100644 --- a/bookie/src/app/settle-option/settle-option-resolver.service.ts +++ b/bookie/src/app/settle-option/settle-option-resolver.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; +import { ActivatedRouteSnapshot } from '@angular/router'; import { Observable } from 'rxjs'; import { SettleOption } from '../core/settle-option'; @@ -9,7 +9,7 @@ import { SettleOptionService } from './settle-option.service'; @Injectable({ providedIn: 'root', }) -export class SettleOptionResolver implements Resolve { +export class SettleOptionResolver { constructor(private ser: SettleOptionService) {} resolve(route: ActivatedRouteSnapshot): Observable { diff --git a/bookie/src/app/settle-option/settle-option.service.ts b/bookie/src/app/settle-option/settle-option.service.ts index 5ec262c..4e888fe 100644 --- a/bookie/src/app/settle-option/settle-option.service.ts +++ b/bookie/src/app/settle-option/settle-option.service.ts @@ -17,7 +17,10 @@ const serviceName = 'SettleOptionService'; providedIn: 'root', }) export class SettleOptionService { - 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/bookie/src/app/shared/image-dialog/image-dialog.component.ts b/bookie/src/app/shared/image-dialog/image-dialog.component.ts index c43315a..3878fc2 100644 --- a/bookie/src/app/shared/image-dialog/image-dialog.component.ts +++ b/bookie/src/app/shared/image-dialog/image-dialog.component.ts @@ -7,7 +7,10 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; styleUrls: ['./image-dialog.component.css'], }) export class ImageDialogComponent { - constructor(public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: string) {} + constructor( + public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: string, + ) {} close(): void { this.dialogRef.close(); diff --git a/bookie/src/app/tables/table-list-resolver.service.ts b/bookie/src/app/tables/table-list-resolver.service.ts index 538e610..dbed451 100644 --- a/bookie/src/app/tables/table-list-resolver.service.ts +++ b/bookie/src/app/tables/table-list-resolver.service.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core'; -import { Resolve } from '@angular/router'; import { Observable } from 'rxjs'; import { Table } from '../core/table'; @@ -9,7 +8,7 @@ import { TableService } from './table.service'; @Injectable({ providedIn: 'root', }) -export class TableListResolver implements Resolve { +export class TableListResolver { constructor(private ser: TableService) {} resolve(): Observable { diff --git a/bookie/src/app/tables/table-resolver.service.ts b/bookie/src/app/tables/table-resolver.service.ts index 2f44dd1..c1d7950 100644 --- a/bookie/src/app/tables/table-resolver.service.ts +++ b/bookie/src/app/tables/table-resolver.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; +import { ActivatedRouteSnapshot } from '@angular/router'; import { Observable } from 'rxjs'; import { Table } from '../core/table'; @@ -9,7 +9,7 @@ import { TableService } from './table.service'; @Injectable({ providedIn: 'root', }) -export class TableResolver implements Resolve { +export class TableResolver { constructor(private ser: TableService) {} resolve(route: ActivatedRouteSnapshot): Observable
{ diff --git a/bookie/src/app/tables/table.service.ts b/bookie/src/app/tables/table.service.ts index 0062e50..544d6af 100644 --- a/bookie/src/app/tables/table.service.ts +++ b/bookie/src/app/tables/table.service.ts @@ -16,7 +16,10 @@ const serviceName = 'TableService'; providedIn: 'root', }) export class TableService { - 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/bookie/src/app/tax-report/tax-report-resolver.service.ts b/bookie/src/app/tax-report/tax-report-resolver.service.ts index 6883efa..7bc297b 100644 --- a/bookie/src/app/tax-report/tax-report-resolver.service.ts +++ b/bookie/src/app/tax-report/tax-report-resolver.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; +import { ActivatedRouteSnapshot } from '@angular/router'; import { Observable } from 'rxjs'; import { TaxReport } from './tax-report'; @@ -8,7 +8,7 @@ import { TaxReportService } from './tax-report.service'; @Injectable({ providedIn: 'root', }) -export class TaxReportResolver implements Resolve { +export class TaxReportResolver { constructor(private ser: TaxReportService) {} resolve(route: ActivatedRouteSnapshot): Observable { diff --git a/bookie/src/app/tax-report/tax-report.component.html b/bookie/src/app/tax-report/tax-report.component.html index 9f19da6..39ae1cc 100644 --- a/bookie/src/app/tax-report/tax-report.component.html +++ b/bookie/src/app/tax-report/tax-report.component.html @@ -47,19 +47,19 @@ Rate - {{ row.taxRate | percent : '1.2-2' }} + {{ row.taxRate | percent: '1.2-2' }} Sale - {{ row.saleAmount | currency : 'INR' }} + {{ row.saleAmount | currency: 'INR' }} Tax - {{ row.amount | currency : 'INR' }} + {{ row.amount | currency: 'INR' }} diff --git a/bookie/src/app/tax-report/tax-report.component.ts b/bookie/src/app/tax-report/tax-report.component.ts index 187b000..ee3df6c 100644 --- a/bookie/src/app/tax-report/tax-report.component.ts +++ b/bookie/src/app/tax-report/tax-report.component.ts @@ -24,7 +24,11 @@ export class TaxReportComponent implements OnInit { /** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */ displayedColumns = ['name', 'taxRate', 'saleAmount', 'taxAmount']; - constructor(private route: ActivatedRoute, private router: Router, private toCsv: ToCsvService) { + constructor( + private route: ActivatedRoute, + private router: Router, + private toCsv: ToCsvService, + ) { // Create form this.form = new FormGroup({ startDate: new FormControl(new Date(), { nonNullable: true }), diff --git a/bookie/src/app/tax-report/tax-report.service.ts b/bookie/src/app/tax-report/tax-report.service.ts index 7d63dbd..379a4eb 100644 --- a/bookie/src/app/tax-report/tax-report.service.ts +++ b/bookie/src/app/tax-report/tax-report.service.ts @@ -14,7 +14,10 @@ const serviceName = 'TaxReportService'; providedIn: 'root', }) export class TaxReportService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} get(startDate: string | null, finishDate: string | null): Observable { const options = { params: new HttpParams() }; diff --git a/bookie/src/app/taxes/tax-list-resolver.service.ts b/bookie/src/app/taxes/tax-list-resolver.service.ts index 43817c3..84c0ef4 100644 --- a/bookie/src/app/taxes/tax-list-resolver.service.ts +++ b/bookie/src/app/taxes/tax-list-resolver.service.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core'; -import { Resolve } from '@angular/router'; import { Observable } from 'rxjs'; import { Tax } from '../core/tax'; @@ -9,7 +8,7 @@ import { TaxService } from './tax.service'; @Injectable({ providedIn: 'root', }) -export class TaxListResolver implements Resolve { +export class TaxListResolver { constructor(private ser: TaxService) {} resolve(): Observable { diff --git a/bookie/src/app/taxes/tax-list/tax-list.component.html b/bookie/src/app/taxes/tax-list/tax-list.component.html index 59755fd..1855d4f 100644 --- a/bookie/src/app/taxes/tax-list/tax-list.component.html +++ b/bookie/src/app/taxes/tax-list/tax-list.component.html @@ -21,7 +21,7 @@ Rate - {{ row.rate | percent : '1.2-2' }} + {{ row.rate | percent: '1.2-2' }} diff --git a/bookie/src/app/taxes/tax-resolver.service.ts b/bookie/src/app/taxes/tax-resolver.service.ts index 091047d..4e52ddf 100644 --- a/bookie/src/app/taxes/tax-resolver.service.ts +++ b/bookie/src/app/taxes/tax-resolver.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; +import { ActivatedRouteSnapshot } from '@angular/router'; import { Observable } from 'rxjs'; import { Tax } from '../core/tax'; @@ -9,7 +9,7 @@ import { TaxService } from './tax.service'; @Injectable({ providedIn: 'root', }) -export class TaxResolver implements Resolve { +export class TaxResolver { constructor(private ser: TaxService) {} resolve(route: ActivatedRouteSnapshot): Observable { diff --git a/bookie/src/app/taxes/tax.service.ts b/bookie/src/app/taxes/tax.service.ts index 21db41a..f6e4e62 100644 --- a/bookie/src/app/taxes/tax.service.ts +++ b/bookie/src/app/taxes/tax.service.ts @@ -16,7 +16,10 @@ const serviceName = 'TaxService'; providedIn: 'root', }) export class TaxService { - 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/bookie/src/app/temporal-product/temporal-product-list-resolver.service.ts b/bookie/src/app/temporal-product/temporal-product-list-resolver.service.ts index 32164b2..81180d5 100644 --- a/bookie/src/app/temporal-product/temporal-product-list-resolver.service.ts +++ b/bookie/src/app/temporal-product/temporal-product-list-resolver.service.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core'; -import { Resolve } from '@angular/router'; import { Observable } from 'rxjs'; import { Product } from '../core/product'; @@ -9,7 +8,7 @@ import { TemporalProductService } from './temporal-product.service'; @Injectable({ providedIn: 'root', }) -export class TemporalProductListResolverService implements Resolve { +export class TemporalProductListResolverService { constructor(private ser: TemporalProductService) {} resolve(): Observable { diff --git a/bookie/src/app/temporal-product/temporal-product-list/temporal-product-list.component.html b/bookie/src/app/temporal-product/temporal-product-list/temporal-product-list.component.html index d96a1f5..ffbd803 100644 --- a/bookie/src/app/temporal-product/temporal-product-list/temporal-product-list.component.html +++ b/bookie/src/app/temporal-product/temporal-product-list/temporal-product-list.component.html @@ -48,7 +48,7 @@ Price - {{ row.price | currency : 'INR' }} + {{ row.price | currency: 'INR' }} @@ -91,7 +91,7 @@ Quantity - {{ row.quantity | number : '1.2-2' }} + {{ row.quantity | number: '1.2-2' }} diff --git a/bookie/src/app/temporal-product/temporal-product-resolver.service.ts b/bookie/src/app/temporal-product/temporal-product-resolver.service.ts index ba198dd..75d2f63 100644 --- a/bookie/src/app/temporal-product/temporal-product-resolver.service.ts +++ b/bookie/src/app/temporal-product/temporal-product-resolver.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; +import { ActivatedRouteSnapshot } from '@angular/router'; import { Observable } from 'rxjs'; import { Product } from '../core/product'; @@ -9,7 +9,7 @@ import { TemporalProductService } from './temporal-product.service'; @Injectable({ providedIn: 'root', }) -export class TemporalProductResolverService implements Resolve { +export class TemporalProductResolverService { constructor(private ser: TemporalProductService) {} resolve(route: ActivatedRouteSnapshot): Observable { diff --git a/bookie/src/app/temporal-product/temporal-product.service.ts b/bookie/src/app/temporal-product/temporal-product.service.ts index 6aec7fc..e60d78a 100644 --- a/bookie/src/app/temporal-product/temporal-product.service.ts +++ b/bookie/src/app/temporal-product/temporal-product.service.ts @@ -15,7 +15,10 @@ const serviceName = 'ProductService'; @Injectable({ providedIn: 'root' }) export class TemporalProductService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} get(id: string): Observable { return this.http diff --git a/bookie/src/app/update-product-prices/update-product-prices-resolver.service.ts b/bookie/src/app/update-product-prices/update-product-prices-resolver.service.ts index 5b16eb9..7cf769c 100644 --- a/bookie/src/app/update-product-prices/update-product-prices-resolver.service.ts +++ b/bookie/src/app/update-product-prices/update-product-prices-resolver.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; +import { ActivatedRouteSnapshot } from '@angular/router'; import { Observable } from 'rxjs'; import { UpdateProductPrices } from './update-product-prices'; @@ -8,7 +8,7 @@ import { UpdateProductPricesService } from './update-product-prices.service'; @Injectable({ providedIn: 'root', }) -export class UpdateProductPricesResolver implements Resolve { +export class UpdateProductPricesResolver { constructor(private ser: UpdateProductPricesService) {} resolve(route: ActivatedRouteSnapshot): Observable { diff --git a/bookie/src/app/update-product-prices/update-product-prices.component.html b/bookie/src/app/update-product-prices/update-product-prices.component.html index fa734a0..c2d5ef5 100644 --- a/bookie/src/app/update-product-prices/update-product-prices.component.html +++ b/bookie/src/app/update-product-prices/update-product-prices.component.html @@ -36,7 +36,7 @@ Old Price - {{ row.oldPrice | currency : 'INR' }} + {{ row.oldPrice | currency: 'INR' }} diff --git a/bookie/src/app/update-product-prices/update-product-prices.service.ts b/bookie/src/app/update-product-prices/update-product-prices.service.ts index f384719..efdf8db 100644 --- a/bookie/src/app/update-product-prices/update-product-prices.service.ts +++ b/bookie/src/app/update-product-prices/update-product-prices.service.ts @@ -15,7 +15,10 @@ const serviceName = 'UpdateProductPricesService'; providedIn: 'root', }) export class UpdateProductPricesService { - constructor(private http: HttpClient, private log: ErrorLoggerService) {} + constructor( + private http: HttpClient, + private log: ErrorLoggerService, + ) {} get(id: string | null, date: string | null): Observable { const getUrl: string = id === null ? url : `${url}/${id}`; diff --git a/bookie/src/app/users/user-list-resolver.service.ts b/bookie/src/app/users/user-list-resolver.service.ts index aa72c58..fad3ebc 100644 --- a/bookie/src/app/users/user-list-resolver.service.ts +++ b/bookie/src/app/users/user-list-resolver.service.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core'; -import { Resolve } from '@angular/router'; import { Observable } from 'rxjs'; import { User } from '../core/user'; @@ -9,7 +8,7 @@ import { UserService } from './user.service'; @Injectable({ providedIn: 'root', }) -export class UserListResolver implements Resolve { +export class UserListResolver { constructor(private ser: UserService) {} resolve(): Observable { diff --git a/bookie/src/app/users/user-resolver.service.ts b/bookie/src/app/users/user-resolver.service.ts index f6f0ec9..6ac22dd 100644 --- a/bookie/src/app/users/user-resolver.service.ts +++ b/bookie/src/app/users/user-resolver.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve } from '@angular/router'; +import { ActivatedRouteSnapshot } from '@angular/router'; import { Observable } from 'rxjs'; import { User } from '../core/user'; @@ -9,7 +9,7 @@ import { UserService } from './user.service'; @Injectable({ providedIn: 'root', }) -export class UserResolver implements Resolve { +export class UserResolver { constructor(private ser: UserService) {} resolve(route: ActivatedRouteSnapshot): Observable { diff --git a/bookie/src/app/users/user.service.ts b/bookie/src/app/users/user.service.ts index d5a0ad1..8502370 100644 --- a/bookie/src/app/users/user.service.ts +++ b/bookie/src/app/users/user.service.ts @@ -16,7 +16,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}`;