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

src/app/authentication/login-page/login-page.component.ts

@@ -14,12 +14,12 @@ export class LoginPageComponent {
   disabled = '';
   active: any;
 
-  constructor(@Inject(DOCUMENT) 
+  constructor(@Inject(DOCUMENT)
   private document: Document,
   private elementRef: ElementRef,
-  private renderer: Renderer2, 
-  private formBuilder: FormBuilder, 
-  private router: Router, 
+  private renderer: Renderer2,
+  private formBuilder: FormBuilder,
+  private router: Router,
   private authservice: AuthService,) {
     const bodyElement = this.renderer.selectRootElement('body', true);
      this.renderer.setAttribute(bodyElement, 'class', 'cover1 justify-center');
@@ -39,7 +39,7 @@ export class LoginPageComponent {
 
     const html : any = this.elementRef.nativeElement.ownerDocument.documentElement;
     html.removeAttribute('data-header-styles', 'light');
-    
+
     //html.removeAttribute('data-nav-layout','vertical');
     html.classList.add('h-full', 'light');
      if (localStorage.getItem('synto-header-mode') == 'dark') {
@@ -66,7 +66,7 @@ export class LoginPageComponent {
       this.authservice
         .loginWithEmail(this.email, this.password)
         .then(() => {
-          this.router.navigate(['/dashboard/sales']);
+          this.router.navigate(['/self-evaluation']);
           console.clear();
         })
         .catch((_error: any) => {
@@ -109,7 +109,7 @@ export class LoginPageComponent {
       this.loginForm.controls['username'].value === 'spruko@admin.com' &&
       this.loginForm.controls['password'].value === 'sprukoadmin'
     ) {
-      this.router.navigate(['/dashboard/sales']);
+      this.router.navigate(['/self-evaluation']);
     } else {
       this.error = 'Please check email and passowrd';
     }
@@ -130,8 +130,8 @@ export class LoginPageComponent {
         const html: any = this.elementRef.nativeElement.ownerDocument.documentElement;
         html.classList.remove('h-full', 'dark');
       }
-    
+
    const authe: any = document.querySelector('.h-full');
    authe.removeAttribute('class', 'h-full');
   }
-} 
+}
\ No newline at end of file

src/app/components/competency-assessment/competency-management/group-competencies/edit-group-competencies/edit-group-competencies.component.html

@@ -120,7 +120,7 @@
                     <thead>
                         <tr>
                             <ng-container
-                                *ngFor="let item of ['รหัส Competency','ชื่อ competency','ระดับความหวัง','Action']; let f = first; let l = last; let i = index">
+                                *ngFor="let item of ['รหัสสมรรถนะ','ชื่อสมรรถนะ','ระดับความหวัง','Action']; let f = first; let l = last; let i = index">
                                 <th scope="col" class="relative px-10px py-10px bg-soft-secondary text-primary"
                                     [class.!text-center]="f || l || item === 'ระดับความหวัง'">
                                     <span class="text-sm">{{ item }}</span>
@@ -429,4 +429,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file

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

@@ -56,7 +56,7 @@
         <div class="border-t border-gray-200 pt-10px  grid grid-cols-1 space-y-6">
             <div class="grid grid-cols-11">
                 <div class="space-y-2 col-span-2">
-                    <label class="ti-form-label">รหัส Competency</label>
+                    <label class="ti-form-label">รหัสสมรรถนะ</label>
                     <input type="text" class="ti-form-input bg-input-readonly" readonly>
                 </div>
                 <div class="col-span-1"></div>
@@ -520,4 +520,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file

src/app/components/competency-assessment/evaluation-cycle-manager/define-document-form/edit-define-document-form/edit-define-document-form.component.html

@@ -269,7 +269,7 @@
                                 <thead>
                                     <tr>
                                         <ng-container
-                                            *ngFor="let item of ['รหัส Competency','ชื่อ competency','ระดับความหวัง','Action']; let f = first; let l = last; let i = index">
+                                            *ngFor="let item of ['รหัสสมรรถนะ','ชื่อสมรรถนะ','ระดับความหวัง','Action']; let f = first; let l = last; let i = index">
                                             <th scope="col"
                                                 class="relative px-10px py-10px bg-soft-secondary text-primary"
                                                 [class.!text-center]="f || l || item === 'ระดับความหวัง'">
@@ -593,4 +593,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file

src/app/components/competency-assessment/setting-competency/competency-configuration/competency-configuration.component.html

@@ -15,7 +15,7 @@
              </div>
          </div>
  </div>
- 
+
  <div class="body-content">
     <div class="page">
         <div class="grid grid-cols-3 gap-6">
@@ -28,6 +28,16 @@
                 <input type="text" id="input-label" class="ti-form-input w-2/3 pr-10" value="2567">
             </div>
         </div>
+        <div class="grid grid-cols-3 gap-6 mt-10">
+          <div class="col-span-1">
+              <label for="hs-trailing-button-add-on-with-icon" class="ti-form-label">ระดับความคาดหวัง *</label>
+          </div>
+      </div>
+      <div class="grid grid-cols-3 gap-6">
+          <div class="col-span-1">
+              <input type="text" id="input-label" class="ti-form-input w-2/3 pr-10" value="8">
+          </div>
+      </div>
         <label for="hs-trailing-button-add-on-with-icon" class="ti-form-label mt-10">จัดการสมรรถนะกับกลุ่ม *</label>
         <div class="box-body">
             <div class="grid grid-cols-6 flex gap-x-6">
@@ -69,4 +79,4 @@
             </table>
         </div>
     </div>
- </div>
+ </div>
\ No newline at end of file

src/app/shared/services/navservice.ts

@@ -87,6 +87,17 @@ export class NavService implements OnDestroy {
 
   MENUITEMS: Menu[] = [
     {
+      title: 'การประเมินผล',
+      type: 'sub',
+      selected: false,
+      active: false,
+      path: '/supervisor-evaluation',
+      children: [
+        { path: '/self-evaluation', title: 'ประเมินตนเอง', type: 'link' },
+        { path: '/supervisor-evaluation', title: 'ประเมินโดยหัวหน้า', type: 'link' },
+      ],
+    },
+    {
       title: 'การจัดการข้อมูลองค์กร',
       type: 'sub',
       selected: false,
@@ -148,17 +159,7 @@ export class NavService implements OnDestroy {
       ],
     },
 
-    {
-      title: 'การประเมินผล',
-      type: 'sub',
-      selected: false,
-      active: false,
-      path: '/supervisor-evaluation',
-      children: [
-        { path: '/self-evaluation', title: 'ประเมินตนเอง', type: 'link' },
-        { path: '/supervisor-evaluation', title: 'ประเมินโดยหัวหน้า', type: 'link' },
-      ],
-    },
+
   ];
   // Array
   items = new BehaviorSubject<Menu[]>(this.MENUITEMS);