Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mySkill-x
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
mySkill-x
Commits
22415e8c
Commit
22415e8c
authored
Mar 21, 2025
by
Nattana Chaiyamat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ผู้อนุมัติ 1 ลงไป แก้ได้เท่านั้น
parent
bd3515dc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
20 deletions
+22
-20
evaluation.component.html
...rformance-evaluation/evaluation/evaluation.component.html
+13
-13
evaluation.component.ts
...performance-evaluation/evaluation/evaluation.component.ts
+9
-7
No files found.
src/app/components/performance-evaluation/evaluation/evaluation.component.html
View file @
22415e8c
...
...
@@ -289,8 +289,8 @@
</div>
<div
class=
"col-span-2"
>
<textarea
type=
"text"
rows=
"2"
class=
"ti-form-input mb-2"
placeholder=
"ใส่ Comment ที่นี่"
[
class
.!
bg-input-readonly
]="!
appraisalCompentency
.
data
||
appraisalCompentency
.
data
.
currentStep
!='
0
'||!
can
Edit
"
[
readonly
]="!
appraisalCompentency
.
data
||
appraisalCompentency
.
data
.
currentStep
!='
0
'||!
can
Edit
"
[
class
.!
bg-input-readonly
]="!
appraisalCompentency
.
data
||
appraisalCompentency
.
data
.
currentStep
!='
0
'||!
can
Save
"
[
readonly
]="!
appraisalCompentency
.
data
||
appraisalCompentency
.
data
.
currentStep
!='
0
'||!
can
Save
"
[(
ngModel
)]="
appraisalCompentency
.
data
.
masfromEvaluationAssessment1lList
[
0
].
apsassessyComment
"
></textarea>
<span
class=
"pt-2"
>
วันที่ :
...
...
@@ -312,8 +312,8 @@
</div>
<div
class=
"col-span-2"
>
<textarea
type=
"text"
rows=
"2"
class=
"ti-form-input mb-2"
placeholder=
"ใส่ Comment ที่นี่"
[
class
.!
bg-input-readonly
]="!
appraisalCompentency
.
data
||
appraisalCompentency
.
data
.
currentStep
!='
1
'||!
can
Edit
"
[
readonly
]="!
appraisalCompentency
.
data
||
appraisalCompentency
.
data
.
currentStep
!='
1
'||!
can
Edit
"
[
class
.!
bg-input-readonly
]="!
appraisalCompentency
.
data
||
appraisalCompentency
.
data
.
currentStep
!='
1
'||!
can
Save
"
[
readonly
]="!
appraisalCompentency
.
data
||
appraisalCompentency
.
data
.
currentStep
!='
1
'||!
can
Save
"
[(
ngModel
)]="
appraisalCompentency
.
data
.
masfromEvaluationAssessment1lList
[
0
].
apsapprove1Comment
"
></textarea>
<span
class=
"pt-2"
>
วันที่ :
...
...
@@ -335,8 +335,8 @@
</div>
<div
class=
"col-span-2"
>
<textarea
type=
"text"
rows=
"2"
class=
"ti-form-input mb-2"
placeholder=
"ใส่ Comment ที่นี่"
[
class
.!
bg-input-readonly
]="!
appraisalCompentency
.
data
||
appraisalCompentency
.
data
.
currentStep
!='
2
'||!
can
Edit
"
[
readonly
]="!
appraisalCompentency
.
data
||
appraisalCompentency
.
data
.
currentStep
!='
2
'||!
can
Edit
"
[
class
.!
bg-input-readonly
]="!
appraisalCompentency
.
data
||
appraisalCompentency
.
data
.
currentStep
!='
2
'||!
can
Save
"
[
readonly
]="!
appraisalCompentency
.
data
||
appraisalCompentency
.
data
.
currentStep
!='
2
'||!
can
Save
"
[(
ngModel
)]="
appraisalCompentency
.
data
.
masfromEvaluationAssessment1lList
[
0
].
apsapprove2Comment
"
></textarea>
<span
class=
"pt-2"
>
วันที่ :
...
...
@@ -358,8 +358,8 @@
</div>
<div
class=
"col-span-2"
>
<textarea
type=
"text"
rows=
"2"
class=
"ti-form-input mb-2"
placeholder=
"ใส่ Comment ที่นี่"
[
class
.!
bg-input-readonly
]="!
appraisalCompentency
.
data
||
appraisalCompentency
.
data
.
currentStep
!='
3
'||!
can
Edit
"
[
readonly
]="!
appraisalCompentency
.
data
||
appraisalCompentency
.
data
.
currentStep
!='
3
'||!
can
Edit
"
[
class
.!
bg-input-readonly
]="!
appraisalCompentency
.
data
||
appraisalCompentency
.
data
.
currentStep
!='
3
'||!
can
Save
"
[
readonly
]="!
appraisalCompentency
.
data
||
appraisalCompentency
.
data
.
currentStep
!='
3
'||!
can
Save
"
[(
ngModel
)]="
appraisalCompentency
.
data
.
masfromEvaluationAssessment1lList
[
0
].
apsapprove3Comment
"
></textarea>
<span
class=
"pt-2"
>
วันที่ :
...
...
@@ -381,8 +381,8 @@
</div>
<div
class=
"col-span-2"
>
<textarea
type=
"text"
rows=
"2"
class=
"ti-form-input mb-2"
placeholder=
"ใส่ Comment ที่นี่"
[
class
.!
bg-input-readonly
]="!
appraisalCompentency
.
data
||
appraisalCompentency
.
data
.
currentStep
!='
4
'||!
can
Edit
"
[
readonly
]="!
appraisalCompentency
.
data
||
appraisalCompentency
.
data
.
currentStep
!='
4
'||!
can
Edit
"
[
class
.!
bg-input-readonly
]="!
appraisalCompentency
.
data
||
appraisalCompentency
.
data
.
currentStep
!='
4
'||!
can
Save
"
[
readonly
]="!
appraisalCompentency
.
data
||
appraisalCompentency
.
data
.
currentStep
!='
4
'||!
can
Save
"
[(
ngModel
)]="
appraisalCompentency
.
data
.
masfromEvaluationAssessment1lList
[
0
].
apsapprove4Comment
"
></textarea>
<span
class=
"pt-2"
>
วันที่ :
...
...
@@ -404,8 +404,8 @@
</div>
<div
class=
"col-span-2"
>
<textarea
type=
"text"
rows=
"2"
class=
"ti-form-input mb-2"
placeholder=
"ใส่ Comment ที่นี่"
[
class
.!
bg-input-readonly
]="!
appraisalCompentency
.
data
||
appraisalCompentency
.
data
.
currentStep
!='
5
'||!
can
Edit
"
[
readonly
]="!
appraisalCompentency
.
data
||
appraisalCompentency
.
data
.
currentStep
!='
5
'||!
can
Edit
"
[
class
.!
bg-input-readonly
]="!
appraisalCompentency
.
data
||
appraisalCompentency
.
data
.
currentStep
!='
5
'||!
can
Save
"
[
readonly
]="!
appraisalCompentency
.
data
||
appraisalCompentency
.
data
.
currentStep
!='
5
'||!
can
Save
"
[(
ngModel
)]="
appraisalCompentency
.
data
.
masfromEvaluationAssessment1lList
[
0
].
apsapprove5Comment
"
></textarea>
<span
class=
"pt-2"
>
วันที่ :
...
...
@@ -415,7 +415,7 @@
</div>
</div>
<div
class=
"flex justify-center mb-1rem pb-2rem"
*
ngIf=
"can
Edit
"
>
<div
class=
"flex justify-center mb-1rem pb-2rem"
*
ngIf=
"can
Save
"
>
<button
type=
"submit"
class=
"ti-btn ti-btn-success mx-2rem"
(
click
)="
save
('
draft
')"
>
บันทึกร่าง
</button>
...
...
src/app/components/performance-evaluation/evaluation/evaluation.component.ts
View file @
22415e8c
...
...
@@ -19,6 +19,7 @@ export class EvaluationComponent implements OnInit {
@
Input
()
competencyTypeId
=
""
@
Output
()
sendReturnPath
:
EventEmitter
<
any
>
=
new
EventEmitter
<
any
>
();
canEdit
=
false
canSave
=
false
hoveredCode
:
string
|
null
=
null
;
hoveredCode2
:
string
|
null
=
null
;
currentDate
=
new
Date
()
...
...
@@ -80,40 +81,41 @@ export class EvaluationComponent implements OnInit {
next
:
response
=>
{
this
.
appraisalCompentency
.
data
=
JSON
.
parse
(
JSON
.
stringify
(
response
))
if
(
this
.
appraisalCompentency
.
data
?.
masfromEvaluationAssessment1lList
[
0
])
{
this
.
canEdit
=
this
.
appraisalCompentency
.
data
.
currentStep
==
this
.
appraisalCompentency
.
data
.
checkStep
this
.
canSave
=
this
.
appraisalCompentency
.
data
.
currentStep
==
this
.
appraisalCompentency
.
data
.
checkStep
this
.
canEdit
=
(
this
.
appraisalCompentency
.
data
.
currentStep
==
this
.
appraisalCompentency
.
data
.
checkStep
&&
(
+
(
this
.
appraisalCompentency
.
data
.
checkStep
)
<=
1
))
switch
(
this
.
appraisalCompentency
.
data
?.
currentStep
)
{
case
(
"0"
):
{
if
(
this
.
can
Edit
)
{
if
(
this
.
can
Save
)
{
this
.
appraisalCompentency
.
data
.
masfromEvaluationAssessment1lList
[
0
].
apsassessyDate
=
this
.
currentDate
.
toISOString
().
split
(
'T'
)[
0
];
}
break
}
case
(
"1"
):
{
if
(
this
.
can
Edit
)
{
if
(
this
.
can
Save
)
{
this
.
appraisalCompentency
.
data
.
masfromEvaluationAssessment1lList
[
0
].
apsapprove1Date
=
this
.
currentDate
.
toISOString
().
split
(
'T'
)[
0
];
}
break
}
case
(
"2"
):
{
if
(
this
.
can
Edit
)
{
if
(
this
.
can
Save
)
{
this
.
appraisalCompentency
.
data
.
masfromEvaluationAssessment1lList
[
0
].
apsapprove2Date
=
this
.
currentDate
.
toISOString
().
split
(
'T'
)[
0
];
}
break
}
case
(
"3"
):
{
if
(
this
.
can
Edit
)
{
if
(
this
.
can
Save
)
{
this
.
appraisalCompentency
.
data
.
masfromEvaluationAssessment1lList
[
0
].
apsapprove3Date
=
this
.
currentDate
.
toISOString
().
split
(
'T'
)[
0
];
}
break
}
case
(
"4"
):
{
if
(
this
.
can
Edit
)
{
if
(
this
.
can
Save
)
{
this
.
appraisalCompentency
.
data
.
masfromEvaluationAssessment1lList
[
0
].
apsapprove4Date
=
this
.
currentDate
.
toISOString
().
split
(
'T'
)[
0
];
}
break
}
case
(
"5"
):
{
if
(
this
.
can
Edit
)
{
if
(
this
.
can
Save
)
{
this
.
appraisalCompentency
.
data
.
masfromEvaluationAssessment1lList
[
0
].
apsapprove5Date
=
this
.
currentDate
.
toISOString
().
split
(
'T'
)[
0
];
}
break
...
...
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