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

Renamed the #selectedAccount attribute to #selectedAccountButton, and the filterSuggestedAccounts, #selectSuggestedAccount, clearSuggestedAccounts, #initializeSuggestedAccounts, #selectAccount, #setConfirmedAccount, and #setSuggestedAccounts methods to filterSuggestedAccountButtons, #selectSuggestedAccountButton, clearSuggestedAccountButtons, #initializeSuggestedAccountButtons, #selectAccountButton, #setConfirmedAccountButton, and #setSuggestedAccountButtons, respectively, in the JavaScript DescriptionEditor class.

Browse Source
This commit is contained in:
依瑪貓 2023-04-02 22:16:29 +08:00
parent cb6de08152
commit a70720be50
1 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/accounting/static/js/description-editor.js
View File

@ -116,7 +116,7 @@ class DescriptionEditor {
* The selected account button * The selected account button
* @type {HTMLButtonElement|null} * @type {HTMLButtonElement|null}
*/ */
#selectedAccount = null; #selectedAccountButton = null;
/** /**
* The tab planes * The tab planes
@ -150,7 +150,7 @@ class DescriptionEditor {
this.tabPlanes[tab.tabId()] = tab; this.tabPlanes[tab.tabId()] = tab;
} }
this.currentTab = this.tabPlanes.general; this.currentTab = this.tabPlanes.general;
this.#initializeSuggestedAccounts(); this.#initializeSuggestedAccountButtons();
this.description.onchange = () => this.#onDescriptionChange(); this.description.onchange = () => this.#onDescriptionChange();
this.#offsetButton.onclick = () => this.lineItemEditor.originalLineItemSelector.onOpen(); this.#offsetButton.onclick = () => this.lineItemEditor.originalLineItemSelector.onOpen();
this.#form.onsubmit = () => { this.#form.onsubmit = () => {
@ -176,72 +176,72 @@ class DescriptionEditor {
} }
/** /**
* Filters the suggested accounts. * Filters the suggested account buttons.
* *
* @param tagButton {HTMLButtonElement} the tag button * @param tagButton {HTMLButtonElement} the tag button
*/ */
filterSuggestedAccounts(tagButton) { filterSuggestedAccountButtons(tagButton) {
this.clearSuggestedAccounts(); this.clearSuggestedAccountButtons();
const suggestedAccountCodes = JSON.parse(tagButton.dataset.accounts); const suggestedAccountCodes = JSON.parse(tagButton.dataset.accounts);
const suggestedAccountButtons = this.#suggestedAccountButtons.filter((button) => suggestedAccountCodes.includes(button.dataset.code)); const suggestedAccountButtons = this.#suggestedAccountButtons.filter((button) => suggestedAccountCodes.includes(button.dataset.code));
for (const button of suggestedAccountButtons) { for (const button of suggestedAccountButtons) {
button.classList.remove("d-none"); button.classList.remove("d-none");
} }
this.#selectSuggestedAccount(suggestedAccountButtons, suggestedAccountCodes[0]); this.#selectSuggestedAccountButton(suggestedAccountButtons, suggestedAccountCodes[0]);
} }
/** /**
* Selects the suggested account. * Selects the suggested account button.
* *
* @param suggestedAccountButtons {HTMLButtonElement[]} the suggested account buttons * @param suggestedAccountButtons {HTMLButtonElement[]} the suggested account buttons
* @param code {string} the code of the most-frequent suggested account * @param code {string} the code of the most-frequent suggested account
*/ */
#selectSuggestedAccount(suggestedAccountButtons, code) { #selectSuggestedAccountButton(suggestedAccountButtons, code) {
if (this.#isAccountConfirmed) { if (this.#isAccountConfirmed) {
return; return;
} }
if (this.#confirmedAccountButton.dataset.code === code) { if (this.#confirmedAccountButton.dataset.code === code) {
this.#selectAccount(this.#confirmedAccountButton); this.#selectAccountButton(this.#confirmedAccountButton);
} else { } else {
for (const button of suggestedAccountButtons) { for (const button of suggestedAccountButtons) {
if (!this.#isAccountConfirmed && button.dataset.code === code) { if (!this.#isAccountConfirmed && button.dataset.code === code) {
this.#selectAccount(button); this.#selectAccountButton(button);
} }
} }
} }
} }
/** /**
* Clears the suggested accounts. * Clears the suggested account buttons.
* *
*/ */
clearSuggestedAccounts() { clearSuggestedAccountButtons() {
for (const button of this.#suggestedAccountButtons) { for (const button of this.#suggestedAccountButtons) {
button.classList.add("d-none"); button.classList.add("d-none");
} }
if (this.#isAccountConfirmed) { if (this.#isAccountConfirmed) {
this.#selectAccount(this.#confirmedAccountButton); this.#selectAccountButton(this.#confirmedAccountButton);
} else { } else {
this.#selectAccount(null); this.#selectAccountButton(null);
} }
} }
/** /**
* Initializes the suggested accounts. * Initializes the suggested account buttons.
* *
*/ */
#initializeSuggestedAccounts() { #initializeSuggestedAccountButtons() {
for (const accountButton of this.#accountButtons) { for (const accountButton of this.#accountButtons) {
accountButton.onclick = () => this.#selectAccount(accountButton); accountButton.onclick = () => this.#selectAccountButton(accountButton);
} }
} }
/** /**
* Select a suggested account. * Select a suggested account button.
* *
* @param selectedAccountButton {HTMLButtonElement|null} the account button, or null to deselect the account * @param selectedAccountButton {HTMLButtonElement|null} the account button, or null to deselect the account
*/ */
#selectAccount(selectedAccountButton) { #selectAccountButton(selectedAccountButton) {
for (const accountButton of this.#accountButtons) { for (const accountButton of this.#accountButtons) {
accountButton.classList.remove("btn-primary"); accountButton.classList.remove("btn-primary");
accountButton.classList.add("btn-outline-primary"); accountButton.classList.add("btn-outline-primary");
@ -250,9 +250,9 @@ class DescriptionEditor {
selectedAccountButton.classList.remove("btn-outline-primary"); selectedAccountButton.classList.remove("btn-outline-primary");
selectedAccountButton.classList.add("btn-primary"); selectedAccountButton.classList.add("btn-primary");
} }
this.#selectedAccount = selectedAccountButton; this.#selectedAccountButton = selectedAccountButton;
if (this.#selectedAccount !== null) { if (this.#selectedAccountButton !== null) {
this.#isAccountConfirmed &= this.#selectedAccount.id === this.#confirmedAccountButton.id; this.#isAccountConfirmed &= this.#selectedAccountButton.id === this.#confirmedAccountButton.id;
} }
} }
@ -262,8 +262,8 @@ class DescriptionEditor {
*/ */
#submit() { #submit() {
bootstrap.Modal.getOrCreateInstance(this.#modal).hide(); bootstrap.Modal.getOrCreateInstance(this.#modal).hide();
if (this.#selectedAccount !== null) { if (this.#selectedAccountButton !== null) {
this.lineItemEditor.saveDescriptionWithAccount(this.description.value, this.#selectedAccount.dataset.code, this.#selectedAccount.dataset.text, this.#selectedAccount.classList.contains("accounting-account-is-need-offset")); this.lineItemEditor.saveDescriptionWithAccount(this.description.value, this.#selectedAccountButton.dataset.code, this.#selectedAccountButton.dataset.text, this.#selectedAccountButton.classList.contains("accounting-account-is-need-offset"));
} else { } else {
this.lineItemEditor.saveDescription(this.description.value); this.lineItemEditor.saveDescription(this.description.value);
} }
@ -274,21 +274,21 @@ class DescriptionEditor {
* *
*/ */
onOpen() { onOpen() {
this.#setConfirmedAccount(); this.#setConfirmedAccountButton();
this.#setSuggestedAccounts(); this.#setSuggestedAccountButtons();
this.#reset(); this.#reset();
this.description.value = this.lineItemEditor.description === null? "": this.lineItemEditor.description; this.description.value = this.lineItemEditor.description === null? "": this.lineItemEditor.description;
if (this.#isAccountConfirmed) { if (this.#isAccountConfirmed) {
this.#selectAccount(this.#confirmedAccountButton); this.#selectAccountButton(this.#confirmedAccountButton);
} }
this.#onDescriptionChange(); this.#onDescriptionChange();
} }
/** /**
* Sets the confirmed account. * Sets the confirmed account button.
* *
*/ */
#setConfirmedAccount() { #setConfirmedAccountButton() {
this.#isAccountConfirmed = this.lineItemEditor.isAccountConfirmed; this.#isAccountConfirmed = this.lineItemEditor.isAccountConfirmed;
if (this.#isAccountConfirmed) { if (this.#isAccountConfirmed) {
this.#confirmedAccountButton.dataset.code = this.lineItemEditor.account.code; this.#confirmedAccountButton.dataset.code = this.lineItemEditor.account.code;
@ -304,10 +304,10 @@ class DescriptionEditor {
} }
/** /**
* Sets the suggested accounts. * Sets the suggested account buttons.
* *
*/ */
#setSuggestedAccounts() { #setSuggestedAccountButtons() {
this.#suggestedAccountButtons = [] this.#suggestedAccountButtons = []
for (const button of this.#accountButtons) { for (const button of this.#accountButtons) {
if (button.id === this.#confirmedAccountButton.id) { if (button.id === this.#confirmedAccountButton.id) {
@ -500,7 +500,7 @@ class DescriptionEditorTagTabPlane extends DescriptionEditorTabPlane {
if (tagButton.dataset.value === this.tag.value) { if (tagButton.dataset.value === this.tag.value) {
tagButton.classList.remove("btn-outline-primary"); tagButton.classList.remove("btn-outline-primary");
tagButton.classList.add("btn-primary"); tagButton.classList.add("btn-primary");
this.editor.filterSuggestedAccounts(tagButton); this.editor.filterSuggestedAccountButtons(tagButton);
isMatched = true; isMatched = true;
} else { } else {
tagButton.classList.remove("btn-primary"); tagButton.classList.remove("btn-primary");
@ -508,7 +508,7 @@ class DescriptionEditorTagTabPlane extends DescriptionEditorTabPlane {
} }
} }
if (!isMatched) { if (!isMatched) {
this.editor.clearSuggestedAccounts(); this.editor.clearSuggestedAccountButtons();
} }
this.validateTag(); this.validateTag();
} }
@ -528,11 +528,11 @@ class DescriptionEditorTagTabPlane extends DescriptionEditorTabPlane {
super.switchToMe(); super.switchToMe();
for (const tagButton of this.tagButtons) { for (const tagButton of this.tagButtons) {
if (tagButton.classList.contains("btn-primary")) { if (tagButton.classList.contains("btn-primary")) {
this.editor.filterSuggestedAccounts(tagButton); this.editor.filterSuggestedAccountButtons(tagButton);
return; return;
} }
} }
this.editor.clearSuggestedAccounts(); this.editor.clearSuggestedAccountButtons();
} }
/** /**
@ -549,7 +549,7 @@ class DescriptionEditorTagTabPlane extends DescriptionEditorTabPlane {
tagButton.classList.remove("btn-outline-primary"); tagButton.classList.remove("btn-outline-primary");
tagButton.classList.add("btn-primary"); tagButton.classList.add("btn-primary");
this.tag.value = tagButton.dataset.value; this.tag.value = tagButton.dataset.value;
this.editor.filterSuggestedAccounts(tagButton); this.editor.filterSuggestedAccountButtons(tagButton);
this.updateDescription(); this.updateDescription();
}; };
} }
@ -1092,7 +1092,7 @@ class DescriptionEditorRecurringTab extends DescriptionEditorTabPlane {
itemButton.classList.add("btn-primary"); itemButton.classList.add("btn-primary");
itemButton.classList.remove("btn-outline-primary"); itemButton.classList.remove("btn-outline-primary");
this.editor.description.value = this.#getDescription(itemButton); this.editor.description.value = this.#getDescription(itemButton);
this.editor.filterSuggestedAccounts(itemButton); this.editor.filterSuggestedAccountButtons(itemButton);
}; };
} }
} }
@ -1166,11 +1166,11 @@ class DescriptionEditorRecurringTab extends DescriptionEditorTabPlane {
super.switchToMe(); super.switchToMe();
for (const itemButton of this.#itemButtons) { for (const itemButton of this.#itemButtons) {
if (itemButton.classList.contains("btn-primary")) { if (itemButton.classList.contains("btn-primary")) {
this.editor.filterSuggestedAccounts(itemButton); this.editor.filterSuggestedAccountButtons(itemButton);
return; return;
} }
} }
this.editor.clearSuggestedAccounts(); this.editor.clearSuggestedAccountButtons();
} }
/** /**