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

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")}