Skip to content

M
mySkill-x
Commit 31dc0ed4 by Nattana Chaiyamat
Options

ประเมินตนเอง

parent f23f1e12
Showing with 83 additions and 27 deletions
src/app/components/performance-evaluation/pms-form-employee/pms-competency/pms-competency.component.html
......@@ -71,8 +71,8 @@
</a>
</div>
</th>
<th scope="col"
[ngStyle]="{'width': (evaluaterId!=evaluateeId||currentStep != '0') ?'325px' :'500px;'}">
<ng-container *ngIf="evaluaterId==evaluateeId&&!complete">
<th scope="col" style="width:500px">
ระดับความสามารถ
<div class="hs-tooltip ti-main-tooltip [--trigger:hover]">
<a class="hs-tooltip-toggle ti-main-tooltip-toggle" href="javascript:;">
......@@ -99,7 +99,37 @@
</a>
</div>
</th>
<th scope="col" *ngIf="evaluaterId!=evaluateeId||currentStep != '0'">คะแนนลูกน้อง</th>
</ng-container>
<ng-container *ngIf="evaluaterId!=evaluateeId||complete">
<th scope="col" style="width:325px">
ระดับความสามารถ
<div class="hs-tooltip ti-main-tooltip [--trigger:hover]">
<a class="hs-tooltip-toggle ti-main-tooltip-toggle" href="javascript:;">
<i class="ti ti-help-circle"></i>
<div class="hs-tooltip-content ti-main-tooltip-content border-secondary" role="tooltip">
<div class="flex flex-col">
<div>ระดับความสามารถ (Target Degree)</div>
<div class="text-start">
ระดับ 1 = ไม่มีความรู้พื้นฐานเลย ขาดทักษะในงาน</div>
<div class="text-start">
ระดับ 2 = มีความรู้ในงานบ้างแต่ยังไม่สามารถ ประยุกต์ใช้ในงานได้
</div>
<div class="text-start">
ระดับ 3 = นำความรู้มาประยุกต์ใช้ในงานได้ ปฏิบัติงานเองได้ด้วยตัวเองแก้ไขปัญหาหน้างานได้
</div>
<div class="text-start">
ระดับ 4 = สอนผู้อื่นได้ มีความคล่องตัว เชื่อมโยง ความรู้ในงานได้
</div>
<div class="text-start">
ระดับ 5 = มีความชำนาญ เชี่ยวชาญ เป็นที่ยอมรับ ในองค์กร
</div>
</div>
</div>
</a>
</div>
</th>
<th scope="col">ประเมินตนเอง</th>
</ng-container>
</tr>
</thead>
<tbody>
......@@ -114,7 +144,7 @@
<td class="py-2 text-center" style="vertical-align: top">
<div class="flex flex-row justify-center gap-2 mb-2">
<ng-container *ngFor="let item of [5,4,3,2,1];let f = first">
<ng-container *ngIf="evaluaterId!=evaluateeId||currentStep != '0'">
<ng-container *ngIf="evaluaterId==evaluateeId&&!complete">
<button type="button"
class="h-12 w-12 p-0 shadow border text-soft-secondary-no-hover bg-white"
style="border-radius:10px"
......@@ -128,7 +158,7 @@
{{item}}
</button>
</ng-container>
<ng-container *ngIf="!(evaluaterId!=evaluateeId||currentStep != '0')">
<ng-container *ngIf="evaluaterId!=evaluateeId&&!complete">
<button type="button"
class="h-12 w-12 p-0 shadow border text-soft-secondary-no-hover bg-white"
style="border-radius:10px"
......@@ -154,10 +184,11 @@
</span>
</div>
</td>
<td class="py-2 text-center text-indigo-600 font-semibold" style="vertical-align: top"
*ngIf="evaluaterId!=evaluateeId||currentStep != '0'">
<ng-container *ngIf="evaluaterId!=evaluateeId&&!complete">
<td class="py-2 text-center text-indigo-600 font-semibold" style="vertical-align: top">
{{bi.competencyBehavioral.scoreTopicExpectationEmp}}
</td>
</ng-container>
</tr>
</ng-container>
</tbody>
......
src/app/components/performance-evaluation/pms-form-employee/pms-competency/pms-competency.component.ts
......@@ -13,6 +13,7 @@ import Swal from 'sweetalert2';
styleUrls: ['./pms-competency.component.scss']
})
export class PmsCompetencyComponent {
@Input() complete = false
@Input() fCurrentPart = ""
currentPart = ""
@Input() canSave = false
......
src/app/components/performance-evaluation/pms-form-employee/pms-form-employee.component.ts
......@@ -72,7 +72,7 @@ export class PmsFormEmployeeComponent {
hasPushedState = false;
companyId = ""
complete = false
@ViewChild('scrollContainer') scrollContainer!: ElementRef;
......@@ -323,6 +323,7 @@ export class PmsFormEmployeeComponent {
selectDataList(data: CompetencyModel) {
this.compentency.originalData = this.deepClone(data)
this.compentency.data = this.deepClone(data)
this.complete = this.compentency.data?.statusAll == 'complete'
this.cdr.detectChanges()
if (this.compentency.data) {
this.currentTap = this.firstCurrentTap || "ข้อมูลการประเมิน"
......
src/app/components/performance-evaluation/pms-form-employee/pms-idp/pms-idp.component.html
......@@ -316,7 +316,7 @@
จาก&nbsp;
</ng-container>
<ng-container
*ngIf="data.idpDevelopmentPlan&&data.idpDevelopmentPlan?.training && appraisalIdp.masfromEvaluationIdp.idpStatus=='1'">
*ngIf="data.idpDevelopmentPlan&&data.idpDevelopmentPlan?.training && appraisalIdp.apsapprove1.employeeId == evaluaterId">
<input type="date" id="input-label" class="ti-form-input"
[(ngModel)]="appraisalIdp.masfromEvaluationRound.apsPeriodStart">
<ng-container
......@@ -327,7 +327,7 @@
[(ngModel)]="appraisalIdp.masfromEvaluationRound.apsPeriodEnd">
</ng-container>
<ng-container
*ngIf="!(data.idpDevelopmentPlan&&data.idpDevelopmentPlan?.training) || appraisalIdp.masfromEvaluationIdp.idpStatus!='1'">
*ngIf="!(data.idpDevelopmentPlan&&data.idpDevelopmentPlan?.training) || appraisalIdp.apsapprove1.employeeId != evaluaterId">
{{convertDateFormat(appraisalIdp.masfromEvaluationRound.apsPeriodStart)}}
<ng-container
*ngIf="appraisalIdp.masfromEvaluationRound.apsPeriodStart &&appraisalIdp.masfromEvaluationRound.apsPeriodEnd">
......
src/app/components/performance-evaluation/pms-form-employee/pms-idp/pms-idp.component.ts
......@@ -19,6 +19,7 @@ interface table {
styleUrls: ['./pms-idp.component.scss']
})
export class PmsIdpComponent {
@Input() complete = false
@Input() canSave = false
@Input() pathTitle: string[] = []
@Input() evaluationRoundId = ""
......@@ -57,7 +58,7 @@ export class PmsIdpComponent {
this.getCompetencycourseMiniList()
}
ngOnChanges(changes: SimpleChanges): void {
if (changes['currentTap']?.currentValue||changes['appraisalIdp']?.currentValue) {
if (changes['currentTap']?.currentValue || changes['appraisalIdp']?.currentValue) {
this.getFormIdp()
}
}
......
src/app/components/performance-evaluation/pms-form-employee/pms-information/pms-information.component.html
......@@ -13,11 +13,17 @@
<th scope="col">แบบการประเมิน</th>
<th scope="col text-center">วันที่เริ่มต้น</th>
<th scope="col text-center">วันที่สิ้นสุด</th>
<th scope="col text-center" *ngIf="evaluaterId!=evaluateeId||currentStep != '0'">คะแนนเฉลี่ยลูกน้อง
<ng-container *ngIf="evaluaterId==evaluateeId&&!complete">
<th scope="col text-center">คะแนนเฉลี่ย</th>
<th scope="col text-center">ผล GAP</th>
</ng-container>
<ng-container *ngIf="evaluaterId!=evaluateeId||complete">
<th scope="col text-center">คะแนนเฉลี่ยตนเอง
</th>
<th scope="col text-center">คะแนนเฉลี่ย</th>
<th scope="col text-center" *ngIf="evaluaterId!=evaluateeId||currentStep != '0'">ผล GAP ลูกน้อง</th>
<th scope="col text-center">ผล GAP ตนเอง</th>
<th scope="col text-center">ผล GAP</th>
</ng-container>
<th scope="col text-center">การจัดการ</th>
</tr>
</thead>
......@@ -36,21 +42,30 @@
<td class="py-2 text-center" style="vertical-align: top">
{{formatThaiDate(item.masfromEvaluationRound.apsPeriodEnd)}}
</td>
<td class="py-2 text-center" style="vertical-align: top"
*ngIf="evaluaterId!=evaluateeId||currentStep != '0'">
<ng-container *ngIf="evaluaterId==evaluateeId&&!complete">
<td class="py-2 text-center" style="vertical-align: top">
{{inforWeightEmp.get(item.comType)!=='undefined' && inforWeightEmp.get(item.comType)
!=='null'?inforWeightEmp.get(item.comType): '0'}}
</td>
<td class="py-2 text-center" style="vertical-align: top">
{{inforGapEmp.get(item.comType)!=='null'?inforGapEmp.get(item.comType): ''}}
</td>
</ng-container>
<ng-container *ngIf="evaluaterId!=evaluateeId||complete">
<td class="py-2 text-center" style="vertical-align: top">
{{inforWeightEmp.get(item.comType)!=='undefined' && inforWeightEmp.get(item.comType)
!=='null'?inforWeightEmp.get(item.comType): '0'}}
</td>
<td class="py-2 text-center" style="vertical-align: top">
{{inforWeight.get(item.comType) !=='null'?inforWeight.get(item.comType): '0'}}
</td>
<td class="py-2 text-center" style="vertical-align: top"
*ngIf="evaluaterId!=evaluateeId||currentStep != '0'">
<td class="py-2 text-center" style="vertical-align: top">
{{inforGapEmp.get(item.comType)!=='null'?inforGapEmp.get(item.comType): ''}}
</td>
<td class="py-2 text-center" style="vertical-align: top">
{{inforGap.get(item.comType)!=='null'?inforGap.get(item.comType): ''}}
</td>
</ng-container>
<td class="py-2 text-center" style="vertical-align: top">
<div class="flex justify-center">
<button type="button" class="ti-btn rounded-sm" [class]="statusButtonClass(statusType)"
......@@ -79,8 +94,13 @@
<th scope="col">แบบการประเมิน</th>
<th scope="col text-center">วันที่เริ่มต้น</th>
<th scope="col text-center">วันที่สิ้นสุด</th>
<th scope="col text-center">ผลการประเมินลูกน้อง</th>
<ng-container *ngIf="evaluaterId==evaluateeId&&!complete">
<th scope="col text-center">ผลการประเมิน</th>
</ng-container>
<ng-container *ngIf="evaluaterId!=evaluateeId||complete">
<th scope="col text-center">ผลการประเมินตนเอง</th>
<th scope="col text-center">ผลการประเมิน</th>
</ng-container>
<th scope="col text-center">เกรด</th>
<th scope="col text-center">การจัดการ</th>
</tr>
......@@ -98,13 +118,19 @@
<td class="py-2 text-center" style="vertical-align: top">
{{formatThaiDate(appraisalPms.pmsMasfromEvaluationRoundModel.apsPeriodEnd)}}
</td>
<td *ngIf="evaluaterId!=evaluateeId||currentStep != '0'" class="py-2 text-center"
style="vertical-align: top">
<ng-container *ngIf="evaluaterId==evaluateeId&&!complete">
<td class="py-2 text-center" style="vertical-align: top">
{{kpiScoreEmp}}
</td>
</ng-container>
<ng-container *ngIf="evaluaterId!=evaluateeId||complete">
<td class="py-2 text-center" style="vertical-align: top">
{{kpiScoreEmp}}
</td>
<td class="py-2 text-center" style="vertical-align: top">
{{kpiScore}}
</td>
</ng-container>
<td class="py-2 text-center" style="vertical-align: top">
{{kpiGrade}}
</td>
......
src/app/components/performance-evaluation/pms-form-employee/pms-information/pms-information.component.ts
......@@ -8,6 +8,7 @@ import { Competency, Pms } from 'src/app/shared/model/competency.model';
})
export class PmsInformationComponent {
@Input() canSave = false
@Input() complete = false
@Input() statusType = ''
@Input() inforWeight: Map<string, string> = new Map<string, string>()
@Input() inforGap: Map<string, string> = new Map<string, string>()
......
src/app/components/performance-evaluation/pms-form-employee/pms-kpi/pms-kpi.component.ts
......@@ -29,6 +29,7 @@ export interface LevelStarModel {
styleUrls: ['./pms-kpi.component.scss']
})
export class PmsKpiComponent {
@Input() complete = false
@Input() canSave = false
@Input() inforWeight: Map<string, string> = new Map<string, string>()
data8List: Part8Model[] = [{
......
src/app/shared/model/competency.model.ts
......@@ -2,7 +2,7 @@ export interface CompetencyModel {
competency: Competency[]
idp: Idp
pms: Pms
statusAll: StatusAll
statusAll: string
evaluationRoundId: string
tdesc: string
edesc: string
......@@ -3872,9 +3872,3 @@ export interface StatusFrom3 {
edesc: string
tdesc: string
}
export interface StatusAll {
additionalProp1: string
additionalProp2: string
additionalProp3: string
}
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