แก้หน้าประเมิน

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

@@ -43,6 +43,8 @@ import { DayTypeRegistryComponent } from '../company-components/day-type-registr
 import { TimeAttendanceComponent } from '../performance-management-evaluation/time-attendance/time-attendance.component';
 import { RolePermissionConfigComponent } from '../company-components/account-settings/role-permission-config/role-permission-config.component';
 import { PmsFormEmployeeComponent } from '../performance-evaluation/pms-form-employee/pms-form-employee.component';
+import { EmployeeSelfServiceComponent } from '../employee-self-service/employee-self-service.component';
+import { MySkillXModuleComponent } from '../my-skill-x-module/my-skill-x-module.component';
 
 
 
@@ -94,7 +96,9 @@ const routes: Routes = [
       { path: "self-evaluation", title: 'ประเมินตนเอง', component: SelfEvaluationComponent },
       { path: "day-type-registry", title: 'ประเมินตนเอง', component: DayTypeRegistryComponent },
       { path: "time-attendance", title: 'ทะเบียนการประเมินเวลาทำงาน', component: TimeAttendanceComponent },
-      { path: "role-permission-config", title: 'กำหนดสิทธิการเข้าใช้งาน', component: RolePermissionConfigComponent }
+      { path: "role-permission-config", title: 'กำหนดสิทธิการเข้าใช้งาน', component: RolePermissionConfigComponent },
+      { path: "employee-self-service", title: 'employee-self-service', component: EmployeeSelfServiceComponent },
+      { path: "my-skill-x-module", title: 'my-skill-x-module', component: MySkillXModuleComponent }
     ]
   }
 ];

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

@@ -176,6 +176,8 @@ import { PmsKpiComponent } from '../performance-evaluation/pms-form-employee/pms
 import { PmsIdpComponent } from '../performance-evaluation/pms-form-employee/pms-idp/pms-idp.component';
 import { PmsSummaryComponent } from '../performance-evaluation/pms-form-employee/pms-summary/pms-summary.component';
 import { BarRatingModule } from 'ngx-bar-rating';
+import { EmployeeSelfServiceComponent } from '../employee-self-service/employee-self-service.component';
+import { MySkillXModuleComponent } from '../my-skill-x-module/my-skill-x-module.component';
 
 export const MY_DATE_FORMATS = {
   parse: {
@@ -309,7 +311,9 @@ export class CustomDateAdapter extends NativeDateAdapter {
     PmsCompetencyComponent,
     PmsKpiComponent,
     PmsIdpComponent,
-    PmsSummaryComponent
+    PmsSummaryComponent,
+    EmployeeSelfServiceComponent,
+    MySkillXModuleComponent
   ],
   imports: [
     CommonModule,

src/app/components/employee-self-service/employee-self-service.component.ts

+import { Component, EventEmitter, Input, Output } from '@angular/core';
+
+@Component({
+  selector: 'app-employee-self-service',
+  templateUrl: './employee-self-service.component.html',
+  styleUrls: ['./employee-self-service.component.scss']
+})
+export class EmployeeSelfServiceComponent {}

src/app/components/my-skill-x-module/my-skill-x-module.component.ts

+import { Component, EventEmitter, Input, Output } from '@angular/core';
+
+@Component({
+  selector: 'app-my-skill-x-module',
+  templateUrl: './my-skill-x-module.component.html',
+  styleUrls: ['./my-skill-x-module.component.scss']
+})
+export class MySkillXModuleComponent {}

src/app/components/performance-evaluation/pms-form-employee/pms-competency/pms-competency.component.html

@@ -3,7 +3,7 @@
   <div class="flex flex-col">
     <div class="flex flex-row py-2 gap-2 sticky" style="top:0;z-index:2;background: white;">
       <ng-container *ngFor="let appraisalCompentency of appraisalCompentencyList ;let i=index">
-        <button type="button" class="flex justify-center !items-center border bg-white p-2 text-center"
+        <button type="button" class="flex justify-center !items-center border bg-white p-2 text-center font-semibold"
           style="border-radius:20px;width: 100px"
           (click)="getAppraisalCompentencyForm(i);currentPart=appraisalCompentency.comType"
           [ngClass]="{'!bg-primary text-white':currentPart==appraisalCompentency.comType}">
@@ -28,7 +28,8 @@
     </div>
     <div class="flex flex-col gap-2 relative" style="overflow-y: auto;min-height: calc(100vh - 480px);">
       <ng-container *ngFor="let item2 of appraisalCompentencyFilter();let i = index;let f= first">
-        <button type="button" [attr.id]="'menu-' + i" class="p-4 w-full bg-secondary text-white text-left"
+        <button type="button" [attr.id]="'menu-' + i"
+          class="p-4 w-full text-white text-left bg-gradient-to-r from-primary to-secondary font-semibold"
           style="border-radius:20px"
           (click)="scrollToMenu(i);
           allBiOpen(!biOpen.get(item2.groupAssessment1.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.competencyTopic.competencyTopicId),item2.groupAssessment1.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.competencyTopic.competencyTopicId)">
@@ -103,26 +104,29 @@
                 *ngFor="let bi of item2.groupAssessment1.competencyIndicatorsCourses1Mini.behavioralIndicatorsList;let i2 = index;let f = first">
                 <tr class="border-b border-gray-200">
                   <td class="py-2" style="vertical-align: top">{{bi.behavioralIndicators}}</td>
-                  <td class="py-2 text-center" style="vertical-align: top">{{bi.assessmentId}}</td>
+                  <td class="py-2 text-center text-indigo-600 font-semibold" style="vertical-align: top">
+                    {{bi.assessmentId}}</td>
                   <td class="py-2 text-center" style="vertical-align: top">
                     <div class="flex flex-row justify-center gap-2 mb-2">
                       <ng-container *ngFor="let item of [5,4,3,2,1];let f = first">
-                        <button type="button"
-                          class="h-12 w-12 p-0 shadow border !border-soft-secondary text-soft-secondary bg-white"
+                        <button type="button" class="h-12 w-12 p-0 shadow border text-soft-secondary-no-hover bg-white"
                           style="border-radius:10px"
                           (mouseenter)="biScore.set(bi.behavioralIndicators+bi.assessmentId,item)"
                           (mouseleave)="biScore.clear()"
-                          (click)="bi.competencyBehavioral.scoreTopicExpectation=item;calnumberCheck()" [ngClass]="{'!border-secondary !text-secondary':bi.competencyBehavioral.scoreTopicExpectation>=item||(biScore.get(bi.behavioralIndicators+bi.assessmentId) ?? 0)>=item,
+                          (click)="bi.competencyBehavioral.scoreTopicExpectation=item;calnumberCheck()" [ngClass]="{
+                            '!border-secondary':  bi.competencyBehavioral.scoreTopicExpectation>=item||(biScore.get(bi.behavioralIndicators+bi.assessmentId) ?? 0)>=item ,
+                            '!text-indigo-600':bi.competencyBehavioral.scoreTopicExpectation>item||(biScore.get(bi.behavioralIndicators+bi.assessmentId) ?? 0)>item,
+                            '!text-white !bg-secondary': bi.competencyBehavioral.scoreTopicExpectation==item||(biScore.get(bi.behavioralIndicators+bi.assessmentId) ?? 0)==item ,
                             'pointer-events-none':!canEdit}">
                           {{item}}
                         </button>
                       </ng-container>
                     </div>
                     <div class="flex justify-center" style="height: 20px;white-space: nowrap; overflow: visible">
-                      <span *ngIf="biScore.get(bi.behavioralIndicators+bi.assessmentId)" class="text-secondary">
+                      <span *ngIf="biScore.get(bi.behavioralIndicators+bi.assessmentId)" class="text-indigo-600">
                         {{scoreDescriptions[(biScore.get(bi.behavioralIndicators+bi.assessmentId) ?? 0)] }}
                       </span>
-                      <span *ngIf="!biScore.get(bi.behavioralIndicators+bi.assessmentId)" class="text-secondary">
+                      <span *ngIf="!biScore.get(bi.behavioralIndicators+bi.assessmentId)" class="text-indigo-600">
                         {{scoreDescriptions[bi.competencyBehavioral.scoreTopicExpectation] }}
                       </span>
                     </div>
@@ -134,7 +138,8 @@
         </ng-container>
       </ng-container>
       <button *ngIf="appraisalCompentencyFilter().length" [attr.id]="'menu-' + appraisalCompentencyFilter().length"
-        type="button" class="p-4 w-full bg-secondary text-white text-left" style="border-radius:20px"
+        type="button" class="p-4 w-full text-white text-left bg-gradient-to-r from-primary to-secondary font-semibold"
+        style="  border-radius:20px"
         (click)="scrollToMenu(appraisalCompentencyFilter().length);allBiOpen(!biOpen.get('สรุป'),'สรุป')">
         <span style="padding-left:50px">
           สรุป
@@ -147,7 +152,8 @@
       <ng-container *ngIf="biOpen.get('สรุป')">
         <div class="pb-1rem px-2rem">
           <div class="py-2 grid grid-cols-11">
-            <div class="col-span-8">ระดับความสามารถ (Target Degree)</div>
+            <div class="col-span-8" style="font-size: 1rem;font-weight: 500; border-radius:20px">ระดับความสามารถ (Target
+              Degree)</div>
             <div class="col-span-3 grid grid-cols-5">
               <div class="col-span-1 text-center" *ngFor="let item of [5,4,3,2,1]">{{item}}</div>
             </div>
@@ -189,17 +195,19 @@
             </div>
           </div>
           <div class="py-2 grid grid-cols-11">
-            <div class="col-span-8">คะแนนรวมหลังถ่วงน้ำหนัก</div>
+            <div class="col-span-8 font-semibold" style=" border-radius:20px">คะแนนรวมหลังถ่วงน้ำหนัก
+            </div>
             <div class="col-span-3 grid grid-cols-5">
-              <div class="col-span-5 text-center">
+              <div class="col-span-5 text-center text-indigo-600 font-semibold">
                 {{showNumber(appraisalCompentencyList[appraisalCompentencyIndex].masfromEvaluationAssessment1lList[0].weightedTotal)}}
               </div>
             </div>
           </div>
           <div class="py-2 grid grid-cols-11">
-            <div class="col-span-8">คะแนนเฉลี่ยคิดเป็น</div>
+            <div class="col-span-8 font-semibold" style=" border-radius:20px">คะแนนเฉลี่ยคิดเป็น
+            </div>
             <div class="col-span-3 grid grid-cols-5">
-              <div class="col-span-5 text-center">
+              <div class="col-span-5 text-center text-indigo-600 font-semibold">
                 {{showNumber(appraisalCompentencyList[appraisalCompentencyIndex].masfromEvaluationAssessment1lList[0].averageScore)}}
               </div>
             </div>
@@ -239,10 +247,10 @@
                       <span>{{item2}} </span><br>
                     </div>
                   </td>
-                  <td class="align-start text-center">
+                  <td class="align-start text-center text-indigo-600 font-semibold">
                     {{calAverage(appraisalCompentencyList[appraisalCompentencyIndex].masfromEvaluationAssessment1lList[0].averageScore)}}
                   </td>
-                  <td class="align-start text-center">
+                  <td class="align-start text-center text-indigo-600 font-semibold">
                     {{calGap(appraisalCompentencyList[appraisalCompentencyIndex].masfromEvaluationAssessment1lList[0].averageScore)}}
                   </td>
                 </tr>

src/app/components/performance-evaluation/pms-form-employee/pms-information/pms-information.component.html

 <div class="flex flex-col gap-2 pt-2" style="overflow-y: auto;min-height: calc(100vh - 422px)">
     <div class="flex">
-        <button type="button" class="p-4 w-full bg-secondary text-white text-left" style="border-radius:20px"
-            (click)="menuClose.set('Compentency',!menuClose.get('Compentency'))">
+        <button type="button"
+            class="p-4 w-full bg-gradient-to-r from-primary to-secondary text-white text-left font-semibold"
+            style="border-radius:20px" (click)="menuClose.set('Compentency',!menuClose.get('Compentency'))">
             รายละเอียดประเมินสมรรถนะ (Compentency)
         </button>
     </div>
@@ -50,8 +51,9 @@
         </table>
     </ng-container>
     <div class="flex" *ngIf="appraisalPms">
-        <button type="button" class="p-4 w-full bg-secondary text-white text-left" style="border-radius:20px"
-            (click)="menuClose.set('PMS',!menuClose.get('PMS'))">
+        <button type="button"
+            class="p-4 w-full bg-gradient-to-r from-primary to-secondary text-white text-left  font-semibold"
+            style="border-radius:20px" (click)="menuClose.set('PMS',!menuClose.get('PMS'))">
             รายละเอียดประเมินผลการปฏิบัติงาน (PMS)
         </button>
     </div>

src/app/components/performance-evaluation/pms-form-employee/pms-kpi/pms-kpi.component.ts

@@ -81,6 +81,7 @@ export class PmsKpiComponent {
   partShow: string[] = []
   partOpen: Map<string, boolean> = new Map<string, boolean>()
   partScore: Map<string, number> = new Map<string, number>()
+  @Input() compentencyFormRemain = 0
   @Input() evaluateeId = ""
   @Input() evaluaterId = ""
   @Input() appraisalPms?: Pms
@@ -95,8 +96,7 @@ export class PmsKpiComponent {
   groupGrade: { loading: boolean, dataList: CompetencyGradeModel[] } = { loading: false, dataList: [] }
   @ViewChild('scrollContainer') scrollContainer!: ElementRef;
   @Output() scrollToMenuId: EventEmitter<any> = new EventEmitter<any>();
-  
-  remain = 0
+
   constructor(private appraisalService: AppraisalService,
     private pmsGroupGradeService: PmsGroupGradeService,
     private employeeService: EmployeeService,
@@ -517,9 +517,9 @@ export class PmsKpiComponent {
     return 0
   }
   allFormRemain() {
-    this.remain = [this.part1Remain(), this.part2Remain(), this.part3Remain(), this.part5Remain(), this.part6Remain(), this.part7Remain()].filter(data => data != 0).length
+    const remain = [this.part1Remain(), this.part2Remain(), this.part3Remain(), this.compentencyFormRemain, this.part5Remain(), this.part6Remain(), this.part7Remain()].filter(data => data != 0).length
     this.kpiForm.emit(this.appraisalPms)
-    this.kpiFormRemain.emit(this.remain)
+    this.kpiFormRemain.emit(remain)
   }
 
   remainList() {
@@ -527,7 +527,7 @@ export class PmsKpiComponent {
       this.part1Remain(),
       this.part2Remain(),
       this.part3Remain(),
-      this.remain,
+      this.compentencyFormRemain,
       this.part5Remain(),
       this.part6Remain(),
       this.part7Remain()

src/app/components/performance-evaluation/supervisor-evaluation/supervisor-evaluation.component.html

@@ -35,12 +35,6 @@
                                 </div>
                             </div>
                         </div>
-                        <!-- <div class="px-1">
-                            <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-10 m-0 shadow-md">
-                                <i class="ti ti-book fs-l"></i>
-                                Help
-                            </button>
-                        </div> -->
                     </div>
                 </div>
                 <div class="w-full min-height-50px justify-between items-center py-2">
@@ -55,8 +49,9 @@
                                 <table class="ti-custom-table ti-custom-table-head ti-custom-table-hover">
                                     <thead>
                                         <tr>
+                                            <!-- ['รหัสพนักงาน','ชื่อพนักงาน','ตำเเหน่งงาน','ประเมิน','เเผนพัฒนา','PMS','ผลประเมิน','เกรด' ,'สถานะผู้ประเมิน'] -->
                                             <ng-container
-                                                *ngFor="let item of subordinate.select?.showPms?['รหัสพนักงาน','ชื่อพนักงาน','ตำเเหน่งงาน','ประเมิน','เเผนพัฒนา','PMS','ผลประเมิน','เกรด' ,'สถานะผู้ประเมิน']:
+                                                *ngFor="let item of subordinate.select?.showPms?['รหัสพนักงาน','ชื่อพนักงาน','ตำเเหน่งงาน','ประเมิน','ผลประเมิน','เกรด' ,'สถานะผู้ประเมิน']:
                                                 ['รหัสพนักงาน','ชื่อพนักงาน','ตำเเหน่งงาน','ประเมิน','เเผนพัฒนา','สถานะผู้ประเมิน']; let f = first; let l = last; let i = index">
                                                 <th scope="col"
                                                     class="relative px-10px py-10px bg-soft-secondary text-primary"
@@ -105,16 +100,22 @@
                                             <td style="font-size: 12px;">{{item.apsassessy.position.tdesc}}</td>
                                             <td class="text-center">
                                                 <div class="flex justify-center">
-                                                    <button type="button" class="ti-btn rounded-sm "
+                                                    <!-- <button type="button" class="ti-btn rounded-sm "
                                                         *ngFor="let type of item.typeList"
                                                         [class]="statusButtonClass(type.statusType)"
                                                         style="height: 15px; width: 45px; font-size: 12px; display: flex; align-items: center; justify-content: center;margin-left:4px;"
                                                         (click)="selectSubordinate(item,type.competencyTypeId,subordinate.select?.evaluationRoundId);pageEvalution=type.shortName">
                                                         {{type.shortName}}
+                                                    </button> -->
+                                                    <button type="button" class="ti-btn rounded-sm "
+                                                        [class]="statusButtonClass(item.statusIdp.statusType)"
+                                                        style="height: 30px; width: auto; font-size: 12px; display: flex; align-items: center; justify-content: center;margin-left:4px;"
+                                                        (click)="selectSubordinate(item,'',subordinate.select?.evaluationRoundId,item.statusIdp.statusType);pageEvalution='open'">
+                                                        {{statusCompetencyText(item.statusIdp.statusType)}}
                                                     </button>
                                                 </div>
                                             </td>
-                                            <td class="text-center">
+                                            <!-- <td class="text-center">
                                                 <div class="flex justify-center">
                                                     <button type="button" class="ti-btn rounded-sm"
                                                         [class]="statusButtonClass(item.statusIdp.statusType)"
@@ -133,7 +134,7 @@
                                                         PMS
                                                     </button>
                                                 </div>
-                                            </td>
+                                            </td> -->
                                             <td class="text-center" style="font-size: 12px;"
                                                 *ngIf="subordinate.select?.showPms">
                                                 {{item.sumScore}}</td>

src/app/components/performance-evaluation/supervisor-evaluation/supervisor-evaluation.component.ts

@@ -38,6 +38,21 @@ export class SupervisorEvaluationComponent {
       return ""
     }
   }
+  statusCompetencyText = (status: string) => {
+    if (status === "no access") {
+      return "ยังไม่ถึงขั้นตอนดำเนินการ"
+    } else if (status === "pending") {
+      return "รอดำเนินการ"
+    } else if (status === "evaluating") {
+      return "อยู่ระหว่างดำเนินการ"
+    } else if (status === "completed") {
+      return "ดำเนินการเสร็จสิ้น"
+    } else if (status === "rejected") {
+      return "ส่งกลับ"
+    } else {
+      return ""
+    }
+  }
   constructor(private appraisalService: AppraisalService,
     private cdr: ChangeDetectorRef) {
   }

src/app/shared/components/header/header.component.html

@@ -738,7 +738,22 @@
                     <i class="ti ti-clipboard-check text-lg"></i>
                     Task Manager
                   </a> -->
-                  <a (click)="onSettingsClick()" class="ti-dropdown-item cursor-pointer">
+                  <a *ngIf="!router.url.includes('/self-evaluation')" (click)="onNextPartClick('/self-evaluation')"
+                    class="ti-dropdown-item cursor-pointer">
+                    <i class="ti ti-settings text-lg"></i>
+                    ประเมินตนเอง
+                  </a>
+                  <a *ngIf="!router.url.includes('/supervisor-evaluation')"
+                    (click)="onNextPartClick('/supervisor-evaluation')" class="ti-dropdown-item cursor-pointer">
+                    <i class="ti ti-settings text-lg"></i>
+                    ประเมินโดยหัวหน้า
+                  </a>
+                  <a *ngIf="!router.url.includes('/employee-self-service')"
+                    (click)="onNextPartClick('/employee-self-service')" class="ti-dropdown-item cursor-pointer">
+                    <i class="ti ti-settings text-lg"></i>
+                    employeeSelfServiceClick
+                  </a>
+                  <a (click)="onNextPartClick('/company-registration')" class="ti-dropdown-item cursor-pointer">
                     <i class="ti ti-settings text-lg"></i>
                     Settings
                   </a>

src/app/shared/components/header/header.component.ts

@@ -5,6 +5,7 @@ import { AuthService } from '../../services/auth.service';
 import { TokenService } from '../../services/token.service';
 import { EmployeeService } from '../../services/employee.service';
 import { EmployeeModel, MyEmployeeModel } from '../../model/employee.model';
+import { ActivatedRoute, Router } from '@angular/router';
 
 @Component({
   selector: 'app-header',
@@ -13,26 +14,28 @@ import { EmployeeModel, MyEmployeeModel } from '../../model/employee.model';
 })
 
 export class HeaderComponent {
-  employeeProfile :EmployeeModel  = new MyEmployeeModel();
+  employeeProfile: EmployeeModel = new MyEmployeeModel();
   constructor(public navServices: NavService,
     private authService: AuthService,
-    public tokenService:TokenService,
+    public tokenService: TokenService,
     private employeeService: EmployeeService,
     private elementRef: ElementRef,
+    public router: Router,
+    private route: ActivatedRoute,
     private navService: NavService) {
     this.getEvaluatee();
-      
-  }
- getEvaluatee() {
-  this.employeeProfile = new MyEmployeeModel(JSON.parse(sessionStorage.getItem('employeeProfile') || '{}'));
-  if(this.employeeProfile?.employeeId == undefined || this.employeeProfile?.employeeId == null || this.employeeProfile?.employeeId == ''){
-    this.employeeService.getWorking().subscribe({
-      next: response => {
-        sessionStorage.setItem('employeeProfile', JSON.stringify(response));
-        this.employeeProfile = new MyEmployeeModel(response)
-      }
-    })
+
   }
+  getEvaluatee() {
+    this.employeeProfile = new MyEmployeeModel(JSON.parse(sessionStorage.getItem('employeeProfile') || '{}'));
+    if (this.employeeProfile?.employeeId == undefined || this.employeeProfile?.employeeId == null || this.employeeProfile?.employeeId == '') {
+      this.employeeService.getWorking().subscribe({
+        next: response => {
+          sessionStorage.setItem('employeeProfile', JSON.stringify(response));
+          this.employeeProfile = new MyEmployeeModel(response)
+        }
+      })
+    }
 
   }
 
@@ -142,4 +145,8 @@ export class HeaderComponent {
   onSettingsClick() {
     this.navService.toggleEvaluationMenu();
   }
+
+  onNextPartClick(part: string) {
+    this.router.navigate([part]);
+  }
 }

src/app/shared/services/navservice.ts

@@ -89,19 +89,19 @@ export class NavService implements OnDestroy {
   }
 
   private MENUITEMS: Menu[] = [
-    {
-      title: 'ประเมินผล',
-      type: 'sub',
-      selected: false,
-      active: false,
-      path: '',
-      id: 'm1',
-      show: true,
-      children: [
-        { id: 'm11', path: '/self-evaluation', title: 'ประเมินตนเอง', type: 'link', show: true },
-        { id: 'm12', path: '/supervisor-evaluation', title: 'ประเมินโดยหัวหน้า', type: 'link', show: true },
-      ],
-    },
+    // {
+    //   title: 'ประเมินผล',
+    //   type: 'sub',
+    //   selected: false,
+    //   active: false,
+    //   path: '',
+    //   id: 'm1',
+    //   show: true,
+    //   children: [
+    //     { id: 'm11', path: '/self-evaluation', title: 'ประเมินตนเอง', type: 'link', show: true },
+    //     { id: 'm12', path: '/supervisor-evaluation', title: 'ประเมินโดยหัวหน้า', type: 'link', show: true },
+    //   ],
+    // },
     {
       title: 'จัดการข้อมูลองค์กร',
       type: 'sub',
@@ -182,28 +182,28 @@ export class NavService implements OnDestroy {
   ];
   // Array
   items = new BehaviorSubject<Menu[]>(this.MENUITEMS);
-  
+
   private menuItemsSubject = new BehaviorSubject<Menu[]>(this.MENUITEMS);
   menuItems$ = this.menuItemsSubject.asObservable();
 
 
   toggleEvaluationMenu() {
-    // const menuItem = this.MENUITEMS.find(item => item.id === 'm1');
-    // if (menuItem) {
-    //   menuItem.show = !menuItem.show;  // Toggle ซ่อน/แสดง
-    //   menuItem.children?.forEach(child => child.show = menuItem.show);
-    //   this.menuItemsSubject.next([...this.MENUITEMS]);
-
-    //   const currentUrl = this.router.url;
-    //   const evaluationPaths = menuItem.children?.map(child => child.path) || [];
-
-    //   if (!menuItem.show && evaluationPaths.includes(currentUrl)) {
-    //     this.router.navigate(['/company-registration']);
-    //   }
-
-    //   if (menuItem.show) {
-    //     this.router.navigate(['/self-evaluation']);
-    //   }
-    // }
+    const menuItem = this.MENUITEMS.find(item => item.id === 'm1');
+    if (menuItem) {
+      menuItem.show = !menuItem.show;  // Toggle ซ่อน/แสดง
+      menuItem.children?.forEach(child => child.show = menuItem.show);
+      this.menuItemsSubject.next([...this.MENUITEMS]);
+
+      const currentUrl = this.router.url;
+      const evaluationPaths = menuItem.children?.map(child => child.path) || [];
+
+      if (!menuItem.show && evaluationPaths.includes(currentUrl)) {
+        this.router.navigate(['/company-registration']);
+      }
+
+      if (menuItem.show) {
+        this.router.navigate(['/self-evaluation']);
+      }
+    }
   }
 }

src/assets/css/style.css

@@ -5860,6 +5860,11 @@ select option:focus {
   --tw-gradient-to: rgb(var(--color-primary) / 0) var(--tw-gradient-to-position);
   --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to);
 }
+.from-secondary {
+  --tw-gradient-from: rgb(var(--color-secondary)) var(--tw-gradient-from-position);
+  --tw-gradient-to: rgb(var(--color-secondary) / 0) var(--tw-gradient-to-position);
+  --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to);
+}
 .from-white {
   --tw-gradient-from: #fff var(--tw-gradient-from-position);
   --tw-gradient-to: rgb(255 255 255 / 0) var(--tw-gradient-to-position);
@@ -8151,6 +8156,9 @@ span.flatpickr-weekday {
 .numInput:focus {
   --tw-ring-color: rgb(var(--color-primary));
 }
+.ring-primary {
+  --tw-ring-color: rgb(var(--color-primary));
+}
 .flatpickr-current-month .flatpickr-monthDropdown-months .flatpickr-monthDropdown-month {
   --tw-bg-opacity: 1 !important;
   background-color: rgb(255 255 255 / var(--tw-bg-opacity)) !important;
@@ -25110,6 +25118,9 @@ div:where(.swal2-container) div:where(.swal2-validation-message) {
   color: rgb(var(--color-primary));
 }
 
+.text-soft-secondary-no-hover {
+  color: rgb(var(--color-secondary) / 0.25);
+}
 .text-soft-secondary {
   color: rgb(var(--color-secondary) / 0.25);
 }
@@ -25137,4 +25148,8 @@ div:where(.swal2-container) div:where(.swal2-validation-message) {
 
 .\!border-sort-secondary {
   border-color: rgb(var(--color-secondary) / 0.1) !important;
+}
+
+.\!ml-0{
+  margin-left: 0 !important;
 }
\ No newline at end of file