IO-3001 Add UI adjustments.

2024-11-01 19:54:49 -07:00
parent f8e65ada76
commit 1205e71ea6
6 changed files with 156 additions and 103 deletions
--- a/client/src/components/job-totals-table/job-totals.table.totals.component.jsx
+++ b/client/src/components/job-totals-table/job-totals.table.totals.component.jsx
@@ -22,6 +22,14 @@ export function JobTotalsTableTotals({ bodyshop, job }) {

  const data = useMemo(() => {
    return [
+      ...(job.job_totals?.totals?.ttl_adjustment
+        ? [
+            {
+              key: `Subtotal Adj.`,
+              total: job.job_totals?.totals?.ttl_adjustment
+            }
+          ]
+        : []),
      {
        key: t("jobs.labels.subtotal"),
        total: job.job_totals.totals.subtotal,
@@ -116,7 +124,7 @@ export function JobTotalsTableTotals({ bodyshop, job }) {
              ...(job.job_totals?.totals?.ttl_tax_adjustment
                ? [
                    {
-                      key: `Adj.`,
+                      key: `Tax Adj.`,
                      total: job.job_totals?.totals?.ttl_tax_adjustment
                    }
                  ]
--- a/client/src/components/jobs-available-table/jobs-available-table.container.jsx
+++ b/client/src/components/jobs-available-table/jobs-available-table.container.jsx
@@ -408,16 +408,14 @@ export function JobsAvailableContainer({ bodyshop, currentUser, insertAuditTrail
        updateSchComp={updateSchComp}
        setSchComp={setSchComp}
      />
-      {
-         currentUser.email.includes("@rome.") ||
-         currentUser.email.includes("@imex.") ? (
+      {currentUser.email.includes("@rome.") || currentUser.email.includes("@imex.") ? (
        <Button
          onClick={async () => {
            for (const record of data.available_jobs) {
              //Query the data
              console.log("Start Job", record.id);
-                         const {data} = await loadEstData({
-                             variables: {id: record.id},
+              const { data } = await loadEstData({
+                variables: { id: record.id }
              });
              console.log("Query has been awaited and is complete");
              await onOwnerFindModalOk(data);
@@ -426,8 +424,7 @@ export function JobsAvailableContainer({ bodyshop, currentUser, insertAuditTrail
        >
          Add all jobs as new.
        </Button>
-         ) : null
-      }
+      ) : null}
      <Row gutter={[16, 16]}>
        <Col span={24}>
          <JobsAvailableTableComponent
--- a/job-totals-testing-util.js
+++ b/job-totals-testing-util.js
@@ -1,12 +1,12 @@
 const path = require("path");
+const fs = require("fs");
 const Dinero = require("dinero.js");
 const { gql } = require("graphql-request");
-
 const AxiosLib = require("axios").default;
 const axios = AxiosLib.create();
+const pLimit = require("p-limit");
+const converter = require("json-2-csv");

-// Dinero.defaultCurrency = "USD";
-// Dinero.globalLocale = "en-CA";
 Dinero.globalRoundingMode = "HALF_EVEN";
 const client = require("./server/graphql-client/graphql-client").client;
 require("dotenv").config({
@@ -15,7 +15,7 @@ require("dotenv").config({

 async function RunTheTest() {
  const bodyshopids = ["71f8494c-89f0-43e0-8eb2-820b52d723bc"];
-  const bearerToken = `Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6ImU2YWMzNTcyNzY3ZGUyNjE0ZmM1MTA4NjMzMDg3YTQ5MjMzMDNkM2IiLCJ0eXAiOiJKV1QifQ.eyJuYW1lIjoiUGF0cmljayBGaWMgKERFVikiLCJodHRwczovL2hhc3VyYS5pby9qd3QvY2xhaW1zIjp7IngtaGFzdXJhLWRlZmF1bHQtcm9sZSI6InVzZXIiLCJ4LWhhc3VyYS1hbGxvd2VkLXJvbGVzIjpbInVzZXIiXSwieC1oYXN1cmEtdXNlci1pZCI6ImhOSjhBRHB0REhRQkRFcXNCOFFNWVRqaURuZjEifSwiaXNzIjoiaHR0cHM6Ly9zZWN1cmV0b2tlbi5nb29nbGUuY29tL2ltZXgtZGV2IiwiYXVkIjoiaW1leC1kZXYiLCJhdXRoX3RpbWUiOjE3MzAxMzIwMjksInVzZXJfaWQiOiJoTko4QURwdERIUUJERXFzQjhRTVlUamlEbmYxIiwic3ViIjoiaE5KOEFEcHRESFFCREVxc0I4UU1ZVGppRG5mMSIsImlhdCI6MTczMDE1MjI5NiwiZXhwIjoxNzMwMTU1ODk2LCJlbWFpbCI6InBhdHJpY2tAaW1leC5kZXYiLCJlbWFpbF92ZXJpZmllZCI6ZmFsc2UsImZpcmViYXNlIjp7ImlkZW50aXRpZXMiOnsiZW1haWwiOlsicGF0cmlja0BpbWV4LmRldiJdfSwic2lnbl9pbl9wcm92aWRlciI6InBhc3N3b3JkIn19.Fgf_itlA2-CMd2sTYBNjD-g8Jt3wPLW_YWbDtMn8tm-doSPhU7-RHSHON7Vz6o1m6S3x88RODt2uxSifxfgjqXYC_yJiUVEnHp7xokI1X-7EIbv6S_jfD1gKq7gNehkKkm0QETvAX_wmL0hEZyZnBacxjkSZzDZgbfKfj8U2CAU1nY6O5vk90q0HdTrt98RL37Uiz62ftAdBZCLSpZ1AS1hGa1S3NDMhWbWvBVCMY59bhM8lreH-Q1znlSe9jNXbElvrKofSc3Jz2WeTIj3Ifq5Ev-p4rIOoILww8kE9ZKp4s28JXMdrpRnqFM7tufggjZaKx5g1_rwRnzl-dk50RQ`;
+  const bearerToken = `Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6ImU2YWMzNTcyNzY3ZGUyNjE0ZmM1MTA4NjMzMDg3YTQ5MjMzMDNkM2IiLCJ0eXAiOiJKV1QifQ.eyJuYW1lIjoiUGF0cmljayBGaWMgKERFVikiLCJodHRwczovL2hhc3VyYS5pby9qd3QvY2xhaW1zIjp7IngtaGFzdXJhLWRlZmF1bHQtcm9sZSI6InVzZXIiLCJ4LWhhc3VyYS1hbGxvd2VkLXJvbGVzIjpbInVzZXIiXSwieC1oYXN1cmEtdXNlci1pZCI6ImhOSjhBRHB0REhRQkRFcXNCOFFNWVRqaURuZjEifSwiaXNzIjoiaHR0cHM6Ly9zZWN1cmV0b2tlbi5nb29nbGUuY29tL2ltZXgtZGV2IiwiYXVkIjoiaW1leC1kZXYiLCJhdXRoX3RpbWUiOjE3MzAxMzIwMjksInVzZXJfaWQiOiJoTko4QURwdERIUUJERXFzQjhRTVlUamlEbmYxIiwic3ViIjoiaE5KOEFEcHRESFFCREVxc0I4UU1ZVGppRG5mMSIsImlhdCI6MTczMDQwNzg2MSwiZXhwIjoxNzMwNDExNDYxLCJlbWFpbCI6InBhdHJpY2tAaW1leC5kZXYiLCJlbWFpbF92ZXJpZmllZCI6ZmFsc2UsImZpcmViYXNlIjp7ImlkZW50aXRpZXMiOnsiZW1haWwiOlsicGF0cmlja0BpbWV4LmRldiJdfSwic2lnbl9pbl9wcm92aWRlciI6InBhc3N3b3JkIn19.Mxla5zqBNpdzXuAPqCswsLohrV5xm0SNi2Agr0lAU_crNJxVXJdTaKL8B4Av-LMCGjylHqume9WUbZ43fnMxrq4hlWGqeDzGpD7ev76h4omSn0jiMJ0qZmFeR1ejV40KZ6eLrvxEbDLiAebbU2rLp7tZonpspwPa1ruoRk4ixvtvv66ZNcbiEA5NP3VM9VDFnLzj8Vb160t3dQF58bxMUt8RoCc9cP_XPXWxnj-DsyDaYBO-shJrg3Co8T_jPg2ix-x2HkAVpPvTUjCCpAya-DhOx5aFZYiaNlmvosqCqcfZgVfjVuEogZb_rDkSF4wkR8DtfUt9IgGjWxF_rhos_Q`;

  const { jobs } = await client.request(
    gql`
@@ -35,10 +35,13 @@ async function RunTheTest() {

  const results = [];

-  for (const [index, job] of jobs.entries()) {
+  const limit = pLimit(5); // Set concurrency limit to 3
+
+  const tasks = jobs.map((job, index) => {
+    return limit(async () => {
      process.stdout.cursorTo(0);
      process.stdout.write(
-      `Processing job ${index + 1} of ${jobs.length}. Failed jobs: ${results.filter((r) => r.result !== "PASS").length}`
+        `Processing job ${index + 1} of ${jobs.length}. Failed jobs: ${results.filter((r) => r.overallTotalCorrect !== "PASS").length}. Correct jobs because of adjustment: ${results.filter((r) => r.correctJobsBecauseOfAdjustment).length}`
      );

      try {
@@ -80,22 +83,30 @@ async function RunTheTest() {
        result.difference = (calcTotal - ttlTotal) / 100;

        if (Math.abs(calcTotal - ttlTotal) > 3) {
-        //Diff is greater than 5 cents. Fail it.
-        result.result = "***FAIL***";
+          result.overallTotalCorrect = "***FAIL***";
        } else {
-        result.result = "PASS";
+          result.overallTotalCorrect = "PASS";
        }
-      const subcalcTotal = newjob.job_totals.totals.subtotal.amount;
-      const subttlTotal = newjob.cieca_ttl.data.n_ttl_amt * 100;
-      result.subdifference = (subcalcTotal - subttlTotal) / 100;
+        result.ttl_adjustment = Dinero(newjob.job_totals.totals.ttl_adjustment).toFormat();
+        result.ttl_tax_adjustment = Dinero(newjob.job_totals.totals.ttl_tax_adjustment).toFormat();

-      if (Math.abs(subcalcTotal - subttlTotal) > 3) {
-        //Diff is greater than 5 cents. Fail it.
-        result.subresult = "***FAIL***";
+        const calcTax =
+          Dinero(newjob.job_totals.totals.us_sales_tax_breakdown.ty1Tax)
+            .add(Dinero(newjob.job_totals.totals.us_sales_tax_breakdown.ty2Tax))
+            .add(Dinero(newjob.job_totals.totals.us_sales_tax_breakdown.ty3Tax))
+            .add(Dinero(newjob.job_totals.totals.us_sales_tax_breakdown.ty4Tax))
+            .add(Dinero(newjob.job_totals.totals.us_sales_tax_breakdown.ty5Tax))
+            .add(Dinero(newjob.job_totals.totals.ttl_tax_adjustment))
+            .getAmount() / 100;
+
+        const emsTax = newjob.cieca_ttl.data.g_tax;
+        result.taxDifference = calcTax - emsTax;
+
+        if (Math.abs(calcTax - emsTax) > 3) {
+          result.taxCorrect = "***FAIL***";
        } else {
-        result.subresult = "PASS";
+          result.taxCorrect = "PASS";
        }
-      // console.log(`${result.result} => RO ${job.ro_number} - ${job.id} `);

        results.push(result);
      } catch (error) {
@@ -105,9 +116,13 @@ async function RunTheTest() {
          result: "**503 FAILURE**"
        });
      }
-  }
+    });
+  });

-  console.table(results.filter((r) => r.result !== "PASS"));
+  await Promise.all(tasks);
+
+  console.table(results.filter((r) => r.overallTotalCorrect !== "PASS"));
+  console.log("=======================================");
  const summary = results.reduce(
    (acc, val) => {
      if (val.result === "PASS") {
@@ -119,18 +134,12 @@ async function RunTheTest() {
    { pass: 0, fail: 0 }
  );
  console.log("Pass Rate: ", ((summary.pass / (summary.fail + summary.pass)) * 100).toFixed(1));
+
+  const ret = converter.json2csv(results, { emptyFieldValue: "" });
+
+  fs.writeFile(`./logs/totalstest-${Date.now()}.csv`, ret, (error) => console.log(error));
 }

-RunTheTest();
-
-// mutation {
-//   delete_jobs(where: {shopid: {_eq: "a7ee1503-ee05-4a02-b80e-bdb11d1cc8ac"}}) {
-//     affected_rows
-//   }
-//   delete_owners(where: {shopid: {_eq: "a7ee1503-ee05-4a02-b80e-bdb11d1cc8ac"}}) {
-//     affected_rows
-//   }
-//   delete_vehicles(where: {shopid: {_eq: "a7ee1503-ee05-4a02-b80e-bdb11d1cc8ac"}}) {
-//     affected_rows
-//   }
-// }
+RunTheTest().catch((error) => {
+  console.log("Error in RunTheTest: ", error);
+});
--- a/package-lock.json
+++ b/package-lock.json
@@ -64,6 +64,7 @@
      "devDependencies": {
        "@trivago/prettier-plugin-sort-imports": "^4.3.0",
        "concurrently": "^8.2.2",
+        "p-limit": "^3.1.0",
        "prettier": "^3.3.3",
        "source-map-explorer": "^2.5.2"
      },
@@ -6726,7 +6727,8 @@
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "optional": true,
+      "devOptional": true,
+      "license": "MIT",
      "dependencies": {
        "yocto-queue": "^0.1.0"
      },
@@ -8720,7 +8722,8 @@
      "version": "0.1.0",
      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "optional": true,
+      "devOptional": true,
+      "license": "MIT",
      "engines": {
        "node": ">=10"
      },
--- a/package.json
+++ b/package.json
@@ -74,6 +74,7 @@
  "devDependencies": {
    "@trivago/prettier-plugin-sort-imports": "^4.3.0",
    "concurrently": "^8.2.2",
+    "p-limit": "^3.1.0",
    "prettier": "^3.3.3",
    "source-map-explorer": "^2.5.2"
  }
--- a/server/job/job-costing.js
+++ b/server/job/job-costing.js
@@ -809,6 +809,41 @@ function GenerateCostingData(job) {
      gppercent: formatGpPercent(0)
    });
  }
+  //Push adjustments to bottom line.
+  if (job.job_totals.totals.ttl_adjustment) {
+    //Add to totals.
+    const Adjustment = Dinero(job.job_totals.totals.ttl_adjustment); //Need to invert, since this is being assigned as a cost.
+    summaryData.totalAdditionalSales = summaryData.totalAdditionalSales.add(Adjustment);
+    summaryData.totalSales = summaryData.totalSales.add(Adjustment);
+    //Add to lines.
+    costCenterData.push({
+      id: "Adj",
+      cost_center: "Adjustment",
+      sale_labor: Dinero().toFormat(),
+      sale_labor_dinero: Dinero(),
+      sale_parts: Dinero().toFormat(),
+      sale_parts_dinero: Dinero(),
+      sale_additional: Adjustment.toFormat(),
+      sale_additional_dinero: Adjustment,
+      sale_sublet: Dinero(),
+      sale_sublet_dinero: Dinero(),
+      sales: Adjustment.toFormat(),
+      sales_dinero: Adjustment,
+      cost_parts: Dinero().toFormat(),
+      cost_parts_dinero: Dinero(),
+      cost_labor: Dinero().toFormat(), //Adjustment.toFormat(),
+      cost_labor_dinero: Dinero(), // Adjustment,
+      cost_additional: Dinero(),
+      cost_additional_dinero: Dinero(),
+      cost_sublet: Dinero(),
+      cost_sublet_dinero: Dinero(),
+      costs: Dinero().toFormat(),
+      costs_dinero: Dinero(),
+      gpdollars_dinero: Dinero(),
+      gpdollars: Dinero().toFormat(),
+      gppercent: formatGpPercent(0)
+    });
+  }

  //Final summary data massaging.