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

IO-1151 IO-1159 Calculated Repair & Label Updates

Browse Source
This commit is contained in:
Patrick Fic
2021-05-21 12:37:54 -07:00
parent f2a4eb1b65
commit f6378daa89
6 changed files with 66 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
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
@@ -20437,6 +20437,48 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>calc_repair_days</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>calc_repair_days_tt</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>cards</name>
<children>

17
client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx
View File

@@ -1,4 +1,4 @@
import { DatePicker, Form, Tooltip } from "antd";
import { DatePicker, Form, Statistic, Tooltip } from "antd";
import React, { useMemo } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
@@ -23,6 +23,10 @@ export function JobsDetailDatesComponent({ jobRO, job, bodyshop }) {
);
}, [job.status, bodyshop.md_ro_statuses.post_production_statuses]);
const calcRepairDays =
job.joblines.reduce((acc, val) => acc + val.mod_lb_hrs, 0) /
(bodyshop.target_touchtime === 0 ? 1 : bodyshop.target_touchtime);
return (
<div>
<FormRow header={t("jobs.forms.estdates")}>
@@ -52,6 +56,17 @@ export function JobsDetailDatesComponent({ jobRO, job, bodyshop }) {
<Form.Item label={t("jobs.fields.actual_in")} name="actual_in">
<DateTimePicker disabled={jobRO} />
</Form.Item>
<Tooltip
title={t("jobs.labels.calc_repair_days_tt", {
target_touchtime: bodyshop.target_touchtime,
})}
>
<Statistic
value={calcRepairDays}
precision={1}
title={t("jobs.labels.calc_repair_days")}
/>
</Tooltip>
</FormRow>
<FormRow header={t("jobs.forms.repairdates")}>
<Form.Item

2
client/src/components/vehicle-detail-form/vehicle-detail-form.container.jsx
View File

@@ -39,7 +39,7 @@ function VehicleDetailFormContainer({ vehicle, refetch }) {
return (
<>
<PageHeader
title={t("menus.header.owners")}
title={t("menus.header.vehicles")}
extra={
<Button
type="primary"

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

@@ -1226,6 +1226,8 @@
"rate": "PVRT Rate"
},
"ca_gst_all_if_null": "If the job is marked as a \"GST Registrant\" and this value is set to $0, the customer will be responsible for paying all of the GST by default. ",
"calc_repair_days": "Calculated Repair Days",
"calc_repair_days_tt": "This is the approximate number of days required to complete the repair according to the target touch time in your shop configuration (current set to {{target_touchtime}}).",
"cards": {
"customer": "Customer Information",
"damage": "Area of Damage",

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

@@ -1226,6 +1226,8 @@
"rate": ""
},
"ca_gst_all_if_null": "",
"calc_repair_days": "",
"calc_repair_days_tt": "",
"cards": {
"customer": "Información al cliente",
"damage": "Área de Daño",

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

@@ -1226,6 +1226,8 @@
"rate": ""
},
"ca_gst_all_if_null": "",
"calc_repair_days": "",
"calc_repair_days_tt": "",
"cards": {
"customer": "Informations client",
"damage": "Zone de dommages",