IO-2506 Correct for variable immutibility and nested ifs

IO-2506 Federal Tax Exempt on Bill Entry
Will Toggle Federal Tax off on any new line or retroactively toggle it off on all lines when switch is enabled. Limited to PBS or CDK setups.
2023-12-19 09:18:00 -08:00 · 2023-12-18 12:36:46 -08:00
9 changed files with 41 additions and 97 deletions
--- a/client/src/components/bill-form/bill-form.component.jsx
+++ b/client/src/components/bill-form/bill-form.component.jsx
@@ -79,6 +79,20 @@ export function BillFormComponent({
      });
  };

+  const handleFederalTaxExemptSwitchToggle = (checked) => {
+    // Early gate
+    if (!checked) return;
+    const values = form.getFieldsValue("billlines");
+    // Gate bill lines
+    if (!values?.billlines?.length) return;
+
+    const billlines = values.billlines.map((b) => {
+      b.applicable_taxes.federal = false;
+      return b;
+    });
+    form.setFieldsValue({ billlines });
+  };
+
  useEffect(() => {
    if (job) form.validateFields(["is_credit_memo"]);
  }, [job, form]);
@@ -387,7 +401,16 @@ export function BillFormComponent({
        >
          <CurrencyInput min={0} />
        </Form.Item>
-        <Form.Item shouldUpdate span={15}>
+        {bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid ? (
+          <Form.Item
+            span={2}
+            label={t("bills.labels.federal_tax_exempt")}
+            name="federal_tax_exempt"
+          >
+            <Switch onChange={handleFederalTaxExemptSwitchToggle} />
+          </Form.Item>
+        ) : null}
+        <Form.Item shouldUpdate span={13}>
          {() => {
            const values = form.getFieldsValue([
              "billlines",
@@ -405,7 +428,7 @@ export function BillFormComponent({
              totals = CalculateBillTotal(values);
            if (!!totals)
              return (
-                <div>
+                <div align="right">
                  <Space wrap>
                    <Statistic
                      title={t("bills.labels.subtotal")}
--- a/client/src/components/bill-form/bill-form.lines.component.jsx
+++ b/client/src/components/bill-form/bill-form.lines.component.jsx
@@ -1,14 +1,15 @@
 import { DeleteFilled, DollarCircleFilled } from "@ant-design/icons";
 import { useTreatments } from "@splitsoftware/splitio-react";
 import {
-  Button, Form,
+  Button,
+  Form,
  Input,
  InputNumber,
  Select,
  Space,
  Switch,
  Table,
-  Tooltip
+  Tooltip,
 } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -466,7 +467,8 @@ export function BillEnterModalLinesComponent({
          return {
            key: `${field.index}fedtax`,
            valuePropName: "checked",
-            initialValue: true,
+            initialValue:
+              form.getFieldValue("federal_tax_exempt") === true ? false : true,
            name: [field.name, "applicable_taxes", "federal"],
          };
        },
--- a/client/src/components/scoreboard-timetickets-stats/scoreboard-timetickets.component.jsx
+++ b/client/src/components/scoreboard-timetickets-stats/scoreboard-timetickets.component.jsx
@@ -29,7 +29,7 @@ export default connect(

 export function ScoreboardTimeTicketsStats({ bodyshop }) {
  const { t } = useTranslation();
-  const startDate = moment().startOf("month");
+  const startDate = moment().startOf("month")
  const endDate = moment().endOf("month");

  const fixedPeriods = useMemo(() => {
@@ -84,8 +84,6 @@ export function ScoreboardTimeTicketsStats({ bodyshop }) {
      end: endDate.format("YYYY-MM-DD"),
      fixedStart: fixedPeriods.start.format("YYYY-MM-DD"),
      fixedEnd: fixedPeriods.end.format("YYYY-MM-DD"),
-      jobStart: startDate,
-      jobEnd: endDate,
    },
    fetchPolicy: "network-only",
    nextFetchPolicy: "network-only",
@@ -342,21 +340,11 @@ export function ScoreboardTimeTicketsStats({ bodyshop }) {
      larData.push({ ...r, ...lar });
    });

-    const jobData = {};
-    data.jobs.forEach((job) => {
-      job.tthrs = job.joblines.reduce((acc, val) => acc + val.mod_lb_hrs, 0);
-    });
-    jobData.tthrs = data.jobs
-      .reduce((acc, val) => acc + val.tthrs, 0)
-      .toFixed(1);
-    jobData.count = data.jobs.length.toFixed(0);
-
    return {
      fixed: ret,
      combinedData: combinedData,
      labData: labData,
      larData: larData,
-      jobData: jobData,
    };
  }, [fixedPeriods, data, bodyshop]);

@@ -368,10 +356,7 @@ export function ScoreboardTimeTicketsStats({ bodyshop }) {
        <ScoreboardTimeticketsTargetsTable />
      </Col>
      <Col span={24}>
-        <ScoreboardTicketsStats
-          data={calculatedData.fixed}
-          jobData={calculatedData.jobData}
-        />
+        <ScoreboardTicketsStats data={calculatedData.fixed} />
      </Col>
      <Col span={24}>
        <ScoreboardTimeTicketsChart
--- a/client/src/components/scoreboard-timetickets-stats/scoreboard-timetickets.stats.component.jsx
+++ b/client/src/components/scoreboard-timetickets-stats/scoreboard-timetickets.stats.component.jsx
@@ -41,7 +41,7 @@ function useLocalStorage(key, initialValue) {
  return [storedValue, setStoredValue];
 }

-export function ScoreboardTicketsStats({ data, jobData, bodyshop }) {
+export function ScoreboardTicketsStats({ data, bodyshop }) {
  const { t } = useTranslation();
  const [isLarge, setIsLarge] = useLocalStorage("isLargeStatistic", false);

@@ -408,7 +408,7 @@ export function ScoreboardTicketsStats({ data, jobData, bodyshop }) {
            {/* Monthly Stats */}
            <Row gutter={[16, 16]}>
              {/* This Month */}
-              <Col span={7} align="center">
+              <Col span={8} align="center">
                <Card size="small" title={t("scoreboard.labels.thismonth")}>
                  <Row gutter={[16, 16]}>
                    <Col span={24}>
@@ -482,7 +482,7 @@ export function ScoreboardTicketsStats({ data, jobData, bodyshop }) {
                </Card>
              </Col>
              {/* Last Month */}
-              <Col span={7} align="center">
+              <Col span={8} align="center">
                <Card size="small" title={t("scoreboard.labels.lastmonth")}>
                  <Row gutter={[16, 16]}>
                    <Col span={24}>
@@ -556,7 +556,7 @@ export function ScoreboardTicketsStats({ data, jobData, bodyshop }) {
                </Card>
              </Col>
              {/* Efficiency Over Period */}
-              <Col span={7} align="center">
+              <Col span={8} align="center">
                <Card
                  size="small"
                  title={t("scoreboard.labels.efficiencyoverperiod")}
@@ -604,40 +604,6 @@ export function ScoreboardTicketsStats({ data, jobData, bodyshop }) {
                  </Row>
                </Card>
              </Col>
-              <Col span={3} align="center">
-                <Card
-                  size="small"
-                  title={t("scoreboard.labels.jobscompletednotinvoiced")}
-                >
-                  <Row gutter={[16, 16]}>
-                    <Col span={24}>
-                      <Statistic
-                        value={jobData.count}
-                        valueStyle={{
-                          fontSize: statisticSize,
-                          fontWeight: statisticWeight,
-                        }}
-                      />
-                    </Col>
-                  </Row>
-                  <Row gutter={[16, 16]}>
-                    <Col span={24}>
-                      <Statistic
-                        title={
-                          <Typography.Text strong>
-                            {t("scoreboard.labels.totalhrs")}
-                          </Typography.Text>
-                        }
-                        value={jobData.tthrs}
-                        valueStyle={{
-                          fontSize: statisticSize,
-                          fontWeight: statisticWeight,
-                        }}
-                      />
-                    </Col>
-                  </Row>
-                </Card>
-              </Col>
            </Row>
          </Space>
          {/* Disclaimer */}
--- a/client/src/components/scoreboard-timetickets/scoreboard-timetickets.component.jsx
+++ b/client/src/components/scoreboard-timetickets/scoreboard-timetickets.component.jsx
@@ -65,8 +65,6 @@ export default function ScoreboardTimeTickets() {
      end: endDate.format("YYYY-MM-DD"),
      fixedStart: fixedPeriods.start.format("YYYY-MM-DD"),
      fixedEnd: fixedPeriods.end.format("YYYY-MM-DD"),
-      jobStart: startDate,
-      jobEnd: endDate,
    },
    fetchPolicy: "network-only",
    nextFetchPolicy: "network-only",
--- a/client/src/graphql/timetickets.queries.js
+++ b/client/src/graphql/timetickets.queries.js
@@ -143,14 +143,9 @@ export const QUERY_TIME_TICKETS_IN_RANGE_SB = gql`
    $end: date!
    $fixedStart: date!
    $fixedEnd: date!
-    $jobStart: timestamptz!
-    $jobEnd: timestamptz!
  ) {
    timetickets(
-      where: {
-        date: { _gte: $start, _lte: $end }
-        cost_center: { _neq: "timetickets.labels.shift" }
-      }
+      where: { date: { _gte: $start, _lte: $end }, cost_center: {_neq: "timetickets.labels.shift"} }
      order_by: { date: desc_nulls_first }
    ) {
      actualhrs
@@ -181,10 +176,7 @@ export const QUERY_TIME_TICKETS_IN_RANGE_SB = gql`
      }
    }
    fixedperiod: timetickets(
-      where: {
-        date: { _gte: $fixedStart, _lte: $fixedEnd }
-        cost_center: { _neq: "timetickets.labels.shift" }
-      }
+      where: { date: { _gte: $fixedStart, _lte: $fixedEnd }, cost_center: {_neq: "timetickets.labels.shift"} }
      order_by: { date: desc_nulls_first }
    ) {
      actualhrs
@@ -213,25 +205,6 @@ export const QUERY_TIME_TICKETS_IN_RANGE_SB = gql`
        last_name
      }
    }
-    jobs(
-      where: {
-        date_invoiced: { _is_null: true }
-        ro_number: { _is_null: false }
-        voided: { _eq: false }
-        _or: [
-          { actual_completion: { _gte: $jobStart, _lte: $jobEnd } }
-          { actual_delivery: { _gte: $jobStart, _lte: $jobEnd } }
-        ]
-      }
-    ) {
-      id
-      joblines(order_by: { line_no: asc }, where: { removed: { _eq: false } }) {
-        convertedtolbr
-        convertedtolbr_data
-        mod_lb_hrs
-        mod_lbr_ty
-      }
-    }
  }
 `;

--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -203,6 +203,7 @@
 				"entered_total": "Total of Entered Lines",
 				"enteringcreditmemo": "You are entering a credit memo. Please ensure you are also entering positive values.",
 				"federal_tax": "Federal Tax",
+				"federal_tax_exempt": "Federal Tax Exempt?",
 				"generatepartslabel": "Generate Parts Labels after Saving?",
 				"iouexists": "An IOU exists that is associated to this RO.",
 				"local_tax": "Local Tax",
@@ -2695,7 +2696,6 @@
 				"efficiencyoverperiod": "Efficiency over Selected Dates",
 				"entries": "Scoreboard Entries",
 				"jobs": "Jobs",
-				"jobscompletednotinvoiced": "Completed Not Invoiced",
 				"lastmonth": "Last Month",
 				"lastweek": "Last Week",
 				"monthlytarget": "Monthly",
@@ -2710,7 +2710,6 @@
 				"timetickets": "Time Tickets",
 				"timeticketsemployee": "Time Tickets by Employee",
 				"todateactual": "Actual (MTD)",
-				"totalhrs": "Total Hours",
 				"totaloverperiod": "Total over Selected Dates",
 				"weeklyactual": "Actual (W)",
 				"weeklytarget": "Weekly",
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -203,6 +203,7 @@
 				"entered_total": "",
 				"enteringcreditmemo": "",
 				"federal_tax": "",
+				"federal_tax_exempt": "",
 				"generatepartslabel": "",
 				"iouexists": "",
 				"local_tax": "",
@@ -2695,7 +2696,6 @@
 				"efficiencyoverperiod": "",
 				"entries": "",
 				"jobs": "",
-				"jobscompletednotinvoiced": "",
 				"lastmonth": "",
 				"lastweek": "",
 				"monthlytarget": "",
@@ -2710,7 +2710,6 @@
 				"timetickets": "",
 				"timeticketsemployee": "",
 				"todateactual": "",
-				"totalhrs": "",
 				"totaloverperiod": "",
 				"weeklyactual": "",
 				"weeklytarget": "",
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -203,6 +203,7 @@
 				"entered_total": "",
 				"enteringcreditmemo": "",
 				"federal_tax": "",
+				"federal_tax_exempt": "",
 				"generatepartslabel": "",
 				"iouexists": "",
 				"local_tax": "",
@@ -2695,7 +2696,6 @@
 				"efficiencyoverperiod": "",
 				"entries": "",
 				"jobs": "",
-				"jobscompletednotinvoiced": "",
 				"lastmonth": "",
 				"lastweek": "",
 				"monthlytarget": "",
@@ -2710,7 +2710,6 @@
 				"timetickets": "",
 				"timeticketsemployee": "",
 				"todateactual": "",
-				"totalhrs": "",
 				"totaloverperiod": "",
 				"weeklyactual": "",
 				"weeklytarget": "",
Author	SHA1	Message	Date
Allan Carr	0117237988	IO-2506 Correct for variable immutibility and nested ifs	2023-12-19 09:18:00 -08:00
Allan Carr	661bedbe5b	IO-2506 Federal Tax Exempt on Bill Entry Will Toggle Federal Tax off on any new line or retroactively toggle it off on all lines when switch is enabled. Limited to PBS or CDK setups.	2023-12-18 12:36:46 -08:00