Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
myjob-manage
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
angular
myjob-manage
Commits
36eb5823
Commit
36eb5823
authored
Jul 03, 2025
by
Natthaphat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ใส่ translate
parent
ea4b8730
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
245 additions
and
45 deletions
+245
-45
article-manage.component.html
...p/DPU/common/article-manage/article-manage.component.html
+2
-2
company-manage.component.html
...p/DPU/common/company-manage/company-manage.component.html
+2
-2
pdpa-manage.component.html
src/app/DPU/common/pdpa-manage/pdpa-manage.component.html
+165
-23
pdpa-manage.component.ts
src/app/DPU/common/pdpa-manage/pdpa-manage.component.ts
+40
-6
user-setting.component.html
.../user-management/user-setting/user-setting.component.html
+10
-10
en.json
src/assets/i18n/en.json
+13
-1
th.json
src/assets/i18n/th.json
+13
-1
No files found.
src/app/DPU/common/article-manage/article-manage.component.html
View file @
36eb5823
...
...
@@ -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
View file @
36eb5823
...
...
@@ -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.html
View file @
36eb5823
...
...
@@ -54,8 +54,8 @@
</tr>
</thead>
<tbody>
@if (
items
List.length > 0) {
@for(item of
itemsList;track items
List){
@if (
filter
List.length > 0) {
@for(item of
filterList;track filter
List){
<tr
class=
"border border-defaultborder dark:border-defaultborder/10"
>
<td
class=
"product-checkbox"
><input
class=
"form-check-input"
type=
"checkbox"
...
...
@@ -69,13 +69,15 @@
</td>
<td>
<div>
<span
class=
"block mb-1"
>
{{item.startDate| date
<span
class=
"badge bg-info/10 text-primary"
><i
class=
"bi bi-clock me-1"
></i>
{{item.startDate
| date
: 'medium'}}
</span>
</div>
</td>
<td>
<div>
<span
class=
"block mb-1"
>
{{item.endDate | date
<span
class=
"badge bg-info/10 text-primary"
><i
class=
"bi bi-clock me-1"
></i>
{{item.endDate
| date
: 'medium'}}
</span>
</div>
</td>
...
...
@@ -123,7 +125,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>
...
...
@@ -142,7 +144,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>
...
...
@@ -183,7 +185,7 @@
<input type="text" class="form-control" [ngClass]="{ '!bg-input-readonly': modalStatus === 'edit' }"
id="deal-title" placeholder="" [(ngModel)]="pdpa.version" [readonly]="modalStatus === 'edit'">
<div class="text-danger" *ngIf="!pdpa.version">
{{'
Please fill in information
' | translate}}
{{'
{{'Please fill in information' | translate}}
' | translate}}
</div>
</div>
...
...
@@ -191,14 +193,14 @@
<label for="deal-title" class="form-label">{{'วันที่เริ่ม' | translate}}</label>
<input type="text" class="form-control" id="deal-title" placeholder="" [(ngModel)]="pdpa.startDate">
<div class="text-danger" *ngIf="!pdpa.startDate">
{{'
Please fill in information
' | translate}}
{{'
{{'Please fill in information' | translate}}
' | translate}}
</div>
</div>
<div class="xl:col-span-6 col-span-12" *ngIf="modalStatus=='add'">
<label for="deal-title" class="form-label">{{'วันที่สินสุด' | translate}}</label>
<input type="text" class="form-control" id="deal-title" placeholder="" [(ngModel)]="pdpa.endDate">
<div class="text-danger" *ngIf="!pdpa.endDate">
{{'
Please fill in information
' | translate}}
{{'
{{'Please fill in information' | translate}}
' | translate}}
</div>
</div>
<div class="xl:col-span-12 col-span-12">
...
...
@@ -230,9 +232,12 @@
<div
class=
"ti-modal-content"
>
<div
class=
"ti-modal-header flex justify-between items-center p-5"
>
<h6
class=
"modal-title text-[1rem] font-semibold text-defaulttextcolor"
id=
"mail-ComposeLabel"
>
{{ (modalStatus == 'add' ? ('Create' | translate) : ('Edit' | translate)) + ' ' + ('Version' | translate) }}
{{ (modalStatus == 'add' ? ('Create' | translate) : ('Edit' | translate)) + ' ' + ('Version' | translate) }} :
<span
class=
"text-danger"
*
ngIf=
"pdpa.version"
>
({{ pdpa.version }})
</span>
</h6>
<button
type=
"button"
class=
"hs-dropdown-toggle !text-[1rem] !font-semibold !text-defaulttextcolor"
(
click
)="
modalRef
.
close
()"
#
closeModal
>
<span
class=
"sr-only"
>
{{'Close' | translate}}
</span>
...
...
@@ -240,21 +245,21 @@
</button>
</div>
<div
class=
"ti-modal-body-content pt-6 pr-6 pl-6 pb-3 mb-4"
>
<div
class=
"flex items-end justify-start md:justify-end"
>
<
!-- <
div class="flex items-end justify-start md:justify-end">
<a href="javascript:void(0);" class="hs-dropdown-toggle ti-btn ti-btn-primary-full w-full md:w-auto"
(
click
)="
new
()"
data-hs-overlay=
"#modal-detail"
>
(click)="
openModalConsent
()" data-hs-overlay="#modal-detail">
<i class="ri-add-line font-semibold align-middle"></i>
{{ 'Consent List' | translate }}
</a>
</div>
</div>
-->
<div
class=
"grid grid-cols-1 md:grid-cols-2 gap-6 mb-8"
>
<div
class=
"flex flex-col"
>
<label
class=
"ti-form-label mb-2 text-primary font-bold"
>
Version
*
</label>
<label
class=
"ti-form-label mb-2 text-primary font-bold"
>
{{'Version' | translate}}
*
</label>
<input
type=
"text"
class=
"ti-form-input w-full"
[
ngClass
]="{
'!
bg-input-readonly
'
:
modalStatus =
==
'
edit
'
}"
[(
ngModel
)]="
pdpa
.
version
"
[
readonly
]="
modalStatus =
==
'
edit
'"
/>
<div
class=
"text-danger text-sm mt-1"
*
ngIf=
"!pdpa.version"
>
Please fill in information
{{'Please fill in information' | translate}}
</div>
</div>
...
...
@@ -274,24 +279,24 @@
</div>
<div
class=
"text-danger text-sm mt-1"
*
ngIf=
"pdpa.status === null || pdpa.status === undefined"
>
Please fill in information
{{'Please fill in information' | translate}}
</div>
</div>
<div
class=
"flex flex-col"
>
<label
class=
"ti-form-label mb-2 text-primary font-bold"
>
Start Date
</label>
<label
class=
"ti-form-label mb-2 text-primary font-bold"
>
{{'Start Date' | translate}}
</label>
<input
type=
"datetime-local"
class=
"ti-form-input w-full"
[(
ngModel
)]="
pdpa
.
startDate
"
/>
<div
class=
"text-danger text-sm mt-1"
*
ngIf=
"!pdpa.startDate"
>
Please fill in information
{{'Please fill in information' | translate}}
</div>
</div>
<div
class=
"flex flex-col"
>
<label
class=
"ti-form-label mb-2 text-primary font-bold"
>
End Date
</label>
<label
class=
"ti-form-label mb-2 text-primary font-bold"
>
{{'End Date' | translate}}
</label>
<input
type=
"datetime-local"
class=
"ti-form-input w-full"
[(
ngModel
)]="
pdpa
.
endDate
"
/>
<div
class=
"text-danger text-sm mt-1"
*
ngIf=
"!pdpa.endDate"
>
Please fill in information
{{'Please fill in information' | translate}}
</div>
</div>
</div>
...
...
@@ -301,17 +306,17 @@
<a
(
click
)="
currentTab =
1"
class=
"tab-btn"
[
ngClass
]="{
'!
bg-primary
border-primary
!
text-white
'
:
currentTab =
==
1
}"
href=
"javascript:void(0);"
>
ไทย
{{'Thai' |translate}}
</a>
<a
(
click
)="
currentTab =
2"
class=
"tab-btn"
[
ngClass
]="{
'!
bg-primary
border-primary
!
text-white
'
:
currentTab =
==
2
}"
href=
"javascript:void(0);"
>
อังกฤษ
{{'Eng' | translate}}
</a>
<a
(
click
)="
currentTab =
3"
class=
"tab-btn"
[
ngClass
]="{
'!
bg-primary
border-primary
!
text-white
'
:
currentTab =
==
3
}"
href=
"javascript:void(0);"
>
จีน
{{'China' | translate}}
</a>
</nav>
...
...
@@ -349,6 +354,143 @@
</div>
</div>
</ng-template>
<ng-template
#
ConsentList
let-modal
>
<div
class=
"hs-overlay-open:mt-7 ti-modal-box mt-0 ease-out"
>
<div
class=
"ti-modal-content"
>
<div
class=
"ti-modal-header flex justify-between items-center p-5"
>
<h6
class=
"modal-title text-[1rem] font-semibold text-defaulttextcolor"
id=
"mail-ComposeLabel"
>
{{"Consent List | translate"}}
</h6>
<button
type=
"button"
class=
"hs-dropdown-toggle !text-[1rem] !font-semibold !text-defaulttextcolor"
(
click
)="
modalRefConsent
.
close
()"
#
closeModal
>
<span
class=
"sr-only"
>
{{'Close' | translate}}
</span>
<i
class=
"ri-close-line"
></i>
</button>
</div>
<div
class=
"ti-modal-body-content pt-6 pr-6 pl-6 pb-3 mb-4"
>
<div
class=
"table-responsive"
>
<table
class=
"table whitespace-nowrap min-w-full ti-custom-table-hover"
>
<thead>
<tr
class=
"border-b border-defaultborder"
>
<th
scope=
"col"
class=
"!text-start"
>
<input
class=
"form-check-input check-all"
type=
"checkbox"
id=
"all-products"
(
change
)="
toggleAll
($
event
)"
[
checked
]="
allSelected
"
aria-label=
"..."
>
</th>
<th
scope=
"col"
class=
"text-start"
>
{{ 'Fullname' | translate}}
</th>
<th
scope=
"col"
class=
"text-start"
>
{{ 'Mobile' | translate}}
</th>
<th
scope=
"col"
class=
"text-start"
>
{{ 'Consent Date' | translate}}
</th>
<th
scope=
"col"
class=
"text-start"
></th>
</tr>
</thead>
<tbody>
@if (filterListConsent.length > 0) {
@for(item of filterListConsent;track filterListConsent){
<tr
class=
"border border-defaultborder dark:border-defaultborder/10"
>
<td
class=
"product-checkbox"
><input
class=
"form-check-input"
type=
"checkbox"
[
checked
]="
selectedItems
.
get
(
item
.
profileId
)"
(
change
)="
onCheckboxChange
(
item
.
profileId
)"
aria-label=
"..."
value=
""
>
</td>
<td>
<div
class=
"flex items-center"
>
<span
class=
"avatar avatar-sm p-1 me-1 bg-light !rounded-full"
>
<img
[
src
]="
item
.
getPicture
()"
alt=
""
id=
"profile-img"
>
</span>
<div
class=
"ms-2"
>
<p
class=
"font-semibold mb-0 flex items-center text-primary"
><a
(
click
)="
viewConsent
(
item
)"
>
{{item.thFullName}}
</a></p>
<!-- <p class="text-[0.75rem] text-muted mb-0">{{item.memberId}}</p> -->
</div>
</div>
</td>
<td>
<div>
<span
class=
"block"
><i
class=
"ri-phone-line me-2 align-middle text-[.875rem] text-[#8c9097] dark:text-white/50 inline-flex"
></i>
{{item.phoneCurrent}}
</span>
</div>
</td>
<td><span
class=
"badge bg-info/10 text-primary"
><i
class=
"bi bi-clock me-1"
></i>
{{item.consentDate
| date
: 'medium'}}
</span>
</td>
</tr>
}
} @else {
<tr>
<td
[
attr
.
colspan
]="
6
"
class=
"text-center py-4"
>
<ng-container
*
ngIf=
"itemsListConsent.length === 0 && !searchTerm"
>
<p>
กำลังโหลดข้อมูล หรือไม่มีข้อมูลเลย...
</p>
</ng-container>
<ng-container
*
ngIf=
"itemsListConsent.length > 0 && filterListConsent.length === 0 && searchTerm"
>
<p>
ไม่พบข้อมูลที่ค้นหา...
</p>
</ng-container>
</td>
</tr>
}
</tbody>
</table>
</div>
</div>
<div
class=
"box-footer"
>
<div
class=
"flex items-center flex-wrap overflow-auto"
*
ngIf=
"filterListConsent.length > 0"
>
<div
class=
"mb-2 sm:mb-0"
>
<div>
{{'Showing' | translate}} {{filterListConsent.length}} {{'entries'
| translate}}
<i
class=
"bi bi-arrow-right ms-2 font-semibold"
></i>
</div>
</div>
<div
class=
"ms-auto"
>
<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]"
(
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>
<li
class=
"page-item"
><a
class=
"page-link px-3 py-[0.375rem]"
href=
"javascript:void(0);"
*
ngIf=
"pageIndex>0 && ((pageIndex-1)*10 < (searchTerm == '' ? itemsListConsent.length : filterListConsent.length))"
(
click
)="
pageIndex =
pageIndex-1;updatePagedItems()"
>
{{pageIndex}}
</a></li>
<li
class=
"page-item"
><a
class=
"page-link active px-3 py-[0.375rem]"
href=
"javascript:void(0);"
>
{{pageIndex +1}}
</a>
</li>
<li
class=
"page-item"
><a
class=
"page-link px-3 py-[0.375rem]"
href=
"javascript:void(0);"
*
ngIf=
"(pageIndex+1)*10 < (searchTerm == '' ? itemsListConsent.length : filterListConsent.length)"
(
click
)="
pageIndex =
pageIndex+1;updatePagedItems()"
>
{{pageIndex +2}}
</a></li>
<li
class=
"page-item"
><a
class=
"page-link px-3 py-[0.375rem]"
href=
"javascript:void(0);"
*
ngIf=
"(pageIndex+2)*10 < (searchTerm == '' ? itemsListConsent.length : filterListConsent.length)"
(
click
)="
pageIndex =
pageIndex+2;updatePagedItems()"
>
{{pageIndex +3}}
</a></li>
<li
*
ngIf=
"(pageIndex+1)*10 < (searchTerm == '' ? itemsListConsent.length : filterListConsent.length)"
class=
"page-item"
><a
class=
"page-link px-3 py-[0.375rem]"
(
click
)="
pageIndex =
pageIndex+1;updatePagedItems()"
>
{{'Next' |
translate}}
</a>
</li>
</ul>
</nav>
</div>
</div>
</div>
<div
class=
"ti-modal-footer flex justify-center gap-4 mb-3"
>
<button
type=
"button"
class=
"hs-dropdown-toggle ti-btn bg-danger align-middle text-white !font-medium"
(
click
)="
modalRefConsent
.
close
()"
#
closeModal
>
{{'Previous' | translate}}
</button>
<!-- <button type="button" (click)="save()" [disabled]="isSaving"
class="ti-btn bg-primary text-white !font-medium">
{{ isSaving ? ('Saving...' | translate) : ('Save' | translate) }}
</button> -->
</div>
</div>
</div>
</ng-template>
</ng-container>
<ng-container
*
ngIf=
"edit"
>
<app-pdpa-config
[
pdpaconfig
]="
pdpaconfig
"
(
sendEdit
)="
edit=
false"
></app-pdpa-config>
...
...
src/app/DPU/common/pdpa-manage/pdpa-manage.component.ts
View file @
36eb5823
...
...
@@ -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
View file @
36eb5823
...
...
@@ -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
View file @
36eb5823
...
...
@@ -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
View file @
36eb5823
...
...
@@ -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)"
:
"ชื่อ-นามสกุล(อังกฤษ)"
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment