Fixed form issues on time ticket modal and employee setup screen IO-418
This commit is contained in:
@@ -8951,6 +8951,27 @@
|
|||||||
</translation>
|
</translation>
|
||||||
</translations>
|
</translations>
|
||||||
</concept_node>
|
</concept_node>
|
||||||
|
<concept_node>
|
||||||
|
<name>pin</name>
|
||||||
|
<definition_loaded>false</definition_loaded>
|
||||||
|
<description></description>
|
||||||
|
<comment></comment>
|
||||||
|
<default_text></default_text>
|
||||||
|
<translations>
|
||||||
|
<translation>
|
||||||
|
<language>en-US</language>
|
||||||
|
<approved>false</approved>
|
||||||
|
</translation>
|
||||||
|
<translation>
|
||||||
|
<language>es-MX</language>
|
||||||
|
<approved>false</approved>
|
||||||
|
</translation>
|
||||||
|
<translation>
|
||||||
|
<language>fr-CA</language>
|
||||||
|
<approved>false</approved>
|
||||||
|
</translation>
|
||||||
|
</translations>
|
||||||
|
</concept_node>
|
||||||
<concept_node>
|
<concept_node>
|
||||||
<name>termination_date</name>
|
<name>termination_date</name>
|
||||||
<definition_loaded>false</definition_loaded>
|
<definition_loaded>false</definition_loaded>
|
||||||
|
|||||||
@@ -73,6 +73,9 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.ant-input-number-input,
|
.ant-input-number-input,
|
||||||
.ant-input-number {
|
.ant-input-number,
|
||||||
|
.ant-picker-input,
|
||||||
|
.ant-picker,
|
||||||
|
.ant-select {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ 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 FormDatePicker from "../form-date-picker/form-date-picker.component";
|
import FormDatePicker from "../form-date-picker/form-date-picker.component";
|
||||||
|
import CurrencyInput from "../form-items-formatted/currency-form-item.component";
|
||||||
const mapStateToProps = createStructuredSelector({
|
const mapStateToProps = createStructuredSelector({
|
||||||
bodyshop: selectBodyshop,
|
bodyshop: selectBodyshop,
|
||||||
});
|
});
|
||||||
@@ -157,7 +157,7 @@ export function ShopEmployeesFormComponent({
|
|||||||
},
|
},
|
||||||
]}
|
]}
|
||||||
>
|
>
|
||||||
<InputNumber />
|
<CurrencyInput />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
<Form.Item label={t("employees.fields.user_email")} name="user_email">
|
<Form.Item label={t("employees.fields.user_email")} name="user_email">
|
||||||
<Input />
|
<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 InputNumberCalculator from "../form-input-number-calculator/form-input-number-calculator.component";
|
||||||
import JobSearchSelect from "../job-search-select/job-search-select.component";
|
import JobSearchSelect from "../job-search-select/job-search-select.component";
|
||||||
import LaborAllocationsTable from "../labor-allocations-table/labor-allocations-table.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({
|
export default function TimeTicketModalComponent({
|
||||||
form,
|
form,
|
||||||
@@ -19,7 +20,7 @@ export default function TimeTicketModalComponent({
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<div style={{ display: "flex" }}>
|
<LayoutFormRow grow>
|
||||||
<Form.Item
|
<Form.Item
|
||||||
name="jobid"
|
name="jobid"
|
||||||
label={t("timetickets.fields.ro_number")}
|
label={t("timetickets.fields.ro_number")}
|
||||||
@@ -53,9 +54,9 @@ export default function TimeTicketModalComponent({
|
|||||||
>
|
>
|
||||||
<EmployeeSearchSelect options={employeeAutoCompleteOptions} />
|
<EmployeeSearchSelect options={employeeAutoCompleteOptions} />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
</div>
|
</LayoutFormRow>
|
||||||
|
|
||||||
<div style={{ display: "flex" }}>
|
<LayoutFormRow>
|
||||||
<Form.Item
|
<Form.Item
|
||||||
label={t("timetickets.fields.date")}
|
label={t("timetickets.fields.date")}
|
||||||
name="date"
|
name="date"
|
||||||
@@ -102,7 +103,7 @@ export default function TimeTicketModalComponent({
|
|||||||
},
|
},
|
||||||
]}
|
]}
|
||||||
>
|
>
|
||||||
<Select style={{ width: "150px" }}>
|
<Select>
|
||||||
{responsibilityCenters.costs.map((item) => (
|
{responsibilityCenters.costs.map((item) => (
|
||||||
<Select.Option key={item.name}>{item.name}</Select.Option>
|
<Select.Option key={item.name}>{item.name}</Select.Option>
|
||||||
))}
|
))}
|
||||||
@@ -120,7 +121,7 @@ export default function TimeTicketModalComponent({
|
|||||||
>
|
>
|
||||||
<Input disabled />
|
<Input disabled />
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
</div>
|
</LayoutFormRow>
|
||||||
<LaborAllocationsTable
|
<LaborAllocationsTable
|
||||||
joblines={lineTicketData.joblines}
|
joblines={lineTicketData.joblines}
|
||||||
timetickets={lineTicketData.timetickets}
|
timetickets={lineTicketData.timetickets}
|
||||||
|
|||||||
@@ -171,6 +171,7 @@ export function TimeTicketModalContainer({
|
|||||||
>
|
>
|
||||||
<Form
|
<Form
|
||||||
onFinish={handleFinish}
|
onFinish={handleFinish}
|
||||||
|
layout="vertical"
|
||||||
autoComplete={"off"}
|
autoComplete={"off"}
|
||||||
form={form}
|
form={form}
|
||||||
initialValues={
|
initialValues={
|
||||||
|
|||||||
@@ -598,6 +598,7 @@
|
|||||||
"flat_rate": "Flat Rate (Disabled is Straight Time)",
|
"flat_rate": "Flat Rate (Disabled is Straight Time)",
|
||||||
"hire_date": "Hire Date",
|
"hire_date": "Hire Date",
|
||||||
"last_name": "Last Name",
|
"last_name": "Last Name",
|
||||||
|
"pin": "Tech Console PIN",
|
||||||
"termination_date": "Termination Date",
|
"termination_date": "Termination Date",
|
||||||
"user_email": "User Email"
|
"user_email": "User Email"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -598,6 +598,7 @@
|
|||||||
"flat_rate": "Tarifa plana (deshabilitado es tiempo recto)",
|
"flat_rate": "Tarifa plana (deshabilitado es tiempo recto)",
|
||||||
"hire_date": "Fecha de contratación",
|
"hire_date": "Fecha de contratación",
|
||||||
"last_name": "Apellido",
|
"last_name": "Apellido",
|
||||||
|
"pin": "",
|
||||||
"termination_date": "Fecha de conclusión",
|
"termination_date": "Fecha de conclusión",
|
||||||
"user_email": ""
|
"user_email": ""
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -598,6 +598,7 @@
|
|||||||
"flat_rate": "Taux fixe (désactivé est le temps normal)",
|
"flat_rate": "Taux fixe (désactivé est le temps normal)",
|
||||||
"hire_date": "Date d'embauche",
|
"hire_date": "Date d'embauche",
|
||||||
"last_name": "Nom de famille",
|
"last_name": "Nom de famille",
|
||||||
|
"pin": "",
|
||||||
"termination_date": "Date de résiliation",
|
"termination_date": "Date de résiliation",
|
||||||
"user_email": ""
|
"user_email": ""
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user