Skip to content
This repository has been archived by the owner on Jun 30, 2024. It is now read-only.

Commit

Permalink
Move Balances to header
Browse files Browse the repository at this point in the history
  • Loading branch information
rix1337 committed Jul 29, 2023
1 parent a173055 commit e668225
Show file tree
Hide file tree
Showing 6 changed files with 81 additions and 97 deletions.
8 changes: 7 additions & 1 deletion .github/Changelog.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,10 @@
---

### Changelog BudgeTeer:
- Save balances, budgets and open transactions on lock
- Save balances, budgets and open transactions on lock
- Check budget entry for validity
- Move balances to header
- ToDo:
- Fix Date picker for budget validity
- 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
87 changes: 0 additions & 87 deletions budgeteer/web_interface/vuejs_frontend/src/components/Balances.vue
View file

This file was deleted.

2 changes: 1 addition & 1 deletion budgeteer/web_interface/vuejs_frontend/src/components/Budgets.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ function checkEntryInDisplayMonth(entry) {
class="btn btn-outline-success"
type="button"
@click="store.state.data.budgets[category_index].entries[entry_index].booked = true">
<i class="bi bi-check2"/>
<i class="bi bi-check"/>
</button>
</div>
</div>
Expand Down
65 changes: 64 additions & 1 deletion budgeteer/web_interface/vuejs_frontend/src/components/Head.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import axios from 'axios'
const store = useStore()
const toast = useToast()
store.commit('getBalances')
onMounted(() => {
getVersion()
setInterval(getVersion, 300 * 1000)
Expand Down Expand Up @@ -82,7 +84,7 @@ const current_budget = computed({
}
}
return (parseFloat(balances_total_amount + transactions_total_amount + current_budget_total_amount).toFixed(2))
return (balances_total_amount + transactions_total_amount + current_budget_total_amount).toFixed(2)
}
})
Expand All @@ -109,6 +111,67 @@ const current_month = ref(
<div class="card-body">
<div class="row justify-content-center mt-2">
<h2>Restbudget {{ current_month }}: {{ current_budget }} €</h2>
<div class="row justify-content-center mt-2">
<div v-for="(item, index) in store.state.data.balances" :key="item" class="balance">
<div class="input-group">
<div class="input-group-prepend">
<input :disabled="store.state.locked"
v-model="store.state.data.balances[index].label"
class="form-control">
</div>
<input :disabled="store.state.locked"
v-model="store.state.data.balances[index].balance"
type="number"
step="0.01"
class="form-control">
<div class="input-group-append">
<span class="input-group-text"> €</span>
</div>
<div v-if="!store.state.locked"
class="input-group-append">
<select :disabled="store.state.locked"
v-model="store.state.data.balances[index].type"
class="form-control">
<option value="checking">Girokonto</option>
<option value="savings">Sparkonto</option>
</select>
</div>
<div v-if="!store.state.locked"
class="input-group-append">
<button
class="btn btn-outline-primary"
type="button"
@click="store.state.data.balances.splice(index - 1, 0, store.state.data.balances.splice(index, 1)[0])"
>
<i class="bi bi-arrow-up"/>
</button>
<button
class="btn btn-outline-primary"
type="button"
@click="store.state.data.balances.splice(index + 1, 0, store.state.data.balances.splice(index, 1)[0])"
>
<i class="bi bi-arrow-down"/>
</button>
<button
class="btn btn-outline-danger"
type="button"
@click="store.state.data.balances.splice(index, 1)"
>
<i class="bi bi-trash3"/>
</button>
</div>
</div>
</div>
<div v-if="!store.state.locked" class="row justify-content-center mt-2">
<button
class="btn btn-outline-primary"
type="button"
@click="store.state.data.balances.push({label:'',amount:''})"
>
Konto hinzufügen
</button>
</div>
</div>
<div class="col-md-auto p-1">
<button aria-controls="offcanvasBottomSettings" class="btn btn-outline-primary"
data-bs-target="#offcanvasBottomSettings"
Expand Down
14 changes: 9 additions & 5 deletions budgeteer/web_interface/vuejs_frontend/src/components/Transactions.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,19 @@ store.commit('getOpenTransactions')
<div v-for="(item, index) in store.state.data.open_transactions" :key="item" class="transaction">
<div class="input-group">
<div class="input-group-prepend">
<input v-model="store.state.data.open_transactions[index].label"
<input :disabled="store.state.locked"
v-model="store.state.data.open_transactions[index].label"
class="form-control">
</div>
<input v-model="store.state.data.open_transactions[index].amount"
<input :disabled="store.state.locked"
v-model="store.state.data.open_transactions[index].amount"
type="number"
step="0.01"
class="form-control">
<div class="input-group-append">
<span class="input-group-text"> €</span>
</div>
<div class="input-group-append">
<div v-if="!store.state.locked" class="input-group-append">
<button
class="btn btn-outline-primary"
type="button"
Expand All @@ -47,12 +49,14 @@ store.commit('getOpenTransactions')
>
<i class="bi bi-arrow-down"/>
</button>
</div>
<div class="input-group-append">
<button
class="btn btn-outline-danger"
class="btn btn-outline-success"
type="button"
@click="store.state.data.open_transactions.splice(index, 1)"
>
<i class="bi bi-trash3"/>
<i class="bi bi-check"/>
</button>
</div>
</div>
Expand Down
2 changes: 0 additions & 2 deletions budgeteer/web_interface/vuejs_frontend/src/components/_Main.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import "bootstrap"
import Head from './Head.vue'
import Settings from './Settings.vue'
import Transactions from "./Transactions.vue"
import Balances from "./Balances.vue"
import Budgets from "./Budgets.vue"
</script>

Expand All @@ -15,7 +14,6 @@ import Budgets from "./Budgets.vue"
<!--- Main Items -->
<Head/>
<Transactions/>
<Balances/>
<Budgets/>
<!-- Offcanvas Items -->
<Settings/>
Expand Down

0 comments on commit e668225

Please sign in to comment.