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

WIP Vendors list table + order parts.

Browse Source
This commit is contained in:
Patrick Fic
2020-02-13 14:05:26 -08:00
parent 70259eb0d4
commit d1b14427cc
25 changed files with 745 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

178
bodyshop_translations.babel
View File

@@ -4844,6 +4844,48 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>shop_config</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>
<name>shop_vendors</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>
<name>vehicles</name>
<definition_loaded>false</definition_loaded>
@@ -6065,6 +6107,27 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>shop_vendors</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>
<name>vehicledetail</name>
<definition_loaded>false</definition_loaded>
@@ -6753,6 +6816,121 @@
</folder_node>
</children>
</folder_node>
<folder_node>
<name>vendors</name>
<children>
<folder_node>
<name>fields</name>
<children>
<concept_node>
<name>city</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>
<name>cost_center</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>
<name>favorite</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>
<name>name</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>
<name>street1</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>
</children>
</folder_node>
</children>
</folder_node>
</children>
</folder_node>
</children>

8
client/src/components/allocations-assignment/allocations-assignment.container.jsx
View File

@@ -5,7 +5,11 @@ import { INSERT_ALLOCATION } from "../../graphql/allocations.queries";
import { useTranslation } from "react-i18next";
import { notification } from "antd";
export default function AllocationsAssignmentContainer({ jobLineId, hours }) {
export default function AllocationsAssignmentContainer({
jobLineId,
hours,
refetch
}) {
const visibilityState = useState(false);
const { t } = useTranslation();
const [assignment, setAssignment] = useState({
@@ -22,7 +26,7 @@ export default function AllocationsAssignmentContainer({ jobLineId, hours }) {
});
//TODO: Better way to reset the field decorators?
visibilityState[1](false);
//refetch().then(r => form.resetFields());
if (refetch) refetch();
});
};

16
client/src/components/header/header.component.jsx
View File

@@ -71,12 +71,16 @@ export default ({
</Link>
</Menu.Item>
</Menu.SubMenu>
<Menu.Item key="shop">
<Link to="/manage/shop">
{t("menus.header.shop")}
</Link>
</Menu.Item>
<Menu.SubMenu title={t("menus.header.shop")}>
<Menu.Item key="shop">
<Link to="/manage/shop">{t("menus.header.shop_config")}</Link>
</Menu.Item>
<Menu.Item key="shop-vendors">
<Link to="/manage/shop/vendors">
{t("menus.header.shop_vendors")}
</Link>
</Menu.Item>
</Menu.SubMenu>
<Menu.SubMenu
title={

6
client/src/components/job-detail-lines/job-lines.component.jsx
View File

@@ -8,6 +8,8 @@ import AllocationsAssignmentContainer from "../allocations-assignment/allocation
import PartsOrderModalContainer from "../parts-order-modal/parts-order-modal.container";
export default function JobLinesComponent({
loading,
refetch,
jobLines,
setSearchText,
selectedLines,
@@ -18,7 +20,7 @@ export default function JobLinesComponent({
sortedInfo: {}
});
const { t } = useTranslation();
const [partsModalVisible, setPartsModalVisible] = partsOrderModalVisible;
const setPartsModalVisible = partsOrderModalVisible[1];
const columns = [
{
title: t("joblines.fields.unq_seq"),
@@ -126,6 +128,7 @@ export default function JobLinesComponent({
: null}
<AllocationsAssignmentContainer
key={record.id}
refetch={refetch}
jobLineId={record.id}
hours={record.mod_lb_hrs}
/>
@@ -187,6 +190,7 @@ export default function JobLinesComponent({
);
}}
{...formItemLayout}
loading={loading}
size="small"
pagination={{ position: "bottom", defaultPageSize: 50 }}
rowSelection={{

3
client/src/components/job-detail-lines/job-lines.container.jsx
View File

@@ -8,7 +8,7 @@ import JobLinesComponent from "./job-lines.component";
//export default Form.create({ name: "JobsDetailJobLines" })(
export default function JobLinesContainer({ jobId }) {
const { loading, error, data } = useQuery(GET_JOB_LINES_BY_PK, {
const { loading, error, data, refetch } = useQuery(GET_JOB_LINES_BY_PK, {
variables: { id: jobId },
fetchPolicy: "network-only"
});
@@ -21,6 +21,7 @@ export default function JobLinesContainer({ jobId }) {
return (
<JobLinesComponent
loading={loading}
refetch={refetch}
jobLines={
data && data.joblines
? searchText

2
client/src/components/parts-order-modal/parts-order-modal.container.jsx
View File

@@ -5,7 +5,7 @@ export default function PartsOrderModalContainer({
partsOrderModalVisible,
linesToOrder
}) {
console.log("partsord", partsOrderModalVisible);
const [modalVisible, setModalVisible] = partsOrderModalVisible;
return (
<Modal visible={modalVisible} onCancel={() => setModalVisible(false)}>

107
client/src/components/vendors-list/vendors-list.component.jsx Normal file
View File

@@ -0,0 +1,107 @@
import { Input, Table } from "antd";
import React, { useState } from "react";
import { useTranslation } from "react-i18next";
import { alphaSort } from "../../utils/sorters";
export default function VendorsListComponent({
selectedVendor,
setSelectedVendor,
loading,
refetch,
vendors
}) {
const [state, setState] = useState({
sortedInfo: {},
filteredInfo: { text: "" }
});
const { t } = useTranslation();
const columns = [
{
title: t("vendors.fields.name"),
dataIndex: "name",
key: "name",
sorter: (a, b) => alphaSort(a.name, b.name),
sortOrder: state.sortedInfo.columnKey === "name" && state.sortedInfo.order
},
{
title: t("vendors.fields.favorite"),
dataIndex: "favorite",
key: "favorite"
},
{
title: t("vendors.fields.cost_center"),
dataIndex: "cost_center",
key: "cost_center",
sorter: (a, b) => alphaSort(a.cost_center, b.cost_center),
sortOrder:
state.sortedInfo.columnKey === "cost_center" && state.sortedInfo.order
},
{
title: t("vendors.fields.street1"),
dataIndex: "street1",
key: "street1",
width: "10%",
sorter: (a, b) => alphaSort(a.street1, b.street1),
sortOrder:
state.sortedInfo.columnKey === "street1" && state.sortedInfo.order
},
{
title: t("vendors.fields.city"),
dataIndex: "city",
key: "city"
}
];
const handleTableChange = (pagination, filters, sorter) => {
setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
};
const handleOnRowClick = record => {
if (record) {
setSelectedVendor(record);
return;
}
setSelectedVendor(null);
};
//TODO Implement search
return (
<div>
<Table
loading={loading}
title={() => {
return (
<Input.Search
placeholder={t("general.labels.search")}
onSearch={value => {
console.log(value);
}}
enterButton
/>
);
}}
size="small"
pagination={{ position: "top" }}
columns={columns.map(item => ({ ...item }))}
rowKey="id"
onChange={handleTableChange}
dataSource={vendors}
rowSelection={{
onSelect: record => {
setSelectedVendor(record);
},
type: "radio",
selectedRowKeys: selectedVendor.id || null
}}
onRow={(record, rowIndex) => {
return {
onClick: event => {
handleOnRowClick(record);
}
};
}}
/>
</div>
);
}

32
client/src/components/vendors-list/vendors-list.container.jsx Normal file
View File

@@ -0,0 +1,32 @@
import React from "react";
import { useQuery } from "react-apollo";
import AlertComponent from "../../components/alert/alert.component";
import { QUERY_ALL_VENDORS, QUERY_VENDOR_BY_ID } from "../../graphql/vendors.queries";
import VendorsListComponent from "./vendors-list.component";
export default function VendorsListContainer({ selectedVendorState }) {
const [selectedVendor, setSelectedVendor] = selectedVendorState;
const { loading, error, data, refetch } = useQuery(QUERY_ALL_VENDORS, {
fetchPolicy: "network-only"
});
const vendorDetail = useQuery(QUERY_VENDOR_BY_ID, {
fetchPolicy: "network-only",
variables: { id: selectedVendor.id },
skip: !selectedVendor.id
});
if (error) return <AlertComponent message={error.message} type="error" />;
return (
<div>
<VendorsListComponent
selectedVendor={selectedVendor}
setSelectedVendor={setSelectedVendor}
loading={loading}
refetch={refetch}
vendors={data ? data.vendors : null}
/>
{JSON.stringify(vendorDetail && vendorDetail.data)}
</div>
);
}

48
client/src/graphql/vendors.queries.js Normal file
View File

@@ -0,0 +1,48 @@
import { gql } from "apollo-boost";
export const QUERY_VENDOR_BY_ID = gql`
query QUERY_VENDOR_BY_ID($id: uuid!) {
vendors_by_pk(id: $id) {
zip
terms
taxid
street2
state
prompt_discount
name
id
favorite
email
due_date
display_name
discount
country
cost_center
city
street1
}
}
`;
export const UPDATE_VEHICLE = gql`
mutation UPDATE_VEHICLE($vehId: uuid!, $vehicle: vehicles_set_input!) {
update_vehicles(where: { id: { _eq: $vehId } }, _set: $vehicle) {
returning {
id
}
}
}
`;
export const QUERY_ALL_VENDORS = gql`
query QUERY_ALL_VENDORS {
vendors {
name
id
favorite
street1
cost_center
city
}
}
`;

8
client/src/pages/manage/manage.page.jsx
View File

@@ -40,6 +40,9 @@ const OwnersDetailContainer = lazy(() =>
import("../owners-detail/owners-detail.page.container")
);
const ShopPage = lazy(() => import("../shop/shop.page.component"));
const ShopVendorPageContainer = lazy(() =>
import("../shop-vendor/shop-vendor.page.container")
);
const { Header, Content, Footer } = Layout;
@@ -118,6 +121,11 @@ export default function Manage({ match }) {
/>
<Route exact path={`${match.path}/shop/`} component={ShopPage} />
<Route
exact
path={`${match.path}/shop/vendors`}
component={ShopVendorPageContainer}
/>
</Suspense>
</ErrorBoundary>
</Content>

10
client/src/pages/shop-vendor/shop-vendor.page.component.jsx generated Normal file
View File

@@ -0,0 +1,10 @@
import React from "react";
import VendorsListContainer from "../../components/vendors-list/vendors-list.container";
export default function ShopVendorPageComponent({ selectedVendorState }) {
return (
<div>
<VendorsListContainer selectedVendorState={selectedVendorState} />
</div>
);
}

17
client/src/pages/shop-vendor/shop-vendor.page.container.jsx Normal file
View File

@@ -0,0 +1,17 @@
import React, { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import ShopVendorPageComponent from "./shop-vendor.page.component";
export default function ShopVendorPageContainer() {
const { t } = useTranslation();
useEffect(() => {
document.title = t("titles.shop_vendors");
}, [t]);
const selectedVendorState = useState({});
return (
<div>
<ShopVendorPageComponent selectedVendorState={selectedVendorState} />
</div>
);
}

12
client/src/translations/en_us/common.json
View File

@@ -302,6 +302,8 @@
"owners": "Owners",
"schedule": "Schedule",
"shop": "My Shop",
"shop_config": "Configuration",
"shop_vendors": "Vendors",
"vehicles": "Vehicles"
},
"jobsdetail": {
@@ -391,6 +393,7 @@
"profile": "My Profile | $t(titles.app)",
"schedule": "Schedule | $t(titles.app)",
"shop": "My Shop | $t(titles.app)",
"shop_vendors": "Vendors | $t(titles.app)",
"vehicledetail": "Vehicle Details {{vehicle}} | $t(titles.app)",
"vehicles": "All Vehicles | $t(titles.app)"
},
@@ -436,6 +439,15 @@
"successes": {
"save": "Vehicle saved successfully."
}
},
"vendors": {
"fields": {
"city": "City",
"cost_center": "Cost Center",
"favorite": "Favorite?",
"name": "Vendor Name",
"street1": "Street"
}
}
}
}

12
client/src/translations/es/common.json
View File

@@ -302,6 +302,8 @@
"owners": "propietarios",
"schedule": "Programar",
"shop": "Mi tienda",
"shop_config": "Configuración",
"shop_vendors": "Vendedores",
"vehicles": "Vehículos"
},
"jobsdetail": {
@@ -391,6 +393,7 @@
"profile": "Mi perfil | $t(titles.app)",
"schedule": "Horario | $t(titles.app)",
"shop": "Mi tienda | $t(titles.app)",
"shop_vendors": "Vendedores | $t(titles.app)",
"vehicledetail": "Detalles del vehículo {{vehicle}} | $t(titles.app)",
"vehicles": "Todos los vehiculos | $t(titles.app)"
},
@@ -436,6 +439,15 @@
"successes": {
"save": "Vehículo guardado con éxito."
}
},
"vendors": {
"fields": {
"city": "ciudad",
"cost_center": "Centro de costos",
"favorite": "¿Favorito?",
"name": "Nombre del vendedor",
"street1": "calle"
}
}
}
}

12
client/src/translations/fr/common.json
View File

@@ -302,6 +302,8 @@
"owners": "Propriétaires",
"schedule": "Programme",
"shop": "Mon magasin",
"shop_config": "Configuration",
"shop_vendors": "Vendeurs",
"vehicles": "Véhicules"
},
"jobsdetail": {
@@ -391,6 +393,7 @@
"profile": "Mon profil | $t(titles.app)",
"schedule": "Horaire | $t(titles.app)",
"shop": "Mon magasin | $t(titles.app)",
"shop_vendors": "Vendeurs | $t(titles.app)",
"vehicledetail": "Détails du véhicule {{vehicle} | $t(titles.app)",
"vehicles": "Tous les véhicules | $t(titles.app)"
},
@@ -436,6 +439,15 @@
"successes": {
"save": "Le véhicule a été enregistré avec succès."
}
},
"vendors": {
"fields": {
"city": "Ville",
"cost_center": "Centre de coûts",
"favorite": "Préféré?",
"name": "Nom du vendeur",
"street1": "rue"
}
}
}
}

3
hasura/migrations/1581626650166_alter_table_public_vendors_add_column_cost_center/down.yaml Normal file
View File

@@ -0,0 +1,3 @@
- args:
sql: ALTER TABLE "public"."vendors" DROP COLUMN "cost_center";
type: run_sql

3
hasura/migrations/1581626650166_alter_table_public_vendors_add_column_cost_center/up.yaml Normal file
View File

@@ -0,0 +1,3 @@
- args:
sql: ALTER TABLE "public"."vendors" ADD COLUMN "cost_center" text NOT NULL;
type: run_sql

3
hasura/migrations/1581626683086_alter_table_public_vendors_add_column_favorite/down.yaml Normal file
View File

@@ -0,0 +1,3 @@
- args:
sql: ALTER TABLE "public"."vendors" DROP COLUMN "favorite";
type: run_sql

4
hasura/migrations/1581626683086_alter_table_public_vendors_add_column_favorite/up.yaml Normal file
View File

@@ -0,0 +1,4 @@
- args:
sql: ALTER TABLE "public"."vendors" ADD COLUMN "favorite" boolean NOT NULL DEFAULT
false;
type: run_sql

45
hasura/migrations/1581630600157_update_permission_user_public_table_vendors/down.yaml Normal file
View File

@@ -0,0 +1,45 @@
- args:
role: user
table:
name: vendors
schema: public
type: drop_insert_permission
- args:
permission:
check:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
columns:
- due_date
- discount
- prompt_discount
- city
- country
- display_name
- email
- name
- state
- street1
- street2
- taxid
- terms
- zip
- created_at
- updated_at
- bodyshopid
- id
localPresets:
- key: ""
value: ""
set: {}
role: user
table:
name: vendors
schema: public
type: create_insert_permission

47
hasura/migrations/1581630600157_update_permission_user_public_table_vendors/up.yaml Normal file
View File

@@ -0,0 +1,47 @@
- args:
role: user
table:
name: vendors
schema: public
type: drop_insert_permission
- args:
permission:
check:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
columns:
- id
- created_at
- updated_at
- bodyshopid
- name
- street1
- street2
- city
- state
- zip
- country
- email
- taxid
- discount
- prompt_discount
- due_date
- terms
- display_name
- cost_center
- favorite
localPresets:
- key: ""
value: ""
set: {}
role: user
table:
name: vendors
schema: public
type: create_insert_permission

43
hasura/migrations/1581630604954_update_permission_user_public_table_vendors/down.yaml Normal file
View File

@@ -0,0 +1,43 @@
- args:
role: user
table:
name: vendors
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: false
columns:
- due_date
- discount
- prompt_discount
- city
- country
- display_name
- email
- name
- state
- street1
- street2
- taxid
- terms
- zip
- created_at
- updated_at
- bodyshopid
- id
computed_fields: []
filter:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
role: user
table:
name: vendors
schema: public
type: create_select_permission

45
hasura/migrations/1581630604954_update_permission_user_public_table_vendors/up.yaml Normal file
View File

@@ -0,0 +1,45 @@
- args:
role: user
table:
name: vendors
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: false
columns:
- favorite
- due_date
- discount
- prompt_discount
- city
- cost_center
- country
- display_name
- email
- name
- state
- street1
- street2
- taxid
- terms
- zip
- created_at
- updated_at
- bodyshopid
- id
computed_fields: []
filter:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
role: user
table:
name: vendors
schema: public
type: create_select_permission

45
hasura/migrations/1581630611638_update_permission_user_public_table_vendors/down.yaml Normal file
View File

@@ -0,0 +1,45 @@
- args:
role: user
table:
name: vendors
schema: public
type: drop_update_permission
- args:
permission:
columns:
- due_date
- discount
- prompt_discount
- city
- country
- display_name
- email
- name
- state
- street1
- street2
- taxid
- terms
- zip
- created_at
- updated_at
- bodyshopid
- id
filter:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
localPresets:
- key: ""
value: ""
set: {}
role: user
table:
name: vendors
schema: public
type: create_update_permission

47
hasura/migrations/1581630611638_update_permission_user_public_table_vendors/up.yaml Normal file
View File

@@ -0,0 +1,47 @@
- args:
role: user
table:
name: vendors
schema: public
type: drop_update_permission
- args:
permission:
columns:
- favorite
- due_date
- discount
- prompt_discount
- city
- cost_center
- country
- display_name
- email
- name
- state
- street1
- street2
- taxid
- terms
- zip
- created_at
- updated_at
- bodyshopid
- id
filter:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
localPresets:
- key: ""
value: ""
set: {}
role: user
table:
name: vendors
schema: public
type: create_update_permission