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

Merged in release/2024-11-01 (pull request #1874)

Browse Source 
Release/2024-11-01 IO-3012 IO-3009 IO 3010
This commit is contained in:
Dave Richer
2024-10-31 17:07:31 +00:00
parent a715fccd47 d4adc4c1aa
commit dba41e7732
8 changed files with 88 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
client/src/components/form-date-time-picker/form-date-time-picker.component.jsx
View File

@@ -2,11 +2,11 @@ import { DatePicker } from "antd";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import React, { useCallback, useState } from "react"; import React, { useCallback, useState } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import dayjs from "../../utils/day"; import { connect } from "react-redux";
import { fuzzyMatchDate } from "./formats.js";
import { createStructuredSelector } from "reselect"; import { createStructuredSelector } from "reselect";
import { selectBodyshop } from "../../redux/user/user.selectors.js"; import { selectBodyshop } from "../../redux/user/user.selectors.js";
import { connect } from "react-redux"; import dayjs from "../../utils/day";
import { fuzzyMatchDate } from "./formats.js";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop bodyshop: selectBodyshop
@@ -28,7 +28,6 @@ const DateTimePicker = ({
const handleChange = useCallback( const handleChange = useCallback(
(newDate) => { (newDate) => {
if (!newDate) return;
if (onChange) { if (onChange) {
onChange(bodyshop?.timezone ? dayjs(newDate).tz(bodyshop.timezone, true) : newDate); onChange(bodyshop?.timezone ? dayjs(newDate).tz(bodyshop.timezone, true) : newDate);
} }

115
client/src/components/task-list/task-list.component.jsx
View File

@@ -144,7 +144,7 @@ function TaskListComponent({
title: t("tasks.fields.created_by"), title: t("tasks.fields.created_by"),
dataIndex: "created_by", dataIndex: "created_by",
key: "created_by", key: "created_by",
width: "10%", width: "8%",
defaultSortOrder: "descend", defaultSortOrder: "descend",
sorter: true, sorter: true,
sortOrder: sortcolumn === "created_by" && sortorder, sortOrder: sortcolumn === "created_by" && sortorder,
@@ -166,65 +166,70 @@ function TaskListComponent({
}); });
} }
if (showRo) { columns.push({
columns.push({ title: t("tasks.fields.related_items"),
title: t("tasks.fields.job.ro_number"), key: "related_items",
dataIndex: ["job", "ro_number"], width: "12%",
key: "job.ro_number", render: (text, record) => {
width: "8%", const items = [];
render: (text, record) =>
record.job ? ( // Job
<Link to={`/manage/jobs/${record.job.id}?tab=tasks`}>{record.job.ro_number || t("general.labels.na")}</Link> if (showRo && record.job) {
) : ( items.push(
t("general.labels.na") <Link key="job" to={`/manage/jobs/${record.job.id}?tab=tasks`}>
) {t("tasks.fields.job.ro_number")}: {record.job.ro_number}
}); </Link>
} );
}
if (showRo && !record.job) {
items.push(`${t("tasks.fields.job.ro_number")}: ${t("general.labels.na")}`);
}
// Jobline
if (record.jobline?.line_desc) {
items.push(
<span key="jobline">
{t("tasks.fields.jobline")}: {record.jobline.line_desc}
</span>
);
}
// Parts Order
if (record.parts_order) {
const { order_number, vendor } = record.parts_order;
const partsOrderText =
order_number && vendor?.name ? `${order_number} - ${vendor.name}` : t("general.labels.na");
items.push(
<Link
key="parts_order"
to={`/manage/jobs/${record.job.id}?partsorderid=${record.parts_order.id}&tab=partssublet`}
>
{t("tasks.fields.parts_order")}: {partsOrderText}
</Link>
);
}
// Bill
if (record.bill) {
const { invoice_number, vendor } = record.bill;
const billText = invoice_number && vendor?.name ? `${invoice_number} - ${vendor.name}` : t("general.labels.na");
items.push(
<Link key="bill" to={`/manage/jobs/${record.job.id}?billid=${record.bill.id}&tab=partssublet`}>
{t("tasks.fields.bill")}: {billText}
</Link>
);
}
return items.length > 0 ? <Space direction="vertical">{items}</Space> : null;
}
});
columns.push( columns.push(
{
title: t("tasks.fields.jobline"),
dataIndex: ["jobline", "id"],
key: "jobline.id",
width: "8%",
render: (text, record) => record?.jobline?.line_desc || ""
},
{
title: t("tasks.fields.parts_order"),
dataIndex: ["parts_order", "id"],
key: "part_order.id",
width: "8%",
render: (text, record) =>
record.parts_order ? (
<Link to={`/manage/jobs/${record.job.id}?partsorderid=${record.parts_order.id}&tab=partssublet`}>
{record.parts_order.order_number && record.parts_order.vendor && record.parts_order.vendor.name
? `${record.parts_order.order_number} - ${record.parts_order.vendor.name}`
: t("general.labels.na")}
</Link>
) : (
""
)
},
{
title: t("tasks.fields.bill"),
dataIndex: ["bill", "id"],
key: "bill.id",
width: "10%",
render: (text, record) =>
record.bill ? (
<Link to={`/manage/jobs/${record.job.id}?billid=${record.bill.id}&tab=partssublet`}>
{record.bill.invoice_number && record.bill.vendor && record.bill.vendor.name
? `${record.bill.invoice_number} - ${record.bill.vendor.name}`
: t("general.labels.na")}
</Link>
) : (
""
)
},
{ {
title: t("tasks.fields.title"), title: t("tasks.fields.title"),
dataIndex: "title", dataIndex: "title",
key: "title", key: "title",
minWidth: "20%",
sorter: true, sorter: true,
sortOrder: sortcolumn === "title" && sortorder sortOrder: sortcolumn === "title" && sortorder
}, },
@@ -258,7 +263,7 @@ function TaskListComponent({
{ {
title: t("tasks.fields.actions"), title: t("tasks.fields.actions"),
key: "toggleCompleted", key: "toggleCompleted",
width: "5%", width: "8%",
render: (text, record) => ( render: (text, record) => (
<Space direction="horizontal"> <Space direction="horizontal">
<Button <Button

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

@@ -145,7 +145,6 @@ export const QUERY_TIME_TICKETS_IN_RANGE_SB = gql`
) { ) {
timetickets( timetickets(
where: { date: { _gte: $start, _lte: $end }, cost_center: { _neq: "timetickets.labels.shift" } } where: { date: { _gte: $start, _lte: $end }, cost_center: { _neq: "timetickets.labels.shift" } }
order_by: { date: desc_nulls_first }
) { ) {
actualhrs actualhrs
ciecacode ciecacode
@@ -180,7 +179,6 @@ export const QUERY_TIME_TICKETS_IN_RANGE_SB = gql`
} }
fixedperiod: timetickets( fixedperiod: timetickets(
where: { date: { _gte: $fixedStart, _lte: $fixedEnd }, cost_center: { _neq: "timetickets.labels.shift" } } where: { date: { _gte: $fixedStart, _lte: $fixedEnd }, cost_center: { _neq: "timetickets.labels.shift" } }
order_by: { date: desc_nulls_first }
) { ) {
actualhrs actualhrs
ciecacode ciecacode

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

@@ -3204,6 +3204,7 @@
"medium": "Medium" "medium": "Medium"
}, },
"priority": "Priority", "priority": "Priority",
"related_items": "Related Items",
"remind_at": "Remind At", "remind_at": "Remind At",
"title": "Title" "title": "Title"
}, },

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

@@ -3204,6 +3204,7 @@
"medium": "" "medium": ""
}, },
"priority": "", "priority": "",
"related_items": "",
"remind_at": "", "remind_at": "",
"title": "" "title": ""
}, },

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

@@ -3204,6 +3204,7 @@
"medium": "" "medium": ""
}, },
"priority": "", "priority": "",
"related_items": "",
"remind_at": "", "remind_at": "",
"title": "" "title": ""
}, },

62
hasura/metadata/tables.yaml
View File

@@ -69,7 +69,6 @@
delete_permissions: delete_permissions:
- role: user - role: user
permission: permission:
backend_only: false
filter: filter:
jobline: jobline:
job: job:
@@ -180,7 +179,6 @@
delete_permissions: delete_permissions:
- role: user - role: user
permission: permission:
backend_only: false
filter: filter:
bodyshop: bodyshop:
associations: associations:
@@ -387,7 +385,6 @@
delete_permissions: delete_permissions:
- role: user - role: user
permission: permission:
backend_only: false
filter: filter:
bodyshop: bodyshop:
associations: associations:
@@ -504,7 +501,6 @@
delete_permissions: delete_permissions:
- role: user - role: user
permission: permission:
backend_only: false
filter: filter:
bill: bill:
job: job:
@@ -671,7 +667,6 @@
delete_permissions: delete_permissions:
- role: user - role: user
permission: permission:
backend_only: false
filter: filter:
_and: _and:
- job: - job:
@@ -1285,7 +1280,6 @@
delete_permissions: delete_permissions:
- role: user - role: user
permission: permission:
backend_only: false
filter: filter:
courtesycar: courtesycar:
bodyshop: bodyshop:
@@ -1526,7 +1520,6 @@
delete_permissions: delete_permissions:
- role: user - role: user
permission: permission:
backend_only: false
filter: filter:
bodyshop: bodyshop:
associations: associations:
@@ -1786,7 +1779,6 @@
delete_permissions: delete_permissions:
- role: user - role: user
permission: permission:
backend_only: false
filter: filter:
bodyshop: bodyshop:
associations: associations:
@@ -1920,7 +1912,6 @@
delete_permissions: delete_permissions:
- role: user - role: user
permission: permission:
backend_only: false
filter: filter:
_or: _or:
- job: - job:
@@ -2105,7 +2096,6 @@
delete_permissions: delete_permissions:
- role: user - role: user
permission: permission:
backend_only: false
filter: filter:
employee_team: employee_team:
bodyshop: bodyshop:
@@ -2268,7 +2258,6 @@
delete_permissions: delete_permissions:
- role: user - role: user
permission: permission:
backend_only: false
filter: filter:
employee: employee:
bodyshop: bodyshop:
@@ -2449,7 +2438,6 @@
delete_permissions: delete_permissions:
- role: user - role: user
permission: permission:
backend_only: false
filter: filter:
bodyshop: bodyshop:
associations: associations:
@@ -2696,7 +2684,6 @@
delete_permissions: delete_permissions:
- role: user - role: user
permission: permission:
backend_only: false
filter: filter:
bodyshop: bodyshop:
associations: associations:
@@ -2808,7 +2795,6 @@
delete_permissions: delete_permissions:
- role: user - role: user
permission: permission:
backend_only: false
filter: filter:
conversation: conversation:
bodyshop: bodyshop:
@@ -3123,7 +3109,6 @@
delete_permissions: delete_permissions:
- role: user - role: user
permission: permission:
backend_only: false
filter: filter:
job: job:
bodyshop: bodyshop:
@@ -4232,7 +4217,6 @@
delete_permissions: delete_permissions:
- role: user - role: user
permission: permission:
backend_only: false
filter: filter:
bodyshop: bodyshop:
associations: associations:
@@ -4248,41 +4232,41 @@
enable_manual: false enable_manual: false
update: update:
columns: columns:
- clm_no
- v_make_desc
- date_next_contact
- status
- employee_csr
- employee_prep - employee_prep
- clm_total - clm_total
- suspended - suspended
- employee_body - employee_body
- ro_number - ro_number
- actual_in
- ownr_co_nm - ownr_co_nm
- v_model_yr
- comment
- job_totals
- v_vin - v_vin
- ownr_fn
- scheduled_completion - scheduled_completion
- special_coverage_policy - special_coverage_policy
- v_color
- ca_gst_registrant
- scheduled_delivery - scheduled_delivery
- actual_delivery - actual_delivery
- actual_completion - actual_completion
- kanbanparent - kanbanparent
- est_ct_fn - est_ct_fn
- alt_transport
- v_model_desc
- clm_no
- v_make_desc
- date_next_contact
- status
- employee_csr
- actual_in
- v_model_yr
- comment
- job_totals
- ownr_fn
- v_color
- ca_gst_registrant
- employee_refinish - employee_refinish
- ownr_ph1 - ownr_ph1
- date_last_contacted - date_last_contacted
- alt_transport
- inproduction - inproduction
- est_ct_ln - est_ct_ln
- production_vars - production_vars
- category - category
- v_model_desc
- date_invoiced - date_invoiced
- est_co_nm - est_co_nm
- ownr_ln - ownr_ln
@@ -4295,6 +4279,12 @@
- name: event-secret - name: event-secret
value_from_env: EVENT_SECRET value_from_env: EVENT_SECRET
request_transform: request_transform:
body:
action: transform
template: |-
{
"data": {{$body?.event?.data?.new}}
}
method: POST method: POST
query_params: {} query_params: {}
template_engine: Kriti template_engine: Kriti
@@ -4496,7 +4486,6 @@
delete_permissions: delete_permissions:
- role: user - role: user
permission: permission:
backend_only: false
filter: filter:
conversation: conversation:
bodyshop: bodyshop:
@@ -4670,7 +4659,6 @@
delete_permissions: delete_permissions:
- role: user - role: user
permission: permission:
backend_only: false
filter: filter:
job: job:
bodyshop: bodyshop:
@@ -4805,7 +4793,6 @@
delete_permissions: delete_permissions:
- role: user - role: user
permission: permission:
backend_only: false
filter: filter:
bodyshop: bodyshop:
associations: associations:
@@ -5110,7 +5097,6 @@
delete_permissions: delete_permissions:
- role: user - role: user
permission: permission:
backend_only: false
filter: filter:
parts_order: parts_order:
job: job:
@@ -5243,7 +5229,6 @@
delete_permissions: delete_permissions:
- role: user - role: user
permission: permission:
backend_only: false
filter: filter:
job: job:
bodyshop: bodyshop:
@@ -5419,7 +5404,6 @@
delete_permissions: delete_permissions:
- role: user - role: user
permission: permission:
backend_only: false
filter: filter:
job: job:
bodyshop: bodyshop:
@@ -5559,7 +5543,6 @@
delete_permissions: delete_permissions:
- role: user - role: user
permission: permission:
backend_only: false
filter: filter:
bodyshop: bodyshop:
associations: associations:
@@ -5670,7 +5653,6 @@
delete_permissions: delete_permissions:
- role: user - role: user
permission: permission:
backend_only: false
filter: filter:
_or: _or:
- parentjob_rel: - parentjob_rel:
@@ -5760,7 +5742,6 @@
delete_permissions: delete_permissions:
- role: user - role: user
permission: permission:
backend_only: false
filter: filter:
job: job:
bodyshop: bodyshop:
@@ -6045,7 +6026,6 @@
delete_permissions: delete_permissions:
- role: user - role: user
permission: permission:
backend_only: false
filter: filter:
bodyshop: bodyshop:
associations: associations:
@@ -6541,7 +6521,6 @@
delete_permissions: delete_permissions:
- role: user - role: user
permission: permission:
backend_only: false
filter: filter:
bodyshop: bodyshop:
associations: associations:
@@ -6698,7 +6677,6 @@
delete_permissions: delete_permissions:
- role: user - role: user
permission: permission:
backend_only: false
filter: filter:
bodyshop: bodyshop:
associations: associations:

4
server/job/job-updated.js
View File

@@ -3,7 +3,7 @@ const { isObject } = require("lodash");
const jobUpdated = async (req, res) => { const jobUpdated = async (req, res) => {
const { ioRedis, logger, ioHelpers } = req; const { ioRedis, logger, ioHelpers } = req;
if (!req?.body?.event?.data?.new || !isObject(req?.body?.event?.data?.new)) { if (!req?.body?.data || !isObject(req.body.data)) {
logger.log("job-update-error", "ERROR", req.user?.email, null, { logger.log("job-update-error", "ERROR", req.user?.email, null, {
message: `Malformed Job Update request sent from Hasura`, message: `Malformed Job Update request sent from Hasura`,
body: req?.body body: req?.body
@@ -22,7 +22,7 @@ const jobUpdated = async (req, res) => {
// jobid: req?.body?.event?.data?.new?.id // jobid: req?.body?.event?.data?.new?.id
// }); // });
const updatedJob = req.body.event.data.new; const updatedJob = req.body.data;
const bodyshopID = updatedJob.shopid; const bodyshopID = updatedJob.shopid;
// Emit the job-updated event only to the room corresponding to the bodyshop // Emit the job-updated event only to the room corresponding to the bodyshop