diff --git a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx index 141cab456..b1909a41f 100644 --- a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx +++ b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx @@ -335,7 +335,11 @@ export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail }) - + {t("jobs.labels.employeeassignments")} + id={"job-employee-assignments"} + >
diff --git a/client/src/components/shop-employees/shop-employees-form.component.jsx b/client/src/components/shop-employees/shop-employees-form.component.jsx index a44e26d4a..0f3e2268a 100644 --- a/client/src/components/shop-employees/shop-employees-form.component.jsx +++ b/client/src/components/shop-employees/shop-employees-form.component.jsx @@ -1,13 +1,15 @@ import { DeleteFilled } from "@ant-design/icons"; import { useApolloClient, useMutation, useQuery } from "@apollo/client"; +import { useSplitTreatments } from "@splitsoftware/splitio-react"; import { Button, Card, Form, Input, InputNumber, Select, Switch, Table } from "antd"; import { useForm } from "antd/es/form/Form"; -import dayjs from "../../utils/day"; -import React, { useEffect } from "react"; +import queryString from "query-string"; +import { useEffect } from "react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; import { useLocation, useNavigate } from "react-router-dom"; import { createStructuredSelector } from "reselect"; +import { useNotification } from "../../contexts/Notifications/notificationContext.jsx"; import { logImEXEvent } from "../../firebase/firebase.utils"; import { CHECK_EMPLOYEE_NUMBER, @@ -20,19 +22,17 @@ import { import { selectBodyshop } from "../../redux/user/user.selectors"; import CiecaSelect from "../../utils/Ciecaselect"; import { DateFormatter } from "../../utils/DateFormatter"; +import dayjs from "../../utils/day"; import AlertComponent from "../alert/alert.component"; +import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx"; import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component"; import LayoutFormRow from "../layout-form-row/layout-form-row.component"; import ShopEmployeeAddVacation from "./shop-employees-add-vacation.component"; -import queryString from "query-string"; -import { useSplitTreatments } from "@splitsoftware/splitio-react"; -import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx"; -import { useNotification } from "../../contexts/Notifications/notificationContext.jsx"; const mapStateToProps = createStructuredSelector({ bodyshop: selectBodyshop }); -const mapDispatchToProps = (dispatch) => ({ +const mapDispatchToProps = () => ({ //setUserLanguage: language => dispatch(setUserLanguage(language)) }); @@ -83,7 +83,7 @@ export function ShopEmployeesFormComponent({ bodyshop }) { } } }) - .then((r) => { + .then(() => { notification["success"]({ message: t("employees.successes.save") }); @@ -120,13 +120,13 @@ export function ShopEmployeesFormComponent({ bodyshop }) { title: t("employees.fields.vacation.start"), dataIndex: "start", key: "start", - render: (text, record) => {text} + render: (text) => {text} }, { title: t("employees.fields.vacation.end"), dataIndex: "end", key: "end", - render: (text, record) => {text} + render: (text) => {text} }, { title: t("employees.fields.vacation.length"), @@ -210,7 +210,7 @@ export function ShopEmployeesFormComponent({ bodyshop }) { required: true //message: t("general.validation.required"), }, - ({ getFieldValue }) => ({ + () => ({ async validator(rule, value) { if (value) { const response = await client.query({ @@ -369,8 +369,9 @@ export function ShopEmployeesFormComponent({ bodyshop }) { add(); }} style={{ width: "100%" }} + id="add-employee-rate-button" > - {t("employees.actions.newrate")} + {t("employees.actions.newrate")}