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

Replaced the long parameter list with the JournalEntryEditor instance in the save method of the JavaScript JournalEntrySubForm sub-form, to simplify the code.

Browse Source
This commit is contained in:
依瑪貓 2023-03-18 14:56:26 +08:00 committed by 依瑪貓
parent 1a54592d4c
commit fbeec600b7
2 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/accounting/static/js/journal-entry-editor.js
View File

@ -230,7 +230,7 @@ class JournalEntryEditor {
this.entry = this.#side.addJournalEntry(); this.entry = this.#side.addJournalEntry();
} }
this.amount = this.#amount.value; this.amount = this.#amount.value;
this.entry.save(this.isNeedOffset, this.originalEntryId, this.originalEntryDate, this.originalEntryText, this.accountCode, this.accountText, this.summary, this.amount); this.entry.save(this);
bootstrap.Modal.getInstance(this.#modal).hide(); bootstrap.Modal.getInstance(this.#modal).hide();
} }
return false; return false;

37
src/accounting/static/js/transaction-form.js
View File

@ -960,38 +960,31 @@ class JournalEntrySubForm {
/** /**
* Stores the data into the journal entry sub-form. * Stores the data into the journal entry sub-form.
* *
* @param isOriginalEntry {boolean} true if this is an original entry, or false otherwise * @param editor {JournalEntryEditor} the journal entry editor
* @param originalEntryId {string|null} the ID of the original entry
* @param originalEntryDate {string|null} the date of the original entry
* @param originalEntryText {string|null} the text of the original entry
* @param accountCode {string|null} the account code
* @param accountText {string|null} the account text
* @param summary {string|null} the summary
* @param amount {string} the amount
*/ */
save(isOriginalEntry, originalEntryId, originalEntryDate, originalEntryText, accountCode, accountText, summary, amount) { save(editor) {
if (isOriginalEntry) { if (editor.isNeedOffset) {
this.#offsets.classList.remove("d-none"); this.#offsets.classList.remove("d-none");
} else { } else {
this.#offsets.classList.add("d-none"); this.#offsets.classList.add("d-none");
} }
this.#originalEntryId.value = originalEntryId === null? "": originalEntryId; this.#originalEntryId.value = editor.originalEntryId === null? "": editor.originalEntryId;
this.#originalEntryId.dataset.date = originalEntryDate === null? "": originalEntryDate; this.#originalEntryId.dataset.date = editor.originalEntryDate === null? "": editor.originalEntryDate;
this.#originalEntryId.dataset.text = originalEntryText === null? "": originalEntryText; this.#originalEntryId.dataset.text = editor.originalEntryText === null? "": editor.originalEntryText;
if (originalEntryText === null) { if (editor.originalEntryText === null) {
this.#originalEntryText.classList.add("d-none"); this.#originalEntryText.classList.add("d-none");
this.#originalEntryText.innerText = ""; this.#originalEntryText.innerText = "";
} else { } else {
this.#originalEntryText.classList.remove("d-none"); this.#originalEntryText.classList.remove("d-none");
this.#originalEntryText.innerText = A_("Offset %(entry)s", {entry: originalEntryText}); this.#originalEntryText.innerText = A_("Offset %(entry)s", {entry: editor.originalEntryText});
} }
this.#accountCode.value = accountCode === null? "": accountCode; this.#accountCode.value = editor.accountCode === null? "": editor.accountCode;
this.#accountCode.dataset.text = accountText === null? "": accountText; this.#accountCode.dataset.text = editor.accountText === null? "": editor.accountText;
this.#accountText.innerText = accountText === null? "": accountText; this.#accountText.innerText = editor.accountText === null? "": editor.accountText;
this.#summary.value = summary === null? "": summary; this.#summary.value = editor.summary === null? "": editor.summary;
this.#summaryText.innerText = summary === null? "": summary; this.#summaryText.innerText = editor.summary === null? "": editor.summary;
this.#amount.value = amount; this.#amount.value = editor.amount;
this.#amountText.innerText = formatDecimal(new Decimal(amount)); this.#amountText.innerText = formatDecimal(new Decimal(editor.amount));
this.validate(); this.validate();
this.side.updateTotal(); this.side.updateTotal();
this.side.currency.updateCodeSelectorStatus(); this.side.currency.updateCodeSelectorStatus();