Updated format on reporting screen. RPS-26

This commit is contained in:
Patrick Fic
2020-10-28 06:32:37 -07:00
parent 016a3ea6fe
commit 8e4cc5756c
2 changed files with 62 additions and 32 deletions

View File

@@ -9,6 +9,7 @@ import { setSelectedJobId } from "../../../redux/application/application.actions
import { import {
selectReportData, selectReportData,
selectReportLoading, selectReportLoading,
selectScorecard,
} from "../../../redux/reporting/reporting.selectors"; } from "../../../redux/reporting/reporting.selectors";
const { ipcRenderer } = window; const { ipcRenderer } = window;
@@ -16,12 +17,14 @@ const { ipcRenderer } = window;
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
reportingLoading: selectReportLoading, reportingLoading: selectReportLoading,
reportData: selectReportData, reportData: selectReportData,
scoreCard: selectScorecard,
}); });
const mapDispatchToProps = (dispatch) => ({ const mapDispatchToProps = (dispatch) => ({
setSelectedJobId: (id) => dispatch(setSelectedJobId(id)), setSelectedJobId: (id) => dispatch(setSelectedJobId(id)),
}); });
export function ReportingJobsListMolecule({ export function ReportingJobsListMolecule({
scoreCard,
reportingLoading, reportingLoading,
reportData, reportData,
setSelectedJobId, setSelectedJobId,
@@ -147,6 +150,24 @@ export function ReportingJobsListMolecule({
scroll={{ scroll={{
x: true, x: true,
}} }}
summary={() => (
<Table.Summary.Row>
<Table.Summary.Cell index={0}></Table.Summary.Cell>
<Table.Summary.Cell index={1}></Table.Summary.Cell>
<Table.Summary.Cell index={2}></Table.Summary.Cell>
<Table.Summary.Cell index={3}></Table.Summary.Cell>
<Table.Summary.Cell index={4}></Table.Summary.Cell>
<Table.Summary.Cell index={5}>
{scoreCard && scoreCard.allJobsSumDbPrice.toFormat()}
</Table.Summary.Cell>
<Table.Summary.Cell index={6}>
{" "}
{scoreCard && scoreCard.allJobsSumActPrice.toFormat()}
</Table.Summary.Cell>
<Table.Summary.Cell index={7}></Table.Summary.Cell>
<Table.Summary.Cell index={8}></Table.Summary.Cell>
</Table.Summary.Row>
)}
/> />
</div> </div>
); );

View File

@@ -35,38 +35,47 @@ export function ReportingTotalsStatsMolecule({ reportingLoading, scoreCard }) {
marginBottom: "1rem", marginBottom: "1rem",
}} }}
> >
<Statistic <div style={{ display: "flex" }}>
title="RPS Total" <Statistic
value={scoreCard.shopRpsTotalDollars.toFormat()} title="Target RPS %"
/> style={{ margin: "0rem .5rem" }}
<Statistic value={((scoreCard.targetRpsPc || 0) * 100).toFixed(1)}
title="RPS Expectation" suffix="%"
value={scoreCard.shopRpsExpectedDollars.toFormat()} />
/> <Statistic
<Statistic title="Current RPS %"
title="RPS Variance $" style={{ margin: "0rem .5rem" }}
valueStyle={{ valueStyle={{
color: color:
scoreCard.varianceDollars.getAmount() < 0 ? "tomato" : "seagreen", (scoreCard.currentRpsPc || 0) <= (scoreCard.targetRpsPc || 0)
}} ? "tomato"
value={scoreCard.varianceDollars.toFormat()} : "seagreen",
/> }}
<Statistic value={((scoreCard.currentRpsPc || 0) * 100).toFixed(1)}
title="Current RPS %" suffix="%"
valueStyle={{ />
color: </div>
(scoreCard.currentRpsPc || 0) <= (scoreCard.targetRpsPc || 0) <div style={{ display: "flex" }}>
? "tomato" <Statistic
: "seagreen", title="Target RPS $"
}} style={{ margin: "0rem .5rem" }}
value={((scoreCard.currentRpsPc || 0) * 100).toFixed(1)} value={scoreCard.shopRpsExpectedDollars.toFormat()}
suffix="%" />
/> <Statistic
<Statistic title="Current RPS $"
title="Target RPS %" style={{ margin: "0rem .5rem" }}
value={((scoreCard.targetRpsPc || 0) * 100).toFixed(1)} value={scoreCard.shopRpsTotalDollars.toFormat()}
suffix="%" />
/> <Statistic
title="RPS Variance $"
style={{ margin: "0rem .5rem" }}
valueStyle={{
color:
scoreCard.varianceDollars.getAmount() < 0 ? "tomato" : "seagreen",
}}
value={scoreCard.varianceDollars.toFormat()}
/>
</div>
</div> </div>
); );
} }