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

Update formatting for AT on event IO-625

Browse Source
This commit is contained in:
Patrick Fic
2021-02-16 10:31:47 -08:00
parent 2865623ed3
commit 32a370c3cd
2 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/components/schedule-calendar-wrapper/schedule-calendar.styles.scss
View File

@@ -1,10 +1,14 @@
Ø.rbc-time-header-cell-single-day { .rbc-time-header-cell-single-day {
display: unset; display: unset;
} }
.rbc-time-view .rbc-allday-cell { .rbc-time-view .rbc-allday-cell {
height: unset; height: unset;
} }
.rbc-event-label {
display: none;
}
.imex-event-arrived { .imex-event-arrived {
background-color: rgba(4, 141, 4, 0.4); background-color: rgba(4, 141, 4, 0.4);
} }

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

@@ -1,4 +1,4 @@
import { Button, Popover } from "antd"; import { Button, Popover, Space } 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";
@@ -27,7 +27,7 @@ export function ScheduleEventComponent({
{!event.isintake ? ( {!event.isintake ? (
<strong>{event.title}</strong> <strong>{event.title}</strong>
) : ( ) : (
<div> <Space>
<strong>{`${(event.job && event.job.ownr_fn) || ""} ${ <strong>{`${(event.job && event.job.ownr_fn) || ""} ${
(event.job && event.job.ownr_ln) || "" (event.job && event.job.ownr_ln) || ""
}`}</strong> }`}</strong>
@@ -37,7 +37,7 @@ export function ScheduleEventComponent({
} ${(event.job && event.job.v_model_desc) || ""}`} } ${(event.job && event.job.v_model_desc) || ""}`}
</span> </span>
<ScheduleEventColor event={event} /> <ScheduleEventColor event={event} />
</div> </Space>
)} )}
{event.job ? ( {event.job ? (
@@ -113,27 +113,27 @@ export function ScheduleEventComponent({
const RegularEvent = event.isintake ? ( const RegularEvent = event.isintake ? (
<div style={{ display: "flex", flexWrap: "wrap" }}> <div style={{ display: "flex", flexWrap: "wrap" }}>
<strong style={{ margin: ".1rem" }}>{`${ <Space>
event.job.ro_number || t("general.labels.na") <strong>{`${event.job.ro_number || t("general.labels.na")}`}</strong>
}`}</strong> <span>{`${(event.job && event.job.ownr_fn) || ""} ${
<div style={{ margin: ".1rem" }}>{`${ (event.job && event.job.ownr_ln) || ""
(event.job && event.job.ownr_fn) || "" } ${(event.job && event.job.ownr_co_nm) || ""}`}</span>
} ${(event.job && event.job.ownr_ln) || ""} ${ </Space>
(event.job && event.job.ownr_co_nm) || "" <Space>
}`}</div> <span>
{" "}
<div style={{ margin: ".1rem" }}> {`${(event.job && event.job.v_model_yr) || ""} ${
{`${(event.job && event.job.v_model_yr) || ""} ${ (event.job && event.job.v_make_desc) || ""
(event.job && event.job.v_make_desc) || "" } ${(event.job && event.job.v_model_desc) || ""}`}
} ${(event.job && event.job.v_model_desc) || ""}`} </span>
</div> <span>
<div style={{ margin: ".1rem" }}> {`(${
{`(${ (event.job && event.job.labhrs.aggregate.sum.mod_lb_hrs) || "0"
(event.job && event.job.labhrs.aggregate.sum.mod_lb_hrs) || "0" } / ${
} / ${ (event.job && event.job.larhrs.aggregate.sum.mod_lb_hrs) || "0"
(event.job && event.job.larhrs.aggregate.sum.mod_lb_hrs) || "0" })`}
})`} </span>
</div> </Space>
{event.job && event.job.alt_transport && ( {event.job && event.job.alt_transport && (
<div style={{ margin: ".1rem" }}>{event.job.alt_transport}</div> <div style={{ margin: ".1rem" }}>{event.job.alt_transport}</div>
)} )}