From 15fcfe80548ff3c7cd8be15bbd180192dd23a2f0 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 22 Jan 2026 16:45:43 +0700
Subject: [PATCH 1/8] 
 fix(calculateDurationYmd):moment(endDate).startOf("day").add(1, "days");

---
 .../15_development/components/scholarship/DetailView.vue        | 2 ++
 src/stores/mixin.ts                                             | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/modules/15_development/components/scholarship/DetailView.vue b/src/modules/15_development/components/scholarship/DetailView.vue
index 641f10094..7f9e59d08 100644
--- a/src/modules/15_development/components/scholarship/DetailView.vue
+++ b/src/modules/15_development/components/scholarship/DetailView.vue
@@ -374,6 +374,8 @@ function changeStartDate(type: string) {
         const endDate = new Date(formBody?.endDate);
         if (startDate > endDate) {
           formBody.endDate = null;
+        } else {
+          formBody.totalPeriod = calculateDurationYmd(startDate, endDate);
         }
       }
       break;
diff --git a/src/stores/mixin.ts b/src/stores/mixin.ts
index 4ea752184..7bc422c8b 100644
--- a/src/stores/mixin.ts
+++ b/src/stores/mixin.ts
@@ -946,7 +946,7 @@ export const useCounterMixin = defineStore("mixin", () => {
     if (!startDate || !endDate) return "";
 
     let start = moment(startDate).startOf("day");
-    let end = moment(endDate).startOf("day");
+    let end = moment(endDate).startOf("day").add(1, "days");
 
     // สลับค่าเพื่อให้ end มากกว่า start เสมอ
     if (start > end) [start, end] = [end, start];

From e80e4d6dfdc663f28d638cd97a14e88ab7d44ba3 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 30 Jan 2026 17:35:23 +0700
Subject: [PATCH 2/8] fix:test build

---
 src/modules/04_registryPerson/views/listView.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/modules/04_registryPerson/views/listView.vue b/src/modules/04_registryPerson/views/listView.vue
index 3b70e29a6..dbf8dcca0 100644
--- a/src/modules/04_registryPerson/views/listView.vue
+++ b/src/modules/04_registryPerson/views/listView.vue
@@ -745,6 +745,7 @@ onMounted(async () => {
         />
       </div>
     </q-card-section>
+    
   </q-card>
 
   <!-- แสดง dialog เลือกหน่วยงาน/ส่วนราชการ -->

From 78d1a06942d7b388eb6a22d945ad8811e44e51dc Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 6 Feb 2026 17:01:41 +0700
Subject: [PATCH 3/8] fix(development): display btn  projectStatus !== 'FINISH'

---
 src/modules/15_development/components/Target.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/modules/15_development/components/Target.vue b/src/modules/15_development/components/Target.vue
index 360cd4b26..f5a33abbd 100644
--- a/src/modules/15_development/components/Target.vue
+++ b/src/modules/15_development/components/Target.vue
@@ -634,8 +634,9 @@ onMounted(() => {
       class="col-xs-12 col-sm-12 text-weight-medium bg-grey-1 q-py-xs q-px-md"
     >
       เป้าหมายตามแผน
+      <!-- store.projectStatus !== 'FINISH' -->
       <q-btn
-        v-if="store.projectStatus !== 'FINISH' && !checkRoutePermission"
+        v-if="!checkRoutePermission"
         flat
         round
         dense
@@ -700,10 +701,9 @@ onMounted(() => {
           <template v-slot:body="props">
             <q-tr :props="props" class="vertical-top">
               <q-td>
+                <!-- store.projectStatus !== 'FINISH' &&  -->
                 <q-btn
-                  v-if="
-                    store.projectStatus !== 'FINISH' && !checkRoutePermission
-                  "
+                  v-if="!checkRoutePermission"
                   round
                   flat
                   color="edit"

From 70c942fc051c9e42fa1cc20c5fc5a5b50338e840 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 18 Feb 2026 18:14:11 +0700
Subject: [PATCH 4/8] fix(command):bug view PDF

---
 src/modules/18_command/components/DialogPreviewCommand.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/18_command/components/DialogPreviewCommand.vue b/src/modules/18_command/components/DialogPreviewCommand.vue
index 64e10f9bb..66623bfcd 100644
--- a/src/modules/18_command/components/DialogPreviewCommand.vue
+++ b/src/modules/18_command/components/DialogPreviewCommand.vue
@@ -41,8 +41,8 @@ const currentObjectUrl = ref<string | null>(null);
 function closeDialog() {
   modal.value = false;
   command.value = "";
-  commandId.value = "";
-  citizenId.value = "";
+  // commandId.value = "";
+  //  citizenId.value = "";
 }
 
 /**

From 95c8917d18a4f08faec1c41128f3af0112349b40 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 5 Mar 2026 13:45:21 +0700
Subject: [PATCH 5/8] fix: ci-cd push on tags

---
 .forgejo/workflows/build.yaml | 6 +++---
 .forgejo/workflows/ci-cd.yaml | 7 +++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml
index e63417a02..255d7eec5 100644
--- a/.forgejo/workflows/build.yaml
+++ b/.forgejo/workflows/build.yaml
@@ -3,9 +3,9 @@ name: Build
 
 on:
   push:
-    tags:
-      - "v[0-9]+.[0-9]+.[0-9]+"
-      - "v[0-9]+.[0-9]+.[0-9]+*"
+    # tags:
+    #   - "v[0-9]+.[0-9]+.[0-9]+"
+    #   - "v[0-9]+.[0-9]+.[0-9]+*"
   workflow_dispatch:
 
 env:
diff --git a/.forgejo/workflows/ci-cd.yaml b/.forgejo/workflows/ci-cd.yaml
index 4cc280867..b89ae3b44 100644
--- a/.forgejo/workflows/ci-cd.yaml
+++ b/.forgejo/workflows/ci-cd.yaml
@@ -3,8 +3,11 @@ name: Build & Deploy on Dev
 
 on:
   push:
-    branches:
-      - dev
+    # branches:
+    #   - dev
+    tags:
+      - "v[0-9]+.[0-9]+.[0-9]+"
+      - "v[0-9]+.[0-9]+.[0-9]+*"
   workflow_dispatch:
 
 env:

From 001bf4e33043ec445f310a1f995772602fd917f0 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 5 Mar 2026 14:38:49 +0700
Subject: [PATCH 6/8] fix

---
 .forgejo/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml
index 255d7eec5..ddb52c479 100644
--- a/.forgejo/workflows/build.yaml
+++ b/.forgejo/workflows/build.yaml
@@ -1,12 +1,12 @@
 # /.forgejo/workflows/build.yml
 name: Build
 
-on:
-  push:
+# on:
+  # push:
     # tags:
     #   - "v[0-9]+.[0-9]+.[0-9]+"
     #   - "v[0-9]+.[0-9]+.[0-9]+*"
-  workflow_dispatch:
+  # workflow_dispatch:
 
 env:
   REGISTRY: ${{ vars.CONTAINER_REGISTRY }}

From fbfc801ef9e351887b29b8737b1c434671600aa0 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 6 Mar 2026 17:23:27 +0700
Subject: [PATCH 7/8] fix

---
 .forgejo/workflows/ci-cd.yaml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.forgejo/workflows/ci-cd.yaml b/.forgejo/workflows/ci-cd.yaml
index b89ae3b44..2bf102922 100644
--- a/.forgejo/workflows/ci-cd.yaml
+++ b/.forgejo/workflows/ci-cd.yaml
@@ -32,7 +32,11 @@ jobs:
               ca=["/etc/ssl/certs/ca-certificates.crt"]
       - name: Tag Version
         run: |
-          echo "IMAGE_VERSION=latest"
+          if [ "${{ github.ref_type }}" == "tag" ]; then
+            echo "IMAGE_VERSION=${{ github.ref_name }}" >> $GITHUB_ENV
+          else
+            echo "IMAGE_VERSION=latest" >> $GITHUB_ENV
+          fi
       - name: Login in to registry
         uses: docker/login-action@v2
         with:

From e5265dde980f348380d69a4abc40b5cff0dac9f3 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 8 Jun 2026 17:18:23 +0700
Subject: [PATCH 8/8] Merge branch 'develop' into dev