Updated production note display. IO-495

This commit is contained in:
Patrick Fic
2021-02-08 10:00:46 -08:00
parent 7a21721034
commit fa94384684
2 changed files with 23 additions and 6 deletions

View File

@@ -1,11 +1,12 @@
import { PrinterFilled } from "@ant-design/icons"; import { PrinterFilled } from "@ant-design/icons";
import { Button, Divider, PageHeader, Tag } from "antd"; import { Button, Divider, PageHeader, Tag } from "antd";
import React from "react"; import React, { useMemo } 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 { selectJobReadOnly } from "../../redux/application/application.selectors"; import { selectJobReadOnly } from "../../redux/application/application.selectors";
import { setModalContext } from "../../redux/modals/modals.actions"; import { setModalContext } from "../../redux/modals/modals.actions";
import { selectBodyshop } from "../../redux/user/user.selectors";
import CurrencyFormatter from "../../utils/CurrencyFormatter"; import CurrencyFormatter from "../../utils/CurrencyFormatter";
import JobEmployeeAssignments from "../job-employee-assignments/job-employee-assignments.container"; import JobEmployeeAssignments from "../job-employee-assignments/job-employee-assignments.container";
import JobsChangeStatus from "../jobs-change-status/jobs-change-status.component"; import JobsChangeStatus from "../jobs-change-status/jobs-change-status.component";
@@ -18,6 +19,7 @@ import "./jobs-detail-header.styles.scss";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
jobRO: selectJobReadOnly, jobRO: selectJobReadOnly,
bodyshop: selectBodyshop,
}); });
const mapDispatchToProps = (dispatch) => ({ const mapDispatchToProps = (dispatch) => ({
@@ -32,9 +34,16 @@ export function JobsDetailHeader({
refetch, refetch,
loading, loading,
form, form,
bodyshop,
}) { }) {
const { t } = useTranslation(); const { t } = useTranslation();
const jobInPostProduction = useMemo(() => {
return bodyshop.md_ro_statuses.post_production_statuses.includes(
job.status
);
}, [job.status, bodyshop.md_ro_statuses.post_production_statuses]);
const menuExtra = ( const menuExtra = (
<div className="imex-flex-row"> <div className="imex-flex-row">
<JobsChangeStatus job={job} /> <JobsChangeStatus job={job} />
@@ -92,10 +101,10 @@ export function JobsDetailHeader({
extra={menuExtra} extra={menuExtra}
> >
<div style={{ display: "flex", justifyContent: "flex-end" }}> <div style={{ display: "flex", justifyContent: "flex-end" }}>
{job.inproduction && ( {(job.inproduction || jobInPostProduction) && (
<> <>
<div style={{ display: "flex", flex: 1 }}> <div style={{ display: "flex", flex: 1 }}>
<div style={{ width: "20%" }}> <div style={{ marginRight: "2rem" }}>
{t("jobs.fields.production_vars.note")} {t("jobs.fields.production_vars.note")}
</div> </div>
<ProductionListColumnProductionNote record={job} /> <ProductionListColumnProductionNote record={job} />

View File

@@ -54,10 +54,10 @@ export default function ProductionListColumnProductionNote({ record }) {
content={ content={
<div style={{ width: "30em" }}> <div style={{ width: "30em" }}>
<Input.TextArea <Input.TextArea
rows={2} rows={5}
value={note} value={note}
onChange={handleChange} onChange={handleChange}
onPressEnter={handleSaveNote} // onPressEnter={handleSaveNote}
autoFocus autoFocus
allowClear allowClear
/> />
@@ -70,7 +70,15 @@ export default function ProductionListColumnProductionNote({ record }) {
} }
trigger={["click"]} trigger={["click"]}
> >
<div style={{ width: "100%", height: "19px", cursor: "pointer" }}> <div
style={{
width: "100%",
height: "19px",
cursor: "pointer",
overflow: "hidden",
textOverflow: "ellipsis",
}}
>
<Icon component={FaRegStickyNote} style={{ marginRight: ".2rem" }} /> <Icon component={FaRegStickyNote} style={{ marginRight: ".2rem" }} />
{(record.production_vars && record.production_vars.note) || " "} {(record.production_vars && record.production_vars.note) || " "}
</div> </div>