tanshu/brewman
1
0 Fork 0
Code Issues Pull Requests Releases Activity

Chore: Removed @angular/flex-layout and replaced it with tailwind.

Browse Source 
Chore: Upgraded some packages
This commit is contained in:
tanshu committed 2022-12-11 07:50:45 +05:30
1 parent b9fbdd4b99
commit 4a85a9133e
104 files changed
+564 -975
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

brewman/.pre-commit-config.yaml
+1 -1
View File
@@ -6,7 +6,7 @@ repos:
hooks:
- id: black
- repo: https://gitlab.com/pycqa/flake8
- repo: https://github.com/PyCQA/flake8
rev: 5.0.4
hooks:
- id: flake8
brewman/brewman/routers/product.py
+3 -3
View File
@@ -233,9 +233,9 @@ async def show_term_sku(
@router.get("/q-product", response_model=List[ProductSku])
async def show_term_product(
q: str = None, # Query
a: bool = None, # Active
p: bool = None, # Is Purchased?
q: str | None = None, # Query
a: bool | None = None, # Active
p: bool | None = None, # Is Purchased?
current_user: UserToken = Depends(get_user),
) -> List[ProductSku]:
list_ = []
brewman/brewman/routers/recipe.py
+1 -1
View File
@@ -231,7 +231,7 @@ def get_sub_product_cost(product: Product, period_id: uuid.UUID, db: Session) ->
detail=f"Ingredient {product.name} is not bought and also does not have a recipe for the period.",
)
return round(recipe.cost_price / recipe.sku.fraction / recipe.sku.product_yield, 5) # type: ignore[no-any-return]
return round(recipe.cost_price / recipe.sku.fraction / recipe.sku.product_yield, 5)
@router.delete("/{id_}", response_model=None)
brewman/pyproject.toml
+5 -5
View File
@@ -5,27 +5,27 @@ description = "Accounting plus inventory management for a restaurant."
authors = ["tanshu <git@tanshu.com>"]
[tool.poetry.dependencies]
python = "^3.10"
python = "^3.11"
uvicorn = {extras = ["standard"], version = "^0.19.0"}
fastapi = "^0.85.1"
fastapi = "^0.87.0"
python-jose = {extras = ["cryptography"], version = "^3.3.0"}
passlib = {extras = ["bcrypt"], version = "^1.7.4"}
psycopg2-binary = "^2.9.5"
SQLAlchemy = {extras = ["mypy"], version = "^1.4.42"}
SQLAlchemy = {extras = ["mypy"], version = "^1.4.44"}
python-multipart = "^0.0.5"
PyJWT = "^2.6.0"
alembic = "^1.8.1"
itsdangerous = "^2.1.2"
python-dotenv = "^0.21.0"
pydantic = {extras = ["dotenv"], version = "^1.10.2"}
starlette = "^0.20.4"
starlette = "^0.21.0"
[tool.poetry.dev-dependencies]
flake8 = "^5.0.4"
black = "^22.10.0"
isort = {extras = ["toml"], version = "^5.10.1"}
pre-commit = "^2.20.0"
mypy = "^0.982"
mypy = "^0.991"
[build-system]
requires = ["poetry-core>=1.0.0"]
overlord/package.json
+30 -28
View File
@@ -14,47 +14,47 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^14.2.8",
"@angular/cdk": "^14.2.6",
"@angular/common": "^14.2.8",
"@angular/compiler": "^14.2.8",
"@angular/core": "^14.2.8",
"@angular/flex-layout": "^14.0.0-beta.41",
"@angular/forms": "^14.2.8",
"@angular/material": "^14.2.6",
"@angular/material-moment-adapter": "^14.2.6",
"@angular/platform-browser": "^14.2.8",
"@angular/platform-browser-dynamic": "^14.2.8",
"@angular/router": "^14.2.8",
"@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",
"@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.10",
"@types/mousetrap": "1.6.11",
"angular2-hotkeys": "^13.1.0",
"mathjs": "^11.3.2",
"mathjs": "^11.3.3",
"moment": "^2.29.4",
"rxjs": "^6.6.7",
"tslib": "^2.1.0",
"zone.js": "~0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "^14.2.7",
"@angular-eslint/builder": "^14.1.2",
"@angular-eslint/eslint-plugin": "^14.1.2",
"@angular-eslint/eslint-plugin-template": "^14.1.2",
"@angular-eslint/schematics": "^14.1.2",
"@angular-eslint/template-parser": "^14.1.2",
"@angular/cli": "^14.2.7",
"@angular/compiler-cli": "^14.2.8",
"@angular/language-service": "^14.2.8",
"@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",
"@types/jasmine": "~4.3.0",
"@types/node": "^18.11.8",
"@typescript-eslint/eslint-plugin": "^5.41.0",
"@typescript-eslint/parser": "^5.41.0",
"@types/node": "^18.11.9",
"@typescript-eslint/eslint-plugin": "^5.43.0",
"@typescript-eslint/parser": "^5.43.0",
"autoprefixer": "^10.4.13",
"eslint": "^8.26.0",
"eslint-plugin-import": "2.26.0",
"eslint-plugin-unused-imports": "^2.0.0",
"husky": "^8.0.1",
"husky": "^8.0.2",
"jasmine-core": "~4.5.0",
"jasmine-spec-reporter": "7.0.0",
"karma": "^6.4.1",
@@ -63,8 +63,10 @@
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "^2.0.0",
"lint-staged": "^13.0.3",
"postcss": "^8.4.19",
"prettier": "^2.7.1",
"standard-version": "^9.5.0",
"tailwindcss": "^3.2.4",
"ts-node": "^9.1.1",
"typescript": "~4.6.4"
},
@@ -81,4 +83,4 @@
"npx eslint --cache --fix"
]
}
}
}
overlord/src/app/account/account-detail/account-detail.component.html
+16 -44
View File
@@ -1,5 +1,5 @@
<div fxLayout="row" fxFlex="50%" fxLayoutAlign="space-around center" class="example-card">
<mat-card fxFlex>
<div class="flex flex-auto flex-row justify-around content-center items-center lg:max-w-[50%]">
<mat-card class="flex-auto">
<mat-card-title-group>
<mat-card-title>Account</mat-card-title>
<mat-icon
@@ -12,39 +12,21 @@
</mat-icon>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex>
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start">
<mat-form-field class="flex-auto">
<mat-label>Code</mat-label>
<input matInput placeholder="Code" formControlName="code" />
</mat-form-field>
</div>
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex>
<div class="flex flex-row justify-around content-start items-start">
<mat-form-field class="flex-auto">
<mat-label>Name</mat-label>
<input matInput #nameElement placeholder="Name" formControlName="name" />
</mat-form-field>
</div>
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex>
<div class="flex flex-row justify-around content-start items-start">
<mat-form-field class="flex-auto">
<mat-label>Account Type</mat-label>
<mat-select placeholder="Account Type" formControlName="type">
<mat-option *ngFor="let at of accountTypes" [value]="at.id">
@@ -53,24 +35,14 @@
</mat-select>
</mat-form-field>
</div>
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-checkbox formControlName="isActive">Is Active?</mat-checkbox>
<mat-checkbox formControlName="isReconcilable">Is Reconcilable?</mat-checkbox>
<div class="flex flex-row justify-around content-start items-start">
<mat-checkbox formControlName="isActive" class="flex-auto mr-5">Is Active?</mat-checkbox>
<mat-checkbox formControlName="isReconcilable" class="flex-auto"
>Is Reconcilable?</mat-checkbox
>
</div>
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex>
<div class="flex flex-row justify-around content-start items-start">
<mat-form-field class="flex-auto">
<mat-label>Cost Centre</mat-label>
<mat-select placeholder="Cost Centre" formControlName="costCentre">
<mat-option *ngFor="let cs of costCentres" [value]="cs.id">
overlord/src/app/account/account-list/account-list.component.html
+3 -9
View File
@@ -7,15 +7,9 @@
</a>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div
fxLayout="row"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
fxLayoutAlign="space-around start"
>
<mat-form-field fxFlex>
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start">
<mat-form-field class="flex-auto">
<input
type="text"
matInput
overlord/src/app/account/account.module.ts
-2
View File
@@ -1,7 +1,6 @@
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
@@ -23,7 +22,6 @@ import { AccountRoutingModule } from './account-routing.module';
imports: [
CommonModule,
CdkTableModule,
FlexLayoutModule,
MatTableModule,
MatPaginatorModule,
MatSortModule,
overlord/src/app/app.component.html
+1 -1
View File
@@ -1,5 +1,5 @@
<ngx-loading-bar></ngx-loading-bar>
<app-nav-bar></app-nav-bar>
<div fxLayout="column" fxLayoutAlign="center none" class="mat-app-background basic-container">
<div class="flex flex-col justify-center items-stretch mat-app-background basic-container">
<router-outlet></router-outlet>
</div>
overlord/src/app/app.module.ts
-2
View File
@@ -3,7 +3,6 @@ import { registerLocaleData } from '@angular/common';
import { HttpClientModule } from '@angular/common/http';
import enIN from '@angular/common/locales/en-IN';
import { LOCALE_ID, NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
@@ -39,7 +38,6 @@ registerLocaleData(enIN);
imports: [
BrowserModule,
BrowserAnimationsModule,
FlexLayoutModule.withConfig({ useColumnBasisZero: true }),
HotkeyModule.forRoot(),
HttpClientModule,
LayoutModule,
overlord/src/app/attendance/attendance.component.html
+7 -5
View File
@@ -3,9 +3,9 @@
<mat-card-title>Attendance</mat-card-title>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div fxLayout="row" fxLayout.lt-md="column" fxLayoutGap="20px" fxLayoutGap.lt-md="0px">
<mat-form-field fxFlex="80">
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-form-field class="flex-auto basis-4/5 mr-5">
<input
matInput
[matDatepicker]="date"
@@ -17,7 +17,9 @@
<mat-datepicker-toggle matSuffix [for]="date"></mat-datepicker-toggle>
<mat-datepicker #date></mat-datepicker>
</mat-form-field>
<button mat-raised-button color="primary" (click)="show()" fxFlex="20">Show</button>
<button mat-raised-button color="primary" (click)="show()" class="flex-auto basis-1/5">
Show
</button>
</div>
<mat-table #table [dataSource]="dataSource" formArrayName="attendances">
<!-- Code Column -->
@@ -47,7 +49,7 @@
<!-- Status Column -->
<ng-container matColumnDef="status">
<mat-header-cell *matHeaderCellDef>Status</mat-header-cell>
<mat-cell *matCellDef="let row; let i = index" [formGroupName]="i" fxFlex>
<mat-cell *matCellDef="let row; let i = index" [formGroupName]="i" class="flex-auto">
<mat-select formControlName="attendanceType" name="attendanceType">
<mat-option *ngFor="let at of attendanceTypes" [value]="at.id">
{{ at.name }}
overlord/src/app/attendance/attendance.module.ts
-2
View File
@@ -2,7 +2,6 @@ import { A11yModule } from '@angular/cdk/a11y';
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MomentDateAdapter } from '@angular/material-moment-adapter';
import { MatAutocompleteModule } from '@angular/material/autocomplete';
@@ -49,7 +48,6 @@ export const MY_FORMATS = {
A11yModule,
CommonModule,
CdkTableModule,
FlexLayoutModule,
MatAutocompleteModule,
MatButtonModule,
MatCardModule,
overlord/src/app/auth/login/login.component.html
+7 -13
View File
@@ -3,15 +3,15 @@
<mat-card-title>Login</mat-card-title>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div fxLayout="row" fxLayout.lt-md="column" fxLayoutGap="20px" fxLayoutGap.lt-md="0px">
<mat-form-field fxFlex>
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start">
<mat-form-field class="flex-auto">
<mat-label>Username</mat-label>
<input matInput #nameElement placeholder="Username" formControlName="username" />
</mat-form-field>
</div>
<div fxLayout="row" fxLayout.lt-md="column" fxLayoutGap="20px" fxLayoutGap.lt-md="0px">
<mat-form-field fxFlex>
<div class="flex flex-row justify-around content-start items-start">
<mat-form-field class="flex-auto">
<mat-label>Password</mat-label>
<input
matInput
@@ -27,14 +27,8 @@
</div>
<mat-divider></mat-divider>
<h2 *ngIf="showOtp">Client ID: {{ clientId }}</h2>
<div
fxLayout="row"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
*ngIf="showOtp"
>
<mat-form-field fxFlex>
<div class="flex flex-row justify-around content-start items-start" *ngIf="showOtp">
<mat-form-field class="flex-auto">
<mat-label>Otp</mat-label>
<input matInput placeholder="Otp" formControlName="otp" />
</mat-form-field>
overlord/src/app/balance-sheet/balance-sheet.component.html
+3 -9
View File
@@ -3,15 +3,9 @@
<mat-card-title>Balance Sheet</mat-card-title>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div
fxLayout="row"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
fxLayoutAlign="space-around start"
>
<mat-form-field fxFlex>
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-form-field class="flex-auto mr-5">
<input
matInput
[matDatepicker]="dateInput"
overlord/src/app/balance-sheet/balance-sheet.module.ts
-2
View File
@@ -1,7 +1,6 @@
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MomentDateAdapter } from '@angular/material-moment-adapter';
import { MatButtonModule } from '@angular/material/button';
@@ -42,7 +41,6 @@ export const MY_FORMATS = {
imports: [
CommonModule,
CdkTableModule,
FlexLayoutModule,
MatButtonModule,
MatCardModule,
MatCheckboxModule,
overlord/src/app/batch-integrity-report/batch-integrity-report.module.ts
-2
View File
@@ -2,7 +2,6 @@ import { A11yModule } from '@angular/cdk/a11y';
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MomentDateAdapter } from '@angular/material-moment-adapter';
import { MatButtonModule } from '@angular/material/button';
@@ -62,7 +61,6 @@ export const MY_FORMATS = {
MatExpansionModule,
MatDatepickerModule,
ReactiveFormsModule,
FlexLayoutModule,
],
declarations: [BatchIntegrityReportComponent],
providers: [
overlord/src/app/cash-flow/cash-flow.component.html
+7 -11
View File
@@ -3,15 +3,9 @@
<mat-card-title>Cash Flow</mat-card-title>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div
fxLayout="row"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
fxLayoutAlign="space-around start"
>
<mat-form-field fxFlex="40">
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-form-field class="flex-auto basis-2/5 mr-5">
<input
matInput
[matDatepicker]="startDate"
@@ -23,7 +17,7 @@
<mat-datepicker-toggle matSuffix [for]="startDate"></mat-datepicker-toggle>
<mat-datepicker #startDate></mat-datepicker>
</mat-form-field>
<mat-form-field fxFlex="40">
<mat-form-field class="flex-auto basis-2/5 mr-5">
<input
matInput
[matDatepicker]="finishDate"
@@ -35,7 +29,9 @@
<mat-datepicker-toggle matSuffix [for]="finishDate"></mat-datepicker-toggle>
<mat-datepicker #finishDate></mat-datepicker>
</mat-form-field>
<button mat-raised-button color="primary" (click)="show()" fxFlex="20">Show</button>
<button mat-raised-button color="primary" (click)="show()" class="flex-auto basis-1/5">
Show
</button>
</div>
</form>
<mat-table #table [dataSource]="dataSource" matSort aria-label="Elements">
overlord/src/app/cash-flow/cash-flow.module.ts
-2
View File
@@ -1,7 +1,6 @@
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MomentDateAdapter } from '@angular/material-moment-adapter';
import { MatButtonModule } from '@angular/material/button';
@@ -42,7 +41,6 @@ export const MY_FORMATS = {
imports: [
CommonModule,
CdkTableModule,
FlexLayoutModule,
MatButtonModule,
MatCardModule,
MatCheckboxModule,
overlord/src/app/client/client-detail/client-detail.component.css
-3
View File
@@ -1,3 +0,0 @@
.example-card {
max-width: 400px;
}
overlord/src/app/client/client-detail/client-detail.component.html
+11 -35
View File
@@ -1,51 +1,27 @@
<div fxLayout="row" fxFlex="50%" fxLayoutAlign="space-around center" class="example-card">
<mat-card fxFlex>
<div class="flex flex-auto flex-row justify-around content-center items-center lg:max-w-[50%]">
<mat-card class="flex-auto">
<mat-card-title-group>
<mat-card-title>Client</mat-card-title>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex>
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start">
<mat-form-field class="flex-auto">
<mat-label>Code</mat-label>
<input matInput placeholder="Code" formControlName="code" />
</mat-form-field>
</div>
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex>
<div class="flex flex-row justify-around content-start items-start">
<mat-form-field class="flex-auto">
<mat-label>Name</mat-label>
<input matInput #nameElement placeholder="Name" formControlName="name" />
</mat-form-field>
</div>
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-checkbox formControlName="enabled">Is Enabled?</mat-checkbox>
<div class="flex flex-row justify-around content-start items-start">
<mat-checkbox formControlName="enabled" class="flex-auto">Is Enabled?</mat-checkbox>
</div>
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex>
<div class="flex flex-row justify-around content-start items-start">
<mat-form-field class="flex-auto">
<mat-label>OTP</mat-label>
<input matInput placeholder="OTP" formControlName="otp" />
</mat-form-field>
overlord/src/app/client/client.module.ts
-2
View File
@@ -1,7 +1,6 @@
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
@@ -23,7 +22,6 @@ import { ClientRoutingModule } from './client-routing.module';
imports: [
CommonModule,
CdkTableModule,
FlexLayoutModule,
MatButtonModule,
MatCardModule,
MatCheckboxModule,
overlord/src/app/closing-stock/closing-stock.component.html
+9 -13
View File
@@ -6,15 +6,9 @@
</button>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div
fxLayout="row"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
fxLayoutAlign="space-around start"
>
<mat-form-field fxFlex="60">
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-form-field class="flex-auto basis-2/5 mr-5">
<mat-label>Department</mat-label>
<mat-select formControlName="costCentre" name="costCentre">
<mat-option *ngFor="let at of costCentres" [value]="at.id">
@@ -22,7 +16,7 @@
</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field fxFlex="40">
<mat-form-field class="flex-auto basis-2/5 mr-5">
<input
matInput
[matDatepicker]="dateInput"
@@ -34,7 +28,9 @@
<mat-datepicker-toggle matSuffix [for]="dateInput"></mat-datepicker-toggle>
<mat-datepicker #dateInput></mat-datepicker>
</mat-form-field>
<button mat-raised-button color="primary" (click)="show()">Show</button>
<button mat-raised-button color="primary" (click)="show()" class="flex-auto basis-1/5">
Show
</button>
</div>
<mat-table
#table
@@ -69,7 +65,7 @@
<ng-container matColumnDef="physical">
<mat-header-cell *matHeaderCellDef class="middle">Physical Stock</mat-header-cell>
<mat-cell *matCellDef="let row; let i = index" [formGroupName]="i" class="middle">
<mat-form-field fxFlex="100%">
<mat-form-field class="flex-auto max-w-[100%]">
<mat-label>Physical</mat-label>
<input
matInput
@@ -94,7 +90,7 @@
<ng-container matColumnDef="department">
<mat-header-cell *matHeaderCellDef class="middle">Department</mat-header-cell>
<mat-cell *matCellDef="let row; let i = index" [formGroupName]="i" class="middle">
<mat-form-field fxFlex="100%">
<mat-form-field class="flex-auto max-w-[100%]">
<mat-label>Department</mat-label>
<mat-select
formControlName="costCentre"
overlord/src/app/closing-stock/closing-stock.module.ts
-2
View File
@@ -2,7 +2,6 @@ import { A11yModule } from '@angular/cdk/a11y';
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MomentDateAdapter } from '@angular/material-moment-adapter';
import { MatButtonModule } from '@angular/material/button';
@@ -45,7 +44,6 @@ export const MY_FORMATS = {
A11yModule,
CommonModule,
CdkTableModule,
FlexLayoutModule,
MatButtonModule,
MatCardModule,
MatCheckboxModule,
overlord/src/app/cost-centre/cost-centre-detail/cost-centre-detail.component.css
-3
View File
@@ -1,3 +0,0 @@
.example-card {
max-width: 400px;
}
overlord/src/app/cost-centre/cost-centre-detail/cost-centre-detail.component.html
+5 -11
View File
@@ -1,18 +1,12 @@
<div fxLayout="row" fxFlex="50%" fxLayoutAlign="space-around center" class="example-card">
<mat-card fxFlex>
<div class="flex flex-auto flex-row justify-around content-center items-center lg:max-w-[50%]">
<mat-card class="flex-auto">
<mat-card-title-group>
<mat-card-title>Cost Center</mat-card-title>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex>
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start">
<mat-form-field class="flex-auto">
<mat-label>Name</mat-label>
<input
matInput
overlord/src/app/cost-centre/cost-centre.module.ts
-2
View File
@@ -1,7 +1,6 @@
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
@@ -20,7 +19,6 @@ import { CostCentreRoutingModule } from './cost-centre-routing.module';
imports: [
CommonModule,
CdkTableModule,
FlexLayoutModule,
MatButtonModule,
MatCardModule,
MatIconModule,
overlord/src/app/daybook/daybook.component.html
+7 -11
View File
@@ -3,15 +3,9 @@
<mat-card-title>Daybook</mat-card-title>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div
fxLayout="row"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
fxLayoutAlign="space-around start"
>
<mat-form-field fxFlex="40">
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-form-field class="flex-auto basis-2/5 mr-5">
<input
matInput
[matDatepicker]="startDate"
@@ -23,7 +17,7 @@
<mat-datepicker-toggle matSuffix [for]="startDate"></mat-datepicker-toggle>
<mat-datepicker #startDate></mat-datepicker>
</mat-form-field>
<mat-form-field fxFlex="40">
<mat-form-field class="flex-auto basis-2/5 mr-5">
<input
matInput
[matDatepicker]="finishDate"
@@ -35,7 +29,9 @@
<mat-datepicker-toggle matSuffix [for]="finishDate"></mat-datepicker-toggle>
<mat-datepicker #finishDate></mat-datepicker>
</mat-form-field>
<button fxFlex="20" mat-raised-button color="primary" (click)="show()">Show</button>
<button class="flex-auto basis-1/5" mat-raised-button color="primary" (click)="show()">
Show
</button>
</div>
</form>
<mat-table #table [dataSource]="dataSource" matSort aria-label="Elements">
overlord/src/app/daybook/daybook.module.ts
-2
View File
@@ -2,7 +2,6 @@ import { A11yModule } from '@angular/cdk/a11y';
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MomentDateAdapter } from '@angular/material-moment-adapter';
import { MatAutocompleteModule } from '@angular/material/autocomplete';
@@ -46,7 +45,6 @@ export const MY_FORMATS = {
A11yModule,
CommonModule,
CdkTableModule,
FlexLayoutModule,
MatAutocompleteModule,
MatButtonModule,
MatCardModule,
overlord/src/app/employee-attendance/employee-attendance.component.html
+10 -20
View File
@@ -3,15 +3,9 @@
<mat-card-title>Employee Attendance</mat-card-title>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div
fxLayout="row"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
fxLayoutAlign="space-around start"
>
<mat-form-field fxFlex>
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-form-field class="flex-auto mr-5">
<input
matInput
[matDatepicker]="startDate"
@@ -23,7 +17,7 @@
<mat-datepicker-toggle matSuffix [for]="startDate"></mat-datepicker-toggle>
<mat-datepicker #startDate></mat-datepicker>
</mat-form-field>
<mat-form-field fxFlex>
<mat-form-field class="flex-auto">
<input
matInput
[matDatepicker]="finishDate"
@@ -36,14 +30,8 @@
<mat-datepicker #finishDate></mat-datepicker>
</mat-form-field>
</div>
<div
fxLayout="row"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
fxLayoutAlign="space-around start"
>
<mat-form-field fxFlex="80">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-form-field class="flex-auto basis-4/5 mr-5">
<input
type="text"
matInput
@@ -64,7 +52,9 @@
}}</mat-option>
</mat-autocomplete>
</mat-form-field>
<button fxFlex="20" mat-raised-button color="primary" (click)="show()">Show</button>
<button class="flex-auto basis-1/5" mat-raised-button color="primary" (click)="show()">
Show
</button>
</div>
<mat-table #table [dataSource]="dataSource" formArrayName="attendances">
<!-- Date Column -->
@@ -76,7 +66,7 @@
<!-- Status Column -->
<ng-container matColumnDef="status">
<mat-header-cell *matHeaderCellDef>Status</mat-header-cell>
<mat-cell *matCellDef="let row; let i = index" [formGroupName]="i" fxFlex>
<mat-cell *matCellDef="let row; let i = index" [formGroupName]="i" class="flex flex-auto">
<mat-select formControlName="attendanceType" name="attendanceType">
<mat-option *ngFor="let at of attendanceTypes" [value]="at.id">
{{ at.name }}
overlord/src/app/employee-attendance/employee-attendance.module.ts
-2
View File
@@ -2,7 +2,6 @@ import { A11yModule } from '@angular/cdk/a11y';
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MomentDateAdapter } from '@angular/material-moment-adapter';
import { MatAutocompleteModule } from '@angular/material/autocomplete';
@@ -49,7 +48,6 @@ export const MY_FORMATS = {
A11yModule,
CommonModule,
CdkTableModule,
FlexLayoutModule,
MatAutocompleteModule,
MatButtonModule,
MatCardModule,
overlord/src/app/employee-benefits/employee-benefits.component.html
+10 -11
View File
@@ -3,9 +3,9 @@
<mat-card-title>Employee Benefits</mat-card-title>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div fxLayout="row" fxLayout.lt-md="column" fxLayoutGap="20px" fxLayoutGap.lt-md="0px">
<mat-form-field fxFlex>
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start">
<mat-form-field class="flex-auto">
<input
matInput
[matDatepicker]="date"
@@ -20,12 +20,9 @@
</div>
<div
formGroupName="addRow"
fxLayout="row"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col"
>
<mat-form-field fxFlex="60">
<mat-form-field class="flex-auto basis-3/5 mr-5">
<input
type="text"
matInput
@@ -46,7 +43,7 @@
}}</mat-option>
</mat-autocomplete>
</mat-form-field>
<mat-form-field fxFlex="15">
<mat-form-field class="flex-auto basis-[15%] mr-5">
<mat-label>Gross Salary</mat-label>
<input
type="text"
@@ -56,7 +53,7 @@
autocomplete="off"
/>
</mat-form-field>
<mat-form-field fxFlex="15">
<mat-form-field class="flex-auto basis-[15%] mr-5">
<mat-label>Days Worked</mat-label>
<input
type="text"
@@ -67,7 +64,9 @@
/>
</mat-form-field>
<button mat-raised-button color="primary" (click)="addRow()" fxFlex="10">Add</button>
<button mat-raised-button color="primary" (click)="addRow()" class="flex-auto basis-1/10">
Add
</button>
</div>
<mat-table #table [dataSource]="dataSource">
<!-- Name Column -->
overlord/src/app/employee-benefits/employee-benefits.module.ts
-2
View File
@@ -2,7 +2,6 @@ import { A11yModule } from '@angular/cdk/a11y';
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MomentDateAdapter } from '@angular/material-moment-adapter';
import { MatAutocompleteModule } from '@angular/material/autocomplete';
@@ -48,7 +47,6 @@ export const MY_FORMATS = {
A11yModule,
CommonModule,
CdkTableModule,
FlexLayoutModule,
MatAutocompleteModule,
MatButtonModule,
MatCardModule,
overlord/src/app/employee-functions/employee-functions.component.html
+30 -26
View File
@@ -2,15 +2,9 @@
<mat-tab label="Credit Salary">
<mat-card>
<mat-card-content>
<form [formGroup]="creditSalaryForm" fxLayout="column">
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex="80">
<form [formGroup]="creditSalaryForm" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-form-field class="flex-auto basis-4/5 mr-5">
<input
matInput
[matDatepicker]="creditSalaryMonth"
@@ -28,7 +22,12 @@
></mat-datepicker>
</mat-form-field>
<button mat-raised-button color="primary" (click)="creditSalary()" fxFlex="20">
<button
mat-raised-button
color="primary"
(click)="creditSalary()"
class="flex-auto basis-1/5"
>
Credit Salary
</button>
</div>
@@ -41,13 +40,9 @@
<mat-card-content>
<form
[formGroup]="attendanceRecordForm"
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col"
>
<mat-form-field fxFlex="35">
<mat-form-field class="flex-auto basis-[35%] mr-5">
<input
matInput
[matDatepicker]="attendanceStartDate"
@@ -59,7 +54,7 @@
<mat-datepicker-toggle matSuffix [for]="attendanceStartDate"></mat-datepicker-toggle>
<mat-datepicker #attendanceStartDate></mat-datepicker>
</mat-form-field>
<mat-form-field fxFlex="35">
<mat-form-field class="flex-auto basis-[35%] mr-5">
<input
matInput
[matDatepicker]="attendanceFinishDate"
@@ -72,10 +67,18 @@
<mat-datepicker #attendanceFinishDate></mat-datepicker>
</mat-form-field>
<a mat-raised-button color="primary" href="{{ attendanceRecordUrl() }}" fxFlex="15"
<a
mat-raised-button
color="primary"
href="{{ attendanceRecordUrl() }}"
class="flex-auto basis-[15%] mr-5"
>Download Attendance</a
>
<a mat-raised-button color="primary" href="{{ fingerPrintUrl() }}" fxFlex="15"
<a
mat-raised-button
color="primary"
href="{{ fingerPrintUrl() }}"
class="flex-auto basis-[15%]"
>Download Fingerprints</a
>
</form>
@@ -87,15 +90,16 @@
<mat-card-content>
<form
[formGroup]="fingerprintForm"
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col"
>
<input fxFlex="80" type="file" (change)="detectFiles($event)" />
<input class="flex-auto basis-4/5 mr-5" type="file" (change)="detectFiles($event)" />
<button mat-raised-button color="primary" (click)="uploadFingerprints()" fxFlex="20">
<button
mat-raised-button
color="primary"
(click)="uploadFingerprints()"
class="flex-auto basis-1/5"
>
Upload
</button>
</form>
overlord/src/app/employee-functions/employee-functions.module.ts
-2
View File
@@ -2,7 +2,6 @@ import { A11yModule } from '@angular/cdk/a11y';
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MomentDateAdapter } from '@angular/material-moment-adapter';
import { MatAutocompleteModule } from '@angular/material/autocomplete';
@@ -49,7 +48,6 @@ export const MY_FORMATS = {
A11yModule,
CommonModule,
CdkTableModule,
FlexLayoutModule,
MatAutocompleteModule,
MatButtonModule,
MatCardModule,
overlord/src/app/employee/employee-detail/employee-detail.component.html
+16 -16
View File
@@ -11,42 +11,42 @@
</mat-icon>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div fxLayout="row">
<mat-form-field fxFlex>
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start">
<mat-form-field class="flex-auto">
<mat-label>Code</mat-label>
<input matInput placeholder="Code" formControlName="code" />
</mat-form-field>
</div>
<div fxLayout="row">
<mat-form-field fxFlex>
<div class="flex flex-row justify-around content-start items-start">
<mat-form-field class="flex-auto">
<mat-label>Name</mat-label>
<input matInput #nameElement placeholder="Name" formControlName="name" />
</mat-form-field>
</div>
<div fxLayout="row">
<mat-form-field fxFlex>
<div class="flex flex-row justify-around content-start items-start">
<mat-form-field class="flex-auto">
<mat-label>Designation</mat-label>
<input matInput placeholder="Designation" formControlName="designation" />
</mat-form-field>
</div>
<div fxLayout="row">
<mat-form-field fxFlex>
<div class="flex flex-row justify-around content-start items-start">
<mat-form-field class="flex-auto">
<mat-label>Salary</mat-label>
<input matInput placeholder="Salary" formControlName="salary" />
</mat-form-field>
</div>
<div fxLayout="row">
<mat-form-field fxFlex>
<div class="flex flex-row justify-around content-start items-start">
<mat-form-field class="flex-auto">
<mat-label>Points</mat-label>
<input matInput placeholder="Points" formControlName="points" />
</mat-form-field>
</div>
<div fxLayout="row">
<div class="flex flex-row justify-around content-start items-start">
<mat-checkbox formControlName="isActive">Is Active?</mat-checkbox>
</div>
<div fxLayout="row">
<mat-form-field fxFlex>
<div class="flex flex-row justify-around content-start items-start">
<mat-form-field class="flex-auto">
<mat-label>Cost Centre</mat-label>
<mat-select placeholder="Cost Centre" formControlName="costCentre" name="CostCentre">
<mat-option *ngFor="let cs of costCentres" [value]="cs.id">
@@ -55,7 +55,7 @@
</mat-select>
</mat-form-field>
</div>
<mat-form-field fxFlex>
<mat-form-field class="flex-auto">
<input
matInput
[matDatepicker]="joiningDate"
@@ -67,7 +67,7 @@
<mat-datepicker-toggle matSuffix [for]="joiningDate"></mat-datepicker-toggle>
<mat-datepicker #joiningDate></mat-datepicker>
</mat-form-field>
<mat-form-field *ngIf="!item.isActive" fxFlex>
<mat-form-field *ngIf="!item.isActive" class="flex-auto">
<input
matInput
[matDatepicker]="leavingDate"
overlord/src/app/employee/employee-list/employee-list.component.html
+3 -9
View File
@@ -10,15 +10,9 @@
</a>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div
fxLayout="row"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
fxLayoutAlign="space-around start"
>
<mat-form-field fxFlex>
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start">
<mat-form-field class="flex-auto">
<input
type="text"
matInput
overlord/src/app/employee/employee.module.ts
-2
View File
@@ -1,7 +1,6 @@
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MomentDateAdapter } from '@angular/material-moment-adapter';
import { MatButtonModule } from '@angular/material/button';
@@ -43,7 +42,6 @@ export const MY_FORMATS = {
imports: [
CommonModule,
CdkTableModule,
FlexLayoutModule,
MatTableModule,
MatPaginatorModule,
MatSortModule,
overlord/src/app/entries/entries.component.html
+12 -20
View File
@@ -2,15 +2,9 @@
<mat-card-title-group>
<mat-card-title>Entries</mat-card-title>
</mat-card-title-group>
<form [formGroup]="form" fxLayout="column">
<div
fxLayout="row"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
fxLayoutAlign="space-around start"
>
<mat-form-field fxFlex="40%">
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-form-field class="flex-auto basis-2/5 mr-5">
<input
matInput
[matDatepicker]="startDate"
@@ -21,7 +15,7 @@
<mat-datepicker-toggle matSuffix [for]="startDate"></mat-datepicker-toggle>
<mat-datepicker #startDate></mat-datepicker>
</mat-form-field>
<mat-form-field fxFlex="40%">
<mat-form-field class="flex-auto basis-2/5 mr-5">
<input
matInput
[matDatepicker]="finishDate"
@@ -32,24 +26,22 @@
<mat-datepicker-toggle matSuffix [for]="finishDate"></mat-datepicker-toggle>
<mat-datepicker #finishDate></mat-datepicker>
</mat-form-field>
<button mat-raised-button (click)="refresh()" fxFlex="20%">
<button mat-raised-button (click)="refresh()" class="flex-auto basis-1/5">
<mat-icon>refresh</mat-icon>Refresh
</button>
</div>
<div
fxLayout="row"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
fxLayoutAlign="space-around start"
>
<mat-radio-group fxFlex="40%" formControlName="posted" (change)="togglePosted($event)">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-radio-group
class="flex-auto basis-2/5 mr-5"
formControlName="posted"
(change)="togglePosted($event)"
>
<mat-radio-button class="my-margin" [value]="true"> Posted </mat-radio-button>
<mat-radio-button class="my-margin" [value]="false"> Not Posted </mat-radio-button>
<mat-radio-button class="my-margin" [value]="null"> All </mat-radio-button>
</mat-radio-group>
<mat-checkbox
fxFlex="40%"
class="flex-auto basis-2/5"
formControlName="issue"
class="my-margin"
[checked]="issue"
overlord/src/app/entries/entries.module.ts
-2
View File
@@ -2,7 +2,6 @@ import { A11yModule } from '@angular/cdk/a11y';
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MomentDateAdapter } from '@angular/material-moment-adapter';
import { MatButtonModule } from '@angular/material/button';
@@ -62,7 +61,6 @@ export const MY_FORMATS = {
MatExpansionModule,
MatDatepickerModule,
ReactiveFormsModule,
FlexLayoutModule,
],
declarations: [EntriesComponent],
providers: [
overlord/src/app/incentive/incentive.component.html
+6 -6
View File
@@ -3,9 +3,9 @@
<mat-card-title>Incentives</mat-card-title>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div fxLayout="row" fxLayout.lt-md="column" fxLayoutGap="20px" fxLayoutGap.lt-md="0px">
<mat-form-field fxFlex>
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start">
<mat-form-field class="flex-auto">
<input
matInput
[matDatepicker]="date"
@@ -18,7 +18,7 @@
<mat-datepicker #date></mat-datepicker>
</mat-form-field>
</div>
<div fxLayout="row" fxLayout.lt-md="column" fxLayoutGap="20px" fxLayoutGap.lt-md="0px">
<div class="flex flex-row justify-around content-start items-start">
Total Incentive: <strong>{{ voucher.incentive | number: '1.2-2' }}</strong> Total Points:
<strong>{{ totalPoints() | number: '1.2-2' }}</strong> Point Value:
<strong>{{ pointValue() | number: '1.2-2' }}</strong>
@@ -54,7 +54,7 @@
<ng-container matColumnDef="points">
<mat-header-cell *matHeaderCellDef class="center">Service Points</mat-header-cell>
<mat-cell *matCellDef="let row; let i = index" class="center" [formGroupName]="i">
<mat-form-field fxFlex="80%">
<mat-form-field class="flex-auto max-w-[80%]">
<button
mat-stroked-button
mat-icon-button
@@ -69,7 +69,7 @@
formControlName="points"
autocomplete="off"
(change)="change(row, i)"
fxFlex="80%"
class="flex-auto max-w-[80%]"
/>
<button
mat-stroked-button
overlord/src/app/incentive/incentive.module.ts
-2
View File
@@ -2,7 +2,6 @@ import { A11yModule } from '@angular/cdk/a11y';
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MomentDateAdapter } from '@angular/material-moment-adapter';
import { MatAutocompleteModule } from '@angular/material/autocomplete';
@@ -48,7 +47,6 @@ export const MY_FORMATS = {
A11yModule,
CommonModule,
CdkTableModule,
FlexLayoutModule,
MatAutocompleteModule,
MatButtonModule,
MatCardModule,
overlord/src/app/issue/issue-dialog.component.html
+3 -9
View File
@@ -1,14 +1,8 @@
<h1 mat-dialog-title>Edit Issue Entry</h1>
<div mat-dialog-content>
<form [formGroup]="form">
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex="65">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-form-field class="flex-auto basis-2/3 mr-5">
<input
type="text"
matInput
@@ -29,7 +23,7 @@
}}</mat-option>
</mat-autocomplete>
</mat-form-field>
<mat-form-field fxFlex="35">
<mat-form-field class="flex-auto basis-1/3">
<mat-label>Quantity</mat-label>
<input
type="text"
overlord/src/app/issue/issue.component.html
+17 -20
View File
@@ -3,15 +3,9 @@
<mat-card-title>Issue</mat-card-title>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex="40">
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-form-field class="flex-auto basis-[28%] mr-5">
<input
matInput
[matDatepicker]="date"
@@ -24,21 +18,21 @@
<mat-datepicker-toggle matSuffix [for]="date"></mat-datepicker-toggle>
<mat-datepicker #date></mat-datepicker>
</mat-form-field>
<mat-form-field fxFlex="40">
<mat-form-field class="flex-auto basis-[28%] mr-5">
<mat-select formControlName="source">
<mat-option *ngFor="let costCentre of costCentres" [value]="costCentre.id">
{{ costCentre.name }}
</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field fxFlex="40">
<mat-form-field class="flex-auto basis-[28%] mr-5">
<mat-select formControlName="destination">
<mat-option *ngFor="let costCentre of costCentres" [value]="costCentre.id">
{{ costCentre.name }}
</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field fxFlex="20">
<mat-form-field class="flex-auto basis-[16%]">
<mat-label>Amount</mat-label>
<span matPrefix>₹ </span>
<input type="text" matInput formControlName="amount" />
@@ -47,13 +41,9 @@
<div
formGroupName="addRow"
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col"
>
<mat-form-field fxFlex="55">
<mat-form-field class="flex-auto basis-[55%] mr-5">
<input
type="text"
matInput
@@ -74,7 +64,7 @@
}}</mat-option>
</mat-autocomplete>
</mat-form-field>
<mat-form-field fxFlex="25">
<mat-form-field class="flex-auto basis-1/4 mr-5">
<mat-label>Quantity</mat-label>
<input
type="text"
@@ -85,7 +75,14 @@
/>
</mat-form-field>
<button mat-raised-button color="primary" (click)="addRow()" fxFlex="20">Add</button>
<button
mat-raised-button
color="primary"
(click)="addRow()"
class="flex-auto basis-2/5 mr-5"
>
Add
</button>
</div>
<mat-table #table [dataSource]="dataSource" matSort aria-label="Elements">
<!-- Product Column -->
overlord/src/app/issue/issue.module.ts
-2
View File
@@ -2,7 +2,6 @@ import { A11yModule } from '@angular/cdk/a11y';
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MomentDateAdapter } from '@angular/material-moment-adapter';
import { MatAutocompleteModule } from '@angular/material/autocomplete';
@@ -50,7 +49,6 @@ export const MY_FORMATS = {
A11yModule,
CommonModule,
CdkTableModule,
FlexLayoutModule,
HotkeyModule,
MatAutocompleteModule,
MatButtonModule,
overlord/src/app/journal/journal-dialog.component.html
+4 -10
View File
@@ -1,20 +1,14 @@
<h1 mat-dialog-title>Edit Journal Entry</h1>
<div mat-dialog-content>
<form [formGroup]="form">
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex="20">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-form-field class="flex-auto basis-1/5 mr-5">
<mat-select formControlName="debit">
<mat-option [value]="1">Dr</mat-option>
<mat-option [value]="-1">Cr</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field fxFlex="55">
<mat-form-field class="flex-auto basis-[55%] mr-5">
<input
type="text"
matInput
@@ -39,7 +33,7 @@
account.name
}}</mat-option>
</mat-autocomplete>
<mat-form-field fxFlex="25">
<mat-form-field class="flex-auto basis-1/4">
<mat-label>Amount</mat-label>
<span matPrefix>₹ </span>
<input
overlord/src/app/journal/journal.component.html
+18 -16
View File
@@ -11,9 +11,9 @@
</mat-icon>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div fxLayout="row" fxLayout.lt-md="column" fxLayoutGap="20px" fxLayoutGap.lt-md="0px">
<mat-form-field fxFlex>
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start">
<mat-form-field class="flex-auto">
<input
matInput
[matDatepicker]="date"
@@ -29,19 +29,15 @@
</div>
<div
formGroupName="addRow"
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col"
>
<mat-form-field fxFlex="15">
<mat-form-field class="flex-auto mr-5 basis-1/6">
<mat-select formControlName="debit">
<mat-option [value]="1">Dr</mat-option>
<mat-option [value]="-1">Cr</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field fxFlex="50">
<mat-form-field class="flex-auto mr-5 basis-1/2">
<input
type="text"
matInput
@@ -66,7 +62,7 @@
account.name
}}</mat-option>
</mat-autocomplete>
<mat-form-field fxFlex="20">
<mat-form-field class="flex-auto mr-5 basis-1/6">
<mat-label>Amount</mat-label>
<span matPrefix>₹ </span>
<input
@@ -78,7 +74,9 @@
/>
</mat-form-field>
<button mat-raised-button color="primary" (click)="addRow()" fxFlex="15">Add</button>
<button mat-raised-button color="primary" (click)="addRow()" class="flex-auto basis-1/6">
Add
</button>
</div>
<mat-table #table [dataSource]="dataSource" matSort aria-label="Elements">
<!-- Debit Column -->
@@ -117,7 +115,7 @@
<mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
<mat-row *matRowDef="let row; columns: displayedColumns"></mat-row>
</mat-table>
<mat-form-field>
<mat-form-field class="flex-auto">
<mat-label>Narration</mat-label>
<textarea
matInput
@@ -126,14 +124,18 @@
formControlName="narration"
></textarea>
</mat-form-field>
<div fxLayout="row" fxLayoutGap="0.5%" fxLayoutAlign="center">
<div class="img-container" fxFlex="20%" *ngFor="let item of voucher.files">
<div class="flex flex-row justify-center items-stretch">
<div
class="img-container"
class="flex-auto mr-5 basis-1/5"
*ngFor="let item of voucher.files"
>
<img [src]="item.thumbnail" (click)="zoomImage(item)" />
<button mat-icon-button class="overlay" (click)="deleteImage(item)">
<mat-icon>delete</mat-icon>
</button>
</div>
<div class="img-container" fxFlex="20%">
<div class="img-container" class="flex flex-auto basis-1/5">
<label ng-href for="fileUp">
<img
src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAiIGhlaWdodD0iMTUwIj48cmVjdCB3aWR0aD0iMTAwIiBoZWlnaHQ9IjE1MCIgZmlsbD0iI2VlZSIvPjx0ZXh0IHRleHQtYW5jaG9yPSJtaWRkbGUiIHg9IjUwIiB5PSI3NSIgc3R5bGU9ImZpbGw6I2FhYTtmb250LXdlaWdodDpib2xkO2ZvbnQtc2l6ZToxMDBweDtmb250LWZhbWlseTpBcmlhbCxIZWx2ZXRpY2Esc2Fucy1zZXJpZjtkb21pbmFudC1iYXNlbGluZTpjZW50cmFsIj4rPC90ZXh0Pjwvc3ZnPg=="
overlord/src/app/journal/journal.module.ts
-2
View File
@@ -2,7 +2,6 @@ import { A11yModule } from '@angular/cdk/a11y';
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MomentDateAdapter } from '@angular/material-moment-adapter';
import { MatAutocompleteModule } from '@angular/material/autocomplete';
@@ -50,7 +49,6 @@ export const MY_FORMATS = {
A11yModule,
CommonModule,
CdkTableModule,
FlexLayoutModule,
HotkeyModule,
MatAutocompleteModule,
MatButtonModule,
overlord/src/app/ledger/ledger.component.html
+9 -19
View File
@@ -6,15 +6,9 @@
</button>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div
fxLayout="row"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
fxLayoutAlign="space-around start"
>
<mat-form-field fxFlex>
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-form-field class="flex-auto mr-5">
<input
matInput
[matDatepicker]="startDate"
@@ -26,7 +20,7 @@
<mat-datepicker-toggle matSuffix [for]="startDate"></mat-datepicker-toggle>
<mat-datepicker #startDate></mat-datepicker>
</mat-form-field>
<mat-form-field fxFlex>
<mat-form-field class="flex-auto">
<input
matInput
[matDatepicker]="finishDate"
@@ -39,14 +33,8 @@
<mat-datepicker #finishDate></mat-datepicker>
</mat-form-field>
</div>
<div
fxLayout="row"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
fxLayoutAlign="space-around start"
>
<mat-form-field fxFlex="80">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-form-field class="flex-auto basis-4/5 mr-5">
<input
type="text"
matInput
@@ -67,7 +55,9 @@
}}</mat-option>
</mat-autocomplete>
</mat-form-field>
<button fxFlex="20" mat-raised-button color="primary" (click)="show()">Show</button>
<button class="flex-auto basis-1/5" mat-raised-button color="primary" (click)="show()">
Show
</button>
</div>
</form>
<mat-table #table [dataSource]="dataSource" matSort aria-label="Elements">
overlord/src/app/ledger/ledger.module.ts
-2
View File
@@ -2,7 +2,6 @@ import { A11yModule } from '@angular/cdk/a11y';
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MomentDateAdapter } from '@angular/material-moment-adapter';
import { MatAutocompleteModule } from '@angular/material/autocomplete';
@@ -46,7 +45,6 @@ export const MY_FORMATS = {
A11yModule,
CommonModule,
CdkTableModule,
FlexLayoutModule,
MatAutocompleteModule,
MatButtonModule,
MatCardModule,
overlord/src/app/net-transactions/net-transactions.component.html
+7 -11
View File
@@ -3,15 +3,9 @@
<mat-card-title>Net Transactions</mat-card-title>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div
fxLayout="row"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
fxLayoutAlign="space-around start"
>
<mat-form-field fxFlex="40">
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-form-field class="flex-auto basis-2/5 mr-5">
<input
matInput
[matDatepicker]="startDate"
@@ -23,7 +17,7 @@
<mat-datepicker-toggle matSuffix [for]="startDate"></mat-datepicker-toggle>
<mat-datepicker #startDate></mat-datepicker>
</mat-form-field>
<mat-form-field fxFlex="40">
<mat-form-field class="flex-auto basis-2/5 mr-5">
<input
matInput
[matDatepicker]="finishDate"
@@ -35,7 +29,9 @@
<mat-datepicker-toggle matSuffix [for]="finishDate"></mat-datepicker-toggle>
<mat-datepicker #finishDate></mat-datepicker>
</mat-form-field>
<button fxFlex="20" mat-raised-button color="primary" (click)="show()">Show</button>
<button class="flex-auto basis-1/5" mat-raised-button color="primary" (click)="show()">
Show
</button>
</div>
</form>
<mat-table #table [dataSource]="dataSource" matSort aria-label="Elements">
overlord/src/app/net-transactions/net-transactions.module.ts
-2
View File
@@ -2,7 +2,6 @@ import { A11yModule } from '@angular/cdk/a11y';
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MomentDateAdapter } from '@angular/material-moment-adapter';
import { MatAutocompleteModule } from '@angular/material/autocomplete';
@@ -46,7 +45,6 @@ export const MY_FORMATS = {
A11yModule,
CommonModule,
CdkTableModule,
FlexLayoutModule,
MatAutocompleteModule,
MatButtonModule,
MatCardModule,
overlord/src/app/non-contact-purchase/non-contract-purchase.module.ts
-2
View File
@@ -2,7 +2,6 @@ import { A11yModule } from '@angular/cdk/a11y';
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
@@ -42,7 +41,6 @@ import { NonContractPurchaseComponent } from './non-contract-purchase.component'
MatExpansionModule,
MatDatepickerModule,
ReactiveFormsModule,
FlexLayoutModule,
],
declarations: [NonContractPurchaseComponent],
})
overlord/src/app/payment/payment-dialog.component.html
+3 -9
View File
@@ -1,14 +1,8 @@
<h1 mat-dialog-title>Edit Payment Entry</h1>
<div mat-dialog-content>
<form [formGroup]="form">
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex="65">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-form-field class="flex-auto basis-2/3 mr-5">
<input
type="text"
matInput
@@ -33,7 +27,7 @@
account.name
}}</mat-option>
</mat-autocomplete>
<mat-form-field fxFlex="35">
<mat-form-field class="flex-auto basis-1/3">
<mat-label>Amount</mat-label>
<span matPrefix>₹ </span>
<input
overlord/src/app/payment/payment.component.html
+18 -22
View File
@@ -11,15 +11,9 @@
</mat-icon>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex="40">
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-form-field class="flex-auto basis-2/5 mr-5">
<input
matInput
[matDatepicker]="date"
@@ -32,14 +26,14 @@
<mat-datepicker-toggle matSuffix [for]="date"></mat-datepicker-toggle>
<mat-datepicker #date></mat-datepicker>
</mat-form-field>
<mat-form-field fxFlex="40">
<mat-form-field class="flex-auto basis-2/5 mr-5">
<mat-select formControlName="paymentAccount">
<mat-option *ngFor="let account of paymentAccounts" [value]="account.id">
{{ account.name }}
</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field fxFlex="20">
<mat-form-field class="flex-auto basis-1/5">
<mat-label>Payment Amount</mat-label>
<span matPrefix>₹ </span>
<input type="text" matInput formControlName="paymentAmount" />
@@ -48,13 +42,9 @@
<div
formGroupName="addRow"
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col"
>
<mat-form-field fxFlex="55">
<mat-form-field class="flex-auto basis-[55%] mr-5">
<input
type="text"
matInput
@@ -79,7 +69,7 @@
account.name
}}</mat-option>
</mat-autocomplete>
<mat-form-field fxFlex="25">
<mat-form-field class="flex-auto basis-1/4 mr-5">
<mat-label>Amount</mat-label>
<span matPrefix>₹ </span>
<input
@@ -91,7 +81,9 @@
/>
</mat-form-field>
<button mat-raised-button color="primary" (click)="addRow()" fxFlex="20">Add</button>
<button mat-raised-button color="primary" (click)="addRow()" class="flex-auto basis-1/5">
Add
</button>
</div>
<mat-table #table [dataSource]="dataSource" matSort aria-label="Elements">
<!-- Account Column -->
@@ -133,14 +125,18 @@
formControlName="narration"
></textarea>
</mat-form-field>
<div fxLayout="row" fxLayoutGap="0.5%" fxLayoutAlign="center">
<div class="img-container" fxFlex="20%" *ngFor="let item of voucher.files">
<div class="flex flex-row justify-center items-stretch">
<div
class="img-container"
class="flex-auto mr-5 basis-1/5"
*ngFor="let item of voucher.files"
>
<img [src]="item.thumbnail" (click)="zoomImage(item)" />
<button mat-icon-button class="overlay" (click)="deleteImage(item)">
<mat-icon>delete</mat-icon>
</button>
</div>
<div class="img-container" fxFlex="20%">
<div class="img-container" class="flex flex-auto basis-1/5">
<label ng-href for="fileUp">
<img
src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAiIGhlaWdodD0iMTUwIj48cmVjdCB3aWR0aD0iMTAwIiBoZWlnaHQ9IjE1MCIgZmlsbD0iI2VlZSIvPjx0ZXh0IHRleHQtYW5jaG9yPSJtaWRkbGUiIHg9IjUwIiB5PSI3NSIgc3R5bGU9ImZpbGw6I2FhYTtmb250LXdlaWdodDpib2xkO2ZvbnQtc2l6ZToxMDBweDtmb250LWZhbWlseTpBcmlhbCxIZWx2ZXRpY2Esc2Fucy1zZXJpZjtkb21pbmFudC1iYXNlbGluZTpjZW50cmFsIj4rPC90ZXh0Pjwvc3ZnPg=="
overlord/src/app/payment/payment.module.ts
-2
View File
@@ -2,7 +2,6 @@ import { A11yModule } from '@angular/cdk/a11y';
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MomentDateAdapter } from '@angular/material-moment-adapter';
import { MatAutocompleteModule } from '@angular/material/autocomplete';
@@ -50,7 +49,6 @@ export const MY_FORMATS = {
A11yModule,
CommonModule,
CdkTableModule,
FlexLayoutModule,
HotkeyModule,
MatAutocompleteModule,
MatButtonModule,
overlord/src/app/period/period-detail/period-detail.component.html
+5 -5
View File
@@ -3,9 +3,9 @@
<mat-card-title>Period</mat-card-title>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div fxLayout="row">
<mat-form-field fxFlex>
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start">
<mat-form-field class="flex-auto">
<input
matInput
[matDatepicker]="validFrom"
@@ -17,8 +17,8 @@
<mat-datepicker #validFrom></mat-datepicker>
</mat-form-field>
</div>
<div fxLayout="row">
<mat-form-field fxFlex>
<div class="flex flex-row justify-around content-start items-start">
<mat-form-field class="flex-auto">
<input
matInput
[matDatepicker]="validTill"
overlord/src/app/period/period.module.ts
-2
View File
@@ -1,7 +1,6 @@
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MomentDateAdapter } from '@angular/material-moment-adapter';
import { MatButtonModule } from '@angular/material/button';
@@ -43,7 +42,6 @@ export const MY_FORMATS = {
imports: [
CommonModule,
CdkTableModule,
FlexLayoutModule,
MatTableModule,
MatPaginatorModule,
MatSortModule,
overlord/src/app/product-group/product-group-detail/product-group-detail.component.css
-3
View File
@@ -1,3 +0,0 @@
.example-card {
max-width: 400px;
}
overlord/src/app/product-group/product-group-detail/product-group-detail.component.html
+5 -11
View File
@@ -1,18 +1,12 @@
<div fxLayout="row" fxFlex="50%" fxLayoutAlign="space-around center" class="example-card">
<mat-card fxFlex>
<div class="flex flex-auto flex-row justify-around content-center items-center lg:max-w-[50%]">
<mat-card class="flex-auto">
<mat-card-title-group>
<mat-card-title>Product Group</mat-card-title>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex>
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start">
<mat-form-field class="flex-auto">
<mat-label>Name</mat-label>
<input
matInput
overlord/src/app/product-group/product-group.module.ts
-2
View File
@@ -1,7 +1,6 @@
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
@@ -20,7 +19,6 @@ import { ProductGroupRoutingModule } from './product-group-routing.module';
imports: [
CommonModule,
CdkTableModule,
FlexLayoutModule,
MatTableModule,
MatPaginatorModule,
MatSortModule,
overlord/src/app/product-ledger/product-ledger.component.html
+9 -19
View File
@@ -6,15 +6,9 @@
</button>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div
fxLayout="row"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
fxLayoutAlign="space-around start"
>
<mat-form-field fxFlex>
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-form-field class="flex-auto mr-5">
<input
matInput
[matDatepicker]="startDate"
@@ -26,7 +20,7 @@
<mat-datepicker-toggle matSuffix [for]="startDate"></mat-datepicker-toggle>
<mat-datepicker #startDate></mat-datepicker>
</mat-form-field>
<mat-form-field fxFlex>
<mat-form-field class="flex-auto">
<input
matInput
[matDatepicker]="finishDate"
@@ -39,14 +33,8 @@
<mat-datepicker #finishDate></mat-datepicker>
</mat-form-field>
</div>
<div
fxLayout="row"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
fxLayoutAlign="space-around start"
>
<mat-form-field fxFlex="80">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-form-field class="flex-auto basis-4/5 mr-5">
<input
type="text"
matInput
@@ -67,7 +55,9 @@
}}</mat-option>
</mat-autocomplete>
</mat-form-field>
<button fxFlex="20" mat-raised-button color="primary" (click)="show()">Show</button>
<button class="flex-auto basis-1/5" mat-raised-button color="primary" (click)="show()">
Show
</button>
</div>
</form>
<mat-table #table [dataSource]="dataSource" matSort aria-label="Elements">
overlord/src/app/product-ledger/product-ledger.module.ts
-2
View File
@@ -2,7 +2,6 @@ import { A11yModule } from '@angular/cdk/a11y';
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MomentDateAdapter } from '@angular/material-moment-adapter';
import { MatAutocompleteModule } from '@angular/material/autocomplete';
@@ -46,7 +45,6 @@ export const MY_FORMATS = {
A11yModule,
CommonModule,
CdkTableModule,
FlexLayoutModule,
MatAutocompleteModule,
MatButtonModule,
MatCardModule,
overlord/src/app/product/product-detail/product-detail-dialog.component.html
+6 -10
View File
@@ -2,25 +2,21 @@
<div mat-dialog-content>
<form [formGroup]="form">
<div
fxLayout="row wrap"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
class="flex flex-row flex-wrap justify-around content-start items-start sm:max-lg:flex-col"
>
<mat-form-field fxFlex>
<mat-form-field class="flex-auto mr-5">
<mat-label>Units</mat-label>
<input matInput placeholder="Units" formControlName="units" />
</mat-form-field>
<mat-form-field fxFlex>
<mat-form-field class="flex-auto mr-5">
<mat-label>Fraction</mat-label>
<input matInput type="number" placeholder="Fraction" formControlName="fraction" />
</mat-form-field>
<mat-form-field fxFlex>
<mat-form-field class="flex-auto mr-5">
<mat-label>Yield</mat-label>
<input matInput type="number" placeholder="Yield" formControlName="productYield" />
</mat-form-field>
<mat-form-field fxFlex>
<mat-form-field class="flex-auto mr-5">
<mat-label>{{ data.isPurchased ? 'Purchase Price' : 'Cost Price' }}</mat-label>
<input
matInput
@@ -29,7 +25,7 @@
formControlName="costPrice"
/>
</mat-form-field>
<mat-form-field fxFlex [hidden]="!data.isSold">
<mat-form-field class="flex-auto" [hidden]="!data.isSold">
<mat-label>Sale Price</mat-label>
<input matInput type="number" placeholder="Sale Price" formControlName="salePrice" />
</mat-form-field>
overlord/src/app/product/product-detail/product-detail.component.html
+25 -49
View File
@@ -1,57 +1,35 @@
<div fxLayout="row" fxFlex="50%" fxLayoutAlign="space-around center" class="example-card">
<mat-card fxFlex>
<div class="flex flex-auto flex-row justify-around content-center items-center lg:max-w-[50%]">
<mat-card class="flex-auto">
<mat-card-title-group>
<mat-card-title>Product</mat-card-title>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex>
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start">
<mat-form-field class="flex-auto">
<mat-label>Code</mat-label>
<input matInput placeholder="Code" formControlName="code" />
</mat-form-field>
</div>
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex="80">
<div class="flex flex-row justify-around content-start items-start">
<mat-form-field class="flex-auto basis-4/5 mr-5">
<mat-label>Name</mat-label>
<input matInput #nameElement placeholder="Name" formControlName="name" />
</mat-form-field>
<mat-form-field fxFlex="20">
<mat-form-field class="flex-auto basis-1/5">
<mat-label>Fraction Units</mat-label>
<input matInput placeholder="Fraction Units" formControlName="fractionUnits" />
</mat-form-field>
</div>
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-checkbox formControlName="isPurchased">Is Purchased?</mat-checkbox>
<mat-checkbox formControlName="isSold">Is Sold?</mat-checkbox>
<mat-checkbox formControlName="isActive">Is Active?</mat-checkbox>
<div class="flex flex-row justify-around content-start items-start">
<mat-checkbox formControlName="isPurchased" class="flex-auto mr-5"
>Is Purchased?</mat-checkbox
>
<mat-checkbox formControlName="isSold" class="flex-auto mr-5">Is Sold?</mat-checkbox>
<mat-checkbox formControlName="isActive" class="flex-auto">Is Active?</mat-checkbox>
</div>
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex>
<div class="flex flex-row justify-around content-start items-start">
<mat-form-field class="flex-auto">
<mat-label>Product Type</mat-label>
<mat-select placeholder="Product Group" formControlName="productGroup">
<mat-option *ngFor="let pg of productGroups" [value]="pg.id">
@@ -63,25 +41,21 @@
<h2>Stock Keeping Units</h2>
<div
formGroupName="addRow"
fxLayout="row wrap"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
class="flex flex-row flex-wrap justify-around content-start items-start sm:max-lg:flex-col"
>
<mat-form-field fxFlex>
<mat-form-field class="flex-auto mr-5">
<mat-label>Units</mat-label>
<input matInput placeholder="Units" formControlName="units" />
</mat-form-field>
<mat-form-field fxFlex>
<mat-form-field class="flex-auto mr-5">
<mat-label>Fraction</mat-label>
<input matInput type="number" placeholder="Fraction" formControlName="fraction" />
</mat-form-field>
<mat-form-field fxFlex>
<mat-form-field class="flex-auto mr-5">
<mat-label>Yield</mat-label>
<input matInput type="number" placeholder="Yield" formControlName="productYield" />
</mat-form-field>
<mat-form-field fxFlex>
<mat-form-field class="flex-auto mr-5">
<mat-label>{{ item.isPurchased ? 'Purchase Price' : 'Cost Price' }}</mat-label>
<input
matInput
@@ -90,11 +64,13 @@
formControlName="costPrice"
/>
</mat-form-field>
<mat-form-field fxFlex>
<mat-form-field class="flex-auto mr-5">
<mat-label>Sale Price</mat-label>
<input matInput type="number" placeholder="Sale Price" formControlName="salePrice" />
</mat-form-field>
<button mat-raised-button color="primary" (click)="addRow()" fxFlex>Add</button>
<button mat-raised-button color="primary" (click)="addRow()" class="flex-auto">
Add
</button>
</div>
</form>
<mat-table [dataSource]="dataSource" aria-label="Elements">
overlord/src/app/product/product-list/product-list.component.html
+3 -9
View File
@@ -10,15 +10,9 @@
</a>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div
fxLayout="row"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
fxLayoutAlign="space-around start"
>
<mat-form-field fxFlex>
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start">
<mat-form-field class="flex-auto">
<input
type="text"
matInput
overlord/src/app/product/product.module.ts
-2
View File
@@ -1,7 +1,6 @@
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
@@ -25,7 +24,6 @@ import { ProductRoutingModule } from './product-routing.module';
imports: [
CommonModule,
CdkTableModule,
FlexLayoutModule,
MatTableModule,
MatPaginatorModule,
MatSortModule,
overlord/src/app/profit-loss/profit-loss.component.html
+7 -11
View File
@@ -3,15 +3,9 @@
<mat-card-title>Profit & Loss</mat-card-title>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div
fxLayout="row"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
fxLayoutAlign="space-around start"
>
<mat-form-field fxFlex="40">
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-form-field class="flex-auto basis-2/5 mr-5">
<input
matInput
[matDatepicker]="startDate"
@@ -23,7 +17,7 @@
<mat-datepicker-toggle matSuffix [for]="startDate"></mat-datepicker-toggle>
<mat-datepicker #startDate></mat-datepicker>
</mat-form-field>
<mat-form-field fxFlex="40">
<mat-form-field class="flex-auto basis-2/5 mr-5">
<input
matInput
[matDatepicker]="finishDate"
@@ -35,7 +29,9 @@
<mat-datepicker-toggle matSuffix [for]="finishDate"></mat-datepicker-toggle>
<mat-datepicker #finishDate></mat-datepicker>
</mat-form-field>
<button fxFlex="20" mat-raised-button color="primary" (click)="show()">Show</button>
<button class="flex-auto basis-1/5" mat-raised-button color="primary" (click)="show()">
Show
</button>
</div>
</form>
<mat-table #table [dataSource]="dataSource" matSort aria-label="Elements">
overlord/src/app/profit-loss/profit-loss.module.ts
-2
View File
@@ -2,7 +2,6 @@ import { A11yModule } from '@angular/cdk/a11y';
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MomentDateAdapter } from '@angular/material-moment-adapter';
import { MatAutocompleteModule } from '@angular/material/autocomplete';
@@ -46,7 +45,6 @@ export const MY_FORMATS = {
A11yModule,
CommonModule,
CdkTableModule,
FlexLayoutModule,
MatAutocompleteModule,
MatButtonModule,
MatCardModule,
overlord/src/app/purchase-entries/purchase-entries.component.html
+7 -11
View File
@@ -3,15 +3,9 @@
<mat-card-title>Purchase Entries</mat-card-title>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div
fxLayout="row"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
fxLayoutAlign="space-around start"
>
<mat-form-field fxFlex="40">
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-form-field class="flex-auto basis-2/5 mr-5">
<input
matInput
[matDatepicker]="startDate"
@@ -23,7 +17,7 @@
<mat-datepicker-toggle matSuffix [for]="startDate"></mat-datepicker-toggle>
<mat-datepicker #startDate></mat-datepicker>
</mat-form-field>
<mat-form-field fxFlex="40">
<mat-form-field class="flex-auto basis-2/5 mr-5">
<input
matInput
[matDatepicker]="finishDate"
@@ -35,7 +29,9 @@
<mat-datepicker-toggle matSuffix [for]="finishDate"></mat-datepicker-toggle>
<mat-datepicker #finishDate></mat-datepicker>
</mat-form-field>
<button fxFlex="20" mat-raised-button color="primary" (click)="show()">Show</button>
<button class="flex-auto basis-1/5" mat-raised-button color="primary" (click)="show()">
Show
</button>
</div>
</form>
<mat-table #table [dataSource]="dataSource" matSort aria-label="Elements">
overlord/src/app/purchase-entries/purchase-entries.module.ts
-2
View File
@@ -2,7 +2,6 @@ import { A11yModule } from '@angular/cdk/a11y';
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MomentDateAdapter } from '@angular/material-moment-adapter';
import { MatAutocompleteModule } from '@angular/material/autocomplete';
@@ -46,7 +45,6 @@ export const MY_FORMATS = {
A11yModule,
CommonModule,
CdkTableModule,
FlexLayoutModule,
MatAutocompleteModule,
MatButtonModule,
MatCardModule,
overlord/src/app/purchase-return/purchase-return-dialog.component.html
+3 -9
View File
@@ -1,14 +1,8 @@
<h1 mat-dialog-title>Edit PurchaseReturn Entry</h1>
<div mat-dialog-content>
<form [formGroup]="form">
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex="65">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-form-field class="flex-auto basis-2/3 mr-5">
<input
type="text"
matInput
@@ -29,7 +23,7 @@
}}</mat-option>
</mat-autocomplete>
</mat-form-field>
<mat-form-field fxFlex="35">
<mat-form-field class="flex-auto basis-1/3">
<mat-label>Quantity</mat-label>
<input
type="text"
overlord/src/app/purchase-return/purchase-return.component.html
+18 -22
View File
@@ -11,15 +11,9 @@
</mat-icon>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex="40">
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-form-field class="flex-auto basis-2/5 mr-5">
<input
matInput
[matDatepicker]="date"
@@ -32,7 +26,7 @@
<mat-datepicker-toggle matSuffix [for]="date"></mat-datepicker-toggle>
<mat-datepicker #date></mat-datepicker>
</mat-form-field>
<mat-form-field fxFlex="40">
<mat-form-field class="flex-auto basis-2/5 mr-5">
<input
type="text"
matInput
@@ -57,7 +51,7 @@
}}</mat-option>
</mat-autocomplete>
</mat-form-field>
<mat-form-field fxFlex="20">
<mat-form-field class="flex-auto basis-1/5">
<mat-label>Amount</mat-label>
<span matPrefix>₹ </span>
<input type="text" matInput formControlName="amount" />
@@ -66,13 +60,9 @@
<div
formGroupName="addRow"
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col"
>
<mat-form-field fxFlex="55">
<mat-form-field class="flex-auto basis-[55%] mr-5">
<input
type="text"
matInput
@@ -93,7 +83,7 @@
}}</mat-option>
</mat-autocomplete>
</mat-form-field>
<mat-form-field fxFlex="25">
<mat-form-field class="flex-auto basis-1/4 mr-5">
<mat-label>Quantity</mat-label>
<input
type="text"
@@ -104,7 +94,9 @@
/>
</mat-form-field>
<button mat-raised-button color="primary" (click)="addRow()" fxFlex="20">Add</button>
<button mat-raised-button color="primary" (click)="addRow()" class="flex-auto basis-1/5">
Add
</button>
</div>
<mat-table #table [dataSource]="dataSource" matSort aria-label="Elements">
<!-- Product Column -->
@@ -174,14 +166,18 @@
formControlName="narration"
></textarea>
</mat-form-field>
<div fxLayout="row" fxLayoutGap="0.5%" fxLayoutAlign="center">
<div class="img-container" fxFlex="20%" *ngFor="let item of voucher.files">
<div class="flex flex-row justify-center items-stretch mr-5">
<div
class="img-container"
class="flex-auto mr-5 basis-1/5"
*ngFor="let item of voucher.files"
>
<img [src]="item.thumbnail" (click)="zoomImage(item)" />
<button mat-icon-button class="overlay" (click)="deleteImage(item)">
<mat-icon>delete</mat-icon>
</button>
</div>
<div class="img-container" fxFlex="20%">
<div class="img-container" class="flex flex-auto basis-1/5">
<label ng-href for="fileUp">
<img
src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAiIGhlaWdodD0iMTUwIj48cmVjdCB3aWR0aD0iMTAwIiBoZWlnaHQ9IjE1MCIgZmlsbD0iI2VlZSIvPjx0ZXh0IHRleHQtYW5jaG9yPSJtaWRkbGUiIHg9IjUwIiB5PSI3NSIgc3R5bGU9ImZpbGw6I2FhYTtmb250LXdlaWdodDpib2xkO2ZvbnQtc2l6ZToxMDBweDtmb250LWZhbWlseTpBcmlhbCxIZWx2ZXRpY2Esc2Fucy1zZXJpZjtkb21pbmFudC1iYXNlbGluZTpjZW50cmFsIj4rPC90ZXh0Pjwvc3ZnPg=="
overlord/src/app/purchase-return/purchase-return.module.ts
-2
View File
@@ -2,7 +2,6 @@ import { A11yModule } from '@angular/cdk/a11y';
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MomentDateAdapter } from '@angular/material-moment-adapter';
import { MatAutocompleteModule } from '@angular/material/autocomplete';
@@ -50,7 +49,6 @@ export const MY_FORMATS = {
A11yModule,
CommonModule,
CdkTableModule,
FlexLayoutModule,
HotkeyModule,
MatAutocompleteModule,
MatButtonModule,
overlord/src/app/purchase/purchase-dialog.component.html
+6 -12
View File
@@ -1,14 +1,8 @@
<h1 mat-dialog-title>Edit Purchase Entry</h1>
<div mat-dialog-content>
<form [formGroup]="form">
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex="52">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-form-field class="flex-auto basis-[52%] mr-5">
<input
type="text"
matInput
@@ -29,7 +23,7 @@
}}</mat-option>
</mat-autocomplete>
</mat-form-field>
<mat-form-field fxFlex="12">
<mat-form-field class="flex-auto basis-[12%] mr-5">
<mat-label>Quantity</mat-label>
<input
type="text"
@@ -39,7 +33,7 @@
autocomplete="off"
/>
</mat-form-field>
<mat-form-field fxFlex="12">
<mat-form-field class="flex-auto basis-[12%] mr-5">
<mat-label>Price</mat-label>
<input
type="text"
@@ -49,11 +43,11 @@
autocomplete="off"
/>
</mat-form-field>
<mat-form-field fxFlex="12">
<mat-form-field class="flex-auto basis-[12%] mr-5">
<mat-label>Tax</mat-label>
<input type="text" matInput placeholder="Tax" formControlName="tax" autocomplete="off" />
</mat-form-field>
<mat-form-field fxFlex="12">
<mat-form-field class="flex-auto basis-[12%]">
<mat-label>Discount</mat-label>
<input
type="text"
overlord/src/app/purchase/purchase.component.html
+21 -25
View File
@@ -11,15 +11,9 @@
</mat-icon>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex="40">
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-form-field class="flex-auto basis-2/5 mr-5">
<input
matInput
[matDatepicker]="date"
@@ -32,7 +26,7 @@
<mat-datepicker-toggle matSuffix [for]="date"></mat-datepicker-toggle>
<mat-datepicker #date></mat-datepicker>
</mat-form-field>
<mat-form-field fxFlex="40">
<mat-form-field class="flex-auto basis-2/5 mr-5">
<input
type="text"
matInput
@@ -57,7 +51,7 @@
}}</mat-option>
</mat-autocomplete>
</mat-form-field>
<mat-form-field fxFlex="20">
<mat-form-field class="flex-auto basis-1/5">
<mat-label>Amount</mat-label>
<span matPrefix>₹ </span>
<input type="text" matInput formControlName="amount" />
@@ -66,13 +60,9 @@
<div
formGroupName="addRow"
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col"
>
<mat-form-field fxFlex="50">
<mat-form-field class="flex-auto basis-1/2 mr-5">
<input
type="text"
matInput
@@ -93,7 +83,7 @@
}}</mat-option>
</mat-autocomplete>
</mat-form-field>
<mat-form-field fxFlex="10">
<mat-form-field class="flex-auto basis-1/10 mr-5">
<mat-label>Quantity</mat-label>
<input
type="text"
@@ -103,7 +93,7 @@
autocomplete="off"
/>
</mat-form-field>
<mat-form-field fxFlex="10">
<mat-form-field class="flex-auto basis-1/10 mr-5">
<mat-label>Price</mat-label>
<input
type="text"
@@ -113,11 +103,11 @@
autocomplete="off"
/>
</mat-form-field>
<mat-form-field fxFlex="10">
<mat-form-field class="flex-auto basis-1/10 mr-5">
<mat-label>Tax</mat-label>
<input type="text" matInput placeholder="Tax" formControlName="tax" autocomplete="off" />
</mat-form-field>
<mat-form-field fxFlex="10">
<mat-form-field class="flex-auto basis-1/10 mr-5">
<mat-label>Discount</mat-label>
<input
type="text"
@@ -128,7 +118,9 @@
/>
</mat-form-field>
<button mat-raised-button color="primary" (click)="addRow()" fxFlex="10">Add</button>
<button mat-raised-button color="primary" (click)="addRow()" class="flex-auto basis-1/10">
Add
</button>
</div>
<mat-table #table [dataSource]="dataSource" matSort aria-label="Elements">
<!-- Product Column -->
@@ -198,14 +190,18 @@
formControlName="narration"
></textarea>
</mat-form-field>
<div fxLayout="row" fxLayoutGap="0.5%" fxLayoutAlign="center">
<div class="img-container" fxFlex="20%" *ngFor="let item of voucher.files">
<div class="flex flex-row justify-center items-stretch mr-5">
<div
class="img-container"
class="flex-auto mr-5 basis-1/5"
*ngFor="let item of voucher.files"
>
<img [src]="item.thumbnail" (click)="zoomImage(item)" />
<button mat-icon-button class="overlay" (click)="deleteImage(item)">
<mat-icon>delete</mat-icon>
</button>
</div>
<div class="img-container" fxFlex="20%">
<div class="img-container" class="flex flex-auto basis-1/5">
<label ng-href for="fileUp">
<img
src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAiIGhlaWdodD0iMTUwIj48cmVjdCB3aWR0aD0iMTAwIiBoZWlnaHQ9IjE1MCIgZmlsbD0iI2VlZSIvPjx0ZXh0IHRleHQtYW5jaG9yPSJtaWRkbGUiIHg9IjUwIiB5PSI3NSIgc3R5bGU9ImZpbGw6I2FhYTtmb250LXdlaWdodDpib2xkO2ZvbnQtc2l6ZToxMDBweDtmb250LWZhbWlseTpBcmlhbCxIZWx2ZXRpY2Esc2Fucy1zZXJpZjtkb21pbmFudC1iYXNlbGluZTpjZW50cmFsIj4rPC90ZXh0Pjwvc3ZnPg=="
overlord/src/app/purchase/purchase.module.ts
-2
View File
@@ -2,7 +2,6 @@ import { A11yModule } from '@angular/cdk/a11y';
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MomentDateAdapter } from '@angular/material-moment-adapter';
import { MatAutocompleteModule } from '@angular/material/autocomplete';
@@ -50,7 +49,6 @@ export const MY_FORMATS = {
A11yModule,
CommonModule,
CdkTableModule,
FlexLayoutModule,
HotkeyModule,
MatAutocompleteModule,
MatButtonModule,
overlord/src/app/purchases/purchases.component.html
+7 -11
View File
@@ -3,15 +3,9 @@
<mat-card-title>Purchases</mat-card-title>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div
fxLayout="row"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
fxLayoutAlign="space-around start"
>
<mat-form-field fxFlex="40">
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-form-field class="flex-auto basis-2/5 mr-5">
<input
matInput
[matDatepicker]="startDate"
@@ -23,7 +17,7 @@
<mat-datepicker-toggle matSuffix [for]="startDate"></mat-datepicker-toggle>
<mat-datepicker #startDate></mat-datepicker>
</mat-form-field>
<mat-form-field fxFlex="40">
<mat-form-field class="flex-auto basis-2/5 mr-5">
<input
matInput
[matDatepicker]="finishDate"
@@ -35,7 +29,9 @@
<mat-datepicker-toggle matSuffix [for]="finishDate"></mat-datepicker-toggle>
<mat-datepicker #finishDate></mat-datepicker>
</mat-form-field>
<button fxFlex="20" mat-raised-button color="primary" (click)="show()">Show</button>
<button class="flex-auto basis-1/5" mat-raised-button color="primary" (click)="show()">
Show
</button>
</div>
</form>
<mat-table #table [dataSource]="dataSource" matSort aria-label="Elements">
overlord/src/app/purchases/purchases.module.ts
-2
View File
@@ -2,7 +2,6 @@ import { A11yModule } from '@angular/cdk/a11y';
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MomentDateAdapter } from '@angular/material-moment-adapter';
import { MatAutocompleteModule } from '@angular/material/autocomplete';
@@ -46,7 +45,6 @@ export const MY_FORMATS = {
A11yModule,
CommonModule,
CdkTableModule,
FlexLayoutModule,
MatAutocompleteModule,
MatButtonModule,
MatCardModule,
overlord/src/app/rate-contract/rate-contract-detail/rate-contract-detail.component.css
-3
View File
@@ -1,3 +0,0 @@
.example-card {
max-width: 400px;
}
overlord/src/app/rate-contract/rate-contract-detail/rate-contract-detail.component.html
+15 -29
View File
@@ -1,18 +1,12 @@
<div fxLayout="row" fxFlex="50%" fxLayoutAlign="space-around center" class="example-card">
<mat-card fxFlex>
<div class="flex flex-auto flex-row justify-around content-center items-center lg:max-w-[50%]">
<mat-card class="flex-auto">
<mat-card-title-group>
<mat-card-title>Rate Contract</mat-card-title>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex="40">
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-form-field class="flex-auto basis-2/5 mr-5">
<input
matInput
[matDatepicker]="date"
@@ -24,7 +18,7 @@
<mat-datepicker-toggle matSuffix [for]="date"></mat-datepicker-toggle>
<mat-datepicker #date></mat-datepicker>
</mat-form-field>
<mat-form-field fxFlex="60">
<mat-form-field class="flex-auto basis-3/5">
<input
type="text"
matInput
@@ -46,14 +40,8 @@
</mat-autocomplete>
</mat-form-field>
</div>
<div
fxLayout="row"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
fxLayoutAlign="space-around start"
>
<mat-form-field fxFlex>
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-form-field class="flex-auto mr-5">
<input
matInput
[matDatepicker]="validFrom"
@@ -64,7 +52,7 @@
<mat-datepicker-toggle matSuffix [for]="validFrom"></mat-datepicker-toggle>
<mat-datepicker #validFrom></mat-datepicker>
</mat-form-field>
<mat-form-field fxFlex>
<mat-form-field class="flex-auto">
<input
matInput
[matDatepicker]="validTill"
@@ -78,13 +66,9 @@
</div>
<div
formGroupName="addRow"
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col"
>
<mat-form-field fxFlex="60">
<mat-form-field class="flex-auto basis-3/5 mr-5">
<input
type="text"
matInput
@@ -105,7 +89,7 @@
}}</mat-option>
</mat-autocomplete>
</mat-form-field>
<mat-form-field fxFlex="20">
<mat-form-field class="flex-auto basis-1/5 mr-5">
<mat-label>Price</mat-label>
<input
type="text"
@@ -115,7 +99,9 @@
autocomplete="off"
/>
</mat-form-field>
<button mat-raised-button color="primary" (click)="addRow()" fxFlex="20">Add</button>
<button mat-raised-button color="primary" (click)="addRow()" class="flex-auto basis-1/5">
Add
</button>
</div>
<mat-table #table [dataSource]="dataSource" matSort aria-label="Elements">
<!-- Product Column -->
overlord/src/app/rate-contract/rate-contract.module.ts
-2
View File
@@ -1,7 +1,6 @@
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MomentDateAdapter } from '@angular/material-moment-adapter';
import { MatAutocompleteModule } from '@angular/material/autocomplete';
@@ -40,7 +39,6 @@ export const MY_FORMATS = {
imports: [
CommonModule,
CdkTableModule,
FlexLayoutModule,
MatButtonModule,
MatCardModule,
MatCheckboxModule,
overlord/src/app/raw-material-cost/raw-material-cost.component.html
+7 -11
View File
@@ -6,15 +6,9 @@
</button>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div
fxLayout="row"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
fxLayoutAlign="space-around start"
>
<mat-form-field fxFlex="40">
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-form-field class="flex-auto basis-2/5 mr-5">
<input
matInput
[matDatepicker]="startDate"
@@ -26,7 +20,7 @@
<mat-datepicker-toggle matSuffix [for]="startDate"></mat-datepicker-toggle>
<mat-datepicker #startDate></mat-datepicker>
</mat-form-field>
<mat-form-field fxFlex="40">
<mat-form-field class="flex-auto basis-2/5 mr-5">
<input
matInput
[matDatepicker]="finishDate"
@@ -38,7 +32,9 @@
<mat-datepicker-toggle matSuffix [for]="finishDate"></mat-datepicker-toggle>
<mat-datepicker #finishDate></mat-datepicker>
</mat-form-field>
<button fxFlex="20" mat-raised-button color="primary" (click)="show()">Show</button>
<button class="flex-auto basis-1/5" mat-raised-button color="primary" (click)="show()">
Show
</button>
</div>
</form>
<mat-table #table [dataSource]="dataSource" matSort aria-label="Elements">
overlord/src/app/raw-material-cost/raw-material-cost.module.ts
-2
View File
@@ -2,7 +2,6 @@ import { A11yModule } from '@angular/cdk/a11y';
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MomentDateAdapter } from '@angular/material-moment-adapter';
import { MatAutocompleteModule } from '@angular/material/autocomplete';
@@ -46,7 +45,6 @@ export const MY_FORMATS = {
A11yModule,
CommonModule,
CdkTableModule,
FlexLayoutModule,
MatAutocompleteModule,
MatButtonModule,
MatCardModule,
overlord/src/app/receipt/receipt-dialog.component.html
+3 -10
View File
@@ -1,15 +1,8 @@
<h1 mat-dialog-title>Edit Receipt Entry</h1>
<div mat-dialog-content>
<form [formGroup]="form">
<div
fxLayout="row"
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex="65">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-form-field class="flex-auto basis-2/3 mr-5">
<input
type="text"
matInput
@@ -34,7 +27,7 @@
account.name
}}</mat-option>
</mat-autocomplete>
<mat-form-field fxFlex="35">
<mat-form-field class="flex-auto basis-1/3">
<mat-label>Amount</mat-label>
<span matPrefix>₹ </span>
<input
overlord/src/app/receipt/receipt.component.html
+19 -23
View File
@@ -11,15 +11,9 @@
</mat-icon>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex="40">
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-form-field class="flex-auto basis-2/5 mr-5">
<input
matInput
[matDatepicker]="date"
@@ -32,14 +26,14 @@
<mat-datepicker-toggle matSuffix [for]="date"></mat-datepicker-toggle>
<mat-datepicker #date></mat-datepicker>
</mat-form-field>
<mat-form-field fxFlex="40">
<mat-form-field class="flex-auto basis-2/5 mr-5">
<mat-select formControlName="receiptAccount">
<mat-option *ngFor="let account of receiptAccounts" [value]="account.id">
{{ account.name }}
</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field fxFlex="20">
<mat-form-field class="flex-auto basis-1/5">
<mat-label>Receipt Amount</mat-label>
<span matPrefix>₹ </span>
<input type="text" matInput formControlName="receiptAmount" />
@@ -48,13 +42,9 @@
<div
formGroupName="addRow"
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col"
>
<mat-form-field fxFlex="55">
<mat-form-field class="flex-auto basis-[55%] mr-5">
<input
type="text"
matInput
@@ -79,7 +69,7 @@
account.name
}}</mat-option>
</mat-autocomplete>
<mat-form-field fxFlex="25">
<mat-form-field class="flex-auto basis-1/4 mr-5">
<mat-label>Amount</mat-label>
<span matPrefix>₹ </span>
<input
@@ -91,7 +81,9 @@
/>
</mat-form-field>
<button mat-raised-button color="primary" (click)="addRow()" fxFlex="20">Add</button>
<button mat-raised-button color="primary" (click)="addRow()" class="flex-auto basis-1/5">
Add
</button>
</div>
<mat-table #table [dataSource]="dataSource" matSort aria-label="Elements">
<!-- Account Column -->
@@ -124,7 +116,7 @@
<mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
<mat-row *matRowDef="let row; columns: displayedColumns"></mat-row>
</mat-table>
<mat-form-field>
<mat-form-field class="flex-auto">
<mat-label>Narration</mat-label>
<textarea
matInput
@@ -133,14 +125,18 @@
formControlName="narration"
></textarea>
</mat-form-field>
<div fxLayout="row" fxLayoutGap="0.5%" fxLayoutAlign="center">
<div class="img-container" fxFlex="20%" *ngFor="let item of voucher.files">
<div class="flex flex-row justify-center items-stretch">
<div
class="img-container"
class="flex-auto mr-5 basis-1/5"
*ngFor="let item of voucher.files"
>
<img [src]="item.thumbnail" (click)="zoomImage(item)" />
<button mat-icon-button class="overlay" (click)="deleteImage(item)">
<mat-icon>delete</mat-icon>
</button>
</div>
<div class="img-container" fxFlex="20%">
<div class="img-container" class="flex flex-auto basis-1/5">
<label ng-href for="fileUp">
<img
src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAiIGhlaWdodD0iMTUwIj48cmVjdCB3aWR0aD0iMTAwIiBoZWlnaHQ9IjE1MCIgZmlsbD0iI2VlZSIvPjx0ZXh0IHRleHQtYW5jaG9yPSJtaWRkbGUiIHg9IjUwIiB5PSI3NSIgc3R5bGU9ImZpbGw6I2FhYTtmb250LXdlaWdodDpib2xkO2ZvbnQtc2l6ZToxMDBweDtmb250LWZhbWlseTpBcmlhbCxIZWx2ZXRpY2Esc2Fucy1zZXJpZjtkb21pbmFudC1iYXNlbGluZTpjZW50cmFsIj4rPC90ZXh0Pjwvc3ZnPg=="
overlord/src/app/receipt/receipt.module.ts
-2
View File
@@ -2,7 +2,6 @@ import { A11yModule } from '@angular/cdk/a11y';
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MomentDateAdapter } from '@angular/material-moment-adapter';
import { MatAutocompleteModule } from '@angular/material/autocomplete';
@@ -50,7 +49,6 @@ export const MY_FORMATS = {
A11yModule,
CommonModule,
CdkTableModule,
FlexLayoutModule,
HotkeyModule,
MatAutocompleteModule,
MatButtonModule,
overlord/src/app/recipe/recipe-detail/recipe-detail.component.css
-3
View File
@@ -1,3 +0,0 @@
.example-card {
max-width: 400px;
}
overlord/src/app/recipe/recipe-detail/recipe-detail.component.html
+16 -24
View File
@@ -3,15 +3,9 @@
<mat-card-title>Recipe Detail</mat-card-title>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div
fxLayout="row"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
fxLayoutAlign="space-around start"
>
<mat-form-field fxFlex>
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start">
<mat-form-field class="flex-auto">
<mat-select formControlName="period">
<mat-option *ngFor="let p of periods" [value]="p">
{{ p.validFrom }} to {{ p.validTill }}
@@ -19,8 +13,8 @@
</mat-select>
</mat-form-field>
</div>
<div fxLayout="row" fxLayout.lt-md="column" fxLayoutGap="20px" fxLayoutGap.lt-md="0px">
<mat-form-field fxFlex="60">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-form-field class="flex-auto basis-3/5 mr-5">
<input
type="text"
matInput
@@ -41,7 +35,7 @@
}}</mat-option>
</mat-autocomplete>
</mat-form-field>
<mat-form-field fxFlex="10">
<mat-form-field class="flex-auto basis-1/10 mr-5">
<mat-label>Yield</mat-label>
<input
type="text"
@@ -51,7 +45,7 @@
autocomplete="off"
/>
</mat-form-field>
<mat-form-field fxFlex="10">
<mat-form-field class="flex-auto basis-1/10 mr-5">
<mat-label>Sale Price</mat-label>
<span matPrefix>₹ </span>
<input
@@ -62,7 +56,7 @@
autocomplete="off"
/>
</mat-form-field>
<mat-form-field fxFlex="10">
<mat-form-field class="flex-auto basis-1/10 mr-5">
<mat-label>Cost Price</mat-label>
<span matPrefix>₹ </span>
<input
@@ -73,7 +67,7 @@
autocomplete="off"
/>
</mat-form-field>
<mat-form-field fxFlex="10">
<mat-form-field class="flex-auto basis-1/10">
<mat-label>Cost Percentage</mat-label>
<input
type="text"
@@ -87,13 +81,9 @@
</div>
<div
formGroupName="addRow"
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col"
>
<mat-form-field fxFlex="50">
<mat-form-field class="flex-auto basis-1/2 mr-5">
<input
type="text"
matInput
@@ -114,7 +104,7 @@
>
</mat-autocomplete>
</mat-form-field>
<mat-form-field fxFlex="20">
<mat-form-field class="flex-auto basis-1/5 mr-5">
<mat-label>Quantity</mat-label>
<input
type="text"
@@ -124,7 +114,7 @@
autocomplete="off"
/>
</mat-form-field>
<mat-form-field fxFlex="20">
<mat-form-field class="flex-auto basis-1/5 mr-5">
<mat-label>Rate</mat-label>
<span matPrefix>₹ </span>
<input
@@ -136,7 +126,9 @@
/>
</mat-form-field>
<button mat-raised-button color="primary" (click)="addRow()" fxFlex="15">Add</button>
<button mat-raised-button color="primary" (click)="addRow()" class="flex-auto basis-1/10">
Add
</button>
</div>
<mat-table #table [dataSource]="dataSource" matSort aria-label="Elements">
<!-- Ingredient Column -->
overlord/src/app/recipe/recipe-list/recipe-list.component.html
+4 -10
View File
@@ -7,22 +7,16 @@
</a>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex>
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-form-field class="flex-auto">
<mat-select formControlName="period">
<mat-option *ngFor="let p of periods" [value]="p">
{{ p.validFrom }} to {{ p.validTill }}
</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field fxFlex>
<mat-form-field class="flex-auto">
<mat-label>Product Type</mat-label>
<mat-select
placeholder="Product Category"
overlord/src/app/recipe/recipe.module.ts
-2
View File
@@ -1,7 +1,6 @@
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MomentDateAdapter } from '@angular/material-moment-adapter';
import { MatAutocompleteModule } from '@angular/material/autocomplete';
@@ -41,7 +40,6 @@ export const MY_FORMATS = {
imports: [
CommonModule,
CdkTableModule,
FlexLayoutModule,
MatButtonModule,
MatCardModule,
MatCheckboxModule,
overlord/src/app/role/role-detail/role-detail.component.css
-3
View File
@@ -1,3 +0,0 @@
.example-card {
max-width: 400px;
}
overlord/src/app/role/role-detail/role-detail.component.html
+7 -18
View File
@@ -1,18 +1,12 @@
<div fxLayout="row" fxFlex="50%" fxLayoutAlign="space-around center" class="example-card">
<mat-card fxFlex>
<div class="flex flex-auto flex-row justify-around content-center items-center lg:max-w-[50%]">
<mat-card class="flex-auto">
<mat-card-title-group>
<mat-card-title>Role</mat-card-title>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex>
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start">
<mat-form-field class="flex-auto">
<mat-label>Name</mat-label>
<input matInput #nameElement placeholder="Name" formControlName="name" />
</mat-form-field>
@@ -20,16 +14,11 @@
<mat-divider></mat-divider>
<div formArrayName="permissions">
<div
fxLayout="row"
class="flex flex-row justify-around content-start items-start"
*ngFor="let p of item.permissions; index as i"
[formGroupName]="i"
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-checkbox formControlName="permission" fxFlex>{{ p.name }}</mat-checkbox>
<mat-checkbox formControlName="permission" class="flex-auto">{{ p.name }}</mat-checkbox>
</div>
</div>
</form>
overlord/src/app/role/role.module.ts
-2
View File
@@ -1,7 +1,6 @@
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
import { MatCardModule } from '@angular/material/card';
@@ -24,7 +23,6 @@ import { RoleRoutingModule } from './role-routing.module';
imports: [
CommonModule,
CdkTableModule,
FlexLayoutModule,
MatButtonModule,
MatCardModule,
MatCheckboxModule,
overlord/src/app/settings/settings.component.html
+54 -66
View File
@@ -2,19 +2,19 @@
<mat-tab label="Lock Dates">
<mat-card>
<mat-card-content>
<form [formGroup]="lockInfoForm" fxLayout="column">
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-checkbox formControlName="lockOlder" fxFlex="20">Lock Older</mat-checkbox>
<mat-checkbox formControlName="olderRolling" *ngIf="lockOlder" fxFlex="20">
<form [formGroup]="lockInfoForm" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-checkbox formControlName="lockOlder" class="flex-auto basis-1/5 mr-5"
>Lock Older</mat-checkbox
>
<mat-checkbox
formControlName="olderRolling"
*ngIf="lockOlder"
class="flex-auto basis-1/5 mr-5"
>
Is Rolling
</mat-checkbox>
<mat-form-field fxFlex="60" *ngIf="lockOlder && !olderRolling">
<mat-form-field class="flex-auto basis-3/5" *ngIf="lockOlder && !olderRolling">
<input
matInput
[matDatepicker]="olderDate"
@@ -25,22 +25,22 @@
<mat-datepicker-toggle matSuffix [for]="olderDate"></mat-datepicker-toggle>
<mat-datepicker #olderDate></mat-datepicker>
</mat-form-field>
<mat-form-field fxFlex="60" *ngIf="lockOlder && olderRolling">
<mat-form-field class="flex-auto basis-3/5" *ngIf="lockOlder && olderRolling">
<input matInput placeholder="Days" formControlName="olderDays" autocomplete="off" />
</mat-form-field>
</div>
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-checkbox formControlName="lockNewer" fxFlex="20">Lock Newer</mat-checkbox>
<mat-checkbox formControlName="newerRolling" *ngIf="lockNewer" fxFlex="20">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-checkbox formControlName="lockNewer" class="flex-auto basis-1/5 mr-5"
>Lock Newer</mat-checkbox
>
<mat-checkbox
formControlName="newerRolling"
*ngIf="lockNewer"
class="flex-auto basis-1/5 mr-5"
>
Is Rolling
</mat-checkbox>
<mat-form-field fxFlex="60" *ngIf="lockNewer && !newerRolling">
<mat-form-field class="flex-auto basis-3/5" *ngIf="lockNewer && !newerRolling">
<input
matInput
[matDatepicker]="newerDate"
@@ -51,56 +51,38 @@
<mat-datepicker-toggle matSuffix [for]="newerDate"></mat-datepicker-toggle>
<mat-datepicker #newerDate></mat-datepicker>
</mat-form-field>
<mat-form-field fxFlex="60" *ngIf="lockNewer && newerRolling">
<mat-form-field class="flex-auto basis-3/5" *ngIf="lockNewer && newerRolling">
<input matInput placehnewer="Days" formControlName="newerDays" autocomplete="off" />
</mat-form-field>
</div>
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<div formArrayName="accountTypes">
<h3>Account Types</h3>
<div
fxLayout="row"
*ngFor="let at of accountTypes; index as i"
[formGroupName]="i"
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
class="flex flex-row justify-around content-start items-start"
>
<mat-checkbox formControlName="accountType" fxFlex>{{ at.name }}</mat-checkbox>
<mat-checkbox formControlName="accountType" class="flex-auto">{{
at.name
}}</mat-checkbox>
</div>
</div>
<div formArrayName="voucherTypes">
<h3>Voucher Types</h3>
<div
fxLayout="row"
*ngFor="let vt of voucherTypes; index as j"
[formGroupName]="j"
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
class="flex flex-row justify-around content-start items-start"
>
<mat-checkbox formControlName="voucherType" fxFlex>{{ vt.name }}</mat-checkbox>
<mat-checkbox formControlName="voucherType" class="flex-auto">{{
vt.name
}}</mat-checkbox>
</div>
</div>
</div>
<div
fxLayout="row"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
fxLayoutAlign="space-around start"
>
<mat-form-field fxFlex="30%">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-form-field class="flex-auto basis-3/10 mr-5">
<input
matInput
[matDatepicker]="validFrom"
@@ -111,7 +93,7 @@
<mat-datepicker-toggle matSuffix [for]="validFrom"></mat-datepicker-toggle>
<mat-datepicker #validFrom></mat-datepicker>
</mat-form-field>
<mat-form-field fxFlex="30%">
<mat-form-field class="flex-auto basis-3/10 mr-5">
<input
matInput
[matDatepicker]="validTill"
@@ -122,7 +104,7 @@
<mat-datepicker-toggle matSuffix [for]="validTill"></mat-datepicker-toggle>
<mat-datepicker #validTill></mat-datepicker>
</mat-form-field>
<mat-form-field fxFlex="20">
<mat-form-field class="flex-auto basis-1/5 mr-5">
<mat-label>Index</mat-label>
<input
type="text"
@@ -132,7 +114,14 @@
autocomplete="off"
/>
</mat-form-field>
<button mat-raised-button color="primary" (click)="saveLock()">Add</button>
<button
mat-raised-button
color="primary"
(click)="saveLock()"
class="flex-auto basis-1/5"
>
Add
</button>
</div>
<mat-table #table [dataSource]="dataSource" matSort aria-label="Elements">
<!-- Index Column -->
@@ -203,15 +192,9 @@
<mat-tab label="Rebase Data">
<mat-card>
<mat-card-content>
<form [formGroup]="rebaseDataForm" fxLayout="column">
<div
fxLayout="row"
fxLayoutAlign="space-around start"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
>
<mat-form-field fxFlex="80">
<form [formGroup]="rebaseDataForm" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-form-field class="flex-auto basis-4/5 mr-5">
<input
matInput
[matDatepicker]="rebaseDataDate"
@@ -224,7 +207,12 @@
<mat-datepicker #rebaseDataDate></mat-datepicker>
</mat-form-field>
<button mat-raised-button color="primary" (click)="confirmRebase()" fxFlex="20">
<button
mat-raised-button
color="primary"
(click)="confirmRebase()"
class="flex-auto basis-1/5"
>
Rebase
</button>
</div>
@@ -248,7 +236,7 @@
mat-raised-button
[color]="maintenance.enabled ? 'warn' : 'primary'"
(click)="toggleMaintenance()"
fxFlex="100"
class="flex-auto"
>
{{ maintenance.enabled ? 'Disable' : 'Enable' }}
</button>
overlord/src/app/settings/settings.module.ts
-2
View File
@@ -2,7 +2,6 @@ import { A11yModule } from '@angular/cdk/a11y';
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MomentDateAdapter } from '@angular/material-moment-adapter';
import { MatAutocompleteModule } from '@angular/material/autocomplete';
@@ -49,7 +48,6 @@ export const MY_FORMATS = {
A11yModule,
CommonModule,
CdkTableModule,
FlexLayoutModule,
MatAutocompleteModule,
MatButtonModule,
MatCardModule,
overlord/src/app/stock-movement/stock-movement.component.html
+7 -11
View File
@@ -3,15 +3,9 @@
<mat-card-title>Stock Movement</mat-card-title>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div
fxLayout="row"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
fxLayoutAlign="space-around start"
>
<mat-form-field fxFlex="40">
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-form-field class="flex-auto basis-2/5 mr-5">
<input
matInput
[matDatepicker]="startDate"
@@ -23,7 +17,7 @@
<mat-datepicker-toggle matSuffix [for]="startDate"></mat-datepicker-toggle>
<mat-datepicker #startDate></mat-datepicker>
</mat-form-field>
<mat-form-field fxFlex="40">
<mat-form-field class="flex-auto basis-2/5 mr-5">
<input
matInput
[matDatepicker]="finishDate"
@@ -35,7 +29,9 @@
<mat-datepicker-toggle matSuffix [for]="finishDate"></mat-datepicker-toggle>
<mat-datepicker #finishDate></mat-datepicker>
</mat-form-field>
<button fxFlex="20" mat-raised-button color="primary" (click)="show()">Show</button>
<button class="flex-auto basis-1/5" mat-raised-button color="primary" (click)="show()">
Show
</button>
</div>
</form>
<mat-table #table [dataSource]="dataSource" matSort aria-label="Elements">
overlord/src/app/stock-movement/stock-movement.module.ts
-2
View File
@@ -2,7 +2,6 @@ import { A11yModule } from '@angular/cdk/a11y';
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MomentDateAdapter } from '@angular/material-moment-adapter';
import { MatAutocompleteModule } from '@angular/material/autocomplete';
@@ -46,7 +45,6 @@ export const MY_FORMATS = {
A11yModule,
CommonModule,
CdkTableModule,
FlexLayoutModule,
MatAutocompleteModule,
MatButtonModule,
MatCardModule,
overlord/src/app/trial-balance/trial-balance.component.html
+4 -10
View File
@@ -3,15 +3,9 @@
<mat-card-title>Trial Balance</mat-card-title>
</mat-card-title-group>
<mat-card-content>
<form [formGroup]="form" fxLayout="column">
<div
fxLayout="row"
fxLayout.lt-md="column"
fxLayoutGap="20px"
fxLayoutGap.lt-md="0px"
fxLayoutAlign="space-around start"
>
<mat-form-field fxFlex>
<form [formGroup]="form" class="flex flex-col">
<div class="flex flex-row justify-around content-start items-start sm:max-lg:flex-col">
<mat-form-field class="flex-auto basis-4/5 mr-5">
<input
matInput
[matDatepicker]="dateInput"
@@ -23,7 +17,7 @@
<mat-datepicker-toggle matSuffix [for]="dateInput"></mat-datepicker-toggle>
<mat-datepicker #dateInput></mat-datepicker>
</mat-form-field>
<button mat-raised-button color="primary" (click)="show()">Show</button>
<button mat-raised-button color="primary" (click)="show()" class="flex-auto">Show</button>
</div>
</form>
<mat-table #table [dataSource]="dataSource" matSort aria-label="Elements">
overlord/src/app/trial-balance/trial-balance.module.ts
-2
View File
@@ -2,7 +2,6 @@ import { A11yModule } from '@angular/cdk/a11y';
import { CdkTableModule } from '@angular/cdk/table';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { ReactiveFormsModule } from '@angular/forms';
import { MomentDateAdapter } from '@angular/material-moment-adapter';
import { MatButtonModule } from '@angular/material/button';
@@ -44,7 +43,6 @@ export const MY_FORMATS = {
A11yModule,
CommonModule,
CdkTableModule,
FlexLayoutModule,
MatButtonModule,
MatCardModule,
MatCheckboxModule,
overlord/src/app/user/user-detail/user-detail.component.css
-3
View File
@@ -1,3 +0,0 @@
.example-card {
max-width: 400px;
}
Loaded 100 of 104 files, more files were not shown because too many files have changed in this diff. Show more