Merge remote-tracking branch 'origin/master' into feature/america

client/src/components/header/header.component.jsx

@@ -1,10 +1,9 @@
-import { useTreatments } from "@splitsoftware/splitio-react";
 import Icon, {
   BankFilled,
   BarChartOutlined,
   CarFilled,
-  ClockCircleFilled,
   CheckCircleOutlined,
+  ClockCircleFilled,
   DashboardFilled,
   DollarCircleFilled,
   ExportOutlined,
@@ -26,6 +25,7 @@ import Icon, {
   UnorderedListOutlined,
   UserOutlined,
 } from "@ant-design/icons";
+import { useTreatments } from "@splitsoftware/splitio-react";
 import { Layout, Menu } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -275,7 +275,11 @@ function Header({
             onClick={() => {
               setTimeTicketContext({
                 actions: {},
-                context: {},
+                context: {
+                  created_by: currentUser.displayName
+                    ? currentUser.email.concat(" | ", currentUser.displayName)
+                    : currentUser.email,
+                },
               });
             }}
           >

client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.container.jsx

@@ -1,22 +1,26 @@
 import { useMutation } from "@apollo/client";
 import { Button, Card, Form, notification, Space } from "antd";
 import axios from "axios";
+import moment from "moment";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { INSERT_NEW_TIME_TICKET } from "../../graphql/timetickets.queries";
-import { selectTechnician } from "../../redux/tech/tech.selectors";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import TechClockInComponent from "./tech-job-clock-in-form.component";
-import TechJobPrintTickets from "../tech-job-print-tickets/tech-job-print-tickets.component";
-import moment from "moment";
 import { setModalContext } from "../../redux/modals/modals.actions";
+import { selectTechnician } from "../../redux/tech/tech.selectors";
+import {
+  selectBodyshop,
+  selectCurrentUser,
+} from "../../redux/user/user.selectors";
+import TechJobPrintTickets from "../tech-job-print-tickets/tech-job-print-tickets.component";
+import TechClockInComponent from "./tech-job-clock-in-form.component";
 import { useTreatments } from "@splitsoftware/splitio-react";
 
 const mapStateToProps = createStructuredSelector({
   technician: selectTechnician,
   bodyshop: selectBodyshop,
+  currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
   setTimeTicketContext: (context) =>
@@ -26,6 +30,7 @@ export function TechClockInContainer({
   setTimeTicketContext,
   technician,
   bodyshop,
+  currentUser,
 }) {
   const { Enhanced_Payroll } = useTreatments(
     ["Enhanced_Payroll"],
@@ -68,6 +73,12 @@ export function TechClockInContainer({
                       values.cost_center
                     );
                   }),
+            created_by: currentUser.email.concat(
+              " | ",
+              technician.employee_number
+                .concat(" ", technician.first_name, " ", technician.last_name)
+                .trim()
+            ),
           },
         ],
       },
@@ -102,6 +113,17 @@ export function TechClockInContainer({
                     employeeid: technician.id,
                     flat_rate: emps.flat_rate,
                   },
+                  created_by: currentUser.email.concat(
+                    " | ",
+                    technician.employee_number
+                      .concat(
+                        " ",
+                        technician.first_name,
+                        " ",
+                        technician.last_name
+                      )
+                      .trim()
+                  ),
                 },
               });
             }}

client/src/components/time-ticket-list/time-ticket-list.component.jsx

@@ -10,6 +10,7 @@ import { setModalContext } from "../../redux/modals/modals.actions";
 import {
   selectAuthLevel,
   selectBodyshop,
+  selectCurrentUser,
 } from "../../redux/user/user.selectors";
 import { DateFormatter, DateTimeFormatter } from "../../utils/DateFormatter";
 import { onlyUnique } from "../../utils/arrayHelper";
@@ -23,6 +24,7 @@ import { useTreatments } from "@splitsoftware/splitio-react";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   authLevel: selectAuthLevel,
+  currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
   setTimeTicketTaskContext: (context) =>
@@ -34,6 +36,7 @@ export function TimeTicketList({
   bodyshop,
   setTimeTicketTaskContext,
   authLevel,
+  currentUser,
   disabled,
   loading,
   timetickets,
@@ -238,7 +241,15 @@ export function TimeTicketList({
             },
           },
         ]),
-
+    {
+      title: t("timetickets.fields.created_by"),
+      dataIndex: "created_by",
+      key: "created_by",
+      sorter: (a, b) => alphaSort(a.created_by, b.created_by),
+      sortOrder:
+        state.sortedInfo.columnKey === "created_by" && state.sortedInfo.order,
+      render: (text, record) => record.created_by,
+    },
     // {
     //   title: "Pay",
     //   dataIndex: "pay",
@@ -326,7 +337,12 @@ export function TimeTicketList({
             (techConsole ? null : (
               <TimeTicketEnterButton
                 actions={{ refetch }}
-                context={{ jobId: jobId }}
+                context={{
+                  jobId: jobId,
+                  created_by: currentUser.displayName
+                    ? currentUser.email.concat(" | ", currentUser.displayName)
+                    : currentUser.email,
+                }}
                 disabled={disabled}
               >
                 {t("timetickets.actions.enter")}

client/src/components/time-ticket-modal/time-ticket-modal.container.jsx

@@ -1,5 +1,5 @@
 import { useMutation, useQuery } from "@apollo/client";
-import { Button, Form, Modal, notification, PageHeader, Space } from "antd";
+import { Button, Form, Modal, PageHeader, Space, notification } from "antd";
 import moment from "moment";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -83,6 +83,7 @@ export function TimeTicketModalContainer({
                     )[0].rate
                   : null,
               bodyshopid: bodyshop.id,
+              created_by: timeTicketModal.context.created_by,
             },
           ],
         },

client/src/components/time-ticket-shift-form/time-ticket-shift-form.container.jsx

@@ -65,6 +65,21 @@ export function TimeTicektShiftContainer({
               clockon: theTime,
               date: theTime,
               memo: values.memo,
+              created_by: isTechConsole
+                ? currentUser.email.concat(
+                    " | ",
+                    technician.employee_number
+                      .concat(
+                        " ",
+                        technician.first_name,
+                        " ",
+                        technician.last_name
+                      )
+                      .trim()
+                  )
+                : currentUser.displayName
+                ? currentUser.email.concat(" | ", currentUser.displayName)
+                : currentUser.email,
             },
           ],
         },