From 53dd257aa01f5ee28480ad7b451d414ceb31374f Mon Sep 17 00:00:00 2001
From: bton <anton@postmitdermaus.de>
Date: Wed, 6 Nov 2024 21:09:06 +0100
Subject: [PATCH 1/3] fixed stuff

---
 web/src/views/Ticket.vue | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/web/src/views/Ticket.vue b/web/src/views/Ticket.vue
index 63f3515..d11b872 100644
--- a/web/src/views/Ticket.vue
+++ b/web/src/views/Ticket.vue
@@ -83,7 +83,7 @@ export default {
         ticket(val) {
             if (this.selected_state == null) {
                 this.selected_state = val.state;
-            }
+			}
             if (this.selected_assignee == null) {
                 this.selected_assignee = val.assigned_to
             }
@@ -102,6 +102,8 @@ export default {
             return `ticket+${this.ticket.uuid}@${domain}`;
         }
     },
+        //this.scheduleAfterInit(() => [this.fetchTicketStates(), this.loadTickets(), this.loadUsers(),
+            //this.fetchShippingVouchers()]);
     methods: {
         ...mapActions(['deleteItem', 'markItemReturned', 'sendMail', 'updateTicketPartial', 'postComment']),
         ...mapActions(['loadTickets', 'fetchTicketStates', 'loadUsers', 'scheduleAfterInit']),
@@ -134,12 +136,16 @@ export default {
         },
     },
     mounted() {
-        this.scheduleAfterInit(() => [this.fetchTicketStates(), this.loadTickets(), this.loadUsers(),
-            this.fetchShippingVouchers()]);
+		this.scheduleAfterInit(() => [Promise.all([this.fetchTicketStates(), this.loadTickets(), this.loadUsers(), this.fetchShippingVouchers()]).then(()=>{
+			this.selected_state = this.ticket.state;
+			this.selected_assignee = this.ticket.assigned_to
+		})]);
+        //this.scheduleAfterInit(() => [this.fetchTicketStates(), this.loadTickets(), this.loadUsers(),
+            //this.fetchShippingVouchers()]);
     }
 };
 </script>
 
 <style scoped>
 
-</style>
\ No newline at end of file
+</style>

From 0f8462dc7c11ddb0ce2de90dc8d7b3938bbf097a Mon Sep 17 00:00:00 2001
From: jedi <git@m.j3d1.de>
Date: Wed, 6 Nov 2024 21:13:44 +0100
Subject: [PATCH 2/3] enforce startup order in docker-compose.yml

---
 deploy/dev/docker-compose.yml | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/deploy/dev/docker-compose.yml b/deploy/dev/docker-compose.yml
index 95e8083..dff5ab3 100644
--- a/deploy/dev/docker-compose.yml
+++ b/deploy/dev/docker-compose.yml
@@ -6,11 +6,17 @@ services:
     command: bash -c 'python manage.py migrate && python manage.py runserver 0.0.0.0:8000'
     environment:
       - HTTP_HOST=core
-      #- DATABASE_URL
+      - DB_HOST=db
+      - DB_PORT=3306
+      - DB_NAME=system3
+      - DB_USER=system3
+      - DB_PASSWORD=system3
     volumes:
       - ../../core:/code
     ports:
       - "8000:8000"
+    depends_on:
+      - db
 
   frontend:
     build:
@@ -23,6 +29,8 @@ services:
       - ./vue.config.js:/web/vue.config.js
     ports:
       - "8080:8080"
+    depends_on:
+      - core
 
   db:
     image: mariadb
@@ -30,4 +38,11 @@ services:
       MARIADB_RANDOM_ROOT_PASSWORD: true
       MARIADB_DATABASE: system3
       MARIADB_USER: system3
-      MARIADB_PASSWORD: system3
\ No newline at end of file
+      MARIADB_PASSWORD: system3
+    volumes:
+      - mariadb_data:/var/lib/mysql
+    ports:
+      - "3306:3306"
+
+volumes:
+  mariadb_data:
\ No newline at end of file

From 6ce4a1df4c42c18e3b84605d15845d9caf1a36cf Mon Sep 17 00:00:00 2001
From: bton <anton@postmitdermaus.de>
Date: Wed, 6 Nov 2024 21:09:06 +0100
Subject: [PATCH 3/3] fixed stuff

---
 web/src/views/Ticket.vue | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/web/src/views/Ticket.vue b/web/src/views/Ticket.vue
index 63f3515..d11b872 100644
--- a/web/src/views/Ticket.vue
+++ b/web/src/views/Ticket.vue
@@ -83,7 +83,7 @@ export default {
         ticket(val) {
             if (this.selected_state == null) {
                 this.selected_state = val.state;
-            }
+			}
             if (this.selected_assignee == null) {
                 this.selected_assignee = val.assigned_to
             }
@@ -102,6 +102,8 @@ export default {
             return `ticket+${this.ticket.uuid}@${domain}`;
         }
     },
+        //this.scheduleAfterInit(() => [this.fetchTicketStates(), this.loadTickets(), this.loadUsers(),
+            //this.fetchShippingVouchers()]);
     methods: {
         ...mapActions(['deleteItem', 'markItemReturned', 'sendMail', 'updateTicketPartial', 'postComment']),
         ...mapActions(['loadTickets', 'fetchTicketStates', 'loadUsers', 'scheduleAfterInit']),
@@ -134,12 +136,16 @@ export default {
         },
     },
     mounted() {
-        this.scheduleAfterInit(() => [this.fetchTicketStates(), this.loadTickets(), this.loadUsers(),
-            this.fetchShippingVouchers()]);
+		this.scheduleAfterInit(() => [Promise.all([this.fetchTicketStates(), this.loadTickets(), this.loadUsers(), this.fetchShippingVouchers()]).then(()=>{
+			this.selected_state = this.ticket.state;
+			this.selected_assignee = this.ticket.assigned_to
+		})]);
+        //this.scheduleAfterInit(() => [this.fetchTicketStates(), this.loadTickets(), this.loadUsers(),
+            //this.fetchShippingVouchers()]);
     }
 };
 </script>
 
 <style scoped>
 
-</style>
\ No newline at end of file
+</style>