From 10a870a300ab2e55eabf5c82e3b4cd1b72dc7c6a Mon Sep 17 00:00:00 2001 From: Jan Bader Date: Sun, 11 Sep 2022 20:19:19 +0000 Subject: [PATCH 01/31] Stop propagation from click event when opening modal --- web/src/components/Modal.vue | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/web/src/components/Modal.vue b/web/src/components/Modal.vue index ab01010..40b4ec0 100644 --- a/web/src/components/Modal.vue +++ b/web/src/components/Modal.vue @@ -15,10 +15,13 @@ const visible = ref(false); function closeDialog() { visible.value = false; }; -function openDialog() { - emit("open"); - visible.value = true; + +function openDialog(e : MouseEvent) { + e.stopPropagation(); + emit("open"); + visible.value = true; }; + function submitDialog() { const e = {cancel: false}; emit("submit", e); -- 2.47.2 From 77de2a833e57333431db59eb7a599365c4d46299 Mon Sep 17 00:00:00 2001 From: Jan Bader Date: Sun, 11 Sep 2022 20:19:40 +0000 Subject: [PATCH 02/31] Cleanup --- web/src/pages/Budgeting.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web/src/pages/Budgeting.vue b/web/src/pages/Budgeting.vue index 34fbd8e..18328ac 100644 --- a/web/src/pages/Budgeting.vue +++ b/web/src/pages/Budgeting.vue @@ -28,7 +28,6 @@ const GroupsForMonth = computed(() => { return [...groupsForMonth(selected.value.Year, selected.value.Month)]; }); - const previous = computed(() => ({ Year: new Date(selected.value.Year, selected.value.Month - 1, 1).getFullYear(), Month: new Date(selected.value.Year, selected.value.Month - 1, 1).getMonth(), @@ -203,7 +202,7 @@ const budgeted = computed(() => accountStore.GetBudgeted(selected.value.Year, se v-model="category.Assigned" type="number" class="hidden sm:block mx-2 text-right" - @input="(evt) => assignedChanged(evt, category)" + @input="(evt : Event) => assignedChanged(evt, category)" /> Date: Sun, 11 Sep 2022 20:20:00 +0000 Subject: [PATCH 03/31] Add CreateCategory --- web/src/dialogs/CreateCategory.vue | 49 ++++++++++++++++++++++++++++++ web/src/pages/Budgeting.vue | 6 +++- 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 web/src/dialogs/CreateCategory.vue diff --git a/web/src/dialogs/CreateCategory.vue b/web/src/dialogs/CreateCategory.vue new file mode 100644 index 0000000..d8b309e --- /dev/null +++ b/web/src/dialogs/CreateCategory.vue @@ -0,0 +1,49 @@ + + + diff --git a/web/src/pages/Budgeting.vue b/web/src/pages/Budgeting.vue index 18328ac..29b1da9 100644 --- a/web/src/pages/Budgeting.vue +++ b/web/src/pages/Budgeting.vue @@ -6,6 +6,7 @@ import { Category, useAccountStore } from "../stores/budget-account"; import { useSessionStore } from "../stores/session"; import Input from "../components/Input.vue"; import { POST } from "../api"; +import CreateCategory from "../dialogs/CreateCategory.vue"; const props = defineProps<{ budgetid: string, @@ -158,7 +159,9 @@ const budgeted = computed(() => accountStore.GetBudgeted(selected.value.Year, se {{ (getGroupState(group) ? "−" : "+") + " " + group.Name }} + >{{ (getGroupState(group) ? "−" : "+") + " " + group.Name }} + +