Skip to content

M
mySkill-x
Commit fd34e5f7 by Nattana Chaiyamat
Options

เปลี่ยนตัวเลือกจาก 7 เป็น 5

parent e5429003
Showing with 18 additions and 21 deletions
src/app/components/performance-evaluation/pms-form-employee/pms-competency/pms-competency.component.html
......@@ -144,7 +144,7 @@
</a>
</div>
</th>
<!-- <th scope="col">ประเมินตนเอง</th> -->
<th scope="col">ประเมินตนเอง</th>
</ng-container>
</tr>
</thead>
......@@ -159,7 +159,7 @@
{{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 [7,6,5,4,3,2,1];let f = first">
<ng-container *ngFor="let item of [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"
......@@ -201,9 +201,9 @@
</div>
</td>
<ng-container *ngIf="evaluaterId!=evaluateeId||complete">
<!-- <td class="py-2 text-center text-indigo-600 font-semibold" style="vertical-align: top">
<td class="py-2 text-center text-indigo-600 font-semibold" style="vertical-align: top">
{{bi.competencyBehavioral.scoreTopicExpectationBoss}}
</td> -->
</td>
</ng-container>
</tr>
</ng-container>
......@@ -228,19 +228,19 @@
<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-7">
<div class="col-span-1 text-center" *ngFor="let item of [7,6,5,4,3,2,1]">{{item}}</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>
</div>
<div class="py-2 grid grid-cols-11">
<div class="col-span-8">รวมจำนวนเครื่องหมายแต่ละช่อง (1)</div>
<div class="col-span-3 grid grid-cols-7">
<div class="col-span-1 text-center">
<div class="col-span-3 grid grid-cols-5">
<!-- <div class="col-span-1 text-center">
{{appraisalCompentencyList[appraisalCompentencyIndex].masfromEvaluationAssessment1List[0].weightScore7Boss}}
</div>
<div class="col-span-1 text-center">
{{appraisalCompentencyList[appraisalCompentencyIndex].masfromEvaluationAssessment1List[0].weightScore6Boss}}
</div>
</div> -->
<div class="col-span-1 text-center">
{{appraisalCompentencyList[appraisalCompentencyIndex].masfromEvaluationAssessment1List[0].weightScore5Boss}}
</div>
......@@ -260,9 +260,9 @@
</div>
<div class="py-2 grid grid-cols-11">
<div class="col-span-8">ตัวคูณคะแนนในแต่ละช่อง (2)</div>
<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-3 grid grid-cols-5">
<!-- <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>
......@@ -272,8 +272,8 @@
</div>
<div class="py-2 grid grid-cols-11">
<div class="col-span-8">ถ่วงน้ำหนักผลรวม 1X2</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 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>
</div>
......
src/app/components/performance-evaluation/pms-form-employee/pms-form-employee.component.html
......@@ -159,12 +159,11 @@
<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 [7,6,5,4,3,2,1]">
<div class="flex-1 text-center font-size-18px font-weight-700" *ngFor="let item of [5,4,3,2,1]">
{{item}}</div>
</div>
<div class="w-full flex flex-row gap-2">
<div *ngFor="let item of [7,6,5,4,3,2,1]"
<div *ngFor="let item of [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]}}
......@@ -235,12 +234,11 @@
<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 [7,6,5,4,3,2,1]">
<div class="flex-1 text-center font-size-18px font-weight-700" *ngFor="let item of [5,4,3,2,1]">
{{item}}</div>
</div>
<div class="w-full flex flex-row gap-2">
<div *ngFor="let item of [7,6,5,4,3,2,1]"
<div *ngFor="let item of [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]}}
......@@ -480,7 +478,6 @@
<p class="font-medium ">
{{returnField(compentency.data,apsEmp+'.thFullName')}}
</p>
</h3>
</div>
</div>
......
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