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

Added the "confirmed account" to the description editor so that it does not override the user's selected account when the user specifically selected it or already confirmed it.

Browse Source
This commit is contained in:
依瑪貓 2023-04-01 18:05:48 +08:00
parent 0faca49540
commit 211821b4d7
3 changed files with 109 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,6 +94,24 @@ class DescriptionEditor {
*/
#accountButtons;
/**
* The suggested account buttons
* @type {HTMLButtonElement[]}
*/
#suggestedAccountButtons;
/**
* The account that the user has confirmed
* @type {HTMLButtonElement}
*/
#confirmedAccountButton;
/**
* Whether the user has confirmed the account
* @type {boolean}
*/
#isAccountConfirmed = false;
/**
* The selected account button
* @type {HTMLButtonElement|null}
@ -124,6 +142,8 @@ class DescriptionEditor {
this.note = document.getElementById(`${this.prefix}-annotation-note`);
// noinspection JSValidateTypes
this.#accountButtons = Array.from(document.getElementsByClassName(`${this.prefix}-account`));
this.#confirmedAccountButton = document.getElementById(`${this.prefix}-account-confirmed`)
for (const cls of [DescriptionEditorGeneralTagTab, DescriptionEditorGeneralTripTab, DescriptionEditorBusTripTab, DescriptionEditorRecurringTab, DescriptionEditorAnnotationTab]) {
const tab = new cls(this);
@ -162,13 +182,30 @@ class DescriptionEditor {
*/
filterSuggestedAccounts(tagButton) {
this.clearSuggestedAccounts();
const suggested = JSON.parse(tagButton.dataset.accounts);
for (const accountButton of this.#accountButtons) {
if (suggested.includes(accountButton.dataset.code)) {
accountButton.classList.remove("d-none");
if (accountButton.dataset.code === suggested[0]) {
this.#selectAccount(accountButton);
return;
const suggestedAccountCodes = JSON.parse(tagButton.dataset.accounts);
const suggestedAccountButtons = this.#suggestedAccountButtons.filter((button) => suggestedAccountCodes.includes(button.dataset.code));
for (const button of suggestedAccountButtons) {
button.classList.remove("d-none");
}
this.#selectSuggestedAccount(suggestedAccountButtons, suggestedAccountCodes[0]);
}
/**
* Selects the suggested account.
*
* @param suggestedAccountButtons {HTMLButtonElement[]} the suggested account buttons
* @param code {string} the code of the most-frequent suggested account
*/
#selectSuggestedAccount(suggestedAccountButtons, code) {
if (this.#isAccountConfirmed) {
return;
}
if (this.#confirmedAccountButton.dataset.code === code) {
this.#selectAccount(this.#confirmedAccountButton);
} else {
for (const button of suggestedAccountButtons) {
if (!this.#isAccountConfirmed && button.dataset.code === code) {
this.#selectAccount(button);
}
}
}
@ -179,10 +216,14 @@ class DescriptionEditor {
*
*/
clearSuggestedAccounts() {
for (const accountButton of this.#accountButtons) {
accountButton.classList.add("d-none");
for (const button of this.#suggestedAccountButtons) {
button.classList.add("d-none");
}
if (this.#isAccountConfirmed) {
this.#selectAccount(this.#confirmedAccountButton);
} else {
this.#selectAccount(null);
}
this.#selectAccount(null);
}
/**
@ -210,6 +251,9 @@ class DescriptionEditor {
selectedAccountButton.classList.add("btn-primary");
}
this.#selectedAccount = selectedAccountButton;
if (this.#selectedAccount !== null) {
this.#isAccountConfirmed &= this.#selectedAccount.id === this.#confirmedAccountButton.id;
}
}
/**
@ -230,11 +274,53 @@ class DescriptionEditor {
*
*/
onOpen() {
this.#setConfirmedAccount();
this.#setSuggestedAccounts();
this.#reset();
this.description.value = this.lineItemEditor.description === null? "": this.lineItemEditor.description;
if (this.#isAccountConfirmed) {
this.#selectAccount(this.#confirmedAccountButton);
}
this.#onDescriptionChange();
}
/**
* Sets the confirmed account.
*
*/
#setConfirmedAccount() {
this.#isAccountConfirmed = this.lineItemEditor.isAccountConfirmed;
if (this.#isAccountConfirmed) {
this.#confirmedAccountButton.dataset.code = this.lineItemEditor.account.code;
this.#confirmedAccountButton.dataset.text = this.lineItemEditor.account.text;
this.#confirmedAccountButton.innerText = this.lineItemEditor.account.text
this.#confirmedAccountButton.classList.remove("d-none");
} else {
this.#confirmedAccountButton.dataset.code = "";
this.#confirmedAccountButton.dataset.text = "";
this.#confirmedAccountButton.innerText = "";
this.#confirmedAccountButton.classList.add("d-none");
}
}
/**
* Sets the suggested accounts.
*
*/
#setSuggestedAccounts() {
this.#suggestedAccountButtons = []
for (const button of this.#accountButtons) {
if (button.id === this.#confirmedAccountButton.id) {
continue;
}
if (button.dataset.code === this.#confirmedAccountButton.dataset.code) {
button.classList.add("d-none");
} else {
this.#suggestedAccountButtons.push(button);
}
}
}
/**
* Resets the description editor.
*

12
src/accounting/static/js/journal-entry-line-item-editor.js
View File

@ -172,6 +172,12 @@ class JournalEntryLineItemEditor {
*/
account = null;
/**
* Whether the user has confirmed the account
* @type {boolean}
*/
isAccountConfirmed = false;
/**
* The description
* @type {string|null}
@ -280,6 +286,7 @@ class JournalEntryLineItemEditor {
this.#descriptionText.innerText = originalLineItem.description;
this.#accountControl.classList.add("accounting-not-empty");
this.account = originalLineItem.account.copy();
this.isAccountConfirmed = false;
this.#accountText.innerText = this.account.text;
this.#amountInput.value = String(originalLineItem.netBalance);
this.#amountInput.max = String(originalLineItem.netBalance);
@ -301,6 +308,7 @@ class JournalEntryLineItemEditor {
this.#setEnableDescriptionAccount(true);
this.#accountControl.classList.remove("accounting-not-empty");
this.account = null;
this.isAccountConfirmed = false;
this.#accountText.innerText = "";
this.#amountInput.max = "";
}
@ -345,6 +353,7 @@ class JournalEntryLineItemEditor {
clearAccount() {
this.#accountControl.classList.remove("accounting-not-empty");
this.account = null;
this.isAccountConfirmed = false;
this.#accountText.innerText = "";
this.#validateAccount();
}
@ -357,6 +366,7 @@ class JournalEntryLineItemEditor {
saveAccount(account) {
this.#accountControl.classList.add("accounting-not-empty");
this.account = new JournalEntryAccount(account.code, account.text, account.isNeedOffset);
this.isAccountConfirmed = true;
this.#accountText.innerText = account.text;
this.#validateAccount();
}
@ -480,6 +490,7 @@ class JournalEntryLineItemEditor {
this.#accountControl.classList.remove("accounting-not-empty");
this.#accountControl.classList.remove("is-invalid");
this.account = null;
this.isAccountConfirmed = false;
this.#accountText.innerText = "";
this.#accountError.innerText = "";
this.#amountInput.value = "";
@ -518,6 +529,7 @@ class JournalEntryLineItemEditor {
}
this.#descriptionText.innerText = this.description === null? "": this.description;
this.account = lineItem.account;
this.isAccountConfirmed = true;
if (this.account === null) {
this.#accountControl.classList.remove("accounting-not-empty");
} else {

1
src/accounting/templates/accounting/journal-entry/include/description-editor-modal.html
View File

@ -182,6 +182,7 @@ First written: 2023/2/28
{# The suggested accounts #}
<div class="mt-3">
<button id="accounting-description-editor-{{ description_editor.debit_credit }}-account-confirmed" class="btn btn-primary accounting-description-editor-{{ description_editor.debit_credit }}-account d-none" type="button" data-code="" data-text=""></button>
{% for account in description_editor.accounts %}
<button class="btn btn-outline-primary d-none accounting-description-editor-{{ description_editor.debit_credit }}-account {% if account.is_need_offset %} accounting-account-is-need-offset {% endif %}" type="button" data-code="{{ account.code }}" data-text="{{ account }}">
{{ account }}