Skip to content

feat: Add sorting by Cost/Change column on account journal page #2255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GuanghaoYe wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: Add sorting by Cost/Change column on account journal page #2255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion frontend/src/reports/journal/JournalHeaders.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,17 @@
</button>
<span class="num">{_("Units")}</span>
{#if show_change_and_balance}
<span class="num">{_("Cost")} / {_("Change")}</span>
<button
type="button"
class="num unset"
data-order={name === "change" ? order : undefined}
{disabled}
onclick={() => {
set_sort_column("change");
}}
>
{_("Cost")} / {_("Change")}
</button>
<span class="num">{_("Price")} / {_("Balance")}</span>
{:else}
<span class="num">{_("Cost")}</span>
Expand All @@ -70,4 +80,13 @@
button {
position: relative;
}

button.num {
padding-left: 18px;
}

button.num[data-order]::after {
right: auto;
left: 4px;
}
</style>
4 changes: 3 additions & 1 deletion frontend/src/reports/journal/sort.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
import { get_direction, sortElements } from "../../sort/index.ts";
import type { JournalSort } from "../../stores/journal.ts";

export type JournalSortColumn = "date" | "flag" | "narration";
export type JournalSortColumn = "date" | "flag" | "narration" | "change";

const journal_column_types = {
date: "num",
flag: "string",
narration: "string",
change: "num",
};

const journal_column_selectors = {
date: ".datecell",
flag: ".flag",
narration: ".description",
change: ".change",
};

export function sort_journal(ol: HTMLOListElement, sort: JournalSort): void {
Expand Down
5 changes: 4 additions & 1 deletion frontend/src/stores/journal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ const default_journal_sort: JournalSort = ["date", "desc"];
/** The column and order that the journal should be sorted in. */
export const journal_sort = localStorageSyncedStore<JournalSort>(
"journal-sort-order",
tuple(constants("date", "flag", "narration"), constants("asc", "desc")),
tuple(
constants("date", "flag", "narration", "change"),
constants("asc", "desc"),
),
() => default_journal_sort,
);
12 changes: 6 additions & 6 deletions src/fava/translations/messages.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ msgstr ""

#: frontend/src/entry-forms/Balance.svelte:28
#: frontend/src/modals/AddEntry.svelte:15
#: frontend/src/reports/journal/JournalHeaders.svelte:56
#: frontend/src/reports/journal/JournalHeaders.svelte:66
#: frontend/src/reports/statistics/UpdateActivity.svelte:39
msgid "Balance"
msgstr ""
Expand Down Expand Up @@ -239,8 +239,8 @@ msgid "Date"
msgstr ""

#: frontend/src/reports/commodities/CommodityTable.svelte:19
#: frontend/src/reports/journal/JournalHeaders.svelte:56
#: frontend/src/reports/journal/JournalHeaders.svelte:59
#: frontend/src/reports/journal/JournalHeaders.svelte:66
#: frontend/src/reports/journal/JournalHeaders.svelte:69
msgid "Price"
msgstr ""

Expand Down Expand Up @@ -460,12 +460,12 @@ msgstr ""
msgid "F"
msgstr ""

#: frontend/src/reports/journal/JournalHeaders.svelte:55
#: frontend/src/reports/journal/JournalHeaders.svelte:58
#: frontend/src/reports/journal/JournalHeaders.svelte:64
#: frontend/src/reports/journal/JournalHeaders.svelte:68
msgid "Cost"
msgstr ""

#: frontend/src/reports/journal/JournalHeaders.svelte:55
#: frontend/src/reports/journal/JournalHeaders.svelte:64
msgid "Change"
msgstr ""

Expand Down