Compare commits

..

No commits in common. "d6a8040977ee36114add5876893c687620c99812" and "ca3cc590d29063bad070283b9d6fdfe7766e83e7" have entirely different histories.

2 changed files with 2 additions and 9 deletions

View File

@ -103,9 +103,6 @@ const EmpAttendance = () => {
<th className="border-top-1" colSpan={2}>
Name
</th>
<th className="border-top-1" colSpan={2}>
ProjectName
</th>
<th className="border-top-1">Date</th>
<th>
<i className="bx bxs-down-arrow-alt text-success"></i>{" "}
@ -121,7 +118,7 @@ const EmpAttendance = () => {
<tbody>
{currentItems?.map((attendance, index) => (
<tr key={index}>
<td colSpan={3}>
<td colSpan={2}>
<div className="d-flex justify-content-start align-items-center">
<Avatar
firstName={attendance.firstName}
@ -136,7 +133,6 @@ const EmpAttendance = () => {
</div>
</div>
</td>
<td>{attendance.projectName}</td>
<td>
{" "}
{moment(attendance.checkInTime).format("DD-MMM-YYYY")}

View File

@ -17,7 +17,7 @@ const taskSchema = z
.object({
activityID: z.string().min(1, "Activity is required"),
workCategoryId: z.string().min(1, "Work Category is required"),
plannedWork: z.number().min(0.01, "Planned Work must be greater than 0"),
plannedWork: z.number().min(1, "Planned Work must be greater than 0"),
completedWork: z.number().min(0, "Completed Work must be ≥ 0"),
comment: z.string(),
})
@ -107,7 +107,6 @@ const EditActivityModal = ({
const onSubmitForm = (data) => {
const payload = {
...data,
plannedWork: Number(data.plannedWork.toFixed(2)),
id: workItem?.workItem?.id ?? workItem?.id,
buildingID: building?.id,
floorId: floor?.id,
@ -221,10 +220,8 @@ const EditActivityModal = ({
<input
{...register("plannedWork", { valueAsNumber: true })}
type="number"
step="0.01" // <-- allows 2 decimal places
className="form-control form-control-sm"
/>
{errors.plannedWork && (
<p className="danger-text">{errors.plannedWork.message}</p>
)}