浏览代码

Optional remarks for miscellaneous tasks

tags/Baseline_180220205_Frontend
Wayne 10 个月前
父节点
当前提交
a20b375dce
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. +1
    -1
      src/app/api/timesheets/utils.ts
  2. +1
    -1
      src/components/TimesheetTable/TimesheetEditModal.tsx

+ 1
- 1
src/app/api/timesheets/utils.ts 查看文件

@@ -47,7 +47,7 @@ export const validateTimeEntry = (
} else { } else {
if (entry.taskGroupId && !entry.taskId) { if (entry.taskGroupId && !entry.taskId) {
error.taskId = "Required"; error.taskId = "Required";
} else if (!entry.remark) {
} else if (!entry.taskGroupId && !entry.remark) {
error.remark = "Required for non-billable tasks"; error.remark = "Required for non-billable tasks";
} }
} }


+ 1
- 1
src/components/TimesheetTable/TimesheetEditModal.tsx 查看文件

@@ -304,7 +304,7 @@ const TimesheetEditModal: React.FC<Props> = ({
error={Boolean(formState.errors.remark)} error={Boolean(formState.errors.remark)}
{...register("remark", { {...register("remark", {
validate: (value) => validate: (value) =>
Boolean(projectId || value) ||
Boolean(projectId || taskGroupId || value) ||
t("Required for non-billable tasks"), t("Required for non-billable tasks"),
})} })}
helperText={formState.errors.remark?.message} helperText={formState.errors.remark?.message}


正在加载...
取消
保存