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

Merged in release/2021-09-03 (pull request #194)

Browse Source 
release/2021-09-03

Approved-by: Patrick Fic
This commit is contained in:
Patrick Fic
2021-09-01 16:19:58 +00:00
parent 4cb92c8508 47edb0bdf4
commit 9ad5b9547f
3 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx
View File

@@ -53,6 +53,20 @@ export function JobChecklistForm({
setLoading(true); setLoading(true);
logImEXEvent("job_complete_intake"); logImEXEvent("job_complete_intake");
console.log({
values,
job,
production_vars: {
...job.production_vars,
note:
values.production_vars &&
values.production_vars.note &&
values.production_vars.note !== ""
? job.production_vars && values.production_vars.note
: job.production_vars && job.production_vars.note,
},
});
const result = await intakeJob({ const result = await intakeJob({
variables: { variables: {
jobId: jobId, jobId: jobId,
@@ -65,12 +79,12 @@ export function JobChecklistForm({
...(type === "intake" && { ...(type === "intake" && {
production_vars: { production_vars: {
...job.production_vars, ...job.production_vars,
...values.production_vars,
note: note:
values.production_vars && values.production_vars &&
values.production_vars.note && values.production_vars.note &&
values.production_vars.note !== "" values.production_vars.note !== ""
? job.production_vars && values.production_vars.note ? values.production_vars && values.production_vars.note
: job.production_vars && job.production_vars.note, : job.production_vars && job.production_vars.note,
}, },
}), }),

7
client/src/components/job-scoreboard-add-button/job-scoreboard-add-button.component.jsx
View File

@@ -1,12 +1,11 @@
import { useMutation } from "@apollo/client"; import { useMutation } from "@apollo/client";
import { Button, Card, Form, notification, Popover } from "antd"; import { Button, Card, Form, InputNumber, notification, Popover } from "antd";
import moment from "moment"; import moment from "moment";
import React, { useState } from "react"; import React, { useState } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { logImEXEvent } from "../../firebase/firebase.utils"; import { logImEXEvent } from "../../firebase/firebase.utils";
import { INSERT_SCOREBOARD_ENTRY } from "../../graphql/scoreboard.queries"; import { INSERT_SCOREBOARD_ENTRY } from "../../graphql/scoreboard.queries";
import FormDatePicker from "../form-date-picker/form-date-picker.component"; import FormDatePicker from "../form-date-picker/form-date-picker.component";
import InputNumberCalculator from "../form-input-number-calculator/form-input-number-calculator.component";
export default function ScoreboardAddButton({ export default function ScoreboardAddButton({
job, job,
@@ -73,7 +72,7 @@ export default function ScoreboardAddButton({
}, },
]} ]}
> >
<InputNumberCalculator precision={1} /> <InputNumber precision={1} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("scoreboard.fields.painthrs")} label={t("scoreboard.fields.painthrs")}
@@ -85,7 +84,7 @@ export default function ScoreboardAddButton({
}, },
]} ]}
> >
<InputNumberCalculator precision={1} /> <InputNumber precision={1} />
</Form.Item> </Form.Item>
<Button type="primary" htmlType="submit"> <Button type="primary" htmlType="submit">

9
client/src/components/scoreboard-entry-edit/scoreboard-entry-edit.component.jsx
View File

@@ -1,10 +1,9 @@
import { Button, Card, Dropdown, Form, notification } from "antd";
import React, { useState } from "react";
import { useMutation } from "@apollo/client"; import { useMutation } from "@apollo/client";
import { Button, Card, Dropdown, Form, InputNumber, notification } from "antd";
import React, { useState } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { UPDATE_SCOREBOARD_ENTRY } from "../../graphql/scoreboard.queries"; import { UPDATE_SCOREBOARD_ENTRY } from "../../graphql/scoreboard.queries";
import FormDatePicker from "../form-date-picker/form-date-picker.component"; import FormDatePicker from "../form-date-picker/form-date-picker.component";
import InputNumberCalculator from "../form-input-number-calculator/form-input-number-calculator.component";
export default function ScoreboardEntryEdit({ entry }) { export default function ScoreboardEntryEdit({ entry }) {
const [visible, setVisible] = useState(false); const [visible, setVisible] = useState(false);
@@ -64,7 +63,7 @@ export default function ScoreboardEntryEdit({ entry }) {
}, },
]} ]}
> >
<InputNumberCalculator precision={1} /> <InputNumber precision={1} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("scoreboard.fields.painthrs")} label={t("scoreboard.fields.painthrs")}
@@ -76,7 +75,7 @@ export default function ScoreboardEntryEdit({ entry }) {
}, },
]} ]}
> >
<InputNumberCalculator precision={1} /> <InputNumber precision={1} />
</Form.Item> </Form.Item>
<Button type="primary" loading={loading} htmlType="submit"> <Button type="primary" loading={loading} htmlType="submit">