IO-2411 filter inactive employees on prod. print button

client/src/components/bill-enter-modal/bill-enter-modal.container.jsx

@@ -37,8 +37,8 @@ const mapStateToProps = createStructuredSelector({
 });
 const mapDispatchToProps = (dispatch) => ({
   toggleModalVisible: () => dispatch(toggleModalVisible("billEnter")),
-  insertAuditTrail: ({ jobid, billid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, billid, operation })),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
 const Templates = TemplateList("job_special");
@@ -316,7 +316,7 @@ function BillEnterModalContainer({
     insertAuditTrail({
       jobid: values.jobid,
       billid: billId,
-      operation: AuditTrailMapping.billposted(r1.data.insert_bills.returning[0].invoice_number),
+      operation: AuditTrailMapping.billposted(remainingValues.invoice_number),
     });
 
     if (enterAgain) {

client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx

@@ -9,15 +9,15 @@ import {
   Table,
   Tooltip,
 } from "antd";
-import moment from "moment";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
-import { GenerateDocument } from "../../utils/RenderTemplate";
-import { TemplateList } from "../../utils/TemplateConstants";
 import { alphaSort } from "../../utils/sorters";
 import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
+import moment from "moment";
+import { GenerateDocument } from "../../utils/RenderTemplate";
+import { TemplateList } from "../../utils/TemplateConstants";
 export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
   const [state, setState] = useState({
     sortedInfo: {},
@@ -115,14 +115,6 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
       sortOrder:
         state.sortedInfo.columnKey === "model" && state.sortedInfo.order,
     },
-    {
-      title: t("courtesycars.fields.color"),
-      dataIndex: "color",
-      key: "color",
-      sorter: (a, b) => alphaSort(a.color, b.color),
-      sortOrder:
-        state.sortedInfo.columnKey === "color" && state.sortedInfo.order,
-    },
     {
       title: t("courtesycars.fields.plate"),
       dataIndex: "plate",

client/src/components/email-overlay/email-overlay.container.jsx

@@ -109,7 +109,7 @@ export function EmailOverlayContainer({
               ]
             : []),
         ],
-        media: selectedMedia.filter((m) => m.isSelected).map((m) => m.fullsize),
+        media: selectedMedia.filter((m) => m.isSelected).map((m) => m.src),
         //attachments,
       });
       notification["success"]({ message: t("emails.successes.sent") });

client/src/components/job-search-select/job-search-select.component.jsx

@@ -33,9 +33,7 @@ const JobSearchSelect = (
     useLazyQuery(SEARCH_JOBS_BY_ID_FOR_AUTOCOMPLETE);
 
   const executeSearch = (v) => {
-    console.log(v);
-    if (v && v.variables?.search !== "" && v.variables.search.length >= 2)
-      callSearch(v);
+    if (v && v !== "") callSearch(v);
   };
   const debouncedExecuteSearch = _.debounce(executeSearch, 500);
 

client/src/components/jobs-documents-gallery/jobs-documents-gallery.external.component.jsx

@@ -1,7 +1,7 @@
 import React, { useEffect } from "react";
 import { Gallery } from "react-grid-gallery";
 import { useTranslation } from "react-i18next";
-import { GenerateSrcUrl, GenerateThumbUrl } from "./job-documents.utility";
+import { GenerateThumbUrl } from "./job-documents.utility";
 
 function JobsDocumentGalleryExternal({
   data,
@@ -15,7 +15,7 @@ function JobsDocumentGalleryExternal({
     let documents = data.reduce((acc, value) => {
       if (value.type.startsWith("image")) {
         acc.push({
-          fullsize: GenerateSrcUrl(value),
+          //src: GenerateSrcUrl(value),
           src: GenerateThumbUrl(value),
           thumbnailHeight: 225,
           thumbnailWidth: 225,

client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.external.component.jsx

@@ -52,7 +52,7 @@ function JobDocumentsLocalGalleryExternal({
               val.type.mime &&
               val.type.mime.startsWith("image")
             ) {
-              acc.push({ ...val, src: val.thumbnail, fullsize: val.src });
+              acc.push({ ...val, src: val.thumbnail });
             }
             return acc;
           }, [])

client/src/components/labor-allocations-table/labor-allocations-table.component.jsx

@@ -231,14 +231,7 @@ export function LaborAllocationsTable({
                   {summary.adjustments.toFixed(1)}
                 </Table.Summary.Cell>
                 <Table.Summary.Cell>
-                  <Typography.Text
-                    style={{
-                      fontWeight: "bold",
-                      color: summary.difference >= 0 ? "green" : "red",
-                    }}
-                  >
-                    {summary.difference.toFixed(1)}
-                  </Typography.Text>
+                  {summary.difference.toFixed(1)}
                 </Table.Summary.Cell>
               </Table.Summary.Row>
             )}

client/src/components/owner-search-select/owner-search-select.component.jsx

@@ -21,8 +21,7 @@ const OwnerSearchSelect = ({ value, onChange, onBlur, disabled }, ref) => {
     useLazyQuery(SEARCH_OWNERS_BY_ID_FOR_AUTOCOMPLETE);
 
   const executeSearch = (v) => {
-    if (v && v.variables?.search !== "" && v.variables.search.length >= 2)
-      callSearch(v);
+    callSearch(v);
   };
   const debouncedExecuteSearch = _.debounce(executeSearch, 500);
 

client/src/components/owners-list/owners-list.component.jsx

@@ -106,11 +106,7 @@ export default function OwnersListComponent({
           <Input.Search
             placeholder={search.search || t("general.labels.search")}
             onSearch={(value) => {
-              if (value?.length >= 3) {
-                search.search = value;
-              } else {
-                delete search.search;
-              }
+              search.search = value;
               history.push({ search: queryString.stringify(search) });
             }}
             enterButton

client/src/components/production-list-table/production-list-print.component.jsx

@@ -55,25 +55,27 @@ export function ProductionListPrint({ bodyshop }) {
           <Menu.SubMenu
             title={t("reportcenter.templates.production_by_technician_one")}
           >
-            {bodyshop.employees.map((e) => (
-              <Menu.Item
-                key={e.id}
-                onClick={async () => {
-                  setLoading(true);
-                  await GenerateDocument(
-                    {
-                      name: production_by_technician_one.key,
-                      variables: { id: e.id },
-                    },
-                    {},
-                    "p"
-                  );
-                  setLoading(false);
-                }}
-              >
-                {e.first_name} {e.last_name}
-              </Menu.Item>
-            ))}
+            {bodyshop.employees
+              .filter((e) => e.active)
+              .map((e) => (
+                <Menu.Item
+                  key={e.id}
+                  onClick={async () => {
+                    setLoading(true);
+                    await GenerateDocument(
+                      {
+                        name: production_by_technician_one.key,
+                        variables: { id: e.id },
+                      },
+                      {},
+                      "p"
+                    );
+                    setLoading(false);
+                  }}
+                >
+                  {e.first_name} {e.last_name}
+                </Menu.Item>
+              ))}
           </Menu.SubMenu>
           <Menu.SubMenu
             title={t("reportcenter.templates.production_by_category_one")}

client/src/components/vehicle-search-select/vehicle-search-select.component.jsx

@@ -22,7 +22,7 @@ const VehicleSearchSelect = ({ value, onChange, onBlur, disabled }, ref) => {
   ] = useLazyQuery(SEARCH_VEHICLES_BY_ID_FOR_AUTOCOMPLETE);
 
   const executeSearch = (v) => {
-    if (v && v !== "" && v.length >= 3) callSearch(v);
+    callSearch(v);
   };
   const debouncedExecuteSearch = _.debounce(executeSearch, 500);
 

client/src/graphql/bills.queries.js

@@ -5,7 +5,6 @@ export const INSERT_NEW_BILL = gql`
     insert_bills(objects: $bill) {
       returning {
         id
-        invoice_number
       }
     }
   }

client/src/graphql/jobs.queries.js

@@ -1242,7 +1242,7 @@ export const SEARCH_JOBS_FOR_AUTOCOMPLETE = gql`
   ) {
     search_jobs(
       args: { search: $search }
-      limit: 25
+      limit: 50
       where: {
         _and: {
           converted: { _eq: $isConverted }

client/src/graphql/owners.queries.js

@@ -36,7 +36,7 @@ export const SEARCH_OWNERS_FOR_AUTOCOMPLETE = gql`
   query SEARCH_OWNERS_FOR_AUTOCOMPLETE($search: String) {
     search_owners(
       args: { search: $search }
-      limit: 25
+      limit: 50
       order_by: { ownr_ln: desc_nulls_last }
     ) {
       id

client/src/graphql/vehicles.queries.js

@@ -184,7 +184,7 @@ export const SEARCH_VEHICLES_BY_ID_FOR_AUTOCOMPLETE = gql`
 `;
 export const SEARCH_VEHICLES_FOR_AUTOCOMPLETE = gql`
   query SEARCH_VEHICLES_FOR_AUTOCOMPLETE($search: String) {
-    search_vehicles(args: { search: $search }, limit: 25) {
+    search_vehicles(args: { search: $search }, limit: 50) {
       id
       v_vin
       v_model_yr

client/src/translations/en_us/common.json

@@ -2565,22 +2565,18 @@
 				"gsr_labor_only": "Gross Sales - Labor Only",
 				"hours_sold_detail_closed": "Hours Sold Detail - Closed",
 				"hours_sold_detail_closed_csr": "Hours Sold Detail - Closed by CSR",
-				"hours_sold_detail_closed_estimator": "Hours Sold Detail - Closed by Estimator",
 				"hours_sold_detail_closed_ins_co": "Hours Sold Detail - Closed by Source",
 				"hours_sold_detail_closed_status": "Hours Sold Detail - Closed by Status",
 				"hours_sold_detail_open": "Hours Sold Detail - Open",
 				"hours_sold_detail_open_csr": "Hours Sold Detail - Open by CSR",
-				"hours_sold_detail_open_estimator": "Hours Sold Detail - Open by Estimator",
 				"hours_sold_detail_open_ins_co": "Hours Sold Detail - Open by Source",
 				"hours_sold_detail_open_status": "Hours Sold Detail - Open by Status",
 				"hours_sold_summary_closed": "Hours Sold Summary - Closed",
 				"hours_sold_summary_closed_csr": "Hours Sold Summary - Closed by CSR",
-				"hours_sold_summary_closed_estimator": "Hours Sold Summary - Closed by Estimator",
 				"hours_sold_summary_closed_ins_co": "Hours Sold Summary - Closed by Source",
 				"hours_sold_summary_closed_status": "Hours Sold Summary - Closed by Status",
 				"hours_sold_summary_open": "Hours Sold Summary - Open",
 				"hours_sold_summary_open_csr": "Hours Sold Summary - Open CSR",
-				"hours_sold_summary_open_estimator": "Hours Sold Summary - Open Estimator",
 				"hours_sold_summary_open_ins_co": "Hours Sold Summary - Open by Source",
 				"hours_sold_summary_open_status": "Hours Sold Summary - Open by Status",
 				"job_costing_ro_csr": "Job Costing by CSR",

client/src/translations/es/common.json

@@ -2565,22 +2565,18 @@
 				"gsr_labor_only": "",
 				"hours_sold_detail_closed": "",
 				"hours_sold_detail_closed_csr": "",
-				"hours_sold_detail_closed_estimator": "",
 				"hours_sold_detail_closed_ins_co": "",
 				"hours_sold_detail_closed_status": "",
 				"hours_sold_detail_open": "",
 				"hours_sold_detail_open_csr": "",
-				"hours_sold_detail_open_estimator": "",
 				"hours_sold_detail_open_ins_co": "",
 				"hours_sold_detail_open_status": "",
 				"hours_sold_summary_closed": "",
 				"hours_sold_summary_closed_csr": "",
-				"hours_sold_summary_closed_estimator": "",
 				"hours_sold_summary_closed_ins_co": "",
 				"hours_sold_summary_closed_status": "",
 				"hours_sold_summary_open": "",
 				"hours_sold_summary_open_csr": "",
-				"hours_sold_summary_open_estimator": "",
 				"hours_sold_summary_open_ins_co": "",
 				"hours_sold_summary_open_status": "",
 				"job_costing_ro_csr": "",

client/src/translations/fr/common.json

@@ -2565,22 +2565,18 @@
 				"gsr_labor_only": "",
 				"hours_sold_detail_closed": "",
 				"hours_sold_detail_closed_csr": "",
-				"hours_sold_detail_closed_estimator": "",
 				"hours_sold_detail_closed_ins_co": "",
 				"hours_sold_detail_closed_status": "",
 				"hours_sold_detail_open": "",
 				"hours_sold_detail_open_csr": "",
-				"hours_sold_detail_open_estimator": "",
 				"hours_sold_detail_open_ins_co": "",
 				"hours_sold_detail_open_status": "",
 				"hours_sold_summary_closed": "",
 				"hours_sold_summary_closed_csr": "",
-				"hours_sold_summary_closed_estimator": "",
 				"hours_sold_summary_closed_ins_co": "",
 				"hours_sold_summary_closed_status": "",
 				"hours_sold_summary_open": "",
 				"hours_sold_summary_open_csr": "",
-				"hours_sold_summary_open_estimator": "",
 				"hours_sold_summary_open_ins_co": "",
 				"hours_sold_summary_open_status": "",
 				"job_costing_ro_csr": "",

client/src/utils/RenderTemplate.js

@@ -1,14 +1,15 @@
 import { gql } from "@apollo/client";
-import jsreport from "@jsreport/browser-client";
 import { notification } from "antd";
-import axios from "axios";
+import jsreport from "@jsreport/browser-client";
 import _ from "lodash";
+import moment from "moment";
 import { auth } from "../firebase/firebase.utils";
 import { setEmailOptions } from "../redux/email/email.actions";
 import { store } from "../redux/store";
 import client from "../utils/GraphQLClient";
-import cleanAxios from "./CleanAxios";
 import { TemplateList } from "./TemplateConstants";
+import cleanAxios from "./CleanAxios";
+import axios from "axios";
 const server = process.env.REACT_APP_REPORTS_SERVER_URL;
 
 jsreport.serverUrl = server;
@@ -254,7 +255,7 @@ export async function RenderTemplates(
       headerpath: `/${bodyshop.imexshopid}/header.html`,
       footerpath: `/${bodyshop.imexshopid}/footer.html`,
       bodyshop: bodyshop,
-      offset: bodyshop.timezone,
+      offset: moment().utcOffset(),
     },
   };
 

client/src/utils/TemplateConstants.js

@@ -818,74 +818,6 @@ export const TemplateList = (type, context) => {
             },
             group: "sales",
           },
-          hours_sold_detail_closed_estimator: {
-            title: i18n.t(
-              "reportcenter.templates.hours_sold_detail_closed_estimator"
-            ),
-            description: "",
-            subject: i18n.t(
-              "reportcenter.templates.hours_sold_detail_closed_estimator"
-            ),
-            key: "hours_sold_detail_closed_estimator",
-            //idtype: "vendor",
-            disabled: false,
-            rangeFilter: {
-              object: i18n.t("reportcenter.labels.objects.jobs"),
-              field: i18n.t("jobs.fields.date_invoiced"),
-            },
-            group: "sales",
-          },
-          hours_sold_detail_open_estimator: {
-            title: i18n.t(
-              "reportcenter.templates.hours_sold_detail_open_estimator"
-            ),
-            description: "",
-            subject: i18n.t(
-              "reportcenter.templates.hours_sold_detail_open_estimator"
-            ),
-            key: "hours_sold_detail_open_estimator",
-            //idtype: "vendor",
-            disabled: false,
-            rangeFilter: {
-              object: i18n.t("reportcenter.labels.objects.jobs"),
-              field: i18n.t("jobs.fields.date_open"),
-            },
-            group: "sales",
-          },
-          hours_sold_summary_closed_estimator: {
-            title: i18n.t(
-              "reportcenter.templates.hours_sold_summary_closed_estimator"
-            ),
-            description: "",
-            subject: i18n.t(
-              "reportcenter.templates.hours_sold_summary_closed_estimator"
-            ),
-            key: "hours_sold_summary_closed_estimator",
-            //idtype: "vendor",
-            disabled: false,
-            rangeFilter: {
-              object: i18n.t("reportcenter.labels.objects.jobs"),
-              field: i18n.t("jobs.fields.date_invoiced"),
-            },
-            group: "sales",
-          },
-          hours_sold_summary_open_estimator: {
-            title: i18n.t(
-              "reportcenter.templates.hours_sold_summary_open_estimator"
-            ),
-            description: "",
-            subject: i18n.t(
-              "reportcenter.templates.hours_sold_summary_open_estimator"
-            ),
-            key: "hours_sold_summary_open_estimator",
-            //idtype: "vendor",
-            disabled: false,
-            rangeFilter: {
-              object: i18n.t("reportcenter.labels.objects.jobs"),
-              field: i18n.t("jobs.fields.date_invoiced"),
-            },
-            group: "sales",
-          },
           hours_sold_summary_open_status: {
             title: i18n.t(
               "reportcenter.templates.hours_sold_summary_open_status"