Fixed form issues on time ticket modal and employee setup screen IO-418
This commit is contained in:
@@ -6,7 +6,7 @@ import { connect } from "react-redux";
|
||||
import { createStructuredSelector } from "reselect";
|
||||
import { selectBodyshop } from "../../redux/user/user.selectors";
|
||||
import FormDatePicker from "../form-date-picker/form-date-picker.component";
|
||||
|
||||
import CurrencyInput from "../form-items-formatted/currency-form-item.component";
|
||||
const mapStateToProps = createStructuredSelector({
|
||||
bodyshop: selectBodyshop,
|
||||
});
|
||||
@@ -157,7 +157,7 @@ export function ShopEmployeesFormComponent({
|
||||
},
|
||||
]}
|
||||
>
|
||||
<InputNumber />
|
||||
<CurrencyInput />
|
||||
</Form.Item>
|
||||
<Form.Item label={t("employees.fields.user_email")} name="user_email">
|
||||
<Input />
|
||||
|
||||
@@ -6,6 +6,7 @@ import FormDatePicker from "../form-date-picker/form-date-picker.component";
|
||||
import InputNumberCalculator from "../form-input-number-calculator/form-input-number-calculator.component";
|
||||
import JobSearchSelect from "../job-search-select/job-search-select.component";
|
||||
import LaborAllocationsTable from "../labor-allocations-table/labor-allocations-table.component";
|
||||
import LayoutFormRow from "../layout-form-row/layout-form-row.component";
|
||||
|
||||
export default function TimeTicketModalComponent({
|
||||
form,
|
||||
@@ -19,7 +20,7 @@ export default function TimeTicketModalComponent({
|
||||
|
||||
return (
|
||||
<div>
|
||||
<div style={{ display: "flex" }}>
|
||||
<LayoutFormRow grow>
|
||||
<Form.Item
|
||||
name="jobid"
|
||||
label={t("timetickets.fields.ro_number")}
|
||||
@@ -53,9 +54,9 @@ export default function TimeTicketModalComponent({
|
||||
>
|
||||
<EmployeeSearchSelect options={employeeAutoCompleteOptions} />
|
||||
</Form.Item>
|
||||
</div>
|
||||
</LayoutFormRow>
|
||||
|
||||
<div style={{ display: "flex" }}>
|
||||
<LayoutFormRow>
|
||||
<Form.Item
|
||||
label={t("timetickets.fields.date")}
|
||||
name="date"
|
||||
@@ -102,7 +103,7 @@ export default function TimeTicketModalComponent({
|
||||
},
|
||||
]}
|
||||
>
|
||||
<Select style={{ width: "150px" }}>
|
||||
<Select>
|
||||
{responsibilityCenters.costs.map((item) => (
|
||||
<Select.Option key={item.name}>{item.name}</Select.Option>
|
||||
))}
|
||||
@@ -120,7 +121,7 @@ export default function TimeTicketModalComponent({
|
||||
>
|
||||
<Input disabled />
|
||||
</Form.Item>
|
||||
</div>
|
||||
</LayoutFormRow>
|
||||
<LaborAllocationsTable
|
||||
joblines={lineTicketData.joblines}
|
||||
timetickets={lineTicketData.timetickets}
|
||||
|
||||
@@ -171,6 +171,7 @@ export function TimeTicketModalContainer({
|
||||
>
|
||||
<Form
|
||||
onFinish={handleFinish}
|
||||
layout="vertical"
|
||||
autoComplete={"off"}
|
||||
form={form}
|
||||
initialValues={
|
||||
|
||||
Reference in New Issue
Block a user