From e348110bdd86e9606977cc473b33829ee42b6cee Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Tue, 3 May 2022 11:33:31 -0700 Subject: [PATCH 1/4] IO-1857 Resolve time ticket update fix. --- .../time-ticket-modal/time-ticket-modal.component.jsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx index 4774c6810..c8e37a688 100644 --- a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx +++ b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx @@ -237,7 +237,11 @@ export function TimeTicketModalComponent({ return Promise.reject( t("timetickets.validation.clockoffwithoutclockon") ); - if (value && !value.isSameOrAfter(clockon)) + if ( + value && + value.isSameOrAfter && + !value.isSameOrAfter(clockon) + ) return Promise.reject( t("timetickets.validation.clockoffmustbeafterclockon") ); From e56424c9b36470dec326d2f561ed6a2dc6e82d07 Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Fri, 6 May 2022 09:30:29 -0700 Subject: [PATCH 2/4] IO-1858 Email Groupings --- bodyshop_translations.babel | 42 +++++++++++++++ .../email-overlay/email-overlay.component.jsx | 12 ++++- .../shop-info/shop-info.general.component.jsx | 54 +++++++++++++++++++ client/src/graphql/bodyshop.queries.js | 2 + client/src/translations/en_us/common.json | 2 + client/src/translations/es/common.json | 2 + client/src/translations/fr/common.json | 2 + hasura/metadata/tables.yaml | 2 + .../down.sql | 4 ++ .../up.sql | 2 + 10 files changed, 123 insertions(+), 1 deletion(-) create mode 100644 hasura/migrations/1651792938097_alter_table_public_bodyshops_add_column_md_to_emails/down.sql create mode 100644 hasura/migrations/1651792938097_alter_table_public_bodyshops_add_column_md_to_emails/up.sql diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel index a7de63bcb..d03467a82 100644 --- a/bodyshop_translations.babel +++ b/bodyshop_translations.babel @@ -8927,6 +8927,48 @@ + + md_to_emails + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + md_to_emails_emails + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + messagingpresets false diff --git a/client/src/components/email-overlay/email-overlay.component.jsx b/client/src/components/email-overlay/email-overlay.component.jsx index baf52d376..0c7fefc78 100644 --- a/client/src/components/email-overlay/email-overlay.component.jsx +++ b/client/src/components/email-overlay/email-overlay.component.jsx @@ -42,7 +42,12 @@ export function EmailOverlayComponent({ const { t } = useTranslation(); const handleClick = ({ item, key, keyPath }) => { const email = item.props.value; - form.setFieldsValue({ to: _.uniq([...form.getFieldValue("to"), email]) }); + form.setFieldsValue({ + to: _.uniq([ + ...form.getFieldValue("to"), + ...(typeof email === "string" ? [email] : email), + ]), + }); }; const menu = ( @@ -55,6 +60,11 @@ export function EmailOverlayComponent({ {`${e.first_name} ${e.last_name}`} ))} + {bodyshop.md_to_emails.map((e, idx) => ( + + {e.label} + + ))} ); diff --git a/client/src/components/shop-info/shop-info.general.component.jsx b/client/src/components/shop-info/shop-info.general.component.jsx index 0eeb78d4a..92e99791b 100644 --- a/client/src/components/shop-info/shop-info.general.component.jsx +++ b/client/src/components/shop-info/shop-info.general.component.jsx @@ -1393,6 +1393,60 @@ export default function ShopInfoGeneral({ form }) { }} + + + {(fields, { add, remove, move }) => { + return ( +
+ {fields.map((field, index) => ( + + + + + + + + + + {(fields, { add, remove, move }) => { diff --git a/client/src/graphql/bodyshop.queries.js b/client/src/graphql/bodyshop.queries.js index 045fe4278..06d86ff3c 100644 --- a/client/src/graphql/bodyshop.queries.js +++ b/client/src/graphql/bodyshop.queries.js @@ -115,6 +115,7 @@ export const QUERY_BODYSHOP = gql` last_name employee_number rates + external_id } } } @@ -219,6 +220,7 @@ export const UPDATE_SHOP = gql` employee_number rates user_email + external_id } } } diff --git a/client/src/graphql/employees.queries.js b/client/src/graphql/employees.queries.js index c47b81919..207c10bab 100644 --- a/client/src/graphql/employees.queries.js +++ b/client/src/graphql/employees.queries.js @@ -25,6 +25,7 @@ export const QUERY_EMPLOYEE_BY_ID = gql` rates pin user_email + external_id employee_vacations(order_by: { start: desc }) { id start diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json index 713aeef22..f75ed1931 100644 --- a/client/src/translations/en_us/common.json +++ b/client/src/translations/en_us/common.json @@ -879,6 +879,7 @@ "base_rate": "Base Rate", "cost_center": "Cost Center", "employee_number": "Employee Number", + "external_id": "External Employee ID", "first_name": "First Name", "flat_rate": "Flat Rate (Disabled is Straight Time)", "hire_date": "Hire Date", diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json index e02845ee7..1d63e0ffc 100644 --- a/client/src/translations/es/common.json +++ b/client/src/translations/es/common.json @@ -879,6 +879,7 @@ "base_rate": "Tasa básica", "cost_center": "Centro de costos", "employee_number": "Numero de empleado", + "external_id": "", "first_name": "Nombre de pila", "flat_rate": "Tarifa plana (deshabilitado es tiempo recto)", "hire_date": "Fecha de contratación", diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json index 8193fce89..002cba126 100644 --- a/client/src/translations/fr/common.json +++ b/client/src/translations/fr/common.json @@ -879,6 +879,7 @@ "base_rate": "Taux de base", "cost_center": "Centre de coûts", "employee_number": "Numéro d'employé", + "external_id": "", "first_name": "Prénom", "flat_rate": "Taux fixe (désactivé est le temps normal)", "hire_date": "Date d'embauche", diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml index 709a33ec0..9d71bdd90 100644 --- a/hasura/metadata/tables.yaml +++ b/hasura/metadata/tables.yaml @@ -1955,6 +1955,7 @@ - active - created_at - employee_number + - external_id - first_name - flat_rate - hire_date @@ -1973,6 +1974,7 @@ - active - created_at - employee_number + - external_id - first_name - flat_rate - hire_date @@ -2001,6 +2003,7 @@ - active - created_at - employee_number + - external_id - first_name - flat_rate - hire_date diff --git a/hasura/migrations/1651854742243_alter_table_public_employees_add_column_external_id/down.sql b/hasura/migrations/1651854742243_alter_table_public_employees_add_column_external_id/down.sql new file mode 100644 index 000000000..35e6b6b0d --- /dev/null +++ b/hasura/migrations/1651854742243_alter_table_public_employees_add_column_external_id/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"."employees" add column "external_id" text +-- null; diff --git a/hasura/migrations/1651854742243_alter_table_public_employees_add_column_external_id/up.sql b/hasura/migrations/1651854742243_alter_table_public_employees_add_column_external_id/up.sql new file mode 100644 index 000000000..139abc4d9 --- /dev/null +++ b/hasura/migrations/1651854742243_alter_table_public_employees_add_column_external_id/up.sql @@ -0,0 +1,2 @@ +alter table "public"."employees" add column "external_id" text + null; From d78955a8fdfdfb3972b2c46f91c1f56c8999f968 Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Fri, 6 May 2022 10:19:49 -0700 Subject: [PATCH 4/4] IO-1853 Add Attendance Table excel creation. --- bodyshop_translations.babel | 26 ++++++++++++ ...ime-tickets-attendance-table.component.jsx | 42 +++++++++++++++++++ .../time-tickets/time-tickets.container.jsx | 2 + client/src/translations/en_us/common.json | 3 ++ client/src/translations/es/common.json | 3 ++ client/src/translations/fr/common.json | 3 ++ client/src/utils/TemplateConstants.js | 7 ++++ 7 files changed, 86 insertions(+) create mode 100644 client/src/components/time-tickets-attendance-table/time-tickets-attendance-table.component.jsx diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel index a8ae33e7b..9322e859a 100644 --- a/bodyshop_translations.babel +++ b/bodyshop_translations.babel @@ -36737,6 +36737,32 @@ + + special + + + attendance_detail_csv + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + subjects diff --git a/client/src/components/time-tickets-attendance-table/time-tickets-attendance-table.component.jsx b/client/src/components/time-tickets-attendance-table/time-tickets-attendance-table.component.jsx new file mode 100644 index 000000000..8448eb131 --- /dev/null +++ b/client/src/components/time-tickets-attendance-table/time-tickets-attendance-table.component.jsx @@ -0,0 +1,42 @@ +import { Button } from "antd"; +import queryString from "query-string"; +import React, { useState } from "react"; +import { useLocation } from "react-router-dom"; +import { GenerateDocument } from "../../utils/RenderTemplate"; +import { TemplateList } from "../../utils/TemplateConstants"; +import { useTranslation } from "react-i18next"; +import moment from "moment"; +const AttendanceCsv = TemplateList("special").attendance_detail_csv; + +export default function TimeTicketsAttendanceTable() { + const searchParams = queryString.parse(useLocation().search); + const { start, end } = searchParams; + const { t } = useTranslation(); + const [loading, setLoading] = useState(false); + + const handleClick = async () => { + setLoading(true); + + await GenerateDocument( + { + name: AttendanceCsv.key, + variables: { + start: start + ? start + : moment().startOf("week").subtract(7, "days").format("YYYY-MM-DD"), + end: end ? end : moment().endOf("week").format("YYYY-MM-DD"), + }, + }, + {}, + "x" + ); + + setLoading(false); + }; + + return ( + + ); +} diff --git a/client/src/pages/time-tickets/time-tickets.container.jsx b/client/src/pages/time-tickets/time-tickets.container.jsx index 222be5117..03cfdda50 100644 --- a/client/src/pages/time-tickets/time-tickets.container.jsx +++ b/client/src/pages/time-tickets/time-tickets.container.jsx @@ -14,6 +14,7 @@ import TimeTicketList from "../../components/time-ticket-list/time-ticket-list.c import TimeTicketsPayrollTable from "../../components/time-tickets-payroll-table/time-tickets-payroll-table.component"; import TimeTicketsSummaryEmployees from "../../components/time-tickets-summary-employees/time-tickets-summary-employees.component"; import { QUERY_TIME_TICKETS_IN_RANGE } from "../../graphql/timetickets.queries"; +import TimeTicketsAttendanceTable from "../../components/time-tickets-attendance-table/time-tickets-attendance-table.component"; import { setBreadcrumbs, setSelectedHeader, @@ -71,6 +72,7 @@ export function TimeTicketsContainer({ timetickets={data ? data.timetickets : []} extra={ + diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json index f75ed1931..0dc3c96d2 100644 --- a/client/src/translations/en_us/common.json +++ b/client/src/translations/en_us/common.json @@ -2174,6 +2174,9 @@ "ca_bc_etf_table": "ICBC ETF Table", "exported_payroll": "Payroll Table" }, + "special": { + "attendance_detail_csv": "Attendance Table" + }, "subjects": { "jobs": { "parts_order": "Parts Order PO: {{ro_number}} - {{name}}" diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json index 1d63e0ffc..8670f0f47 100644 --- a/client/src/translations/es/common.json +++ b/client/src/translations/es/common.json @@ -2174,6 +2174,9 @@ "ca_bc_etf_table": "", "exported_payroll": "" }, + "special": { + "attendance_detail_csv": "" + }, "subjects": { "jobs": { "parts_order": "" diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json index 002cba126..fc457d9ff 100644 --- a/client/src/translations/fr/common.json +++ b/client/src/translations/fr/common.json @@ -2174,6 +2174,9 @@ "ca_bc_etf_table": "", "exported_payroll": "" }, + "special": { + "attendance_detail_csv": "" + }, "subjects": { "jobs": { "parts_order": "" diff --git a/client/src/utils/TemplateConstants.js b/client/src/utils/TemplateConstants.js index fcc6af566..71dacacce 100644 --- a/client/src/utils/TemplateConstants.js +++ b/client/src/utils/TemplateConstants.js @@ -1668,6 +1668,13 @@ export const TemplateList = (type, context) => { key: "exported_payroll", disabled: false, }, + attendance_detail_csv: { + title: i18n.t("printcenter.special.attendance_detail_csv"), + description: "Est Detail", + subject: i18n.t("printcenter.special.attendance_detail_csv"), + key: "attendance_detail_csv", + disabled: false, + }, production_by_technician_one: { title: i18n.t( "reportcenter.templates.production_by_technician_one"