admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- PR Change Requests

Browse Source 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
This commit is contained in:
Dave Richer
2024-04-09 16:49:03 -04:00
parent 6b9269eb2d
commit 80b4ef3ae8
3 changed files with 27 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/src/components/task-list/task-list.component.jsx
View File

@@ -247,11 +247,6 @@ function TaskListComponent({
} }
); );
const [state, setState] = useState({
sortedInfo: {},
filteredInfo: { text: "" }
});
const handleCreateTask = useCallback(() => { const handleCreateTask = useCallback(() => {
setTaskUpsertContext({ setTaskUpsertContext({
actions: {}, actions: {},

56
client/src/components/task-upsert-modal/task-upsert-modal.component.jsx
View File

@@ -131,13 +131,12 @@ export function TaskUpsertModalComponent({
allowClear allowClear
placeholder={t("tasks.placeholders.joblineid")} placeholder={t("tasks.placeholders.joblineid")}
disabled={!selectedJobDetails || !selectedJobId} disabled={!selectedJobDetails || !selectedJobId}
> options={selectedJobDetails?.joblines?.map((jobline) => ({
{selectedJobDetails?.joblines?.map((jobline) => ( key: jobline.id,
<Select.Option key={jobline.id} value={jobline.id}> value: jobline.id,
{jobline.line_desc} label: jobline.line_desc
</Select.Option> }))}
))} />
</Select>
</Form.Item> </Form.Item>
</Col> </Col>
<Col span={8}> <Col span={8}>
@@ -146,13 +145,12 @@ export function TaskUpsertModalComponent({
allowClear allowClear
placeholder={t("tasks.placeholders.partsorderid")} placeholder={t("tasks.placeholders.partsorderid")}
disabled={!selectedJobDetails || !selectedJobId} disabled={!selectedJobDetails || !selectedJobId}
> options={selectedJobDetails?.parts_orders?.map((partsOrder) => ({
{selectedJobDetails?.parts_orders?.map((partsOrder) => ( key: partsOrder.id,
<Select.Option key={partsOrder.id} value={partsOrder.id}> value: partsOrder.id,
{partsOrder.order_number} - {partsOrder.vendor.name} label: `${partsOrder.order_number} - ${partsOrder.vendor.name}`
</Select.Option> }))}
))} />
</Select>
</Form.Item> </Form.Item>
</Col> </Col>
<Col span={8}> <Col span={8}>
@@ -161,13 +159,12 @@ export function TaskUpsertModalComponent({
allowClear allowClear
placeholder={t("tasks.placeholders.billid")} placeholder={t("tasks.placeholders.billid")}
disabled={!selectedJobDetails || !selectedJobId} disabled={!selectedJobDetails || !selectedJobId}
> options={selectedJobDetails?.bills?.map((bill) => ({
{selectedJobDetails?.bills?.map((bill) => ( key: bill.id,
<Select.Option key={bill.id} value={bill.id}> value: bill.id,
{bill.invoice_number} - {bill.vendor.name} label: `${bill.invoice_number} - ${bill.vendor.name}`
</Select.Option> }))}
))} />
</Select>
</Form.Item> </Form.Item>
</Col> </Col>
</Row> </Row>
@@ -183,15 +180,16 @@ export function TaskUpsertModalComponent({
} }
]} ]}
> >
<Select placeholder={t("tasks.placeholders.assigned_to")}> <Select
{bodyshop.employees placeholder={t("tasks.placeholders.assigned_to")}
options={bodyshop.employees
.filter((x) => x.active) .filter((x) => x.active)
.map((employee) => ( .map((employee) => ({
<Select.Option key={employee.id} value={employee.user_email}> key: employee.id,
{employee.first_name} {employee.last_name} value: employee.user_email,
</Select.Option> label: `${employee.first_name} ${employee.last_name}`
))} }))}
</Select> />
</Form.Item> </Form.Item>
</Col> </Col>
<Col span={8}> <Col span={8}>

5
client/src/graphql/jobs.queries.js
View File

@@ -100,11 +100,6 @@ export const QUERY_ALL_ACTIVE_JOBS = gql`
suspended suspended
est_ct_fn est_ct_fn
est_ct_ln est_ct_ln
tasks_aggregate(where: { completed: { _eq: false }, deleted: { _eq: false } }) {
aggregate {
count
}
}
} }
} }
`; `;