ใส่ translate

src/app/DPU/common/article-manage/article-manage.component.html

@@ -143,7 +143,7 @@
             <nav aria-label="Page navigation">
               <ul class="ti-pagination mb-0">
                 <li *ngIf="pageIndex>0" class="page-item {{pageIndex==0 ? 'disabled' : ''}}"><a
-                    class="page-link px-3 py-[0.375rem]"
+                    class="page-link px-3 py-[0.375rem] cursor-pointer"
                     (click)="pageIndex = pageIndex-1;updatePagedItems()">{{'Previous' | translate}}</a></li>
                 <li class="page-item"><a class="page-link px-3 py-[0.375rem]" href="javascript:void(0);"
                     *ngIf="pageIndex-1>0" (click)="pageIndex = pageIndex-2;updatePagedItems()">{{pageIndex-1}}</a></li>
@@ -161,7 +161,7 @@
                     *ngIf="(pageIndex+2)*10 < (searchTerm == '' ? itemsList.length : filterList.length)"
                     (click)="pageIndex = pageIndex+2;updatePagedItems()">{{pageIndex +3}}</a></li>
                 <li *ngIf="(pageIndex+1)*10 < (searchTerm == '' ? itemsList.length : filterList.length)"
-                  class="page-item"><a class="page-link px-3 py-[0.375rem]"
+                  class="page-item"><a class="page-link px-3 py-[0.375rem] cursor-pointer"
                     (click)="pageIndex = pageIndex+1;updatePagedItems()">{{'Next' |
                     translate}}</a>
                 </li>

src/app/DPU/common/company-manage/company-manage.component.html

@@ -133,7 +133,7 @@
             <nav aria-label="Page navigation">
               <ul class="ti-pagination mb-0">
                 <li *ngIf="pageIndex>0" class="page-item {{pageIndex==0 ? 'disabled' : ''}}"><a
-                    class="page-link px-3 py-[0.375rem]"
+                    class="page-link px-3 py-[0.375rem] cursor-pointer"
                     (click)="pageIndex = pageIndex-1;updatePagedItems()">{{'Previous' | translate}}</a></li>
                 <li class="page-item"><a class="page-link px-3 py-[0.375rem]" href="javascript:void(0);"
                     *ngIf="pageIndex-1>0" (click)="pageIndex = pageIndex-2;updatePagedItems()">{{pageIndex-1}}</a></li>
@@ -151,7 +151,7 @@
                     *ngIf="(pageIndex+2)*10 < (searchTerm == '' ? itemsList.length : filterList.length)"
                     (click)="pageIndex = pageIndex+2;updatePagedItems()">{{pageIndex +3}}</a></li>
                 <li *ngIf="(pageIndex+1)*10 < (searchTerm == '' ? itemsList.length : filterList.length)"
-                  class="page-item"><a class="page-link px-3 py-[0.375rem]"
+                  class="page-item"><a class="page-link px-3 py-[0.375rem] cursor-pointer"
                     (click)="pageIndex = pageIndex+1;updatePagedItems()">{{'Next' |
                     translate}}</a>
                 </li>

src/app/DPU/common/pdpa-manage/pdpa-manage.component.ts

@@ -18,6 +18,7 @@ import { PdpaConfigComponent } from "./pdpa-config/pdpa-config.component";
 import { QuillModule } from "ngx-quill";
 import { MatDialog } from "@angular/material/dialog";
 import { MyPdpaConfigModel, PdpaConfigModel } from '../../models/pdpaConfig.model';
+import { MyPdpaModel, PdpaModel } from "../../models/pdpa.model";
 
 @Component({
   selector: 'app-pdpa-manage',
@@ -56,8 +57,10 @@ export class PdpaManageComponent {
   };
   @ViewChild('closeModal') public childModal?: ElementRef;
   @ViewChild('modalDetail') modalDetail!: TemplateRef<any>;
+  @ViewChild('ConsentList') ConsentList!: TemplateRef<any>;
 
   modalRef: any;
+  modalRefConsent: any;
 
   pdpaconfig!: MyPdpaConfigModel;
   edit = false
@@ -75,6 +78,11 @@ export class PdpaManageComponent {
   modalStatus: "add" | "edit" = "add"
   isSaving = false;
 
+  consentList: PdpaModel[] = [];
+  itemsListConsent: MyPdpaModel[] = []
+  filterListConsent: MyPdpaModel[] = []
+  consent: MyPdpaModel = new MyPdpaModel()
+
   get searchTerm(): string {
     return this._searchTerm;
   }
@@ -99,18 +107,28 @@ export class PdpaManageComponent {
       this.itemsList = res.map(item => new MyPdpaConfigModel(item, this.translate));
       this.filterList = [...this.itemsList];
     });
+    this.pdpaService.getPdpaList().subscribe(res => {
+      this.consentList = res.map(item => new MyPdpaModel(item, this.translate));
+      this.filterListConsent = [...this.itemsListConsent];
+    });
+
   }
 
   filter(v: string): MyPdpaConfigModel[] {
     const search = v.toLowerCase();
-    return this.itemsList.filter(x =>
-      x.version?.toLowerCase().includes(search) ||
-      x.startDate?.toLowerCase().includes(search) ||
-      x.endDate?.toLowerCase().includes(search) ||
-      x.status?.toLowerCase().includes(search)
-    );
+    return this.itemsList.filter(x => {
+      const startDateStr = x.startDate ? new Date(x.startDate).toLocaleDateString() : '';
+      const endDateStr = x.endDate ? new Date(x.endDate).toLocaleDateString() : '';
+      const statusStr = x.status ? x.status.toString() : '';
+
+      return (x.version?.toLowerCase().includes(search)) ||
+        (startDateStr.toLowerCase().includes(search)) ||
+        (endDateStr.toLowerCase().includes(search)) ||
+        (statusStr.toLowerCase().includes(search));
+    });
   }
 
+
   new() {
     this.modalStatus = 'add'
     this.pdpa = new MyPdpaConfigModel();
@@ -124,6 +142,11 @@ export class PdpaManageComponent {
     this.openModal();
   }
 
+  viewConsent(item: MyPdpaModel) {
+    this.modalStatus = 'edit';
+    this.consent = new MyPdpaModel(item, this.translate);
+  }
+
   private formatDatesForDatetimeLocal(consentModel: MyPdpaConfigModel): void {
     if (consentModel.startDate) {
       consentModel.startDate = consentModel.startDate.substring(0, 16);
@@ -298,6 +321,17 @@ export class PdpaManageComponent {
     this.modalRef.close()
   }
 
+  openModalConsent() {
+    this.modalRefConsent = this.modal.open(this.ConsentList, {
+      width: '1500px',
+      height: '750px'
+    })
+  }
+
+  closeModalConsent() {
+    this.modalRefConsent.close()
+  }
+
   filterEmp(empId: string) {
     this.pdpa = this.itemsList.filter(e => e.version == empId)[0]
   }

src/app/DPU/common/user-management/user-setting/user-setting.component.html

@@ -164,7 +164,7 @@
             <nav aria-label="Page navigation">
               <ul class="ti-pagination  mb-0">
                 <li *ngIf="pageIndex>0" class="page-item {{pageIndex==0 ? 'disabled' : ''}}"><a
-                    class="page-link px-3 py-[0.375rem]"
+                    class="page-link px-3 py-[0.375rem] cursor-pointer"
                     (click)="pageIndex = pageIndex-1;updatePagedItems()">{{'Previous' | translate}}</a></li>
                 <li class="page-item"><a class="page-link px-3 py-[0.375rem]" href="javascript:void(0);"
                     *ngIf="pageIndex-1>0" (click)="pageIndex = pageIndex-2;updatePagedItems()">{{pageIndex-1}}</a></li>
@@ -182,7 +182,7 @@
                     *ngIf="(pageIndex+2)*10 < (searchTerm == '' ? itemsList.length : filterList.length)"
                     (click)="pageIndex = pageIndex+2;updatePagedItems()">{{pageIndex +3}}</a></li>
                 <li *ngIf="(pageIndex+1)*10 < (searchTerm == '' ? itemsList.length : filterList.length)"
-                  class="page-item"><a class="page-link px-3 py-[0.375rem]"
+                  class="page-item"><a class="page-link px-3 py-[0.375rem] cursor-pointer"
                     (click)="pageIndex = pageIndex+1;updatePagedItems()">{{'Next' |
                     translate}}</a>
                 </li>
@@ -259,7 +259,7 @@
           </div> -->
 
           <div class="xl:col-span-6 col-span-12" *ngIf="modalStatus=='add'">
-            <label for="deal-title" class="form-label">{{'ชื่อ(ไทย)' | translate}}</label>
+            <label for="deal-title" class="form-label">{{'Name(Thai)' | translate}}</label>
             <input type="text" class="form-control" id="deal-title" placeholder=""
               [(ngModel)]="selectModel.thFirstname">
             <div class="text-danger" *ngIf="!selectModel.thFirstname">
@@ -267,14 +267,14 @@
             </div>
           </div>
           <div class="xl:col-span-6 col-span-12" *ngIf="modalStatus=='add'">
-            <label for="deal-title" class="form-label">{{'นามสกุล(ไทย)' | translate}}</label>
+            <label for="deal-title" class="form-label">{{'Surname(Thai)' | translate}}</label>
             <input type="text" class="form-control" id="deal-title" placeholder="" [(ngModel)]="selectModel.thLastname">
             <div class="text-danger" *ngIf="!selectModel.thLastname">
               {{'Please fill in information' | translate}}
             </div>
           </div>
           <div class="xl:col-span-6 col-span-12" *ngIf="modalStatus=='add'">
-            <label for="deal-title" class="form-label">{{'ชื่อ(อังกฤษ)' | translate}}</label>
+            <label for="deal-title" class="form-label">{{'Name(Eng)' | translate}}</label>
             <input type="text" class="form-control" id="deal-title" placeholder=""
               [(ngModel)]="selectModel.engFirstname">
             <div class="text-danger" *ngIf="!selectModel.engFirstname">
@@ -282,7 +282,7 @@
             </div>
           </div>
           <div class="xl:col-span-6 col-span-12" *ngIf="modalStatus=='add'">
-            <label for="deal-title" class="form-label">{{'นามสกุล(อังกฤษ)' | translate}}</label>
+            <label for="deal-title" class="form-label">{{'Surname(Eng)' | translate}}</label>
             <input type="text" class="form-control" id="deal-title" placeholder=""
               [(ngModel)]="selectModel.engLastname">
             <div class="text-danger" *ngIf="!selectModel.engLastname">
@@ -290,7 +290,7 @@
             </div>
           </div>
           <div class="xl:col-span-6 col-span-12" *ngIf="modalStatus=='edit'">
-            <label for="deal-title" class="form-label">{{'ชื่อ-นามสกุล(ไทย)' | translate}}</label>
+            <label for="deal-title" class="form-label">{{'Name-Surname(Thai)' | translate}}</label>
             <input type="text" class="form-control" id="deal-title" placeholder="" [(ngModel)]="selectModel.thFullName" [disabled]="action === 'edit'">
             <div class="text-danger" *ngIf="!selectModel.thFullName">
               {{'Please fill in information' | translate}}
@@ -298,7 +298,7 @@
           </div>
 
           <div class="xl:col-span-6 col-span-12" *ngIf="modalStatus=='edit'">
-            <label for="deal-title" class="form-label">{{'ชื่อ-นามสกุล(อังกฤษ)' | translate}}</label>
+            <label for="deal-title" class="form-label">{{'Name-Surname(Eng)' | translate}}</label>
             <input type="text" class="form-control" id="deal-title" placeholder="" [disabled]="action === 'edit'"
               [(ngModel)]="selectModel.engFullName">
             <div class="text-danger" *ngIf="!selectModel.engFullName">
@@ -307,7 +307,7 @@
           </div>
 
           <div class="xl:col-span-6 col-span-12">
-            <label for="deal-title" class="form-label">{{'อีเมล' | translate}}</label>
+            <label for="deal-title" class="form-label">{{'Email' | translate}}</label>
             <input type="text" class="form-control" id="deal-title" placeholder="" [(ngModel)]="selectModel.email" [disabled]="action === 'edit'">
             <div class="text-danger" *ngIf="!selectModel.email">
               {{'Please fill in information' | translate}}
@@ -316,7 +316,7 @@
 
 
           <div class="xl:col-span-6 col-span-12">
-            <label for="deal-title" class="form-label">{{'เบอร์ติดต่อ' | translate}}</label>
+            <label for="deal-title" class="form-label">{{'Mobile' | translate}}</label>
             <input type="text" class="form-control" id="deal-title" placeholder="" [disabled]="action === 'edit'"
               [(ngModel)]="selectModel.phoneNumberProfile">
             <div class="text-danger" *ngIf="!selectModel.phoneNumberProfile">

src/assets/i18n/en.json

@@ -77,5 +77,17 @@
   "Mobile": "Mobile",
   "Candidate ID": "Candidate ID",
   "User Information":"User Information",
-  "Company":"Company"
+  "Company":"Company",
+  "Version":"Version",
+  "Start Date":"Start Date",
+  "End Date":"End Date",
+  "Thai":"Thai",
+  "Eng":"ENG",
+  "China":"China",
+  "Name(Thai)":"Name(Thai)",
+  "Surname(Thai)":"Surname(Thai)",
+  "Name(Eng)":"Name(Eng)",
+  "Surname(Eng)":"Surname(Eng)",
+  "Name-Surname(Thai)":"Name-Surname(Thai)",
+  "Name-Surname(Eng)":"Name-Surname(Eng)"
 }

src/assets/i18n/th.json

@@ -77,5 +77,17 @@
   "Mobile" : "เบอร์ติดต่อ",
   "Candidate ID": "รหัสสมาชิก",
   "User Information":"ข้อมูลผู้ใช้งาน",
-  "Company":"บริษัท"
+  "Company":"บริษัท",
+  "Version":"เวอร์ชั่น",
+  "Start Date":"วันที่เริ่มต้น",
+  "End Date":"วันที่สิ้นสุด",
+  "Thai":"ไทย",
+  "Eng":"อังกฤษ",
+  "China":"จีน",
+  "Name(Thai)":"ชื่อ(ไทย)",
+  "Surname(Thai)":"นามสกุล(ไทย)",
+  "Name(Eng)":"ชื่อ(อังกฤษ)",
+  "Surname(Eng)":"นามสกุล(อังกฤษ)",
+  "Name-Surname(Thai)":"ชื่อ-นามสกุล(ไทย)",
+  "Name-Surname(Eng)":"ชื่อ-นามสกุล(อังกฤษ)"
 }