From 129664e5648fa22e26e89f0ec19584535f3822c6 Mon Sep 17 00:00:00 2001 From: Amritanshu Date: Mon, 12 Dec 2022 12:00:24 +0530 Subject: [PATCH] Chore: Upgraded to angular 15 Chore: Moved from angular/flex-layout to Tailwind Chore: Upgrade completed --- .../brewman/routers/reports/profit_loss.py | 2 +- brewman/brewman/routers/reports/purchases.py | 2 +- brewman/brewman/schemas/profit_loss.py | 2 +- brewman/brewman/schemas/purchases.py | 4 +- brewman/brewman/schemas/rate_contract.py | 12 + brewman/brewman/schemas/voucher.py | 2 +- overlord/.browserslistrc | 17 - overlord/angular.json | 8 + overlord/package.json | 56 ++-- .../account-detail.component.html | 104 +++---- .../account-list/account-list.component.html | 16 +- overlord/src/app/app-routing.module.ts | 1 - .../app/attendance/attendance.component.html | 16 +- .../src/app/auth/login/login.component.html | 2 +- .../balance-sheet.component.html | 12 +- .../batch-integrity-report.component.html | 10 +- .../app/cash-flow/cash-flow.component.html | 6 +- .../client-detail.component.html | 2 +- .../client-list/client-list.component.html | 2 +- .../closing-stock.component.html | 24 +- .../app/core/nav-bar/nav-bar.component.html | 2 +- .../cost-centre-detail.component.html | 50 ++- .../cost-centre-list.component.html | 16 +- .../src/app/daybook/daybook.component.html | 10 +- .../employee-attendance.component.html | 18 +- .../employee-benefits.component.html | 16 +- .../employee-functions.component.html | 6 +- .../employee-detail.component.html | 26 +- .../employee-list.component.html | 26 +- overlord/src/app/employee/employee.module.ts | 8 +- .../src/app/entries/entries.component.html | 104 +++---- .../app/incentive/incentive.component.html | 34 +- .../src/app/issue/issue-dialog.component.html | 6 +- overlord/src/app/issue/issue.component.css | 6 +- overlord/src/app/issue/issue.component.html | 36 +-- .../app/journal/journal-dialog.component.html | 10 +- .../src/app/journal/journal.component.css | 9 +- .../src/app/journal/journal.component.html | 46 +-- overlord/src/app/ledger/ledger.component.html | 28 +- .../net-transactions.component.html | 10 +- .../non-contract-purchase.component.html | 8 +- .../app/payment/payment-dialog.component.html | 10 +- .../src/app/payment/payment.component.css | 9 +- .../src/app/payment/payment.component.html | 46 +-- .../period-detail.component.html | 8 +- .../period-list/period-list.component.html | 16 +- overlord/src/app/period/period.module.ts | 8 +- .../product-group-detail.component.html | 50 ++- .../product-group-list.component.html | 16 +- .../product-ledger.component.html | 40 +-- .../product-detail-dialog.component.html | 8 +- .../product-detail.component.html | 260 ++++++++-------- .../product-list/product-list.component.html | 26 +- .../profit-loss/profit-loss.component.html | 14 +- .../purchase-entries.component.html | 16 +- .../purchase-return-dialog.component.html | 8 +- .../purchase-return.component.css | 9 +- .../purchase-return.component.html | 54 ++-- .../purchase/purchase-dialog.component.html | 6 +- .../src/app/purchase/purchase.component.css | 10 +- .../src/app/purchase/purchase.component.html | 54 ++-- .../app/purchases/purchases.component.html | 18 +- .../rate-contract-detail.component.html | 294 +++++++++--------- .../rate-contract-detail.component.ts | 2 +- .../rate-contract-list-datasource.ts | 2 +- .../rate-contract-list.component.html | 18 +- .../src/app/rate-contract/rate-contract.ts | 3 +- .../raw-material-cost.component.html | 34 +- .../app/receipt/receipt-dialog.component.html | 10 +- .../src/app/receipt/receipt.component.css | 9 +- .../src/app/receipt/receipt.component.html | 46 +-- .../recipe-detail.component.html | 14 +- .../recipe-list/recipe-list.component.html | 22 +- .../role-detail/role-detail.component.html | 2 +- .../role/role-list/role-list.component.html | 2 +- .../src/app/settings/settings.component.html | 6 +- .../confirm-dialog.component.html | 6 +- .../stock-movement.component.html | 18 +- .../trial-balance.component.html | 8 +- .../user-detail/user-detail.component.html | 2 +- .../user/user-list/user-list.component.html | 2 +- overlord/src/styles.css | 12 +- overlord/src/test.ts | 15 - overlord/tsconfig.json | 5 +- 84 files changed, 1011 insertions(+), 982 deletions(-) delete mode 100644 overlord/.browserslistrc diff --git a/brewman/brewman/routers/reports/profit_loss.py b/brewman/brewman/routers/reports/profit_loss.py index 1b743ba6..7863236f 100644 --- a/brewman/brewman/routers/reports/profit_loss.py +++ b/brewman/brewman/routers/reports/profit_loss.py @@ -33,7 +33,7 @@ def report_blank( startDate=get_start_date(request.session), finishDate=get_finish_date(request.session), body=[], - footer=None, + footer=schemas.ProfitLossItem(group="", total=0, order=0), ) diff --git a/brewman/brewman/routers/reports/purchases.py b/brewman/brewman/routers/reports/purchases.py index 605b4c1a..3c1effd0 100644 --- a/brewman/brewman/routers/reports/purchases.py +++ b/brewman/brewman/routers/reports/purchases.py @@ -34,7 +34,7 @@ def report_blank( startDate=get_start_date(request.session), finishDate=get_finish_date(request.session), body=[], - footer=None, + footer=schemas.PurchasesItem(name="Total", quantity=0, rate=0, url=[], amount=0), ) diff --git a/brewman/brewman/schemas/profit_loss.py b/brewman/brewman/schemas/profit_loss.py index 26ae3cd3..e23d39a6 100644 --- a/brewman/brewman/schemas/profit_loss.py +++ b/brewman/brewman/schemas/profit_loss.py @@ -25,7 +25,7 @@ class ProfitLoss(BaseModel): start_date: date finish_date: date body: List[ProfitLossItem] - footer: Optional[ProfitLossItem] + footer: ProfitLossItem class Config: anystr_strip_whitespace = True diff --git a/brewman/brewman/schemas/purchases.py b/brewman/brewman/schemas/purchases.py index 263b7401..739f270e 100644 --- a/brewman/brewman/schemas/purchases.py +++ b/brewman/brewman/schemas/purchases.py @@ -1,6 +1,6 @@ from datetime import date, datetime from decimal import Decimal -from typing import List, Optional, Union +from typing import List, Union from pydantic import validator from pydantic.main import BaseModel @@ -24,7 +24,7 @@ class Purchases(BaseModel): start_date: date finish_date: date body: List[PurchasesItem] - footer: Optional[PurchasesItem] + footer: PurchasesItem class Config: anystr_strip_whitespace = True diff --git a/brewman/brewman/schemas/rate_contract.py b/brewman/brewman/schemas/rate_contract.py index 907c9a8d..9eeafc3b 100644 --- a/brewman/brewman/schemas/rate_contract.py +++ b/brewman/brewman/schemas/rate_contract.py @@ -32,6 +32,18 @@ class RateContractBlank(BaseModel): return value return datetime.strptime(value, "%d-%b-%Y").date() + @validator("valid_from", pre=True) + def parse_valid_from(cls, value: Union[date, str]) -> date: + if isinstance(value, date): + return value + return datetime.strptime(value, "%d-%b-%Y").date() + + @validator("valid_till", pre=True) + def parse_valid_till(cls, value: Union[date, str]) -> date: + if isinstance(value, date): + return value + return datetime.strptime(value, "%d-%b-%Y").date() + class RateContractIn(RateContractBlank): vendor: AccountLink diff --git a/brewman/brewman/schemas/voucher.py b/brewman/brewman/schemas/voucher.py index e3505bd0..e72040ff 100644 --- a/brewman/brewman/schemas/voucher.py +++ b/brewman/brewman/schemas/voucher.py @@ -43,7 +43,7 @@ class Voucher(VoucherIn): last_edit_date: Optional[datetime] user: Optional[UserLink] posted: Optional[bool] - poster_id: Optional[uuid.UUID] + poster: Optional[str] journals: List[Journal] inventories: List[Inventory] vendor: Optional[AccountLink] diff --git a/overlord/.browserslistrc b/overlord/.browserslistrc deleted file mode 100644 index 427441dc..00000000 --- a/overlord/.browserslistrc +++ /dev/null @@ -1,17 +0,0 @@ -# This file is used by the build system to adjust CSS and JS output to support the specified browsers below. -# For additional information regarding the format and rule options, please see: -# https://github.com/browserslist/browserslist#queries - -# For the full list of supported browsers by the Angular framework, please see: -# https://angular.io/guide/browser-support - -# You can see what browsers were selected by your queries by running: -# npx browserslist - -last 1 Chrome version -last 1 Firefox version -last 2 Edge major versions -last 2 Safari major versions -last 2 iOS major versions -Firefox ESR -not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line. diff --git a/overlord/angular.json b/overlord/angular.json index 4c2f0a46..0d85ee28 100644 --- a/overlord/angular.json +++ b/overlord/angular.json @@ -121,5 +121,13 @@ "@angular-eslint/schematics" ], "analytics": "0309c8d2-99a2-4dd3-b63e-9a0a43611460" + }, + "schematics": { + "@angular-eslint/schematics:application": { + "setParserOptionsProject": true + }, + "@angular-eslint/schematics:library": { + "setParserOptionsProject": true + } } } diff --git a/overlord/package.json b/overlord/package.json index 68b24fb6..6b2e05a0 100644 --- a/overlord/package.json +++ b/overlord/package.json @@ -14,44 +14,44 @@ }, "private": true, "dependencies": { - "@angular/animations": "^14.2.10", - "@angular/cdk": "^14.2.7", - "@angular/common": "^14.2.10", - "@angular/compiler": "^14.2.10", - "@angular/core": "^14.2.10", - "@angular/forms": "^14.2.10", - "@angular/material": "^14.2.7", - "@angular/material-moment-adapter": "^14.2.7", - "@angular/platform-browser": "^14.2.10", - "@angular/platform-browser-dynamic": "^14.2.10", - "@angular/router": "^14.2.10", + "@angular/animations": "^15.0.3", + "@angular/cdk": "^15.0.2", + "@angular/common": "^15.0.3", + "@angular/compiler": "^15.0.3", + "@angular/core": "^15.0.3", + "@angular/forms": "^15.0.3", + "@angular/material": "^15.0.2", + "@angular/material-moment-adapter": "^15.0.2", + "@angular/platform-browser": "^15.0.3", + "@angular/platform-browser-dynamic": "^15.0.3", + "@angular/router": "^15.0.3", "@ngx-loading-bar/core": "^6.0.2", "@ngx-loading-bar/http-client": "^6.0.2", "@ngx-loading-bar/router": "^6.0.2", "@types/mousetrap": "1.6.11", "angular2-hotkeys": "^13.1.0", - "mathjs": "^11.3.3", + "mathjs": "^11.5.0", "moment": "^2.29.4", "rxjs": "^6.6.7", "tslib": "^2.1.0", "zone.js": "~0.11.4" }, "devDependencies": { - "@angular-devkit/build-angular": "^14.2.9", - "@angular-eslint/builder": "^14.2.0", - "@angular-eslint/eslint-plugin": "^14.2.0", - "@angular-eslint/eslint-plugin-template": "^14.2.0", - "@angular-eslint/schematics": "^14.2.0", - "@angular-eslint/template-parser": "^14.2.0", - "@angular/cli": "^14.2.9", - "@angular/compiler-cli": "^14.2.10", - "@angular/language-service": "^14.2.10", + "@angular-devkit/build-angular": "^15.0.3", + "@angular-eslint/builder": "^15.1.0", + "@angular-eslint/eslint-plugin": "^15.1.0", + "@angular-eslint/eslint-plugin-template": "^15.1.0", + "@angular-eslint/schematics": "^15.1.0", + "@angular-eslint/template-parser": "^15.1.0", + "@angular/cli": "^15.0.3", + "@angular/compiler-cli": "^15.0.3", + "@angular/language-service": "^15.0.3", "@types/jasmine": "~4.3.0", - "@types/node": "^18.11.9", - "@typescript-eslint/eslint-plugin": "^5.43.0", - "@typescript-eslint/parser": "^5.43.0", + "@types/node": "^18.11.13", + "@typescript-eslint/eslint-plugin": "^5.46.0", + "@typescript-eslint/parser": "^5.46.0", "autoprefixer": "^10.4.13", - "eslint": "^8.26.0", + "eslint": "^8.28.0", "eslint-plugin-import": "2.26.0", "eslint-plugin-unused-imports": "^2.0.0", "husky": "^8.0.2", @@ -62,13 +62,13 @@ "karma-coverage": "~2.2.0", "karma-jasmine": "~5.1.0", "karma-jasmine-html-reporter": "^2.0.0", - "lint-staged": "^13.0.3", + "lint-staged": "^13.1.0", "postcss": "^8.4.19", - "prettier": "^2.7.1", + "prettier": "^2.8.1", "standard-version": "^9.5.0", "tailwindcss": "^3.2.4", "ts-node": "^9.1.1", - "typescript": "~4.6.4" + "typescript": "~4.8.4" }, "husky": { "hooks": { diff --git a/overlord/src/app/account/account-detail/account-detail.component.html b/overlord/src/app/account/account-detail/account-detail.component.html index 5bbceba5..e5f01ef3 100644 --- a/overlord/src/app/account/account-detail/account-detail.component.html +++ b/overlord/src/app/account/account-detail/account-detail.component.html @@ -1,5 +1,5 @@ -
- + + Account - -
-
- - Code - - -
-
- - Name - - -
-
- - Account Type - - - {{ at.name }} - - - -
-
- Is Active? - Is Reconcilable? -
-
- - Cost Centre - - - {{ cs.name }} - - - -
-
- - - - - - -
+ + +
+
+ + Code + + +
+
+ + Name + + +
+
+ + Account Type + + + {{ at.name }} + + + +
+
+ Is Active? + Is Reconcilable? +
+
+ + Cost Centre + + + {{ cs.name }} + + + +
+
+ + + + + + diff --git a/overlord/src/app/account/account-list/account-list.component.html b/overlord/src/app/account/account-list/account-list.component.html index 15d10fcd..37941e65 100644 --- a/overlord/src/app/account/account-list/account-list.component.html +++ b/overlord/src/app/account/account-list/account-list.component.html @@ -1,11 +1,13 @@ - - Accounts - - add_box - Add - - + + + Accounts + + add_box + Add + + +
diff --git a/overlord/src/app/app-routing.module.ts b/overlord/src/app/app-routing.module.ts index 07d14deb..b7974021 100644 --- a/overlord/src/app/app-routing.module.ts +++ b/overlord/src/app/app-routing.module.ts @@ -204,7 +204,6 @@ const appRoutes: Routes = [ CommonModule, RouterModule.forRoot(appRoutes, { onSameUrlNavigation: 'reload', - relativeLinkResolution: 'legacy', }), ], exports: [RouterModule], diff --git a/overlord/src/app/attendance/attendance.component.html b/overlord/src/app/attendance/attendance.component.html index f8a97237..c84dba75 100644 --- a/overlord/src/app/attendance/attendance.component.html +++ b/overlord/src/app/attendance/attendance.component.html @@ -1,7 +1,7 @@ - + Attendance - +
@@ -64,19 +64,21 @@ {{ row.prints }} new_releases - - + {{ row.hoursWorked }} - - + + diff --git a/overlord/src/app/auth/login/login.component.html b/overlord/src/app/auth/login/login.component.html index 4b38f366..7f46f892 100644 --- a/overlord/src/app/auth/login/login.component.html +++ b/overlord/src/app/auth/login/login.component.html @@ -1,4 +1,4 @@ - + Login diff --git a/overlord/src/app/balance-sheet/balance-sheet.component.html b/overlord/src/app/balance-sheet/balance-sheet.component.html index 7ecff59b..63bde7ab 100644 --- a/overlord/src/app/balance-sheet/balance-sheet.component.html +++ b/overlord/src/app/balance-sheet/balance-sheet.component.html @@ -1,7 +1,7 @@ - + Balance Sheet - +
@@ -39,10 +39,10 @@ Amount {{ - row.subAmount | currency: 'INR' | clear + row.subAmount | currency : 'INR' | clear }} {{ info.footer?.subAmount | currency: 'INR' | clear }} + >{{ info.footer?.subAmount | currency : 'INR' | clear }} @@ -50,10 +50,10 @@ Total {{ - row.amount | currency: 'INR' | clear + row.amount | currency : 'INR' | clear }} {{ info.footer?.amount | currency: 'INR' | clear }} + >{{ info.footer?.amount | currency : 'INR' | clear }} diff --git a/overlord/src/app/batch-integrity-report/batch-integrity-report.component.html b/overlord/src/app/batch-integrity-report/batch-integrity-report.component.html index 2695d74e..af3613d5 100644 --- a/overlord/src/app/batch-integrity-report/batch-integrity-report.component.html +++ b/overlord/src/app/batch-integrity-report/batch-integrity-report.component.html @@ -1,14 +1,14 @@ - - BatchReport - + + Batch Integrity + Batch - {{ row.product }} dated {{ row.date }} @ {{ row.price | currency: 'INR' }} is showing + {{ row.product }} dated {{ row.date }} @ {{ row.price | currency : 'INR' }} is showing {{ row.showing }} instead of {{ row.actual }} @@ -21,7 +21,7 @@
  • {{ detail.type }} on {{ detail.date }} of {{ detail.quantity }} @ - {{ detail.price | currency: 'INR' }} + {{ detail.price | currency : 'INR' }}
    • diff --git a/overlord/src/app/cash-flow/cash-flow.component.html b/overlord/src/app/cash-flow/cash-flow.component.html index 43d6757a..c7f74c86 100644 --- a/overlord/src/app/cash-flow/cash-flow.component.html +++ b/overlord/src/app/cash-flow/cash-flow.component.html @@ -1,7 +1,7 @@ - + Cash Flow - +
    @@ -51,7 +51,7 @@ Amount {{ - row.amount | currency: 'INR' | clear + row.amount | currency : 'INR' | clear }} diff --git a/overlord/src/app/client/client-detail/client-detail.component.html b/overlord/src/app/client/client-detail/client-detail.component.html index b451ee98..fb8acd3f 100644 --- a/overlord/src/app/client/client-detail/client-detail.component.html +++ b/overlord/src/app/client/client-detail/client-detail.component.html @@ -1,5 +1,5 @@
    - + Client diff --git a/overlord/src/app/client/client-list/client-list.component.html b/overlord/src/app/client/client-list/client-list.component.html index 0520e244..f0faef81 100644 --- a/overlord/src/app/client/client-list/client-list.component.html +++ b/overlord/src/app/client/client-list/client-list.component.html @@ -1,4 +1,4 @@ - + Clients diff --git a/overlord/src/app/closing-stock/closing-stock.component.html b/overlord/src/app/closing-stock/closing-stock.component.html index 57e5470f..44771adb 100644 --- a/overlord/src/app/closing-stock/closing-stock.component.html +++ b/overlord/src/app/closing-stock/closing-stock.component.html @@ -1,10 +1,12 @@ - - Closing Stock - - + + + Closing Stock + + +
    @@ -57,7 +59,7 @@ >Closing Stock {{ - row.quantity | number: '0.2-2' + row.quantity | number : '0.2-2' }} @@ -65,7 +67,7 @@ Physical Stock - + Physical Variance {{ - row.quantity - row.physical | number: '0.2-2' + row.quantity - row.physical | number : '0.2-2' }} @@ -90,7 +92,7 @@ Department - + Department Amount {{ - row.amount | currency: 'INR' + row.amount | currency : 'INR' }} diff --git a/overlord/src/app/core/nav-bar/nav-bar.component.html b/overlord/src/app/core/nav-bar/nav-bar.component.html index 78116a21..73f3be95 100644 --- a/overlord/src/app/core/nav-bar/nav-bar.component.html +++ b/overlord/src/app/core/nav-bar/nav-bar.component.html @@ -1,5 +1,5 @@ - HnG / TGB + HnG / TGB Journal Purchase diff --git a/overlord/src/app/cost-centre/cost-centre-detail/cost-centre-detail.component.html b/overlord/src/app/cost-centre/cost-centre-detail/cost-centre-detail.component.html index 944651c9..899a7288 100644 --- a/overlord/src/app/cost-centre/cost-centre-detail/cost-centre-detail.component.html +++ b/overlord/src/app/cost-centre/cost-centre-detail/cost-centre-detail.component.html @@ -1,26 +1,24 @@ -
    - - - Cost Center - - - -
    - - Name - - -
    - -     - - - -     -
    + + + Cost Center + + +
    +
    + + Name + + +
    +
    +     + + + +     diff --git a/overlord/src/app/cost-centre/cost-centre-list/cost-centre-list.component.html b/overlord/src/app/cost-centre/cost-centre-list/cost-centre-list.component.html index 9c4c0be3..6b9e517c 100644 --- a/overlord/src/app/cost-centre/cost-centre-list/cost-centre-list.component.html +++ b/overlord/src/app/cost-centre/cost-centre-list/cost-centre-list.component.html @@ -1,11 +1,13 @@ - - Cost Centers - - add_box - Add - - + + + Cost Centers + + add_box + Add + + + diff --git a/overlord/src/app/daybook/daybook.component.html b/overlord/src/app/daybook/daybook.component.html index eedbd0a8..e42cc990 100644 --- a/overlord/src/app/daybook/daybook.component.html +++ b/overlord/src/app/daybook/daybook.component.html @@ -1,7 +1,7 @@ - + Daybook - +
    @@ -29,7 +29,7 @@ -
    @@ -65,7 +65,7 @@ Amount {{ - row.debitAmount | currency: 'INR' + row.debitAmount | currency : 'INR' }} @@ -79,7 +79,7 @@ Amount {{ - row.creditAmount | currency: 'INR' + row.creditAmount | currency : 'INR' }} diff --git a/overlord/src/app/employee-attendance/employee-attendance.component.html b/overlord/src/app/employee-attendance/employee-attendance.component.html index a7ac2e44..056fb590 100644 --- a/overlord/src/app/employee-attendance/employee-attendance.component.html +++ b/overlord/src/app/employee-attendance/employee-attendance.component.html @@ -1,7 +1,7 @@ - + Employee Attendance - +
    @@ -52,7 +52,7 @@ }} -
    @@ -81,19 +81,21 @@ {{ row.prints }} new_releases - - + {{ row.hoursWorked }} - - + + diff --git a/overlord/src/app/employee-benefits/employee-benefits.component.html b/overlord/src/app/employee-benefits/employee-benefits.component.html index 6d279260..d77ad4b5 100644 --- a/overlord/src/app/employee-benefits/employee-benefits.component.html +++ b/overlord/src/app/employee-benefits/employee-benefits.component.html @@ -1,7 +1,7 @@ - + Employee Benefits - +
    @@ -91,7 +91,7 @@ GrossSalary {{ - row.grossSalary | currency: 'INR' + row.grossSalary | currency : 'INR' }} @@ -99,7 +99,7 @@ DaysWorked {{ - row.daysWorked | number: '1.2-2' + row.daysWorked | number : '1.2-2' }} @@ -107,7 +107,7 @@ Esi EE {{ - row.esiEmployee | currency: 'INR' + row.esiEmployee | currency : 'INR' }} @@ -115,7 +115,7 @@ Pf EE {{ - row.pfEmployee | currency: 'INR' + row.pfEmployee | currency : 'INR' }} @@ -123,7 +123,7 @@ Esi ER {{ - row.esiEmployer | currency: 'INR' + row.esiEmployer | currency : 'INR' }} @@ -131,7 +131,7 @@ Pf ER {{ - row.pfEmployer | currency: 'INR' + row.pfEmployer | currency : 'INR' }} diff --git a/overlord/src/app/employee-functions/employee-functions.component.html b/overlord/src/app/employee-functions/employee-functions.component.html index 18780b6a..7ffbdc72 100644 --- a/overlord/src/app/employee-functions/employee-functions.component.html +++ b/overlord/src/app/employee-functions/employee-functions.component.html @@ -1,6 +1,6 @@ - +
    @@ -36,7 +36,7 @@ - + - + - - Employee - - {{ item.isStarred ? 'star' : 'star_border' }} - - + + + + Employee + + {{ item.isStarred ? 'star' : 'star_border' }} + + +
    diff --git a/overlord/src/app/employee/employee-list/employee-list.component.html b/overlord/src/app/employee/employee-list/employee-list.component.html index 3f3ec015..8e0f3121 100644 --- a/overlord/src/app/employee/employee-list/employee-list.component.html +++ b/overlord/src/app/employee/employee-list/employee-list.component.html @@ -1,14 +1,16 @@ - - Employees - - - add_box - Add - - + + + Employees + + + add_box + Add + + +
    @@ -51,13 +53,13 @@ Salary - {{ row.salary | currency: 'INR' }} + {{ row.salary | currency : 'INR' }} Points - {{ row.points | number: '1.2-2' }} + {{ row.points | number : '1.2-2' }} diff --git a/overlord/src/app/employee/employee.module.ts b/overlord/src/app/employee/employee.module.ts index bb7c1e8d..a073e0f3 100644 --- a/overlord/src/app/employee/employee.module.ts +++ b/overlord/src/app/employee/employee.module.ts @@ -6,12 +6,8 @@ import { MomentDateAdapter } from '@angular/material-moment-adapter'; import { MatButtonModule } from '@angular/material/button'; import { MatCardModule } from '@angular/material/card'; import { MatCheckboxModule } from '@angular/material/checkbox'; -import { - DateAdapter, - MAT_DATE_FORMATS, - MAT_DATE_LOCALE, - MatOptionModule, -} from '@angular/material/core'; +import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE } from '@angular/material/core'; +import { MatOptionModule } from '@angular/material/core'; import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatDialogModule } from '@angular/material/dialog'; import { MatIconModule } from '@angular/material/icon'; diff --git a/overlord/src/app/entries/entries.component.html b/overlord/src/app/entries/entries.component.html index fa74ca2b..d5998674 100644 --- a/overlord/src/app/entries/entries.component.html +++ b/overlord/src/app/entries/entries.component.html @@ -1,57 +1,57 @@ - + Entries - - -
    - - - - - - - - - - - -
    -
    - - Posted - Not Posted - All - - - Include Issue Entries - -
    - + +
    +
    + + + + + + + + + + + +
    +
    + + Posted + Not Posted + All + + + Include Issue Entries + +
    +
    @@ -96,7 +96,7 @@ Amount - {{ row.amount | currency: 'INR' }} + {{ row.amount | currency : 'INR' }} diff --git a/overlord/src/app/incentive/incentive.component.html b/overlord/src/app/incentive/incentive.component.html index 77dbd206..cfda2e25 100644 --- a/overlord/src/app/incentive/incentive.component.html +++ b/overlord/src/app/incentive/incentive.component.html @@ -1,7 +1,7 @@ - + Incentives - +
    @@ -19,9 +19,9 @@
    - Total Incentive: {{ voucher.incentive | number: '1.2-2' }} Total Points: - {{ totalPoints() | number: '1.2-2' }} Point Value: - {{ pointValue() | number: '1.2-2' }} + Total Incentive: {{ voucher.incentive | number : '1.2-2' }} Total Points: + {{ totalPoints() | number : '1.2-2' }} Point Value: + {{ pointValue() | number : '1.2-2' }}
    @@ -46,7 +46,7 @@ DaysWorked {{ - row.daysWorked | number: '1.2-2' + row.daysWorked | number : '1.2-2' }} @@ -54,14 +54,8 @@ Service Points - - - @@ -88,7 +76,7 @@ Amount {{ - amount(row) | currency: 'INR' + amount(row) | currency : 'INR' }} diff --git a/overlord/src/app/issue/issue-dialog.component.html b/overlord/src/app/issue/issue-dialog.component.html index c723bbe2..2e40acd4 100644 --- a/overlord/src/app/issue/issue-dialog.component.html +++ b/overlord/src/app/issue/issue-dialog.component.html @@ -37,6 +37,8 @@
    - - + +
    diff --git a/overlord/src/app/issue/issue.component.css b/overlord/src/app/issue/issue.component.css index d8e048eb..d92733c5 100644 --- a/overlord/src/app/issue/issue.component.css +++ b/overlord/src/app/issue/issue.component.css @@ -31,6 +31,8 @@ top: 0; } -mat-form-field.mat-form-field { - font-size: 1.25em; +.fill-remaining-space { + /* This fills the remaining space, by using flexbox. + Every toolbar row uses a flexbox row layout. */ + flex: 1 1 auto; } diff --git a/overlord/src/app/issue/issue.component.html b/overlord/src/app/issue/issue.component.html index ab5591be..556780c2 100644 --- a/overlord/src/app/issue/issue.component.html +++ b/overlord/src/app/issue/issue.component.html @@ -1,7 +1,7 @@ - + Issue - +
    @@ -75,12 +75,7 @@ /> -
    @@ -101,21 +96,21 @@ Quantity {{ - row.quantity | number: '1.2-2' + row.quantity | number : '1.2-2' }} Rate - {{ row.rate | currency: 'INR' }} + {{ row.rate | currency : 'INR' }} Amount {{ - row.amount | currency: 'INR' + row.amount | currency : 'INR' }} @@ -147,10 +142,10 @@
    - - + + + Created on {{ voucher.creationDate | localTime }} and Last Edited on  {{ voucher.lastEditDate | localTime }} by  {{ voucher.user.name }}. {{ voucher.poster ? 'Posted by ' + voucher.poster : '' }} + - - Created on {{ voucher.creationDate | localTime }} and Last Edited on - {{ voucher.lastEditDate | localTime }} by - {{ voucher.user.name }}. {{ voucher.poster ? 'Posted by ' + voucher.poster : '' }} - Other issues for the day @@ -187,7 +183,7 @@ Amount - {{ row.amount | currency: 'INR' }} + {{ row.amount | currency : 'INR' }} diff --git a/overlord/src/app/journal/journal-dialog.component.html b/overlord/src/app/journal/journal-dialog.component.html index af2a69e9..c0b0ff03 100644 --- a/overlord/src/app/journal/journal-dialog.component.html +++ b/overlord/src/app/journal/journal-dialog.component.html @@ -19,8 +19,8 @@ autocomplete="off" /> - Balance as on Date: {{ accBal.date | currency: 'INR' | accounting }} / - Final balance: {{ accBal.total | currency: 'INR' | accounting }} + Balance as on Date: {{ accBal.date | currency : 'INR' | accounting }} / + Final balance: {{ accBal.total | currency : 'INR' | accounting }}
    - - + +
    diff --git a/overlord/src/app/journal/journal.component.css b/overlord/src/app/journal/journal.component.css index 4447f07f..b3c8cb3b 100644 --- a/overlord/src/app/journal/journal.component.css +++ b/overlord/src/app/journal/journal.component.css @@ -31,10 +31,6 @@ top: 0; } -mat-form-field.mat-form-field { - font-size: 1.25em; -} - .gold { color: gold; } @@ -42,3 +38,8 @@ mat-form-field.mat-form-field { .pointer { cursor: pointer; } +.fill-remaining-space { + /* This fills the remaining space, by using flexbox. + Every toolbar row uses a flexbox row layout. */ + flex: 1 1 auto; +} diff --git a/overlord/src/app/journal/journal.component.html b/overlord/src/app/journal/journal.component.html index f78a0b16..0a13cbec 100644 --- a/overlord/src/app/journal/journal.component.html +++ b/overlord/src/app/journal/journal.component.html @@ -1,15 +1,17 @@ - - Journal - - {{ voucher.isStarred ? 'star' : 'star_border' }} - - + + + Journal + + {{ voucher.isStarred ? 'star' : 'star_border' }} + + +
    @@ -48,8 +50,8 @@ autocomplete="off" /> - Balance as on Date: {{ accBal.date | currency: 'INR' | accounting }} / - Final balance: {{ accBal.total | currency: 'INR' | accounting }} + Balance as on Date: {{ accBal.date | currency : 'INR' | accounting }} / + Final balance: {{ accBal.total | currency : 'INR' | accounting }} Amount {{ - row.amount | currency: 'INR' + row.amount | currency : 'INR' }} @@ -154,7 +156,7 @@ - @@ -174,11 +177,12 @@ > Delete + + + Created on {{ voucher.creationDate | localTime }} and Last Edited on  {{ voucher.lastEditDate | localTime }} by  {{ voucher.user.name }}. {{ voucher.poster ? 'Posted by ' + voucher.poster : '' }} + - - Created on {{ voucher.creationDate | localTime }} and Last Edited on - {{ voucher.lastEditDate | localTime }} by - {{ voucher.user.name }}. {{ voucher.poster ? 'Posted by ' + voucher.poster : '' }} - diff --git a/overlord/src/app/ledger/ledger.component.html b/overlord/src/app/ledger/ledger.component.html index 9f636aac..fd0f511b 100644 --- a/overlord/src/app/ledger/ledger.component.html +++ b/overlord/src/app/ledger/ledger.component.html @@ -1,10 +1,12 @@ - - Ledger - - + + + Ledger + + +
    @@ -55,7 +57,7 @@ }} -
    @@ -95,10 +97,10 @@ Debit {{ - row.debit | currency: 'INR' | clear + row.debit | currency : 'INR' | clear }} {{ - debit | currency: 'INR' + debit | currency : 'INR' }} @@ -106,10 +108,10 @@ Credit {{ - row.credit | currency: 'INR' | clear + row.credit | currency : 'INR' | clear }} {{ - credit | currency: 'INR' + credit | currency : 'INR' }} @@ -117,10 +119,10 @@ Running {{ - row.running | currency: 'INR' | accounting + row.running | currency : 'INR' | accounting }} {{ - running | currency: 'INR' | accounting + running | currency : 'INR' | accounting }} diff --git a/overlord/src/app/net-transactions/net-transactions.component.html b/overlord/src/app/net-transactions/net-transactions.component.html index 1131eb55..890ab1f9 100644 --- a/overlord/src/app/net-transactions/net-transactions.component.html +++ b/overlord/src/app/net-transactions/net-transactions.component.html @@ -1,7 +1,7 @@ - + Net Transactions - +
    @@ -29,7 +29,7 @@ -
    @@ -51,7 +51,7 @@ Debit {{ - row.debit | currency: 'INR' | accounting + row.debit | currency : 'INR' | accounting }} @@ -59,7 +59,7 @@ Credit {{ - row.credit | currency: 'INR' | accounting + row.credit | currency : 'INR' | accounting }} diff --git a/overlord/src/app/non-contact-purchase/non-contract-purchase.component.html b/overlord/src/app/non-contact-purchase/non-contract-purchase.component.html index 2799cedd..6409198c 100644 --- a/overlord/src/app/non-contact-purchase/non-contract-purchase.component.html +++ b/overlord/src/app/non-contact-purchase/non-contract-purchase.component.html @@ -1,7 +1,7 @@ - + Non Contract Purchases - + @@ -28,7 +28,7 @@ Contract {{ - row.contractPrice | currency: 'INR' + row.contractPrice | currency : 'INR' }} @@ -36,7 +36,7 @@ Purchase {{ - row.purchasePrice | currency: 'INR' + row.purchasePrice | currency : 'INR' }} diff --git a/overlord/src/app/payment/payment-dialog.component.html b/overlord/src/app/payment/payment-dialog.component.html index a87b2f5d..5d5280bf 100644 --- a/overlord/src/app/payment/payment-dialog.component.html +++ b/overlord/src/app/payment/payment-dialog.component.html @@ -13,8 +13,8 @@ autocomplete="off" /> - Balance as on Date: {{ accBal.date | currency: 'INR' | accounting }} / - Final balance: {{ accBal.total | currency: 'INR' | accounting }} + Balance as on Date: {{ accBal.date | currency : 'INR' | accounting }} / + Final balance: {{ accBal.total | currency : 'INR' | accounting }}
    - - + +
    diff --git a/overlord/src/app/payment/payment.component.css b/overlord/src/app/payment/payment.component.css index 4447f07f..b3c8cb3b 100644 --- a/overlord/src/app/payment/payment.component.css +++ b/overlord/src/app/payment/payment.component.css @@ -31,10 +31,6 @@ top: 0; } -mat-form-field.mat-form-field { - font-size: 1.25em; -} - .gold { color: gold; } @@ -42,3 +38,8 @@ mat-form-field.mat-form-field { .pointer { cursor: pointer; } +.fill-remaining-space { + /* This fills the remaining space, by using flexbox. + Every toolbar row uses a flexbox row layout. */ + flex: 1 1 auto; +} diff --git a/overlord/src/app/payment/payment.component.html b/overlord/src/app/payment/payment.component.html index 0461f1b4..470a006b 100644 --- a/overlord/src/app/payment/payment.component.html +++ b/overlord/src/app/payment/payment.component.html @@ -1,15 +1,17 @@ - - Payment - - {{ voucher.isStarred ? 'star' : 'star_border' }} - - + + + Payment + + {{ voucher.isStarred ? 'star' : 'star_border' }} + + +
    @@ -55,8 +57,8 @@ autocomplete="off" /> - Balance as on Date: {{ accBal.date | currency: 'INR' | accounting }} / - Final balance: {{ accBal.total | currency: 'INR' | accounting }} + Balance as on Date: {{ accBal.date | currency : 'INR' | accounting }} / + Final balance: {{ accBal.total | currency : 'INR' | accounting }} Amount {{ - row.amount | currency: 'INR' + row.amount | currency : 'INR' }} @@ -155,7 +157,7 @@ - @@ -175,11 +178,12 @@ > Delete + + + Created on {{ voucher.creationDate | localTime }} and Last Edited on  {{ voucher.lastEditDate | localTime }} by  {{ voucher.user.name }}. {{ voucher.poster ? 'Posted by ' + voucher.poster : '' }} + - - Created on {{ voucher.creationDate | localTime }} and Last Edited on - {{ voucher.lastEditDate | localTime }} by - {{ voucher.user.name }}. {{ voucher.poster ? 'Posted by ' + voucher.poster : '' }} - diff --git a/overlord/src/app/period/period-detail/period-detail.component.html b/overlord/src/app/period/period-detail/period-detail.component.html index 1bbcb52c..9c107ea5 100644 --- a/overlord/src/app/period/period-detail/period-detail.component.html +++ b/overlord/src/app/period/period-detail/period-detail.component.html @@ -1,7 +1,7 @@ - - + + Period - +
    @@ -33,7 +33,7 @@ - + diff --git a/overlord/src/app/period/period-list/period-list.component.html b/overlord/src/app/period/period-list/period-list.component.html index bb0e027d..71019c48 100644 --- a/overlord/src/app/period/period-list/period-list.component.html +++ b/overlord/src/app/period/period-list/period-list.component.html @@ -1,11 +1,13 @@ - - Periods - - add_box - Add - - + + + Periods + + add_box + Add + + + diff --git a/overlord/src/app/period/period.module.ts b/overlord/src/app/period/period.module.ts index 1a3bf0a0..3ace72b3 100644 --- a/overlord/src/app/period/period.module.ts +++ b/overlord/src/app/period/period.module.ts @@ -6,12 +6,8 @@ import { MomentDateAdapter } from '@angular/material-moment-adapter'; import { MatButtonModule } from '@angular/material/button'; import { MatCardModule } from '@angular/material/card'; import { MatCheckboxModule } from '@angular/material/checkbox'; -import { - DateAdapter, - MAT_DATE_FORMATS, - MAT_DATE_LOCALE, - MatOptionModule, -} from '@angular/material/core'; +import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE } from '@angular/material/core'; +import { MatOptionModule } from '@angular/material/core'; import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatDialogModule } from '@angular/material/dialog'; import { MatIconModule } from '@angular/material/icon'; diff --git a/overlord/src/app/product-group/product-group-detail/product-group-detail.component.html b/overlord/src/app/product-group/product-group-detail/product-group-detail.component.html index 1769e485..305a11bd 100644 --- a/overlord/src/app/product-group/product-group-detail/product-group-detail.component.html +++ b/overlord/src/app/product-group/product-group-detail/product-group-detail.component.html @@ -1,26 +1,24 @@ -
    - - - Product Group - - -
    -
    - - Name - - -
    -
    -     - - - -     -
    + + + Product Group + + +
    +
    + + Name + + +
    +
    +     + + + +     diff --git a/overlord/src/app/product-group/product-group-list/product-group-list.component.html b/overlord/src/app/product-group/product-group-list/product-group-list.component.html index a4da4758..cef08b4e 100644 --- a/overlord/src/app/product-group/product-group-list/product-group-list.component.html +++ b/overlord/src/app/product-group/product-group-list/product-group-list.component.html @@ -1,11 +1,13 @@ - - Product Groups - - add_box - Add - - + + + Product Groups + + add_box + Add + + + diff --git a/overlord/src/app/product-ledger/product-ledger.component.html b/overlord/src/app/product-ledger/product-ledger.component.html index 8149717b..f02196db 100644 --- a/overlord/src/app/product-ledger/product-ledger.component.html +++ b/overlord/src/app/product-ledger/product-ledger.component.html @@ -1,10 +1,12 @@ - - Product Ledger - - + + + Product Ledger + + +
    @@ -55,7 +57,7 @@ }} -
    @@ -97,10 +99,10 @@ >Debit Quantity {{ row.debitQuantity | number: '1.2-2' }} {{ row.debitUnit }}{{ row.debitQuantity | number : '1.2-2' }} {{ row.debitUnit }} {{ - debitQuantity | number: '1.2-2' + debitQuantity | number : '1.2-2' }} @@ -108,10 +110,10 @@ Amount {{ - row.debitAmount | currency: 'INR' + row.debitAmount | currency : 'INR' }} {{ - debitAmount | currency: 'INR' + debitAmount | currency : 'INR' }} @@ -119,10 +121,10 @@ Credit {{ row.creditQuantity | number: '1.2-2' }} {{ row.creditUnit }}{{ row.creditQuantity | number : '1.2-2' }} {{ row.creditUnit }} {{ - creditQuantity | number: '1.2-2' + creditQuantity | number : '1.2-2' }} @@ -130,10 +132,10 @@ Credit {{ - row.creditAmount | currency: 'INR' + row.creditAmount | currency : 'INR' }} {{ - creditAmount | currency: 'INR' + creditAmount | currency : 'INR' }} @@ -141,10 +143,10 @@ Running {{ - row.runningQuantity | number: '1.2-2' + row.runningQuantity | number : '1.2-2' }} {{ - runningQuantity | number: '1.2-2' + runningQuantity | number : '1.2-2' }} @@ -152,10 +154,10 @@ Running {{ - row.runningAmount | currency: 'INR' + row.runningAmount | currency : 'INR' }} {{ - runningAmount | currency: 'INR' + runningAmount | currency : 'INR' }} diff --git a/overlord/src/app/product/product-detail/product-detail-dialog.component.html b/overlord/src/app/product/product-detail/product-detail-dialog.component.html index 388a3587..31a49cf8 100644 --- a/overlord/src/app/product/product-detail/product-detail-dialog.component.html +++ b/overlord/src/app/product/product-detail/product-detail-dialog.component.html @@ -1,4 +1,4 @@ -

    Edit Journal Entry

    +

    Edit Product SKU

    - - + +
    diff --git a/overlord/src/app/product/product-detail/product-detail.component.html b/overlord/src/app/product/product-detail/product-detail.component.html index c4a14c7a..46e721f3 100644 --- a/overlord/src/app/product/product-detail/product-detail.component.html +++ b/overlord/src/app/product/product-detail/product-detail.component.html @@ -1,135 +1,131 @@ -
    - - - Product - - - -
    - - Code - - -
    -
    - - Name - - - - Fraction Units - - -
    -
    - Is Purchased? - Is Sold? - Is Active? -
    -
    - - Product Type - - - {{ pg.name }} - - - -
    -

    Stock Keeping Units

    -
    + + Product + + + +
    + + Code + + +
    +
    + + Name + + + + Fraction Units + + +
    +
    + Is Purchased? - - Units - - - - Fraction - - - - Yield - - - - {{ item.isPurchased ? 'Purchase Price' : 'Cost Price' }} - - - - Sale Price - - -
    +
    + + Product Type + + + {{ pg.name }} + + + +
    +

    Stock Keeping Units

    +
    + + Units + + + + Fraction + + + + Yield + + + + {{ item.isPurchased ? 'Purchase Price' : 'Cost Price' }} + + + + Sale Price + + + +
    + + + + + Units + {{ row.units }} + + + + + Fraction + {{ row.fraction }} + + + + + Yield + {{ row.productYield }} + + + + + Cost Price + {{ + row.costPrice | currency : 'INR' + }} + + + + + Sale Price + {{ + row.salePrice | currency : 'INR' + }} + + + + + Action + + -
    - - - - - Units - {{ row.units }} - + + + - - - Fraction - {{ row.fraction }} - - - - - Yield - {{ row.productYield }} - - - - - Cost Price - {{ - row.costPrice | currency: 'INR' - }} - - - - - Sale Price - {{ - row.salePrice | currency: 'INR' - }} - - - - - Action - - - - - - - - - -     - - - - -     -
    + + + + + + + + + diff --git a/overlord/src/app/product/product-list/product-list.component.html b/overlord/src/app/product/product-list/product-list.component.html index a8f17bcf..c3902078 100644 --- a/overlord/src/app/product/product-list/product-list.component.html +++ b/overlord/src/app/product/product-list/product-list.component.html @@ -1,14 +1,16 @@ - - Products - - - add_box - Add - - + + + Products + + + add_box + Add + + +
    @@ -47,7 +49,7 @@
    • - {{ sku.costPrice | currency: 'INR' }} + {{ sku.costPrice | currency : 'INR' }}
    @@ -59,7 +61,7 @@
    • - {{ sku.productYield | percent: '1.2-2' }} + {{ sku.productYield | percent : '1.2-2' }}
    diff --git a/overlord/src/app/profit-loss/profit-loss.component.html b/overlord/src/app/profit-loss/profit-loss.component.html index 4ded72e7..3bcc6c7b 100644 --- a/overlord/src/app/profit-loss/profit-loss.component.html +++ b/overlord/src/app/profit-loss/profit-loss.component.html @@ -1,7 +1,7 @@ - + Profit & Loss - +
    @@ -29,7 +29,7 @@ -
    @@ -52,18 +52,18 @@ Amount - {{ row.amount | currency: 'INR' }} + {{ row.amount | currency : 'INR' }} - {{ info.footer.amount | currency: 'INR' }} + {{ info.footer.amount | currency : 'INR' }} Total - {{ row.total | currency: 'INR' }} + {{ row.total | currency : 'INR' }} - {{ info.footer.total | currency: 'INR' }} + {{ info.footer.total | currency : 'INR' }} diff --git a/overlord/src/app/purchase-entries/purchase-entries.component.html b/overlord/src/app/purchase-entries/purchase-entries.component.html index 90858616..911981ca 100644 --- a/overlord/src/app/purchase-entries/purchase-entries.component.html +++ b/overlord/src/app/purchase-entries/purchase-entries.component.html @@ -1,7 +1,7 @@ - + Purchase Entries - +
    @@ -29,7 +29,7 @@ -
    @@ -59,34 +59,34 @@ Quantity {{ - row.quantity | number: '1.2-2' + row.quantity | number : '1.2-2' }} Rate - {{ row.rate | currency: 'INR' }} + {{ row.rate | currency : 'INR' }} Tax - {{ row.tax | percent: '1.2-2' }} + {{ row.tax | percent : '1.2-2' }} Discount {{ - row.discount | percent: '1.2-2' + row.discount | percent : '1.2-2' }} Amount - {{ row.amount | currency: 'INR' }} + {{ row.amount | currency : 'INR' }} diff --git a/overlord/src/app/purchase-return/purchase-return-dialog.component.html b/overlord/src/app/purchase-return/purchase-return-dialog.component.html index 8943c565..ef992a09 100644 --- a/overlord/src/app/purchase-return/purchase-return-dialog.component.html +++ b/overlord/src/app/purchase-return/purchase-return-dialog.component.html @@ -1,4 +1,4 @@ -

    Edit PurchaseReturn Entry

    +

    Edit Purchase Return Entry

    @@ -37,6 +37,8 @@
    - - + +
    diff --git a/overlord/src/app/purchase-return/purchase-return.component.css b/overlord/src/app/purchase-return/purchase-return.component.css index 4447f07f..b3c8cb3b 100644 --- a/overlord/src/app/purchase-return/purchase-return.component.css +++ b/overlord/src/app/purchase-return/purchase-return.component.css @@ -31,10 +31,6 @@ top: 0; } -mat-form-field.mat-form-field { - font-size: 1.25em; -} - .gold { color: gold; } @@ -42,3 +38,8 @@ mat-form-field.mat-form-field { .pointer { cursor: pointer; } +.fill-remaining-space { + /* This fills the remaining space, by using flexbox. + Every toolbar row uses a flexbox row layout. */ + flex: 1 1 auto; +} diff --git a/overlord/src/app/purchase-return/purchase-return.component.html b/overlord/src/app/purchase-return/purchase-return.component.html index 12d44060..0dc275fe 100644 --- a/overlord/src/app/purchase-return/purchase-return.component.html +++ b/overlord/src/app/purchase-return/purchase-return.component.html @@ -1,15 +1,17 @@ - - Purchase Return - - {{ voucher.isStarred ? 'star' : 'star_border' }} - - + + + Purchase Return + + {{ voucher.isStarred ? 'star' : 'star_border' }} + + +
    @@ -37,8 +39,8 @@ autocomplete="off" /> - Balance as on Date: {{ accBal.date | currency: 'INR' | accounting }} / - Final balance: {{ accBal.total | currency: 'INR' | accounting }} + Balance as on Date: {{ accBal.date | currency : 'INR' | accounting }} / + Final balance: {{ accBal.total | currency : 'INR' | accounting }} Quantity {{ - row.quantity | number: '1.2-2' + row.quantity | number : '1.2-2' }} Rate - {{ row.rate | currency: 'INR' }} + {{ row.rate | currency : 'INR' }} Tax - {{ row.tax | percent: '1.2-2' }} + {{ row.tax | percent : '1.2-2' }} Discount {{ - row.discount | percent: '1.2-2' + row.discount | percent : '1.2-2' }} @@ -137,7 +139,7 @@ Amount {{ - row.amount | currency: 'INR' + row.amount | currency : 'INR' }} @@ -196,7 +198,7 @@ - @@ -216,11 +219,12 @@ > Delete + + + Created on {{ voucher.creationDate | localTime }} and Last Edited on  {{ voucher.lastEditDate | localTime }} by  {{ voucher.user.name }}. {{ voucher.poster ? 'Posted by ' + voucher.poster : '' }} + - - Created on {{ voucher.creationDate | localTime }} and Last Edited on - {{ voucher.lastEditDate | localTime }} by - {{ voucher.user.name }}. {{ voucher.poster ? 'Posted by ' + voucher.poster : '' }} - diff --git a/overlord/src/app/purchase/purchase-dialog.component.html b/overlord/src/app/purchase/purchase-dialog.component.html index a95eccc0..3a6c2172 100644 --- a/overlord/src/app/purchase/purchase-dialog.component.html +++ b/overlord/src/app/purchase/purchase-dialog.component.html @@ -61,6 +61,8 @@
    - - + +
    diff --git a/overlord/src/app/purchase/purchase.component.css b/overlord/src/app/purchase/purchase.component.css index 4447f07f..ddcb474c 100644 --- a/overlord/src/app/purchase/purchase.component.css +++ b/overlord/src/app/purchase/purchase.component.css @@ -31,10 +31,6 @@ top: 0; } -mat-form-field.mat-form-field { - font-size: 1.25em; -} - .gold { color: gold; } @@ -42,3 +38,9 @@ mat-form-field.mat-form-field { .pointer { cursor: pointer; } + +.fill-remaining-space { + /* This fills the remaining space, by using flexbox. + Every toolbar row uses a flexbox row layout. */ + flex: 1 1 auto; +} diff --git a/overlord/src/app/purchase/purchase.component.html b/overlord/src/app/purchase/purchase.component.html index 17cf830b..a0871af8 100644 --- a/overlord/src/app/purchase/purchase.component.html +++ b/overlord/src/app/purchase/purchase.component.html @@ -1,15 +1,17 @@ - - Purchase - - {{ voucher.isStarred ? 'star' : 'star_border' }} - - + + + Purchase + + {{ voucher.isStarred ? 'star' : 'star_border' }} + + +
    @@ -37,8 +39,8 @@ autocomplete="off" /> - Balance as on Date: {{ accBal.date | currency: 'INR' | accounting }} / - Final balance: {{ accBal.total | currency: 'INR' | accounting }} + Balance as on Date: {{ accBal.date | currency : 'INR' | accounting }} / + Final balance: {{ accBal.total | currency : 'INR' | accounting }} Quantity {{ - row.quantity | number: '1.2-2' + row.quantity | number : '1.2-2' }} Rate - {{ row.rate | currency: 'INR' }} + {{ row.rate | currency : 'INR' }} Tax - {{ row.tax | percent: '1.2-2' }} + {{ row.tax | percent : '1.2-2' }} Discount {{ - row.discount | percent: '1.2-2' + row.discount | percent : '1.2-2' }} @@ -161,7 +163,7 @@ Amount {{ - row.amount | currency: 'INR' + row.amount | currency : 'INR' }} @@ -220,7 +222,7 @@ - @@ -240,11 +243,12 @@ > Delete + + + Created on {{ voucher.creationDate | localTime }} and Last Edited on  {{ voucher.lastEditDate | localTime }} by  {{ voucher.user.name }}. {{ voucher.poster ? 'Posted by ' + voucher.poster : '' }} + - - Created on {{ voucher.creationDate | localTime }} and Last Edited on - {{ voucher.lastEditDate | localTime }} by - {{ voucher.user.name }}. {{ voucher.poster ? 'Posted by ' + voucher.poster : '' }} - diff --git a/overlord/src/app/purchases/purchases.component.html b/overlord/src/app/purchases/purchases.component.html index 0074ba09..821a4c53 100644 --- a/overlord/src/app/purchases/purchases.component.html +++ b/overlord/src/app/purchases/purchases.component.html @@ -1,7 +1,7 @@ - + Purchases - +
    @@ -29,7 +29,7 @@ -
    @@ -54,28 +54,28 @@ Quantity {{ - row.quantity | number: '1.2-2' + row.quantity | number : '1.2-2' }} - {{ info.footer.quantity | number: '1.2-2' }} + {{ info.footer.quantity | number : '1.2-2' }} Rate - {{ row.rate | currency: 'INR' }} + {{ row.rate | currency : 'INR' }} - {{ info.footer.rate | currency: 'INR' }} + {{ info.footer.rate | currency : 'INR' }} Amount - {{ row.amount | currency: 'INR' }} + {{ row.amount | currency : 'INR' }} - {{ info.footer.amount | currency: 'INR' }} + {{ info.footer.amount | currency : 'INR' }} diff --git a/overlord/src/app/rate-contract/rate-contract-detail/rate-contract-detail.component.html b/overlord/src/app/rate-contract/rate-contract-detail/rate-contract-detail.component.html index fc3cd928..fb60119d 100644 --- a/overlord/src/app/rate-contract/rate-contract-detail/rate-contract-detail.component.html +++ b/overlord/src/app/rate-contract/rate-contract-detail/rate-contract-detail.component.html @@ -1,150 +1,148 @@ -
    - - - Rate Contract - - - -
    - - - - - - - - - {{ - account.name - }} - - -
    -
    - - - - - - - - - - -
    -
    - - - - {{ - product.name - }} - - - - Price - - - -
    - - - - Product - {{ row.sku.name }} - - - - - Price - {{ - row.price | currency: 'INR' - }} - - - - - Action - - - - - - - - - - Narration - + [matDatepicker]="date" + placeholder="Date" + formControlName="date" + autocomplete="off" + #dateElement + /> + + - -     - - - - -     -
    + + + + {{ + account.name + }} + + +
    +
    + + + + + + + + + + +
    +
    + + + + {{ + product.name + }} + + + + Price + + + +
    + + + + Product + {{ row.sku.name }} + + + + + Price + {{ + row.price | currency : 'INR' + }} + + + + + Action + + + + + + + + + + Narration + + + +     + + + + +     diff --git a/overlord/src/app/rate-contract/rate-contract-detail/rate-contract-detail.component.ts b/overlord/src/app/rate-contract/rate-contract-detail/rate-contract-detail.component.ts index 8ad7d138..e0cb82ea 100644 --- a/overlord/src/app/rate-contract/rate-contract-detail/rate-contract-detail.component.ts +++ b/overlord/src/app/rate-contract/rate-contract-detail/rate-contract-detail.component.ts @@ -100,7 +100,7 @@ export class RateContractDetailComponent implements OnInit, AfterViewInit { date: moment(this.item.date, 'DD-MMM-YYYY').toDate(), validFrom: moment(this.item.validFrom, 'DD-MMM-YYYY').toDate(), validTill: moment(this.item.validTill, 'DD-MMM-YYYY').toDate(), - account: this.item.vendor.name, + account: this.item.vendor?.name ?? '', addRow: { product: '', price: '', diff --git a/overlord/src/app/rate-contract/rate-contract-list/rate-contract-list-datasource.ts b/overlord/src/app/rate-contract/rate-contract-list/rate-contract-list-datasource.ts index 7e29edf7..b3b45b12 100644 --- a/overlord/src/app/rate-contract/rate-contract-list/rate-contract-list-datasource.ts +++ b/overlord/src/app/rate-contract/rate-contract-list/rate-contract-list-datasource.ts @@ -65,7 +65,7 @@ export class RateContractListDatasource extends DataSource { const isAsc = sort.direction === 'asc'; switch (sort.active) { case 'vendor': - return compare(a.vendor.name, b.vendor.name, isAsc); + return compare(a.vendor?.name ?? '', b.vendor?.name ?? '', isAsc); default: return 0; } diff --git a/overlord/src/app/rate-contract/rate-contract-list/rate-contract-list.component.html b/overlord/src/app/rate-contract/rate-contract-list/rate-contract-list.component.html index 32d10cbf..24820371 100644 --- a/overlord/src/app/rate-contract/rate-contract-list/rate-contract-list.component.html +++ b/overlord/src/app/rate-contract/rate-contract-list/rate-contract-list.component.html @@ -1,11 +1,13 @@ - - Rate Contracts - - add_box - Add - - + + + Rate Contracts + + add_box + Add + + + @@ -30,7 +32,7 @@
    • - {{ item.sku.name }} @ {{ item.price | currency: 'INR' }} + {{ item.sku.name }} @ {{ item.price | currency : 'INR' }}
    diff --git a/overlord/src/app/rate-contract/rate-contract.ts b/overlord/src/app/rate-contract/rate-contract.ts index 3917adf5..a06ef54a 100644 --- a/overlord/src/app/rate-contract/rate-contract.ts +++ b/overlord/src/app/rate-contract/rate-contract.ts @@ -6,7 +6,7 @@ import { RateContractItem } from './rate-contract-item'; export class RateContract { id: string | undefined; date: string; - vendor: Account; + vendor: Account | undefined; validFrom: string; validTill: string; narration: string; @@ -17,7 +17,6 @@ export class RateContract { public constructor(init?: Partial) { this.date = ''; - this.vendor = new Account(); this.validFrom = ''; this.validTill = ''; this.narration = ''; diff --git a/overlord/src/app/raw-material-cost/raw-material-cost.component.html b/overlord/src/app/raw-material-cost/raw-material-cost.component.html index 1e9d93e6..9ae2acff 100644 --- a/overlord/src/app/raw-material-cost/raw-material-cost.component.html +++ b/overlord/src/app/raw-material-cost/raw-material-cost.component.html @@ -1,10 +1,12 @@ - - Raw Material Cost - - + + + Raw Material Cost + + +
    @@ -32,7 +34,7 @@ -
    @@ -57,27 +59,27 @@ Issue - {{ row.issue | currency: 'INR' }} + {{ row.issue | currency : 'INR' }} {{ - info.footer?.issue | currency: 'INR' + info.footer?.issue | currency : 'INR' }} Sale - {{ row.sale | currency: 'INR' }} + {{ row.sale | currency : 'INR' }} {{ - info.footer?.sale | currency: 'INR' + info.footer?.sale | currency : 'INR' }} RMC - {{ row.rmc | percent: '1.2-2' }} + {{ row.rmc | percent : '1.2-2' }} {{ - info.footer?.rmc | percent: '1.2-2' + info.footer?.rmc | percent : '1.2-2' }} @@ -92,7 +94,7 @@ Quantity {{ - row.quantity | number: '1.2-2' + row.quantity | number : '1.2-2' }} @@ -100,14 +102,14 @@ Net - {{ row.net | currency: 'INR' }} + {{ row.net | currency : 'INR' }} Gross - {{ row.gross | currency: 'INR' }} + {{ row.gross | currency : 'INR' }} diff --git a/overlord/src/app/receipt/receipt-dialog.component.html b/overlord/src/app/receipt/receipt-dialog.component.html index dd1bda9b..add07540 100644 --- a/overlord/src/app/receipt/receipt-dialog.component.html +++ b/overlord/src/app/receipt/receipt-dialog.component.html @@ -13,8 +13,8 @@ autocomplete="off" /> - Balance as on Date: {{ accBal.date | currency: 'INR' | accounting }} / - Final balance: {{ accBal.total | currency: 'INR' | accounting }} + Balance as on Date: {{ accBal.date | currency : 'INR' | accounting }} / + Final balance: {{ accBal.total | currency : 'INR' | accounting }}
    - - + +
    diff --git a/overlord/src/app/receipt/receipt.component.css b/overlord/src/app/receipt/receipt.component.css index 4447f07f..b3c8cb3b 100644 --- a/overlord/src/app/receipt/receipt.component.css +++ b/overlord/src/app/receipt/receipt.component.css @@ -31,10 +31,6 @@ top: 0; } -mat-form-field.mat-form-field { - font-size: 1.25em; -} - .gold { color: gold; } @@ -42,3 +38,8 @@ mat-form-field.mat-form-field { .pointer { cursor: pointer; } +.fill-remaining-space { + /* This fills the remaining space, by using flexbox. + Every toolbar row uses a flexbox row layout. */ + flex: 1 1 auto; +} diff --git a/overlord/src/app/receipt/receipt.component.html b/overlord/src/app/receipt/receipt.component.html index 13e3582e..f6664201 100644 --- a/overlord/src/app/receipt/receipt.component.html +++ b/overlord/src/app/receipt/receipt.component.html @@ -1,15 +1,17 @@ - - Receipt - - {{ voucher.isStarred ? 'star' : 'star_border' }} - - + + + Receipt + + {{ voucher.isStarred ? 'star' : 'star_border' }} + + +
    @@ -55,8 +57,8 @@ autocomplete="off" /> - Balance as on Date: {{ accBal.date | currency: 'INR' | accounting }} / - Final balance: {{ accBal.total | currency: 'INR' | accounting }} + Balance as on Date: {{ accBal.date | currency : 'INR' | accounting }} / + Final balance: {{ accBal.total | currency : 'INR' | accounting }} Amount {{ - row.amount | currency: 'INR' + row.amount | currency : 'INR' }} @@ -155,7 +157,7 @@ - @@ -175,11 +178,12 @@ > Delete + + + Created on {{ voucher.creationDate | localTime }} and Last Edited on  {{ voucher.lastEditDate | localTime }} by  {{ voucher.user.name }}. {{ voucher.poster ? 'Posted by ' + voucher.poster : '' }} + - - Created on {{ voucher.creationDate | localTime }} and Last Edited on - {{ voucher.lastEditDate | localTime }} by - {{ voucher.user.name }}. {{ voucher.poster ? 'Posted by ' + voucher.poster : '' }} - diff --git a/overlord/src/app/recipe/recipe-detail/recipe-detail.component.html b/overlord/src/app/recipe/recipe-detail/recipe-detail.component.html index ed7d70e3..f5e0eee4 100644 --- a/overlord/src/app/recipe/recipe-detail/recipe-detail.component.html +++ b/overlord/src/app/recipe/recipe-detail/recipe-detail.component.html @@ -1,7 +1,7 @@ - + Recipe Detail - +
    @@ -141,21 +141,23 @@ Quantity {{ row.quantity | number: '1.2-2' }} {{ row.product.fractionUnits }}{{ row.quantity | number : '1.2-2' }} {{ row.product.fractionUnits }} Rate - {{ row.price | currency: 'INR' }} + {{ + row.price | currency : 'INR' + }} Amount {{ - row.quantity * row.price | currency: 'INR' + row.quantity * row.price | currency : 'INR' }} @@ -175,7 +177,7 @@ - diff --git a/overlord/src/app/recipe/recipe-list/recipe-list.component.html b/overlord/src/app/recipe/recipe-list/recipe-list.component.html index 0809734e..6e81dda7 100644 --- a/overlord/src/app/recipe/recipe-list/recipe-list.component.html +++ b/overlord/src/app/recipe/recipe-list/recipe-list.component.html @@ -1,11 +1,13 @@ - - Recipes - - add_box - Add - - + + + Recipes + + add_box + Add + + +
    @@ -43,20 +45,20 @@ Sale Price - {{ row.salePrice | currency: 'INR' }} + {{ row.salePrice | currency : 'INR' }} Cost Price - {{ row.costPrice | currency: 'INR' }} + {{ row.costPrice | currency : 'INR' }} Cost %age {{ - row.costPrice / row.salePrice | percent: '1.2-2' + row.costPrice / row.salePrice | percent : '1.2-2' }} diff --git a/overlord/src/app/role/role-detail/role-detail.component.html b/overlord/src/app/role/role-detail/role-detail.component.html index 46951b31..980da69a 100644 --- a/overlord/src/app/role/role-detail/role-detail.component.html +++ b/overlord/src/app/role/role-detail/role-detail.component.html @@ -1,5 +1,5 @@
    - + Role diff --git a/overlord/src/app/role/role-list/role-list.component.html b/overlord/src/app/role/role-list/role-list.component.html index ef770825..c3d5d803 100644 --- a/overlord/src/app/role/role-list/role-list.component.html +++ b/overlord/src/app/role/role-list/role-list.component.html @@ -1,4 +1,4 @@ - + Roles diff --git a/overlord/src/app/settings/settings.component.html b/overlord/src/app/settings/settings.component.html index 571aff34..65c8b153 100644 --- a/overlord/src/app/settings/settings.component.html +++ b/overlord/src/app/settings/settings.component.html @@ -1,6 +1,6 @@ - +
    @@ -190,7 +190,7 @@ - +
    @@ -221,7 +221,7 @@ - + Maintenance mode is ENABLED by user diff --git a/overlord/src/app/shared/confirm-dialog/confirm-dialog.component.html b/overlord/src/app/shared/confirm-dialog/confirm-dialog.component.html index 258eb0f4..62c5e7e8 100644 --- a/overlord/src/app/shared/confirm-dialog/confirm-dialog.component.html +++ b/overlord/src/app/shared/confirm-dialog/confirm-dialog.component.html @@ -3,6 +3,8 @@ {{ data.content }}
    - - + +
    diff --git a/overlord/src/app/stock-movement/stock-movement.component.html b/overlord/src/app/stock-movement/stock-movement.component.html index 6c1195c1..660f38f5 100644 --- a/overlord/src/app/stock-movement/stock-movement.component.html +++ b/overlord/src/app/stock-movement/stock-movement.component.html @@ -1,7 +1,7 @@ - + Stock Movement - +
    @@ -29,7 +29,7 @@ -
    @@ -57,27 +57,31 @@ Opening - {{ row.opening | number: '1.2-2' }} + {{ + row.opening | number : '1.2-2' + }} Purchase {{ - row.purchase | number: '1.2-2' + row.purchase | number : '1.2-2' }} Issue - {{ row.issue | number: '1.2-2' }} + {{ row.issue | number : '1.2-2' }} Closing - {{ row.closing | number: '1.2-2' }} + {{ + row.closing | number : '1.2-2' + }} diff --git a/overlord/src/app/trial-balance/trial-balance.component.html b/overlord/src/app/trial-balance/trial-balance.component.html index 2ee82fa5..6e2a01e8 100644 --- a/overlord/src/app/trial-balance/trial-balance.component.html +++ b/overlord/src/app/trial-balance/trial-balance.component.html @@ -1,7 +1,7 @@ - + Trial Balance - +
    @@ -37,7 +37,7 @@ Debit {{ - row.debit | currency: 'INR' | accounting + row.debit | currency : 'INR' | accounting }} @@ -45,7 +45,7 @@ Credit {{ - row.credit | currency: 'INR' | accounting + row.credit | currency : 'INR' | accounting }} diff --git a/overlord/src/app/user/user-detail/user-detail.component.html b/overlord/src/app/user/user-detail/user-detail.component.html index 29f525c3..98135233 100644 --- a/overlord/src/app/user/user-detail/user-detail.component.html +++ b/overlord/src/app/user/user-detail/user-detail.component.html @@ -1,5 +1,5 @@
    - + User diff --git a/overlord/src/app/user/user-list/user-list.component.html b/overlord/src/app/user/user-list/user-list.component.html index 7cdffd11..767f19dd 100644 --- a/overlord/src/app/user/user-list/user-list.component.html +++ b/overlord/src/app/user/user-list/user-list.component.html @@ -1,4 +1,4 @@ - + Users diff --git a/overlord/src/styles.css b/overlord/src/styles.css index a570b2ad..3767407a 100644 --- a/overlord/src/styles.css +++ b/overlord/src/styles.css @@ -3,11 +3,7 @@ @tailwind components; @tailwind utilities; -html, -body { - height: 100%; -} -body { - margin: 0; - font-family: Roboto, 'Helvetica Neue', sans-serif; -} +a { + color: rgb(0, 0, 238); + text-decoration: underline; +} \ No newline at end of file diff --git a/overlord/src/test.ts b/overlord/src/test.ts index 8e0cae8f..79ce8c50 100644 --- a/overlord/src/test.ts +++ b/overlord/src/test.ts @@ -7,22 +7,7 @@ import { platformBrowserDynamicTesting, } from '@angular/platform-browser-dynamic/testing'; -declare const require: { - context( - path: string, - deep?: boolean, - filter?: RegExp, - ): { - keys(): string[]; - (id: string): T; - }; -}; - // First, initialize the Angular testing environment. getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), { teardown: { destroyAfterEach: false } }); -// Then we find all the tests. -const context = require.context('./', true, /\.spec\.ts$/); -// And load the modules. -context.keys().map(context); diff --git a/overlord/tsconfig.json b/overlord/tsconfig.json index f7e542ee..87d46a3b 100644 --- a/overlord/tsconfig.json +++ b/overlord/tsconfig.json @@ -14,12 +14,13 @@ "experimentalDecorators": true, "moduleResolution": "node", "importHelpers": true, - "target": "es2020", + "target": "ES2022", "module": "es2020", "lib": [ "es2018", "dom" - ] + ], + "useDefineForClassFields": false }, "angularCompilerOptions": { "enableI18nLegacyMessageIdFormat": false,