IO-1972 Converted to labor display.

client/src/components/job-line-convert-to-labor/job-line-convert-to-labor.component.jsx

@@ -66,10 +66,8 @@ export function JobLineConvertToLabor({
     const newAdjustments = _.cloneDeep(
       existingAdjustments.data.jobs_by_pk.lbr_adjustments
     );
-
+    const adjustment = calculateAdjustment({ mod_lbr_ty, job, jobline });
-    newAdjustments[mod_lbr_ty] =
+    newAdjustments[mod_lbr_ty] = (newAdjustments[mod_lbr_ty] || 0) + adjustment;
-      (newAdjustments[mod_lbr_ty] || 0) +
-      calculateAdjustment({ mod_lbr_ty, job, jobline });
 
     const jobUpdate = client.mutate({
       mutation: UPDATE_JOB,
@@ -83,7 +81,13 @@ export function JobLineConvertToLabor({
       mutation: UPDATE_JOB_LINE,
       variables: {
         lineId: jobline.id,
-        line: { convertedtolbr: true },
+        line: {
+          convertedtolbr: true,
+          convertedtolbr_data: {
+            mod_lbr_ty: mod_lbr_ty,
+            mod_lb_hrs: adjustment,
+          },
+        },
       },
     });
 

client/src/graphql/jobs-lines.queries.js

@@ -178,6 +178,7 @@ export const UPDATE_JOB_LINE = gql`
         status
         removed
         convertedtolbr
+        convertedtolbr_data
       }
     }
   }

client/src/graphql/jobs.queries.js

@@ -1907,6 +1907,7 @@ export const QUERY_JOB_CLOSE_DETAILS = gql`
         profitcenter_part
         prt_dsmk_p
         convertedtolbr
+        convertedtolbr_data
       }
     }
   }

hasura/metadata/tables.yaml

@@ -2385,6 +2385,7 @@
           - bett_type
           - cert_part
           - convertedtolbr
+          - convertedtolbr_data
           - created_at
           - db_hrs
           - db_price
@@ -2449,6 +2450,7 @@
           - bett_type
           - cert_part
           - convertedtolbr
+          - convertedtolbr_data
           - created_at
           - db_hrs
           - db_price
@@ -2524,6 +2526,7 @@
           - bett_type
           - cert_part
           - convertedtolbr
+          - convertedtolbr_data
           - created_at
           - db_hrs
           - db_price

hasura/migrations/1658168648531_alter_table_public_joblines_add_column_convertedtolbr_data/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."joblines" add column "convertedtolbr_data" jsonb
+--  not null default jsonb_build_object();

hasura/migrations/1658168648531_alter_table_public_joblines_add_column_convertedtolbr_data/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."joblines" add column "convertedtolbr_data" jsonb
+ not null default jsonb_build_object();