Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions frontend/src/api/validators.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { account_hierarchy_validator } from "../charts/hierarchy.ts";
import { chart_validator } from "../charts/index.ts";
import { entryBaseValidator } from "../entries/index.ts";
import { entryValidator } from "../entries/index.ts";
import type { ValidationT } from "../lib/validation.ts";
import {
array,
Expand Down Expand Up @@ -136,7 +136,7 @@ export const commodities_validator = array(
export type Commodities = ValidationT<typeof commodities_validator>;

export const context_validator = object({
entry: entryBaseValidator,
entry: entryValidator,
balances_before: optional(record(array(string))),
balances_after: optional(record(array(string))),
});
Expand Down
95 changes: 65 additions & 30 deletions frontend/src/modals/AddEntry.svelte
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<script lang="ts">
import { save_entries } from "../api/index.ts";
import { get_context, save_entries } from "../api/index.ts";
import { Balance, Note, Transaction } from "../entries/index.ts";
import Entry from "../entry-forms/Entry.svelte";
import { todayAsString } from "../format.ts";
import { _ } from "../i18n.ts";
import type { ValidationError } from "../lib/validation.ts";
import { router } from "../router.ts";
import { addEntryContinue } from "../stores/editor.ts";
import { hash } from "../stores/url.ts";
Expand All @@ -20,6 +21,7 @@
let entry: Transaction | Balance | Note = $state.raw(
Transaction.empty(todayAsString()),
);
let error: ValidationError | null = $state(null);

async function submit(event: SubmitEvent) {
event.preventDefault();
Expand All @@ -34,38 +36,71 @@
}
}

let shown = $derived($hash === "add-transaction");
let shown = $derived($hash.startsWith("add-transaction"));
let entry_hash = $derived(
$hash.startsWith("add-transaction-from") ? $hash.slice(21) : "",
);
$effect(() => {
async function fetchAndSet() {
if (entry_hash) {
const data = await get_context({ entry_hash });
let fetchedEntry = data.entry;
if (fetchedEntry.t === "Transaction") {
fetchedEntry = fetchedEntry.set("date", todayAsString());
entry = fetchedEntry;
} else if (fetchedEntry.t === "Balance") {
fetchedEntry = fetchedEntry.set("date", todayAsString());
entry = fetchedEntry;
} else if (fetchedEntry.t === "Note") {
fetchedEntry = fetchedEntry.set("date", todayAsString());
entry = fetchedEntry;
} else {
error = {
name: "ValidationError",
message: `This entry type is not supported.`,
};
}
}
}
fetchAndSet().catch(() => {
error = { name: "ValidationError", message: "Call to server failed." };
});
});
</script>

<ModalBase {shown} focus=".payee input">
<form onsubmit={submit} class="flex-column">
<h3>
{_("Add")}
{#each entryTypes as [Cls, displayName] (displayName)}
<button
type="button"
class:muted={!(entry instanceof Cls)}
onclick={() => {
// when switching between entry types, keep the date.
entry = Cls.empty(entry.date);
}}
>
{displayName}
</button>
<!-- eslint-disable-next-line svelte/no-useless-mustaches -->
{" "}
{/each}
</h3>
<Entry bind:entry />
<div class="flex-row">
<span class="spacer"></span>
<label>
<input type="checkbox" bind:checked={$addEntryContinue} />
<span>{_("continue")}</span>
</label>
<button type="submit">{_("Save")}</button>
</div>
</form>
{#if error}
<p>{_("Error loading entry. Error message:")} {error.message}</p>
{:else}
<form onsubmit={submit} class="flex-column">
<h3>
{_("Add")}
{#each entryTypes as [Cls, displayName] (displayName)}
<button
type="button"
class:muted={!(entry instanceof Cls)}
onclick={() => {
// when switching between entry types, keep the date.
entry = Cls.empty(entry.date);
}}
>
{displayName}
</button>
<!-- eslint-disable-next-line svelte/no-useless-mustaches -->
{" "}
{/each}
</h3>
<Entry bind:entry />
<div class="flex-row">
<span class="spacer"></span>
<label>
<input type="checkbox" bind:checked={$addEntryContinue} />
<span>{_("continue")}</span>
</label>
<button type="submit">{_("Save")}</button>
</div>
</form>
{/if}
</ModalBase>

<style>
Expand Down
16 changes: 10 additions & 6 deletions src/fava/translations/messages.pot
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ msgid "Saving…"
msgstr ""

#: frontend/src/editor/SaveButton.svelte:14
#: frontend/src/modals/AddEntry.svelte:66
#: frontend/src/modals/AddEntry.svelte:106
#: frontend/src/reports/import/Extract.svelte:115
msgid "Save"
msgstr ""
Expand Down Expand Up @@ -79,7 +79,7 @@ msgid "Add metadata"
msgstr ""

#: frontend/src/entry-forms/Balance.svelte:28
#: frontend/src/modals/AddEntry.svelte:15
#: frontend/src/modals/AddEntry.svelte:16
#: frontend/src/reports/journal/JournalHeaders.svelte:56
#: frontend/src/reports/statistics/UpdateActivity.svelte:39
msgid "Balance"
Expand All @@ -106,7 +106,7 @@ msgid "Value"
msgstr ""

#: frontend/src/entry-forms/Note.svelte:27
#: frontend/src/modals/AddEntry.svelte:16
#: frontend/src/modals/AddEntry.svelte:17
msgid "Note"
msgstr ""

Expand Down Expand Up @@ -151,15 +151,19 @@ msgstr ""
msgid "Daily"
msgstr ""

#: frontend/src/modals/AddEntry.svelte:14
#: frontend/src/modals/AddEntry.svelte:15
msgid "Transaction"
msgstr ""

#: frontend/src/modals/AddEntry.svelte:43
#: frontend/src/modals/AddEntry.svelte:77
msgid "Error loading entry. Error message:"
msgstr ""

#: frontend/src/modals/AddEntry.svelte:81
msgid "Add"
msgstr ""

#: frontend/src/modals/AddEntry.svelte:64
#: frontend/src/modals/AddEntry.svelte:104
msgid "continue"
msgstr ""

Expand Down