IO-1954 schedule display improvements.

This commit is contained in:
Patrick Fic
2022-07-13 16:17:21 -07:00
parent 05a0ee30f4
commit b346c28fe0
3 changed files with 38 additions and 29 deletions

View File

@@ -247,40 +247,39 @@ export function ScheduleEventComponent({
); );
const RegularEvent = event.isintake ? ( const RegularEvent = event.isintake ? (
<div <Space
wrap
style={{ style={{
display: "flex", backgroundColor:
flexWrap: "wrap", event.color && event.color.hex ? event.color.hex : event.color,
height: "100%",
}} }}
> >
<Space> {event.note && <AlertFilled className="production-alert" />}
{event.note && <AlertFilled className="production-alert" />} <strong>{`${event.job.ro_number || t("general.labels.na")}`}</strong>
<strong>{`${event.job.ro_number || t("general.labels.na")}`}</strong>
<span> <OwnerNameDisplay ownerObject={event.job} />
<OwnerNameDisplay ownerObject={event.job} />
</span> {`${(event.job && event.job.v_model_yr) || ""} ${
</Space> (event.job && event.job.v_make_desc) || ""
<Space> } ${(event.job && event.job.v_model_desc) || ""}`}
<span>
{`${(event.job && event.job.v_model_yr) || ""} ${ {`(${(event.job && event.job.labhrs.aggregate.sum.mod_lb_hrs) || "0"} / ${
(event.job && event.job.v_make_desc) || "" (event.job && event.job.larhrs.aggregate.sum.mod_lb_hrs) || "0"
} ${(event.job && event.job.v_model_desc) || ""}`} })`}
</span>
<span>
{`(${
(event.job && event.job.labhrs.aggregate.sum.mod_lb_hrs) || "0"
} / ${
(event.job && event.job.larhrs.aggregate.sum.mod_lb_hrs) || "0"
})`}
</span>
</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>
)} )}
</div> </Space>
) : ( ) : (
<div style={{ height: "100%", width: "100%" }}> <div
style={{
height: "100%",
width: "100%",
backgroundColor:
event.color && event.color.hex ? event.color.hex : event.color,
}}
>
<strong>{`${event.title || ""}`}</strong> <strong>{`${event.title || ""}`}</strong>
</div> </div>
); );
@@ -291,7 +290,13 @@ export function ScheduleEventComponent({
onVisibleChange={(vis) => !event.vacation && setVisible(vis)} onVisibleChange={(vis) => !event.vacation && setVisible(vis)}
trigger="click" trigger="click"
content={event.block ? blockContent : popoverContent} content={event.block ? blockContent : popoverContent}
style={{ height: "100%", width: "100%" }} style={{
height: "100%",
width: "100%",
backgroundColor:
event.color && event.color.hex ? event.color.hex : event.color,
}}
> >
{RegularEvent} {RegularEvent}
</Popover> </Popover>

View File

@@ -4,6 +4,10 @@
.rbc-time-view .rbc-allday-cell { .rbc-time-view .rbc-allday-cell {
height: unset; height: unset;
} }
.rbc-month-row{
overflow: unset !important;
}
// .rbc-row-content { // .rbc-row-content {
// display: none; // display: none;
// } // }

View File

@@ -34,7 +34,7 @@ export function ScheduleCalendarWrapperComponent({
const { t } = useTranslation(); const { t } = useTranslation();
const handleEventPropStyles = (event, start, end, isSelected) => { const handleEventPropStyles = (event, start, end, isSelected) => {
return { return {
...(event.color ...(event.color && !((search.view || defaultView) === "agenda")
? { ? {
style: { style: {
backgroundColor: backgroundColor: