diff --git a/electron/decoder/decoder.js b/electron/decoder/decoder.js index a8e9882..57cb95c 100644 --- a/electron/decoder/decoder.js +++ b/electron/decoder/decoder.js @@ -330,7 +330,7 @@ async function DecodeLinFile(extensionlessFilePath, close_date) { "DB_HRS", "MOD_LB_HRS", "LBR_INC", - // "LBR_OP", + "LBR_OP", "LBR_HRS_J", // "LBR_TYP_J", // "LBR_OP_J", @@ -382,14 +382,6 @@ async function DecodeLinFile(extensionlessFilePath, close_date) { jobline.alerts = claimsClerk({ jobline, joblines }); - //Moved from V1 function as they may be needed later. - delete jobline.lbr_inc; - delete jobline.lbr_hrs_j; - delete jobline.prt_dsmk_m; //Delete price markup for wheel repair - delete jobline.prt_dsmk_p; - delete jobline.glass_flag; - delete jobline.price_j; - delete jobline.line_ref; return jobline; }); diff --git a/hasura/metadata/databases/default/tables/public_joblines.yaml b/hasura/metadata/databases/default/tables/public_joblines.yaml index 552095d..9da63d9 100644 --- a/hasura/metadata/databases/default/tables/public_joblines.yaml +++ b/hasura/metadata/databases/default/tables/public_joblines.yaml @@ -22,13 +22,18 @@ insert_permissions: - db_hrs - db_price - db_ref + - glass_flag - id - ignore - jobid - lbr_amt + - lbr_hrs_j + - lbr_inc + - lbr_op - line_desc - line_ind - line_no + - line_ref - misc_amt - mod_lb_hrs - mod_lbr_ty @@ -37,6 +42,9 @@ insert_permissions: - part_type - price_diff - price_diff_pc + - price_j + - prt_dsmk_m + - prt_dsmk_p - unq_seq - updated_at select_permissions: @@ -49,13 +57,18 @@ select_permissions: - db_hrs - db_price - db_ref + - glass_flag - id - ignore - jobid - lbr_amt + - lbr_hrs_j + - lbr_inc + - lbr_op - line_desc - line_ind - line_no + - line_ref - misc_amt - mod_lb_hrs - mod_lbr_ty @@ -64,6 +77,9 @@ select_permissions: - part_type - price_diff - price_diff_pc + - price_j + - prt_dsmk_m + - prt_dsmk_p - unq_seq - updated_at filter: @@ -83,13 +99,18 @@ update_permissions: - db_hrs - db_price - db_ref + - glass_flag - id - ignore - jobid - lbr_amt + - lbr_hrs_j + - lbr_inc + - lbr_op - line_desc - line_ind - line_no + - line_ref - misc_amt - mod_lb_hrs - mod_lbr_ty @@ -98,6 +119,9 @@ update_permissions: - part_type - price_diff - price_diff_pc + - price_j + - prt_dsmk_m + - prt_dsmk_p - unq_seq - updated_at filter: diff --git a/hasura/migrations/default/1741365200075_alter_table_public_joblines_add_column_lbr_inc/down.sql b/hasura/migrations/default/1741365200075_alter_table_public_joblines_add_column_lbr_inc/down.sql new file mode 100644 index 0000000..8d83d4d --- /dev/null +++ b/hasura/migrations/default/1741365200075_alter_table_public_joblines_add_column_lbr_inc/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 "lbr_inc" boolean +-- null; diff --git a/hasura/migrations/default/1741365200075_alter_table_public_joblines_add_column_lbr_inc/up.sql b/hasura/migrations/default/1741365200075_alter_table_public_joblines_add_column_lbr_inc/up.sql new file mode 100644 index 0000000..09d0ff8 --- /dev/null +++ b/hasura/migrations/default/1741365200075_alter_table_public_joblines_add_column_lbr_inc/up.sql @@ -0,0 +1,2 @@ +alter table "public"."joblines" add column "lbr_inc" boolean + null; diff --git a/hasura/migrations/default/1741365213554_alter_table_public_joblines_add_column_lbr_hrs_j/down.sql b/hasura/migrations/default/1741365213554_alter_table_public_joblines_add_column_lbr_hrs_j/down.sql new file mode 100644 index 0000000..b6cea98 --- /dev/null +++ b/hasura/migrations/default/1741365213554_alter_table_public_joblines_add_column_lbr_hrs_j/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 "lbr_hrs_j" boolean +-- null; diff --git a/hasura/migrations/default/1741365213554_alter_table_public_joblines_add_column_lbr_hrs_j/up.sql b/hasura/migrations/default/1741365213554_alter_table_public_joblines_add_column_lbr_hrs_j/up.sql new file mode 100644 index 0000000..d37992d --- /dev/null +++ b/hasura/migrations/default/1741365213554_alter_table_public_joblines_add_column_lbr_hrs_j/up.sql @@ -0,0 +1,2 @@ +alter table "public"."joblines" add column "lbr_hrs_j" boolean + null; diff --git a/hasura/migrations/default/1741365228467_alter_table_public_joblines_add_column_prt_dsmk_m/down.sql b/hasura/migrations/default/1741365228467_alter_table_public_joblines_add_column_prt_dsmk_m/down.sql new file mode 100644 index 0000000..a9a18b8 --- /dev/null +++ b/hasura/migrations/default/1741365228467_alter_table_public_joblines_add_column_prt_dsmk_m/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 "prt_dsmk_m" numeric +-- null; diff --git a/hasura/migrations/default/1741365228467_alter_table_public_joblines_add_column_prt_dsmk_m/up.sql b/hasura/migrations/default/1741365228467_alter_table_public_joblines_add_column_prt_dsmk_m/up.sql new file mode 100644 index 0000000..f330f9c --- /dev/null +++ b/hasura/migrations/default/1741365228467_alter_table_public_joblines_add_column_prt_dsmk_m/up.sql @@ -0,0 +1,2 @@ +alter table "public"."joblines" add column "prt_dsmk_m" numeric + null; diff --git a/hasura/migrations/default/1741365241229_alter_table_public_joblines_add_column_prt_dsmk_p/down.sql b/hasura/migrations/default/1741365241229_alter_table_public_joblines_add_column_prt_dsmk_p/down.sql new file mode 100644 index 0000000..421fa59 --- /dev/null +++ b/hasura/migrations/default/1741365241229_alter_table_public_joblines_add_column_prt_dsmk_p/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 "prt_dsmk_p" numeric +-- null; diff --git a/hasura/migrations/default/1741365241229_alter_table_public_joblines_add_column_prt_dsmk_p/up.sql b/hasura/migrations/default/1741365241229_alter_table_public_joblines_add_column_prt_dsmk_p/up.sql new file mode 100644 index 0000000..b051e18 --- /dev/null +++ b/hasura/migrations/default/1741365241229_alter_table_public_joblines_add_column_prt_dsmk_p/up.sql @@ -0,0 +1,2 @@ +alter table "public"."joblines" add column "prt_dsmk_p" numeric + null; diff --git a/hasura/migrations/default/1741365258341_alter_table_public_joblines_add_column_glass_flag/down.sql b/hasura/migrations/default/1741365258341_alter_table_public_joblines_add_column_glass_flag/down.sql new file mode 100644 index 0000000..95a6c38 --- /dev/null +++ b/hasura/migrations/default/1741365258341_alter_table_public_joblines_add_column_glass_flag/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 "glass_flag" boolean +-- null; diff --git a/hasura/migrations/default/1741365258341_alter_table_public_joblines_add_column_glass_flag/up.sql b/hasura/migrations/default/1741365258341_alter_table_public_joblines_add_column_glass_flag/up.sql new file mode 100644 index 0000000..68437a3 --- /dev/null +++ b/hasura/migrations/default/1741365258341_alter_table_public_joblines_add_column_glass_flag/up.sql @@ -0,0 +1,2 @@ +alter table "public"."joblines" add column "glass_flag" boolean + null; diff --git a/hasura/migrations/default/1741365269248_alter_table_public_joblines_add_column_price_j/down.sql b/hasura/migrations/default/1741365269248_alter_table_public_joblines_add_column_price_j/down.sql new file mode 100644 index 0000000..62fc391 --- /dev/null +++ b/hasura/migrations/default/1741365269248_alter_table_public_joblines_add_column_price_j/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 "price_j" boolean +-- null; diff --git a/hasura/migrations/default/1741365269248_alter_table_public_joblines_add_column_price_j/up.sql b/hasura/migrations/default/1741365269248_alter_table_public_joblines_add_column_price_j/up.sql new file mode 100644 index 0000000..95f74c0 --- /dev/null +++ b/hasura/migrations/default/1741365269248_alter_table_public_joblines_add_column_price_j/up.sql @@ -0,0 +1,2 @@ +alter table "public"."joblines" add column "price_j" boolean + null; diff --git a/hasura/migrations/default/1741365401759_alter_table_public_joblines_add_column_line_ref/down.sql b/hasura/migrations/default/1741365401759_alter_table_public_joblines_add_column_line_ref/down.sql new file mode 100644 index 0000000..fa0893b --- /dev/null +++ b/hasura/migrations/default/1741365401759_alter_table_public_joblines_add_column_line_ref/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 "line_ref" numeric +-- null; diff --git a/hasura/migrations/default/1741365401759_alter_table_public_joblines_add_column_line_ref/up.sql b/hasura/migrations/default/1741365401759_alter_table_public_joblines_add_column_line_ref/up.sql new file mode 100644 index 0000000..c303a29 --- /dev/null +++ b/hasura/migrations/default/1741365401759_alter_table_public_joblines_add_column_line_ref/up.sql @@ -0,0 +1,2 @@ +alter table "public"."joblines" add column "line_ref" numeric + null; diff --git a/hasura/migrations/default/1741365503744_alter_table_public_joblines_add_column_lbr_op/down.sql b/hasura/migrations/default/1741365503744_alter_table_public_joblines_add_column_lbr_op/down.sql new file mode 100644 index 0000000..1dcf8a4 --- /dev/null +++ b/hasura/migrations/default/1741365503744_alter_table_public_joblines_add_column_lbr_op/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 "lbr_op" text +-- null; diff --git a/hasura/migrations/default/1741365503744_alter_table_public_joblines_add_column_lbr_op/up.sql b/hasura/migrations/default/1741365503744_alter_table_public_joblines_add_column_lbr_op/up.sql new file mode 100644 index 0000000..e98e725 --- /dev/null +++ b/hasura/migrations/default/1741365503744_alter_table_public_joblines_add_column_lbr_op/up.sql @@ -0,0 +1,2 @@ +alter table "public"."joblines" add column "lbr_op" text + null;