Skip to content

M
mySkill-x
Commit 7d54174d by Nattana Chaiyamat
Options

สีสถานะ form

parent bb71bec4
Showing with 28 additions and 34 deletions
src/app/components/performance-evaluation/evaluation/evaluation.component.ts
......@@ -80,50 +80,42 @@ 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
switch (this.appraisalCompentency.data?.currentStep) {
case ("0"): {
if (this.canEdit) {
this.appraisalCompentency.data.masfromEvaluationAssessment1lList[0].apsassessyDate = this.currentDate.toISOString().split('T')[0];
this.canEdit = this.evaluaterId == this.appraisalCompentency.data.apsassessy.employeeId
}
break
}
case ("1"): {
this.appraisalCompentency.data.masfromEvaluationAssessment1lList[0].apsassessyDate = this.appraisalCompentency.data.masfromEvaluationAssessment1lList[0].apsassessyDate
if (this.canEdit) {
this.appraisalCompentency.data.masfromEvaluationAssessment1lList[0].apsapprove1Date = this.currentDate.toISOString().split('T')[0];
this.canEdit = this.evaluaterId == this.appraisalCompentency.data.apsapprove1.employeeId
}
break
}
case ("2"): {
this.appraisalCompentency.data.masfromEvaluationAssessment1lList[0].apsassessyDate = this.appraisalCompentency.data.masfromEvaluationAssessment1lList[0].apsassessyDate
this.appraisalCompentency.data.masfromEvaluationAssessment1lList[0].apsapprove1Date = this.appraisalCompentency.data.masfromEvaluationAssessment1lList[0].apsapprove1Date
if (this.canEdit) {
this.appraisalCompentency.data.masfromEvaluationAssessment1lList[0].apsapprove2Date = this.currentDate.toISOString().split('T')[0];
this.canEdit = this.evaluaterId == this.appraisalCompentency.data.apsapprove2.employeeId
}
break
}
case ("3"): {
this.appraisalCompentency.data.masfromEvaluationAssessment1lList[0].apsassessyDate = this.appraisalCompentency.data.masfromEvaluationAssessment1lList[0].apsassessyDate
this.appraisalCompentency.data.masfromEvaluationAssessment1lList[0].apsapprove1Date = this.appraisalCompentency.data.masfromEvaluationAssessment1lList[0].apsapprove1Date
this.appraisalCompentency.data.masfromEvaluationAssessment1lList[0].apsapprove2Date = this.appraisalCompentency.data.masfromEvaluationAssessment1lList[0].apsapprove2Date
if (this.canEdit) {
this.appraisalCompentency.data.masfromEvaluationAssessment1lList[0].apsapprove3Date = this.currentDate.toISOString().split('T')[0];
this.canEdit = this.evaluaterId == this.appraisalCompentency.data.apsapprove3.employeeId
}
break
}
case ("4"): {
this.appraisalCompentency.data.masfromEvaluationAssessment1lList[0].apsassessyDate = this.appraisalCompentency.data.masfromEvaluationAssessment1lList[0].apsassessyDate
this.appraisalCompentency.data.masfromEvaluationAssessment1lList[0].apsapprove1Date = this.appraisalCompentency.data.masfromEvaluationAssessment1lList[0].apsapprove1Date
this.appraisalCompentency.data.masfromEvaluationAssessment1lList[0].apsapprove2Date = this.appraisalCompentency.data.masfromEvaluationAssessment1lList[0].apsapprove2Date
this.appraisalCompentency.data.masfromEvaluationAssessment1lList[0].apsapprove3Date = this.appraisalCompentency.data.masfromEvaluationAssessment1lList[0].apsapprove3Date
if (this.canEdit) {
this.appraisalCompentency.data.masfromEvaluationAssessment1lList[0].apsapprove4Date = this.currentDate.toISOString().split('T')[0];
this.canEdit = this.evaluaterId == this.appraisalCompentency.data.apsapprove4.employeeId
}
break
}
case ("5"): {
this.appraisalCompentency.data.masfromEvaluationAssessment1lList[0].apsassessyDate = this.appraisalCompentency.data.masfromEvaluationAssessment1lList[0].apsassessyDate
this.appraisalCompentency.data.masfromEvaluationAssessment1lList[0].apsapprove1Date = this.appraisalCompentency.data.masfromEvaluationAssessment1lList[0].apsapprove1Date
this.appraisalCompentency.data.masfromEvaluationAssessment1lList[0].apsapprove2Date = this.appraisalCompentency.data.masfromEvaluationAssessment1lList[0].apsapprove2Date
this.appraisalCompentency.data.masfromEvaluationAssessment1lList[0].apsapprove3Date = this.appraisalCompentency.data.masfromEvaluationAssessment1lList[0].apsapprove3Date
this.appraisalCompentency.data.masfromEvaluationAssessment1lList[0].apsapprove4Date = this.appraisalCompentency.data.masfromEvaluationAssessment1lList[0].apsapprove4Date
if (this.canEdit) {
this.appraisalCompentency.data.masfromEvaluationAssessment1lList[0].apsapprove5Date = this.currentDate.toISOString().split('T')[0];
this.canEdit = this.evaluaterId == this.appraisalCompentency.data.apsapprove5.employeeId
}
break
}
default: { return }
......
src/app/components/performance-evaluation/idp-evaluation/idp-evalution.component.ts
......@@ -31,36 +31,32 @@ export class IdpEvalutionComponent {
this.evaluationIdpService.getFormIdp(this.evaluationRoundId, this.evaluateeId).subscribe({
next: response => {
this.formIdp.data = JSON.parse(JSON.stringify(response))
console.log(" 🐒 this.formIdp.data:", this.formIdp.data?.competencyIndicatorsCourses1)
if (this.formIdp.data) {
this.canEdit = this.formIdp.data.currentStep == this.formIdp.data.checkStep
}
switch (this.formIdp.data?.currentStep) {
case ("0"): {
this.formIdp.data.masfromEvaluationIdp.apsassessyDate = this.currentDate.toISOString().split('T')[0];
this.canEdit = this.evaluaterId == this.formIdp.data.apsassessy.employeeId
break
}
case ("1"): {
this.formIdp.data.masfromEvaluationIdp.apsapprove1Date = this.currentDate.toISOString().split('T')[0];
this.canEdit = this.evaluaterId == this.formIdp.data.apsapprove1.employeeId
break
}
case ("2"): {
this.formIdp.data.masfromEvaluationIdp.apsapprove2Date = this.currentDate.toISOString().split('T')[0];
this.canEdit = this.evaluaterId == this.formIdp.data.apsapprove2.employeeId
break
}
case ("3"): {
this.formIdp.data.masfromEvaluationIdp.apsapprove3Date = this.currentDate.toISOString().split('T')[0];
this.canEdit = this.evaluaterId == this.formIdp.data.apsapprove3.employeeId
break
}
case ("4"): {
this.formIdp.data.masfromEvaluationIdp.apsapprove4Date = this.currentDate.toISOString().split('T')[0];
this.canEdit = this.evaluaterId == this.formIdp.data.apsapprove4.employeeId
break
}
case ("5"): {
this.formIdp.data.masfromEvaluationIdp.apsapprove5Date = this.currentDate.toISOString().split('T')[0];
this.canEdit = this.evaluaterId == this.formIdp.data.apsapprove5.employeeId
break
}
default: { return }
......
src/app/components/performance-evaluation/self-evaluation/self-evaluation.component.html
......@@ -122,8 +122,8 @@
<button type="button" class="ti-btn rounded-sm " (click)="selectCompentencyForm(masfromEvaluationAssessment1.competencyType.competencyTypeId);onEdit = true ;
pathTitle = ['การประเมินผล', 'ประเมินตนเอง','ประเมินผล']"
[class.ti-btn-soft-secondary]="masfromEvaluationAssessment1.masfromStatusType.code == 'employee'"
[class.ti-btn-soft-warning]="masfromEvaluationAssessment1.masfromStatusType.code != 'employee'&&masfromEvaluationAssessment1.masfromStatusType.code != 'Boss_finish'"
[class.ti-btn-soft-success]="masfromEvaluationAssessment1.masfromStatusType.code == 'Boss_finish'">
[class.ti-btn-soft-warning]="masfromEvaluationAssessment1.masfromStatusType.code == 'evaluating'"
[class.ti-btn-soft-success]="masfromEvaluationAssessment1.masfromStatusType.code == 'employee_finish'">
ประเมิน
</button>
</td>
......
src/app/components/performance-evaluation/supervisor-evaluation/supervisor-evaluation.component.html
......@@ -107,8 +107,9 @@
<div class="flex justify-center">
<button type="button" class="ti-btn rounded-sm "
*ngFor="let type of item.typeList"
[class.ti-btn-soft-secondary]="type.statusType == 'employee'"
[class.ti-btn-soft-warning]="type.statusType != 'employee'&&type.statusType != 'Boss_finish'"
[class.ti-btn-soft-mute]="type.statusType == 'Not_evaluating_yet'"
[class.ti-btn-soft-secondary]="type.statusType == 'Boss'"
[class.ti-btn-soft-warning]="type.statusType == 'BossEvaluating'"
[class.ti-btn-soft-success]="type.statusType == 'Boss_finish'"
style="height: 15px; width: 45px; font-size: 12px; display: flex; align-items: center; justify-content: center;margin-left:4px;"
(click)="selectSubordinate(item,type.competencyTypeId,subordinate.select?.evaluationRoundId);pageEvalution='evaluation'">
......@@ -119,8 +120,9 @@
<td class="text-center">
<div class="flex justify-center">
<button type="button" class="ti-btn rounded-sm"
[class.ti-btn-soft-secondary]="item.statusIdp.statusType == 'employee'"
[class.ti-btn-soft-warning]="item.statusIdp.statusType != 'employee'&&item.statusIdp.statusType != 'Boss_finish'"
[class.ti-btn-soft-mute]="item.statusIdp.statusType == 'Not_evaluating_yet'"
[class.ti-btn-soft-secondary]="item.statusIdp.statusType == 'Boss'"
[class.ti-btn-soft-warning]="item.statusIdp.statusType == 'BossEvaluating'"
[class.ti-btn-soft-success]="item.statusIdp.statusType == 'Boss_finish'"
style="height: 15px; width: 45px; font-size: 12px; display: flex; align-items: center; justify-content: center;margin-left:4px;"
(click)="selectSubordinate(item,'',subordinate.select?.evaluationRoundId);pageEvalution='idp'">
......
src/app/shared/model/appraisal-competency.model.ts
......@@ -740,6 +740,7 @@ export interface AppraisalCompentencyModel2 {
masfromEvaluationAssessment1lList: MasfromEvaluationAssessment1lList[]
currentStep: string
lastStep: string
checkStep: string
masfromStatusType: MasfromStatusType
}
export interface MasfromStatusType {
......
src/app/shared/model/appraisal-subordinate.model.ts
......@@ -19,6 +19,8 @@ export interface Masfromevaluationassessment {
shortName: string,
statusType: string
}
checkStep: string
currentStep: string
}
export interface MasfromStatusType {
......
src/app/shared/model/idp-form.model.ts
......@@ -15,6 +15,7 @@ export interface IdpFormModel {
masfromEvaluationIdp: MasfromEvaluationIdp
competencyIndicatorsCourses1: CompetencyIndicatorsCourses1[]
boss: Boss
checkStep: string
}
export interface PersonalLevel {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment