From 281c42f637ac3fc8bacb745711a6d50a5b16e23d Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 13 Feb 2024 16:46:39 +0700
Subject: [PATCH 1/3] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?=
 =?UTF-8?q?=E0=B8=82=E0=B8=81=E0=B8=A5=E0=B9=88=E0=B8=AD=E0=B8=87=E0=B8=82?=
 =?UTF-8?q?=E0=B9=89=E0=B8=AD=E0=B8=84=E0=B8=A7=E0=B8=B2=E0=B8=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/01_dashboard/views/Dashboard.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/modules/01_dashboard/views/Dashboard.vue b/src/modules/01_dashboard/views/Dashboard.vue
index 2cfe962..39e0fd0 100644
--- a/src/modules/01_dashboard/views/Dashboard.vue
+++ b/src/modules/01_dashboard/views/Dashboard.vue
@@ -241,7 +241,9 @@ const thaiOptions: Intl.DateTimeFormatOptions = {
             กล่องข้อความ
           </div>
           <q-space />
-          <div class="text-grey-5" style="font-size: 12px">ทั้งหมด {{ totalInbox }} ข้อความ</div>
+          <div class="text-grey-5" style="font-size: 12px">
+            ทั้งหมด {{ totalInbox }} ข้อความ
+          </div>
         </div>
         <div
           v-if="totalInbox != 0"
@@ -265,7 +267,7 @@ const thaiOptions: Intl.DateTimeFormatOptions = {
                 class="'q-py-md q-mb-sm my-menu'"
                 :active="link === item.no"
                 active-class="my-menu-link"
-                @click="onClickOpenPopupDetail(item)"
+                @click.stop.prevent="onClickOpenPopupDetail(item)"
               >
                 <q-item-section>
                   <q-item-label caption class="text-weight-light">
@@ -308,7 +310,7 @@ const thaiOptions: Intl.DateTimeFormatOptions = {
                     icon="mdi-reply"
                     size="10px"
                     color="grey-7"
-                    @click="dialogRepleOpen(item.no)"
+                    @click.stop.prevent="dialogRepleOpen(item.no)"
                   >
                     <q-tooltip>ตอบกลับข้อความ</q-tooltip>
                   </q-btn>

From df5bd24f7b2ae4d287f01f86c4569374ab206a24 Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Tue, 13 Feb 2024 21:08:09 +0700
Subject: [PATCH 2/3] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20path=20build?=
 =?UTF-8?q?=20server?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/release.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 131c053..74f75c4 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -8,8 +8,8 @@ on:
 env:
     REGISTRY: docker.frappet.com
     IMAGE_NAME: ehr/bma-ehr-user
-    DEPLOY_HOST: frappet.com
-    COMPOSE_PATH: /home/frappet/docker/bma-ehr-user
+    DEPLOY_HOST: 192.168.1.80
+    COMPOSE_PATH: /home/frappet/docker/bma-ehr
 
 jobs:
     # act workflow_dispatch -W .github/workflows/release.yaml --input IMAGE_VER=test-v6.1 -s DOCKER_USER=sorawit -s DOCKER_PASS=P@ssword -s SSH_PASSWORD=P@ssw0rd

From 678b0505d6e37ef458dd3a6e5ce800ab3bab43d9 Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Wed, 14 Feb 2024 14:41:42 +0700
Subject: [PATCH 3/3] =?UTF-8?q?=E0=B9=80=E0=B8=9B=E0=B8=A5=E0=B8=B5?=
 =?UTF-8?q?=E0=B9=88=E0=B8=A2=E0=B8=99=E0=B8=97=E0=B8=B5=E0=B9=88=20build?=
 =?UTF-8?q?=20docker?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/release.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 74f75c4..257e4f5 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -8,8 +8,8 @@ on:
 env:
     REGISTRY: docker.frappet.com
     IMAGE_NAME: ehr/bma-ehr-user
-    DEPLOY_HOST: 192.168.1.80
-    COMPOSE_PATH: /home/frappet/docker/bma-ehr
+    DEPLOY_HOST: 49.0.91.80
+    COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-user
 
 jobs:
     # act workflow_dispatch -W .github/workflows/release.yaml --input IMAGE_VER=test-v6.1 -s DOCKER_USER=sorawit -s DOCKER_PASS=P@ssword -s SSH_PASSWORD=P@ssw0rd
@@ -60,11 +60,11 @@ jobs:
                   host: ${{env.DEPLOY_HOST}}
                   username: frappet
                   password: ${{ secrets.SSH_PASSWORD }}
-                  port: 22
+                  port: 10102
                   script: |
                       cd "${{env.COMPOSE_PATH}}"
-                      docker-compose pull
-                      docker-compose up -d
+                      docker compose pull
+                      docker compose up -d
                       echo "${{ steps.gen_ver.outputs.image_ver }}"> success
             - uses: snow-actions/line-notify@v1.1.0
               if: success()