From e0804099eeb3de9a95d074e038d24bf03fae7ceb Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Thu, 30 Jun 2022 14:16:10 -0700
Subject: [PATCH] IO-1967 Adjust display of convert to labor button.

---
 .../bill-enter-modal.container.jsx            |  2 +-
 .../job-detail-lines/job-lines.component.jsx  |  5 +--
 .../job-line-convert-to-labor.component.jsx   | 39 +++++++++++--------
 ...-allocations-adjustment-edit.component.jsx |  4 +-
 4 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
index e21cb8efd..2200809ee 100644
--- a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
+++ b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
@@ -149,7 +149,7 @@ function BillEnterModalContainer({
           jobid: values.jobid,
           operation: AuditTrailMapping.jobmodifylbradj({
             mod_lbr_ty: key,
-            hours: adjustmentsToInsert[key],
+            hours: adjustmentsToInsert[key].toFixed(1),
           }),
         });
       });
diff --git a/client/src/components/job-detail-lines/job-lines.component.jsx b/client/src/components/job-detail-lines/job-lines.component.jsx
index 8d0c3488a..de3aec81d 100644
--- a/client/src/components/job-detail-lines/job-lines.component.jsx
+++ b/client/src/components/job-detail-lines/job-lines.component.jsx
@@ -176,7 +176,7 @@ export function JobLinesComponent({
         state.sortedInfo.columnKey === "act_price" && state.sortedInfo.order,
       ellipsis: true,
       render: (text, record) => (
-        <>
+        <JobLineConvertToLabor jobline={record} job={job}>
           <CurrencyFormatter>
             {record.db_ref === "900510" || record.db_ref === "900511"
               ? record.prt_dsmk_m
@@ -189,7 +189,7 @@ export function JobLinesComponent({
           ) : (
             <></>
           )}
-        </>
+        </JobLineConvertToLabor>
       ),
     },
     {
@@ -337,7 +337,6 @@ export function JobLinesComponent({
               </Button>
             </>
           )}
-          <JobLineConvertToLabor jobline={record} job={job} />
         </Space>
       ),
     },
diff --git a/client/src/components/job-line-convert-to-labor/job-line-convert-to-labor.component.jsx b/client/src/components/job-line-convert-to-labor/job-line-convert-to-labor.component.jsx
index e4335cd04..972d5cfd9 100644
--- a/client/src/components/job-line-convert-to-labor/job-line-convert-to-labor.component.jsx
+++ b/client/src/components/job-line-convert-to-labor/job-line-convert-to-labor.component.jsx
@@ -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>
+      )}
+    </>
   );
 }
 
diff --git a/client/src/components/labor-allocations-adjustment-edit/labor-allocations-adjustment-edit.component.jsx b/client/src/components/labor-allocations-adjustment-edit/labor-allocations-adjustment-edit.component.jsx
index 982728142..5d5a56d2c 100644
--- a/client/src/components/labor-allocations-adjustment-edit/labor-allocations-adjustment-edit.component.jsx
+++ b/client/src/components/labor-allocations-adjustment-edit/labor-allocations-adjustment-edit.component.jsx
@@ -72,7 +72,9 @@ export function LaborAllocationsAdjustmentEdit({
         jobid: jobId,
         operation: AuditTrailMapping.jobmodifylbradj({
           mod_lbr_ty: values.mod_lbr_ty,
-          hours: values.hours - ((adjustments && adjustments[mod_lbr_ty]) || 0),
+          hours:
+            values.hours -
+            ((adjustments && adjustments[mod_lbr_ty]) || 0).toFixed(1),
         }),
       });
     }