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

Bumped the version to 7 

Fixed double exception being thrown
Currency pipe broke the accounts pipe
This commit is contained in:
Amritanshu Agrawal 2020-06-01 09:01:31 +05:30
parent 1c2c98e7b5
commit 7b4756fe1a
26 changed files with 55 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
brewman/routers/account.py
View File

@ -1,4 +1,3 @@
import traceback
import uuid
from typing import List, Optional
from datetime import datetime
@ -49,9 +48,7 @@ def save(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
@router.put("/{id_}", response_model=schemas.Account)
@ -84,9 +81,7 @@ def update(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
@router.delete("/{id}")

5
brewman/routers/attendance.py
View File

@ -1,4 +1,3 @@
import traceback
from datetime import datetime, date, timedelta
from fastapi import APIRouter, HTTPException, status, Depends, Security, Request
@ -107,9 +106,7 @@ def save(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
def date_range(start: date, stop: date, step=timedelta(days=1), inclusive=False):

9
brewman/routers/auth/client.py
View File

@ -1,4 +1,3 @@
import traceback
import uuid
from fastapi import APIRouter, HTTPException, status, Depends, Security
@ -46,9 +45,7 @@ def update(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
@router.delete("/{id_}")
@ -68,9 +65,7 @@ def delete(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
@router.get("/list")

13
brewman/routers/auth/role.py
View File

@ -1,4 +1,3 @@
import traceback
import uuid
from typing import List, Optional
@ -41,9 +40,7 @@ def save(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
@router.put("/{id_}", response_model=schemas.Role)
@ -66,9 +63,7 @@ def update(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
def add_permissions(role: Role, permissions: List[schemas.PermissionItem], db):
@ -97,9 +92,7 @@ def delete(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
@router.get("")

17
brewman/routers/auth/user.py
View File

@ -1,4 +1,3 @@
import traceback
import uuid
from typing import List, Optional
@ -41,9 +40,7 @@ def save(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
@router.get("/me", response_model=schemas.User)
@ -75,9 +72,7 @@ def update_me(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
@router.put("/{id_}", response_model=schemas.User)
@ -103,9 +98,7 @@ def update(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
def add_roles(user: User, roles: List[schemas.RoleItem], db: Session):
@ -134,9 +127,7 @@ def delete(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
@router.get("")

14
brewman/routers/cost_centre.py
View File

@ -1,4 +1,3 @@
import traceback
import uuid
from typing import List, Optional
@ -42,9 +41,7 @@ def save(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
@router.put("/{id_}", response_model=schemas.CostCentre)
@ -70,9 +67,8 @@ def update(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
@router.delete("/{id_}")
@ -96,9 +92,7 @@ def delete(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
@router.get("")

9
brewman/routers/employee.py
View File

@ -1,4 +1,3 @@
import traceback
import uuid
from sqlalchemy import desc
@ -51,9 +50,7 @@ def save(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
@router.put("/{id_}", response_model=schemas.Employee)
@ -87,9 +84,7 @@ def update(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
@router.delete("/{id_}")

13
brewman/routers/employee_benefit.py
View File

@ -1,4 +1,3 @@
import traceback
import uuid
from math import ceil
from typing import List
@ -75,9 +74,7 @@ def save_route(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
def save(data: schema_in.EmployeeBenefitIn, date_: date, user: UserToken, db: Session) -> Voucher:
@ -163,9 +160,7 @@ def update_route(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
def update(id_: uuid.UUID, data: schema_in.EmployeeBenefitIn, user: UserToken, db: Session) -> Voucher:
@ -222,9 +217,7 @@ def get_id(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
@router.get("", response_model=output.Voucher)

13
brewman/routers/incentive.py
View File

@ -1,4 +1,3 @@
import traceback
import uuid
from decimal import Decimal
from typing import List, Optional
@ -73,9 +72,7 @@ def save_route(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
def save(data: schema_in.IncentiveIn, user: UserToken, db: Session) -> Voucher:
@ -138,9 +135,7 @@ def update_route(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
def update(id_: uuid.UUID, data: schema_in.IncentiveIn, user: UserToken, db: Session) -> Voucher:
@ -185,9 +180,7 @@ def get_id(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
@router.get("", response_model=output.Voucher)

13
brewman/routers/issue.py
View File

@ -1,4 +1,3 @@
import traceback
import uuid
from datetime import datetime
from decimal import Decimal
@ -69,9 +68,7 @@ def save_route(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
def save(data: schema_in.IssueIn, user: UserToken, db: Session) -> (Voucher, Optional[bool]):
@ -176,9 +173,7 @@ def update_route(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
def update(id_: uuid.UUID, data: schema_in.IssueIn, user: UserToken, db: Session) -> (Voucher, Optional[bool]):
@ -306,9 +301,7 @@ def get_id(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
@router.get("", response_model=output.Voucher)

10
brewman/routers/journal.py
View File

@ -1,4 +1,3 @@
import traceback
import uuid
from typing import List
from datetime import datetime
@ -65,6 +64,7 @@ def save_route(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=str(e),
)
except Exception:
db.rollback()
raise
@ -111,9 +111,7 @@ def update_route(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
def update(id_: uuid.UUID, data: schema_in.JournalIn, user: UserToken, db: Session) -> Voucher:
@ -174,9 +172,7 @@ def get_id(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
@router.get("", response_model=output.Voucher)

9
brewman/routers/product.py
View File

@ -1,4 +1,3 @@
import traceback
import uuid
from typing import Optional
@ -54,9 +53,7 @@ def save(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
@router.put("/{id_}", response_model=schemas.Product)
@ -93,9 +90,7 @@ def update(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
@router.delete("/{id_}")

13
brewman/routers/product_group.py
View File

@ -1,4 +1,3 @@
import traceback
import uuid
from typing import List, Optional
@ -42,9 +41,7 @@ def save(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
@router.put("/{id_}", response_model=schemas.ProductGroup)
@ -70,9 +67,7 @@ def update(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
@router.delete("/{id_}")
@ -96,9 +91,7 @@ def delete(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
@router.get("")

13
brewman/routers/purchase.py
View File

@ -1,4 +1,3 @@
import traceback
import uuid
from decimal import Decimal
from typing import List
@ -69,9 +68,7 @@ def save_route(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
def save(data: schema_in.PurchaseIn, user: UserToken, db: Session) -> Voucher:
@ -158,9 +155,7 @@ def update_route(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
def update(id_: uuid.UUID, data: schema_in.PurchaseIn, user: UserToken, db: Session) -> Voucher:
@ -301,9 +296,7 @@ def get_id(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
@router.get("", response_model=output.Voucher)

13
brewman/routers/purchase_return.py
View File

@ -1,4 +1,3 @@
import traceback
import uuid
from decimal import Decimal
from typing import List
@ -68,9 +67,7 @@ def save_route(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
def save(data: schema_in.PurchaseIn, user: UserToken, db: Session) -> Voucher:
@ -154,9 +151,7 @@ def update_route(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
def update(id_: uuid.UUID, data: schema_in.PurchaseIn, user: UserToken, db: Session) -> Voucher:
@ -248,9 +243,7 @@ def get_id(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
@router.get("", response_model=output.Voucher)

5
brewman/routers/voucher.py
View File

@ -1,4 +1,3 @@
import traceback
import uuid
from typing import Optional
from datetime import datetime, date
@ -67,9 +66,7 @@ def post_voucher(
)
except Exception:
db.rollback()
raise HTTPException(
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=traceback.format_exc(),
)
raise
def check_delete_permissions(voucher: Voucher, user: UserToken):

2
overlord/package.json
View File

@ -1,6 +1,6 @@
{
"name": "overlord",
"version": "0.0.0",
"version": "7.0.0",
"scripts": {
"ng": "ng",
"start": "ng serve",

4
overlord/src/app/daybook/daybook.component.html
View File

@ -66,8 +66,8 @@
</ng-container>
<mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
<mat-row *matRowDef="let row; columns: displayedColumns;" [ngClass]="getRowClass(row.id, row.posted)"
(click)="selectRow(row.id)"></mat-row>
<mat-row *matRowDef="let row; columns: displayedColumns;" [class.selected]="selectedRowId === row.id"
[class.unposted]="!row.posted && selectedRowId !== row.id" (click)="selectRow(row.id)"></mat-row>
</mat-table>
<mat-paginator #paginator

10
overlord/src/app/daybook/daybook.component.ts
View File

@ -48,16 +48,6 @@ export class DaybookComponent implements OnInit {
this.selectedRowId = id;
}
getRowClass(id: string, posted: boolean): string {
if (this.selectedRowId === id) {
return 'selected';
} else if (!posted) {
return 'unposted';
} else {
return '';
}
}
show() {
const l = this.prepareSubmit();
this.router.navigate(['daybook'], {

3
overlord/src/app/journal/journal.component.ts
View File

@ -133,7 +133,8 @@ export class JournalComponent implements OnInit, AfterViewInit, OnDestroy {
rowAmount(amount: string = '', debit: number): any {
try {
const val = math.eval(amount.trim().replace(',', ''));
amount = amount.replace(new RegExp('(₹[\s]*)|(,)|(\s)', 'g'), '');
const val = math.eval(amount);
if (val < 0) {
debit *= -1;
}

4
overlord/src/app/ledger/ledger.component.html
View File

@ -87,8 +87,8 @@
</ng-container>
<mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
<mat-row *matRowDef="let row; columns: displayedColumns;" [ngClass]="getRowClass(row.id, row.posted)"
(click)="selectRow(row.id)"></mat-row>
<mat-row *matRowDef="let row; columns: displayedColumns;" [class.selected]="selectedRowId === row.id"
[class.unposted]="!row.posted && selectedRowId !== row.id" (click)="selectRow(row.id)"></mat-row>
<mat-footer-row *matFooterRowDef="displayedColumns"></mat-footer-row>
</mat-table>

10
overlord/src/app/ledger/ledger.component.ts
View File

@ -104,16 +104,6 @@ export class LedgerComponent implements OnInit, AfterViewInit {
this.selectedRowId = id;
}
getRowClass(id: string, posted: boolean): string {
if (this.selectedRowId === id) {
return 'selected';
} else if (!posted) {
return 'unposted';
} else {
return '';
}
}
show() {
const info = this.getInfo();
this.router.navigate(['ledger', info.account.id], {

3
overlord/src/app/payment/payment.component.ts
View File

@ -141,7 +141,8 @@ export class PaymentComponent implements OnInit, AfterViewInit, OnDestroy {
rowAmount(amount: string = ''): number {
try {
return math.eval(amount.trim().replace(',', ''));
amount = amount.replace(new RegExp('(₹[\s]*)|(,)|(\s)', 'g'), '');
return math.eval(amount);
} catch {
return 0;
}

3
overlord/src/app/receipt/receipt.component.ts
View File

@ -140,7 +140,8 @@ export class ReceiptComponent implements OnInit, AfterViewInit, OnDestroy {
rowAmount(amount: string = ''): number {
try {
return math.eval(amount.trim().replace(',', ''));
amount = amount.replace(new RegExp('(₹[\s]*)|(,)|(\s)', 'g'), '');
return math.eval(amount);
} catch {
return 0;
}

2
overlord/src/app/shared/accounting.pipe.ts
View File

@ -13,7 +13,7 @@ export class AccountingPipe implements PipeTransform {
if (value === null) {
return '';
}
const amount = +(value.replace(new RegExp('(₹ )|(,)', 'g'), ''));
const amount = +(value.replace(new RegExp('(₹[\s]*)|(,)', 'g'), ''));
return value.replace('-', '') + ((amount < 0) ? '\u00A0Cr' : '\u00A0Dr');
}

2
setup.py
View File

@ -11,7 +11,7 @@ with open(os.path.join(here, 'requirements.txt'), "r") as r:
requires = r.read().splitlines()
setup(name='brewman',
version='6.0',
version='7.0',
description='brewman',
long_description=README + '\n\n' + CHANGES,
classifiers=[