IO-1967 Adjust display of convert to labor button.

This commit is contained in:
Patrick Fic
2022-06-30 14:16:10 -07:00
parent ece0946738
commit e0804099ee
4 changed files with 29 additions and 21 deletions

View File

@@ -37,6 +37,7 @@ export default connect(
)(JobLineConvertToLabor);
export function JobLineConvertToLabor({
children,
jobline,
job,
insertAuditTrail,
@@ -105,7 +106,7 @@ export function JobLineConvertToLabor({
insertAuditTrail({
jobid: job.id,
operation: AuditTrailMapping.jobmodifylbradj({
hours: calculateAdjustment({ mod_lbr_ty, job, jobline }),
hours: calculateAdjustment({ mod_lbr_ty, job, jobline }).toFixed(1),
mod_lbr_ty,
}),
});
@@ -214,23 +215,29 @@ export function JobLineConvertToLabor({
};
return (
<Popover
disabled={jobline.convertedtolbr}
content={overlay}
visible={visibility}
placement="bottom"
>
<Tooltip title={t("joblines.actions.converttolabor")}>
<Button
<>
{children}
{jobline.act_price !== 0 && (
<Popover
disabled={jobline.convertedtolbr}
loading={loading}
onClick={handleClick}
{...otherBtnProps}
content={overlay}
visible={visibility}
placement="bottom"
>
<ClockCircleOutlined />
</Button>
</Tooltip>
</Popover>
<Tooltip title={t("joblines.actions.converttolabor")}>
<Button
type="link"
disabled={jobline.convertedtolbr}
loading={loading}
onClick={handleClick}
{...otherBtnProps}
>
<ClockCircleOutlined />
</Button>
</Tooltip>
</Popover>
)}
</>
);
}