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

IO-3292 Add note pinning functionality.

Browse Source
This commit is contained in:
Patrick Fic
2025-07-22 09:03:41 -07:00
parent 953e70efef
commit 1934ae0758
15 changed files with 1757 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1150
bodyshop_translations.babel
View File

File diff suppressed because it is too large Load Diff

52
client/src/components/job-notes-pin-toggle/job-notes-pin-toggle.component.jsx Normal file
View File

@@ -0,0 +1,52 @@
import { PushpinFilled, PushpinOutlined } from "@ant-design/icons";
import { useMutation } from "@apollo/client";
import { GET_JOB_BY_PK } from "../../graphql/jobs.queries";
import { UPDATE_NOTE } from "../../graphql/notes.queries";
function JobNotesPinToggle({ note }) {
const [updateNote] = useMutation(UPDATE_NOTE, {
update(cache, { data: { updateNote: updatedNote } }) {
try {
const existingJob = cache.readQuery({
query: GET_JOB_BY_PK,
variables: { id: note.jobid }
});
if (existingJob) {
cache.writeQuery({
query: GET_JOB_BY_PK,
variables: { id: note.jobid },
data: {
...existingJob,
job: {
...existingJob.job,
notes: updatedNote.pinned
? [updatedNote, ...existingJob.job.notes]
: existingJob.job.notes.filter((n) => n.id !== updatedNote.id)
}
}
});
}
} catch (error) {
// Query not yet executed is most likely. No logging as this isn't a fatal error.
}
}
});
const handlePinToggle = () => {
updateNote({
variables: {
noteId: note.id,
note: { pinned: !note.pinned }
}
});
};
return note.pinned ? (
<PushpinFilled size="large" onClick={handlePinToggle} style={{ color: "gold" }} />
) : (
<PushpinOutlined size="large" onClick={handlePinToggle} />
);
}
export default JobNotesPinToggle;

482
client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
View File

@@ -23,6 +23,7 @@ import JobAltTransportChange from "../job-at-change/job-at-change.component";
import JobEmployeeAssignments from "../job-employee-assignments/job-employee-assignments.container"; import JobEmployeeAssignments from "../job-employee-assignments/job-employee-assignments.container";
import JobsRelatedRos from "../jobs-related-ros/jobs-related-ros.component"; import JobsRelatedRos from "../jobs-related-ros/jobs-related-ros.component";
import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component"; import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
import PinnedJobNotes from "../pinned-job-notes/pinned-job-notes.component.jsx";
import ProductionListColumnComment from "../production-list-columns/production-list-columns.comment.component"; import ProductionListColumnComment from "../production-list-columns/production-list-columns.comment.component";
import ProductionListColumnProductionNote from "../production-list-columns/production-list-columns.productionnote.component"; import ProductionListColumnProductionNote from "../production-list-columns/production-list-columns.productionnote.component";
import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component"; import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component";
@@ -102,254 +103,257 @@ export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail })
}; };
return ( return (
<Row gutter={[16, 16]} style={{ alignItems: "stretch" }}> <>
<Col {...colSpan}> <Row gutter={[16, 16]} style={{ alignItems: "stretch" }}>
<Card title={"Job Status"} style={{ height: "100%" }}> <Col {...colSpan}>
<div> <Card title={"Job Status"} style={{ height: "100%" }}>
<DataLabel label={t("jobs.fields.status")}> <div>
<DataLabel label={t("jobs.fields.status")}>
<Space wrap>
{job.status}
{job.inproduction && <Tag color="#f50">{t("jobs.labels.inproduction")}</Tag>}
{job.suspended && <PauseCircleOutlined style={{ color: "orangered" }} />}
{job.iouparent && (
<Link to={`/manage/jobs/${job.iouparent}`}>
<Tooltip title={t("jobs.labels.iou")}>
<BranchesOutlined style={{ color: "orangered" }} />
</Tooltip>
</Link>
)}
{job.production_vars && job.production_vars.alert ? (
<ExclamationCircleFilled className="production-alert" />
) : null}
{job.status === bodyshop.md_ro_statuses.default_scheduled && job.scheduled_in ? (
<Tag>
<Link to={`/manage/schedule?date=${dayjs(job.scheduled_in).format("YYYY-MM-DD")}`}>
<DateTimeFormatter>{job.scheduled_in}</DateTimeFormatter>
</Link>
</Tag>
) : null}
</Space>
</DataLabel>
<DataLabel label={t("jobs.fields.comment")} valueStyle={{ overflow: "hidden", textOverflow: "ellipsis" }}>
<ProductionListColumnComment record={job} />
</DataLabel>
<DataLabel label={t("jobs.fields.ins_co_nm_short")}>{job.ins_co_nm}</DataLabel>
<DataLabel label={t("jobs.fields.clm_no")}>{job.clm_no}</DataLabel>
<DataLabel label={t("jobs.fields.ponumber")} hideIfNull>
{job.po_number}
</DataLabel>
<DataLabel label={t("jobs.fields.repairtotal")}>
<CurrencyFormatter>{job.clm_total}</CurrencyFormatter>
<span style={{ margin: "0rem .5rem" }}>/</span>
<CurrencyFormatter>{job.owner_owing}</CurrencyFormatter>
</DataLabel>
<DataLabel label={t("jobs.fields.alt_transport")}>
{job.alt_transport}
<JobAltTransportChange job={job} />
</DataLabel>
{job?.cccontracts?.length > 0 && (
<DataLabel label={t("jobs.labels.contracts")}>
{job.cccontracts.map((c, index) => (
<Space key={c.id} wrap>
<Link to={`/manage/courtesycars/contracts/${c.id}`}>
{`${c.agreementnumber} - ${c.courtesycar.fleetnumber} ${c.courtesycar.year} ${c.courtesycar.make} ${c.courtesycar.model}`}
{index !== job.cccontracts.length - 1 ? "," : null}
</Link>
</Space>
))}
</DataLabel>
)}
<DataLabel label={t("jobs.fields.production_vars.note")}>
<ProductionListColumnProductionNote record={job} />
</DataLabel>
<DataLabel label={t("jobs.fields.estimate_sent_approval")}>
<Space>
<Checkbox
checked={!!job.estimate_sent_approval}
onChange={(e) => handleCheckboxChange("estimate_sent_approval", e.target.checked)}
disabled={disabled}
>
{job.estimate_sent_approval && (
<span style={{ color: "#888" }}>
<DateTimeFormatter>{job.estimate_sent_approval}</DateTimeFormatter>
</span>
)}
</Checkbox>
</Space>
</DataLabel>
<DataLabel label={t("jobs.fields.estimate_approved")}>
<Space>
<Checkbox
checked={!!job.estimate_approved}
onChange={(e) => handleCheckboxChange("estimate_approved", e.target.checked)}
disabled={disabled}
>
{job.estimate_approved && (
<span style={{ color: "#888" }}>
<DateTimeFormatter>{job.estimate_approved}</DateTimeFormatter>
</span>
)}
</Checkbox>
</Space>
</DataLabel>
<Space wrap> <Space wrap>
{job.status} {job.special_coverage_policy && (
{job.inproduction && <Tag color="#f50">{t("jobs.labels.inproduction")}</Tag>} <Tag color="tomato">
{job.suspended && <PauseCircleOutlined style={{ color: "orangered" }} />} <Space>
{job.iouparent && ( <WarningFilled />
<Link to={`/manage/jobs/${job.iouparent}`}> <span>{t("jobs.labels.specialcoveragepolicy")}</span>
<Tooltip title={t("jobs.labels.iou")}> </Space>
<BranchesOutlined style={{ color: "orangered" }} />
</Tooltip>
</Link>
)}
{job.production_vars && job.production_vars.alert ? (
<ExclamationCircleFilled className="production-alert" />
) : null}
{job.status === bodyshop.md_ro_statuses.default_scheduled && job.scheduled_in ? (
<Tag>
<Link to={`/manage/schedule?date=${dayjs(job.scheduled_in).format("YYYY-MM-DD")}`}>
<DateTimeFormatter>{job.scheduled_in}</DateTimeFormatter>
</Link>
</Tag> </Tag>
) : null} )}
{job.ca_gst_registrant && (
<Tag color="geekblue">
<Space>
<WarningFilled />
<span>{t("jobs.fields.ca_gst_registrant")}</span>
</Space>
</Tag>
)}
{job.hit_and_run && (
<Tag color="green">
<Space>
<WarningFilled />
<span>{t("jobs.fields.hit_and_run")}</span>
</Space>
</Tag>
)}
</Space> </Space>
</DataLabel> </div>
<DataLabel label={t("jobs.fields.comment")} valueStyle={{ overflow: "hidden", textOverflow: "ellipsis" }}> </Card>
<ProductionListColumnComment record={job} /> </Col>
</DataLabel> <Col {...colSpan}>
<DataLabel label={t("jobs.fields.ins_co_nm_short")}>{job.ins_co_nm}</DataLabel> <Card
<DataLabel label={t("jobs.fields.clm_no")}>{job.clm_no}</DataLabel> style={{ height: "100%" }}
<DataLabel label={t("jobs.fields.ponumber")} hideIfNull> title={
{job.po_number}
</DataLabel>
<DataLabel label={t("jobs.fields.repairtotal")}>
<CurrencyFormatter>{job.clm_total}</CurrencyFormatter>
<span style={{ margin: "0rem .5rem" }}>/</span>
<CurrencyFormatter>{job.owner_owing}</CurrencyFormatter>
</DataLabel>
<DataLabel label={t("jobs.fields.alt_transport")}>
{job.alt_transport}
<JobAltTransportChange job={job} />
</DataLabel>
{job?.cccontracts?.length > 0 && (
<DataLabel label={t("jobs.labels.contracts")}>
{job.cccontracts.map((c, index) => (
<Space key={c.id} wrap>
<Link to={`/manage/courtesycars/contracts/${c.id}`}>
{`${c.agreementnumber} - ${c.courtesycar.fleetnumber} ${c.courtesycar.year} ${c.courtesycar.make} ${c.courtesycar.model}`}
{index !== job.cccontracts.length - 1 ? "," : null}
</Link>
</Space>
))}
</DataLabel>
)}
<DataLabel label={t("jobs.fields.production_vars.note")}>
<ProductionListColumnProductionNote record={job} />
</DataLabel>
<DataLabel label={t("jobs.fields.estimate_sent_approval")}>
<Space>
<Checkbox
checked={!!job.estimate_sent_approval}
onChange={(e) => handleCheckboxChange("estimate_sent_approval", e.target.checked)}
disabled={disabled}
>
{job.estimate_sent_approval && (
<span style={{ color: "#888" }}>
<DateTimeFormatter>{job.estimate_sent_approval}</DateTimeFormatter>
</span>
)}
</Checkbox>
</Space>
</DataLabel>
<DataLabel label={t("jobs.fields.estimate_approved")}>
<Space>
<Checkbox
checked={!!job.estimate_approved}
onChange={(e) => handleCheckboxChange("estimate_approved", e.target.checked)}
disabled={disabled}
>
{job.estimate_approved && (
<span style={{ color: "#888" }}>
<DateTimeFormatter>{job.estimate_approved}</DateTimeFormatter>
</span>
)}
</Checkbox>
</Space>
</DataLabel>
<Space wrap>
{job.special_coverage_policy && (
<Tag color="tomato">
<Space>
<WarningFilled />
<span>{t("jobs.labels.specialcoveragepolicy")}</span>
</Space>
</Tag>
)}
{job.ca_gst_registrant && (
<Tag color="geekblue">
<Space>
<WarningFilled />
<span>{t("jobs.fields.ca_gst_registrant")}</span>
</Space>
</Tag>
)}
{job.hit_and_run && (
<Tag color="green">
<Space>
<WarningFilled />
<span>{t("jobs.fields.hit_and_run")}</span>
</Space>
</Tag>
)}
</Space>
</div>
</Card>
</Col>
<Col {...colSpan}>
<Card
style={{ height: "100%" }}
title={
disabled ? (
<>{ownerTitle.length > 0 ? ownerTitle : t("owner.labels.noownerinfo")}</>
) : (
<Link to={`/manage/owners/${job.owner.id}`}>
{ownerTitle.length > 0 ? ownerTitle : t("owner.labels.noownerinfo")}
</Link>
)
}
>
<div>
<DataLabel key="2" label={t("jobs.fields.ownr_ph1")}>
{disabled ? (
<PhoneNumberFormatter>{job.ownr_ph1}</PhoneNumberFormatter>
) : (
<ChatOpenButton phone={job.ownr_ph1} jobid={job.id} />
)}
</DataLabel>
<DataLabel key="22" label={t("jobs.fields.ownr_ph2")}>
{disabled ? (
<PhoneNumberFormatter>{job.ownr_ph2}</PhoneNumberFormatter>
) : (
<ChatOpenButton phone={job.ownr_ph2} jobid={job.id} />
)}
</DataLabel>
<DataLabel key="3" label={t("owners.fields.address")}>
{`${job.ownr_addr1 || ""} ${job.ownr_addr2 || ""} ${
job.ownr_city || ""
} ${job.ownr_st || ""} ${job.ownr_zip || ""}`}
</DataLabel>
<DataLabel key="4" label={t("owners.fields.ownr_ea")}>
{disabled ? (
<>{job.ownr_ea || ""}</>
) : job.ownr_ea ? (
<a href={`mailto:${job.ownr_ea}`}>{job.ownr_ea}</a>
) : null}
</DataLabel>
{job.owner?.tax_number && (
<DataLabel key="5" label={t("owners.fields.tax_number")}>
{job.owner?.tax_number || ""}
</DataLabel>
)}
<DataLabel label={t("owners.fields.note")} valueStyle={{ overflow: "hidden", textOverflow: "ellipsis" }}>
{job.owner?.note || ""}
</DataLabel>
</div>
</Card>
</Col>
<Col {...colSpan}>
<Card
style={{ height: "100%" }}
title={
job.vehicle ? (
disabled ? ( disabled ? (
<>{vehicleTitle.length > 0 ? vehicleTitle : t("vehicles.labels.novehinfo")} </> <>{ownerTitle.length > 0 ? ownerTitle : t("owner.labels.noownerinfo")}</>
) : ( ) : (
<Link to={job.vehicle && `/manage/vehicles/${job.vehicle.id}`}> <Link to={`/manage/owners/${job.owner.id}`}>
{vehicleTitle.length > 0 ? vehicleTitle : t("vehicles.labels.novehinfo")} {ownerTitle.length > 0 ? ownerTitle : t("owner.labels.noownerinfo")}
</Link> </Link>
) )
) : ( }
<span></span> >
) <div>
} <DataLabel key="2" label={t("jobs.fields.ownr_ph1")}>
> {disabled ? (
<div> <PhoneNumberFormatter>{job.ownr_ph1}</PhoneNumberFormatter>
<DataLabel key="2" label={t("vehicles.fields.plate_no")}> ) : (
{`${job.plate_no || t("general.labels.na")} (${`${job.plate_st || t("general.labels.na")}`})`} <ChatOpenButton phone={job.ownr_ph1} jobid={job.id} />
</DataLabel> )}
<DataLabel key="4" label={t("vehicles.fields.v_vin")}>
<VehicleVinDisplay>{`${job.v_vin || t("general.labels.na")}`}</VehicleVinDisplay>
{bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid ? (
job.v_vin?.length !== 17 ? (
<WarningFilled style={{ color: "tomato", marginLeft: ".3rem" }} />
) : null
) : null}
</DataLabel>
<DataLabel label={t("jobs.fields.regie_number")}>{job.regie_number || t("general.labels.na")}</DataLabel>
<DataLabel label={t("jobs.labels.relatedros")}>
<JobsRelatedRos jobid={job.id} job={job} disabled={disabled} />
</DataLabel>
{job.vehicle && job.vehicle.notes && (
<DataLabel
label={t("vehicles.fields.notes")}
valueStyle={{ whiteSpace: "pre-wrap" }}
valueClassName={notesClamped ? "clamp" : ""}
onValueClick={() => setNotesClamped(!notesClamped)}
>
{job.vehicle.notes}
</DataLabel> </DataLabel>
)} <DataLabel key="22" label={t("jobs.fields.ownr_ph2")}>
{job.vehicle && job.vehicle.v_paint_codes && ( {disabled ? (
<DataLabel label={t("vehicles.fields.v_paint_codes", { number: "" })}> <PhoneNumberFormatter>{job.ownr_ph2}</PhoneNumberFormatter>
<span style={{ whiteSpace: "pre" }}> ) : (
{Object.keys(job.vehicle.v_paint_codes) <ChatOpenButton phone={job.ownr_ph2} jobid={job.id} />
.filter( )}
(key) =>
job.vehicle.v_paint_codes[key] !== "" &&
job.vehicle.v_paint_codes[key] !== null &&
job.vehicle.v_paint_codes[key] !== undefined
)
.map((key, idx) => (
<Tag key={idx}>{job.vehicle.v_paint_codes[key]}</Tag>
))}
</span>
</DataLabel> </DataLabel>
)} <DataLabel key="3" label={t("owners.fields.address")}>
</div> {`${job.ownr_addr1 || ""} ${job.ownr_addr2 || ""} ${
</Card> job.ownr_city || ""
</Col> } ${job.ownr_st || ""} ${job.ownr_zip || ""}`}
<Col {...colSpan}> </DataLabel>
<Card <DataLabel key="4" label={t("owners.fields.ownr_ea")}>
style={{ height: "100%" }} {disabled ? (
title={<span id="job-employee-assignments-title">{t("jobs.labels.employeeassignments")}</span>} <>{job.ownr_ea || ""}</>
id={"job-employee-assignments"} ) : job.ownr_ea ? (
> <a href={`mailto:${job.ownr_ea}`}>{job.ownr_ea}</a>
<div> ) : null}
<JobEmployeeAssignments job={job} /> </DataLabel>
<Divider style={{ margin: ".5rem" }} /> {job.owner?.tax_number && (
<DataLabel label={t("jobs.labels.labor_hrs")}> <DataLabel key="5" label={t("owners.fields.tax_number")}>
{bodyHrs.toFixed(1)} / {refinishHrs.toFixed(1)} / {(bodyHrs + refinishHrs).toFixed(1)} {job.owner?.tax_number || ""}
</DataLabel> </DataLabel>
</div> )}
</Card> <DataLabel label={t("owners.fields.note")} valueStyle={{ overflow: "hidden", textOverflow: "ellipsis" }}>
</Col> {job.owner?.note || ""}
</Row> </DataLabel>
</div>
</Card>
</Col>
<Col {...colSpan}>
<Card
style={{ height: "100%" }}
title={
job.vehicle ? (
disabled ? (
<>{vehicleTitle.length > 0 ? vehicleTitle : t("vehicles.labels.novehinfo")} </>
) : (
<Link to={job.vehicle && `/manage/vehicles/${job.vehicle.id}`}>
{vehicleTitle.length > 0 ? vehicleTitle : t("vehicles.labels.novehinfo")}
</Link>
)
) : (
<span></span>
)
}
>
<div>
<DataLabel key="2" label={t("vehicles.fields.plate_no")}>
{`${job.plate_no || t("general.labels.na")} (${`${job.plate_st || t("general.labels.na")}`})`}
</DataLabel>
<DataLabel key="4" label={t("vehicles.fields.v_vin")}>
<VehicleVinDisplay>{`${job.v_vin || t("general.labels.na")}`}</VehicleVinDisplay>
{bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid ? (
job.v_vin?.length !== 17 ? (
<WarningFilled style={{ color: "tomato", marginLeft: ".3rem" }} />
) : null
) : null}
</DataLabel>
<DataLabel label={t("jobs.fields.regie_number")}>{job.regie_number || t("general.labels.na")}</DataLabel>
<DataLabel label={t("jobs.labels.relatedros")}>
<JobsRelatedRos jobid={job.id} job={job} disabled={disabled} />
</DataLabel>
{job.vehicle && job.vehicle.notes && (
<DataLabel
label={t("vehicles.fields.notes")}
valueStyle={{ whiteSpace: "pre-wrap" }}
valueClassName={notesClamped ? "clamp" : ""}
onValueClick={() => setNotesClamped(!notesClamped)}
>
{job.vehicle.notes}
</DataLabel>
)}
{job.vehicle && job.vehicle.v_paint_codes && (
<DataLabel label={t("vehicles.fields.v_paint_codes", { number: "" })}>
<span style={{ whiteSpace: "pre" }}>
{Object.keys(job.vehicle.v_paint_codes)
.filter(
(key) =>
job.vehicle.v_paint_codes[key] !== "" &&
job.vehicle.v_paint_codes[key] !== null &&
job.vehicle.v_paint_codes[key] !== undefined
)
.map((key, idx) => (
<Tag key={idx}>{job.vehicle.v_paint_codes[key]}</Tag>
))}
</span>
</DataLabel>
)}
</div>
</Card>
</Col>
<Col {...colSpan}>
<Card
style={{ height: "100%" }}
title={<span id="job-employee-assignments-title">{t("jobs.labels.employeeassignments")}</span>}
id={"job-employee-assignments"}
>
<div>
<JobEmployeeAssignments job={job} />
<Divider style={{ margin: ".5rem" }} />
<DataLabel label={t("jobs.labels.labor_hrs")}>
{bodyHrs.toFixed(1)} / {refinishHrs.toFixed(1)} / {(bodyHrs + refinishHrs).toFixed(1)}
</DataLabel>
</div>
</Card>
</Col>
</Row>
<PinnedJobNotes job={job} />
</>
); );
} }

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

@@ -12,6 +12,7 @@ import useLocalStorage from "../../utils/useLocalStorage";
import LayoutFormRow from "../layout-form-row/layout-form-row.component"; 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";
import JobNotesPinToggle from "../job-notes-pin-toggle/job-notes-pin-toggle.component";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
jobRO: selectJobReadOnly jobRO: selectJobReadOnly
@@ -47,6 +48,9 @@ export function JobNotesComponent({
key: "icons", key: "icons",
width: 80, width: 80,
filteredValue: filter?.icons || null, filteredValue: filter?.icons || null,
defaultSortOrder: "desc",
multiple: 1,
sorter: (a, b) => a.pinned - b.pinned,
filters: [ filters: [
{ {
text: t("notes.labels.usernotes"), text: t("notes.labels.usernotes"),
@@ -63,6 +67,7 @@ export function JobNotesComponent({
{record.critical ? <WarningFilled style={{ margin: 4, color: "red" }} /> : null} {record.critical ? <WarningFilled style={{ margin: 4, color: "red" }} /> : null}
{record.private ? <EyeInvisibleFilled style={{ margin: 4 }} /> : null} {record.private ? <EyeInvisibleFilled style={{ margin: 4 }} /> : null}
{record.audit ? <AuditOutlined style={{ margin: 4 }} /> : null} {record.audit ? <AuditOutlined style={{ margin: 4 }} /> : null}
<JobNotesPinToggle note={record} />
</span> </span>
) )
}, },
@@ -100,6 +105,7 @@ export function JobNotesComponent({
dataIndex: "updated_at", dataIndex: "updated_at",
key: "updated_at", key: "updated_at",
defaultSortOrder: "descend", defaultSortOrder: "descend",
multiple: 2,
width: 200, width: 200,
sorter: (a, b) => new Date(a.updated_at) - new Date(b.updated_at), sorter: (a, b) => new Date(a.updated_at) - new Date(b.updated_at),
render: (text, record) => <DateTimeFormatter>{record.updated_at}</DateTimeFormatter> render: (text, record) => <DateTimeFormatter>{record.updated_at}</DateTimeFormatter>

11
client/src/components/note-upsert-modal/note-upsert-modal.component.jsx
View File

@@ -23,17 +23,22 @@ export function NoteUpsertModalComponent({ form, noteUpsertModal }) {
return ( return (
<> <>
<Row gutter={[16, 16]}> <Row gutter={[16, 16]}>
<Col span={8}> <Col span={6}>
<Form.Item label={t("notes.fields.critical")} name="critical" valuePropName="checked"> <Form.Item label={t("notes.fields.critical")} name="critical" valuePropName="checked">
<Switch /> <Switch />
</Form.Item> </Form.Item>
</Col> </Col>
<Col span={8}> <Col span={6}>
<Form.Item label={t("notes.fields.private")} name="private" valuePropName="checked"> <Form.Item label={t("notes.fields.private")} name="private" valuePropName="checked">
<Switch /> <Switch />
</Form.Item> </Form.Item>
</Col> </Col>
<Col span={8}> <Col span={6}>
<Form.Item label={t("notes.fields.pinned")} name="pinned" valuePropName="checked">
<Switch />
</Form.Item>
</Col>
<Col span={6}>
<Form.Item label={t("notes.fields.type")} name="type" initialValue="general"> <Form.Item label={t("notes.fields.type")} name="type" initialValue="general">
<Select <Select
options={[ options={[

59
client/src/components/note-upsert-modal/note-upsert-modal.container.jsx
View File

@@ -1,10 +1,12 @@
import { useMutation } from "@apollo/client"; import { useMutation } from "@apollo/client";
import { Form, Modal } from "antd"; import { Form, Modal } from "antd";
import React, { useEffect } from "react"; import { useEffect } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { createStructuredSelector } from "reselect"; import { createStructuredSelector } from "reselect";
import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
import { logImEXEvent } from "../../firebase/firebase.utils"; import { logImEXEvent } from "../../firebase/firebase.utils";
import { GET_JOB_BY_PK } from "../../graphql/jobs.queries.js";
import { INSERT_NEW_NOTE, UPDATE_NOTE } from "../../graphql/notes.queries"; import { INSERT_NEW_NOTE, UPDATE_NOTE } from "../../graphql/notes.queries";
import { insertAuditTrail } from "../../redux/application/application.actions"; import { insertAuditTrail } from "../../redux/application/application.actions";
import { toggleModalVisible } from "../../redux/modals/modals.actions"; import { toggleModalVisible } from "../../redux/modals/modals.actions";
@@ -12,7 +14,6 @@ import { selectNoteUpsert } from "../../redux/modals/modals.selectors";
import { selectCurrentUser } from "../../redux/user/user.selectors"; import { selectCurrentUser } from "../../redux/user/user.selectors";
import AuditTrailMapping from "../../utils/AuditTrailMappings"; import AuditTrailMapping from "../../utils/AuditTrailMappings";
import NoteUpsertModalComponent from "./note-upsert-modal.component"; import NoteUpsertModalComponent from "./note-upsert-modal.component";
import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
currentUser: selectCurrentUser, currentUser: selectCurrentUser,
@@ -65,6 +66,33 @@ export function NoteUpsertModalContainer({ currentUser, noteUpsertModal, toggleM
variables: { variables: {
noteId: existingNote.id, noteId: existingNote.id,
note: values note: values
},
update(cache, { data: { updateNote: updatedNote } }) {
try {
const existingJob = cache.readQuery({
query: GET_JOB_BY_PK,
variables: { id: jobId }
});
if (existingJob) {
cache.writeQuery({
query: GET_JOB_BY_PK,
variables: { id: jobId },
data: {
...existingJob,
job: {
...existingJob.job,
notes: updatedNote.pinned
? [updatedNote, ...existingJob.job.notes]
: existingJob.job.notes.filter((n) => n.id !== updatedNote.id)
}
}
});
}
} catch (error) {
// Cache miss is okay, query hasn't been executed yet
console.log("Cache miss for GET_JOB_BY_PK");
}
} }
}).then((r) => { }).then((r) => {
notification["success"]({ notification["success"]({
@@ -86,6 +114,33 @@ export function NoteUpsertModalContainer({ currentUser, noteUpsertModal, toggleM
variables: { variables: {
noteInput: [{ ...values, jobid: jobId, created_by: currentUser.email }] noteInput: [{ ...values, jobid: jobId, created_by: currentUser.email }]
}, },
update(cache, { data: { updateNote: updatedNote } }) {
try {
const existingJob = cache.readQuery({
query: GET_JOB_BY_PK,
variables: { id: jobId }
});
if (existingJob) {
cache.writeQuery({
query: GET_JOB_BY_PK,
variables: { id: jobId },
data: {
...existingJob,
job: {
...existingJob.job,
notes: updatedNote.pinned
? [updatedNote, ...existingJob.job.notes]
: existingJob.job.notes.filter((n) => n.id !== updatedNote.id)
}
}
});
}
} catch (error) {
// Cache miss is okay, query hasn't been executed yet
console.log("Cache miss for GET_JOB_BY_PK");
}
},
refetchQueries: ["QUERY_NOTES_BY_JOB_PK"] refetchQueries: ["QUERY_NOTES_BY_JOB_PK"]
}); });

30
client/src/components/pinned-job-notes/pinned-job-notes.component.jsx Normal file
View File

@@ -0,0 +1,30 @@
import { Card, Divider, Space } from "antd";
import { useMemo } from "react";
import { useTranslation } from "react-i18next";
import JobNotesPinToggle from "../job-notes-pin-toggle/job-notes-pin-toggle.component";
function PinnedJobNotes({ job }) {
const { t } = useTranslation();
const pinnedNotes = useMemo(() => {
return job?.notes?.filter((note) => note.pinned); //This will be typically filtered, but adding this to maximize flexibility of the component.
}, [job.notes]);
return pinnedNotes?.length ? (
<>
<Divider />
<Space direction="vertical" style={{ width: "100%" }}>
{pinnedNotes?.map((note) => (
<Card
key={note.id}
title={`${t("notes.labels.pinned_note")} - ${t(`notes.fields.types.${note.type}`)}`}
extra={<JobNotesPinToggle note={note} />}
>
{note.text}
</Card>
))}
</Space>
</>
) : null;
}
export default PinnedJobNotes;

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

@@ -713,6 +713,19 @@ export const GET_JOB_BY_PK = gql`
v_model_yr v_model_yr
v_model_desc v_model_desc
v_vin v_vin
notes(where:{pinned: {_eq: true}}, order_by: {updated_at: desc}) {
created_at
created_by
critical
id
jobid
private
text
updated_at
audit
type
pinned
}
vehicle { vehicle {
id id
jobs { jobs {
@@ -959,6 +972,8 @@ export const QUERY_JOB_CARD_DETAILS = gql`
critical critical
private private
created_at created_at
pinned
type
} }
updated_at updated_at
clm_total clm_total
@@ -984,6 +999,7 @@ export const QUERY_JOB_CARD_DETAILS = gql`
key key
type type
} }
} }
} }
`; `;
@@ -1048,6 +1064,8 @@ export const QUERY_TECH_JOB_DETAILS = gql`
critical critical
private private
created_at created_at
pinned
type
} }
updated_at updated_at
documents(order_by: { created_at: desc }) { documents(order_by: { created_at: desc }) {
@@ -2323,7 +2341,7 @@ export const QUERY_JOBS_TECH_ASIGNED_TO_BY_TEAM = gql`
`; `;
export const QUERY_PARTS_QUEUE_CARD_DETAILS = gql` export const QUERY_PARTS_QUEUE_CARD_DETAILS = gql`
query QUERY_JOB_CARD_DETAILS($id: uuid!) { query QUERY_PARTS_QUEUE_CARD_DETAILS($id: uuid!) {
jobs_by_pk(id: $id) { jobs_by_pk(id: $id) {
actual_completion actual_completion
actual_delivery actual_delivery
@@ -2349,6 +2367,19 @@ export const QUERY_PARTS_QUEUE_CARD_DETAILS = gql`
start start
status status
} }
notes(where:{pinned: {_eq: true}}, order_by: {updated_at: desc}) {
created_at
created_by
critical
id
jobid
private
text
updated_at
audit
type
pinned
}
clm_no clm_no
clm_total clm_total
comment comment

3
client/src/graphql/notes.queries.js
View File

@@ -14,6 +14,7 @@ export const INSERT_NEW_NOTE = gql`
updated_at updated_at
audit audit
type type
pinned
} }
} }
} }
@@ -43,6 +44,7 @@ export const QUERY_NOTES_BY_JOB_PK = gql`
updated_at updated_at
audit audit
type type
pinned
} }
} }
} }
@@ -63,6 +65,7 @@ export const UPDATE_NOTE = gql`
updated_at updated_at
audit audit
type type
pinned
} }
} }
} }

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

@@ -426,6 +426,11 @@
"messagingtext": "Messaging Preset Text", "messagingtext": "Messaging Preset Text",
"noteslabel": "Note Label", "noteslabel": "Note Label",
"notestext": "Note Text", "notestext": "Note Text",
"notifications": {
"description": "Select employees to automatically follow new jobs and receive notifications for job updates.",
"invalid_followers": "Invalid selection. Please select valid employees.",
"placeholder": "Search for employees"
},
"partslocation": "Parts Location", "partslocation": "Parts Location",
"phone": "Phone", "phone": "Phone",
"prodtargethrs": "Production Target Hours", "prodtargethrs": "Production Target Hours",
@@ -648,15 +653,9 @@
"use_paint_scale_data": "Use Paint Scale Data for Job Costing?", "use_paint_scale_data": "Use Paint Scale Data for Job Costing?",
"uselocalmediaserver": "Use Local Media Server?", "uselocalmediaserver": "Use Local Media Server?",
"website": "Website", "website": "Website",
"zip_post": "Zip/Postal Code", "zip_post": "Zip/Postal Code"
"notifications": {
"description": "Select employees to automatically follow new jobs and receive notifications for job updates.",
"placeholder": "Search for employees",
"invalid_followers": "Invalid selection. Please select valid employees."
}
}, },
"labels": { "labels": {
"consent_settings": "Phone Number Opt-Out List",
"2tiername": "Name => RO", "2tiername": "Name => RO",
"2tiersetup": "2 Tier Setup", "2tiersetup": "2 Tier Setup",
"2tiersource": "Source => RO", "2tiersource": "Source => RO",
@@ -667,6 +666,7 @@
"apptcolors": "Appointment Colors", "apptcolors": "Appointment Colors",
"businessinformation": "Business Information", "businessinformation": "Business Information",
"checklists": "Checklists", "checklists": "Checklists",
"consent_settings": "Phone Number Opt-Out List",
"csiq": "CSI Questions", "csiq": "CSI Questions",
"customtemplates": "Custom Templates", "customtemplates": "Custom Templates",
"defaultcostsmapping": "Default Costs Mapping", "defaultcostsmapping": "Default Costs Mapping",
@@ -704,6 +704,9 @@
"messagingpresets": "Messaging Presets", "messagingpresets": "Messaging Presets",
"notemplatesavailable": "No templates available to add.", "notemplatesavailable": "No templates available to add.",
"notespresets": "Notes Presets", "notespresets": "Notes Presets",
"notifications": {
"followers": "Notifications"
},
"orderstatuses": "Order Statuses", "orderstatuses": "Order Statuses",
"partslocations": "Parts Locations", "partslocations": "Parts Locations",
"partsscan": "Parts Scanning", "partsscan": "Parts Scanning",
@@ -734,10 +737,7 @@
"ssbuckets": "Job Size Definitions", "ssbuckets": "Job Size Definitions",
"systemsettings": "System Settings", "systemsettings": "System Settings",
"task-presets": "Task Presets", "task-presets": "Task Presets",
"workingdays": "Working Days", "workingdays": "Working Days"
"notifications": {
"followers": "Notifications"
}
}, },
"operations": { "operations": {
"contains": "Contains", "contains": "Contains",
@@ -783,6 +783,15 @@
"completed": "Job checklist completed." "completed": "Job checklist completed."
} }
}, },
"consent": {
"associated_owners": "Associated Owners",
"created_at": "Opt-Out Date",
"no_owners": "No Associated Owners",
"phone_1": "Phone 1",
"phone_2": "Phone 2",
"phone_number": "Phone Number",
"text_body": "Users can opt out of receiving SMS messages by replying with keywords such as STOP, UNSUBSCRIBE, CANCEL, END, QUIT, STOPALL, REVOKE and OPTOUT. To opt back in, users can reply with START, YES, or UNSTOP. Even after opting out, users can still send messages to us, which will be received and processed as needed. Ensure customers are informed to reply with these keywords to manage their messaging preferences. After opting out, users receive a confirmation message and will not receive further messages until they opt back in."
},
"contracts": { "contracts": {
"actions": { "actions": {
"changerate": "Change Contract Rates", "changerate": "Change Contract Rates",
@@ -1235,11 +1244,11 @@
"fcm": "You must allow notification permissions to have real time messaging. Click to try again.", "fcm": "You must allow notification permissions to have real time messaging. Click to try again.",
"notfound": "No record was found.", "notfound": "No record was found.",
"sizelimit": "The selected items exceed the size limit.", "sizelimit": "The selected items exceed the size limit.",
"submit-for-testing": "Error submitting Job for testing.",
"sub_status": { "sub_status": {
"expired": "The subscription for this shop has expired. Please contact Sales to reactivate.", "expired": "The subscription for this shop has expired. Please contact Sales to reactivate.",
"trial-expired": "The trial for this shop has expired. Please contact Sales to reactivate." "trial-expired": "The trial for this shop has expired. Please contact Sales to reactivate."
} },
"submit-for-testing": "Error submitting Job for testing."
}, },
"itemtypes": { "itemtypes": {
"contract": "CC Contract", "contract": "CC Contract",
@@ -1659,8 +1668,6 @@
"adjustment_bottom_line": "Adjustments", "adjustment_bottom_line": "Adjustments",
"adjustmenthours": "Adjustment Hours", "adjustmenthours": "Adjustment Hours",
"alt_transport": "Alt. Trans.", "alt_transport": "Alt. Trans.",
"estimate_sent_approval": "Estimate Sent for Approval",
"estimate_approved": "Estimate Approved",
"area_of_damage_impact": { "area_of_damage_impact": {
"10": "Left Front Side", "10": "Left Front Side",
"11": "Left Front Corner", "11": "Left Front Corner",
@@ -1783,6 +1790,8 @@
"est_ct_ln": "Estimator Last Name", "est_ct_ln": "Estimator Last Name",
"est_ea": "Estimator Email", "est_ea": "Estimator Email",
"est_ph1": "Estimator Phone #", "est_ph1": "Estimator Phone #",
"estimate_approved": "Estimate Approved",
"estimate_sent_approval": "Estimate Sent for Approval",
"federal_tax_payable": "Federal Tax Payable", "federal_tax_payable": "Federal Tax Payable",
"federal_tax_rate": "Federal Tax Rate", "federal_tax_rate": "Federal Tax Rate",
"flat_rate_ats": "Flat Rate ATS?", "flat_rate_ats": "Flat Rate ATS?",
@@ -1966,8 +1975,6 @@
"scheddates": "Schedule Dates" "scheddates": "Schedule Dates"
}, },
"labels": { "labels": {
"sent": "",
"approved": "",
"accountsreceivable": "Accounts Receivable", "accountsreceivable": "Accounts Receivable",
"act_price_ppc": "New Part Price", "act_price_ppc": "New Part Price",
"actual_completion_inferred": "$t(jobs.fields.actual_completion) inferred using $t(jobs.fields.scheduled_completion).", "actual_completion_inferred": "$t(jobs.fields.actual_completion) inferred using $t(jobs.fields.scheduled_completion).",
@@ -1982,6 +1989,7 @@
"alreadyaddedtoscoreboard": "Job has already been added to scoreboard. Saving will update the previous entry.", "alreadyaddedtoscoreboard": "Job has already been added to scoreboard. Saving will update the previous entry.",
"alreadyclosed": "This Job has already been closed.", "alreadyclosed": "This Job has already been closed.",
"appointmentconfirmation": "Send confirmation to customer?", "appointmentconfirmation": "Send confirmation to customer?",
"approved": "",
"associationwarning": "Any changes to associations will require updating the data from the new parent record to the Job.", "associationwarning": "Any changes to associations will require updating the data from the new parent record to the Job.",
"audit": "Audit Trail", "audit": "Audit Trail",
"available": "Available", "available": "Available",
@@ -2172,6 +2180,7 @@
"sales": "Sales", "sales": "Sales",
"savebeforeconversion": "You have unsaved changes on the Job. Please save them before converting it. ", "savebeforeconversion": "You have unsaved changes on the Job. Please save them before converting it. ",
"scheduledinchange": "The scheduled in is based off the latest appointment. To change this date, please schedule or reschedule the Job. ", "scheduledinchange": "The scheduled in is based off the latest appointment. To change this date, please schedule or reschedule the Job. ",
"sent": "",
"specialcoveragepolicy": "Special Coverage Policy Applies", "specialcoveragepolicy": "Special Coverage Policy Applies",
"state_tax_amt": "Provincial/State Taxes", "state_tax_amt": "Provincial/State Taxes",
"subletsnotcompleted": "Outstanding Sublets", "subletsnotcompleted": "Outstanding Sublets",
@@ -2388,15 +2397,16 @@
}, },
"errors": { "errors": {
"invalidphone": "The phone number is invalid. Unable to open conversation. ", "invalidphone": "The phone number is invalid. Unable to open conversation. ",
"no_consent": "This phone number has opted-out of Messaging.",
"noattachedjobs": "No Jobs have been associated to this conversation. ", "noattachedjobs": "No Jobs have been associated to this conversation. ",
"updatinglabel": "Error updating label. {{error}}", "updatinglabel": "Error updating label. {{error}}"
"no_consent": "This phone number has opted-out of Messaging."
}, },
"labels": { "labels": {
"addlabel": "Add a label to this conversation.", "addlabel": "Add a label to this conversation.",
"archive": "Archive", "archive": "Archive",
"maxtenimages": "You can only select up to a maximum of 10 images at a time.", "maxtenimages": "You can only select up to a maximum of 10 images at a time.",
"messaging": "Messaging", "messaging": "Messaging",
"no_consent": "Opted-out",
"noallowtxt": "This customer has not indicated their permission to be messaged.", "noallowtxt": "This customer has not indicated their permission to be messaged.",
"nojobs": "Not associated to any Job.", "nojobs": "Not associated to any Job.",
"nopush": "Polling Mode Enabled", "nopush": "Polling Mode Enabled",
@@ -2406,8 +2416,7 @@
"selectmedia": "Select Media", "selectmedia": "Select Media",
"sentby": "Sent by {{by}} at {{time}}", "sentby": "Sent by {{by}} at {{time}}",
"typeamessage": "Send a message...", "typeamessage": "Send a message...",
"unarchive": "Unarchive", "unarchive": "Unarchive"
"no_consent": "Opted-out"
}, },
"render": { "render": {
"conversation_list": "Conversation List" "conversation_list": "Conversation List"
@@ -2427,6 +2436,7 @@
"fields": { "fields": {
"createdby": "Created By", "createdby": "Created By",
"critical": "Critical", "critical": "Critical",
"pinned": "Pinned",
"private": "Private", "private": "Private",
"text": "Contents", "text": "Contents",
"type": "Type", "type": "Type",
@@ -2445,6 +2455,7 @@
"addtorelatedro": "Add to Related ROs", "addtorelatedro": "Add to Related ROs",
"newnoteplaceholder": "Add a note...", "newnoteplaceholder": "Add a note...",
"notetoadd": "Note to Add", "notetoadd": "Note to Add",
"pinned_note": "Pinned Note",
"systemnotes": "System Notes", "systemnotes": "System Notes",
"usernotes": "User Notes" "usernotes": "User Notes"
}, },
@@ -2467,11 +2478,15 @@
"fcm": "Push" "fcm": "Push"
}, },
"labels": { "labels": {
"auto-add": "Automatically watch Jobs I import",
"auto-add-success": "Auto watcher status successfully changed.",
"auto-add-failure": "Something went wrong updating your auto watcher status.",
"add-watchers": "Add Watchers", "add-watchers": "Add Watchers",
"add-watchers-team": "Add Team Members", "add-watchers-team": "Add Team Members",
"auto-add": "Automatically watch Jobs I import",
"auto-add-description": "",
"auto-add-failure": "Something went wrong updating your auto watcher status.",
"auto-add-off": "",
"auto-add-on": "",
"auto-add-success": "Auto watcher status successfully changed.",
"employee-notification": "Notifications are disabled because you do not have an associated Employee record.",
"employee-search": "Search for an Employee", "employee-search": "Search for an Employee",
"mark-all-read": "Mark All Read", "mark-all-read": "Mark All Read",
"new-notification-title": "New Notification:", "new-notification-title": "New Notification:",
@@ -2488,8 +2503,7 @@
"teams-search": "Search for a Team", "teams-search": "Search for a Team",
"unwatch": "Unwatch", "unwatch": "Unwatch",
"watch": "Watch", "watch": "Watch",
"watching-issue": "Watching", "watching-issue": "Watching"
"employee-notification": "Notifications are disabled because you do not have an associated Employee record."
}, },
"scenarios": { "scenarios": {
"alternate-transport-changed": "Alternate Transport Changed", "alternate-transport-changed": "Alternate Transport Changed",
@@ -3299,17 +3313,10 @@
"updated": "Scoreboard updated." "updated": "Scoreboard updated."
} }
}, },
"settings": {
"title": "Phone Number Opt-Out List"
},
"tasks": { "tasks": {
"labels": {
"my_tasks_center": "Task Center",
"go_to_job": "Go to Job",
"overdue": "Overdue",
"due_today": "Today",
"upcoming": "Upcoming",
"no_due_date": "Incomplete",
"ro-number": "RO #{{ro_number}}",
"no_tasks": "No Tasks Found"
},
"actions": { "actions": {
"edit": "Edit Task", "edit": "Edit Task",
"new": "New Task", "new": "New Task",
@@ -3324,9 +3331,6 @@
"myTasks": "Mine", "myTasks": "Mine",
"refresh": "Refresh" "refresh": "Refresh"
}, },
"errors": {
"load_failure": "Failed to load Tasks."
},
"date_presets": { "date_presets": {
"completion": "Completion", "completion": "Completion",
"day": "Day", "day": "Day",
@@ -3340,6 +3344,9 @@
"tomorrow": "Tomorrow", "tomorrow": "Tomorrow",
"two_weeks": "Two Weeks" "two_weeks": "Two Weeks"
}, },
"errors": {
"load_failure": "Failed to load Tasks."
},
"failures": { "failures": {
"completed": "Failed to toggle Task completion.", "completed": "Failed to toggle Task completion.",
"created": "Failed to create Task.", "created": "Failed to create Task.",
@@ -3374,6 +3381,16 @@
"remind_at": "Remind At", "remind_at": "Remind At",
"title": "Title" "title": "Title"
}, },
"labels": {
"due_today": "Today",
"go_to_job": "Go to Job",
"my_tasks_center": "Task Center",
"no_due_date": "Incomplete",
"no_tasks": "No Tasks Found",
"overdue": "Overdue",
"ro-number": "RO #{{ro_number}}",
"upcoming": "Upcoming"
},
"placeholders": { "placeholders": {
"assigned_to": "Select an Employee", "assigned_to": "Select an Employee",
"billid": "Select a Bill", "billid": "Select a Bill",
@@ -3889,18 +3906,6 @@
"validation": { "validation": {
"unique_vendor_name": "You must enter a unique vendor name." "unique_vendor_name": "You must enter a unique vendor name."
} }
},
"consent": {
"phone_number": "Phone Number",
"associated_owners": "Associated Owners",
"created_at": "Opt-Out Date",
"no_owners": "No Associated Owners",
"phone_1": "Phone 1",
"phone_2": "Phone 2",
"text_body": "Users can opt out of receiving SMS messages by replying with keywords such as STOP, UNSUBSCRIBE, CANCEL, END, QUIT, STOPALL, REVOKE and OPTOUT. To opt back in, users can reply with START, YES, or UNSTOP. Even after opting out, users can still send messages to us, which will be received and processed as needed. Ensure customers are informed to reply with these keywords to manage their messaging preferences. After opting out, users receive a confirmation message and will not receive further messages until they opt back in."
},
"settings": {
"title": "Phone Number Opt-Out List"
} }
} }
} }

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

@@ -426,6 +426,11 @@
"messagingtext": "", "messagingtext": "",
"noteslabel": "", "noteslabel": "",
"notestext": "", "notestext": "",
"notifications": {
"description": "",
"invalid_followers": "",
"placeholder": ""
},
"partslocation": "", "partslocation": "",
"phone": "", "phone": "",
"prodtargethrs": "", "prodtargethrs": "",
@@ -648,15 +653,9 @@
"use_paint_scale_data": "", "use_paint_scale_data": "",
"uselocalmediaserver": "", "uselocalmediaserver": "",
"website": "", "website": "",
"zip_post": "", "zip_post": ""
"notifications": {
"description": "",
"placeholder": "",
"invalid_followers": ""
}
}, },
"labels": { "labels": {
"consent_settings": "",
"2tiername": "", "2tiername": "",
"2tiersetup": "", "2tiersetup": "",
"2tiersource": "", "2tiersource": "",
@@ -667,6 +666,7 @@
"apptcolors": "", "apptcolors": "",
"businessinformation": "", "businessinformation": "",
"checklists": "", "checklists": "",
"consent_settings": "",
"csiq": "", "csiq": "",
"customtemplates": "", "customtemplates": "",
"defaultcostsmapping": "", "defaultcostsmapping": "",
@@ -704,6 +704,9 @@
"messagingpresets": "", "messagingpresets": "",
"notemplatesavailable": "", "notemplatesavailable": "",
"notespresets": "", "notespresets": "",
"notifications": {
"followers": ""
},
"orderstatuses": "", "orderstatuses": "",
"partslocations": "", "partslocations": "",
"partsscan": "", "partsscan": "",
@@ -734,10 +737,7 @@
"ssbuckets": "", "ssbuckets": "",
"systemsettings": "", "systemsettings": "",
"task-presets": "", "task-presets": "",
"workingdays": "", "workingdays": ""
"notifications": {
"followers": ""
}
}, },
"operations": { "operations": {
"contains": "", "contains": "",
@@ -783,6 +783,15 @@
"completed": "" "completed": ""
} }
}, },
"consent": {
"associated_owners": "",
"created_at": "",
"no_owners": "",
"phone_1": "",
"phone_2": "",
"phone_number": "",
"text_body": ""
},
"contracts": { "contracts": {
"actions": { "actions": {
"changerate": "", "changerate": "",
@@ -1235,11 +1244,11 @@
"fcm": "", "fcm": "",
"notfound": "", "notfound": "",
"sizelimit": "", "sizelimit": "",
"submit-for-testing": "",
"sub_status": { "sub_status": {
"expired": "", "expired": "",
"trial-expired": "" "trial-expired": ""
} },
"submit-for-testing": ""
}, },
"itemtypes": { "itemtypes": {
"contract": "", "contract": "",
@@ -1651,8 +1660,6 @@
"voiding": "" "voiding": ""
}, },
"fields": { "fields": {
"estimate_sent_approval": "",
"estimate_approved": "",
"active_tasks": "", "active_tasks": "",
"actual_completion": "Realización real", "actual_completion": "Realización real",
"actual_delivery": "Entrega real", "actual_delivery": "Entrega real",
@@ -1783,6 +1790,8 @@
"est_ct_ln": "Apellido del tasador", "est_ct_ln": "Apellido del tasador",
"est_ea": "Correo electrónico del tasador", "est_ea": "Correo electrónico del tasador",
"est_ph1": "Número de teléfono del tasador", "est_ph1": "Número de teléfono del tasador",
"estimate_approved": "",
"estimate_sent_approval": "",
"federal_tax_payable": "Impuesto federal por pagar", "federal_tax_payable": "Impuesto federal por pagar",
"federal_tax_rate": "", "federal_tax_rate": "",
"flat_rate_ats": "", "flat_rate_ats": "",
@@ -1966,8 +1975,6 @@
"scheddates": "" "scheddates": ""
}, },
"labels": { "labels": {
"sent": "",
"approved": "",
"accountsreceivable": "", "accountsreceivable": "",
"act_price_ppc": "", "act_price_ppc": "",
"actual_completion_inferred": "", "actual_completion_inferred": "",
@@ -1982,6 +1989,7 @@
"alreadyaddedtoscoreboard": "", "alreadyaddedtoscoreboard": "",
"alreadyclosed": "", "alreadyclosed": "",
"appointmentconfirmation": "¿Enviar confirmación al cliente?", "appointmentconfirmation": "¿Enviar confirmación al cliente?",
"approved": "",
"associationwarning": "", "associationwarning": "",
"audit": "", "audit": "",
"available": "", "available": "",
@@ -2172,6 +2180,7 @@
"sales": "", "sales": "",
"savebeforeconversion": "", "savebeforeconversion": "",
"scheduledinchange": "", "scheduledinchange": "",
"sent": "",
"specialcoveragepolicy": "", "specialcoveragepolicy": "",
"state_tax_amt": "", "state_tax_amt": "",
"subletsnotcompleted": "", "subletsnotcompleted": "",
@@ -2388,15 +2397,16 @@
}, },
"errors": { "errors": {
"invalidphone": "", "invalidphone": "",
"no_consent": "",
"noattachedjobs": "", "noattachedjobs": "",
"updatinglabel": "", "updatinglabel": ""
"no_consent": ""
}, },
"labels": { "labels": {
"addlabel": "", "addlabel": "",
"archive": "", "archive": "",
"maxtenimages": "", "maxtenimages": "",
"messaging": "Mensajería", "messaging": "Mensajería",
"no_consent": "",
"noallowtxt": "", "noallowtxt": "",
"nojobs": "", "nojobs": "",
"nopush": "", "nopush": "",
@@ -2406,8 +2416,7 @@
"selectmedia": "", "selectmedia": "",
"sentby": "", "sentby": "",
"typeamessage": "Enviar un mensaje...", "typeamessage": "Enviar un mensaje...",
"unarchive": "", "unarchive": ""
"no_consent": ""
}, },
"render": { "render": {
"conversation_list": "" "conversation_list": ""
@@ -2427,6 +2436,7 @@
"fields": { "fields": {
"createdby": "Creado por", "createdby": "Creado por",
"critical": "Crítico", "critical": "Crítico",
"pinned": "",
"private": "Privado", "private": "Privado",
"text": "Contenido", "text": "Contenido",
"type": "", "type": "",
@@ -2445,6 +2455,7 @@
"addtorelatedro": "", "addtorelatedro": "",
"newnoteplaceholder": "Agrega una nota...", "newnoteplaceholder": "Agrega una nota...",
"notetoadd": "", "notetoadd": "",
"pinned_note": "",
"systemnotes": "", "systemnotes": "",
"usernotes": "" "usernotes": ""
}, },
@@ -2467,13 +2478,15 @@
"fcm": "" "fcm": ""
}, },
"labels": { "labels": {
"auto-add-on": "",
"auto-add-off": "",
"auto-add-success": "",
"auto-add-failure": "",
"auto-add-description": "",
"add-watchers": "", "add-watchers": "",
"add-watchers-team": "", "add-watchers-team": "",
"auto-add": "",
"auto-add-description": "",
"auto-add-failure": "",
"auto-add-off": "",
"auto-add-on": "",
"auto-add-success": "",
"employee-notification": "",
"employee-search": "", "employee-search": "",
"mark-all-read": "", "mark-all-read": "",
"new-notification-title": "", "new-notification-title": "",
@@ -2490,8 +2503,7 @@
"teams-search": "", "teams-search": "",
"unwatch": "", "unwatch": "",
"watch": "", "watch": "",
"watching-issue": "", "watching-issue": ""
"employee-notification": ""
}, },
"scenarios": { "scenarios": {
"alternate-transport-changed": "", "alternate-transport-changed": "",
@@ -3301,17 +3313,10 @@
"updated": "" "updated": ""
} }
}, },
"settings": {
"title": ""
},
"tasks": { "tasks": {
"labels": {
"my_tasks_center": "",
"go_to_job": "",
"overdue": "",
"due_today": "",
"upcoming": "",
"no_due_date": "",
"ro-number": "",
"no_tasks": ""
},
"actions": { "actions": {
"edit": "", "edit": "",
"new": "", "new": "",
@@ -3326,9 +3331,6 @@
"myTasks": "", "myTasks": "",
"refresh": "" "refresh": ""
}, },
"errors": {
"load_failure": ""
},
"date_presets": { "date_presets": {
"completion": "", "completion": "",
"day": "", "day": "",
@@ -3342,6 +3344,9 @@
"tomorrow": "", "tomorrow": "",
"two_weeks": "" "two_weeks": ""
}, },
"errors": {
"load_failure": ""
},
"failures": { "failures": {
"completed": "", "completed": "",
"created": "", "created": "",
@@ -3376,6 +3381,16 @@
"remind_at": "", "remind_at": "",
"title": "" "title": ""
}, },
"labels": {
"due_today": "",
"go_to_job": "",
"my_tasks_center": "",
"no_due_date": "",
"no_tasks": "",
"overdue": "",
"ro-number": "",
"upcoming": ""
},
"placeholders": { "placeholders": {
"assigned_to": "", "assigned_to": "",
"billid": "", "billid": "",
@@ -3891,18 +3906,6 @@
"validation": { "validation": {
"unique_vendor_name": "" "unique_vendor_name": ""
} }
},
"consent": {
"phone_number": "",
"associated_owners": "",
"created_at": "",
"no_owners": "",
"phone_1": "",
"phone_2": "",
"text_body": ""
},
"settings": {
"title": ""
} }
} }
} }

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

@@ -426,6 +426,11 @@
"messagingtext": "", "messagingtext": "",
"noteslabel": "", "noteslabel": "",
"notestext": "", "notestext": "",
"notifications": {
"description": "",
"invalid_followers": "",
"placeholder": ""
},
"partslocation": "", "partslocation": "",
"phone": "", "phone": "",
"prodtargethrs": "", "prodtargethrs": "",
@@ -648,15 +653,9 @@
"use_paint_scale_data": "", "use_paint_scale_data": "",
"uselocalmediaserver": "", "uselocalmediaserver": "",
"website": "", "website": "",
"zip_post": "", "zip_post": ""
"notifications": {
"description": "",
"placeholder": "",
"invalid_followers": ""
}
}, },
"labels": { "labels": {
"consent_settings": "",
"2tiername": "", "2tiername": "",
"2tiersetup": "", "2tiersetup": "",
"2tiersource": "", "2tiersource": "",
@@ -667,6 +666,7 @@
"apptcolors": "", "apptcolors": "",
"businessinformation": "", "businessinformation": "",
"checklists": "", "checklists": "",
"consent_settings": "",
"csiq": "", "csiq": "",
"customtemplates": "", "customtemplates": "",
"defaultcostsmapping": "", "defaultcostsmapping": "",
@@ -704,6 +704,9 @@
"messagingpresets": "", "messagingpresets": "",
"notemplatesavailable": "", "notemplatesavailable": "",
"notespresets": "", "notespresets": "",
"notifications": {
"followers": ""
},
"orderstatuses": "", "orderstatuses": "",
"partslocations": "", "partslocations": "",
"partsscan": "", "partsscan": "",
@@ -734,10 +737,7 @@
"ssbuckets": "", "ssbuckets": "",
"systemsettings": "", "systemsettings": "",
"task-presets": "", "task-presets": "",
"workingdays": "", "workingdays": ""
"notifications": {
"followers": ""
}
}, },
"operations": { "operations": {
"contains": "", "contains": "",
@@ -783,6 +783,15 @@
"completed": "" "completed": ""
} }
}, },
"consent": {
"associated_owners": "Associated Owners",
"created_at": "Opt-Out Date",
"no_owners": "No Associated Owners",
"phone_1": "Phone 1",
"phone_2": "Phone 2",
"phone_number": "Phone Number",
"text_body": ""
},
"contracts": { "contracts": {
"actions": { "actions": {
"changerate": "", "changerate": "",
@@ -1235,11 +1244,11 @@
"fcm": "", "fcm": "",
"notfound": "", "notfound": "",
"sizelimit": "", "sizelimit": "",
"submit-for-testing": "",
"sub_status": { "sub_status": {
"expired": "", "expired": "",
"trial-expired": "" "trial-expired": ""
} },
"submit-for-testing": ""
}, },
"itemtypes": { "itemtypes": {
"contract": "", "contract": "",
@@ -1651,8 +1660,6 @@
"voiding": "" "voiding": ""
}, },
"fields": { "fields": {
"estimate_sent_approval": "",
"estimate_approved": "",
"active_tasks": "", "active_tasks": "",
"actual_completion": "Achèvement réel", "actual_completion": "Achèvement réel",
"actual_delivery": "Livraison réelle", "actual_delivery": "Livraison réelle",
@@ -1783,6 +1790,8 @@
"est_ct_ln": "Nom de l'évaluateur", "est_ct_ln": "Nom de l'évaluateur",
"est_ea": "Courriel de l'évaluateur", "est_ea": "Courriel de l'évaluateur",
"est_ph1": "Numéro de téléphone de l'évaluateur", "est_ph1": "Numéro de téléphone de l'évaluateur",
"estimate_approved": "",
"estimate_sent_approval": "",
"federal_tax_payable": "Impôt fédéral à payer", "federal_tax_payable": "Impôt fédéral à payer",
"federal_tax_rate": "", "federal_tax_rate": "",
"flat_rate_ats": "", "flat_rate_ats": "",
@@ -1966,8 +1975,6 @@
"scheddates": "" "scheddates": ""
}, },
"labels": { "labels": {
"sent": "",
"approved": "",
"accountsreceivable": "", "accountsreceivable": "",
"act_price_ppc": "", "act_price_ppc": "",
"actual_completion_inferred": "", "actual_completion_inferred": "",
@@ -1982,6 +1989,7 @@
"alreadyaddedtoscoreboard": "", "alreadyaddedtoscoreboard": "",
"alreadyclosed": "", "alreadyclosed": "",
"appointmentconfirmation": "Envoyer une confirmation au client?", "appointmentconfirmation": "Envoyer une confirmation au client?",
"approved": "",
"associationwarning": "", "associationwarning": "",
"audit": "", "audit": "",
"available": "", "available": "",
@@ -2172,6 +2180,7 @@
"sales": "", "sales": "",
"savebeforeconversion": "", "savebeforeconversion": "",
"scheduledinchange": "", "scheduledinchange": "",
"sent": "",
"specialcoveragepolicy": "", "specialcoveragepolicy": "",
"state_tax_amt": "", "state_tax_amt": "",
"subletsnotcompleted": "", "subletsnotcompleted": "",
@@ -2388,15 +2397,16 @@
}, },
"errors": { "errors": {
"invalidphone": "", "invalidphone": "",
"no_consent": "",
"noattachedjobs": "", "noattachedjobs": "",
"updatinglabel": "", "updatinglabel": ""
"no_consent": ""
}, },
"labels": { "labels": {
"addlabel": "", "addlabel": "",
"archive": "", "archive": "",
"maxtenimages": "", "maxtenimages": "",
"messaging": "Messagerie", "messaging": "Messagerie",
"no_consent": "",
"noallowtxt": "", "noallowtxt": "",
"nojobs": "", "nojobs": "",
"nopush": "", "nopush": "",
@@ -2406,8 +2416,7 @@
"selectmedia": "", "selectmedia": "",
"sentby": "", "sentby": "",
"typeamessage": "Envoyer un message...", "typeamessage": "Envoyer un message...",
"unarchive": "", "unarchive": ""
"no_consent": ""
}, },
"render": { "render": {
"conversation_list": "" "conversation_list": ""
@@ -2427,6 +2436,7 @@
"fields": { "fields": {
"createdby": "Créé par", "createdby": "Créé par",
"critical": "Critique", "critical": "Critique",
"pinned": "",
"private": "privé", "private": "privé",
"text": "Contenu", "text": "Contenu",
"type": "", "type": "",
@@ -2445,6 +2455,7 @@
"addtorelatedro": "", "addtorelatedro": "",
"newnoteplaceholder": "Ajouter une note...", "newnoteplaceholder": "Ajouter une note...",
"notetoadd": "", "notetoadd": "",
"pinned_note": "",
"systemnotes": "", "systemnotes": "",
"usernotes": "" "usernotes": ""
}, },
@@ -2467,13 +2478,15 @@
"fcm": "" "fcm": ""
}, },
"labels": { "labels": {
"auto-add-on": "",
"auto-add-off": "",
"auto-add-success": "",
"auto-add-failure": "",
"auto-add-description": "",
"add-watchers": "", "add-watchers": "",
"add-watchers-team": "", "add-watchers-team": "",
"auto-add": "",
"auto-add-description": "",
"auto-add-failure": "",
"auto-add-off": "",
"auto-add-on": "",
"auto-add-success": "",
"employee-notification": "",
"employee-search": "", "employee-search": "",
"mark-all-read": "", "mark-all-read": "",
"new-notification-title": "", "new-notification-title": "",
@@ -2490,8 +2503,7 @@
"teams-search": "", "teams-search": "",
"unwatch": "", "unwatch": "",
"watch": "", "watch": "",
"watching-issue": "", "watching-issue": ""
"employee-notification": ""
}, },
"scenarios": { "scenarios": {
"alternate-transport-changed": "", "alternate-transport-changed": "",
@@ -3301,17 +3313,10 @@
"updated": "" "updated": ""
} }
}, },
"settings": {
"title": ""
},
"tasks": { "tasks": {
"labels": {
"my_tasks_center": "",
"go_to_job": "",
"overdue": "",
"due_today": "",
"upcoming": "",
"no_due_date": "",
"ro-number": "",
"no_tasks": ""
},
"actions": { "actions": {
"edit": "", "edit": "",
"new": "", "new": "",
@@ -3326,9 +3331,6 @@
"myTasks": "", "myTasks": "",
"refresh": "" "refresh": ""
}, },
"errors": {
"load_failure": ""
},
"date_presets": { "date_presets": {
"completion": "", "completion": "",
"day": "", "day": "",
@@ -3342,6 +3344,9 @@
"tomorrow": "", "tomorrow": "",
"two_weeks": "" "two_weeks": ""
}, },
"errors": {
"load_failure": ""
},
"failures": { "failures": {
"completed": "", "completed": "",
"created": "", "created": "",
@@ -3376,6 +3381,16 @@
"remind_at": "", "remind_at": "",
"title": "" "title": ""
}, },
"labels": {
"due_today": "",
"go_to_job": "",
"my_tasks_center": "",
"no_due_date": "",
"no_tasks": "",
"overdue": "",
"ro-number": "",
"upcoming": ""
},
"placeholders": { "placeholders": {
"assigned_to": "", "assigned_to": "",
"billid": "", "billid": "",
@@ -3891,18 +3906,6 @@
"validation": { "validation": {
"unique_vendor_name": "" "unique_vendor_name": ""
} }
},
"consent": {
"phone_number": "Phone Number",
"associated_owners": "Associated Owners",
"created_at": "Opt-Out Date",
"no_owners": "No Associated Owners",
"phone_1": "Phone 1",
"phone_2": "Phone 2",
"text_body": ""
},
"settings": {
"title": ""
} }
} }
} }

3
hasura/metadata/tables.yaml
View File

@@ -4909,6 +4909,7 @@
- critical - critical
- id - id
- jobid - jobid
- pinned
- private - private
- text - text
- type - type
@@ -4923,6 +4924,7 @@
- critical - critical
- id - id
- jobid - jobid
- pinned
- private - private
- text - text
- type - type
@@ -4947,6 +4949,7 @@
- critical - critical
- id - id
- jobid - jobid
- pinned
- private - private
- text - text
- type - type

4
hasura/migrations/1753134828673_alter_table_public_notes_add_column_pinned/down.sql Normal file
View File

@@ -0,0 +1,4 @@
-- Could not auto-generate a down migration.
-- Please write an appropriate down migration for the SQL below:
-- alter table "public"."notes" add column "pinned" boolean
-- not null default 'false';

2
hasura/migrations/1753134828673_alter_table_public_notes_add_column_pinned/up.sql Normal file
View File

@@ -0,0 +1,2 @@
alter table "public"."notes" add column "pinned" boolean
not null default 'false';