เพิ่มช่อง Description(CHINA) degree

src/app/DPU/models/degree.model.ts

@@ -2,23 +2,26 @@ import { TranslateService } from "@ngx-translate/core";
 import { BaseModel, baseGetName, checkData } from "./base.model";
 
 export interface DegreeModel {
-    degreeId: string
-    engName: string
-    higher: string
-    thName: string
+    degreeId: string,
+    higher: string,
+    thName: string,
+    engName: string,
+    chinaName: string
 }
 
 export class DegreeModel extends BaseModel implements DegreeModel {
-    degreeId: string
-    engName: string
-    higher: string
-    thName: string
+    degreeId: string;
+    higher: string;
+    thName: string;
+    engName: string;
+    chinaName: string;
     constructor(data?: Partial<DegreeModel>, translateService?: TranslateService) {
         super(data, translateService)
         this.degreeId = checkData(data?.degreeId)
-        this.engName = checkData(data?.engName)
         this.higher = checkData(data?.higher)
         this.thName = checkData(data?.thName)
+        this.engName = checkData(data?.engName)
+        this.chinaName = checkData(data?.chinaName)
     }
     getName() {
         return baseGetName(this.thName, this.engName, this.translateService?.currentLang)

src/app/DPU/myjob/company-department/degree-manage/degree-manage.component.html

@@ -37,7 +37,7 @@
                 <th scope="col" class="text-start">{{ 'Degree ID' | translate}}</th>
                 <th scope="col" class="text-start">{{ 'Description(TH)' | translate}}</th>
                 <th scope="col" class="text-start">{{ 'Description(ENG)' | translate}}</th>
-                <!-- <th scope="col" class="text-start">{{ 'Higher' | translate}}</th> -->
+                <th scope="col" class="text-start">{{ 'Description(CHINA)' | translate}}</th>
                 <th scope="col" class="text-start">{{ 'Action' | translate}}</th>
                 <th scope="col" class="text-start"></th>
               </tr>
@@ -66,11 +66,11 @@
                     <span>{{item.engName}}</span>
                   </div>
                 </td>
-                <!-- <td>
+                <td>
                   <div>
-                    <span>{{item.higher}}</span>
+                    <span>{{item.chinaName}}</span>
                   </div>
-                </td> -->
+                </td>
 
                 <td>
                   <div class="flex flex-row items-center !gap-2 ">
@@ -165,29 +165,36 @@
         <div class="grid grid-cols-12 gap-4">
 
           <div class="xl:col-span-12 col-span-12">
-            <label for="deal-title" class="form-label">{{'Degree ID' | translate}}</label>
+            <label for="degreeId" class="form-label">{{'Degree ID' | translate}}</label>
             <input type="text" class="form-control" [ngClass]="{ '!bg-input-readonly': modalStatus === 'edit' }"
-              id="deal-title" placeholder="" [(ngModel)]="degree.degreeId" [readonly]="modalStatus === 'edit'">
+              id="degreeId" placeholder="" [(ngModel)]="degree.degreeId" [readonly]="modalStatus === 'edit'">
             <div class="text-danger" *ngIf="!degree.degreeId">
               {{'Please fill in information' | translate}}
             </div>
           </div>
 
           <div class="xl:col-span-6 col-span-12">
-            <label for="deal-title" class="form-label">{{'Description(TH)' | translate}}</label>
-            <input type="text" class="form-control" id="deal-title" placeholder=""
+            <label for="thName" class="form-label">{{'Description(TH)' | translate}}</label>
+            <input type="text" class="form-control" id="thName" placeholder=""
               [(ngModel)]="degree.thName">
             <div class="text-danger" *ngIf="!degree.thName">
               {{'Please fill in information' | translate}}
             </div>
           </div>
           <div class="xl:col-span-6 col-span-12">
-            <label for="deal-title" class="form-label">{{'Description(ENG)' | translate}}</label>
-            <input type="text" class="form-control" id="deal-title" placeholder="" [(ngModel)]="degree.engName">
+            <label for="engName" class="form-label">{{'Description(ENG)' | translate}}</label>
+            <input type="text" class="form-control" id="engName" placeholder="" [(ngModel)]="degree.engName">
             <div class="text-danger" *ngIf="!degree.engName">
               {{'Please fill in information' | translate}}
             </div>
           </div>
+          <div class="xl:col-span-6 col-span-12">
+            <label for="chinaName" class="form-label">{{'Description(CHINA)' | translate}}</label>
+            <input type="text" class="form-control" id="chinaName" placeholder="" [(ngModel)]="degree.chinaName">
+            <div class="text-danger" *ngIf="!degree.chinaName">
+              {{'Please fill in information' | translate}}
+            </div>
+          </div>
         </div>
       </div>
       <div class="ti-modal-footer">
@@ -195,8 +202,8 @@
           data-hs-overlay="#modal-detail">
           {{'Cancel' | translate}}
         </button>
-        <button type="button" (click)="save()" [class.ti-btn-disabled]="!degree.degreeId||!degree.thName||!degree.engName"
-              [disabled]="!degree.degreeId||!degree.thName||!degree.engName" class="ti-btn bg-primary text-white !font-medium">{{'Save' |
+        <button type="button" (click)="save()" [class.ti-btn-disabled]="!degree.degreeId||!degree.thName||!degree.engName||!degree.chinaName"
+              [disabled]="!degree.degreeId||!degree.thName||!degree.engName||!degree.chinaName" class="ti-btn bg-primary text-white !font-medium">{{'Save' |
           translate}}</button>
       </div>
     </div>

src/app/DPU/myjob/company-department/degree-manage/degree-manage.component.ts

@@ -80,7 +80,8 @@ export class DegreeManageComponent {
         x.degreeId?.toLowerCase().indexOf(v.toLowerCase()) !== -1 ||
         x.thName?.toLowerCase().indexOf(v.toLowerCase()) !== -1 ||
         x.engName?.toLowerCase().indexOf(v.toLowerCase()) !== -1 ||
-        x.higher?.toLowerCase().indexOf(v.toLowerCase()) !== -1 
+        x.higher?.toLowerCase().indexOf(v.toLowerCase()) !== -1 ||
+        x.chinaName?.toLocaleLowerCase().indexOf(v.toLocaleLowerCase()) !== -1
     );
   }