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

Merged in release/2022-01-07 (pull request #335)

Browse Source 
release/2022-01-07

Approved-by: Patrick Fic
This commit is contained in:
Patrick Fic
2022-01-06 18:14:27 +00:00
parent ddb7d8915e ade92d86aa
commit b22318015e
27 changed files with 1010 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

196
bodyshop_translations.babel
View File

@@ -1,4 +1,4 @@
<babeledit_project version="1.2" be_version="2.7.1"> <babeledit_project be_version="2.7.1" version="1.2">
<!-- <!--
BabelEdit project file BabelEdit project file
@@ -500,6 +500,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>end</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>note</name> <name>note</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -521,6 +542,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>start</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>time</name> <name>time</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -673,6 +715,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>dataconsistency</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>history</name> <name>history</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -715,6 +778,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>manualevent</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>noarrivingjobs</name> <name>noarrivingjobs</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -13183,6 +13267,27 @@
<folder_node> <folder_node>
<name>actions</name> <name>actions</name>
<children> <children>
<concept_node>
<name>addvacation</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>new</name> <name>new</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -13571,6 +13676,74 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<folder_node>
<name>vacation</name>
<children>
<concept_node>
<name>end</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>length</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>start</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
</children>
</folder_node>
</children> </children>
</folder_node> </folder_node>
<folder_node> <folder_node>
@@ -13597,6 +13770,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>endmustbeafterstart</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>flat_rate</name> <name>flat_rate</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>

4
client/src/components/bill-form/bill-form.lines.component.jsx
View File

@@ -74,7 +74,9 @@ export function BillEnterModalLinesComponent({
actual_price: opt.cost, actual_price: opt.cost,
cost_center: opt.part_type cost_center: opt.part_type
? bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid ? bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid
? opt.part_type ? opt.part_type !== "PAE"
? opt.part_type
: null
: responsibilityCenters.defaults && : responsibilityCenters.defaults &&
(responsibilityCenters.defaults.costs[ (responsibilityCenters.defaults.costs[
opt.part_type opt.part_type

171
client/src/components/job-at-change/schedule-event.component.jsx
View File

@@ -27,6 +27,7 @@ import { GenerateDocument } from "../../utils/RenderTemplate";
import { TemplateList } from "../../utils/TemplateConstants"; import { TemplateList } from "../../utils/TemplateConstants";
import ChatOpenButton from "../chat-open-button/chat-open-button.component"; import ChatOpenButton from "../chat-open-button/chat-open-button.component";
import DataLabel from "../data-label/data-label.component"; import DataLabel from "../data-label/data-label.component";
import ScheduleManualEvent from "../schedule-manual-event/schedule-manual-event.component";
import ScheduleAtChange from "./job-at-change.component"; import ScheduleAtChange from "./job-at-change.component";
import ScheduleEventColor from "./schedule-event.color.component"; import ScheduleEventColor from "./schedule-event.color.component";
import ScheduleEventNote from "./schedule-event.note.component"; import ScheduleEventNote from "./schedule-event.note.component";
@@ -66,7 +67,10 @@ export function ScheduleEventComponent({
const popoverContent = ( const popoverContent = (
<div style={{ maxWidth: "40vw" }}> <div style={{ maxWidth: "40vw" }}>
{!event.isintake ? ( {!event.isintake ? (
<strong>{event.title}</strong> <Space>
<strong>{event.title}</strong>
<ScheduleEventColor event={event} />
</Space>
) : ( ) : (
<Space> <Space>
<strong>{`${(event.job && event.job.ownr_fn) || ""} ${ <strong>{`${(event.job && event.job.ownr_fn) || ""} ${
@@ -118,7 +122,9 @@ export function ScheduleEventComponent({
</DataLabel> </DataLabel>
<ScheduleEventNote event={event} /> <ScheduleEventNote event={event} />
</div> </div>
) : null} ) : (
<div>{event.note || ""}</div>
)}
<Divider /> <Divider />
<Space wrap> <Space wrap>
{event.job ? ( {event.job ? (
@@ -140,84 +146,89 @@ export function ScheduleEventComponent({
{t("appointments.actions.preview")} {t("appointments.actions.preview")}
</Button> </Button>
) : null} ) : null}
{event.job ? (
<Dropdown <Dropdown
overlay={ overlay={
<Menu> <Menu>
<Menu.Item <Menu.Item
onClick={() => { onClick={() => {
const Template = TemplateList("job").appointment_reminder; const Template = TemplateList("job").appointment_reminder;
GenerateDocument( GenerateDocument(
{ {
name: Template.key, name: Template.key,
variables: { id: event.job.id }, variables: { id: event.job.id },
}, },
{ {
to: event.job && event.job.ownr_ea, to: event.job && event.job.ownr_ea,
subject: Template.subject, subject: Template.subject,
}, },
"e", "e",
event.job && event.job.id event.job && event.job.id
);
}}
disabled={event.arrived}
>
{t("general.labels.email")}
</Menu.Item>
<Menu.Item
onClick={() => {
const p = parsePhoneNumber(event.job.ownr_ph1, "CA");
if (p && p.isValid()) {
openChatByPhone({
phone_num: p.formatInternational(),
jobid: event.job.id,
});
setMessage(
t("appointments.labels.reminder", {
shopname: bodyshop.shopname,
date: moment(event.start).format("MM/DD/YYYY"),
time: moment(event.start).format("HH:mm a"),
})
); );
setVisible(false); }}
} else { disabled={event.arrived}
notification["error"]({ >
message: t("messaging.error.invalidphone"), {t("general.labels.email")}
}); </Menu.Item>
} <Menu.Item
}} onClick={() => {
disabled={event.arrived || !bodyshop.messagingservicesid} const p = parsePhoneNumber(event.job.ownr_ph1, "CA");
> if (p && p.isValid()) {
{t("general.labels.sms")} openChatByPhone({
</Menu.Item> phone_num: p.formatInternational(),
</Menu> jobid: event.job.id,
} });
> setMessage(
<Button>{t("appointments.actions.sendreminder")}</Button> t("appointments.labels.reminder", {
</Dropdown> shopname: bodyshop.shopname,
date: moment(event.start).format("MM/DD/YYYY"),
time: moment(event.start).format("HH:mm a"),
})
);
setVisible(false);
} else {
notification["error"]({
message: t("messaging.error.invalidphone"),
});
}
}}
disabled={event.arrived || !bodyshop.messagingservicesid}
>
{t("general.labels.sms")}
</Menu.Item>
</Menu>
}
>
<Button>{t("appointments.actions.sendreminder")}</Button>
</Dropdown>
) : null}
<Button onClick={() => handleCancel(event.id)} disabled={event.arrived}> <Button onClick={() => handleCancel(event.id)} disabled={event.arrived}>
{t("appointments.actions.cancel")} {t("appointments.actions.cancel")}
</Button> </Button>
<Button {event.isintake ? (
disabled={event.arrived} <Button
onClick={() => { disabled={event.arrived}
setVisible(false); onClick={() => {
setScheduleContext({ setVisible(false);
actions: { refetch: refetch }, setScheduleContext({
context: { actions: { refetch: refetch },
jobId: event.job.id, context: {
job: event.job, jobId: event.job.id,
previousEvent: event.id, job: event.job,
color: event.color, previousEvent: event.id,
alt_transport: event.job && event.job.alt_transport, color: event.color,
note: event.note, alt_transport: event.job && event.job.alt_transport,
}, note: event.note,
}); },
}} });
> }}
{t("appointments.actions.reschedule")} >
</Button> {t("appointments.actions.reschedule")}
</Button>
) : (
<ScheduleManualEvent event={event} />
)}
{event.isintake ? ( {event.isintake ? (
<Link <Link
to={{ to={{
@@ -235,7 +246,13 @@ export function ScheduleEventComponent({
); );
const RegularEvent = event.isintake ? ( const RegularEvent = event.isintake ? (
<div style={{ display: "flex", flexWrap: "wrap" }}> <div
style={{
display: "flex",
flexWrap: "wrap",
height: "100%",
}}
>
<Space> <Space>
{event.note && <AlertFilled className="production-alert" />} {event.note && <AlertFilled className="production-alert" />}
<strong>{`${event.job.ro_number || t("general.labels.na")}`}</strong> <strong>{`${event.job.ro_number || t("general.labels.na")}`}</strong>
@@ -262,7 +279,7 @@ export function ScheduleEventComponent({
)} )}
</div> </div>
) : ( ) : (
<div> <div style={{ height: "100%", width: "100%" }}>
<strong>{`${event.title || ""}`}</strong> <strong>{`${event.title || ""}`}</strong>
</div> </div>
); );

61
client/src/components/jobs-notes/jobs.notes.component.jsx
View File

@@ -5,7 +5,7 @@ import {
EyeInvisibleFilled, EyeInvisibleFilled,
WarningFilled, WarningFilled,
} from "@ant-design/icons"; } from "@ant-design/icons";
import { Button, Card, Space, Table } from "antd"; import { Button, Card, Form, Input, Space, Table } from "antd";
import React from "react"; import React from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { connect } from "react-redux"; import { connect } from "react-redux";
@@ -14,6 +14,7 @@ import { selectJobReadOnly } from "../../redux/application/application.selectors
import { setModalContext } from "../../redux/modals/modals.actions"; import { setModalContext } from "../../redux/modals/modals.actions";
import { DateTimeFormatter } from "../../utils/DateFormatter"; import { DateTimeFormatter } from "../../utils/DateFormatter";
import { TemplateList } from "../../utils/TemplateConstants"; import { TemplateList } from "../../utils/TemplateConstants";
import LayoutFormRow from "../layout-form-row/layout-form-row.component";
import NoteUpsertModal from "../note-upsert-modal/note-upsert-modal.container"; import NoteUpsertModal from "../note-upsert-modal/note-upsert-modal.container";
import PrintWrapperComponent from "../print-wrapper/print-wrapper.component"; import PrintWrapperComponent from "../print-wrapper/print-wrapper.component";
@@ -131,32 +132,42 @@ export function JobNotesComponent({
]; ];
return ( return (
<Card <div>
title={t("jobs.labels.notes")} <LayoutFormRow>
extra={ <Form.Item
<Button label={t("jobs.fields.invoice_final_note")}
onClick={() => { name="invoice_final_note"
setNoteUpsertContext({
actions: { refetch: refetch },
context: {
jobId: jobId,
},
});
}}
> >
{t("notes.actions.new")} <Input.TextArea disabled={jobRO} />
</Button> </Form.Item>
} </LayoutFormRow>
> <Card
<NoteUpsertModal /> title={t("jobs.labels.notes")}
extra={
<Button
onClick={() => {
setNoteUpsertContext({
actions: { refetch: refetch },
context: {
jobId: jobId,
},
});
}}
>
{t("notes.actions.new")}
</Button>
}
>
<NoteUpsertModal />
<Table <Table
loading={loading} loading={loading}
columns={columns} columns={columns}
rowKey="id" rowKey="id"
dataSource={data} dataSource={data}
/> />
</Card> </Card>
</div>
); );
} }
export default connect(mapStateToProps, mapDispatchToProps)(JobNotesComponent); export default connect(mapStateToProps, mapDispatchToProps)(JobNotesComponent);

6
client/src/components/parts-order-list-table/parts-order-list-table.component.jsx
View File

@@ -10,7 +10,7 @@ import {
PageHeader, PageHeader,
Popconfirm, Popconfirm,
Space, Space,
Table Table,
} from "antd"; } from "antd";
import queryString from "query-string"; import queryString from "query-string";
import React, { useState } from "react"; import React, { useState } from "react";
@@ -168,7 +168,9 @@ export function PartsOrderListTableComponent({
cost_center: pol.jobline?.part_type cost_center: pol.jobline?.part_type
? bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid ? bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid
? pol.jobline.part_type ? pol.jobline.part_type !== "PAE"
? pol.jobline.part_type
: null
: responsibilityCenters.defaults && : responsibilityCenters.defaults &&
(responsibilityCenters.defaults.costs[ (responsibilityCenters.defaults.costs[
pol.jobline.part_type pol.jobline.part_type

8
client/src/components/schedule-calendar-wrapper/scheduler-calendar-wrapper.component.jsx
View File

@@ -12,6 +12,7 @@ import "./schedule-calendar.styles.scss";
import JobDetailCards from "../job-detail-cards/job-detail-cards.component"; import JobDetailCards from "../job-detail-cards/job-detail-cards.component";
import { selectProblemJobs } from "../../redux/application/application.selectors"; import { selectProblemJobs } from "../../redux/application/application.selectors";
import { Alert } from "antd"; import { Alert } from "antd";
import { useTranslation } from "react-i18next";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop, bodyshop: selectBodyshop,
@@ -30,7 +31,7 @@ export function ScheduleCalendarWrapperComponent({
}) { }) {
const search = queryString.parse(useLocation().search); const search = queryString.parse(useLocation().search);
const history = useHistory(); const history = useHistory();
const { t } = useTranslation();
const handleEventPropStyles = (event, start, end, isSelected) => { const handleEventPropStyles = (event, start, end, isSelected) => {
return { return {
...(event.color ...(event.color
@@ -57,7 +58,10 @@ export function ScheduleCalendarWrapperComponent({
<Alert <Alert
key={problem.id} key={problem.id}
type="error" type="error"
message={`${problem.ro_number} has a data consistency issue. It has been exlcuded for scheduling purposes. CODE: ${problem.code}`} message={t("appointments.labels.dataconsistency", {
ro_number: problem.ro_number,
code: problem.code,
})}
/> />
))} ))}

7
client/src/components/schedule-calendar/schedule-calendar.component.jsx
View File

@@ -3,7 +3,7 @@ import { Button, Card, Col, PageHeader, Row, Space } from "antd";
import React from "react"; import React from "react";
import ScheduleCalendarWrapperComponent from "../schedule-calendar-wrapper/scheduler-calendar-wrapper.component"; import ScheduleCalendarWrapperComponent from "../schedule-calendar-wrapper/scheduler-calendar-wrapper.component";
import ScheduleModal from "../schedule-job-modal/schedule-job-modal.container"; import ScheduleModal from "../schedule-job-modal/schedule-job-modal.container";
//import ScheduleManualEvent from "../schedule-manual-event/schedule-manual-event.component"; import ScheduleManualEvent from "../schedule-manual-event/schedule-manual-event.component";
import ScheduleProductionList from "../schedule-production-list/schedule-production-list.component"; import ScheduleProductionList from "../schedule-production-list/schedule-production-list.component";
import ScheduleVerifyIntegrity from "../schedule-verify-integrity/schedule-verify-integrity.component"; import ScheduleVerifyIntegrity from "../schedule-verify-integrity/schedule-verify-integrity.component";
@@ -25,9 +25,8 @@ export default function ScheduleCalendarComponent({ data, refetch }) {
<SyncOutlined /> <SyncOutlined />
</Button> </Button>
<ScheduleProductionList /> <ScheduleProductionList />
{
// <ScheduleManualEvent /> <ScheduleManualEvent />
}
</Space> </Space>
} }
/> />

40
client/src/components/schedule-calendar/schedule-calendar.container.jsx
View File

@@ -10,6 +10,7 @@ import ScheduleCalendarComponent from "./schedule-calendar.component";
import { calculateScheduleLoad } from "../../redux/application/application.actions"; import { calculateScheduleLoad } from "../../redux/application/application.actions";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { createStructuredSelector } from "reselect"; import { createStructuredSelector } from "reselect";
import moment from "moment";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
//currentUser: selectCurrentUser //currentUser: selectCurrentUser
}); });
@@ -26,7 +27,12 @@ export function ScheduleCalendarContainer({ calculateScheduleLoad }) {
const { loading, error, data, refetch } = useQuery( const { loading, error, data, refetch } = useQuery(
QUERY_ALL_ACTIVE_APPOINTMENTS, QUERY_ALL_ACTIVE_APPOINTMENTS,
{ {
variables: { start: range.start.toDate(), end: range.end.toDate() }, variables: {
start: range.start.toDate(),
end: range.end.toDate(),
startd: range.start,
endd: range.end,
},
skip: !!!range.start || !!!range.end, skip: !!!range.start || !!!range.end,
fetchPolicy: "network-only", fetchPolicy: "network-only",
nextFetchPolicy: "network-only", nextFetchPolicy: "network-only",
@@ -39,15 +45,29 @@ export function ScheduleCalendarContainer({ calculateScheduleLoad }) {
if (loading) return <LoadingSpinner />; if (loading) return <LoadingSpinner />;
if (error) return <AlertComponent message={error.message} type="error" />; if (error) return <AlertComponent message={error.message} type="error" />;
let normalizedData = data.appointments.map((e) => { let normalizedData = [
//Required becuase Hasura returns a string instead of a date object. ...data.appointments.map((e) => {
return Object.assign( //Required becuase Hasura returns a string instead of a date object.
{}, return Object.assign(
e, {},
{ start: new Date(e.start) }, e,
{ end: new Date(e.end) } { start: new Date(e.start) },
); { end: new Date(e.end) }
}); );
}),
...data.employee_vacation.map((e) => {
//Required becuase Hasura returns a string instead of a date object.
return {
...e,
title: `${
(e.employee.first_name && e.employee.first_name.substr(0, 1)) || ""
} ${e.employee.last_name || ""} OUT`,
color: "red",
start: moment(e.start).startOf("day").toDate(),
end: moment(e.end).startOf("day").toDate(),
};
}),
];
return ( return (
<ScheduleCalendarComponent <ScheduleCalendarComponent

34
client/src/components/schedule-day-view/schedule-day-view.container.jsx
View File

@@ -11,6 +11,8 @@ export default function ScheduleDayViewContainer({ day }) {
variables: { variables: {
start: moment(day).startOf("day"), start: moment(day).startOf("day"),
end: moment(day).endOf("day"), end: moment(day).endOf("day"),
startd: moment(day).startOf("day").format("YYYY-MM-DD"),
endd: moment(day).add(1, "day").format("YYYY-MM-DD"),
}, },
skip: !moment(day).isValid(), skip: !moment(day).isValid(),
fetchPolicy: "network-only", fetchPolicy: "network-only",
@@ -23,15 +25,29 @@ export default function ScheduleDayViewContainer({ day }) {
let normalizedData; let normalizedData;
if (data) { if (data) {
normalizedData = data.appointments.map((e) => { normalizedData = [
//Required becuase Hasura returns a string instead of a date object. ...data.appointments.map((e) => {
return Object.assign( //Required becuase Hasura returns a string instead of a date object.
{}, return Object.assign(
e, {},
{ start: new Date(e.start) }, e,
{ end: new Date(e.end) } { start: new Date(e.start) },
); { end: new Date(e.end) }
}); );
}),
...data.employee_vacation.map((e) => {
//Required becuase Hasura returns a string instead of a date object.
return {
...e,
title: `${
(e.employee.first_name && e.employee.first_name.substr(0, 1)) || ""
} ${e.employee.last_name || ""} OUT`,
color: "red",
start: moment(e.start).startOf("day").toDate(),
end: moment(e.end).startOf("day").toDate(),
};
}),
];
} }
return ( return (

1
client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
View File

@@ -190,7 +190,6 @@ export function ScheduleJobModalComponent({
<Col span={12}> <Col span={12}>
<Form.Item shouldUpdate={(prev, cur) => prev.start !== cur.start}> <Form.Item shouldUpdate={(prev, cur) => prev.start !== cur.start}>
{() => { {() => {
console.log("render");
const values = form.getFieldsValue(); const values = form.getFieldsValue();
return ( return (
<div className="schedule-job-modal"> <div className="schedule-job-modal">

86
client/src/components/schedule-manual-event/schedule-manual-event.component.jsx
View File

@@ -1,17 +1,32 @@
import { useMutation } from "@apollo/client"; import { useMutation } from "@apollo/client";
import { Button, Card, Form, Input, Popover, Space } from "antd"; import { Button, Card, Form, Input, Popover, Select, Space } from "antd";
import moment from "moment";
import React, { useEffect, useState } from "react"; import React, { useEffect, useState } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import { logImEXEvent } from "../../firebase/firebase.utils"; import { logImEXEvent } from "../../firebase/firebase.utils";
import { import {
INSERT_APPOINTMENT, INSERT_MANUAL_APPT,
UPDATE_APPOINTMENT, UPDATE_APPOINTMENT,
} from "../../graphql/appointments.queries"; } from "../../graphql/appointments.queries";
import { selectBodyshop } from "../../redux/user/user.selectors";
import FormDateTimePickerComponent from "../form-date-time-picker/form-date-time-picker.component"; import FormDateTimePickerComponent from "../form-date-time-picker/form-date-time-picker.component";
export default function ScheduleManualEvent({ event }) { const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop,
});
const mapDispatchToProps = (dispatch) => ({
//setUserLanguage: language => dispatch(setUserLanguage(language))
});
export default connect(
mapStateToProps,
mapDispatchToProps
)(ScheduleManualEvent);
export function ScheduleManualEvent({ bodyshop, event }) {
const { t } = useTranslation(); const { t } = useTranslation();
const [insertAppointment] = useMutation(INSERT_APPOINTMENT); const [insertAppointment] = useMutation(INSERT_MANUAL_APPT);
const [updateAppointment] = useMutation(UPDATE_APPOINTMENT); const [updateAppointment] = useMutation(UPDATE_APPOINTMENT);
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
const [form] = Form.useForm(); const [form] = Form.useForm();
@@ -22,26 +37,27 @@ export default function ScheduleManualEvent({ event }) {
useEffect(() => { useEffect(() => {
if (visibility && event) { if (visibility && event) {
form.setFieldsValue({ event }); form.setFieldsValue(event);
} }
}, [visibility, form, event]); }, [visibility, form, event]);
useEffect(() => {
// if (entryData && entryData.scoreboard && entryData.scoreboard[0]) {
// console.log("Setting FOrm");
// // form.setFieldsValue(entryData.scoreboard[0]);
// }
}, [form]);
const handleFinish = async (values) => { const handleFinish = async (values) => {
logImEXEvent("job_close_add_to_scoreboard"); logImEXEvent("schedule_manual_event");
setLoading(true); setLoading(true);
try { try {
if (event && event.id) { if (event && event.id) {
updateAppointment(); updateAppointment({
variables: { appid: event.id, app: values },
refetchQueries: ["QUERY_ALL_ACTIVE_APPOINTMENTS"],
});
} else { } else {
insertAppointment(); insertAppointment({
variables: {
apt: { ...values, isintake: false, bodyshopid: bodyshop.id },
},
refetchQueries: ["QUERY_ALL_ACTIVE_APPOINTMENTS"],
});
} }
} catch (error) { } catch (error) {
console.log(error); console.log(error);
@@ -56,8 +72,8 @@ export default function ScheduleManualEvent({ event }) {
<div> <div>
<Form form={form} layout="vertical" onFinish={handleFinish}> <Form form={form} layout="vertical" onFinish={handleFinish}>
<Form.Item <Form.Item
label={t("schedule.fields.note")} label={t("appointments.fields.title")}
name="note" name="title"
rules={[ rules={[
{ {
required: true, required: true,
@@ -67,8 +83,11 @@ export default function ScheduleManualEvent({ event }) {
> >
<Input /> <Input />
</Form.Item> </Form.Item>
<Form.Item label={t("appointments.fields.note")} name="note">
<Input />
</Form.Item>
<Form.Item <Form.Item
label={t("schedule.fields.start")} label={t("appointments.fields.start")}
name="start" name="start"
rules={[ rules={[
{ {
@@ -80,17 +99,42 @@ export default function ScheduleManualEvent({ event }) {
<FormDateTimePickerComponent /> <FormDateTimePickerComponent />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("schedule.fields.end")} label={t("appointments.fields.end")}
name="end" name="end"
rules={[ rules={[
{ {
required: true, required: true,
//message: t("general.validation.required"), //message: t("general.validation.required"),
}, },
({ getFieldValue }) => ({
async validator(rule, value) {
if (value) {
const { start } = form.getFieldsValue();
if (moment(start).isAfter(moment(value))) {
return Promise.reject(
t("employees.labels.endmustbeafterstart")
);
} else {
return Promise.resolve();
}
} else {
return Promise.resolve();
}
},
}),
]} ]}
> >
<FormDateTimePickerComponent /> <FormDateTimePickerComponent />
</Form.Item> </Form.Item>
<Form.Item label={t("appointments.fields.color")} name="color">
<Select>
{bodyshop.appt_colors.map((col, idx) => (
<Select.Option key={idx} value={col.color.hex}>
{col.label}
</Select.Option>
))}
</Select>
</Form.Item>
<Space wrap> <Space wrap>
<Button type="primary" htmlType="submit"> <Button type="primary" htmlType="submit">
@@ -112,7 +156,9 @@ export default function ScheduleManualEvent({ event }) {
return ( return (
<Popover content={overlay} visible={visibility}> <Popover content={overlay} visible={visibility}>
<Button loading={loading} onClick={handleClick}> <Button loading={loading} onClick={handleClick}>
{t("schedule.labels.manualevent")} {event
? t("appointments.actions.reschedule")
: t("appointments.labels.manualevent")}
</Button> </Button>
</Popover> </Popover>
); );

124
client/src/components/shop-employees/shop-employees-add-vacation.component.jsx Normal file
View File

@@ -0,0 +1,124 @@
import { useMutation } from "@apollo/client";
import { Button, Card, Form, notification, Popover, Space } from "antd";
import moment from "moment";
import React, { useState } from "react";
import { useTranslation } from "react-i18next";
import { logImEXEvent } from "../../firebase/firebase.utils";
import { INSERT_VACATION } from "../../graphql/employees.queries";
import FormDatePicker from "../form-date-picker/form-date-picker.component";
export default function ShopEmployeeAddVacation({ employee }) {
const { t } = useTranslation();
const [insertVacation] = useMutation(INSERT_VACATION);
const [loading, setLoading] = useState(false);
const [form] = Form.useForm();
const [visibility, setVisibility] = useState(false);
const handleFinish = async (values) => {
logImEXEvent("employee_add_vacation");
setLoading(true);
let result;
result = await insertVacation({
variables: { vacation: { ...values, employeeid: employee.id } },
update(cache, { data }) {
cache.modify({
id: cache.identify({ id: employee.id, __typename: "employees" }),
fields: {
employee_vacations(ex) {
return [data.insert_employee_vacation_one, ...ex];
},
},
});
},
});
if (!!result.errors) {
notification["error"]({
message: t("employees.errors.adding", {
message: JSON.stringify(result.errors),
}),
});
} else {
notification["success"]({
message: t("employees.successes.added"),
});
}
setLoading(false);
setVisibility(false);
};
const overlay = (
<Card>
<Form form={form} layout="vertical" onFinish={handleFinish}>
<Form.Item
label={t("employees.fields.vacation.start")}
name="start"
rules={[
{
required: true,
//message: t("general.validation.required"),
},
]}
>
<FormDatePicker />
</Form.Item>
<Form.Item
label={t("employees.fields.vacation.end")}
name="end"
rules={[
{
required: true,
//message: t("general.validation.required"),
},
({ getFieldValue }) => ({
async validator(rule, value) {
if (value) {
const { start } = form.getFieldsValue();
if (moment(start).isAfter(moment(value))) {
return Promise.reject(
t("employees.labels.endmustbeafterstart")
);
} else {
return Promise.resolve();
}
} else {
return Promise.resolve();
}
},
}),
]}
>
<FormDatePicker />
</Form.Item>
<Space wrap>
<Button type="primary" htmlType="submit">
{t("general.actions.save")}
</Button>
<Button onClick={() => setVisibility(false)}>
{t("general.actions.cancel")}
</Button>
</Space>
</Form>
</Card>
);
const handleClick = (e) => {
setVisibility(true);
};
return (
<Popover content={overlay} visible={visibility}>
<Button
loading={loading}
disabled={!employee?.active}
onClick={handleClick}
>
{t("employees.actions.addvacation")}
</Button>
</Popover>
);
}

172
client/src/components/shop-employees/shop-employees-form.component.jsx
View File

@@ -1,20 +1,41 @@
import { DeleteFilled } from "@ant-design/icons"; import { DeleteFilled } from "@ant-design/icons";
import { Button, Card, Form, Input, InputNumber, Select, Switch } from "antd"; import { useApolloClient, useMutation, useQuery } from "@apollo/client";
import {
Button,
Card,
Form,
Input,
InputNumber,
notification,
Select,
Switch,
Table,
} from "antd";
import { useForm } from "antd/es/form/Form";
import moment from "moment"; import moment from "moment";
import querystring from "query-string";
import React, { useEffect } from "react"; import React, { useEffect } from "react";
import { useApolloClient } from "@apollo/client";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { useHistory, useLocation } from "react-router-dom";
import { createStructuredSelector } from "reselect"; import { createStructuredSelector } from "reselect";
import { logImEXEvent } from "../../firebase/firebase.utils";
import { import {
CHECK_EMPLOYEE_NUMBER, CHECK_EMPLOYEE_NUMBER,
DELETE_VACATION,
INSERT_EMPLOYEES,
QUERY_EMPLOYEE_BY_ID,
QUERY_USERS_BY_EMAIL, QUERY_USERS_BY_EMAIL,
UPDATE_EMPLOYEE,
} from "../../graphql/employees.queries"; } from "../../graphql/employees.queries";
import { selectBodyshop } from "../../redux/user/user.selectors"; import { selectBodyshop } from "../../redux/user/user.selectors";
import CiecaSelect from "../../utils/Ciecaselect";
import { DateFormatter } from "../../utils/DateFormatter";
import AlertComponent from "../alert/alert.component";
import FormDatePicker from "../form-date-picker/form-date-picker.component"; import FormDatePicker from "../form-date-picker/form-date-picker.component";
import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component"; import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
import LayoutFormRow from "../layout-form-row/layout-form-row.component"; import LayoutFormRow from "../layout-form-row/layout-form-row.component";
import CiecaSelect from "../../utils/Ciecaselect"; import ShopEmployeeAddVacation from "./shop-employees-add-vacation.component";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop, bodyshop: selectBodyshop,
@@ -23,20 +44,129 @@ const mapDispatchToProps = (dispatch) => ({
//setUserLanguage: language => dispatch(setUserLanguage(language)) //setUserLanguage: language => dispatch(setUserLanguage(language))
}); });
export function ShopEmployeesFormComponent({ export function ShopEmployeesFormComponent({ bodyshop }) {
bodyshop,
form,
selectedEmployee,
handleFinish,
}) {
const { t } = useTranslation(); const { t } = useTranslation();
const [form] = useForm();
const history = useHistory();
const search = querystring.parse(useLocation().search);
const [deleteVacation] = useMutation(DELETE_VACATION);
const { error, data } = useQuery(QUERY_EMPLOYEE_BY_ID, {
variables: { id: search.employeeId },
skip: !search.employeeId || search.employeeId === "new",
fetchPolicy: "network-only",
nextFetchPolicy: "network-only",
});
const client = useApolloClient(); const client = useApolloClient();
useEffect(() => { useEffect(() => {
if (selectedEmployee) form.resetFields(); if (data && data.employees_by_pk) form.setFieldsValue(data.employees_by_pk);
}, [selectedEmployee, form]); else {
form.resetFields();
}
}, [form, data, search.employeeId]);
if (!selectedEmployee) return null; const [updateEmployee] = useMutation(UPDATE_EMPLOYEE);
const [insertEmployees] = useMutation(INSERT_EMPLOYEES);
const handleFinish = (values) => {
if (search.employeeId && search.employeeId !== "new") {
//Update a record.
logImEXEvent("shop_employee_update");
updateEmployee({
variables: {
id: search.employeeId,
employee: {
...values,
user_email: values.user_email === "" ? null : values.user_email,
},
},
})
.then((r) => {
notification["success"]({
message: t("employees.successes.save"),
});
})
.catch((error) => {
notification["error"]({
message: t("employees.errors.save", {
message: JSON.stringify(error),
}),
});
});
} else {
//New record, insert it.
logImEXEvent("shop_employee_insert");
insertEmployees({
variables: { employees: [{ ...values, shopid: bodyshop.id }] },
refetchQueries: ["QUERY_EMPLOYEES"],
}).then((r) => {
search.employeeId = r.data.insert_employees.returning[0].id;
history.push({ search: querystring.stringify(search) });
notification["success"]({
message: t("employees.successes.save"),
});
});
}
};
if (!search.employeeId) return null;
if (error) return <AlertComponent message={error.message} type="error" />;
const columns = [
{
title: t("employees.fields.vacation.start"),
dataIndex: "start",
key: "start",
render: (text, record) => <DateFormatter>{text}</DateFormatter>,
},
{
title: t("employees.fields.vacation.end"),
dataIndex: "end",
key: "end",
render: (text, record) => <DateFormatter>{text}</DateFormatter>,
},
{
title: t("employees.fields.vacation.length"),
dataIndex: "length",
key: "length",
render: (text, record) =>
moment(record.end).diff(moment(record.start), "days", true).toFixed(1),
},
{
title: t("general.labels.actions"),
dataIndex: "actions",
key: "actions",
render: (text, record) => (
<Button
onClick={async () => {
await deleteVacation({
variables: { id: record.id },
update(cache) {
cache.modify({
id: cache.identify({
id: data.employees_by_pk.id,
__typename: "employees",
}),
fields: {
employee_vacations(ex, { readField }) {
return ex.filter(
(vacaref) => record.id !== readField("id", vacaref)
);
},
},
});
},
});
}}
>
<DeleteFilled />
</Button>
),
},
];
return ( return (
<Card <Card
@@ -51,15 +181,6 @@ export function ShopEmployeesFormComponent({
autoComplete={"off"} autoComplete={"off"}
layout="vertical" layout="vertical"
form={form} form={form}
initialValues={{
...selectedEmployee,
hire_date: selectedEmployee.hire_date
? moment(selectedEmployee.hire_date)
: null,
termination_date: selectedEmployee.termination_date
? moment(selectedEmployee.termination_date)
: null,
}}
> >
<LayoutFormRow> <LayoutFormRow>
<Form.Item <Form.Item
@@ -288,6 +409,15 @@ export function ShopEmployeesFormComponent({
}} }}
</Form.List> </Form.List>
</Form> </Form>
<Table
title={() => (
<ShopEmployeeAddVacation employee={data && data.employees_by_pk} />
)}
columns={columns}
rowKey={"id"}
dataSource={data ? data.employees_by_pk.employee_vacations : []}
/>
</Card> </Card>
); );
} }

41
client/src/components/shop-employees/shop-employees-list.component.jsx
View File

@@ -1,19 +1,22 @@
import { Button, Table } from "antd"; import { Button, Table } from "antd";
import queryString from "query-string";
import React from "react"; import React from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
export default function ShopEmployeesListComponent({ import { useHistory, useLocation } from "react-router-dom";
loading,
employees, export default function ShopEmployeesListComponent({ loading, employees }) {
selectedEmployee,
setSelectedEmployee,
handleDelete,
}) {
const { t } = useTranslation(); const { t } = useTranslation();
const history = useHistory();
const search = queryString.parse(useLocation().search);
const handleOnRowClick = (record) => { const handleOnRowClick = (record) => {
if (record) { if (record) {
setSelectedEmployee(record); search.employeeId = record.id;
} else setSelectedEmployee({}); history.push({ search: queryString.stringify(search) });
} else {
delete search.employeeId;
history.push({ search: queryString.stringify(search) });
}
}; };
const columns = [ const columns = [
{ {
@@ -41,18 +44,6 @@ export default function ShopEmployeesListComponent({
? t("employees.labels.flat_rate") ? t("employees.labels.flat_rate")
: t("employees.labels.straight_time"), : t("employees.labels.straight_time"),
}, },
// {
// title: t("employees.labels.actions"),
// dataIndex: "actions",
// key: "actions",
// render: (text, record) => (
// <div>
// <Button key="delete" onClick={() => handleDelete(record.id)}>
// {t("general.actions.delete")}
// </Button>
// </div>
// )
// }
]; ];
return ( return (
<div> <div>
@@ -62,7 +53,8 @@ export default function ShopEmployeesListComponent({
<Button <Button
type="primary" type="primary"
onClick={() => { onClick={() => {
setSelectedEmployee({}); search.employeeId = "new";
history.push({ search: queryString.stringify(search) });
}} }}
> >
{t("employees.actions.new")} {t("employees.actions.new")}
@@ -76,10 +68,11 @@ export default function ShopEmployeesListComponent({
dataSource={employees} dataSource={employees}
rowSelection={{ rowSelection={{
onSelect: (props) => { onSelect: (props) => {
setSelectedEmployee(props); search.employeeId = props.id;
history.push({ search: queryString.stringify(search) });
}, },
type: "radio", type: "radio",
selectedRowKeys: [(selectedEmployee && selectedEmployee.id) || null], selectedRowKeys: [search.employeeId],
}} }}
onRow={(record, rowIndex) => { onRow={(record, rowIndex) => {
return { return {

29
client/src/components/shop-employees/shop-employees.component.jsx
View File

@@ -1,29 +0,0 @@
import React from "react";
import ShopEmployeesFormComponent from "./shop-employees-form.component";
import ShopEmployeesListComponent from "./shop-employees-list.component";
export default function ShopEmployeeComponent({
form,
loading,
employees,
employeeState,
handleFinish,
handleDelete
}) {
const [selectedEmployee, setSelectedEmployee] = employeeState;
return (
<div>
<ShopEmployeesListComponent
employees={employees}
loading={loading}
selectedEmployee={selectedEmployee}
setSelectedEmployee={setSelectedEmployee}
handleDelete={handleDelete}
/>
<ShopEmployeesFormComponent
handleFinish={handleFinish}
form={form}
selectedEmployee={selectedEmployee}
/>
</div>
);
}

114
client/src/components/shop-employees/shop-employees.container.jsx
View File

@@ -1,120 +1,32 @@
import { useMutation, useQuery } from "@apollo/client"; import { useQuery } from "@apollo/client";
import { Form, notification } from "antd"; import React from "react";
import React, { useState } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { createStructuredSelector } from "reselect"; import { createStructuredSelector } from "reselect";
import { logImEXEvent } from "../../firebase/firebase.utils"; import { QUERY_EMPLOYEES } from "../../graphql/employees.queries";
import {
DELETE_EMPLOYEE,
INSERT_EMPLOYEES,
QUERY_EMPLOYEES,
UPDATE_EMPLOYEE,
} from "../../graphql/employees.queries";
import { selectBodyshop } from "../../redux/user/user.selectors"; import { selectBodyshop } from "../../redux/user/user.selectors";
import AlertComponent from "../alert/alert.component"; import AlertComponent from "../alert/alert.component";
import ShopEmployeeComponent from "./shop-employees.component"; import ShopEmployeesFormComponent from "./shop-employees-form.component";
import ShopEmployeesListComponent from "./shop-employees-list.component";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop, bodyshop: selectBodyshop,
}); });
function ShopEmployeesContainer({ bodyshop }) { function ShopEmployeesContainer({ bodyshop }) {
const [form] = Form.useForm(); const { loading, error, data } = useQuery(QUERY_EMPLOYEES, {
const { t } = useTranslation();
const employeeState = useState(null);
const { loading, error, data, refetch } = useQuery(QUERY_EMPLOYEES, {
fetchPolicy: "network-only", fetchPolicy: "network-only",
nextFetchPolicy: "network-only", nextFetchPolicy: "network-only",
}); });
const [updateEmployee] = useMutation(UPDATE_EMPLOYEE);
const [insertEmployees] = useMutation(INSERT_EMPLOYEES);
const [deleteEmployee] = useMutation(DELETE_EMPLOYEE);
const handleDelete = (id) => {
logImEXEvent("shop_employee_delete");
deleteEmployee({ variables: { id: id } })
.then((r) => {
notification["success"]({
message: t("employees.successes.delete"),
});
employeeState[1](null);
refetch().then((r) => form.resetFields());
})
.catch((error) => {
notification["error"]({
message: t("employees.errors.delete", {
message: JSON.stringify(error),
}),
});
});
};
const handleFinish = (values) => {
if (employeeState[0].id) {
//Update a record.
logImEXEvent("shop_employee_update");
updateEmployee({
variables: {
id: employeeState[0].id,
employee: {
...values,
user_email: values.user_email === "" ? null : values.user_email,
},
},
})
.then((r) => {
notification["success"]({
message: t("employees.successes.save"),
});
employeeState[1](null);
refetch().then((r) => form.resetFields());
})
.catch((error) => {
notification["error"]({
message: t("employees.errors.save", {
message: JSON.stringify(error),
}),
});
});
} else {
//New record, insert it.
logImEXEvent("shop_employee_insert");
insertEmployees({
variables: { employees: [{ ...values, shopid: bodyshop.id }] },
}).then((r) => {
notification["success"]({
message: t("employees.successes.save"),
});
employeeState[1](null);
refetch().catch((error) => {
notification["error"]({
message: t("employees.errors.save", {
message: JSON.stringify(error),
}),
});
});
});
}
};
if (error) return <AlertComponent message={error.message} type="error" />; if (error) return <AlertComponent message={error.message} type="error" />;
return ( return (
<ShopEmployeeComponent <div>
handleFinish={handleFinish} <ShopEmployeesListComponent
handleDelete={handleDelete} employees={data ? data.employees : []}
form={form} loading={loading}
loading={loading} />
employeeState={employeeState} <ShopEmployeesFormComponent />
employees={data ? data.employees : []} </div>
/>
); );
} }
export default connect(mapStateToProps, null)(ShopEmployeesContainer); export default connect(mapStateToProps, null)(ShopEmployeesContainer);

53
client/src/graphql/appointments.queries.js
View File

@@ -4,7 +4,21 @@ export const QUERY_ALL_ACTIVE_APPOINTMENTS = gql`
query QUERY_ALL_ACTIVE_APPOINTMENTS( query QUERY_ALL_ACTIVE_APPOINTMENTS(
$start: timestamptz! $start: timestamptz!
$end: timestamptz! $end: timestamptz!
$startd: date!
$endd: date!
) { ) {
employee_vacation(
where: { _or: [{ start: { _gte: $startd } }, { end: { _lte: $endd } }] }
) {
id
start
end
employee {
id
last_name
first_name
}
}
appointments( appointments(
where: { where: {
canceled: { _eq: false } canceled: { _eq: false }
@@ -77,6 +91,26 @@ export const INSERT_APPOINTMENT_BLOCK = gql`
} }
`; `;
export const INSERT_MANUAL_APPT = gql`
mutation INSERT_MANUAL_APPT($apt: appointments_insert_input!) {
insert_appointments_one(object: $apt) {
start
id
end
arrived
title
isintake
block
color
note
canceled
job {
id
}
}
}
`;
export const INSERT_APPOINTMENT = gql` export const INSERT_APPOINTMENT = gql`
mutation INSERT_APPOINTMENT( mutation INSERT_APPOINTMENT(
$app: [appointments_insert_input!]! $app: [appointments_insert_input!]!
@@ -109,7 +143,24 @@ export const INSERT_APPOINTMENT = gql`
`; `;
export const QUERY_APPOINTMENT_BY_DATE = gql` export const QUERY_APPOINTMENT_BY_DATE = gql`
query QUERY_APPOINTMENT_BY_DATE($start: timestamptz, $end: timestamptz) { query QUERY_APPOINTMENT_BY_DATE(
$start: timestamptz
$end: timestamptz
$startd: date!
$endd: date!
) {
employee_vacation(
where: { _or: [{ start: { _gte: $startd } }, { end: { _lte: $endd } }] }
) {
id
start
end
employee {
id
last_name
first_name
}
}
appointments( appointments(
where: { start: { _lte: $end, _gte: $start }, canceled: { _eq: false } } where: { start: { _lte: $end, _gte: $start }, canceled: { _eq: false } }
) { ) {

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

@@ -2,7 +2,7 @@ import { gql } from "@apollo/client";
export const QUERY_ALL_ASSOCIATIONS = gql` export const QUERY_ALL_ASSOCIATIONS = gql`
query QUERY_ALL_ASSOCIATIONS { query QUERY_ALL_ASSOCIATIONS {
associations { associations(order_by: { bodyshop: { shopname: asc } }) {
id id
active active
bodyshop { bodyshop {

44
client/src/graphql/employees.queries.js
View File

@@ -3,6 +3,17 @@ import { gql } from "@apollo/client";
export const QUERY_EMPLOYEES = gql` export const QUERY_EMPLOYEES = gql`
query QUERY_EMPLOYEES { query QUERY_EMPLOYEES {
employees(order_by: { employee_number: asc }) { employees(order_by: { employee_number: asc }) {
last_name
id
first_name
flat_rate
employee_number
}
}
`;
export const QUERY_EMPLOYEE_BY_ID = gql`
query QUERY_EMPLOYEE_BY_ID($id: uuid!) {
employees_by_pk(id: $id) {
last_name last_name
id id
first_name first_name
@@ -14,6 +25,11 @@ export const QUERY_EMPLOYEES = gql`
rates rates
pin pin
user_email user_email
employee_vacations(order_by: { start: desc }) {
id
start
end
}
} }
} }
`; `;
@@ -55,7 +71,17 @@ export const INSERT_EMPLOYEES = gql`
mutation INSERT_EMPLOYEES($employees: [employees_insert_input!]!) { mutation INSERT_EMPLOYEES($employees: [employees_insert_input!]!) {
insert_employees(objects: $employees) { insert_employees(objects: $employees) {
returning { returning {
last_name
id id
first_name
employee_number
active
termination_date
hire_date
flat_rate
rates
pin
user_email
} }
} }
} }
@@ -98,3 +124,21 @@ export const QUERY_USERS_BY_EMAIL = gql`
} }
} }
`; `;
export const INSERT_VACATION = gql`
mutation INSERT_VACATION($vacation: employee_vacation_insert_input!) {
insert_employee_vacation_one(object: $vacation) {
id
start
end
}
}
`;
export const DELETE_VACATION = gql`
mutation DELETE_VACATION($id: uuid!) {
delete_employee_vacation_by_pk(id: $id) {
id
}
}
`;

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

@@ -485,7 +485,7 @@ export const GET_JOB_BY_PK = gql`
} }
alt_transport alt_transport
intakechecklist intakechecklist
invoice_final_note
loss_desc loss_desc
kmin kmin
kmout kmout

8
client/src/pages/jobs-close/jobs-close.component.jsx
View File

@@ -63,7 +63,6 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
kmin: values.kmin, kmin: values.kmin,
kmout: values.kmout, kmout: values.kmout,
dms_allocation: values.dms_allocation, dms_allocation: values.dms_allocation,
invoice_final_note: values.invoice_final_note,
}, },
}, },
refetchQueries: ["QUERY_JOB_CLOSE_DETAILS"], refetchQueries: ["QUERY_JOB_CLOSE_DETAILS"],
@@ -123,7 +122,6 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
kmin: job.kmin, kmin: job.kmin,
kmout: job.kmout, kmout: job.kmout,
dms_allocation: job.dms_allocation, dms_allocation: job.dms_allocation,
invoice_final_note: job.invoice_final_note,
}} }}
scrollToFirstError scrollToFirstError
> >
@@ -273,12 +271,6 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
<Input disabled /> <Input disabled />
</Form.Item> </Form.Item>
)} )}
<Form.Item
label={t("jobs.fields.invoice_final_note")}
name="invoice_final_note"
>
<Input.TextArea disabled={jobRO} />
</Form.Item>
</LayoutFormRow> </LayoutFormRow>
<Divider /> <Divider />
<JobsCloseLines job={job} /> <JobsCloseLines job={job} />

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

@@ -37,7 +37,9 @@
"fields": { "fields": {
"alt_transport": "Alt. Trans.", "alt_transport": "Alt. Trans.",
"color": "Appointment Color", "color": "Appointment Color",
"note": "Appt. Note", "end": "End",
"note": "Note",
"start": "Start",
"time": "Appointment Time", "time": "Appointment Time",
"title": "Title" "title": "Title"
}, },
@@ -47,8 +49,10 @@
"blocked": "Blocked", "blocked": "Blocked",
"cancelledappointment": "Canceled appointment for: ", "cancelledappointment": "Canceled appointment for: ",
"completingjobs": "Completing Jobs", "completingjobs": "Completing Jobs",
"dataconsistency": "{{ro_number}} has a data consistency issue. It has been excluded for scheduling purposes. CODE: {{code}}.",
"history": "History", "history": "History",
"inproduction": "Jobs In Production", "inproduction": "Jobs In Production",
"manualevent": "Add Manual Appointment",
"noarrivingjobs": "No jobs are arriving.", "noarrivingjobs": "No jobs are arriving.",
"nocompletingjobs": "No jobs scheduled for completion.", "nocompletingjobs": "No jobs scheduled for completion.",
"nodateselected": "No date has been selected.", "nodateselected": "No date has been selected.",
@@ -833,6 +837,7 @@
}, },
"employees": { "employees": {
"actions": { "actions": {
"addvacation": "Add Vacation",
"new": "New Employee", "new": "New Employee",
"newrate": "New Rate" "newrate": "New Rate"
}, },
@@ -854,10 +859,16 @@
"pin": "Tech Console PIN", "pin": "Tech Console PIN",
"rate": "Rate", "rate": "Rate",
"termination_date": "Termination Date", "termination_date": "Termination Date",
"user_email": "User Email" "user_email": "User Email",
"vacation": {
"end": "Vacation End",
"length": "Vacation Length",
"start": "Vacation Start"
}
}, },
"labels": { "labels": {
"actions": "Actions", "actions": "Actions",
"endmustbeafterstart": "End date must be after start date.",
"flat_rate": "Flat Rate", "flat_rate": "Flat Rate",
"name": "Name", "name": "Name",
"rate_type": "Rate Type", "rate_type": "Rate Type",

13
client/src/translations/es/common.json
View File

@@ -37,7 +37,9 @@
"fields": { "fields": {
"alt_transport": "", "alt_transport": "",
"color": "", "color": "",
"end": "",
"note": "", "note": "",
"start": "",
"time": "", "time": "",
"title": "Título" "title": "Título"
}, },
@@ -47,8 +49,10 @@
"blocked": "", "blocked": "",
"cancelledappointment": "Cita cancelada para:", "cancelledappointment": "Cita cancelada para:",
"completingjobs": "", "completingjobs": "",
"dataconsistency": "",
"history": "", "history": "",
"inproduction": "", "inproduction": "",
"manualevent": "",
"noarrivingjobs": "", "noarrivingjobs": "",
"nocompletingjobs": "", "nocompletingjobs": "",
"nodateselected": "No se ha seleccionado ninguna fecha.", "nodateselected": "No se ha seleccionado ninguna fecha.",
@@ -833,6 +837,7 @@
}, },
"employees": { "employees": {
"actions": { "actions": {
"addvacation": "",
"new": "Nuevo empleado", "new": "Nuevo empleado",
"newrate": "" "newrate": ""
}, },
@@ -854,10 +859,16 @@
"pin": "", "pin": "",
"rate": "", "rate": "",
"termination_date": "Fecha de conclusión", "termination_date": "Fecha de conclusión",
"user_email": "" "user_email": "",
"vacation": {
"end": "",
"length": "",
"start": ""
}
}, },
"labels": { "labels": {
"actions": "", "actions": "",
"endmustbeafterstart": "",
"flat_rate": "", "flat_rate": "",
"name": "", "name": "",
"rate_type": "", "rate_type": "",

13
client/src/translations/fr/common.json
View File

@@ -37,7 +37,9 @@
"fields": { "fields": {
"alt_transport": "", "alt_transport": "",
"color": "", "color": "",
"end": "",
"note": "", "note": "",
"start": "",
"time": "", "time": "",
"title": "Titre" "title": "Titre"
}, },
@@ -47,8 +49,10 @@
"blocked": "", "blocked": "",
"cancelledappointment": "Rendez-vous annulé pour:", "cancelledappointment": "Rendez-vous annulé pour:",
"completingjobs": "", "completingjobs": "",
"dataconsistency": "",
"history": "", "history": "",
"inproduction": "", "inproduction": "",
"manualevent": "",
"noarrivingjobs": "", "noarrivingjobs": "",
"nocompletingjobs": "", "nocompletingjobs": "",
"nodateselected": "Aucune date n'a été sélectionnée.", "nodateselected": "Aucune date n'a été sélectionnée.",
@@ -833,6 +837,7 @@
}, },
"employees": { "employees": {
"actions": { "actions": {
"addvacation": "",
"new": "Nouvel employé", "new": "Nouvel employé",
"newrate": "" "newrate": ""
}, },
@@ -854,10 +859,16 @@
"pin": "", "pin": "",
"rate": "", "rate": "",
"termination_date": "Date de résiliation", "termination_date": "Date de résiliation",
"user_email": "" "user_email": "",
"vacation": {
"end": "",
"length": "",
"start": ""
}
}, },
"labels": { "labels": {
"actions": "", "actions": "",
"endmustbeafterstart": "",
"flat_rate": "", "flat_rate": "",
"name": "", "name": "",
"rate_type": "", "rate_type": "",

89
hasura/metadata/tables.yaml
View File

@@ -1773,6 +1773,88 @@
_eq: X-Hasura-User-Id _eq: X-Hasura-User-Id
- active: - active:
_eq: true _eq: true
- table:
schema: public
name: employee_vacation
object_relationships:
- name: employee
using:
foreign_key_constraint_on: employeeid
insert_permissions:
- role: user
permission:
check:
employee:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
columns:
- id
- created_at
- updated_at
- employeeid
- start
- end
backend_only: false
select_permissions:
- role: user
permission:
columns:
- end
- start
- created_at
- updated_at
- employeeid
- id
filter:
employee:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
update_permissions:
- role: user
permission:
columns:
- end
- start
- created_at
- updated_at
- employeeid
- id
filter:
employee:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
check: null
delete_permissions:
- role: user
permission:
filter:
employee:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
- table: - table:
schema: public schema: public
name: employees name: employees
@@ -1791,6 +1873,13 @@
table: table:
schema: public schema: public
name: allocations name: allocations
- name: employee_vacations
using:
foreign_key_constraint_on:
column: employeeid
table:
schema: public
name: employee_vacation
- name: jobsByEmployeeBody - name: jobsByEmployeeBody
using: using:
foreign_key_constraint_on: foreign_key_constraint_on:

1
hasura/migrations/1641339745427_create_table_public_employee_vacation/down.sql Normal file
View File

@@ -0,0 +1 @@
DROP TABLE "public"."employee_vacation";

18
hasura/migrations/1641339745427_create_table_public_employee_vacation/up.sql Normal file
View File

@@ -0,0 +1,18 @@
CREATE TABLE "public"."employee_vacation" ("id" uuid NOT NULL DEFAULT gen_random_uuid(), "created_at" timestamptz NOT NULL DEFAULT now(), "updated_at" timestamptz NOT NULL DEFAULT now(), "employeeid" uuid NOT NULL, "start" date NOT NULL, "end" date NOT NULL, PRIMARY KEY ("id") , FOREIGN KEY ("employeeid") REFERENCES "public"."employees"("id") ON UPDATE cascade ON DELETE cascade);
CREATE OR REPLACE FUNCTION "public"."set_current_timestamp_updated_at"()
RETURNS TRIGGER AS $$
DECLARE
_new record;
BEGIN
_new := NEW;
_new."updated_at" = NOW();
RETURN _new;
END;
$$ LANGUAGE plpgsql;
CREATE TRIGGER "set_public_employee_vacation_updated_at"
BEFORE UPDATE ON "public"."employee_vacation"
FOR EACH ROW
EXECUTE PROCEDURE "public"."set_current_timestamp_updated_at"();
COMMENT ON TRIGGER "set_public_employee_vacation_updated_at" ON "public"."employee_vacation"
IS 'trigger to set value of column "updated_at" to current timestamp on row update';
CREATE EXTENSION IF NOT EXISTS pgcrypto;