UI fixes for manual job creation + owners pages + vehicles pages + all jobs BOD-155
This commit is contained in:
@@ -7,12 +7,12 @@ import { alphaSort } from "../../utils/sorters";
|
||||
|
||||
export default function JobsCreateOwnerInfoSearchComponent({
|
||||
loading,
|
||||
owners
|
||||
owners,
|
||||
}) {
|
||||
const [state, setState] = useContext(JobCreateContext);
|
||||
const [tableState, setTableState] = useState({
|
||||
sortedInfo: {},
|
||||
filteredInfo: { text: "" }
|
||||
filteredInfo: { text: "" },
|
||||
});
|
||||
|
||||
const { t } = useTranslation();
|
||||
@@ -25,7 +25,7 @@ export default function JobsCreateOwnerInfoSearchComponent({
|
||||
sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
|
||||
sortOrder:
|
||||
tableState.sortedInfo.columnKey === "ownr_ln" &&
|
||||
tableState.sortedInfo.order
|
||||
tableState.sortedInfo.order,
|
||||
},
|
||||
{
|
||||
title: t("owners.fields.ownr_fn"),
|
||||
@@ -34,7 +34,7 @@ export default function JobsCreateOwnerInfoSearchComponent({
|
||||
sorter: (a, b) => alphaSort(a.ownr_fn, b.ownr_fn),
|
||||
sortOrder:
|
||||
tableState.sortedInfo.columnKey === "ownr_fn" &&
|
||||
tableState.sortedInfo.order
|
||||
tableState.sortedInfo.order,
|
||||
},
|
||||
{
|
||||
title: t("owners.fields.ownr_addr1"),
|
||||
@@ -43,7 +43,7 @@ export default function JobsCreateOwnerInfoSearchComponent({
|
||||
sorter: (a, b) => alphaSort(a.ownr_addr1, b.ownr_addr1),
|
||||
sortOrder:
|
||||
tableState.sortedInfo.columnKey === "ownr_addr1" &&
|
||||
tableState.sortedInfo.order
|
||||
tableState.sortedInfo.order,
|
||||
},
|
||||
{
|
||||
title: t("owners.fields.ownr_city"),
|
||||
@@ -52,7 +52,7 @@ export default function JobsCreateOwnerInfoSearchComponent({
|
||||
sorter: (a, b) => alphaSort(a.ownr_city, b.ownr_city),
|
||||
sortOrder:
|
||||
tableState.sortedInfo.columnKey === "ownr_city" &&
|
||||
tableState.sortedInfo.order
|
||||
tableState.sortedInfo.order,
|
||||
},
|
||||
{
|
||||
title: t("owners.fields.ownr_ea"),
|
||||
@@ -61,7 +61,7 @@ export default function JobsCreateOwnerInfoSearchComponent({
|
||||
sorter: (a, b) => alphaSort(a.ownr_ea, b.ownr_ea),
|
||||
sortOrder:
|
||||
tableState.sortedInfo.columnKey === "ownr_ea" &&
|
||||
tableState.sortedInfo.order
|
||||
tableState.sortedInfo.order,
|
||||
},
|
||||
{
|
||||
title: t("owners.fields.ownr_ph1"),
|
||||
@@ -73,51 +73,54 @@ export default function JobsCreateOwnerInfoSearchComponent({
|
||||
sorter: (a, b) => alphaSort(a.ownr_ph1, b.ownr_ph1),
|
||||
sortOrder:
|
||||
tableState.sortedInfo.columnKey === "ownr_ph1" &&
|
||||
tableState.sortedInfo.order
|
||||
}
|
||||
tableState.sortedInfo.order,
|
||||
},
|
||||
];
|
||||
|
||||
const handleTableChange = (pagination, filters, sorter) => {
|
||||
setTableState({ ...tableState, filteredInfo: filters, sortedInfo: sorter });
|
||||
};
|
||||
//TODO Implement searching & pagination
|
||||
|
||||
return (
|
||||
<Table
|
||||
loading={loading}
|
||||
title={() => {
|
||||
return (
|
||||
<Input.Search
|
||||
placeholder="Search..."
|
||||
onSearch={value => {
|
||||
setState({
|
||||
...state,
|
||||
owner: { ...state.owner, search: value }
|
||||
});
|
||||
}}
|
||||
enterButton
|
||||
/>
|
||||
<div className='imex-table-header'>
|
||||
<Input.Search
|
||||
className='imex-table-header__search'
|
||||
placeholder={t("general.labels.search")}
|
||||
onSearch={(value) => {
|
||||
setState({
|
||||
...state,
|
||||
owner: { ...state.owner, search: value },
|
||||
});
|
||||
}}
|
||||
enterButton
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}}
|
||||
size="small"
|
||||
size='small'
|
||||
scroll={{ x: true }}
|
||||
pagination={{ position: "top" }}
|
||||
columns={columns.map(item => ({ ...item }))}
|
||||
rowKey="id"
|
||||
columns={columns}
|
||||
rowKey='id'
|
||||
dataSource={owners}
|
||||
onChange={handleTableChange}
|
||||
rowSelection={{
|
||||
onSelect: props => {
|
||||
onSelect: (props) => {
|
||||
setState({
|
||||
...state,
|
||||
owner: { ...state.owner, new: false, selectedid: props.id }
|
||||
owner: { ...state.owner, new: false, selectedid: props.id },
|
||||
});
|
||||
},
|
||||
type: "radio",
|
||||
selectedRowKeys: [state.owner.selectedid]
|
||||
selectedRowKeys: [state.owner.selectedid],
|
||||
}}
|
||||
onRow={(record, rowIndex) => {
|
||||
return {
|
||||
onClick: event => {
|
||||
onClick: (event) => {
|
||||
if (record) {
|
||||
if (record.id) {
|
||||
setState({
|
||||
@@ -125,18 +128,18 @@ export default function JobsCreateOwnerInfoSearchComponent({
|
||||
owner: {
|
||||
...state.owner,
|
||||
new: false,
|
||||
selectedid: record.id
|
||||
}
|
||||
selectedid: record.id,
|
||||
},
|
||||
});
|
||||
|
||||
|
||||
return;
|
||||
}
|
||||
}
|
||||
setState({
|
||||
...state,
|
||||
owner: { ...state.owner, selectedid: null }
|
||||
owner: { ...state.owner, selectedid: null },
|
||||
});
|
||||
}
|
||||
},
|
||||
};
|
||||
}}
|
||||
/>
|
||||
|
||||
Reference in New Issue
Block a user