การจัดการหัวข้อการประเมินเวลาทำงาน

src/app/components/performance-management-evaluation/time-attendance/time-attendance.component.html

@@ -120,8 +120,7 @@
                                 (ngModelChange)="dataListCheck()" id="checkbox-{{item.data.pmsWorkingTimeId}}">
                         </td>
                         <td>
-                            <label
-                                for="checkbox-{{item.data.pmsWorkingTimeId}}">{{item.data.pmsWorkingTimeId}}</label>
+                            <label for="checkbox-{{item.data.pmsWorkingTimeId}}">{{item.data.pmsWorkingTimeId}}</label>
                         </td>
                         <td>{{item.data.tdesc}}</td>
                         <td>{{item.data.detailUnit}}</td>
@@ -224,7 +223,7 @@
                 </div>
             </div>
             <div class="ti-modal-body padding-16px pt-0 overflow-y-0">
-                <label class="ti-form-label mt-2rem">รหัสประเภทวัน<span class="text-danger">*</span></label>
+                <label class="ti-form-label mt-2rem">รหัส<span class="text-danger">*</span></label>
                 <input type="text" class="ti-form-input w-1/2" [ngClass]="{'bg-input-readonly':modalStatus=='edit'}"
                     [readonly]="modalStatus=='edit'" [(ngModel)]="pmsWorkingTime.select.pmsWorkingTimeId">
                 <label class="ti-form-label mt-2rem">รหัสประเภทวัน <span class="text-danger">*</span></label>
@@ -283,7 +282,12 @@
                 <label class="ti-form-label mt-2rem">ชื่อหัวข้อ (อังกฤษ)</label>
                 <input type="text" class="ti-form-input" [(ngModel)]="pmsWorkingTime.select.edesc">
                 <label class="ti-form-label mt-2rem">เป้าหมายผลงาน</label>
-                <input type="text" class="ti-form-input" [(ngModel)]="pmsWorkingTime.select.weight">
+                <input type="text" class="ti-form-input" [(ngModel)]="pmsWorkingTime.select.performanceTargets">
+                <label class="ti-form-label mt-2rem">หน่วยนับ</label>
+                <!-- <input type="text" class="ti-form-input" [(ngModel)]="pmsWorkingTime.select.detailUnit"> -->
+                <select class="ti-form-select" [(ngModel)]="pmsWorkingTime.select.detailUnit">
+                    <option *ngFor="let item of ['นาที','ชั่วโมง','วัน','ครั้ง']" [value]="item">{{item}}</option>
+                </select>
                 <label class="ti-form-label mt-2rem">น้ำหนัก</label>
                 <input type="text" class="ti-form-input"
                     oninput="this.value = this.value.replace(/[^\d.]/g, '').replace(/(\..*?)\..*/g, '$1').replace(/(\..*?)(\d{2})./g, '$1$2');"
@@ -299,9 +303,13 @@
                     <div class="col-span-1 grid grid-cols-12 gap-x-2">
                         <label class="ti-form-label  col-span-2 align-center m-0">เงื่อนไข ช่วงระหว่าง</label>
                         <input type="text" class="ti-form-input col-span-2"
+                            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)]="pmsWorkingTime.select.conditionAMin">
                         <label class="ti-form-label  col-span-1 align-center text-center m-0">ถึง</label>
                         <input type="text" class="ti-form-input col-span-2"
+                            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)]="pmsWorkingTime.select.conditionAMax">
                     </div>
                 </div>
@@ -314,9 +322,13 @@
                     <div class="col-span-1 grid grid-cols-12 gap-x-2">
                         <label class="ti-form-label  col-span-2 align-center m-0">เงื่อนไข ช่วงระหว่าง</label>
                         <input type="text" class="ti-form-input col-span-2"
+                            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)]="pmsWorkingTime.select.conditionBMin">
                         <label class="ti-form-label  col-span-1 align-center text-center m-0">ถึง</label>
                         <input type="text" class="ti-form-input col-span-2"
+                            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)]="pmsWorkingTime.select.conditionBMax">
                     </div>
                 </div>
@@ -329,9 +341,13 @@
                     <div class="col-span-1 grid grid-cols-12 gap-x-2">
                         <label class="ti-form-label  col-span-2 align-center m-0">เงื่อนไข ช่วงระหว่าง</label>
                         <input type="text" class="ti-form-input col-span-2"
+                            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)]="pmsWorkingTime.select.conditionCMin">
                         <label class="ti-form-label  col-span-1 align-center text-center m-0">ถึง</label>
                         <input type="text" class="ti-form-input col-span-2"
+                            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)]="pmsWorkingTime.select.conditionCMax">
                     </div>
                 </div>
@@ -344,9 +360,13 @@
                     <div class="col-span-1 grid grid-cols-12 gap-x-2">
                         <label class="ti-form-label  col-span-2 align-center m-0">เงื่อนไข ช่วงระหว่าง</label>
                         <input type="text" class="ti-form-input col-span-2"
+                            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)]="pmsWorkingTime.select.conditionDMin">
                         <label class="ti-form-label  col-span-1 align-center text-center m-0">ถึง</label>
                         <input type="text" class="ti-form-input col-span-2"
+                            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)]="pmsWorkingTime.select.conditionDMax">
                     </div>
                 </div>
@@ -359,9 +379,13 @@
                     <div class="col-span-1 grid grid-cols-12 gap-x-2">
                         <label class="ti-form-label  col-span-2 align-center m-0">เงื่อนไข ช่วงระหว่าง</label>
                         <input type="text" class="ti-form-input col-span-2"
+                            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)]="pmsWorkingTime.select.conditionEMin">
                         <label class="ti-form-label  col-span-1 align-center text-center m-0">ถึง</label>
                         <input type="text" class="ti-form-input col-span-2"
+                            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)]="pmsWorkingTime.select.conditionEMax">
                     </div>
                 </div>

src/app/shared/model/pms-working-time.model.ts

@@ -10,20 +10,20 @@ export interface PmsWorkingTimeModel {
     detailUnit: string
     performanceTargets: string
     targetADetail: string
-    conditionAMin: string
-    conditionAMax: string
+    conditionAMin: number
+    conditionAMax: number
     targetBDetail: string
-    conditionBMin: string
-    conditionBMax: string
+    conditionBMin: number
+    conditionBMax: number
     targetCDetail: string
-    conditionCMin: string
-    conditionCMax: string
+    conditionCMin: number
+    conditionCMax: number
     targetDDetail: string
-    conditionDMin: string
-    conditionDMax: string
+    conditionDMin: number
+    conditionDMax: number
     targetEDetail: string
-    conditionEMin: string
-    conditionEMax: string
+    conditionEMin: number
+    conditionEMax: number
     emeventgrp: EmeventgrpModel[]
 }
 
@@ -37,20 +37,20 @@ export class MyPmsWorkingTimeModel implements PmsWorkingTimeModel {
     detailUnit: string
     performanceTargets: string
     targetADetail: string
-    conditionAMin: string
-    conditionAMax: string
+    conditionAMin: number
+    conditionAMax: number
     targetBDetail: string
-    conditionBMin: string
-    conditionBMax: string
+    conditionBMin: number
+    conditionBMax: number
     targetCDetail: string
-    conditionCMin: string
-    conditionCMax: string
+    conditionCMin: number
+    conditionCMax: number
     targetDDetail: string
-    conditionDMin: string
-    conditionDMax: string
+    conditionDMin: number
+    conditionDMax: number
     targetEDetail: string
-    conditionEMin: string
-    conditionEMax: string
+    conditionEMin: number
+    conditionEMax: number
     emeventgrp: EmeventgrpModel[]
     constructor(data?: Partial<PmsWorkingTimeModel>) {
         this.pmsWorkingTimeId = data?.pmsWorkingTimeId || ""
@@ -62,20 +62,20 @@ export class MyPmsWorkingTimeModel implements PmsWorkingTimeModel {
         this.detailUnit = data?.detailUnit || ""
         this.performanceTargets = data?.performanceTargets || ""
         this.targetADetail = data?.targetADetail || ""
-        this.conditionAMin = data?.conditionAMin || ""
-        this.conditionAMax = data?.conditionAMax || ""
+        this.conditionAMin = data?.conditionAMin ?? 0
+        this.conditionAMax = data?.conditionAMax ?? 0
         this.targetBDetail = data?.targetBDetail || ""
-        this.conditionBMin = data?.conditionBMin || ""
-        this.conditionBMax = data?.conditionBMax || ""
+        this.conditionBMin = data?.conditionBMin ?? 0
+        this.conditionBMax = data?.conditionBMax ?? 0
         this.targetCDetail = data?.targetCDetail || ""
-        this.conditionCMin = data?.conditionCMin || ""
-        this.conditionCMax = data?.conditionCMax || ""
+        this.conditionCMin = data?.conditionCMin ?? 0
+        this.conditionCMax = data?.conditionCMax ?? 0
         this.targetDDetail = data?.targetDDetail || ""
-        this.conditionDMin = data?.conditionDMin || ""
-        this.conditionDMax = data?.conditionDMax || ""
+        this.conditionDMin = data?.conditionDMin ?? 0
+        this.conditionDMax = data?.conditionDMax ?? 0
         this.targetEDetail = data?.targetEDetail || ""
-        this.conditionEMin = data?.conditionEMin || ""
-        this.conditionEMax = data?.conditionEMax || ""
+        this.conditionEMin = data?.conditionEMin ?? 0
+        this.conditionEMax = data?.conditionEMax ?? 0
         this.emeventgrp = data?.emeventgrp?.map(x => new MyEmeventgrpModel(x)) || []
     }
 }