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

src/app/components/competency-assessment/name-registration/competency-topic/competency-topic.component.html

@@ -164,7 +164,7 @@
         <div class="max-h-full overflow-hidden ti-modal-content">
             <div class="ti-modal-header">
                 <h3 class="text-xxl font-bold text-primary">
-                    {{modalStatus=='add'?'เพิ่มหัวข้อสมรรถนะ':'แก้ไขประเภทสมรรถนะ'}}
+                    {{modalStatus=='add'?'เพิ่มหัวข้อสมรรถนะ':'แก้ไขหัวข้อสมรรถนะ'}}
                 </h3>
                 <div class="flex justify-end">
                     <button type="button" class="hs-dropdown-toggle ti-modal-clode-btn text-danger"

src/app/components/competency-assessment/name-registration/competency-topic/competency-topic.component.ts

@@ -28,17 +28,6 @@ export interface DataModel2 {
   styleUrls: ['./competency-topic.component.scss']
 })
 export class CompetencyTopic {
-
-  @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;
-  }
-
   currentPage = 1
   page = Array.from({ length: 1 }, (_, i) => i + 1);
   search = ""
@@ -248,7 +237,7 @@ export class CompetencyTopic {
       const body = new MyCompetencytopicModel({
         competencyTopicId: this.dataSelect.id, tdesc: this.dataSelect.name, edesc: this.dataSelect.edesc, competencyDetail: this.dataSelect.definition,
         competencyType: new MyCompetencytypeModel({ competencyTypeId: this.dataSelect.type.id, tdesc: this.dataSelect.type.name, edesc: this.dataSelect.type.edesc, shortName: this.dataSelect.type.code, expectationLevel: this.dataSelect.type.level }),
-        competencyFiles: competencyFiles || ""
+        competencyFiles: competencyFiles || ((this.examFileName == this.dataSelect.file) ? this.dataSelect.file : '')
       })
       this.dataLoading = true
       this.competencytopicService.post(body).subscribe({

src/app/components/competency-assessment/name-registration/name-registration.component.html

@@ -28,7 +28,7 @@
             </div>
             <div *ngIf="currentPage == 2" id="underline-2" class="hidden" role="tabpanel"
                 aria-labelledby="underline-item-2">
-                <app-competency-topic [pathTitle]="pathTitle" (sendPathTitle)="pathTitle=$event"></app-competency-topic>
+                <app-competency-topic></app-competency-topic>
             </div>
         </div>
     </div>