diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel index bdbcca4d8..970bef3ff 100644 --- a/bodyshop_translations.babel +++ b/bodyshop_translations.babel @@ -3602,6 +3602,27 @@ actions + + add_task_preset + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + addapptcolor false @@ -5584,6 +5605,95 @@ + + md_tasks_presets + + + hourstype + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + memo + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + name + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + percent + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + messaginglabel false @@ -9771,6 +9881,27 @@ + + md_tasks_presets + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + md_to_emails false @@ -10280,6 +10411,27 @@ + + task-presets + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + workingdays false @@ -14809,6 +14961,27 @@ + + newmember + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + @@ -14835,6 +15008,27 @@ + + employeeid + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + name false @@ -14856,6 +15050,27 @@ + + percentage + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + diff --git a/client/src/components/scoreboard-chart/scoreboard-chart.component.jsx b/client/src/components/scoreboard-chart/scoreboard-chart.component.jsx index 802697a02..545030397 100644 --- a/client/src/components/scoreboard-chart/scoreboard-chart.component.jsx +++ b/client/src/components/scoreboard-chart/scoreboard-chart.component.jsx @@ -1,5 +1,6 @@ -import Dinero from "dinero.js"; import { Card } from "antd"; +import Dinero from "dinero.js"; +import _ from "lodash"; import moment from "moment"; import React from "react"; import { connect } from "react-redux"; @@ -18,7 +19,6 @@ import { import { createStructuredSelector } from "reselect"; import { selectBodyshop } from "../../redux/user/user.selectors"; import * as Utils from "../scoreboard-targets-table/scoreboard-targets-table.util"; -import _ from "lodash"; import CustomTooltip from "./chart-custom-tooltip"; const graphProps = { @@ -71,7 +71,9 @@ export function ScoreboardChart({ sbEntriesByDate, bodyshop }) { bodyshop.scoreboard_target.dailyBodyTarget + bodyshop.scoreboard_target.dailyPaintTarget, val - ), + ) + + bodyshop.scoreboard_target.dailyBodyTarget + + bodyshop.scoreboard_target.dailyPaintTarget, 1 ), accHrs: _.round( diff --git a/client/src/components/shop-info/shop-info.component.jsx b/client/src/components/shop-info/shop-info.component.jsx index 9baeb2c58..aad29074e 100644 --- a/client/src/components/shop-info/shop-info.component.jsx +++ b/client/src/components/shop-info/shop-info.component.jsx @@ -15,6 +15,7 @@ import ShopInfoResponsibilityCenterComponent from "./shop-info.responsibilitycen import ShopInfoROStatusComponent from "./shop-info.rostatus.component"; import ShopInfoSchedulingComponent from "./shop-info.scheduling.component"; import ShopInfoSpeedPrint from "./shop-info.speedprint.component"; +import ShopInfoTaskPresets from "./shop-info.task-presets.component"; const mapStateToProps = createStructuredSelector({ bodyshop: selectBodyshop, @@ -83,6 +84,12 @@ export function ShopInfoComponent({ bodyshop, form, saveLoading }) { )} + + + ); diff --git a/client/src/components/shop-info/shop-info.task-presets.component.jsx b/client/src/components/shop-info/shop-info.task-presets.component.jsx new file mode 100644 index 000000000..7218f8056 --- /dev/null +++ b/client/src/components/shop-info/shop-info.task-presets.component.jsx @@ -0,0 +1,144 @@ +import { DeleteFilled } from "@ant-design/icons"; +import { + Button, + Checkbox, + Col, + Form, + Input, + InputNumber, + Row, + Space, +} from "antd"; +import React from "react"; +import { useTranslation } from "react-i18next"; +import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component"; +import LayoutFormRow from "../layout-form-row/layout-form-row.component"; + +export default function ShopInfoTaskPresets({ form }) { + const { t } = useTranslation(); + + return ( + + + {(fields, { add, remove, move }) => { + return ( +
+ {fields.map((field, index) => ( + + + + + + + + + + + {t("joblines.fields.lbr_types.LAB")} + + + + + {t("joblines.fields.lbr_types.LAR")} + + + + + {t("joblines.fields.lbr_types.LAM")} + + + + + {t("joblines.fields.lbr_types.LAF")} + + + + + {t("joblines.fields.lbr_types.LAG")} + + + + + + + + + + + + + { + remove(field.name); + }} + /> + + + + + ))} + + + +
+ ); + }} + + + ); +} diff --git a/client/src/components/time-ticket-task-modal/time-ticket-task-modal.container.jsx b/client/src/components/time-ticket-task-modal/time-ticket-task-modal.container.jsx index cc8ae83a6..09fffd9b2 100644 --- a/client/src/components/time-ticket-task-modal/time-ticket-task-modal.container.jsx +++ b/client/src/components/time-ticket-task-modal/time-ticket-task-modal.container.jsx @@ -52,6 +52,10 @@ export function TimeTickeTaskModalContainer({ }); async function handleFinish(values) { + console.log( + "🚀 ~ file: time-ticket-task-modal.container.jsx:55 ~ handleFinish ~ values:", + values + ); try { if (true) { const result = await insertTimeTicketApproval({ @@ -112,7 +116,6 @@ export function TimeTickeTaskModalContainer({ }, [context.jobid, queryJobInfo, visible]); const calculateTimeTickets = (presetMemo) => { - console.log("🚀 ~ file: time-ticket-task-modal.container.jsx:115 ~ calculateTimeTickets ~ presetMemo:", presetMemo) const formData = form.getFieldsValue(); if ( !formData.jobid || @@ -147,7 +150,7 @@ export function TimeTickeTaskModalContainer({ jobid: formData.jobid, rate: e.labor_rates[hourstype], actualhrs: 0, - memo: presetMemo, + memo: typeof presetMemo === "string" ? presetMemo : "", flat_rate: true, ciecacode: hourstype, cost_center: diff --git a/client/src/components/time-ticket-tasks-presets/time-ticket-tasks-presets.component.jsx b/client/src/components/time-ticket-tasks-presets/time-ticket-tasks-presets.component.jsx index 05a845926..b940ca972 100644 --- a/client/src/components/time-ticket-tasks-presets/time-ticket-tasks-presets.component.jsx +++ b/client/src/components/time-ticket-tasks-presets/time-ticket-tasks-presets.component.jsx @@ -1,12 +1,28 @@ import { Button, Dropdown } from "antd"; import React from "react"; -export default function TimeTicketsTasksPresets({ +import { connect } from "react-redux"; +import { createStructuredSelector } from "reselect"; +import { selectBodyshop } from "../../redux/user/user.selectors"; +const mapStateToProps = createStructuredSelector({ + //currentUser: selectCurrentUser + bodyshop: selectBodyshop, +}); +const mapDispatchToProps = (dispatch) => ({ + //setUserLanguage: language => dispatch(setUserLanguage(language)) +}); +export default connect( + mapStateToProps, + mapDispatchToProps +)(TimeTicketsTasksPresets); + +export function TimeTicketsTasksPresets({ + bodyshop, form, calculateTimeTickets, }) { const handleClick = (props) => { - const preset = samplePresets.find((p) => { + const preset = bodyshop.md_tasks_presets?.presets?.find((p) => { return p.name === props.key; }); @@ -24,7 +40,12 @@ export default function TimeTicketsTasksPresets({ ({ label: p.name, key: p.name })), + items: bodyshop.md_tasks_presets?.presets + ? bodyshop.md_tasks_presets?.presets?.map((p) => ({ + label: p.name, + key: p.name, + })) + : [], onClick: handleClick, }} > @@ -33,19 +54,19 @@ export default function TimeTicketsTasksPresets({ ); } -const samplePresets = [ - { - name: "Teardown", - hourstype: ["LAB", "LAM"], - percent: 10, - memo: "Teardown Preset Task", - }, - { - name: "Disassembly", - hourstype: ["LAB", "LAD"], - percent: 20, - memo: "Disassy Preset Claim", - }, - { name: "Body", hourstype: ["LAB", "LAD"], percent: 20 }, - { name: "Prep", hourstype: ["LAR"], percent: 20 }, -]; +// const samplePresets = [ +// { +// name: "Teardown", +// hourstype: ["LAB", "LAM"], +// percent: 10, +// memo: "Teardown Preset Task", +// }, +// { +// name: "Disassembly", +// hourstype: ["LAB", "LAD"], +// percent: 20, +// memo: "Disassy Preset Claim", +// }, +// { name: "Body", hourstype: ["LAB", "LAD"], percent: 20 }, +// { name: "Prep", hourstype: ["LAR"], percent: 20 }, +// ]; diff --git a/client/src/graphql/bodyshop.queries.js b/client/src/graphql/bodyshop.queries.js index 0bdcf6f8e..ad004198a 100644 --- a/client/src/graphql/bodyshop.queries.js +++ b/client/src/graphql/bodyshop.queries.js @@ -117,6 +117,7 @@ export const QUERY_BODYSHOP = gql` md_parts_scan enforce_conversion_category tt_enforce_hours_for_tech_console + md_tasks_presets use_paint_scale_data employees { user_email @@ -233,6 +234,7 @@ export const UPDATE_SHOP = gql` md_parts_scan enforce_conversion_category tt_enforce_hours_for_tech_console + md_tasks_presets employees { id first_name diff --git a/client/src/graphql/jobs-lines.queries.js b/client/src/graphql/jobs-lines.queries.js index dae7e597f..d94f866e8 100644 --- a/client/src/graphql/jobs-lines.queries.js +++ b/client/src/graphql/jobs-lines.queries.js @@ -67,7 +67,7 @@ export const GET_LINE_TICKET_BY_PK = gql` clockoff rate committed_at - committed_by + commited_by employee { id first_name diff --git a/client/src/graphql/timetickets.queries.js b/client/src/graphql/timetickets.queries.js index 64d5b881a..2d8c0c452 100644 --- a/client/src/graphql/timetickets.queries.js +++ b/client/src/graphql/timetickets.queries.js @@ -159,7 +159,7 @@ export const QUERY_TIME_TICKETS_IN_RANGE_SB = gql` memo jobid committed_at - committed_by + commited_by flat_rate job { id diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json index 38bae2851..0c40ef566 100644 --- a/client/src/translations/en_us/common.json +++ b/client/src/translations/en_us/common.json @@ -227,6 +227,7 @@ }, "bodyshop": { "actions": { + "add_task_preset": "Add Task Preset", "addapptcolor": "Add Appointment Color", "addbucket": "Add Definition", "addpartslocation": "Add Parts Location", @@ -339,6 +340,12 @@ }, "md_payment_types": "Payment Types", "md_referral_sources": "Referral Sources", + "md_tasks_presets": { + "hourstype": "Hour Types", + "memo": "Time Ticket Memo", + "name": "Preset Name", + "percent": "Percent" + }, "messaginglabel": "Messaging Preset Label", "messagingtext": "Messaging Preset Text", "noteslabel": "Note Label", @@ -594,6 +601,7 @@ "jobstatuses": "Job Statuses", "laborrates": "Labor Rates", "licensing": "Licensing", + "md_tasks_presets": "Tasks Presets", "md_to_emails": "Preset To Emails", "md_to_emails_emails": "Emails", "messagingpresets": "Messaging Presets", @@ -620,6 +628,7 @@ "speedprint": "Speed Print Configuration", "ssbuckets": "Job Size Definitions", "systemsettings": "System Settings", + "task-presets": "Task Presets", "workingdays": "Working Days" }, "successes": { @@ -921,11 +930,14 @@ }, "employee_teams": { "actions": { - "new": "New Team" + "new": "New Team", + "newmember": "New Team Member" }, "fields": { "active": "Active", - "name": "Team Name" + "employeeid": "Employee", + "name": "Team Name", + "percentage": "Percent" } }, "employees": { diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json index 08d4d9455..a8aff8e9d 100644 --- a/client/src/translations/es/common.json +++ b/client/src/translations/es/common.json @@ -227,6 +227,7 @@ }, "bodyshop": { "actions": { + "add_task_preset": "", "addapptcolor": "", "addbucket": "", "addpartslocation": "", @@ -339,6 +340,12 @@ }, "md_payment_types": "", "md_referral_sources": "", + "md_tasks_presets": { + "hourstype": "", + "memo": "", + "name": "", + "percent": "" + }, "messaginglabel": "", "messagingtext": "", "noteslabel": "", @@ -593,6 +600,7 @@ "jobstatuses": "", "laborrates": "", "licensing": "", + "md_tasks_presets": "", "md_to_emails": "", "md_to_emails_emails": "", "messagingpresets": "", @@ -619,6 +627,7 @@ "speedprint": "", "ssbuckets": "", "systemsettings": "", + "task-presets": "", "workingdays": "" }, "successes": { @@ -920,11 +929,14 @@ }, "employee_teams": { "actions": { - "new": "" + "new": "", + "newmember": "" }, "fields": { "active": "", - "name": "" + "employeeid": "", + "name": "", + "percentage": "" } }, "employees": { diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json index c232dd55c..7b55857a9 100644 --- a/client/src/translations/fr/common.json +++ b/client/src/translations/fr/common.json @@ -227,6 +227,7 @@ }, "bodyshop": { "actions": { + "add_task_preset": "", "addapptcolor": "", "addbucket": "", "addpartslocation": "", @@ -339,6 +340,12 @@ }, "md_payment_types": "", "md_referral_sources": "", + "md_tasks_presets": { + "hourstype": "", + "memo": "", + "name": "", + "percent": "" + }, "messaginglabel": "", "messagingtext": "", "noteslabel": "", @@ -593,6 +600,7 @@ "jobstatuses": "", "laborrates": "", "licensing": "", + "md_tasks_presets": "", "md_to_emails": "", "md_to_emails_emails": "", "messagingpresets": "", @@ -619,6 +627,7 @@ "speedprint": "", "ssbuckets": "", "systemsettings": "", + "task-presets": "", "workingdays": "" }, "successes": { @@ -920,11 +929,14 @@ }, "employee_teams": { "actions": { - "new": "" + "new": "", + "newmember": "" }, "fields": { "active": "", - "name": "" + "employeeid": "", + "name": "", + "percentage": "" } }, "employees": { diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml index b49797a78..ebed06a7c 100644 --- a/hasura/metadata/tables.yaml +++ b/hasura/metadata/tables.yaml @@ -941,6 +941,7 @@ - md_referral_sources - md_responsibility_centers - md_ro_statuses + - md_tasks_presets - md_to_emails - messagingservicesid - pbs_configuration @@ -1038,6 +1039,7 @@ - md_referral_sources - md_responsibility_centers - md_ro_statuses + - md_tasks_presets - md_to_emails - pbs_configuration - phone diff --git a/hasura/migrations/1684251223317_alter_table_public_bodyshops_add_column_md_tasks_presets/down.sql b/hasura/migrations/1684251223317_alter_table_public_bodyshops_add_column_md_tasks_presets/down.sql new file mode 100644 index 000000000..df054809e --- /dev/null +++ b/hasura/migrations/1684251223317_alter_table_public_bodyshops_add_column_md_tasks_presets/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"."bodyshops" add column "md_tasks_presets" jsonb +-- not null default jsonb_build_object(); diff --git a/hasura/migrations/1684251223317_alter_table_public_bodyshops_add_column_md_tasks_presets/up.sql b/hasura/migrations/1684251223317_alter_table_public_bodyshops_add_column_md_tasks_presets/up.sql new file mode 100644 index 000000000..a9439a13e --- /dev/null +++ b/hasura/migrations/1684251223317_alter_table_public_bodyshops_add_column_md_tasks_presets/up.sql @@ -0,0 +1,2 @@ +alter table "public"."bodyshops" add column "md_tasks_presets" jsonb + not null default jsonb_build_object();