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

IO-1891 Add owner Note.

Browse Source
This commit is contained in:
Patrick Fic
2022-05-26 12:09:36 -07:00
parent 7f3b1413d7
commit e1e5dda710
11 changed files with 80 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
bodyshop_translations.babel
View File

@@ -32076,6 +32076,27 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>note</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>ownr_addr1</name>
<definition_loaded>false</definition_loaded>

6
client/src/components/owner-detail-form/owner-detail-form.component.jsx
View File

@@ -14,7 +14,6 @@ export default function OwnerDetailFormComponent({ form, loading }) {
return (
<div>
<FormFieldsChanged form={form} />
<LayoutFormRow header={t("owners.forms.name")}>
<Form.Item label={t("owners.fields.ownr_title")} name="ownr_title">
<Input />
@@ -29,7 +28,6 @@ export default function OwnerDetailFormComponent({ form, loading }) {
<Input />
</Form.Item>
</LayoutFormRow>
<LayoutFormRow header={t("owners.forms.address")}>
<Form.Item label={t("owners.fields.ownr_addr1")} name="ownr_addr1">
<Input />
@@ -50,7 +48,6 @@ export default function OwnerDetailFormComponent({ form, loading }) {
<Input />
</Form.Item>
</LayoutFormRow>
<LayoutFormRow header={t("owners.forms.contact")}>
<Form.Item
label={t("owners.fields.allow_text_message")}
@@ -98,6 +95,9 @@ export default function OwnerDetailFormComponent({ form, loading }) {
<Input />
</Form.Item>
</LayoutFormRow>
<Form.Item label={t("owners.fields.note")} name="note">
<Input.TextArea rows={4} />
</Form.Item>
</div>
);
}

8
client/src/components/owner-find-modal/owner-find-modal.component.jsx
View File

@@ -59,6 +59,14 @@ export default function OwnerFindModalComponent({
<PhoneFormatter>{record.ownr_ph2}</PhoneFormatter>
),
},
{
title: t("owners.fields.note"),
dataIndex: "note",
key: "note",
render: (text, record) => (
<span style={{ whiteSpace: "pre" }}>{record.note}</span>
),
},
];
const handleOnRowClick = (record) => {

23
client/src/components/production-list-columns/production-list-columns.add.component.jsx
View File

@@ -42,17 +42,24 @@ export function ProductionColumnsComponent({
};
const columnKeys = columns.map((i) => i.key);
const cols = dataSource({
technician,
state: tableState,
activeStatuses: bodyshop.md_ro_statuses.active_statuses,
});
const menu = (
<Menu onClick={handleAdd}>
{dataSource({
technician,
state: tableState,
activeStatuses: bodyshop.md_ro_statuses.active_statuses,
})
<Menu
onClick={handleAdd}
style={{
columnCount: Math.max(Math.floor(cols.length / 10), 1),
}}
>
{cols
.filter((i) => !columnKeys.includes(i.key))
.map((item) => (
<Menu.Item key={item.key}>{item.title}</Menu.Item>
<Menu.Item key={item.key} style={{ breakInside: "avoid" }}>
{item.title}
</Menu.Item>
))}
</Menu>
);

2
client/src/graphql/owners.queries.js
View File

@@ -15,6 +15,7 @@ export const QUERY_SEARCH_OWNER_BY_IDX = gql`
ownr_st
ownr_zip
id
note
}
}
`;
@@ -65,6 +66,7 @@ export const QUERY_OWNER_BY_ID = gql`
ownr_title
ownr_zip
preferred_contact
note
jobs {
id
ro_number

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

@@ -1893,6 +1893,7 @@
"address": "Address",
"allow_text_message": "Permission to Text?",
"name": "Name",
"note": "Owner Note",
"ownr_addr1": "Address",
"ownr_addr2": "Address 2",
"ownr_city": "City",

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

@@ -1893,6 +1893,7 @@
"address": "Dirección",
"allow_text_message": "Permiso de texto?",
"name": "Nombre",
"note": "",
"ownr_addr1": "Dirección",
"ownr_addr2": "Dirección 2",
"ownr_city": "ciudad",

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

@@ -1893,6 +1893,7 @@
"address": "Adresse",
"allow_text_message": "Autorisation de texte?",
"name": "Prénom",
"note": "",
"ownr_addr1": "Adresse",
"ownr_addr2": "Adresse 2 ",
"ownr_city": "Ville",

41
hasura/metadata/tables.yaml
View File

@@ -3823,32 +3823,36 @@
- active:
_eq: true
columns:
- id
- accountingid
- allow_text_message
- created_at
- updated_at
- ownr_fn
- ownr_ln
- id
- note
- ownr_addr1
- ownr_addr2
- ownr_city
- ownr_st
- ownr_zip
- ownr_co_nm
- ownr_ctry
- ownr_ea
- ownr_fn
- ownr_ln
- ownr_ph1
- preferred_contact
- allow_text_message
- shopid
- ownr_ph2
- ownr_co_nm
- ownr_st
- ownr_title
- accountingid
- ownr_zip
- preferred_contact
- shopid
- updated_at
select_permissions:
- role: user
permission:
columns:
- allow_text_message
- accountingid
- allow_text_message
- created_at
- id
- note
- ownr_addr1
- ownr_addr2
- ownr_city
@@ -3863,10 +3867,8 @@
- ownr_title
- ownr_zip
- preferred_contact
- created_at
- updated_at
- id
- shopid
- updated_at
filter:
bodyshop:
associations:
@@ -3881,8 +3883,11 @@
- role: user
permission:
columns:
- allow_text_message
- accountingid
- allow_text_message
- created_at
- id
- note
- ownr_addr1
- ownr_addr2
- ownr_city
@@ -3897,10 +3902,8 @@
- ownr_title
- ownr_zip
- preferred_contact
- created_at
- updated_at
- id
- shopid
- updated_at
filter:
bodyshop:
associations:

4
hasura/migrations/1653589931102_alter_table_public_owners_add_column_note/down.sql Normal file
View File

@@ -0,0 +1,4 @@
-- Could not auto-generate a down migration.
-- Please write an appropriate down migration for the SQL below:
-- alter table "public"."owners" add column "note" text
-- null;

2
hasura/migrations/1653589931102_alter_table_public_owners_add_column_note/up.sql Normal file
View File

@@ -0,0 +1,2 @@
alter table "public"."owners" add column "note" text
null;