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

Revised the JavaScript journal entry editor and account selector so that the account selector work with the journal entry editor and does not get into the detail of the journal entry editor.

Browse Source
This commit is contained in:
依瑪貓
2023-03-13 19:47:29 +08:00
parent b344abce06
commit c306ff8009
2 changed files with 63 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -480,7 +480,6 @@ class DebitCreditSideSubForm {
this.#addEntryButton = document.getElementById(this.#prefix + "-add-entry");
this.#addEntryButton.onclick = () => {
JournalEntryEditor.addNew(this);
AccountSelector.initializeJournalEntryForm();
};
this.#resetDeleteJournalEntryButtons();
this.#initializeDragAndDropReordering();
@ -727,7 +726,6 @@ class JournalEntrySubForm {
this.deleteButton = document.getElementById(this.#prefix + "-delete");
this.#control.onclick = () => {
JournalEntryEditor.edit(this, this.#accountCode.value, this.#accountCode.dataset.text, this.#summary.value, this.amount.value);
AccountSelector.initializeJournalEntryForm();
};
this.deleteButton.onclick = () => {
this.element.parentElement.removeChild(this.element);
@ -880,7 +878,10 @@ class JournalEntryEditor {
this.#summary = document.getElementById(this.#prefix + "-summary");
this.#summaryError = document.getElementById(this.#prefix + "-summary-error");
this.#amount = document.getElementById(this.#prefix + "-amount");
this.#amountError = document.getElementById(this.#prefix + "-amount-error");
this.#amountError = document.getElementById(this.#prefix + "-amount-error")
this.#accountControl.onclick = () => {
AccountSelector.start(this, this.entryType);
}
this.#summaryControl.onclick = () => {
SummaryEditor.start(this, this.#summary.dataset.value);
};
@ -898,6 +899,41 @@ class JournalEntryEditor {
};
}
/**
* Returns the account code.
*
* @return {string|null} the account code
*/
getAccountCode() {
return this.#account.dataset.code === ""? null: this.#account.dataset.code;
}
/**
* Clears the account.
*
*/
clearAccount() {
this.#accountControl.classList.remove("accounting-not-empty");
this.#account.dataset.code = "";
this.#account.dataset.text = "";
this.#account.innerText = "";
this.#validateAccount();
}
/**
* Sets the account.
*
* @param code {string} the account code
* @param text {string} the account text
*/
saveAccount(code, text) {
this.#accountControl.classList.add("accounting-not-empty");
this.#account.dataset.code = code;
this.#account.dataset.text = text;
this.#account.innerText = text;
this.#validateAccount();
}
/**
* Saves the summary from the summary editor.
*
@ -1000,6 +1036,7 @@ class JournalEntryEditor {
this.#side = side;
this.entryType = this.#side.entryType;
this.#element.dataset.entryType = side.entryType;
this.#accountControl.dataset.bsTarget = "#accounting-account-selector-" + side.entryType + "-modal";
this.#accountControl.classList.remove("accounting-not-empty");
this.#accountControl.classList.remove("is-invalid");
this.#account.innerText = "";
@ -1031,6 +1068,7 @@ class JournalEntryEditor {
this.#side = entry.side;
this.entryType = this.#side.entryType;
this.#element.dataset.entryType = entry.entryType;
this.#accountControl.dataset.bsTarget = "#accounting-account-selector-" + entry.entryType + "-modal";
if (accountCode === "") {
this.#accountControl.classList.remove("accounting-not-empty");
} else {