Merge branch 'DEV' of https://mygit.myhr.co.th/angular/myAppraisal into DEV

src/app/components/company-registration/company-registration.component.html

@@ -32,3 +32,4 @@
             </div>
         </div>
     </div>
+</div>
\ No newline at end of file

src/app/components/job-description/job-description.component.html

-<app-page-header [pathTitle]="pathTitle"></app-page-header>
+<!-- <app-page-header [pathTitle]="pathTitle"></app-page-header>
 <div class="bg-card-white">
 </div>
 <div class="block-main-content">
@@ -24,8 +24,7 @@
             </div>
             <div *ngIf="activeTab === 'tab2'" class="tab-pane">
                 <div class="mt-5">
-                    <app-position-unit [pathTitle]="pathTitle"
-                        (sendPathTitle)="pathTitle=$event"></app-position-unit>
+                    <app-position-unit [pathTitle]="pathTitle" (sendPathTitle)="pathTitle=$event"></app-position-unit>
                 </div>
             </div>
             <div *ngIf="activeTab === 'tab3'" class="tab-pane">
@@ -40,9 +39,67 @@
             </div>
             <div *ngIf="activeTab === 'tab5'" class="tab-pane">
                 <div class="mt-5">
-                    <app-employee-level [pathTitle]="pathTitle"
-                        (sendPathTitle)="pathTitle=$event"></app-employee-level>
+                    <app-employee-level [pathTitle]="pathTitle" (sendPathTitle)="pathTitle=$event"></app-employee-level>
+                </div>
+            </div>
+        </div>
+    </div>
+</div> -->
+
+<app-page-header [pathTitle]="pathTitle"></app-page-header>
+<div class="bg-card-white">
+</div>
+<div class="block-main-content">
+    <div class="text-xxl font-bold py-2 px-4 text-primary">
+        ข้อมูลลักษณะงาน
+    </div>
+    <div class="page">
+        <div class="border-b border-gray-200 dark:border-white/10">
+            <nav class="-mb-0.5 flex space-x-6 rtl:space-x-reverse">
+                <a class="pl-8 text-xxl font-bold hs-tab-active:border-secondary  hs-tab-active:text-secondary pb-3 px-1 inline-flex items-center gap-2 border-b-[3px] border-transparent whitespace-nowrap text-gray-500  dark:text-white/70 hover:text-secondary active"
+                    href="javascript:void(0);" id="underline-item-1" data-hs-tab="#underline-1"
+                    aria-controls="underline-1" (click)="pathTitle = ['ข้อมูลลักษณะงาน','กลุ่มพนักงาน']">
+                    กลุ่มพนักงาน
+                </a>
+                <a class="text-xxl font-bold hs-tab-active:border-secondary  hs-tab-active:text-secondary pb-3 px-1 inline-flex items-center gap-2 border-b-[3px] border-transparent whitespace-nowrap text-gray-500  dark:text-white/70 hover:text-secondary"
+                    href="javascript:void(0);" id="underline-item-2" data-hs-tab="#underline-2"
+                    aria-controls="underline-2" (click)="pathTitle = ['ข้อมูลลักษณะงาน','ตำเเหน่ง']">
+                    ตำเเหน่ง
+                </a>
+                <a class="text-xxl font-bold hs-tab-active:border-secondary  hs-tab-active:text-secondary pb-3 px-1 inline-flex items-center gap-2 border-b-[3px] border-transparent whitespace-nowrap text-gray-500  dark:text-white/70 hover:text-secondary"
+                    href="javascript:void(0);" id="underline-item-3" data-hs-tab="#underline-3"
+                    aria-controls="underline-3" (click)="pathTitle = ['ข้อมูลลักษณะงาน','ลักษณะงาน']">
+                    ลักษณะงาน
+                </a>
+                <a class="text-xxl font-bold hs-tab-active:border-secondary  hs-tab-active:text-secondary pb-3 px-1 inline-flex items-center gap-2 border-b-[3px] border-transparent whitespace-nowrap text-gray-500  dark:text-white/70 hover:text-secondary"
+                    href="javascript:void(0);" id="underline-item-4" data-hs-tab="#underline-4"
+                    aria-controls="underline-4" (click)="pathTitle = ['ข้อมูลลักษณะงาน','ประเภทพนักงาน']">
+                    ประเภทพนักงาน
+                </a>
+                <a class="text-xxl font-bold hs-tab-active:border-secondary  hs-tab-active:text-secondary pb-3 px-1 inline-flex items-center gap-2 border-b-[3px] border-transparent whitespace-nowrap text-gray-500  dark:text-white/70 hover:text-secondary"
+                    href="javascript:void(0);" id="underline-item-5" data-hs-tab="#underline-5"
+                    aria-controls="underline-5" (click)="pathTitle = ['ข้อมูลลักษณะงาน','ระดับพนักงาน (PL)']">
+                    ระดับพนักงาน (PL)
+                </a>
+            </nav>
+        </div>
+        <div class="mt-3 px-3rem">
+            <div id="underline-1" role="tabpanel" aria-labelledby="underline-item-1">
+                <app-employee-group-unit [pathTitle]="pathTitle"
+                    (sendPathTitle)="pathTitle=$event"></app-employee-group-unit>
+            </div>
+            <div id="underline-2" class="hidden" role="tabpanel" aria-labelledby="underline-item-2">
+                <app-position-unit [pathTitle]="pathTitle" (sendPathTitle)="pathTitle=$event"></app-position-unit>
+            </div>
+            <div id="underline-3" class="hidden" role="tabpanel" aria-labelledby="underline-item-3">
+                ลักษณะงาน
+            </div>
+            <div id="underline-4" class="hidden" role="tabpanel" aria-labelledby="underline-item-4">
+                <app-employee-categories [pathTitle]="pathTitle"
+                    (sendPathTitle)="pathTitle=$event"></app-employee-categories>
             </div>
+            <div id="underline-5" class="hidden" role="tabpanel" aria-labelledby="underline-item-5">
+                <app-employee-level [pathTitle]="pathTitle" (sendPathTitle)="pathTitle=$event"></app-employee-level>
             </div>
         </div>
     </div>

src/app/components/job-description/job-description.component.ts

@@ -6,12 +6,5 @@ import { Component } from '@angular/core';
   styleUrls: ['./job-description.component.scss']
 })
 export class JobDescriptionComponent {
-  pathTitle = ['การจัดการข้อมูลองค์กร', 'ข้อมูลลักษณะงาน', 'กลุ่มพนักงาน']
-  activeTab: string = 'tab1';
-
-  // ฟังก์ชันในการเปลี่ยนแท็บ
-  changeTab(tab: { id: string, text: string }) {
-    this.pathTitle = ['การจัดการข้อมูลองค์กร', 'ข้อมูลลักษณะงาน', tab.text]
-    this.activeTab = tab.id
-  }
+  pathTitle = ['ข้อมูลลักษณะงาน', 'กลุ่มพนักงาน']
 }