diff --git a/client/src/components/job-damage-visual/job-damage-visual.component.jsx b/client/src/components/job-damage-visual/job-damage-visual.component.jsx index 558d4eefe..464bcff87 100644 --- a/client/src/components/job-damage-visual/job-damage-visual.component.jsx +++ b/client/src/components/job-damage-visual/job-damage-visual.component.jsx @@ -1,736 +1,746 @@ import React from "react"; -export default ({ dmg1, dmg2 }) => ( - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { + const { t } = useTranslation(); + + return ( +
+ {t("jobs.labels.cards.damage")} + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { - // - // x - // - } - - -); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { + // + // x + // + } + + +
+ ); +}; diff --git a/client/src/components/job-detail-cards/job-detail-cards.damage.component.jsx b/client/src/components/job-detail-cards/job-detail-cards.damage.component.jsx index 86a95f94f..b2cde2783 100644 --- a/client/src/components/job-detail-cards/job-detail-cards.damage.component.jsx +++ b/client/src/components/job-detail-cards/job-detail-cards.damage.component.jsx @@ -9,11 +9,10 @@ export default function JobDetailCardsDamageComponent({ loading, data }) { return ( {area_of_damage ? ( - - ) : t("jobs.errors.nodamage")} + + ) : ( + t("jobs.errors.nodamage") + )} ); } diff --git a/client/src/components/jobs-detail-general/jobs-detail-general.component.jsx b/client/src/components/jobs-detail-general/jobs-detail-general.component.jsx index fbfd7d2bf..6357bfa12 100644 --- a/client/src/components/jobs-detail-general/jobs-detail-general.component.jsx +++ b/client/src/components/jobs-detail-general/jobs-detail-general.component.jsx @@ -1,4 +1,4 @@ -import { Form, Input, InputNumber, Select, Switch } from "antd"; +import { Col, Form, Input, InputNumber, Row, Select, Switch } from "antd"; import React from "react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; @@ -19,6 +19,8 @@ const mapDispatchToProps = (dispatch) => ({ //setUserLanguage: language => dispatch(setUserLanguage(language)) }); +const lossColFields = { sm: { span: 24 }, md: { span: 18 }, lg: { span: 20 } }; +const lossColDamage = { sm: { span: 24 }, md: { span: 6 }, lg: { span: 4 } }; export function JobsDetailGeneral({ bodyshop, job, form }) { const { getFieldValue } = form; const { t } = useTranslation(); @@ -97,50 +99,54 @@ export function JobsDetailGeneral({ bodyshop, job, form }) { - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {job.area_of_damage ? ( ) : ( t("jobs.errors.nodamage") )} -
- - - - - - - - - - - - - - - - - - - - - - - - -
+ + +