Commit 2fba97ee by Nattana Chaiyamat

competenc ปรับคะแนน 1-7

parent d5958642
......@@ -58,6 +58,8 @@
<!-- กำหนดให้คอลัมน์ "คะแนน" กว้างกว่า -->
<th class="text-base font-bold" style=" width: 23%;height: 40px;">
{{'Score' | translate}}</th>
<th>7</th>
<th>6</th>
<th>5</th>
<th>4</th>
<th>3</th>
......@@ -70,6 +72,10 @@
<td class="text-base font-bold" style="height: 70px;">
{{'Pass' | translate}}<br>{{'NoGAP' | translate}}
</td>
<td><input type="radio" id="idp-radio5" name="score" [value]="7"
[(ngModel)]="idpData.score"></td>
<td><input type="radio" id="idp-radio5" name="score" [value]="6"
[(ngModel)]="idpData.score"></td>
<td><input type="radio" id="idp-radio5" name="score" [value]="5"
[(ngModel)]="idpData.score"></td>
<td><input type="radio" id="idp-radio4" name="score" [value]="4"
......
......@@ -90,6 +90,8 @@
<thead>
<tr>
<th>{{'Score'| translate}}</th>
<th class="text-center">7</th>
<th class="text-center">6</th>
<th class="text-center">5</th>
<th class="text-center">4</th>
<th class="text-center">3</th>
......@@ -103,6 +105,14 @@
<td> <input type="text" class="ti-form-input"
oninput="this.value = this.value.replace(/[^\d.]/g, '').replace(/(\..*?)\..*/g, '$1').replace(/(\..*?)(\d{2})./g, '$1$2');"
onchange="this.value = this.value.replace('', '0');this.value = parseFloat(this.value).toFixed(2)"
[(ngModel)]="setting.data.settingScore7"></td>
<td> <input type="text" class="ti-form-input"
oninput="this.value = this.value.replace(/[^\d.]/g, '').replace(/(\..*?)\..*/g, '$1').replace(/(\..*?)(\d{2})./g, '$1$2');"
onchange="this.value = this.value.replace('', '0');this.value = parseFloat(this.value).toFixed(2)"
[(ngModel)]="setting.data.settingScore6"></td>
<td> <input type="text" class="ti-form-input"
oninput="this.value = this.value.replace(/[^\d.]/g, '').replace(/(\..*?)\..*/g, '$1').replace(/(\..*?)(\d{2})./g, '$1$2');"
onchange="this.value = this.value.replace('', '0');this.value = parseFloat(this.value).toFixed(2)"
[(ngModel)]="setting.data.settingScore5"></td>
<td> <input type="text" class="ti-form-input"
oninput="this.value = this.value.replace(/[^\d.]/g, '').replace(/(\..*?)\..*/g, '$1').replace(/(\..*?)(\d{2})./g, '$1$2');"
......
......@@ -43,10 +43,10 @@ export class FormValidationsComponent {
Submit() {
if (this.customForm.valid) {
// Form is valid, handle the form submission here
console.log('Form submitted successfully!');
// console.log('Form submitted successfully!');
} else {
// Form is invalid, display error messages or handle accordingly
console.log('Form is invalid!');
// console.log('Form is invalid!');
}
}
}
......@@ -143,14 +143,15 @@
{{bi.assessmentId}}</td>
<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 *ngFor="let item of [7,6,5,4,3,2,1];let f = first">
<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"
(mouseenter)="biScore.set(bi.behavioralIndicators+bi.assessmentId,item)"
(mouseleave)="biScore.clear()"
(click)="bi.competencyBehavioral.scoreTopicExpectation=item;bi.competencyBehavioral.scoreTopicExpectationBoss=item;calnumberCheck()" [ngClass]="{
(click)="bi.competencyBehavioral.scoreTopicExpectation=item;bi.competencyBehavioral.scoreTopicExpectationBoss=item;calweightScore()"
[ngClass]="{
'!border-secondary': bi.competencyBehavioral.scoreTopicExpectation>=item||(biScore.get(bi.behavioralIndicators+bi.assessmentId) ?? 0)>=item ,
'!text-indigo-600':bi.competencyBehavioral.scoreTopicExpectation>item||(biScore.get(bi.behavioralIndicators+bi.assessmentId) ?? 0)>item,
'!text-white !bg-secondary': bi.competencyBehavioral.scoreTopicExpectation==item||(biScore.get(bi.behavioralIndicators+bi.assessmentId) ?? 0)==item ,
......@@ -164,8 +165,7 @@
style="border-radius:10px"
(mouseenter)="biScore.set(bi.behavioralIndicators+bi.assessmentId,item)"
(mouseleave)="biScore.clear()"
(click)="bi.competencyBehavioral.scoreTopicExpectationBoss=item;calnumberCheck()"
[ngClass]="{
(click)="bi.competencyBehavioral.scoreTopicExpectationBoss=item;calweightScore()" [ngClass]="{
'!border-secondary': bi.competencyBehavioral.scoreTopicExpectationBoss>=item||(biScore.get(bi.behavioralIndicators+bi.assessmentId) ?? 0)>=item ,
'!text-indigo-600':bi.competencyBehavioral.scoreTopicExpectationBoss>item||(biScore.get(bi.behavioralIndicators+bi.assessmentId) ?? 0)>item,
'!text-white !bg-secondary': bi.competencyBehavioral.scoreTopicExpectationBoss==item||(biScore.get(bi.behavioralIndicators+bi.assessmentId) ?? 0)==item ,
......@@ -212,33 +212,41 @@
<div class="py-2 grid grid-cols-11">
<div class="col-span-8" style="font-size: 1rem;font-weight: 500; border-radius:20px">ระดับความสามารถ (Target
Degree)</div>
<div class="col-span-3 grid grid-cols-5">
<div class="col-span-1 text-center" *ngFor="let item of [5,4,3,2,1]">{{item}}</div>
<div class="col-span-3 grid grid-cols-7">
<div class="col-span-1 text-center" *ngFor="let item of [7,6,5,4,3,2,1]">{{item}}</div>
</div>
</div>
<div class="py-2 grid grid-cols-11">
<div class="col-span-8">รวมจำนวนเครื่องหมายแต่ละช่อง (1)</div>
<div class="col-span-3 grid grid-cols-5">
<div class="col-span-3 grid grid-cols-7">
<div class="col-span-1 text-center">
{{appraisalCompentencyList[appraisalCompentencyIndex].masfromEvaluationAssessment1List[0].weightScore7Boss}}
</div>
<div class="col-span-1 text-center">
{{appraisalCompentencyList[appraisalCompentencyIndex].masfromEvaluationAssessment1List[0].numberCheck5Boss}}
{{appraisalCompentencyList[appraisalCompentencyIndex].masfromEvaluationAssessment1List[0].weightScore6Boss}}
</div>
<div class="col-span-1 text-center">
{{appraisalCompentencyList[appraisalCompentencyIndex].masfromEvaluationAssessment1List[0].numberCheck4Boss}}
{{appraisalCompentencyList[appraisalCompentencyIndex].masfromEvaluationAssessment1List[0].weightScore5Boss}}
</div>
<div class="col-span-1 text-center">
{{appraisalCompentencyList[appraisalCompentencyIndex].masfromEvaluationAssessment1List[0].numberCheck3Boss}}
{{appraisalCompentencyList[appraisalCompentencyIndex].masfromEvaluationAssessment1List[0].weightScore4Boss}}
</div>
<div class="col-span-1 text-center">
{{appraisalCompentencyList[appraisalCompentencyIndex].masfromEvaluationAssessment1List[0].numberCheck2Boss}}
{{appraisalCompentencyList[appraisalCompentencyIndex].masfromEvaluationAssessment1List[0].weightScore3Boss}}
</div>
<div class="col-span-1 text-center">
{{appraisalCompentencyList[appraisalCompentencyIndex].masfromEvaluationAssessment1List[0].numberCheck1Boss}}
{{appraisalCompentencyList[appraisalCompentencyIndex].masfromEvaluationAssessment1List[0].weightScore2Boss}}
</div>
<div class="col-span-1 text-center">
{{appraisalCompentencyList[appraisalCompentencyIndex].masfromEvaluationAssessment1List[0].weightScore1Boss}}
</div>
</div>
</div>
<div class="py-2 grid grid-cols-11">
<div class="col-span-8">ตัวคูณคะแนนในแต่ละช่อง (2)</div>
<div class="col-span-3 grid grid-cols-5">
<div class="col-span-3 grid grid-cols-7">
<div class="col-span-1 text-center">{{setting.data.settingScore7}}</div>
<div class="col-span-1 text-center">{{setting.data.settingScore6}}</div>
<div class="col-span-1 text-center">{{setting.data.settingScore5}}</div>
<div class="col-span-1 text-center">{{setting.data.settingScore4}}</div>
<div class="col-span-1 text-center">{{setting.data.settingScore3}}</div>
......@@ -248,14 +256,15 @@
</div>
<div class="py-2 grid grid-cols-11">
<div class="col-span-8">ถ่วงน้ำหนักผลรวม 1X2</div>
<div class="col-span-3 grid grid-cols-5">
<div class="col-span-1 text-center" *ngFor="let item of [5,4,3,2,1]">{{calWeightScoreBoss(item)}}</div>
<div class="col-span-3 grid grid-cols-7">
<div class="col-span-1 text-center" *ngFor="let item of [7,6,5,4,3,2,1]">{{calWeightScoreBoss(item)}}
</div>
</div>
</div>
<div class="py-2 grid grid-cols-11">
<div class="col-span-8 font-semibold" style=" border-radius:20px">คะแนนรวมหลังถ่วงน้ำหนัก
</div>
<div class="col-span-3 grid grid-cols-5">
<div class="col-span-3 grid grid-cols-1">
<div class="col-span-5 text-center text-indigo-600 font-semibold">
{{showNumber(appraisalCompentencyList[appraisalCompentencyIndex].masfromEvaluationAssessment1List[0].weightedTotalBoss)}}
</div>
......@@ -264,7 +273,7 @@
<div class="py-2 grid grid-cols-11">
<div class="col-span-8 font-semibold" style=" border-radius:20px">คะแนนเฉลี่ยคิดเป็น
</div>
<div class="col-span-3 grid grid-cols-5">
<div class="col-span-3 grid grid-cols-1">
<div class="col-span-5 text-center text-indigo-600 font-semibold">
{{showNumber(appraisalCompentencyList[appraisalCompentencyIndex].masfromEvaluationAssessment1List[0].averageScoreBoss)}}
</div>
......
......@@ -159,11 +159,12 @@
<div class="w-full flex flex-col gap-2" *ngIf="compentency.data">
<div class="w-full flex flex-col gap-2 mt-2">
<div class="w-full flex flex-row gap-2">
<div class="flex-1 text-center font-size-18px font-weight-700" *ngFor="let item of [5,4,3,2,1]">
<div class="flex-1 text-center font-size-18px font-weight-700"
*ngFor="let item of [7,6,5,4,3,2,1]">
{{item}}</div>
</div>
<div class="w-full flex flex-row gap-2">
<div *ngFor="let item of [5,4,3,2,1]"
<div *ngFor="let item of [7,6,5,4,3,2,1]"
class="flex-1 border border-secondary text-center align-center"
style="border-radius:10px;--tw-bg-opacity: 1; background-color: rgb(255 255 255 / var(--tw-bg-opacity));height: 30px;">
{{compentencyScoreBoss[item-1]}}
......@@ -173,6 +174,16 @@
<div class="w-full mt-2 flex justify-center">
<div class="flex flex-row gap-2 w-full">
<div class="flex-1 font-size-18px font-weight-700 text-right align-center">
คะแนนรวม
</div>
<div class="flex-1 flex justify-center items-center">
<div
class="w-full border border-secondary text-center align-center text-indigo-600 font-semibold"
style="border-radius:10px;--tw-bg-opacity: 1; background-color: rgb(255 255 255 / var(--tw-bg-opacity));height: 30px;">
{{compentencyWeightTotalBoss}}
</div>
</div>
<div class="flex-1 font-size-18px font-weight-700 text-right align-center">
คะแนนเฉลี่ย
</div>
<div class="flex-1 flex justify-center items-center">
......@@ -224,11 +235,12 @@
<div class="w-full flex flex-col gap-2" *ngIf="compentency.data">
<div class="w-full flex flex-col gap-2 mt-2">
<div class="w-full flex flex-row gap-2">
<div class="flex-1 text-center font-size-18px font-weight-700" *ngFor="let item of [5,4,3,2,1]">
<div class="flex-1 text-center font-size-18px font-weight-700"
*ngFor="let item of [7,6,5,4,3,2,1]">
{{item}}</div>
</div>
<div class="w-full flex flex-row gap-2">
<div *ngFor="let item of [5,4,3,2,1]"
<div *ngFor="let item of [7,6,5,4,3,2,1]"
class="flex-1 border border-secondary text-center align-center"
style="border-radius:10px;--tw-bg-opacity: 1; background-color: rgb(255 255 255 / var(--tw-bg-opacity));height: 30px;">
{{compentencyScore[item-1]}}
......@@ -238,6 +250,16 @@
<div class="w-full mt-2 flex justify-center">
<div class="flex flex-row gap-2 w-full">
<div class="flex-1 font-size-18px font-weight-700 text-right align-center">
คะแนนรวม
</div>
<div class="flex-1 flex justify-center items-center">
<div
class="w-full border border-secondary text-center align-center text-indigo-600 font-semibold"
style="border-radius:10px;--tw-bg-opacity: 1; background-color: rgb(255 255 255 / var(--tw-bg-opacity));height: 30px;">
{{compentencyWeightTotal}}
</div>
</div>
<div class="flex-1 font-size-18px font-weight-700 text-right align-center">
คะแนนเฉลี่ย
</div>
<div class="flex-1 flex justify-center items-center">
......@@ -594,6 +616,8 @@
[evaluateeId]="evaluateeId" [canEdit]="canEdit" [currentStep]="compentency.data.currentStep"
[dateIso]="dateIso" (compentencyScoreBoss)="compentencyScoreBoss=$event"
(compentencyScore)="compentencyScore=$event"
(compentencyWeightTotalBoss)="compentencyWeightTotalBoss=$event"
(compentencyWeightTotal)="compentencyWeightTotal=$event"
(compentencyWeightScoreBoss)="compentencyWeightScoreBoss=$event"
(compentencyGapBoss)="compentencyGapBoss=$event"
(compentencyWeightScore)="compentencyWeightScore=$event" (compentencyGap)="compentencyGap=$event"
......
......@@ -54,8 +54,10 @@ export class PmsFormEmployeeComponent {
compentencyScoreBoss: String[] = []
compentencyWeightScoreBoss = ""
compentencyWeightTotalBoss = ""
compentencyGapBoss = ""
compentencyScore: String[] = []
compentencyWeightTotal = ""
compentencyWeightScore = ""
compentencyGap = ""
......@@ -565,8 +567,8 @@ export class PmsFormEmployeeComponent {
return isNaN(num) ? 0 : +(+num.toFixed(2));
}
calWeightScore(numberCheck: number) {
switch (numberCheck) {
calWeightScore(weightScore: number) {
switch (weightScore) {
case (1): {
return 1
}
......@@ -601,11 +603,11 @@ export class PmsFormEmployeeComponent {
'!competency[].masfromEvaluationAssessment1List[].apsapprove3Date',
'!competency[].masfromEvaluationAssessment1List[].apsapprove4Date',
'!competency[].masfromEvaluationAssessment1List[].apsapprove5Date',
'!competency[].masfromEvaluationAssessment1List[].numberCheck1',
'!competency[].masfromEvaluationAssessment1List[].numberCheck2',
'!competency[].masfromEvaluationAssessment1List[].numberCheck3',
'!competency[].masfromEvaluationAssessment1List[].numberCheck4',
'!competency[].masfromEvaluationAssessment1List[].numberCheck5',
'!competency[].masfromEvaluationAssessment1List[].weightScore1',
'!competency[].masfromEvaluationAssessment1List[].weightScore2',
'!competency[].masfromEvaluationAssessment1List[].weightScore3',
'!competency[].masfromEvaluationAssessment1List[].weightScore4',
'!competency[].masfromEvaluationAssessment1List[].weightScore5',
'!competency[].masfromEvaluationAssessment1List[].weightedTotal',
'!competency[].masfromEvaluationAssessment1List[].averageScore',
'pms',
......
......@@ -157,7 +157,7 @@ export class SidebarComponent {
(this.previousUrl.includes('/ess') && this.currentUrl.includes('/admin')) ||
(this.previousUrl.includes('/admin') && this.currentUrl.includes('/ess'))
) {
console.log('URL changed between /installer and /admin.');
// console.log('URL changed between /installer and /admin.');
// Implement any logic needed when changing between /installer and /admin
}
......
......@@ -687,11 +687,11 @@ export interface MasfromEvaluationAssessment1 {
apsapprove3Status: string
apsapprove4Status: string
apsapprove5Status: string
numberCheck1: number
numberCheck2: number
numberCheck3: number
numberCheck4: number
numberCheck5: number
weightScore1: number
weightScore2: number
weightScore3: number
weightScore4: number
weightScore5: number
weightedTotal: number
averageScore: number
apsassessyComment: string
......@@ -1422,11 +1422,11 @@ export interface masfromEvaluationAssessment1List {
apsapprove3Status: string
apsapprove4Status: string
apsapprove5Status: string
numberCheck1: number
numberCheck2: number
numberCheck3: number
numberCheck4: number
numberCheck5: number
weightScore1: number
weightScore2: number
weightScore3: number
weightScore4: number
weightScore5: number
weightedTotal: number
averageScore: number
apsassessyComment: string
......
......@@ -15,11 +15,11 @@ export interface AppraisalFormModel {
apsapprove3Status: string
apsapprove4Status: string
apsapprove5Status: string
numberCheck1: number
numberCheck2: number
numberCheck3: number
numberCheck4: number
numberCheck5: number
weightScore1: number
weightScore2: number
weightScore3: number
weightScore4: number
weightScore5: number
weightedTotal: number
averageScore: number
apsassessyComment: string
......@@ -51,11 +51,11 @@ export class MyAppraisalFormModel implements AppraisalFormModel {
apsapprove3Status: string
apsapprove4Status: string
apsapprove5Status: string
numberCheck1: number
numberCheck2: number
numberCheck3: number
numberCheck4: number
numberCheck5: number
weightScore1: number
weightScore2: number
weightScore3: number
weightScore4: number
weightScore5: number
weightedTotal: number
averageScore: number
apsassessyComment: string
......@@ -86,11 +86,11 @@ export class MyAppraisalFormModel implements AppraisalFormModel {
this.apsapprove3Status = data?.apsapprove3Status || ""
this.apsapprove4Status = data?.apsapprove4Status || ""
this.apsapprove5Status = data?.apsapprove5Status || ""
this.numberCheck1 = data?.numberCheck1 ?? 0
this.numberCheck2 = data?.numberCheck2 ?? 0
this.numberCheck3 = data?.numberCheck3 ?? 0
this.numberCheck4 = data?.numberCheck4 ?? 0
this.numberCheck5 = data?.numberCheck5 ?? 0
this.weightScore1 = data?.weightScore1 ?? 0
this.weightScore2 = data?.weightScore2 ?? 0
this.weightScore3 = data?.weightScore3 ?? 0
this.weightScore4 = data?.weightScore4 ?? 0
this.weightScore5 = data?.weightScore5 ?? 0
this.weightedTotal = data?.weightedTotal ?? 0
this.averageScore = data?.averageScore ?? 0
this.apsassessyComment = data?.apsassessyComment || ""
......
......@@ -1046,11 +1046,11 @@ export interface Part4Detail {
apsapprove3Status: string
apsapprove4Status: string
apsapprove5Status: string
numberCheck1: number
numberCheck2: number
numberCheck3: number
numberCheck4: number
numberCheck5: number
weightScore1: number
weightScore2: number
weightScore3: number
weightScore4: number
weightScore5: number
weightedTotal: number
averageScore: number
apsassessyComment: string
......
......@@ -719,16 +719,20 @@ export interface masfromEvaluationAssessment1List {
competencyType: CompetencyType
evaluationResults: string
lineNo: number
numberCheck1Boss: number
numberCheck2Boss: number
numberCheck3Boss: number
numberCheck4Boss: number
numberCheck5Boss: number
numberCheck1: number
numberCheck2: number
numberCheck3: number
numberCheck4: number
numberCheck5: number
weightScore1Boss: number
weightScore2Boss: number
weightScore3Boss: number
weightScore4Boss: number
weightScore5Boss: number
weightScore6Boss: number
weightScore7Boss: number
weightScore1: number
weightScore2: number
weightScore3: number
weightScore4: number
weightScore5: number
weightScore6: number
weightScore7: number
plId: string
sumEvaluationResults: string
weightedTotalBoss: number
......@@ -2543,11 +2547,11 @@ export interface MasfromEvaluationAssessment1 {
lastStep: string
lineNo: number
masfromStatusType: MasfromStatusType2
numberCheck1: number
numberCheck2: number
numberCheck3: number
numberCheck4: number
numberCheck5: number
weightScore1: number
weightScore2: number
weightScore3: number
weightScore4: number
weightScore5: number
plId: string
sumEvaluationResults: string
weightedTotal: number
......@@ -3679,11 +3683,11 @@ export interface Part4Detail {
lastStep: string
lineNo: number
masfromStatusType: MasfromStatusType5
numberCheck1: number
numberCheck2: number
numberCheck3: number
numberCheck4: number
numberCheck5: number
weightScore1: number
weightScore2: number
weightScore3: number
weightScore4: number
weightScore5: number
plId: string
sumEvaluationResults: string
weightedTotal: number
......
......@@ -690,11 +690,11 @@ import { masfromEvaluationAssessment1List } from "./pms-masfrom-evaluation-list.
apsapprove3Status: string
apsapprove4Status: string
apsapprove5Status: string
numberCheck1: number
numberCheck2: number
numberCheck3: number
numberCheck4: number
numberCheck5: number
weightScore1: number
weightScore2: number
weightScore3: number
weightScore4: number
weightScore5: number
weightedTotal: number
averageScore: number
apsassessyComment: string
......@@ -747,11 +747,11 @@ import { masfromEvaluationAssessment1List } from "./pms-masfrom-evaluation-list.
apsapprove3Status: string
apsapprove4Status: string
apsapprove5Status: string
numberCheck1: number
numberCheck2: number
numberCheck3: number
numberCheck4: number
numberCheck5: number
weightScore1: number
weightScore2: number
weightScore3: number
weightScore4: number
weightScore5: number
weightedTotal: number
averageScore: number
apsassessyComment: string
......
......@@ -1419,11 +1419,11 @@ export interface MasfromEvaluationAssessment1 {
apsapprove3Status: string
apsapprove4Status: string
apsapprove5Status: string
numberCheck1: number
numberCheck2: number
numberCheck3: number
numberCheck4: number
numberCheck5: number
weightScore1: number
weightScore2: number
weightScore3: number
weightScore4: number
weightScore5: number
weightedTotal: number
averageScore: number
apsassessyComment: string
......
......@@ -3,6 +3,8 @@ export interface SettingAssessmentModel {
companyId: string;
expectationLevel: number;
settingGroupAssessment: string;
settingScore7: number;
settingScore6: number;
settingScore5: number;
settingScore4: number;
settingScore3: number;
......@@ -16,6 +18,8 @@ export class MySettingAssessmentModel implements SettingAssessmentModel {
companyId: string;
expectationLevel: number;
settingGroupAssessment: string;
settingScore7: number;
settingScore6: number;
settingScore5: number;
settingScore4: number;
settingScore3: number;
......@@ -27,6 +31,8 @@ export class MySettingAssessmentModel implements SettingAssessmentModel {
this.companyId = data?.companyId || "";
this.expectationLevel = data?.expectationLevel ?? 0;
this.settingGroupAssessment = data?.settingGroupAssessment || "";
this.settingScore7 = data?.settingScore7 ?? 0;
this.settingScore6 = data?.settingScore6 ?? 0;
this.settingScore5 = data?.settingScore5 ?? 0;
this.settingScore4 = data?.settingScore4 ?? 0;
this.settingScore3 = data?.settingScore3 ?? 0;
......
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