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

IO-2239 Removed total title

Browse Source
This commit is contained in:
swtmply
2023-04-14 23:33:14 +08:00
parent 86e909e4e9
commit 79e2fecb24
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
client/src/components/scoreboard-day-stats/scoreboard-day-stats.component.jsx
View File

@@ -1,10 +1,9 @@
import { Card, Statistic } from "antd"; import { Card, Divider, Statistic } from "antd";
import moment from "moment"; import moment from "moment";
import React from "react"; import React from "react";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { createStructuredSelector } from "reselect"; import { createStructuredSelector } from "reselect";
import { selectBodyshop } from "../../redux/user/user.selectors"; import { selectBodyshop } from "../../redux/user/user.selectors";
import { useTranslation } from "react-i18next";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop, bodyshop: selectBodyshop,
}); });
@@ -14,7 +13,6 @@ const mapDispatchToProps = (dispatch) => ({
export function ScoreboardDayStats({ bodyshop, date, entries }) { export function ScoreboardDayStats({ bodyshop, date, entries }) {
const { dailyPaintTarget, dailyBodyTarget } = bodyshop.scoreboard_target; const { dailyPaintTarget, dailyBodyTarget } = bodyshop.scoreboard_target;
const { t } = useTranslation();
//let totalHrs = 0; //let totalHrs = 0;
const paintHrs = entries.reduce((acc, value) => { const paintHrs = entries.reduce((acc, value) => {
@@ -43,10 +41,9 @@ export function ScoreboardDayStats({ bodyshop, date, entries }) {
label="P" label="P"
value={paintHrs.toFixed(1)} value={paintHrs.toFixed(1)}
/> />
<Statistic <Divider style={{ margin: 0 }} />
title={t("general.labels.total")}
value={(bodyHrs + paintHrs).toFixed(1)} <Statistic value={(bodyHrs + paintHrs).toFixed(1)} />
/>
</Card> </Card>
); );
} }

8
client/src/components/scoreboard-targets-table/scoreboard-targets-table.component.jsx
View File

@@ -1,5 +1,5 @@
import { CalendarOutlined } from "@ant-design/icons"; import { CalendarOutlined } from "@ant-design/icons";
import { Card, Col, Row, Statistic } from "antd"; import { Card, Col, Divider, Row, Statistic } from "antd";
import _ from "lodash"; import _ from "lodash";
import moment from "moment"; import moment from "moment";
import React, { useMemo } from "react"; import React, { useMemo } from "react";
@@ -177,6 +177,9 @@ export function ScoreboardTargetsTable({ bodyshop, scoreBoardlist }) {
<Statistic value={values.toDatePaint.toFixed(1)} /> <Statistic value={values.toDatePaint.toFixed(1)} />
</Col> </Col>
</Row> </Row>
<Row>
<Divider style={{ margin: 5 }} />
</Row>
<Row> <Row>
<Col {...statSpans}></Col> <Col {...statSpans}></Col>
<Col {...statSpans}> <Col {...statSpans}>
@@ -186,7 +189,6 @@ export function ScoreboardTargetsTable({ bodyshop, scoreBoardlist }) {
</Col> </Col>
<Col {...statSpans}> <Col {...statSpans}>
<Statistic <Statistic
title={t("general.labels.total")}
value={( value={(
Util.WeeklyTargetHrs( Util.WeeklyTargetHrs(
bodyshop.scoreboard_target.dailyBodyTarget, bodyshop.scoreboard_target.dailyBodyTarget,
@@ -206,7 +208,6 @@ export function ScoreboardTargetsTable({ bodyshop, scoreBoardlist }) {
</Col> </Col>
<Col {...statSpans}> <Col {...statSpans}>
<Statistic <Statistic
title={t("general.labels.total")}
value={( value={(
Util.MonthlyTargetHrs( Util.MonthlyTargetHrs(
bodyshop.scoreboard_target.dailyBodyTarget, bodyshop.scoreboard_target.dailyBodyTarget,
@@ -221,7 +222,6 @@ export function ScoreboardTargetsTable({ bodyshop, scoreBoardlist }) {
</Col> </Col>
<Col {...statSpans}> <Col {...statSpans}>
<Statistic <Statistic
title={t("general.labels.total")}
value={( value={(
Util.AsOfTodayTargetHrs( Util.AsOfTodayTargetHrs(
bodyshop.scoreboard_target.dailyBodyTarget, bodyshop.scoreboard_target.dailyBodyTarget,