From df756df4dc4bb78cb0a03bf373054923554ff0e9 Mon Sep 17 00:00:00 2001
From: rix1337 <>
Date: Sun, 30 Jul 2023 17:08:07 +0200
Subject: [PATCH] Allow renaming and deleting budgets + Bugfix

---
 .github/Changelog.md                          |  7 ++-----
 budgeteer/providers/version.py                |  2 +-
 .../vuejs_frontend/package-lock.json          |  4 ++--
 .../web_interface/vuejs_frontend/package.json |  2 +-
 .../vuejs_frontend/src/components/Budgets.vue | 19 ++++++++++++++++--
 .../src/components/Transactions.vue           |  2 +-
 budgeteer/web_interface/web_server.py         | 20 +------------------
 7 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/.github/Changelog.md b/.github/Changelog.md
index 3589994..0969cd1 100644
--- a/.github/Changelog.md
+++ b/.github/Changelog.md
@@ -7,11 +7,8 @@
 ### Changelog BudgeTeer:
 
 #### v.0.1.1
-- ToDo
-  - Errors when starting with empty json database
-  - Book budgets per month (NOT GLOBALLY)
-  - Allow budget name changes
-  - Add Weekly/Yearly budget types
+- 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
diff --git a/budgeteer/providers/version.py b/budgeteer/providers/version.py
index 7b56149..dfb458f 100644
--- 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
index 22bcc8e..191171c 100644
--- a/budgeteer/web_interface/vuejs_frontend/package-lock.json
+++ b/budgeteer/web_interface/vuejs_frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "budgeteer-web",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "budgeteer-web",
-      "version": "0.1.0",
+      "version": "0.1.1",
       "dependencies": {
         "@formkit/i18n": "^0.17.4",
         "@formkit/vue": "^0.17.4",
diff --git a/budgeteer/web_interface/vuejs_frontend/package.json b/budgeteer/web_interface/vuejs_frontend/package.json
index e90f9ce..805119d 100644
--- 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
index 065970d..034c5ea 100644
--- 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/Transactions.vue b/budgeteer/web_interface/vuejs_frontend/src/components/Transactions.vue
index 78ebbf2..7f53bad 100644
--- 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
index ab1e8fa..39aa2f9 100644
--- 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
             }