admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ability to delete manually entered job lines IO-568

Browse Source
This commit is contained in:
Patrick Fic
2021-01-20 10:47:08 -08:00
parent e82e1215ea
commit cb503e392f
15 changed files with 556 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
client/src/components/job-detail-lines/job-lines.component.jsx
View File

@@ -1,11 +1,12 @@
import { FilterFilled, SyncOutlined } from "@ant-design/icons"; import { DeleteFilled, FilterFilled, SyncOutlined } from "@ant-design/icons";
import { useQuery } from "@apollo/react-hooks"; import { useMutation, useQuery } from "@apollo/react-hooks";
import { Button, Dropdown, Input, Menu, Table } from "antd"; import { Button, Dropdown, Input, Menu, Space, Table } from "antd";
import React, { useMemo, useState } from "react"; import React, { useMemo, useState } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { createStructuredSelector } from "reselect"; import { createStructuredSelector } from "reselect";
import { QUERY_BILLS_BY_JOB_REF } from "../../graphql/bill-lines.queries"; import { QUERY_BILLS_BY_JOB_REF } from "../../graphql/bill-lines.queries";
import { DELETE_JOB_LINE_BY_PK } from "../../graphql/jobs-lines.queries";
import { selectJobReadOnly } from "../../redux/application/application.selectors"; import { selectJobReadOnly } from "../../redux/application/application.selectors";
import { setModalContext } from "../../redux/modals/modals.actions"; import { setModalContext } from "../../redux/modals/modals.actions";
import { onlyUnique } from "../../utils/arrayHelper"; import { onlyUnique } from "../../utils/arrayHelper";
@@ -18,7 +19,6 @@ import JobLinesBillRefernece from "../job-lines-bill-reference/job-lines-bill-re
// import AllocationsBulkAssignmentContainer from "../allocations-bulk-assignment/allocations-bulk-assignment.container"; // import AllocationsBulkAssignmentContainer from "../allocations-bulk-assignment/allocations-bulk-assignment.container";
// import AllocationsEmployeeLabelContainer from "../allocations-employee-label/allocations-employee-label.container"; // import AllocationsEmployeeLabelContainer from "../allocations-employee-label/allocations-employee-label.container";
import PartsOrderModalContainer from "../parts-order-modal/parts-order-modal.container"; import PartsOrderModalContainer from "../parts-order-modal/parts-order-modal.container";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
//currentUser: selectCurrentUser //currentUser: selectCurrentUser
jobRO: selectJobReadOnly, jobRO: selectJobReadOnly,
@@ -44,6 +44,7 @@ export function JobLinesComponent({
setJobLineEditContext, setJobLineEditContext,
form, form,
}) { }) {
const [deleteJobLine] = useMutation(DELETE_JOB_LINE_BY_PK);
const { const {
loading: billLinesLoading, loading: billLinesLoading,
error: billLinesError, error: billLinesError,
@@ -53,9 +54,7 @@ export function JobLinesComponent({
skip: loading, skip: loading,
}); });
console.log("billLinesLoading :>> ", billLinesLoading);
const billLinesDataObj = useMemo(() => { const billLinesDataObj = useMemo(() => {
console.log("Memoized object called");
if (!billLinesData) return {}; if (!billLinesData) return {};
const ret = {}; const ret = {};
billLinesData.billlines.map((b) => { billLinesData.billlines.map((b) => {
@@ -292,7 +291,7 @@ export function JobLinesComponent({
dataIndex: "actions", dataIndex: "actions",
key: "actions", key: "actions",
render: (text, record) => ( render: (text, record) => (
<div> <Space>
<Button <Button
disabled={jobRO} disabled={jobRO}
onClick={() => { onClick={() => {
@@ -304,6 +303,29 @@ export function JobLinesComponent({
> >
{t("general.actions.edit")} {t("general.actions.edit")}
</Button> </Button>
{record.manual_line && (
<Button
onClick={() =>
deleteJobLine({
variables: { joblineId: record.id },
update(cache) {
cache.modify({
id: cache.identify(job),
fields: {
joblines(existingJobLines, { readField }) {
return existingJobLines.filter(
(jlRef) => record.id !== readField("id", jlRef)
);
},
},
});
},
})
}
>
<DeleteFilled />
</Button>
)}
{ {
// <AllocationsAssignmentContainer // <AllocationsAssignmentContainer
// key={record.id} // key={record.id}
@@ -312,7 +334,7 @@ export function JobLinesComponent({
// hours={record.mod_lb_hrs} // hours={record.mod_lb_hrs}
// /> // />
} }
</div> </Space>
), ),
}, },
]; ];

10
client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.container.jsx
View File

@@ -33,7 +33,15 @@ function JobLinesUpsertModalContainer({
if (!jobLineEditModal.context.id) { if (!jobLineEditModal.context.id) {
insertJobLine({ insertJobLine({
variables: { variables: {
lineInput: [{ jobid: jobLineEditModal.context.jobid, ...values }], lineInput: [
{
jobid: jobLineEditModal.context.jobid,
manual_line: !(
jobLineEditModal.context && jobLineEditModal.context.id
),
...values,
},
],
}, },
}) })
.then((r) => { .then((r) => {

1
client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.duplicate.util.js
View File

@@ -30,6 +30,7 @@ export default function DuplicateJob(
_tempLines.forEach((line) => { _tempLines.forEach((line) => {
delete line.id; delete line.id;
delete line.__typename; delete line.__typename;
line.manual_line = true;
}); });
delete newJob.joblines; delete newJob.joblines;

8
client/src/graphql/jobs-lines.queries.js
View File

@@ -180,3 +180,11 @@ export const generateJobLinesUpdatesForInvoicing = (joblines) => {
} }
`; `;
}; };
export const DELETE_JOB_LINE_BY_PK = gql`
mutation DELETE_JOB_LINE_BY_PK($joblineId: uuid!) {
delete_joblines_by_pk(id: $joblineId) {
id
}
}
`;

2
client/src/graphql/jobs.queries.js
View File

@@ -495,6 +495,7 @@ export const GET_JOB_BY_PK = gql`
location location
tax_part tax_part
db_ref db_ref
manual_line
parts_order_lines { parts_order_lines {
id id
parts_order { parts_order {
@@ -1081,6 +1082,7 @@ export const QUERY_ALL_JOB_FIELDS = gql`
status status
tax_part tax_part
unq_seq unq_seq
manual_line
} }
employee_body employee_body
employee_refinish employee_refinish

2
client/src/translations/en_us/common.json
View File

@@ -85,7 +85,7 @@
"newline": "New Line" "newline": "New Line"
}, },
"fields": { "fields": {
"actual": "Actual", "actual": "List Price",
"actual_cost": "Actual Cost", "actual_cost": "Actual Cost",
"cost_center": "Cost Center", "cost_center": "Cost Center",
"federal_tax_applicable": "Fed. Tax?", "federal_tax_applicable": "Fed. Tax?",

5
hasura/migrations/1611165627078_alter_table_public_joblines_add_column_manual_line/down.yaml Normal file
View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."joblines" DROP COLUMN "manual_line";
type: run_sql

6
hasura/migrations/1611165627078_alter_table_public_joblines_add_column_manual_line/up.yaml Normal file
View File

@@ -0,0 +1,6 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."joblines" ADD COLUMN "manual_line" boolean NOT NULL
DEFAULT false;
type: run_sql

81
hasura/migrations/1611165639521_update_permission_user_public_table_joblines/down.yaml Normal file
View File

@@ -0,0 +1,81 @@
- args:
role: user
table:
name: joblines
schema: public
type: drop_insert_permission
- args:
permission:
check:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
columns:
- act_price
- alt_co_id
- alt_overrd
- alt_part_i
- alt_partm
- alt_partno
- bett_amt
- bett_pctg
- bett_tax
- bett_type
- cert_part
- created_at
- db_hrs
- db_price
- db_ref
- est_seq
- glass_flag
- id
- jobid
- lbr_amt
- lbr_hrs_j
- lbr_inc
- lbr_op
- lbr_op_j
- lbr_tax
- lbr_typ_j
- line_desc
- line_ind
- line_no
- line_ref
- location
- misc_amt
- misc_sublt
- misc_tax
- mod_lb_hrs
- mod_lbr_ty
- notes
- oem_partno
- op_code_desc
- paint_stg
- paint_tone
- part_qty
- part_type
- price_inc
- price_j
- profitcenter_labor
- profitcenter_part
- prt_dsmk_m
- prt_dsmk_p
- removed
- status
- sublet_completed
- sublet_ignored
- tax_part
- unq_seq
- updated_at
set: {}
role: user
table:
name: joblines
schema: public
type: create_insert_permission

82
hasura/migrations/1611165639521_update_permission_user_public_table_joblines/up.yaml Normal file
View File

@@ -0,0 +1,82 @@
- args:
role: user
table:
name: joblines
schema: public
type: drop_insert_permission
- args:
permission:
check:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
columns:
- act_price
- alt_co_id
- alt_overrd
- alt_part_i
- alt_partm
- alt_partno
- bett_amt
- bett_pctg
- bett_tax
- bett_type
- cert_part
- created_at
- db_hrs
- db_price
- db_ref
- est_seq
- glass_flag
- id
- jobid
- lbr_amt
- lbr_hrs_j
- lbr_inc
- lbr_op
- lbr_op_j
- lbr_tax
- lbr_typ_j
- line_desc
- line_ind
- line_no
- line_ref
- location
- manual_line
- misc_amt
- misc_sublt
- misc_tax
- mod_lb_hrs
- mod_lbr_ty
- notes
- oem_partno
- op_code_desc
- paint_stg
- paint_tone
- part_qty
- part_type
- price_inc
- price_j
- profitcenter_labor
- profitcenter_part
- prt_dsmk_m
- prt_dsmk_p
- removed
- status
- sublet_completed
- sublet_ignored
- tax_part
- unq_seq
- updated_at
set: {}
role: user
table:
name: joblines
schema: public
type: create_insert_permission

82
hasura/migrations/1611165651041_update_permission_user_public_table_joblines/down.yaml Normal file
View File

@@ -0,0 +1,82 @@
- args:
role: user
table:
name: joblines
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: true
columns:
- act_price
- alt_co_id
- alt_overrd
- alt_part_i
- alt_partm
- alt_partno
- bett_amt
- bett_pctg
- bett_tax
- bett_type
- cert_part
- created_at
- db_hrs
- db_price
- db_ref
- est_seq
- glass_flag
- id
- jobid
- lbr_amt
- lbr_hrs_j
- lbr_inc
- lbr_op
- lbr_op_j
- lbr_tax
- lbr_typ_j
- line_desc
- line_ind
- line_no
- line_ref
- location
- misc_amt
- misc_sublt
- misc_tax
- mod_lb_hrs
- mod_lbr_ty
- notes
- oem_partno
- op_code_desc
- paint_stg
- paint_tone
- part_qty
- part_type
- price_inc
- price_j
- profitcenter_labor
- profitcenter_part
- prt_dsmk_m
- prt_dsmk_p
- removed
- status
- sublet_completed
- sublet_ignored
- tax_part
- unq_seq
- updated_at
computed_fields: []
filter:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
role: user
table:
name: joblines
schema: public
type: create_select_permission

83
hasura/migrations/1611165651041_update_permission_user_public_table_joblines/up.yaml Normal file
View File

@@ -0,0 +1,83 @@
- args:
role: user
table:
name: joblines
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: true
columns:
- act_price
- alt_co_id
- alt_overrd
- alt_part_i
- alt_partm
- alt_partno
- bett_amt
- bett_pctg
- bett_tax
- bett_type
- cert_part
- created_at
- db_hrs
- db_price
- db_ref
- est_seq
- glass_flag
- id
- jobid
- lbr_amt
- lbr_hrs_j
- lbr_inc
- lbr_op
- lbr_op_j
- lbr_tax
- lbr_typ_j
- line_desc
- line_ind
- line_no
- line_ref
- location
- manual_line
- misc_amt
- misc_sublt
- misc_tax
- mod_lb_hrs
- mod_lbr_ty
- notes
- oem_partno
- op_code_desc
- paint_stg
- paint_tone
- part_qty
- part_type
- price_inc
- price_j
- profitcenter_labor
- profitcenter_part
- prt_dsmk_m
- prt_dsmk_p
- removed
- status
- sublet_completed
- sublet_ignored
- tax_part
- unq_seq
- updated_at
computed_fields: []
filter:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
role: user
table:
name: joblines
schema: public
type: create_select_permission

81
hasura/migrations/1611165680112_update_permission_user_public_table_joblines/down.yaml Normal file
View File

@@ -0,0 +1,81 @@
- args:
role: user
table:
name: joblines
schema: public
type: drop_update_permission
- args:
permission:
columns:
- act_price
- alt_co_id
- alt_overrd
- alt_part_i
- alt_partm
- alt_partno
- bett_amt
- bett_pctg
- bett_tax
- bett_type
- cert_part
- created_at
- db_hrs
- db_price
- db_ref
- est_seq
- glass_flag
- id
- jobid
- lbr_amt
- lbr_hrs_j
- lbr_inc
- lbr_op
- lbr_op_j
- lbr_tax
- lbr_typ_j
- line_desc
- line_ind
- line_no
- line_ref
- location
- misc_amt
- misc_sublt
- misc_tax
- mod_lb_hrs
- mod_lbr_ty
- notes
- oem_partno
- op_code_desc
- paint_stg
- paint_tone
- part_qty
- part_type
- price_inc
- price_j
- profitcenter_labor
- profitcenter_part
- prt_dsmk_m
- prt_dsmk_p
- removed
- status
- sublet_completed
- sublet_ignored
- tax_part
- unq_seq
- updated_at
filter:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
set: {}
role: user
table:
name: joblines
schema: public
type: create_update_permission

82
hasura/migrations/1611165680112_update_permission_user_public_table_joblines/up.yaml Normal file
View File

@@ -0,0 +1,82 @@
- args:
role: user
table:
name: joblines
schema: public
type: drop_update_permission
- args:
permission:
columns:
- act_price
- alt_co_id
- alt_overrd
- alt_part_i
- alt_partm
- alt_partno
- bett_amt
- bett_pctg
- bett_tax
- bett_type
- cert_part
- created_at
- db_hrs
- db_price
- db_ref
- est_seq
- glass_flag
- id
- jobid
- lbr_amt
- lbr_hrs_j
- lbr_inc
- lbr_op
- lbr_op_j
- lbr_tax
- lbr_typ_j
- line_desc
- line_ind
- line_no
- line_ref
- location
- manual_line
- misc_amt
- misc_sublt
- misc_tax
- mod_lb_hrs
- mod_lbr_ty
- notes
- oem_partno
- op_code_desc
- paint_stg
- paint_tone
- part_qty
- part_type
- price_inc
- price_j
- profitcenter_labor
- profitcenter_part
- prt_dsmk_m
- prt_dsmk_p
- removed
- status
- sublet_completed
- sublet_ignored
- tax_part
- unq_seq
- updated_at
filter:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
set: {}
role: user
table:
name: joblines
schema: public
type: create_update_permission

3
hasura/migrations/metadata.yaml
View File

@@ -1769,6 +1769,7 @@ tables:
- line_no - line_no
- line_ref - line_ref
- location - location
- manual_line
- misc_amt - misc_amt
- misc_sublt - misc_sublt
- misc_tax - misc_tax
@@ -1829,6 +1830,7 @@ tables:
- line_no - line_no
- line_ref - line_ref
- location - location
- manual_line
- misc_amt - misc_amt
- misc_sublt - misc_sublt
- misc_tax - misc_tax
@@ -1900,6 +1902,7 @@ tables:
- line_no - line_no
- line_ref - line_ref
- location - location
- manual_line
- misc_amt - misc_amt
- misc_sublt - misc_sublt
- misc_tax - misc_tax