Added basic bucketed smart scheduling BOD-4

2020-06-24 11:20:27 -07:00
parent 73ff905b58
commit 997ea6cbcf
8 changed files with 148 additions and 52 deletions
--- a/client/src/components/schedule-calendar-wrapper/schedule-calendar.styles.scss
+++ b/client/src/components/schedule-calendar-wrapper/schedule-calendar.styles.scss
@@ -4,3 +4,7 @@
  box-sizing: unset !important;
  min-height: unset !important;
 }
+
+.imex-event-arrived {
+  background-color: green;
+}
--- a/client/src/components/schedule-calendar-wrapper/scheduler-calendar-wrapper.component.jsx
+++ b/client/src/components/schedule-calendar-wrapper/scheduler-calendar-wrapper.component.jsx
@@ -2,14 +2,20 @@ import moment from "moment";
 import queryString from "query-string";
 import React from "react";
 import { Calendar, momentLocalizer } from "react-big-calendar";
+import { connect } from "react-redux";
 import { useHistory, useLocation } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import Event from "../schedule-event/schedule-event.container";
 import HeaderComponent from "./schedule-calendar-header.component";
 import "./schedule-calendar.styles.scss";

+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
 const localizer = momentLocalizer(moment);
-
-export default function ScheduleCalendarWrapperComponent({
+export function ScheduleCalendarWrapperComponent({
+  bodyshop,
  data,
  refetch,
  defaultView,
@@ -19,6 +25,21 @@ export default function ScheduleCalendarWrapperComponent({
 }) {
  const search = queryString.parse(useLocation().search);
  const history = useHistory();
+
+  const handleEventPropStyles = (event, start, end, isSelected) => {
+    // if (!!!bodyshop.ssbuckets) {
+    //   return {};
+    // }
+    // const defaultEventColor = "#3174ad";
+    // const jobHrs = result.jobs_by_pk.jobhrs.aggregate.sum.mod_lb_hrs;
+    // const JobBucket = bodyshop.ssbuckets.filter(
+    //   (bucket) =>
+    //     bucket.gte <= jobHrs && (!!bucket.lt ? bucket.lt > jobHrs : true)
+    // )[0];
+
+    return { className: event.arrived ? "imex-event-arrived" : "" };
+  };
+
  return (
    <Calendar
      events={data}
@@ -41,6 +62,7 @@ export default function ScheduleCalendarWrapperComponent({
      localizer={localizer}
      min={new Date("2020-01-01T06:00:00")} //TODO Read from business settings.
      max={new Date("2020-01-01T20:00:00")}
+      eventPropGetter={handleEventPropStyles}
      components={{
        event: (e) => Event({ event: e.event, refetch: refetch }),
        header: HeaderComponent,
@@ -49,3 +71,5 @@ export default function ScheduleCalendarWrapperComponent({
    />
  );
 }
+
+export default connect(mapStateToProps, null)(ScheduleCalendarWrapperComponent);
--- a/client/src/components/schedule-event/schedule-event.component.jsx
+++ b/client/src/components/schedule-event/schedule-event.component.jsx
@@ -106,9 +106,9 @@ export function ScheduleEventComponent({

  const RegularEvent = event.isintake ? (
    <div>
-      <strong style={{ color: event.arrived ? "green" : "" }}>{`${
-        (event.job && event.job.ownr_fn) || ""
-      } ${(event.job && event.job.ownr_ln) || ""}`}</strong>
+      <strong>{`${(event.job && event.job.ownr_fn) || ""} ${
+        (event.job && event.job.ownr_ln) || ""
+      }`}</strong>
      <div style={{ margin: 4 }}>
        {`${(event.job && event.job.v_model_yr) || ""} ${
          (event.job && event.job.v_make_desc) || ""
--- a/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
+++ b/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
@@ -3,11 +3,12 @@ import axios from "axios";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { auth } from "../../firebase/firebase.utils";
+import { DateFormatter } from "../../utils/DateFormatter";
 import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component";
 import EmailInput from "../form-items-formatted/email-form-item.component";
 import ScheduleDayViewContainer from "../schedule-day-view/schedule-day-view.container";
 import ScheduleExistingAppointmentsList from "../schedule-existing-appointments-list/schedule-existing-appointments-list.component";
-import { DateTimeFormatter } from "../../utils/DateFormatter";
+import moment from "moment";

 export default function ScheduleJobModalComponent({
  existingAppointments,
@@ -41,7 +42,7 @@ export default function ScheduleJobModalComponent({
  return (
    <Row gutter={[32, 32]}>
      <Col span={14}>
-        <div className='imex-flex-row imex-flex-row__flex-space-around'>
+        <div className="imex-flex-row imex-flex-row__flex-space-around">
          <strong>{t("appointments.fields.time")}</strong>
          <DateTimePicker
            value={appData.start}
@@ -53,15 +54,20 @@ export default function ScheduleJobModalComponent({
            {t("appointments.actions.smartscheduling")}
          </Button>
        </div>
-        <div className='imex-flex-row imex-flex-row__flex-space-around'>
+        <div className="imex-flex-row imex-flex-row__flex-space-around">
          {appData.smartDates.map((d, idx) => (
            <Button
-              className='imex-flex-row__margin'
+              className="imex-flex-row__margin"
              key={idx}
              onClick={() => {
-                setAppData({ ...appData, start: d });
-              }}>
-              <DateTimeFormatter>{d}</DateTimeFormatter>
+                console.log("new Date(d)", new Date(d));
+                setAppData({
+                  ...appData,
+                  start: new moment(d).add(8, "hours"),
+                });
+              }}
+            >
+              <DateFormatter>{d}</DateFormatter>
            </Button>
          ))}
        </div>
@@ -75,7 +81,8 @@ export default function ScheduleJobModalComponent({
          defaultChecked={appData.notifyCustomer}
          onChange={(e) =>
            setAppData({ ...appData, notifyCustomer: e.target.checked })
-          }>
+          }
+        >
          {t("jobs.labels.appointmentconfirmation")}
        </Checkbox>
        <EmailInput
--- a/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx
+++ b/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx
@@ -53,7 +53,7 @@ export function ScheduleJobModalContainer({
      start: null,
      smartDates: [],
    });
-  }, [job, , setAppData]);
+  }, [job, setAppData]);

  const { t } = useTranslation();

@@ -158,7 +158,8 @@ export function ScheduleJobModalContainer({
      okButtonProps={{
        disabled: appData.start ? false : true,
        loading: loading,
-      }}>
+      }}
+    >
      <ScheduleJobModalComponent
        existingAppointments={existingAppointments}
        appData={appData}
--- a/client/src/graphql/bodyshop.queries.js
+++ b/client/src/graphql/bodyshop.queries.js
@@ -32,6 +32,7 @@ export const QUERY_BODYSHOP = gql`
      accountingconfig
      appt_length
      stripe_acct_id
+      ssbuckets
      employees {
        id
        first_name
--- a/server/graphql-client/queries.js
+++ b/server/graphql-client/queries.js
@@ -111,8 +111,8 @@ query QUERY_INVOICES_FOR_PAYABLES_EXPORT($invoices: [uuid!]!) {

 exports.QUERY_UPCOMING_APPOINTMENTS = `
 query QUERY_UPCOMING_APPOINTMENTS($now: timestamptz!, $jobId: uuid!) {
-  jobs_by_pk(id: $jobId){
-    bodyshop{
+  jobs_by_pk(id: $jobId) {
+    bodyshop {
      ssbuckets
    }
    jobhrs: joblines_aggregate {
@@ -122,23 +122,27 @@ query QUERY_UPCOMING_APPOINTMENTS($now: timestamptz!, $jobId: uuid!) {
        }
      }
    }
-
  }
-    appointments(where: {start: {_gt: $now}}) {
-      start
-      isintake
-      id
-      job {
-        joblines_aggregate {
-          aggregate {
-            sum {
-              mod_lb_hrs
-            }
+  appointments(where: {_and: {canceled: {_eq: false}, start: {_gte: $now}}}) {
+    start
+    isintake
+    id
+    job {
+      joblines_aggregate {
+        aggregate {
+          sum {
+            mod_lb_hrs
          }
        }
      }
    }
  }
+  productionview {
+    id
+    labhrs
+    larhrs
+    scheduled_completion
+  }
+}

-  
  `;
--- a/server/scheduling/scheduling-job.js
+++ b/server/scheduling/scheduling-job.js
@@ -29,48 +29,103 @@ exports.job = async (req, res) => {
        jobId: jobId,
      });

-    const { appointments } = result;
+    const { appointments, productionview } = result;
    const { ssbuckets } = result.jobs_by_pk.bodyshop;
-    const jobhrs = result.jobs_by_pk.jobhrs.aggregate.sum.mod_lb_hrs;
+    const jobHrs = result.jobs_by_pk.jobhrs.aggregate.sum.mod_lb_hrs;

-    const JobClassification = ssbuckets.filter(
-      (b) => b.gte <= jobhrs && b.lt > jobhrs
-    );
-    //Create a matrix of load bucket
+    const JobBucket = ssbuckets.filter(
+      (bucket) =>
+        bucket.gte <= jobHrs && (!!bucket.lt ? bucket.lt > jobHrs : true)
+    )[0];

    const bucketMatrix = {};

-    //Get latest date + add 5 days.
-
+    //Get latest date + add 5 days to allow for back end adding..
    const totalMatrixDays = moment
-      .max(appointments.map((a) => moment(a.start)))
+      .max([
+        ...appointments.map((a) => moment(a.start)),
+        ...productionview
+          .map((p) => moment(p.scheduled_completion))
+          .filter((p) => p.isValid()),
+      ])
      .add("5", "days")
      .diff(moment(), "days");

-    for (var i = 0; i++; i < totalMatrixDays) {
+    //Initialize the bucket matrix
+    for (i = 0; i < totalMatrixDays; i++) {
      const theDate = moment().add(i, "days").toISOString().substr(0, 10);
-      console.log("theDate", theDate);
-      ssbuckets.forEach((bucket) => {
-        bucketMatrix[theDate][bucket.id] = { in: 0, out: 0 };
-      });
+      //Only need to create a matrix for jobs of the same bucket.
+      bucketMatrix[theDate] = { in: 0, out: 0 };
+
+      // ssbuckets.forEach((bucket) => {
+      //   bucketMatrix[theDate] = {
+      //     ...bucketMatrix[theDate],
+      //     [bucket.id]: { in: 0, out: 0 },
+      //   };
+      // });
    }

+    //Populate the jobs scheduled to come in.
    appointments.forEach((appointment) => {
-      //Get the day of the appointment.
-      const appDate = moment(appointment.start).toISOString().substr(0, 10);
-      !!bucketMatrix[appDate] ? {} : {};
+      const jobHrs =
+        appointment.job.joblines_aggregate.aggregate.sum.mod_lb_hrs;
+      //Is the job in the same bucket?
+      const appointmentBucket = ssbuckets.filter(
+        (bucket) =>
+          bucket.gte <= jobHrs && (!!bucket.lt ? bucket.lt > jobHrs : true)
+      )[0];
+      if (appointmentBucket.id === JobBucket.id) {
+        //Theyre the same classification. Add it to the matrix.
+        const appDate = moment(appointment.start).toISOString().substr(0, 10);
+        bucketMatrix[appDate] = {
+          ...bucketMatrix[appDate],
+          in: bucketMatrix[appDate].in + 1,
+        };
+      }
    });

-    //Calculate the load for the shop looking forward.
+    //Populate the jobs that are leaving today.
+    const todayIsoString = moment().toISOString().substr(0, 10);
+    productionview.forEach((pjob) => {
+      const jobHrs = pjob.larhrs + pjob.labhrs;
+      //Is the job in the same bucket?
+      const pjobBucket = ssbuckets.filter(
+        (bucket) =>
+          bucket.gte <= jobHrs && (!!bucket.lt ? bucket.lt > jobHrs : true)
+      )[0];
+      if (pjobBucket.id === JobBucket.id) {
+        //Theyre the same classification. Add it to the matrix.
+        const compDate = moment(pjob.scheduled_completion);
+        //Is the schedule completion behind today? If so, use today as it.
+        let dateToUse;
+        dateToUse = compDate.isValid()
+          ? moment().diff(compDate, "days") <= 0
+            ? compDate.toISOString().substr(0, 10)
+            : todayIsoString
+          : todayIsoString;
+
+        bucketMatrix[dateToUse] = {
+          ...bucketMatrix[dateToUse],
+          out: bucketMatrix[dateToUse].out + 1,
+        };
+      }
+    });
+
+    //Propose the first 5 dates where we are below target.

    const possibleDates = [];
+    const bucketMatrixKeys = Object.keys(bucketMatrix);
+    bucketMatrixKeys.forEach((bmkey) => {
+      if (JobBucket.target > bucketMatrix[bmkey].in - bucketMatrix[bmkey].out)
+        possibleDates.push(new Date(bmkey).toISOString().substr(0, 10));
+    });

    //Temp
-    possibleDates.push(new Date());
-    possibleDates.push(new Date());
-    possibleDates.push(new Date());
-    possibleDates.push(new Date());
-    possibleDates.push(new Date());
+    // possibleDates.push(new Date());
+    // possibleDates.push(new Date());
+    // possibleDates.push(new Date());
+    // possibleDates.push(new Date());
+    // possibleDates.push(new Date());
    //Get a list of upcoming appointments
    //Get the config for each day