From 643503fd1459e5545f72ec406b44e657cf338f74 Mon Sep 17 00:00:00 2001
From: Suchin Sapphasitthatha <suchin@joolsoft.com>
Date: Thu, 19 Dec 2024 17:51:33 +0000
Subject: [PATCH 1/4] modify CI

---
 .onedev-buildspec.yml | 201 +++++++++++++++++++++---------------------
 1 file changed, 101 insertions(+), 100 deletions(-)

diff --git a/.onedev-buildspec.yml b/.onedev-buildspec.yml
index 8ba5b5947..c49cd32eb 100644
--- a/.onedev-buildspec.yml
+++ b/.onedev-buildspec.yml
@@ -1,102 +1,103 @@
 version: 37
 jobs:
-  - name: CI for UAT
-    steps:
-      - !CheckoutStep
-        name: checkout code
-        cloneCredential: !DefaultCredential {}
-        withLfs: false
-        withSubmodules: false
-        condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-      - !GenerateChecksumStep
-        name: generate package checksum
-        files: package-lock.json yarn.lock
-        targetFile: checksum
-        condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-      - !SetupCacheStep
-        name: set up npm cache
-        key: node_modules_@file:checksum@
-        loadKeys:
-          - node_modules
-        paths:
-          - node_modules
-        uploadStrategy: UPLOAD_IF_NOT_HIT
-        condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-      - !SetBuildVersionStep
-        name: set build version
-        buildVersion: "@tag@"
-        condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-      - !CommandStep
-        name: build & test
-        runInContainer: true
-        image: node
-        interpreter: !DefaultInterpreter
-          commands: |
-            npm install
-            npm run build
-        useTTY: true
-        condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-      - !BuildImageStep
-        name: build docker image
-        dockerfile: ./docker/Dockerfile
-        output: !RegistryOutput
-          tags: hrms-git.chin.in.th/bma-hrms/hrms-mgt:@build_version@ hrms-git.chin.in.th/bma-hrms/hrms-mgt:latest
-        condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-    triggers:
-      - !TagCreateTrigger
-        tags: uat-*
-        branches: main
-    retryCondition: never
-    maxRetries: 3
-    retryDelay: 30
-    timeout: 14400
-  - name: CI for PROD
-    steps:
-      - !CheckoutStep
-        name: checkout code
-        cloneCredential: !DefaultCredential {}
-        withLfs: false
-        withSubmodules: false
-        condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-      - !GenerateChecksumStep
-        name: generate package checksum
-        files: package-lock.json yarn.lock
-        targetFile: checksum
-        condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-      - !SetupCacheStep
-        name: set up npm cache
-        key: node_modules_@file:checksum@
-        loadKeys:
-          - node_modules
-        paths:
-          - node_modules
-        uploadStrategy: UPLOAD_IF_NOT_HIT
-        condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-      - !SetBuildVersionStep
-        name: set build version
-        buildVersion: "@tag@"
-        condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-      - !CommandStep
-        name: build & test
-        runInContainer: true
-        image: node
-        interpreter: !DefaultInterpreter
-          commands: |
-            npm install
-            npm run build
-        useTTY: true
-        condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-      - !BuildImageStep
-        name: build docker image
-        dockerfile: ./docker/Dockerfile
-        output: !RegistryOutput
-          tags: hrms-git.bangkok.go.th/bma-hrms/hrms-mgt:@build_version@ hrms-git.bangkok.go.th/bma-hrms/hrms-mgt:latest
-        condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-    triggers:
-      - !TagCreateTrigger
-        tags: prod-*
-        branches: main
-    retryCondition: never
-    maxRetries: 3
-    retryDelay: 30
-    timeout: 14400
+- name: CI for UAT
+  steps:
+  - !CheckoutStep
+    name: checkout code
+    cloneCredential: !DefaultCredential {}
+    withLfs: false
+    withSubmodules: false
+    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+  - !GenerateChecksumStep
+    name: generate package checksum
+    files: package-lock.json yarn.lock
+    targetFile: checksum
+    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+  - !SetupCacheStep
+    name: set up npm cache
+    key: node_modules_@file:checksum@
+    loadKeys:
+    - node_modules
+    paths:
+    - node_modules
+    uploadStrategy: UPLOAD_IF_NOT_HIT
+    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+  - !SetBuildVersionStep
+    name: set build version
+    buildVersion: '@tag@'
+    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+  - !CommandStep
+    name: build & test
+    runInContainer: true
+    image: node
+    interpreter: !DefaultInterpreter
+      commands: |
+        npm install
+        npm run build
+    useTTY: true
+    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+  - !BuildImageStep
+    name: build docker image
+    dockerfile: ./docker/Dockerfile
+    output: !RegistryOutput
+      tags: hrms-git.chin.in.th/bma-hrms/hrms-mgt:@build_version@ hrms-git.chin.in.th/bma-hrms/hrms-mgt:latest
+    platforms: linux/amd64
+    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+  triggers:
+  - !TagCreateTrigger
+    tags: uat-*
+    branches: main
+  retryCondition: never
+  maxRetries: 3
+  retryDelay: 30
+  timeout: 14400
+- name: CI for PROD
+  steps:
+  - !CheckoutStep
+    name: checkout code
+    cloneCredential: !DefaultCredential {}
+    withLfs: false
+    withSubmodules: false
+    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+  - !GenerateChecksumStep
+    name: generate package checksum
+    files: package-lock.json yarn.lock
+    targetFile: checksum
+    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+  - !SetupCacheStep
+    name: set up npm cache
+    key: node_modules_@file:checksum@
+    loadKeys:
+    - node_modules
+    paths:
+    - node_modules
+    uploadStrategy: UPLOAD_IF_NOT_HIT
+    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+  - !SetBuildVersionStep
+    name: set build version
+    buildVersion: '@tag@'
+    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+  - !CommandStep
+    name: build & test
+    runInContainer: true
+    image: node
+    interpreter: !DefaultInterpreter
+      commands: |
+        npm install
+        npm run build
+    useTTY: true
+    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+  - !BuildImageStep
+    name: build docker image
+    dockerfile: ./docker/Dockerfile
+    output: !RegistryOutput
+      tags: hrms-git.bangkok.go.th/bma-hrms/hrms-mgt:@build_version@ hrms-git.bangkok.go.th/bma-hrms/hrms-mgt:latest
+    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+  triggers:
+  - !TagCreateTrigger
+    tags: prod-*
+    branches: main
+  retryCondition: never
+  maxRetries: 3
+  retryDelay: 30
+  timeout: 14400

From 57fd50cd1fc1789915c4230b42d3cef305e59a90 Mon Sep 17 00:00:00 2001
From: Suchin Sapphasitthatha <suchin@joolsoft.com>
Date: Fri, 20 Dec 2024 03:10:39 +0000
Subject: [PATCH 2/4] modify CI

---
 .onedev-buildspec.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.onedev-buildspec.yml b/.onedev-buildspec.yml
index c49cd32eb..ca8c53977 100644
--- a/.onedev-buildspec.yml
+++ b/.onedev-buildspec.yml
@@ -12,7 +12,7 @@ jobs:
     name: generate package checksum
     files: package-lock.json yarn.lock
     targetFile: checksum
-    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+    condition: NEVER
   - !SetupCacheStep
     name: set up npm cache
     key: node_modules_@file:checksum@
@@ -21,7 +21,7 @@ jobs:
     paths:
     - node_modules
     uploadStrategy: UPLOAD_IF_NOT_HIT
-    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+    condition: NEVER
   - !SetBuildVersionStep
     name: set build version
     buildVersion: '@tag@'
@@ -35,7 +35,7 @@ jobs:
         npm install
         npm run build
     useTTY: true
-    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+    condition: NEVER
   - !BuildImageStep
     name: build docker image
     dockerfile: ./docker/Dockerfile

From 2eaff5ab4a1387061a1ba8a48e51c3fe981cc1fc Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 20 Dec 2024 10:46:05 +0700
Subject: [PATCH 3/4] fix

---
 src/modules/05_placement/views/06_appointPromoteMain.vue  | 4 +---
 src/modules/05_placement/views/07_appointEmployeeMain.vue | 2 --
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/modules/05_placement/views/06_appointPromoteMain.vue b/src/modules/05_placement/views/06_appointPromoteMain.vue
index 4b3df9752..9b8458fd0 100644
--- a/src/modules/05_placement/views/06_appointPromoteMain.vue
+++ b/src/modules/05_placement/views/06_appointPromoteMain.vue
@@ -42,8 +42,6 @@ const position = ref<string>(""); //ตำแหน่ง
 const typeModal = ref<string | null>(null); //ประเภท popup แต่งตั้ง , เลื่อน , ย้าย
 const dataRows = ref<PersonData>();
 const personalId = ref<string>("");
-
-const filterRef = ref<any>(null);
 const listRecevice = ref<resData[]>([]); //ข้อมูลรายการแต่งตั้ง-เลื่อน-ย้าย
 const optionsType = ref<OpType[]>([]);
 const type = ref<string>("");
@@ -167,7 +165,7 @@ async function fecthlistappointment() {
       rowsData.value = response;
       // รายชื่อ ส่งไปออกคำสั่ง
       const listData = rows.value.filter(
-        (e: any) =>
+        (e: PersonData) =>
           e.root !== null &&
           e.status !== "REPORT" &&
           e.status !== "DONE" &&
diff --git a/src/modules/05_placement/views/07_appointEmployeeMain.vue b/src/modules/05_placement/views/07_appointEmployeeMain.vue
index a7cc44244..ded722f5c 100644
--- a/src/modules/05_placement/views/07_appointEmployeeMain.vue
+++ b/src/modules/05_placement/views/07_appointEmployeeMain.vue
@@ -41,8 +41,6 @@ const posType = ref<string>(""); //ประเภทตำแหน่ง
 const posLevel = ref<string>(""); //ระดับตำแหน่ง
 const position = ref<string>(""); //ตำแหน่ง
 const dataRows = ref<PersonData>();
-
-const filterRef = ref<any>(null);
 const listRecevice = ref<resData[]>([]); //ข้อมูลรายการปรับระดับชั้นงานลูกจ้าง
 const optionsType = ref<OpType[]>([]);
 const type = ref<string>("");

From 5c847f0a68952f57e434432ba360a02313f43c88 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 20 Dec 2024 11:52:00 +0700
Subject: [PATCH 4/4] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20ui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../02_organization/components/MainView.vue   | 41 +++++++++++--------
 .../16_positionEmployee/views/main.vue        | 39 +++++++++++-------
 2 files changed, 49 insertions(+), 31 deletions(-)

diff --git a/src/modules/02_organization/components/MainView.vue b/src/modules/02_organization/components/MainView.vue
index f4ba6ca58..bd35e4bd4 100644
--- a/src/modules/02_organization/components/MainView.vue
+++ b/src/modules/02_organization/components/MainView.vue
@@ -327,22 +327,31 @@ onMounted(async () => {
                 </div>
               </q-card>
 
-              <TreeTable
-                v-if="nodeId !== ''"
-                v-model:node-tree="nodeTree"
-                v-model:org-level="orgLevel"
-                v-model:tree-id="nodeId"
-                v-model:pos-master="posMaster"
-                v-model:req-master="reqMaster"
-                v-model:total-page="totalPage"
-                v-model:org-root-id="orgRootId"
-                v-model:total-data="totalData"
-                :short-name="shortName"
-                :main-tree="mainTree"
-                :fetch-data-table="fetchDataTable"
-                :filter-keyword="filterKeyword"
-                :fetch-data-tree="fetchDataTree"
-              />
+              <q-card
+                falt
+                bordered
+                class="q-mt-xs q-gutter-xs scroll"
+                style="height: 72vh"
+              >
+                <div class="q-pa-sm">
+                  <TreeTable
+                    v-if="nodeId !== ''"
+                    v-model:node-tree="nodeTree"
+                    v-model:org-level="orgLevel"
+                    v-model:tree-id="nodeId"
+                    v-model:pos-master="posMaster"
+                    v-model:req-master="reqMaster"
+                    v-model:total-page="totalPage"
+                    v-model:org-root-id="orgRootId"
+                    v-model:total-data="totalData"
+                    :short-name="shortName"
+                    :main-tree="mainTree"
+                    :fetch-data-table="fetchDataTable"
+                    :filter-keyword="filterKeyword"
+                    :fetch-data-tree="fetchDataTree"
+                  />
+                </div>
+              </q-card>
             </div>
             <div class="row col-12 items-center" v-else>
               <q-banner class="q-pa-lg col-12 text-center">
diff --git a/src/modules/16_positionEmployee/views/main.vue b/src/modules/16_positionEmployee/views/main.vue
index 7b64bc8c4..8fba3eb37 100644
--- a/src/modules/16_positionEmployee/views/main.vue
+++ b/src/modules/16_positionEmployee/views/main.vue
@@ -288,21 +288,30 @@ onMounted(() => {
                       </div>
                     </q-card>
 
-                    <TreeTable
-                      v-if="nodeId !== ''"
-                      v-model:node-tree="nodeTree"
-                      v-model:org-level="orgLevel"
-                      v-model:tree-id="nodeId"
-                      v-model:pos-master="posMaster"
-                      v-model:req-master="reqMaster"
-                      v-model:total-page="totalPage"
-                      v-model:total-data="totalData"
-                      :short-name="shortName"
-                      :main-tree="mainTree"
-                      :fetch-data-table="fetchDataTable"
-                      :fetch-data-tree="fetchDataTree"
-                      :filter-keyword="filterKeyword"
-                    />
+                    <q-card
+                      falt
+                      bordered
+                      class="q-mt-xs q-gutter-xs scroll"
+                      style="height: 72vh"
+                    >
+                      <div class="q-pa-sm">
+                        <TreeTable
+                          v-if="nodeId !== ''"
+                          v-model:node-tree="nodeTree"
+                          v-model:org-level="orgLevel"
+                          v-model:tree-id="nodeId"
+                          v-model:pos-master="posMaster"
+                          v-model:req-master="reqMaster"
+                          v-model:total-page="totalPage"
+                          v-model:total-data="totalData"
+                          :short-name="shortName"
+                          :main-tree="mainTree"
+                          :fetch-data-table="fetchDataTable"
+                          :fetch-data-tree="fetchDataTree"
+                          :filter-keyword="filterKeyword"
+                        />
+                      </div>
+                    </q-card>
                   </div>
                   <div class="row col-12 items-center" v-else>
                     <q-banner class="q-pa-lg col-12 text-center">