diff --git a/client/src/components/schedule-calendar-wrapper/schedule-calendar.styles.scss b/client/src/components/schedule-calendar-wrapper/schedule-calendar.styles.scss index 6d6ce64d7..3b8f4c300 100644 --- a/client/src/components/schedule-calendar-wrapper/schedule-calendar.styles.scss +++ b/client/src/components/schedule-calendar-wrapper/schedule-calendar.styles.scss @@ -1,10 +1,14 @@ -Ø.rbc-time-header-cell-single-day { +.rbc-time-header-cell-single-day { display: unset; } .rbc-time-view .rbc-allday-cell { height: unset; } +.rbc-event-label { + display: none; +} + .imex-event-arrived { background-color: rgba(4, 141, 4, 0.4); } diff --git a/client/src/components/schedule-event/schedule-event.component.jsx b/client/src/components/schedule-event/schedule-event.component.jsx index c541638d0..66de70e24 100644 --- a/client/src/components/schedule-event/schedule-event.component.jsx +++ b/client/src/components/schedule-event/schedule-event.component.jsx @@ -1,4 +1,4 @@ -import { Button, Popover } from "antd"; +import { Button, Popover, Space } from "antd"; import React from "react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; @@ -27,7 +27,7 @@ export function ScheduleEventComponent({ {!event.isintake ? ( {event.title} ) : ( -
+ {`${(event.job && event.job.ownr_fn) || ""} ${ (event.job && event.job.ownr_ln) || "" }`} @@ -37,7 +37,7 @@ export function ScheduleEventComponent({ } ${(event.job && event.job.v_model_desc) || ""}`} -
+ )} {event.job ? ( @@ -113,27 +113,27 @@ export function ScheduleEventComponent({ const RegularEvent = event.isintake ? (
- {`${ - event.job.ro_number || t("general.labels.na") - }`} -
{`${ - (event.job && event.job.ownr_fn) || "" - } ${(event.job && event.job.ownr_ln) || ""} ${ - (event.job && event.job.ownr_co_nm) || "" - }`}
- -
- {`${(event.job && event.job.v_model_yr) || ""} ${ - (event.job && event.job.v_make_desc) || "" - } ${(event.job && event.job.v_model_desc) || ""}`} -
-
- {`(${ - (event.job && event.job.labhrs.aggregate.sum.mod_lb_hrs) || "0" - } / ${ - (event.job && event.job.larhrs.aggregate.sum.mod_lb_hrs) || "0" - })`} -
+ + {`${event.job.ro_number || t("general.labels.na")}`} + {`${(event.job && event.job.ownr_fn) || ""} ${ + (event.job && event.job.ownr_ln) || "" + } ${(event.job && event.job.ownr_co_nm) || ""}`} + + + + {" "} + {`${(event.job && event.job.v_model_yr) || ""} ${ + (event.job && event.job.v_make_desc) || "" + } ${(event.job && event.job.v_model_desc) || ""}`} + + + {`(${ + (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.alt_transport && (
{event.job.alt_transport}
)}