imacat/mia-accounting
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 41 Wiki Activity

Added to query the "offset needed" in the get_account_query function.

Browse Source
This commit is contained in:
依瑪貓 2023-02-01 20:03:56 +08:00
parent 9497fa371e
commit 2359842e80
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/accounting/account/query.py
View File

@ -20,6 +20,7 @@
import sqlalchemy as sa import sqlalchemy as sa
from flask import request from flask import request
from accounting.locale import gettext
from accounting.models import Account, AccountL10n from accounting.models import Account, AccountL10n
from accounting.utils.query import parse_query_keywords from accounting.utils.query import parse_query_keywords
@ -41,10 +42,14 @@ def get_account_query() -> list[Account]:
l10n: list[AccountL10n] = AccountL10n.query\ l10n: list[AccountL10n] = AccountL10n.query\
.filter(AccountL10n.title.contains(k)).all() .filter(AccountL10n.title.contains(k)).all()
l10n_matches: set[str] = {x.account_id for x in l10n} l10n_matches: set[str] = {x.account_id for x in l10n}
conditions.append(sa.or_(Account.base_code.contains(k), sub_conditions: list[sa.BinaryExpression] \
Account.title_l10n.contains(k), = [Account.base_code.contains(k),
code.contains(k), Account.title_l10n.contains(k),
Account.id.in_(l10n_matches))) code.contains(k),
Account.id.in_(l10n_matches)]
if k in gettext("Offset needed"):
sub_conditions.append(Account.is_offset_needed)
conditions.append(sa.or_(*sub_conditions))
return Account.query.filter(*conditions)\ return Account.query.filter(*conditions)\
.order_by(Account.base_code, Account.no).all() .order_by(Account.base_code, Account.no).all()