IO-3286 Additional Product Fruit IDs

Signed-off-by: Allan Carr <allan@imexsystems.ca>

client/src/components/form-date-time-picker/form-date-time-picker.component.jsx

@@ -1,6 +1,6 @@
 import { DatePicker, Space, TimePicker } from "antd";
 import PropTypes from "prop-types";
-import { useCallback, useState } from "react";
+import React, { useCallback, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -94,24 +94,7 @@ const DateTimePicker = ({
             showTime={false}
             format="MM/DD/YYYY"
             value={value ? dayjs(value) : null}
-            onChange={(dateValue) => {
-              if (dateValue) {
-                // When date changes, preserve the existing time if it exists
-                if (value && dayjs(value).isValid()) {
-                  const existingTime = dayjs(value);
-                  const newDateTime = dayjs(dateValue)
-                    .hour(existingTime.hour())
-                    .minute(existingTime.minute())
-                    .second(existingTime.second());
-                  handleChange(newDateTime);
-                } else {
-                  // If no existing time, just set the date without time
-                  handleChange(dateValue);
-                }
-              } else {
-                handleChange(dateValue);
-              }
-            }}
+            onChange={handleChange}
             placeholder={t("general.labels.date")}
             onBlur={handleBlur}
             disabledDate={handleDisabledDate}
@@ -122,25 +105,13 @@ const DateTimePicker = ({
             <TimePicker
               format="hh:mm a"
               minuteStep={15}
-              value={value && dayjs(value).hour() === 0 && dayjs(value).minute() === 0 ? null : dayjs(value)}
               defaultOpenValue={dayjs(value)
                 .hour(dayjs().hour())
                 .minute(Math.floor(dayjs().minute() / 15) * 15)
                 .second(0)}
-              onChange={(timeValue) => {
-                if (timeValue) {
-                  // When time changes, combine it with the existing date
-                  const existingDate = dayjs(value);
-                  const newDateTime = existingDate
-                    .hour(timeValue.hour())
-                    .minute(timeValue.minute())
-                    .second(0);
-                  handleChange(newDateTime);
-                } else {
-                  // If time is cleared, just update with null time but keep date
-                  handleChange(timeValue);
-                }
-                if (onBlur) onBlur();
+              onChange={(value) => {
+                handleChange(value);
+                onBlur();
               }}
               placeholder={t("general.labels.time")}
               {...restProps}

client/src/components/job-at-change/schedule-event.component.jsx

@@ -385,9 +385,7 @@ export function ScheduleEventComponent({
                   previousEvent: event.id,
                   color: event.color,
                   alt_transport: event.job && event.job.alt_transport,
-                  note: event.note,
-                  scheduled_in: event.job && event.job.scheduled_in,
-                  scheduled_completion: event.job && event.job.scheduled_completion
+                  note: event.note
                 }
               });
             }}

client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx

@@ -673,9 +673,7 @@ export function JobsDetailHeaderActions({
           context: {
             jobId: job.id,
             job: job,
-            alt_transport: job.alt_transport,
-            scheduled_in: job.scheduled_in,
-            scheduled_completion: job.scheduled_completion
+            alt_transport: job.alt_transport
           }
         });
       }
@@ -1092,7 +1090,11 @@ export function JobsDetailHeaderActions({
             {t("menus.jobsactions.deletejob")}
           </Popconfirm>
         ) : (
-          <Popconfirm title={t("jobs.labels.deletewatchers")} onClick={(e) => e.stopPropagation()} showCancel={false}>
+          <Popconfirm
+            title={t("jobs.labels.deletewatchers")}
+            onClick={(e) => e.stopPropagation()}
+            showCancel={false}
+          >
             {t("menus.jobsactions.deletejob")}
           </Popconfirm>
         )

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

@@ -337,7 +337,7 @@ export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail })
       <Col {...colSpan}>
         <Card
           style={{ height: "100%" }}
-          title=<span id="job-employee-assignments-title">{t("jobs.labels.employeeassignments")}</span>
+          title={<span id="job-employee-assignments-title">{t("jobs.labels.employeeassignments")}</span>}
           id={"job-employee-assignments"}
         >
           <div>

client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx

@@ -3,7 +3,7 @@ import { Button, Card, Input, Space, Table, Typography } from "antd";
 import axios from "axios";
 import _ from "lodash";
 import queryString from "query-string";
-import React, { useEffect, useState } from "react";
+import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, useLocation, useNavigate } from "react-router-dom";
@@ -20,7 +20,7 @@ const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
   bodyshop: selectBodyshop
 });
-const mapDispatchToProps = (dispatch) => ({
+const mapDispatchToProps = () => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 
@@ -203,6 +203,8 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
 
   return (
     <Card
+      id="all-jobs-list"
+      title={t("titles.bc.jobs-all")}
       extra={
         <Space wrap>
           {search.search && (
@@ -256,6 +258,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
         rowKey="id"
         dataSource={search?.search ? openSearchResults : jobs}
         onChange={handleTableChange}
+        id="all-jobs-list-table"
       />
     </Card>
   );

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

@@ -2,7 +2,7 @@ import { BranchesOutlined, ExclamationCircleFilled, PauseCircleOutlined, SyncOut
 import { useQuery } from "@apollo/client";
 import { Button, Card, Grid, Input, Space, Table, Tooltip } from "antd";
 import queryString from "query-string";
-import React, { useState } from "react";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, useLocation, useNavigate } from "react-router-dom";
@@ -22,7 +22,7 @@ const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
 });
 
-const mapDispatchToProps = (dispatch) => ({});
+const mapDispatchToProps = () => ({});
 
 export function JobsList({ bodyshop }) {
   const searchParams = queryString.parse(useLocation().search);
@@ -342,13 +342,14 @@ export function JobsList({ bodyshop }) {
           type: "radio"
         }}
         onChange={handleTableChange}
-        onRow={(record, rowIndex) => {
+        onRow={(record) => {
           return {
-            onClick: (event) => {
+            onClick: () => {
               handleOnRowClick(record);
             }
           };
         }}
+        id="active-jobs-list-table"
       />
     </Card>
   );

client/src/components/schedule-job-modal/schedule-job-modal.container.jsx

@@ -1,10 +1,10 @@
 import { useMutation, useQuery } from "@apollo/client";
 import { Form, Modal } from "antd";
-import { useEffect, useState } from "react";
+import dayjs from "../../utils/day";
+import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import {
   CANCEL_APPOINTMENT_BY_ID,
@@ -19,9 +19,9 @@ import { selectSchedule } from "../../redux/modals/modals.selectors";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import { DateTimeFormat } from "../../utils/DateFormatter";
-import dayjs from "../../utils/day";
 import { TemplateList } from "../../utils/TemplateConstants";
 import ScheduleJobModalComponent from "./schedule-job-modal.component";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -72,7 +72,7 @@ export function ScheduleJobModalContainer({
     variables: { jobid: jobId },
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only",
-    skip: !open || !jobId
+    skip: !open || !!!jobId
   });
 
   useEffect(() => {
@@ -93,12 +93,12 @@ export function ScheduleJobModalContainer({
     logImEXEvent("schedule_new_appointment");
 
     setLoading(true);
-    if (previousEvent) {
+    if (!!previousEvent) {
       const cancelAppt = await cancelAppointment({
         variables: { appid: previousEvent }
       });
 
-      if (cancelAppt.errors) {
+      if (!!cancelAppt.errors) {
         notification["error"]({
           message: t("appointments.errors.canceling", {
             message: JSON.stringify(cancelAppt.errors)
@@ -146,7 +146,7 @@ export function ScheduleJobModalContainer({
       });
     }
 
-    if (appt.errors) {
+    if (!!appt.errors) {
       notification["error"]({
         message: t("appointments.errors.saving", {
           message: JSON.stringify(appt.errors)
@@ -172,7 +172,7 @@ export function ScheduleJobModalContainer({
         }
       });
 
-      if (jobUpdate.errors) {
+      if (!!jobUpdate.errors) {
         notification["error"]({
           message: t("appointments.errors.saving", {
             message: JSON.stringify(jobUpdate.errors)
@@ -222,9 +222,9 @@ export function ScheduleJobModalContainer({
         initialValues={{
           notifyCustomer: !!(job && job.ownr_ea),
           email: (job && job.ownr_ea) || "",
+          start: null,
           // smartDates: [],
-          start: context.scheduled_in,
-          scheduled_completion: context.scheduled_completion ,
+          scheduled_completion: null,
           color: context.color,
           alt_transport: context.alt_transport,
           note: context.note

client/src/graphql/appointments.queries.js

@@ -31,8 +31,6 @@ export const QUERY_ALL_ACTIVE_APPOINTMENTS = gql`
       color
       note
       job {
-        scheduled_in
-        scheduled_completion
         alt_transport
         ro_number
         ownr_ln

client/src/translations/en_us/common.json

@@ -3505,7 +3505,7 @@
         "dashboard": "Dashboard",
         "dms": "DMS Export",
         "export-logs": "Export Logs",
-        "feature-request": "Feature Request",
+        "feature-request": "Feature Requet",
         "inventory": "Inventory",
         "jobs": "Jobs",
         "jobs-active": "Active Jobs",