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

IO-899 WIP CC Improvements

Browse Source
This commit is contained in:
Patrick Fic
2021-04-13 16:12:43 -07:00
parent 472342481b
commit 18531dad6a
23 changed files with 633 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
bodyshop_translations.babel
View File

@@ -1,4 +1,4 @@
<babeledit_project version="1.2" be_version="2.7.1">
<babeledit_project be_version="2.7.1" version="1.2">
<!--
BabelEdit project file
@@ -7876,6 +7876,27 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>damage</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>damagewaiver</name>
<definition_loaded>false</definition_loaded>
@@ -8469,6 +8490,27 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>cardueforservice</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>
<folder_node>
<name>convertform</name>
<children>
@@ -8537,6 +8579,27 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>dlexpirebeforereturn</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>driverinformation</name>
<definition_loaded>false</definition_loaded>
@@ -9564,6 +9627,27 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>uniquefleet</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>usage</name>
<definition_loaded>false</definition_loaded>

4
client/src/components/contract-cars/contract-cars.component.jsx
View File

@@ -6,7 +6,7 @@ import { alphaSort } from "../../utils/sorters";
export default function ContractsCarsComponent({
loading,
data,
selectedCar,
selectedCarId,
handleSelect,
}) {
const [state, setState] = useState({
@@ -117,7 +117,7 @@ export default function ContractsCarsComponent({
rowSelection={{
onSelect: handleSelect,
type: "radio",
selectedRowKeys: [selectedCar],
selectedRowKeys: [selectedCarId],
}}
onRow={(record, rowIndex) => {
return {

5
client/src/components/contract-cars/contract-cars.container.jsx
View File

@@ -13,12 +13,13 @@ export default function ContractCarsContainer({ selectedCarState, form }) {
const [selectedCar, setSelectedCar] = selectedCarState;
const handleSelect = (record) => {
setSelectedCar(record.id);
setSelectedCar(record);
form.setFieldsValue({
kmstart: record.mileage,
dailyrate: record.dailycost,
fuelout: record.fuel,
damage: record.damage,
});
};
@@ -26,7 +27,7 @@ export default function ContractCarsContainer({ selectedCarState, form }) {
return (
<ContractCarsComponent
handleSelect={handleSelect}
selectedCar={selectedCar}
selectedCarId={selectedCar && selectedCar.id}
loading={loading}
data={data ? data.courtesycars : []}
/>

109
client/src/components/contract-form/contract-form.component.jsx
View File

@@ -1,4 +1,5 @@
import { Form, Input, InputNumber, Space } from "antd";
import { WarningFilled } from "@ant-design/icons";
import React from "react";
import { useTranslation } from "react-i18next";
import ContractLicenseDecodeButton from "../contract-license-decode-button/contract-license-decode-button.component";
@@ -12,11 +13,15 @@ import InputPhone, {
} from "../form-items-formatted/phone-form-item.component";
import LayoutFormRow from "../layout-form-row/layout-form-row.component";
import ContractFormJobPrefill from "./contract-form-job-prefill.component";
import FormDateTimePicker from "../form-date-time-picker/form-date-time-picker.component";
import moment from "moment";
import { DateFormatter } from "../../utils/DateFormatter";
export default function ContractFormComponent({
form,
create = false,
selectedJobState,
selectedCar,
}) {
const { t } = useTranslation();
return (
@@ -48,24 +53,24 @@ export default function ContractFormComponent({
},
]}
>
<FormDatePicker />
<FormDateTimePicker />
</Form.Item>
<Form.Item
label={t("contracts.fields.scheduledreturn")}
name="scheduledreturn"
>
<FormDatePicker />
<FormDateTimePicker />
</Form.Item>
{create ? null : (
<Form.Item
label={t("contracts.fields.actualreturn")}
name="actualreturn"
>
<FormDatePicker />
<FormDateTimePicker />
</Form.Item>
)}
</LayoutFormRow>
<LayoutFormRow>
<LayoutFormRow grow>
<Form.Item
label={t("contracts.fields.kmstart")}
name="kmstart"
@@ -78,11 +83,54 @@ export default function ContractFormComponent({
>
<InputNumber />
</Form.Item>
{create && (
<Form.Item
shouldUpdate={(p, c) =>
p.kmstart !== c.kmstart || p.scheduledreturn !== c.scheduledreturn
}
>
{() => {
const mileageOver =
selectedCar &&
selectedCar.nextservicekm <= form.getFieldValue("kmstart");
const dueForService =
selectedCar &&
selectedCar.nextservicedate &&
moment(selectedCar.nextservicedate).isBefore(
moment(form.getFieldValue("scheduledreturn"))
);
console.log(`dueForService`, dueForService);
if (mileageOver || dueForService)
return (
<Space direction="vertical" style={{ color: "tomato" }}>
<span>
<WarningFilled style={{ marginRight: ".3rem" }} />
{t("contracts.labels.cardueforservice")}
</span>
<span>{`${
selectedCar && selectedCar.nextservicekm
} km`}</span>
<span>
<DateFormatter>
{selectedCar && selectedCar.nextservicedate}
</DateFormatter>
</span>
</Space>
);
return <></>;
}}
</Form.Item>
)}
{create ? null : (
<Form.Item label={t("contracts.fields.kmend")} name="kmend">
<InputNumber />
</Form.Item>
)}
<Form.Item label={t("contracts.fields.damage")} name="damage">
<Input.TextArea />
</Form.Item>
</LayoutFormRow>
<LayoutFormRow>
<Form.Item
@@ -135,27 +183,42 @@ export default function ContractFormComponent({
<Input />
</Form.Item>
<Form.Item
label={t("contracts.fields.driver_dlexpiry")}
name="driver_dlexpiry"
rules={[
{
required: true,
message: t("general.validation.required"),
},
]}
shouldUpdate={(p, c) =>
p.driver_dlexpiry !== c.driver_dlexpiry ||
p.scheduledreturn !== c.scheduledreturn
}
>
<FormDatePicker />
{() => {
const dlExpiresBeforeReturn = moment(
form.getFieldValue("driver_dlexpiry")
).isBefore(moment(form.getFieldValue("scheduledreturn")));
return (
<div>
<Form.Item
label={t("contracts.fields.driver_dlexpiry")}
name="driver_dlexpiry"
rules={[
{
required: true,
message: t("general.validation.required"),
},
]}
>
<FormDatePicker />
</Form.Item>
{dlExpiresBeforeReturn && (
<Space style={{ color: "tomato" }}>
<WarningFilled />
<span>{t("contracts.labels.dlexpirebeforereturn")}</span>
</Space>
)}
</div>
);
}}
</Form.Item>
<Form.Item
label={t("contracts.fields.driver_dlst")}
name="driver_dlst"
rules={[
{
required: true,
message: t("general.validation.required"),
},
]}
>
<Form.Item label={t("contracts.fields.driver_dlst")} name="driver_dlst">
<Input />
</Form.Item>
<Form.Item

4
client/src/components/courtesy-car-form/courtesy-car-form.component.jsx
View File

@@ -149,9 +149,7 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
) {
return Promise.resolve();
}
return Promise.reject(
t("vendors.validation.unique_vendor_name")
);
return Promise.reject(t("courtesycars.labels.uniquefleet"));
} else {
return Promise.resolve();
}

11
client/src/graphql/cccontracts.queries.js
View File

@@ -4,6 +4,8 @@ export const INSERT_NEW_CONTRACT = gql`
mutation INSERT_NEW_CONTRACT(
$contract: [cccontracts_insert_input!]!
$ccId: uuid!
$damage: String
$mileage: numeric
) {
insert_cccontracts(objects: $contract) {
returning {
@@ -12,10 +14,16 @@ export const INSERT_NEW_CONTRACT = gql`
}
update_courtesycars_by_pk(
pk_columns: { id: $ccId }
_set: { status: "courtesycars.status.out" }
_set: {
status: "courtesycars.status.out"
mileage: $mileage
damage: $damage
}
) {
status
id
damage
mileage
}
}
`;
@@ -88,6 +96,7 @@ export const QUERY_CONTRACT_BY_PK = gql`
coverage
fuelin
fuelout
damage
job {
id

3
client/src/graphql/courtesy-car.queries.js
View File

@@ -36,6 +36,9 @@ export const QUERY_AVAILABLE_CC = gql`
year
dailycost
mileage
notes
nextservicekm
nextservicedate
}
}
`;

1
client/src/pages/contract-create/contract-create.page.component.jsx
View File

@@ -45,6 +45,7 @@ export default function ContractCreatePageComponent({
create
form={form}
selectedJobState={selectedJobState}
selectedCar={selectedCarState[0]}
/>
</div>
</Col>

45
client/src/pages/contract-create/contract-create.page.container.jsx
View File

@@ -38,37 +38,40 @@ export function ContractCreatePageContainer({
);
const [insertContract] = useMutation(INSERT_NEW_CONTRACT);
const handleFinish = (values) => {
const handleFinish = async (values) => {
if (!!selectedCarState[0] && !!selectedJobState[0]) {
setLoading(true);
insertContract({
const result = await insertContract({
variables: {
ccId: selectedCarState[0],
ccId: selectedCarState[0].id,
damage: values.damage,
mileage: values.kmstart,
contract: {
...values,
status: "contracts.status.out",
courtesycarid: selectedCarState[0],
courtesycarid: selectedCarState[0].id,
jobid: selectedJobState[0],
},
},
})
.then((response) => {
notification["success"]({
message: t("contracts.successes.saved"),
});
form.resetFields();
form.resetFields();
history.push(
`/manage/courtesycars/contracts/${response.data.insert_cccontracts.returning[0].id}`
);
})
.catch((error) =>
notification["error"]({
message: t("contracts.errors.saving", {
error: JSON.stringify(error),
}),
})
});
if (!result.errors) {
//Update the courtesy car to have the damage.
notification["success"]({
message: t("contracts.successes.saved"),
});
form.resetFields();
form.resetFields();
history.push(
`/manage/courtesycars/contracts/${result.data.insert_cccontracts.returning[0].id}`
);
} else {
notification["error"]({
message: t("contracts.errors.saving", {
error: JSON.stringify(!result.errors),
}),
});
}
} else {
notification["error"]({
message: t("contracts.errors.selectjobandcar"),

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

@@ -501,6 +501,7 @@
"coverage": "Coverage",
"dailyfreekm": "Daily Free Mileage",
"dailyrate": "Daily Rate",
"damage": "Existing Damage",
"damagewaiver": "Damage Waiver",
"driver": "Driver",
"driver_addr1": "Driver Address 1",
@@ -531,11 +532,13 @@
"labels": {
"agreement": "Agreement {{agreement_num}} - {{status}}",
"availablecars": "Available Cars",
"cardueforservice": "The courtesy car is due for servicing.",
"convertform": {
"applycleanupcharge": "Apply cleanup charge?",
"refuelqty": "Refuel qty.?"
},
"correctdataonform": "Please review the information above. If any of it is not correct, you can fix it later.",
"dlexpirebeforereturn": "The driver's license expires before the car is expected to return. ",
"driverinformation": "Driver's Information",
"noteconvertedfrom": "R.O. created from converted Courtesy Car Contract {{agreementnumber}}.",
"populatefromjob": "Populate from Job",
@@ -599,6 +602,7 @@
"outwith": "Out With",
"return": "Return Courtesy Car",
"status": "Status",
"uniquefleet": "Enter a unique fleet number.",
"usage": "Usage",
"vehicle": "Vehicle Description"
},

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

@@ -501,6 +501,7 @@
"coverage": "",
"dailyfreekm": "",
"dailyrate": "",
"damage": "",
"damagewaiver": "",
"driver": "",
"driver_addr1": "",
@@ -531,11 +532,13 @@
"labels": {
"agreement": "",
"availablecars": "",
"cardueforservice": "",
"convertform": {
"applycleanupcharge": "",
"refuelqty": ""
},
"correctdataonform": "",
"dlexpirebeforereturn": "",
"driverinformation": "",
"noteconvertedfrom": "",
"populatefromjob": "",
@@ -599,6 +602,7 @@
"outwith": "",
"return": "",
"status": "",
"uniquefleet": "",
"usage": "",
"vehicle": ""
},

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

@@ -501,6 +501,7 @@
"coverage": "",
"dailyfreekm": "",
"dailyrate": "",
"damage": "",
"damagewaiver": "",
"driver": "",
"driver_addr1": "",
@@ -531,11 +532,13 @@
"labels": {
"agreement": "",
"availablecars": "",
"cardueforservice": "",
"convertform": {
"applycleanupcharge": "",
"refuelqty": ""
},
"correctdataonform": "",
"dlexpirebeforereturn": "",
"driverinformation": "",
"noteconvertedfrom": "",
"populatefromjob": "",
@@ -599,6 +602,7 @@
"outwith": "",
"return": "",
"status": "",
"uniquefleet": "",
"usage": "",
"vehicle": ""
},

5
hasura/migrations/1618352856487_alter_table_public_cccontracts_add_column_damage/down.yaml Normal file
View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."cccontracts" DROP COLUMN "damage";
type: run_sql

5
hasura/migrations/1618352856487_alter_table_public_cccontracts_add_column_damage/up.yaml Normal file
View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."cccontracts" ADD COLUMN "damage" text NULL;
type: run_sql

63
hasura/migrations/1618352867949_update_permission_user_public_table_cccontracts/down.yaml Normal file
View File

@@ -0,0 +1,63 @@
- args:
role: user
table:
name: cccontracts
schema: public
type: drop_insert_permission
- args:
permission:
check:
courtesycar:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
columns:
- actax
- actualreturn
- agreementnumber
- cleanupcharge
- contract_date
- courtesycarid
- coverage
- created_at
- dailyfreekm
- dailyrate
- damagewaiver
- driver_addr1
- driver_addr2
- driver_city
- driver_dlexpiry
- driver_dlnumber
- driver_dlst
- driver_dob
- driver_fn
- driver_ln
- driver_ph1
- driver_state
- driver_zip
- excesskmrate
- federaltax
- fuelin
- fuelout
- id
- jobid
- kmend
- kmstart
- localtax
- refuelcharge
- scheduledreturn
- start
- statetax
- status
- updated_at
set: {}
role: user
table:
name: cccontracts
schema: public
type: create_insert_permission

64
hasura/migrations/1618352867949_update_permission_user_public_table_cccontracts/up.yaml Normal file
View File

@@ -0,0 +1,64 @@
- args:
role: user
table:
name: cccontracts
schema: public
type: drop_insert_permission
- args:
permission:
check:
courtesycar:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
columns:
- actax
- actualreturn
- agreementnumber
- cleanupcharge
- contract_date
- courtesycarid
- coverage
- created_at
- dailyfreekm
- dailyrate
- damage
- damagewaiver
- driver_addr1
- driver_addr2
- driver_city
- driver_dlexpiry
- driver_dlnumber
- driver_dlst
- driver_dob
- driver_fn
- driver_ln
- driver_ph1
- driver_state
- driver_zip
- excesskmrate
- federaltax
- fuelin
- fuelout
- id
- jobid
- kmend
- kmstart
- localtax
- refuelcharge
- scheduledreturn
- start
- statetax
- status
- updated_at
set: {}
role: user
table:
name: cccontracts
schema: public
type: create_insert_permission

64
hasura/migrations/1618352878048_update_permission_user_public_table_cccontracts/down.yaml Normal file
View File

@@ -0,0 +1,64 @@
- args:
role: user
table:
name: cccontracts
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: true
columns:
- actax
- actualreturn
- agreementnumber
- cleanupcharge
- contract_date
- courtesycarid
- coverage
- created_at
- dailyfreekm
- dailyrate
- damagewaiver
- driver_addr1
- driver_addr2
- driver_city
- driver_dlexpiry
- driver_dlnumber
- driver_dlst
- driver_dob
- driver_fn
- driver_ln
- driver_ph1
- driver_state
- driver_zip
- excesskmrate
- federaltax
- fuelin
- fuelout
- id
- jobid
- kmend
- kmstart
- localtax
- refuelcharge
- scheduledreturn
- start
- statetax
- status
- updated_at
computed_fields: []
filter:
courtesycar:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
role: user
table:
name: cccontracts
schema: public
type: create_select_permission

65
hasura/migrations/1618352878048_update_permission_user_public_table_cccontracts/up.yaml Normal file
View File

@@ -0,0 +1,65 @@
- args:
role: user
table:
name: cccontracts
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: true
columns:
- actax
- actualreturn
- agreementnumber
- cleanupcharge
- contract_date
- courtesycarid
- coverage
- created_at
- dailyfreekm
- dailyrate
- damage
- damagewaiver
- driver_addr1
- driver_addr2
- driver_city
- driver_dlexpiry
- driver_dlnumber
- driver_dlst
- driver_dob
- driver_fn
- driver_ln
- driver_ph1
- driver_state
- driver_zip
- excesskmrate
- federaltax
- fuelin
- fuelout
- id
- jobid
- kmend
- kmstart
- localtax
- refuelcharge
- scheduledreturn
- start
- statetax
- status
- updated_at
computed_fields: []
filter:
courtesycar:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
role: user
table:
name: cccontracts
schema: public
type: create_select_permission

63
hasura/migrations/1618352885270_update_permission_user_public_table_cccontracts/down.yaml Normal file
View File

@@ -0,0 +1,63 @@
- args:
role: user
table:
name: cccontracts
schema: public
type: drop_update_permission
- args:
permission:
columns:
- actax
- actualreturn
- agreementnumber
- cleanupcharge
- contract_date
- courtesycarid
- coverage
- created_at
- dailyfreekm
- dailyrate
- damagewaiver
- driver_addr1
- driver_addr2
- driver_city
- driver_dlexpiry
- driver_dlnumber
- driver_dlst
- driver_dob
- driver_fn
- driver_ln
- driver_ph1
- driver_state
- driver_zip
- excesskmrate
- federaltax
- fuelin
- fuelout
- id
- jobid
- kmend
- kmstart
- localtax
- refuelcharge
- scheduledreturn
- start
- statetax
- status
- updated_at
filter:
courtesycar:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
set: {}
role: user
table:
name: cccontracts
schema: public
type: create_update_permission

64
hasura/migrations/1618352885270_update_permission_user_public_table_cccontracts/up.yaml Normal file
View File

@@ -0,0 +1,64 @@
- args:
role: user
table:
name: cccontracts
schema: public
type: drop_update_permission
- args:
permission:
columns:
- actax
- actualreturn
- agreementnumber
- cleanupcharge
- contract_date
- courtesycarid
- coverage
- created_at
- dailyfreekm
- dailyrate
- damage
- damagewaiver
- driver_addr1
- driver_addr2
- driver_city
- driver_dlexpiry
- driver_dlnumber
- driver_dlst
- driver_dob
- driver_fn
- driver_ln
- driver_ph1
- driver_state
- driver_zip
- excesskmrate
- federaltax
- fuelin
- fuelout
- id
- jobid
- kmend
- kmstart
- localtax
- refuelcharge
- scheduledreturn
- start
- statetax
- status
- updated_at
filter:
courtesycar:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
set: {}
role: user
table:
name: cccontracts
schema: public
type: create_update_permission

5
hasura/migrations/1618353607686_alter_table_public_cccontracts_alter_column_driver_dlst/down.yaml Normal file
View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."cccontracts" ALTER COLUMN "driver_dlst" SET NOT NULL;
type: run_sql

5
hasura/migrations/1618353607686_alter_table_public_cccontracts_alter_column_driver_dlst/up.yaml Normal file
View File

@@ -0,0 +1,5 @@
- args:
cascade: false
read_only: false
sql: ALTER TABLE "public"."cccontracts" ALTER COLUMN "driver_dlst" DROP NOT NULL;
type: run_sql

3
hasura/migrations/metadata.yaml
View File

@@ -892,6 +892,7 @@ tables:
- created_at
- dailyfreekm
- dailyrate
- damage
- damagewaiver
- driver_addr1
- driver_addr2
@@ -934,6 +935,7 @@ tables:
- created_at
- dailyfreekm
- dailyrate
- damage
- damagewaiver
- driver_addr1
- driver_addr2
@@ -987,6 +989,7 @@ tables:
- created_at
- dailyfreekm
- dailyrate
- damage
- damagewaiver
- driver_addr1
- driver_addr2