Merge pull request #5 from rix1337/dev

v.0.1.1
rix1337 · Jul 30, 2023 · 9fd02ef · 9fd02ef
2 parents 4c51456 + 81cd9f0
commit 9fd02ef
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 27 deletions.
diff --git a/.github/Changelog.md b/.github/Changelog.md
@@ -6,6 +6,10 @@
 
 ### Changelog BudgeTeer:
 
+#### v.0.1.1
+- Fehlerkorrektur beim Hinzufügen neuer Konten, Transaktionen und Budgets
+- Budgets können umbenannt und gelöscht werden
+
 #### v.0.1.0
 - Kontostände, Budgets und offene Transaktionen werden beim Sperren automatisch gespeichert
 - Budgeteintrag auf Gültigkeitszeitraum prüfen

diff --git a/budgeteer/providers/version.py b/budgeteer/providers/version.py
@@ -9,7 +9,7 @@
 
 
 def get_version():
-    return "0.1.0"
+    return "0.1.1"
 
 
 def create_version_file():

diff --git a/budgeteer/web_interface/vuejs_frontend/package-lock.json b/budgeteer/web_interface/vuejs_frontend/package-lock.json
diff --git a/budgeteer/web_interface/vuejs_frontend/package.json b/budgeteer/web_interface/vuejs_frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "budgeteer-web",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "scripts": {
     "dev": "vite",
     "build": "vite build",

diff --git a/budgeteer/web_interface/vuejs_frontend/src/components/Budgets.vue b/budgeteer/web_interface/vuejs_frontend/src/components/Budgets.vue
@@ -95,13 +95,28 @@ function checkEntryInDisplayMonth(entry) {
               <div class="accordion" id="accordionBudgets">
                 <div v-for="(budget, category_index) in store.state.data.budgets" :key="budget" class="accordion-item">
                   <h2 class="accordion-header" :id="'heading' + category_index">
-                    <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
+                    <button v-if="store.state.locked"
+                            class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
                             :data-bs-target="'#collapse' + category_index" aria-expanded="false"
                             :aria-controls="'collapse' + category_index">
                       {{ store.state.data.budgets[category_index].category }}: {{
                         calculateCategoryTotal(category_index)
                       }} €
                     </button>
+                    <button v-else
+                            class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
+                            :data-bs-target="'#collapse' + category_index" aria-expanded="false"
+                            :aria-controls="'collapse' + category_index">
+                      <input type="text" class="form-control" placeholder="Kategorie"
+                             v-model="store.state.data.budgets[category_index].category">
+                      <button
+                          class="btn btn-outline-danger"
+                          type="button"
+                          @click="store.state.data.budgets.splice(category_index, 1) && store.commit('setModifiedWhileLocked', true)"
+                      >
+                        <i class="bi bi-trash3"/>
+                      </button>
+                    </button>
                   </h2>
                   <div :id="'collapse' + category_index" class="accordion-collapse collapse"
                        :aria-labelledby="'heading' + category_index"
@@ -185,7 +200,7 @@ function checkEntryInDisplayMonth(entry) {
                 <button v-if="!store.state.locked"
                         class="btn btn-outline-primary"
                         type="button"
-                        @click="store.state.data.budgets.push({category:'ToDo',amount:'', entries: []})"
+                        @click="store.state.data.budgets.push({category:'Kategorie',amount:'', entries: []})"
                 >
                   Kategorie hinzufügen
                 </button>

diff --git a/budgeteer/web_interface/vuejs_frontend/src/components/Settings.vue b/budgeteer/web_interface/vuejs_frontend/src/components/Settings.vue
@@ -72,7 +72,7 @@ function submitSettings() {
                      label="Prefix"
                      messages-class="text-danger"
                      outer-class="mb-4"
-                     placeholder="Bspw. feedcrawler"
+                     placeholder="Bspw. budgeteer"
                      type="text"
                      validation="alpha"
                      validation-visibility="live"/>

diff --git a/budgeteer/web_interface/vuejs_frontend/src/components/Transactions.vue b/budgeteer/web_interface/vuejs_frontend/src/components/Transactions.vue
@@ -62,7 +62,7 @@ store.commit('getOpenTransactions')
                 </div>
               </div>
               <div class="row justify-content-center mt-2">
-                <button
+                <button v-if="!store.state.locked"
                     class="btn btn-outline-primary"
                     type="button"
                     @click="store.state.data.open_transactions.push({label:'',amount:''})"

diff --git a/budgeteer/web_interface/web_server.py b/budgeteer/web_interface/web_server.py
@@ -224,28 +224,10 @@ def post_settings():
     @auth_basic(is_authenticated_user)
     def get_json(name):
         try:
-            # balances = {
-            #     "balances": [
-            #         {
-            #             "label": 'Girokonto',
-            #             "balance": prettify_amount("888.2"),
-            #             "type": 'checking'
-            #         },
-            #         {
-            #             "label": 'Urlaub',
-            #             "balance": prettify_amount("9999.99"),
-            #             "type": 'savings'
-            #         },
-            #         {
-            #             "label": 'Notfall', "balance": prettify_amount("1000"),
-            #             "type": 'savings'
-            #         }
-            #     ]
-            # }
             try:
                 data = json.loads(BudgetDB("json").retrieve(name))
             except:
-                data = {}
+                data = []
             return {
                 name: data
             }