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

src/app/components/competency-assessment/competency-management/indicators-and-curriculum/edit-group-indicators/edit-group-indicators.html

@@ -128,10 +128,10 @@
                             </td>
                             <td style="font-size: 12px; padding-left: 1.5rem; width: 150px;">
                                 <div style="display: flex; align-items: center;">
-                                    <button type="button" class="ti-btn rounded-sm ti-btn-secondary" style="height: 15px; width: 45px; font-size: 12px; display: flex; align-items: center; justify-content: center;" data-hs-overlay="#edit-group-indicators-alert-delete-modal">
+                                    <button type="button" class="ti-btn rounded-sm ti-btn-secondary" style="height: 15px; width: 45px; font-size: 12px; display: flex; align-items: center; justify-content: center;">
                                         O
                                         <div class="ciricon text-center">
-                                            <i class="ri-close-line text-red-500"></i>
+                                            <i class="ri-close-line text-red-500" data-hs-overlay="#edit-group-indicators-alert-delete-modal"></i>
                                         </div>
                                     </button>
                                     <button type="button" style="display: flex; align-items: center; justify-content: center;">
@@ -454,7 +454,7 @@
                 </h3>
                 <div class="flex justify-end">
                     <button type="button" class="hs-dropdown-toggle ti-modal-clode-btn text-danger"
-                        data-hs-overlay="#indicators-and-curriculum-component-alert-delete-modal">
+                        data-hs-overlay="#edit-group-indicators-alert-delete-modal">
                         <span class="sr-only">Close</span>
                         <i class="ti ti-circle-x fs-xxl"></i>
                     </button>

src/app/components/competency-assessment/idp-development-plan/idp-development-plan.component.html

+<app-page-header [pathTitle]="pathTitle"></app-page-header>
+<div class="bg-card-white">
+</div>
+<div class="block-main-content">
+    <div class="text-lg font-bold py-2 text-primary px-8">
+        แผนพัฒนา IDP
+    </div>
+    <div class="page">
+        <div class="border-b border-gray-200 dark:border-white/10 px-8">
+            <nav class="-mb-0.5 flex space-x-6 rtl:space-x-reverse">
+                <a class="text-base font-medium hs-tab-active:border-secondary  hs-tab-active:text-secondary pb-3 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 = ['การประเมินสมรรถนะ','แผนพัฒนา IDP','กำหนดแผนพัฒนา IDP']">
+                    กำหนดแผนพัฒนา IDP
+                </a>
+            </nav>
+        </div>
+        <div class="mt-3 px-3rem">
+            <div id="underline-1" role="tabpanel" aria-labelledby="underline-item-1">
+                <app-set-idp-development-plan [pathTitle]="pathTitle"
+                    (sendPathTitle)="pathTitle=$event"></app-set-idp-development-plan>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file

src/app/components/competency-assessment/idp-development-plan/idp-development-plan.component.scss

+/* สไตล์ของแถบเมนู */
+.nav-tabs {
+    display: flex;
+    border-bottom: 2px solid #ccc; /* เส้นใต้ */
+    border-top: 2px solid #ccc;
+    width: 100%;
+    cursor: pointer;
+    border-top: 2px solid #ccc;
+}
+
+.nav-item {
+    list-style: none;
+    margin-right: 40px; /* ช่องว่างระหว่างเมนู */
+
+}
+
+.nav-link {
+    text-decoration: none;
+    padding: 10px 20px;
+    display: inline-block;
+    font-size: medium;
+    text-align: left;
+    padding-left: 0px;
+    padding-right: 0px;
+}
+
+.nav-link:hover {
+    background-color: #f0f0f0; /* เปลี่ยนสีเมื่อ hover */
+}
+
+.nav-link.active {
+    color: #569bf5; /* สีตัวอักษรในสถานะ active */
+    font-size: medium;
+    border-bottom: 3.5px solid #569bf5; /* เส้นใต้ */
+}
+
+.tab-content {
+    margin-top: 20px;
+}
+
+.tab-pane.active {
+    display: block;
+}
+.body-content {
+    margin-left: 10px;
+}
\ No newline at end of file

src/app/components/competency-assessment/idp-development-plan/idp-development-plan.component.ts

+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-idp-development-plan',
+  templateUrl: './idp-development-plan.component.html',
+  styleUrls: ['./idp-development-plan.component.scss']
+})
+export class IdpDevelopmentPlanComponent {
+  pathTitle = ['การประเมินสมรรถนะ', 'แผนพัฒนา IDP','กำหนดแผนพัฒนา IDP']
+}

src/app/components/competency-assessment/idp-development-plan/set-idp-development-plan/set-idp-development-plan.component.scss

+.button-clear {
+  position: absolute;
+  top: 96px;
+  z-index: 1;
+  right: 41vw;
+}
+.button-help {
+  position: absolute;
+  top: 0px;
+  z-index: 1;
+  right: 0vw;
+  margin: 4.2rem;
+  margin-right: 10px; /* เพิ่มใหม่ 12/16*/
+}
+table.ti-custom-table-one th {
+  text-align: center;
+  vertical-align: middle;
+  width: 10%;
+  height: 40px;
+  border: 1px solid black;
+}
+
+table.ti-custom-table-one td {
+  text-align: center;
+  vertical-align: middle;
+  width: 10%;
+  height: 40px;
+  border: 1px solid black;
+}
+
+table.ti-custom-table thead {
+  text-align: center;
+  vertical-align: middle;
+  width: 30%;
+  height: 40px;
+  border: 1px solid white;
+  background-color: #569BF5;
+}
+
+table.ti-custom-table th {
+  text-align: center;
+  vertical-align: middle;
+  width: 30%;
+  height: 40px;
+  border: 1px solid white;
+  background-color: #569BF5;
+  color: white;
+  text-transform: none; /* ป้องกันไม่ให้ข้อความเป็นตัวใหญ่ */
+  font-weight: bold; /* กำหนดให้ฟอนต์เป็นปกติ */
+}
+
+
+table.ti-custom-table tbody {
+  text-align: center;
+  vertical-align: middle;
+  height: 40px;
+  border: 1px solid white;
+}
+
+table.ti-custom-table td {
+  text-align: center;
+  vertical-align: middle;
+  width: 20%;
+  height: 70px;
+}
+
+a.custom-link {
+  padding: 10px 40px; /* ปรับ padding ให้เพิ่มขนาด */
+}
+/* สไตล์ของแถบเมนู */
+.nav-tabs {
+  display: flex;
+  width: 100%;
+  cursor: pointer;
+  margin-bottom: 10px;
+  height: 20%;
+}
+
+.nav-item {
+  list-style: none;
+  margin-right: 10px; /* ช่องว่างระหว่างเมนู */
+}
+
+.nav-link {
+  text-decoration: none;
+  padding: 10px 20px;
+  display: inline-block;
+  font-size: large;
+  border-width: 2px 2px 0px 2px;
+  border-style: solid;
+  border-color: #ccc;
+  border-radius: 5px 5px 0px 0px;
+}
+
+.nav-link:hover {
+  background-color: #f0f0f0; /* เปลี่ยนสีเมื่อ hover */
+}
+
+.nav-link.active {
+  color: #ffffff; /* สีตัวอักษรในสถานะ active */
+  font-size: large;
+  border-bottom: 3.5px solid rgb(var(--color-primary)); /* เส้นใต้ */
+  background-color: rgb(var(--color-primary));
+  border-width: 2px 2px 0px 2px;
+  border-style: solid;
+  border-color: rgb(var(--color-primary));
+  border-radius: 5px 5px 0px 0px;
+}
+
+.tab-content {
+  margin-top: 20px;
+}
+
+.tab-pane.active {
+  display: block;
+}
+
+.nav-item-text {
+  list-style: none;
+  margin-right: 10px; /* ช่องว่างระหว่างเมนู */
+}
+.nav-link-text {
+  text-decoration: none;
+  display: inline-block;
+  font-size: large;
+  color: #569bf5;
+  border-bottom: 2px solid #569bf5;
+  line-height: 0.8;
+}
+.ti-pagination .page-link.active {
+  background-color: #569bf5;
+  color: white;
+  border-radius: 50%;
+  padding: 8px 12px;
+}
+.box-body{
+  padding: 0rem;
+}
+.page{
+  min-height: 0vh;
+}
+
+.ti-modal {
+  overflow: hidden;
+}
+.header-title-type {
+  width: 100%;
+  min-height: 50px; /* ใช้ min-height เพื่อให้มีความยืดหยุ่น */
+  // margin-top: 50px;
+  // margin-bottom: 16px;
+  justify-content: space-between; /* จัดเรียงองค์ประกอบภายใน */
+  align-items: center; /* จัดกลางแนวตั้ง */
+  padding-top: 50px;
+  padding-bottom: 1rem;
+}
\ No newline at end of file

src/app/components/competency-assessment/idp-development-plan/set-idp-development-plan/set-idp-development-plan.component.ts

+import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { ToastrService } from 'ngx-toastr';
+
+@Component({
+  selector: 'app-set-idp-development-plan',
+  templateUrl: './set-idp-development-plan.component.html',
+  styleUrls: ['./set-idp-development-plan.component.scss']
+})
+export class SetIdpDevelopmentPlanComponent {
+  @Input() pathTitle = ['การประเมินสมรรถนะ', 'ทะเบียนหลักสูตร', 'หลักสูตรการพัฒนา'];
+  @Output() sendPathTitle: EventEmitter<string[]> = new EventEmitter<string[]>();
+  activeTab: string = 'tab1'; // กำหนด tab เริ่มต้น
+
+  // ฟังก์ชันในการเปลี่ยนแท็บ
+  changeTab(tab: { id: string, text: string }) {
+    this.sendPathTitle.emit(['การประเมินสมรรถนะ', 'ตั้งค่าผู้ใช้งาน', tab.text]);
+    this.activeTab = tab.id;
+  }
+
+  // การจัดการการเปิดปิด modal
+  modalOptions: {
+    [nameModal: string]: {
+      isModalOpen: boolean;
+      modalSize: string;
+      backdropClose: boolean;
+    };
+  } = {
+    "add": {
+      isModalOpen: false,
+      modalSize: 'm',
+      backdropClose: true,
+    },
+    "edit": {
+      isModalOpen: false,
+      modalSize: 'm',
+      backdropClose: true,
+    }
+  };
+
+  openModal(name: string, size: string, closeOnBackdrop?: boolean) {
+    this.modalOptions[name].modalSize = size;
+    this.modalOptions[name].backdropClose = closeOnBackdrop || false;
+    this.modalOptions[name].isModalOpen = true;
+    this.currentModal = name;  // ตั้งค่าค่าของ currentModal เป็น 'add' หรือ 'edit'
+    document.body.style.overflow = 'hidden';
+  }
+
+  closeModal(name: string) {
+    this.modalOptions[name].isModalOpen = false;
+    if (!this.isAnyModalOpen()) {
+      document.body.style.overflow = ''; // คืนค่าการ Scroll เฉพาะเมื่อ Modal ทั้งหมดปิดแล้ว
+    }
+  }
+
+  isAnyModalOpen(): boolean {
+    return Object.values(this.modalOptions).some(modal => modal.isModalOpen); // ตรวจสอบว่า modal อื่นยังเปิดอยู่หรือไม่
+  }
+
+  // ฟังก์ชัน toggle checkbox
+  isChecked: boolean = false; // ใช้สำหรับตรวจสอบสถานะของ checkbox
+  
+  toggleCheckbox() {
+    this.isChecked = !this.isChecked; // สลับสถานะ
+  }
+
+  // ฟังก์ชันสำหรับการเพิ่ม ลบ หรือแก้ไข ข้อมูล
+  addUser() {
+    console.log('เพิ่มผู้ใช้งาน');
+  }
+
+  deleteUser() {
+    console.log('ลบผู้ใช้งาน');
+  }
+
+  editUser() {
+    console.log('แก้ไขผู้ใช้งาน');
+  }
+  
+  currentModal = "";
+  
+  constructor(private toastr: ToastrService) { }
+
+  showSuccess() {
+    this.toastr.success('บันทึกข้อมูลสำเร็จ', 'เเจ้งเตือน', {
+      timeOut: 3000,
+      positionClass: 'toast-top-right',
+    });
+  }
+
+  showSuccessEdit() {
+    this.toastr.success('เเก้ไขข้อมูลสำเร็จ', 'เเจ้งเตือน', {
+      timeOut: 3000,
+      positionClass: 'toast-top-right',
+    });
+  }
+
+  showSuccessDelete() {
+    this.toastr.success('ลบข้อมูลสำเร็จ', 'เเจ้งเตือน', {
+      timeOut: 3000,
+      positionClass: 'toast-top-right',
+    });
+  }
+}

src/app/components/dashboard/dashboard-routing.module.ts

@@ -24,6 +24,8 @@ import { EditGruopCompetenciesComponent } from '../competency-assessment/compete
 import { EvaluationCycleManagerComponent } from '../competency-assessment/evaluation-cycle-manager/evaluation-cycle-manager.component';
 import { EvaluationCycleComponent } from '../competency-assessment/evaluation-cycle-manager/evaluation-cycle/evaluation-cycle.component';
 import { SettingCompetencyComponent } from '../competency-assessment/setting-competency/setting-competency.component';
+import { SetIdpDevelopmentPlanComponent } from '../competency-assessment/idp-development-plan/set-idp-development-plan/set-idp-development-plan.component';
+import { IdpDevelopmentPlanComponent } from '../competency-assessment/idp-development-plan/idp-development-plan.component';
 
 
 const routes: Routes = [
@@ -54,7 +56,8 @@ const routes: Routes = [
       { path: "course-registration",title: 'ทะเบียนหลักสูตร', component: CourseRegistrationComponent },
       { path: "edit-group-competencies",title: 'แก้ไขกลุ่มสมรรถนะ', component: EditGruopCompetenciesComponent },
       { path: "evaluation-cycle-manager",title: 'การจัดการรอบการประเมิน', component: EvaluationCycleManagerComponent  },
-      { path: "setting-competency",title: 'การตั้งค่า', component: SettingCompetencyComponent }
+      { path: "setting-competency",title: 'การตั้งค่า', component: SettingCompetencyComponent },
+      { path: "idp-development-plan",title: 'เเผนพัฒนา IDP', component: IdpDevelopmentPlanComponent },
     ]
   }
 ];

src/app/components/dashboard/dashboard.module.ts

@@ -69,6 +69,8 @@ import { EvaluationCycleManagerComponent } from '../competency-assessment/evalua
 import { EvaluationCycleComponent } from '../competency-assessment/evaluation-cycle-manager/evaluation-cycle/evaluation-cycle.component';
 import { SettingCompetencyComponent } from '../competency-assessment/setting-competency/setting-competency.component';
 import { CompetencyConfigurationComponent } from '../competency-assessment/setting-competency/competency-configuration/competency-configuration.component';
+import { IdpDevelopmentPlanComponent } from '../competency-assessment/idp-development-plan/idp-development-plan.component';
+import { SetIdpDevelopmentPlanComponent } from '../competency-assessment/idp-development-plan/set-idp-development-plan/set-idp-development-plan.component';
 
 
 @NgModule({
@@ -121,7 +123,9 @@ import { CompetencyConfigurationComponent } from '../competency-assessment/setti
     EvaluationCycleManagerComponent,
     EvaluationCycleComponent,
     SettingCompetencyComponent,
-    CompetencyConfigurationComponent
+    CompetencyConfigurationComponent,
+    IdpDevelopmentPlanComponent,
+    SetIdpDevelopmentPlanComponent,
   ],
   imports: [
     CommonModule,

src/app/shared/services/navservice.ts

@@ -118,7 +118,7 @@ export class NavService implements OnDestroy {
         { path: '/dashboard/ecommerce', title: 'ทะเบียนเกรด', type: 'link' },
         { path: '/tool-register', title: 'ทะเบียนเครื่องมือ', type: 'link' },
         { path: '/course-registration', title: 'ทะเบียนหลักสูตร', type: 'link' },
-        { path: '/dashboard/nft', title: 'แผนพัฒนา IDP', type: 'link' },
+        { path: '/idp-development-plan', title: 'แผนพัฒนา IDP', type: 'link' },
         { path: '/competency-management', title: 'การจัดการสมรรถนะ', type: 'link' },
         { path: '/evaluation-cycle-manager', title: 'การจัดการรอบการประเมิน', type: 'link' },
         { path: '/setting-competency', title: 'การตั่งค่า', type: 'link' },