- clear stage.

Signed-off-by: Dave Richer <dave@imexsystems.ca>

client/src/components/dms-post-form/dms-post-form.component.jsx

@@ -14,7 +14,6 @@ import {
   Typography
 } from "antd";
 import Dinero from "dinero.js";
-import dayjs from "../../utils/day";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -22,6 +21,7 @@ import { createStructuredSelector } from "reselect";
 import { determineDmsType } from "../../pages/dms/dms.container";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import i18n from "../../translations/i18n";
+import dayjs from "../../utils/day";
 import DmsCdkMakes from "../dms-cdk-makes/dms-cdk-makes.component";
 import DmsCdkMakesRefetch from "../dms-cdk-makes/dms-cdk-makes.refetch.component";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
@@ -89,7 +89,7 @@ export function DmsPostForm({ bodyshop, socket, job, logsRef }) {
             job.area_of_damage && job.area_of_damage.impact1
               ? " " +
                 t("jobs.labels.dms.damageto", {
-                  area_of_damage: (job.area_of_damage && job.area_of_damage.impact1) || "UNKNOWN"
+                  area_of_damage: (job.area_of_damage && job.area_of_damage.impact1.padStart(2, "0")) || "UNKNOWN"
                 })
               : ""
           }`.slice(0, 239),

client/src/components/job-close-ro-guard/job-close-ro-guard.container.jsx

@@ -1,6 +1,6 @@
-import React, { useCallback, useState } from "react";
 import { LockOutlined } from "@ant-design/icons";
 import { Badge, Card, Col, Collapse, Form, Input, Row, Space, Tooltip } from "antd";
+import React, { useCallback, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -12,8 +12,8 @@ import JobCloseRoGuardBills from "./job-close-ro-guard.bills";
 import JobCloseRoGuardPpd from "./job-close-ro-guard.ppd";
 import JobCloseRoGuardProfit from "./job-close-ro-guard.profit";
 import "./job-close-ro-guard.styles.scss";
-import JobCloseRoGuardTtLifecycle from "./job-close-ro-guard.tt-lifecycle";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
+import JobCloseRoGuardTtLifecycle from "./job-close-ro-guard.tt-lifecycle";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser

client/src/components/job-detail-cards/job-detail-cards.damage.component.jsx

@@ -1,14 +1,21 @@
 import React from "react";
 import { useTranslation } from "react-i18next";
-import CardTemplate from "./job-detail-cards.template.component";
 import Car from "../job-damage-visual/job-damage-visual.component";
+import CardTemplate from "./job-detail-cards.template.component";
 
 export default function JobDetailCardsDamageComponent({ loading, data }) {
   const { t } = useTranslation();
   const { area_of_damage } = data;
   return (
     <CardTemplate loading={loading} title={t("jobs.labels.cards.damage")}>
-      {area_of_damage ? <Car dmg1={area_of_damage.impact1} dmg2={area_of_damage.impact2} /> : t("jobs.errors.nodamage")}
+      {area_of_damage ? (
+        <Car
+          dmg1={area_of_damage.impact1 && area_of_damage.impact1.padStart(2, "0")}
+          dmg2={area_of_damage.impact2 && area_of_damage.impact2.padStart(2, "0")}
+        />
+      ) : (
+        t("jobs.errors.nodamage")
+      )}
     </CardTemplate>
   );
 }

client/src/components/job-detail-cards/job-detail-cards.parts.component.jsx

@@ -26,6 +26,16 @@ export function JobDetailCardsPartsComponent({ loading, data, jobRO }) {
   const { t } = useTranslation();
   const { joblines_status } = data;
 
+  const filteredJobLines = data.joblines.filter(
+    (j) =>
+      j.part_type !== null &&
+      j.part_type !== "PAE" &&
+      j.part_type !== "PAS" &&
+      j.part_type !== "PASL" &&
+      j.part_qty !== 0 &&
+      j.act_price !== 0
+  );
+//TODO: Correct jobline_statuses view by including the part_qty !== 0 and act_price !== 0
   const columns = [
     {
       title: t("joblines.fields.line_desc"),
@@ -95,7 +105,7 @@ export function JobDetailCardsPartsComponent({ loading, data, jobRO }) {
     <div>
       <CardTemplate loading={loading} title={t("jobs.labels.cards.parts")}>
         <PartsStatusPie joblines_status={joblines_status} />
-        <Table key="id" columns={columns} dataSource={data ? data.joblines : []} />
+        <Table key="id" columns={columns} dataSource={filteredJobLines ? filteredJobLines : []} />
       </CardTemplate>
     </div>
   );

client/src/components/jobs-detail-general/jobs-detail-general.component.jsx

@@ -189,7 +189,10 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
         </Col>
         <Col {...lossColDamage}>
           {job.area_of_damage ? (
-            <Car dmg1={job.area_of_damage.impact1} dmg2={job.area_of_damage.impact2} />
+            <Car
+              dmg1={job.area_of_damage.impact1 && job.area_of_damage.impact1.padStart(2, "0")}
+              dmg2={job.area_of_damage.impact2 && job.area_of_damage.impact2.padStart(2, "0")}
+            />
           ) : (
             t("jobs.errors.nodamage")
           )}

client/src/graphql/jobs.queries.js

@@ -905,7 +905,7 @@ export const QUERY_JOB_CARD_DETAILS = gql`
       }
 
       joblines(
-        where: { removed: { _eq: false }, part_type: { _is_null: false, _nin: ["PAE", "PAS", "PASL"] } }
+        where: { removed: { _eq: false } }
         order_by: { line_no: asc }
       ) {
         id

client/src/translations/en_us/common.json

@@ -647,7 +647,10 @@
 						"payers": "Payers"
 					},
 					"cdk_dealerid": "CDK Dealer ID",
+          "costsmapping": "Costs Mapping",
+          "dms_allocations": "DMS Allocations",
 					"pbs_serialnumber": "PBS Serial Number",
+          "profitsmapping": "Profits Mapping",
 					"title": "DMS"
 				},
 				"emaillater": "Email Later",
@@ -2947,6 +2950,8 @@
 				"purchases_by_cost_center_summary": "Purchases by Cost Center (Summary)",
 				"purchases_by_date_range_detail": "Purchases by Date - Detail",
 				"purchases_by_date_range_summary": "Purchases by Date - Summary",
+        "purchases_by_ro_detail_date": "Purchases by RO - Detail",
+        "purchases_by_ro_summary_date": "Purchases by RO - Summary",
 				"purchases_by_vendor_detailed_date_range": "Purchases By Vendor - Detailed",
 				"purchases_by_vendor_summary_date_range": "Purchases by Vendor - Summary",
 				"purchases_grouped_by_vendor_detailed": "Purchases Grouped by Vendor - Detailed",

client/src/translations/es/common.json

@@ -647,7 +647,10 @@
 						"payers": ""
 					},
 					"cdk_dealerid": "",
+          "costsmapping": "",
+          "dms_allocations": "",
 					"pbs_serialnumber": "",
+          "profitsmapping": "",
 					"title": ""
 				},
 				"emaillater": "",
@@ -2937,6 +2940,8 @@
 				"purchases_by_cost_center_summary": "",
 				"purchases_by_date_range_detail": "",
 				"purchases_by_date_range_summary": "",
+        "purchases_by_ro_detail_date": "",
+        "purchases_by_ro_summary_date": "",
 				"purchases_by_vendor_detailed_date_range": "",
 				"purchases_by_vendor_summary_date_range": "",
 				"purchases_grouped_by_vendor_detailed": "",

client/src/translations/fr/common.json

@@ -647,7 +647,10 @@
 						"payers": ""
 					},
 					"cdk_dealerid": "",
+          "costsmapping": "",
+          "dms_allocations": "",
 					"pbs_serialnumber": "",
+          "profitsmapping": "",
 					"title": ""
 				},
 				"emaillater": "",
@@ -2937,6 +2940,8 @@
 				"purchases_by_cost_center_summary": "",
 				"purchases_by_date_range_detail": "",
 				"purchases_by_date_range_summary": "",
+        "purchases_by_ro_detail_date": "",
+        "purchases_by_ro_summary_date": "",
 				"purchases_by_vendor_detailed_date_range": "",
 				"purchases_by_vendor_summary_date_range": "",
 				"purchases_grouped_by_vendor_detailed": "",

client/src/utils/TemplateConstants.js

@@ -1081,6 +1081,32 @@ export const TemplateList = (type, context) => {
             },
             group: "purchases"
           },
+          purchases_by_ro_detail_date: {
+            title: i18n.t("reportcenter.templates.purchases_by_ro_detail_date"),
+            description: "",
+            subject: i18n.t("reportcenter.templates.purchases_by_ro_detail_date"),
+            key: "purchases_by_ro_detail_date",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced")
+            },
+            group: "purchases"
+          },
+          purchases_by_ro_summary_date: {
+            title: i18n.t("reportcenter.templates.purchases_by_ro_summary_date"),
+            description: "",
+            subject: i18n.t("reportcenter.templates.purchases_by_ro_summary_date"),
+            key: "purchases_by_ro_summary_date",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced")
+            },
+            group: "purchases"
+          },
           job_costing_ro_date_summary: {
             title: i18n.t("reportcenter.templates.job_costing_ro_date_summary"),
             description: "",