Merged in release/2023-08-11 (pull request #931)

Release/2023 08 11

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";
@@ -252,7 +252,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,21 +1,25 @@
 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";
 
 const mapStateToProps = createStructuredSelector({
   technician: selectTechnician,
   bodyshop: selectBodyshop,
+  currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
   setTimeTicketContext: (context) =>
@@ -25,6 +29,7 @@ export function TechClockInContainer({
   setTimeTicketContext,
   technician,
   bodyshop,
+  currentUser,
 }) {
   console.log(
     "🚀 ~ file: tech-job-clock-in-form.container.jsx:29 ~ technician:",
@@ -66,6 +71,12 @@ export function TechClockInContainer({
                       values.cost_center
                     );
                   }),
+            created_by: currentUser.email.concat(
+              " | ",
+              technician.employee_number
+                .concat(" ", technician.first_name, " ", technician.last_name)
+                .trim()
+            ),
           },
         ],
       },
@@ -100,6 +111,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

@@ -9,9 +9,10 @@ import { createStructuredSelector } from "reselect";
 import {
   selectAuthLevel,
   selectBodyshop,
+  selectCurrentUser,
 } from "../../redux/user/user.selectors";
-import { onlyUnique } from "../../utils/arrayHelper";
 import { DateFormatter, DateTimeFormatter } from "../../utils/DateFormatter";
+import { onlyUnique } from "../../utils/arrayHelper";
 import { alphaSort, dateSort } from "../../utils/sorters";
 import RbacWrapper, {
   HasRbacAccess,
@@ -20,6 +21,7 @@ import TimeTicketEnterButton from "../time-ticket-enter-button/time-ticket-enter
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   authLevel: selectAuthLevel,
+  currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
@@ -29,6 +31,7 @@ export default connect(mapStateToProps, mapDispatchToProps)(TimeTicketList);
 export function TimeTicketList({
   bodyshop,
   authLevel,
+  currentUser,
   disabled,
   loading,
   timetickets,
@@ -193,7 +196,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: t("general.labels.actions"),
       dataIndex: "actions",
@@ -254,7 +265,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";
@@ -77,6 +77,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,
             },
           ],
         },

client/src/graphql/jobs-lines.queries.js

@@ -57,6 +57,7 @@ export const GET_LINE_TICKET_BY_PK = gql`
       actualhrs
       ciecacode
       cost_center
+      created_by
       date
       id
       jobid

client/src/graphql/timetickets.queries.js

@@ -37,6 +37,7 @@ export const QUERY_TIME_TICKETS_IN_RANGE = gql`
       clockon
       cost_center
       created_at
+      created_by
       date
       id
       rate
@@ -80,6 +81,7 @@ export const QUERY_TIME_TICKETS_TECHNICIAN_IN_RANGE = gql`
       clockon
       cost_center
       created_at
+      created_by
       date
       id
       rate
@@ -112,6 +114,7 @@ export const QUERY_TIME_TICKETS_TECHNICIAN_IN_RANGE = gql`
       clockon
       cost_center
       created_at
+      created_by
       date
       id
       rate
@@ -151,6 +154,7 @@ export const QUERY_TIME_TICKETS_IN_RANGE_SB = gql`
       clockon
       cost_center
       created_at
+      created_by
       date
       id
       rate
@@ -181,6 +185,7 @@ export const QUERY_TIME_TICKETS_IN_RANGE_SB = gql`
       clockon
       cost_center
       created_at
+      created_by
       date
       id
       rate
@@ -210,6 +215,7 @@ export const INSERT_NEW_TIME_TICKET = gql`
     insert_timetickets(objects: $timeTicketInput) {
       returning {
         id
+        created_by
         clockon
         clockoff
         employeeid

client/src/translations/en_us/common.json

@@ -2730,6 +2730,7 @@
 				"clockon": "Clocked In",
 				"committed": "",
 				"cost_center": "Cost Center",
+				"created_by": "Created By",
 				"date": "Ticket Date",
 				"efficiency": "Efficiency",
 				"employee": "Employee",

client/src/translations/es/common.json

@@ -2730,6 +2730,7 @@
 				"clockon": "",
 				"committed": "",
 				"cost_center": "",
+				"created_by": "",
 				"date": "",
 				"efficiency": "",
 				"employee": "",

client/src/translations/fr/common.json

@@ -2730,6 +2730,7 @@
 				"clockon": "",
 				"committed": "",
 				"cost_center": "",
+				"created_by": "",
 				"date": "",
 				"efficiency": "",
 				"employee": "",

client/src/utils/TemplateConstants.js

@@ -1040,7 +1040,7 @@ export const TemplateList = (type, context) => {
             disabled: false,
             rangeFilter: {
               object: i18n.t("reportcenter.labels.objects.jobs"),
-              field: i18n.t("jobs.fields.date_open"),
+              field: i18n.t("jobs.fields.date_invoiced"),
             },
             group: "jobs",
           },

hasura/metadata/tables.yaml

@@ -4649,6 +4649,7 @@
                         _eq: X-Hasura-User-Id
                   - active:
                       _eq: true
+        allow_aggregations: true
   update_permissions:
     - role: user
       permission:
@@ -4726,6 +4727,7 @@
                           _eq: X-Hasura-User-Id
                     - active:
                         _eq: true
+        allow_aggregations: true
   update_permissions:
     - role: user
       permission:
@@ -5554,6 +5556,7 @@
           - committed_at
           - cost_center
           - created_at
+          - created_by
           - date
           - employeeid
           - flat_rate
@@ -5578,6 +5581,7 @@
           - committed_at
           - cost_center
           - created_at
+          - created_by
           - date
           - employeeid
           - flat_rate
@@ -5611,6 +5615,7 @@
           - committed_at
           - cost_center
           - created_at
+          - created_by
           - date
           - employeeid
           - flat_rate

hasura/migrations/1691177401095_create_index_parts_dispatch_employeeid/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."parts_dispatch_employeeid";

hasura/migrations/1691177401095_create_index_parts_dispatch_employeeid/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "parts_dispatch_employeeid" on
+  "public"."parts_dispatch" using btree ("employeeid");

hasura/migrations/1691177452060_create_index_parts_dispatch_dispatchid/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."parts_dispatch_dispatchid";

hasura/migrations/1691177452060_create_index_parts_dispatch_dispatchid/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "parts_dispatch_dispatchid" on
+  "public"."parts_dispatch_lines" using btree ("partsdispatchid");

hasura/migrations/1691177467690_create_index_parts_dispatch_line_accepted_at/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."parts_dispatch_line_accepted_at";

hasura/migrations/1691177467690_create_index_parts_dispatch_line_accepted_at/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "parts_dispatch_line_accepted_at" on
+  "public"."parts_dispatch_lines" using btree ("accepted_at");

hasura/migrations/1691614820968_alter_table_public_timetickets_add_column_created_by/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."timetickets" add column "created_by" text
+--  null;

hasura/migrations/1691614820968_alter_table_public_timetickets_add_column_created_by/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."timetickets" add column "created_by" text
+ null;

server/graphql-client/queries.js

@@ -620,6 +620,7 @@ exports.QUERY_EMPLOYEE_PIN = `query QUERY_EMPLOYEE_PIN($shopId: uuid!, $employee
     employee_number
     id
     pin
+    active
   }
 }`;
 

server/tech/tech.js

@@ -23,7 +23,7 @@ exports.techLogin = async (req, res) => {
     let technician;
     if (result.employees && result.employees[0]) {
       const dbRecord = result.employees[0];
-      if (dbRecord.pin === pin) {
+      if (dbRecord.pin === pin && dbRecord.active === true) {
         valid = true;
         delete dbRecord.pin;
         technician = dbRecord;