diff --git a/.github/Changelog.md b/.github/Changelog.md index dccef62..78367e9 100644 --- a/.github/Changelog.md +++ b/.github/Changelog.md @@ -11,6 +11,7 @@ - Simplified Settings - Moved settings to floating action button - Implemented Datepicker (for Budget validity by month) +- Show save button on deletion of budgets and open transactions - ToDo: - Check budget validity calculating remaining budget for the current month in the header - - Show save button on modification/check/deletion of balances, budgets and open transactions + diff --git a/budgeteer/web_interface/vuejs_frontend/src/App.vue b/budgeteer/web_interface/vuejs_frontend/src/App.vue index 8849a48..a703f0e 100644 --- a/budgeteer/web_interface/vuejs_frontend/src/App.vue +++ b/budgeteer/web_interface/vuejs_frontend/src/App.vue @@ -26,6 +26,7 @@ function saveOnLock() { saveJSON('budgets') saveJSON('open_transactions') store.commit('setLocked', true) + store.commit('setModifiedWhileLocked', false) } @@ -34,7 +35,12 @@ function saveOnLock() {
- + + +
+
@@ -164,7 +165,7 @@ function checkEntryInDisplayMonth(entry) { v-if="displayMonthIsCurrentMonth() && store.state.locked && !store.state.data.budgets[category_index].entries[entry_index].booked" class="btn btn-outline-success" type="button" - @click="store.state.data.budgets[category_index].entries[entry_index].booked = true"> + @click="store.state.data.budgets[category_index].entries[entry_index].booked = true; store.commit('setModifiedWhileLocked', true)">
@@ -178,7 +179,6 @@ function checkEntryInDisplayMonth(entry) {
-
diff --git a/budgeteer/web_interface/vuejs_frontend/src/components/Head.vue b/budgeteer/web_interface/vuejs_frontend/src/components/Head.vue index dfc24e0..9426cdd 100644 --- a/budgeteer/web_interface/vuejs_frontend/src/components/Head.vue +++ b/budgeteer/web_interface/vuejs_frontend/src/components/Head.vue @@ -96,17 +96,10 @@ const current_month = ref(
-

- BudgeTeer -

-

Projekt von - RiX {{ version }} - (Update verfügbar!) -

+

Restbudget {{ current_month }}: {{ current_budget }} €

-

Restbudget {{ current_month }}: {{ current_budget }} €

diff --git a/budgeteer/web_interface/vuejs_frontend/src/components/Transactions.vue b/budgeteer/web_interface/vuejs_frontend/src/components/Transactions.vue index 665cd0c..78ebbf2 100644 --- a/budgeteer/web_interface/vuejs_frontend/src/components/Transactions.vue +++ b/budgeteer/web_interface/vuejs_frontend/src/components/Transactions.vue @@ -52,11 +52,11 @@ store.commit('getOpenTransactions')
diff --git a/budgeteer/web_interface/vuejs_frontend/src/main.js b/budgeteer/web_interface/vuejs_frontend/src/main.js index 1367baa..8bfb68e 100644 --- a/budgeteer/web_interface/vuejs_frontend/src/main.js +++ b/budgeteer/web_interface/vuejs_frontend/src/main.js @@ -23,6 +23,7 @@ const store = createStore({ budgets: [] }, locked: true, + modified_while_locked: false, settings: {}, misc: { loaded_settings: false, @@ -68,6 +69,8 @@ const store = createStore({ state.misc.docker = docker }, setLocked(state, locked) { state.locked = locked + }, setModifiedWhileLocked(state, locked) { + state.modified_while_locked = locked } } })