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

Moved the common codes in the make_transaction_form_from_post() and fill_transaction_from_post() utilities to the new _find_max_record_no() utility, to avoid duplicated codes in the accounting application.

Browse Source
This commit is contained in:
依瑪貓 2020-08-02 02:37:18 +08:00
parent 413c0fe112
commit 73c961cfee
1 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
accounting/utils.py
View File

@ -295,19 +295,7 @@ def fill_transaction_from_post(transaction, post):
if "notes" in post: if "notes" in post:
transaction.notes = post["notes"] transaction.notes = post["notes"]
# The records # The records
max_no = { max_no = _find_max_record_no(post)
"debit": 0,
"credit": 0,
}
for key in post.keys():
m = re.match(
"^(debit|credit)-([1-9][0-9]*)-(id|ord|account|summary|amount)$",
key)
if m is not None:
rec_type = m.group(1)
no = int(m.group(2))
if max_no[rec_type] < no:
max_no[rec_type] = no
records = [] records = []
for rec_type in max_no.keys(): for rec_type in max_no.keys():
for i in range(max_no[rec_type]): for i in range(max_no[rec_type]):
@ -431,19 +419,7 @@ def make_transaction_form_from_post(post, txn_type, transaction):
transaction_form.transaction = transaction transaction_form.transaction = transaction
transaction_form.txn_type = txn_type transaction_form.txn_type = txn_type
# The records # The records
max_no = { max_no = _find_max_record_no(post)
"debit": 0,
"credit": 0,
}
for key in post.keys():
m = re.match(
"^(debit|credit)-([1-9][0-9]*)-(id|ord|account|summary|amount)$",
key)
if m is not None:
rec_type = m.group(1)
no = int(m.group(2))
if max_no[rec_type] < no:
max_no[rec_type] = no
if max_no["debit"] == 0: if max_no["debit"] == 0:
max_no["debit"] = 1 max_no["debit"] = 1
if max_no["credit"] == 0: if max_no["credit"] == 0:
@ -487,3 +463,29 @@ def make_transaction_form_from_status(request, txn_type, transaction):
return return
return make_transaction_form_from_post( return make_transaction_form_from_post(
status["form"], txn_type, transaction) status["form"], txn_type, transaction)
def _find_max_record_no(post):
"""Finds the max debit and record numbers from the POSTed form.
Args:
post (dict[str,str]): The POSTed data.
Returns:
dict[str,int]: The max debit and record numbers from the POSTed form.
"""
max_no = {
"debit": 0,
"credit": 0,
}
for key in post.keys():
m = re.match(
"^(debit|credit)-([1-9][0-9]*)-(id|ord|account|summary|amount)$",
key)
if m is not None:
rec_type = m.group(1)
no = int(m.group(2))
if max_no[rec_type] < no:
max_no[rec_type] = no
return max_no