From 6a8b59c7e66fb17fa5bcb54160ae9e8380fa6210 Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Thu, 16 Jul 2020 10:17:23 -0700
Subject: [PATCH] Added shift clock framework + login on tech console BOD-97
 BOD-188

---
 bodyshop_translations.babel                   | 170 +++++++++++++++++-
 client/src/App/App.styles.scss                |   3 +-
 .../shop-employees-form.component.jsx         |   3 +
 .../shop-employees.container.jsx              |  50 +++---
 .../tech-job-clock-in-form.container.jsx      |  46 +++--
 .../tech-job-clock-out-button.component.jsx   |  97 +++++-----
 .../tech-job-clock-out-delete.component.jsx   |   9 +-
 .../tech-job-clocked-in-list.component.jsx    |   6 +-
 .../tech-sider/tech-sider.component.jsx       |  33 ++--
 .../time-ticket-modal.component.jsx           |  42 ++---
 .../time-ticket-modal.container.jsx           |  30 ++--
 .../time-ticket-shift-active.component.jsx    |  50 ++++++
 .../time-ticket-shift-form.component.jsx      |  53 ++++++
 .../time-ticket-shift-form.container.jsx      |  90 ++++++++++
 .../time-ticket-shift.container.jsx           |  57 ++++++
 client/src/graphql/bodyshop.queries.js        |   3 +
 client/src/graphql/employees.queries.jsx      |   2 +
 client/src/graphql/timetickets.queries.js     |  33 ++++
 .../tech-shift-clock.component.jsx            |  10 ++
 client/src/pages/tech/tech.page.component.jsx |  23 ++-
 client/src/redux/tech/tech.reducer.js         |   1 +
 client/src/translations/en_us/common.json     |  12 +-
 client/src/translations/es/common.json        |  12 +-
 client/src/translations/fr/common.json        |  12 +-
 .../down.yaml                                 |   5 +
 .../up.yaml                                   |   5 +
 .../down.yaml                                 |   5 +
 .../up.yaml                                   |  10 ++
 .../down.yaml                                 |  12 ++
 .../up.yaml                                   |  10 ++
 .../down.yaml                                 |   6 +
 .../up.yaml                                   |  13 ++
 .../down.yaml                                 |   6 +
 .../up.yaml                                   |   8 +
 .../down.yaml                                 |  38 ++++
 .../up.yaml                                   |  39 ++++
 .../down.yaml                                 |  39 ++++
 .../up.yaml                                   |  40 +++++
 .../down.yaml                                 |  38 ++++
 .../up.yaml                                   |  39 ++++
 .../down.yaml                                 |  38 ++++
 .../up.yaml                                   |  29 +++
 .../down.yaml                                 |   5 +
 .../up.yaml                                   |   5 +
 .../down.yaml                                 |   5 +
 .../up.yaml                                   |  10 ++
 .../down.yaml                                 |  12 ++
 .../up.yaml                                   |  20 +++
 .../down.yaml                                 |  29 +++
 .../up.yaml                                   |  37 ++++
 .../down.yaml                                 |  39 ++++
 .../up.yaml                                   |  39 ++++
 .../down.yaml                                 |  37 ++++
 .../up.yaml                                   |  38 ++++
 .../down.yaml                                 |  38 ++++
 .../up.yaml                                   |  38 ++++
 .../down.yaml                                 |  23 +++
 .../up.yaml                                   |  22 +++
 .../down.yaml                                 |   5 +
 .../up.yaml                                   |   5 +
 .../down.yaml                                 |  38 ++++
 .../up.yaml                                   |  39 ++++
 .../down.yaml                                 |  39 ++++
 .../up.yaml                                   |  40 +++++
 .../down.yaml                                 |  38 ++++
 .../up.yaml                                   |  39 ++++
 hasura/migrations/metadata.yaml               | 141 +++++++++------
 67 files changed, 1791 insertions(+), 217 deletions(-)
 create mode 100644 client/src/components/time-ticket-shift-active/time-ticket-shift-active.component.jsx
 create mode 100644 client/src/components/time-ticket-shift-form/time-ticket-shift-form.component.jsx
 create mode 100644 client/src/components/time-ticket-shift-form/time-ticket-shift-form.container.jsx
 create mode 100644 client/src/components/time-ticket-shift/time-ticket-shift.container.jsx
 create mode 100644 client/src/pages/tech-shift-clock/tech-shift-clock.component.jsx
 create mode 100644 hasura/migrations/1594851818607_alter_table_public_employees_add_column_user_email/down.yaml
 create mode 100644 hasura/migrations/1594851818607_alter_table_public_employees_add_column_user_email/up.yaml
 create mode 100644 hasura/migrations/1594851844985_set_fk_public_employees_user_email/down.yaml
 create mode 100644 hasura/migrations/1594851844985_set_fk_public_employees_user_email/up.yaml
 create mode 100644 hasura/migrations/1594851857360_set_fk_public_employees_user_email/down.yaml
 create mode 100644 hasura/migrations/1594851857360_set_fk_public_employees_user_email/up.yaml
 create mode 100644 hasura/migrations/1594851876967_add_relationship_employee_table_public_undefined/down.yaml
 create mode 100644 hasura/migrations/1594851876967_add_relationship_employee_table_public_undefined/up.yaml
 create mode 100644 hasura/migrations/1594851879473_add_relationship_user_table_public_undefined/down.yaml
 create mode 100644 hasura/migrations/1594851879473_add_relationship_user_table_public_undefined/up.yaml
 create mode 100644 hasura/migrations/1594852259471_update_permission_user_public_table_employees/down.yaml
 create mode 100644 hasura/migrations/1594852259471_update_permission_user_public_table_employees/up.yaml
 create mode 100644 hasura/migrations/1594852265828_update_permission_user_public_table_employees/down.yaml
 create mode 100644 hasura/migrations/1594852265828_update_permission_user_public_table_employees/up.yaml
 create mode 100644 hasura/migrations/1594852271012_update_permission_user_public_table_employees/down.yaml
 create mode 100644 hasura/migrations/1594852271012_update_permission_user_public_table_employees/up.yaml
 create mode 100644 hasura/migrations/1594915350729_update_permission_user_public_table_timetickets/down.yaml
 create mode 100644 hasura/migrations/1594915350729_update_permission_user_public_table_timetickets/up.yaml
 create mode 100644 hasura/migrations/1594915426388_alter_table_public_timetickets_add_column_bodyshopid/down.yaml
 create mode 100644 hasura/migrations/1594915426388_alter_table_public_timetickets_add_column_bodyshopid/up.yaml
 create mode 100644 hasura/migrations/1594915475076_set_fk_public_timetickets_bodyshopid/down.yaml
 create mode 100644 hasura/migrations/1594915475076_set_fk_public_timetickets_bodyshopid/up.yaml
 create mode 100644 hasura/migrations/1594915490297_track_all_relationships/down.yaml
 create mode 100644 hasura/migrations/1594915490297_track_all_relationships/up.yaml
 create mode 100644 hasura/migrations/1594915535846_update_permission_user_public_table_timetickets/down.yaml
 create mode 100644 hasura/migrations/1594915535846_update_permission_user_public_table_timetickets/up.yaml
 create mode 100644 hasura/migrations/1594915560544_update_permission_user_public_table_timetickets/down.yaml
 create mode 100644 hasura/migrations/1594915560544_update_permission_user_public_table_timetickets/up.yaml
 create mode 100644 hasura/migrations/1594915572129_update_permission_user_public_table_timetickets/down.yaml
 create mode 100644 hasura/migrations/1594915572129_update_permission_user_public_table_timetickets/up.yaml
 create mode 100644 hasura/migrations/1594915585321_update_permission_user_public_table_timetickets/down.yaml
 create mode 100644 hasura/migrations/1594915585321_update_permission_user_public_table_timetickets/up.yaml
 create mode 100644 hasura/migrations/1594915594328_update_permission_user_public_table_timetickets/down.yaml
 create mode 100644 hasura/migrations/1594915594328_update_permission_user_public_table_timetickets/up.yaml
 create mode 100644 hasura/migrations/1594918801030_alter_table_public_timetickets_add_column_memo/down.yaml
 create mode 100644 hasura/migrations/1594918801030_alter_table_public_timetickets_add_column_memo/up.yaml
 create mode 100644 hasura/migrations/1594918812708_update_permission_user_public_table_timetickets/down.yaml
 create mode 100644 hasura/migrations/1594918812708_update_permission_user_public_table_timetickets/up.yaml
 create mode 100644 hasura/migrations/1594918823530_update_permission_user_public_table_timetickets/down.yaml
 create mode 100644 hasura/migrations/1594918823530_update_permission_user_public_table_timetickets/up.yaml
 create mode 100644 hasura/migrations/1594918834840_update_permission_user_public_table_timetickets/down.yaml
 create mode 100644 hasura/migrations/1594918834840_update_permission_user_public_table_timetickets/up.yaml

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 62caf001f..e0869b086 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project version="1.2" be_version="2.6.1">
+<babeledit_project be_version="2.6.1" version="1.2">
     <!--
 
     BabelEdit project file
@@ -17556,6 +17556,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>memo</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>productivehrs</name>
                                         <definition_loaded>false</definition_loaded>
@@ -17624,6 +17645,48 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>ambreak</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>amshift</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>clockintojob</name>
                                         <definition_loaded>false</definition_loaded>
@@ -17708,6 +17771,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>lunch</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>new</name>
                                         <definition_loaded>false</definition_loaded>
@@ -17729,6 +17813,90 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>pmbreak</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>pmshift</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>shift</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>shiftalreadyclockedon</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>straight_time</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/App/App.styles.scss b/client/src/App/App.styles.scss
index 79abc2ba1..f3f6f2a5c 100644
--- a/client/src/App/App.styles.scss
+++ b/client/src/App/App.styles.scss
@@ -55,7 +55,8 @@
 }
 
 ::-webkit-scrollbar {
-  width: .25rem;
+  width: 0.25rem;
+  max-height: 0.25rem;
   background-color: #f5f5f5;
 }
 
diff --git a/client/src/components/shop-employees/shop-employees-form.component.jsx b/client/src/components/shop-employees/shop-employees-form.component.jsx
index 58178ccac..b8a202e10 100644
--- a/client/src/components/shop-employees/shop-employees-form.component.jsx
+++ b/client/src/components/shop-employees/shop-employees-form.component.jsx
@@ -155,6 +155,9 @@ export function ShopEmployeesFormComponent({
         ]}>
         <InputNumber />
       </Form.Item>
+      <Form.Item label={t("employees.fields.user_email")} name='user_email'>
+        <Input />
+      </Form.Item>
     </Form>
   );
 }
diff --git a/client/src/components/shop-employees/shop-employees.container.jsx b/client/src/components/shop-employees/shop-employees.container.jsx
index dca8d6900..33803ecb2 100644
--- a/client/src/components/shop-employees/shop-employees.container.jsx
+++ b/client/src/components/shop-employees/shop-employees.container.jsx
@@ -8,14 +8,14 @@ import {
   DELETE_EMPLOYEE,
   INSERT_EMPLOYEES,
   QUERY_EMPLOYEES,
-  UPDATE_EMPLOYEE
+  UPDATE_EMPLOYEE,
 } from "../../graphql/employees.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
 import ShopEmployeeComponent from "./shop-employees.component";
 
 const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
+  bodyshop: selectBodyshop,
 });
 
 function ShopEmployeesContainer({ bodyshop }) {
@@ -23,69 +23,75 @@ function ShopEmployeesContainer({ bodyshop }) {
   const { t } = useTranslation();
   const employeeState = useState(null);
   const { loading, error, data, refetch } = useQuery(QUERY_EMPLOYEES, {
-    fetchPolicy: "network-only"
+    fetchPolicy: "network-only",
   });
 
   const [updateEmployee] = useMutation(UPDATE_EMPLOYEE);
   const [insertEmployees] = useMutation(INSERT_EMPLOYEES);
   const [deleteEmployee] = useMutation(DELETE_EMPLOYEE);
-  const handleDelete = id => {
+  const handleDelete = (id) => {
     deleteEmployee({ variables: { id: id } })
-      .then(r => {
+      .then((r) => {
         notification["success"]({
-          message: t("employees.successes.delete")
+          message: t("employees.successes.delete"),
         });
         //TODO Better way to reset the field decorators?
         employeeState[1](null);
-        refetch().then(r => form.resetFields());
+        refetch().then((r) => form.resetFields());
       })
-      .catch(error => {
+      .catch((error) => {
         notification["error"]({
-          message: t("employees.errors.delete")
+          message: t("employees.errors.delete", {
+            message: JSON.stringify(error),
+          }),
         });
       });
   };
 
-  const handleFinish = values => {
+  const handleFinish = (values) => {
     console.log("values", values);
     if (employeeState[0].id) {
       //Update a record.
       updateEmployee({
-        variables: { id: employeeState[0].id, employee: values }
+        variables: { id: employeeState[0].id, employee: values },
       })
-        .then(r => {
+        .then((r) => {
           notification["success"]({
-            message: t("employees.successes.save")
+            message: t("employees.successes.save"),
           });
           //TODO Better way to reset the field decorators?
           employeeState[1](null);
-          refetch().then(r => form.resetFields());
+          refetch().then((r) => form.resetFields());
         })
-        .catch(error => {
+        .catch((error) => {
           notification["error"]({
-            message: t("employees.errors.save")
+            message: t("employees.errors.save", {
+              message: JSON.stringify(error),
+            }),
           });
         });
     } else {
       //New record, insert it.
       insertEmployees({
-        variables: { employees: [{ ...values, shopid: bodyshop.id }] }
-      }).then(r => {
+        variables: { employees: [{ ...values, shopid: bodyshop.id }] },
+      }).then((r) => {
         notification["success"]({
-          message: t("employees.successes.save")
+          message: t("employees.successes.save"),
         });
         //TODO Better way to reset the field decorators?
         employeeState[1](null);
-        refetch().catch(error => {
+        refetch().catch((error) => {
           notification["error"]({
-            message: t("employees.errors.save")
+            message: t("employees.errors.save", {
+              message: JSON.stringify(error),
+            }),
           });
         });
       });
     }
   };
 
-  if (error) return <AlertComponent message={error.message} type="error" />;
+  if (error) return <AlertComponent message={error.message} type='error' />;
 
   return (
     <ShopEmployeeComponent
diff --git a/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.container.jsx b/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.container.jsx
index 67685a07e..f884766f7 100644
--- a/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.container.jsx
+++ b/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.container.jsx
@@ -1,5 +1,6 @@
-import { Button, Form, notification, Card } from "antd";
-import React from "react";
+import { Button, Card, Form, notification } from "antd";
+import axios from "axios";
+import React, { useState } from "react";
 import { useMutation } from "react-apollo";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -16,29 +17,35 @@ const mapStateToProps = createStructuredSelector({
 
 export function TechClockInContainer({ technician, bodyshop }) {
   const [form] = Form.useForm();
+  const [loading, setLoading] = useState(false);
   const [insertTimeTicket] = useMutation(INSERT_NEW_TIME_TICKET, {
     refetchQueries: ["QUERY_ACTIVE_TIME_TICKETS"],
   });
   const { t } = useTranslation();
 
   const handleFinish = async (values) => {
+    setLoading(true);
+    const theTime = (await axios.post("/utils/time")).data;
     const result = await insertTimeTicket({
       variables: {
-        timeTicketInput: {
-          employeeid: technician.id,
-          date: new Date(),
-          clockon: new Date(),
-          jobid: values.jobid,
-          cost_center: technician.cost_center,
-          ciecacode: Object.keys(
-            bodyshop.md_responsibility_centers.defaults.costs
-          ).find((key) => {
-            return (
-              bodyshop.md_responsibility_centers.defaults.costs[key] ===
-              values.cost_center
-            );
-          }),
-        },
+        timeTicketInput: [
+          {
+            bodyshopid: bodyshop.id,
+            employeeid: technician.id,
+            date: theTime,
+            clockon: theTime,
+            jobid: values.jobid,
+            cost_center: technician.cost_center,
+            ciecacode: Object.keys(
+              bodyshop.md_responsibility_centers.defaults.costs
+            ).find((key) => {
+              return (
+                bodyshop.md_responsibility_centers.defaults.costs[key] ===
+                values.cost_center
+              );
+            }),
+          },
+        ],
       },
     });
 
@@ -53,13 +60,14 @@ export function TechClockInContainer({ technician, bodyshop }) {
         message: t("timetickets.successes.clockedin"),
       });
     }
+    setLoading(false);
   };
 
   return (
     <div>
       <Card title={t("timetickets.labels.clockintojob")}>
-        <Form form={form} layout="vertical" onFinish={handleFinish}>
-          <Button type="primary" htmlType="submit">
+        <Form form={form} layout='vertical' onFinish={handleFinish}>
+          <Button type='primary' htmlType='submit' loading={loading}>
             {t("timetickets.actions.clockin")}
           </Button>
           <TechClockInComponent form={form} />
diff --git a/client/src/components/tech-job-clock-out-button/tech-job-clock-out-button.component.jsx b/client/src/components/tech-job-clock-out-button/tech-job-clock-out-button.component.jsx
index 4b5a94b40..26a6a5959 100644
--- a/client/src/components/tech-job-clock-out-button/tech-job-clock-out-button.component.jsx
+++ b/client/src/components/tech-job-clock-out-button/tech-job-clock-out-button.component.jsx
@@ -11,7 +11,7 @@ import {
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { UPDATE_TIME_TICKET } from "../../graphql/timetickets.queries";
-
+import axios from "axios";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
@@ -27,6 +27,7 @@ export function TechClockOffButton({
   technician,
   timeTicketId,
   completedCallback,
+  isShiftTicket,
   otherBtnProps,
 }) {
   const [loading, setLoading] = useState(false);
@@ -40,7 +41,10 @@ export function TechClockOffButton({
     const result = await updateTimeticket({
       variables: {
         timeticketId: timeTicketId,
-        timeticket: { clockoff: new Date(), ...values },
+        timeticket: {
+          clockoff: (await axios.post("/utils/time")).data,
+          ...values,
+        },
       },
     });
 
@@ -64,65 +68,76 @@ export function TechClockOffButton({
       <div>
         <Form
           form={form}
-          layout="vertical"
+          layout='vertical'
           onFinish={handleFinish}
           initialValues={{
-            cost_center: technician ? technician.cost_center : null,
-          }}
-        >
+            cost_center: isShiftTicket
+              ? "timetickets.labels.shift"
+              : technician
+              ? technician.cost_center
+              : null,
+          }}>
+          {!isShiftTicket ? (
+            <div>
+              <Form.Item
+                label={t("timetickets.fields.actualhrs")}
+                name='actualhrs'
+                rules={[
+                  {
+                    required: true,
+                    message: t("general.validation.required"),
+                  },
+                ]}>
+                <InputNumber precision={1} />
+              </Form.Item>
+              <Form.Item
+                label={t("timetickets.fields.productivehrs")}
+                name='productivehrs'
+                rules={[
+                  {
+                    required: true,
+                    message: t("general.validation.required"),
+                  },
+                ]}>
+                <InputNumber precision={1} />
+              </Form.Item>
+            </div>
+          ) : null}
+
           <Form.Item
-            label={t("timetickets.fields.actualhrs")}
-            name="actualhrs"
-            rules={[
-              {
-                required: true,
-                message: t("general.validation.required"),
-              },
-            ]}
-          >
-            <InputNumber precision={1} />
-          </Form.Item>
-          <Form.Item
-            label={t("timetickets.fields.productivehrs")}
-            name="productivehrs"
-            rules={[
-              {
-                required: true,
-                message: t("general.validation.required"),
-              },
-            ]}
-          >
-            <InputNumber precision={1} />
-          </Form.Item>
-          <Form.Item
-            name="cost_center"
+            name='cost_center'
             label={t("timetickets.fields.cost_center")}
             rules={[
               {
                 required: true,
                 message: t("general.validation.required"),
               },
-            ]}
-          >
-            <Select>
-              {bodyshop.md_responsibility_centers.costs.map((i, idx) => (
-                <Select.Option key={idx} value={i.name}>
-                  {i.name}
+            ]}>
+            <Select disabled={isShiftTicket}>
+              {isShiftTicket ? (
+                <Select.Option value='timetickets.labels.shift'>
+                  {t("timetickets.labels.shift")}
                 </Select.Option>
-              ))}
+              ) : (
+                bodyshop.md_responsibility_centers.costs.map((i, idx) => (
+                  <Select.Option key={idx} value={i.name}>
+                    {i.name}
+                  </Select.Option>
+                ))
+              )}
             </Select>
           </Form.Item>
-          <Button type="primary" htmlType="submit">
+          <Button type='primary' htmlType='submit' loading={loading}>
             {t("general.actions.save")}
           </Button>
-          <TechJobClockoutDelete timeTicketId={timeTicketId} />
+          <TechJobClockoutDelete completedCallback={completedCallback} timeTicketId={timeTicketId} />
         </Form>
       </div>
     </Card>
   );
 
   return (
-    <Popover content={overlay} trigger="click">
+    <Popover content={overlay} trigger='click'>
       <Button loading={loading} {...otherBtnProps}>
         {t("timetickets.actions.clockout")}
       </Button>
diff --git a/client/src/components/tech-job-clock-out-delete/tech-job-clock-out-delete.component.jsx b/client/src/components/tech-job-clock-out-delete/tech-job-clock-out-delete.component.jsx
index e4febc563..2375f51a0 100644
--- a/client/src/components/tech-job-clock-out-delete/tech-job-clock-out-delete.component.jsx
+++ b/client/src/components/tech-job-clock-out-delete/tech-job-clock-out-delete.component.jsx
@@ -5,7 +5,10 @@ import { DELETE_TIME_TICKET } from "../../graphql/timetickets.queries";
 import { useTranslation } from "react-i18next";
 import { useMutation } from "@apollo/react-hooks";
 
-export default function TechJobClockoutDelete({ timeTicketId }) {
+export default function TechJobClockoutDelete({
+  timeTicketId,
+  completedCallback,
+}) {
   const [deleteTimeTicket] = useMutation(DELETE_TIME_TICKET);
   const { t } = useTranslation();
   const handleDelete = async () => {
@@ -25,6 +28,7 @@ export default function TechJobClockoutDelete({ timeTicketId }) {
         message: t("timetickets.successes.deleted"),
       });
     }
+    if (completedCallback) completedCallback();
   };
 
   return (
@@ -32,8 +36,7 @@ export default function TechJobClockoutDelete({ timeTicketId }) {
       title={t("timetickets.labels.deleteconfirm")}
       okButtonProps={{ type: "danger" }}
       okText={t("general.actions.delete")}
-      onConfirm={handleDelete}
-    >
+      onConfirm={handleDelete}>
       <DeleteFilled style={{ margin: "1rem", color: "red" }} />
     </Popconfirm>
   );
diff --git a/client/src/components/tech-job-clocked-in-list/tech-job-clocked-in-list.component.jsx b/client/src/components/tech-job-clocked-in-list/tech-job-clocked-in-list.component.jsx
index bda243583..cebf320d4 100644
--- a/client/src/components/tech-job-clocked-in-list/tech-job-clocked-in-list.component.jsx
+++ b/client/src/components/tech-job-clocked-in-list/tech-job-clocked-in-list.component.jsx
@@ -2,17 +2,17 @@ import { Card, List, Typography } from "antd";
 import React from "react";
 import { useQuery } from "react-apollo";
 import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
 import { Link } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
 import { QUERY_ACTIVE_TIME_TICKETS } from "../../graphql/timetickets.queries";
+import { selectTechnician } from "../../redux/tech/tech.selectors";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
 import AlertComponent from "../alert/alert.component";
 import DataLabel from "../data-label/data-label.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import TechClockOffButton from "../tech-job-clock-out-button/tech-job-clock-out-button.component";
-import { selectTechnician } from "../../redux/tech/tech.selectors";
 
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
 const mapStateToProps = createStructuredSelector({
   technician: selectTechnician,
 });
diff --git a/client/src/components/tech-sider/tech-sider.component.jsx b/client/src/components/tech-sider/tech-sider.component.jsx
index 248ee927a..00816f035 100644
--- a/client/src/components/tech-sider/tech-sider.component.jsx
+++ b/client/src/components/tech-sider/tech-sider.component.jsx
@@ -2,6 +2,7 @@ import Icon, { SearchOutlined } from "@ant-design/icons";
 import { Layout, Menu } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
+import { FaBusinessTime } from "react-icons/fa";
 import { FiLogIn, FiLogOut } from "react-icons/fi";
 import { MdTimer } from "react-icons/md";
 import { connect } from "react-redux";
@@ -9,6 +10,7 @@ import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { techLogout } from "../../redux/tech/tech.actions";
 import { selectTechnician } from "../../redux/tech/tech.selectors";
+
 const { Sider } = Layout;
 
 const mapStateToProps = createStructuredSelector({
@@ -27,36 +29,39 @@ export function TechSider({ technician, techLogout }) {
 
   return (
     <Sider collapsible collapsed={collapsed} onCollapse={onCollapse}>
-      <Menu theme="dark" defaultSelectedKeys={["1"]} mode="inline">
+      <Menu theme='dark' defaultSelectedKeys={["1"]} mode='inline'>
         <Menu.Item
-          key="1"
+          key='1'
           disabled={!!technician}
-          icon={<Icon component={FiLogIn} />}
-        >
+          icon={<Icon component={FiLogIn} />}>
           <Link to={`/tech/login`}>{t("menus.tech.login")}</Link>
         </Menu.Item>
-        <Menu.Item key="2" disabled={!!!technician} icon={<SearchOutlined />}>
+        <Menu.Item key='2' disabled={!!!technician} icon={<SearchOutlined />}>
           <Link to={`/tech/joblookup`}>{t("menus.tech.joblookup")}</Link>
         </Menu.Item>
         <Menu.Item
-          key="3"
+          key='3'
           disabled={!!!technician}
-          icon={<Icon component={MdTimer} />}
-        >
-          <Link to={`/tech/jobclockin`}>{t("menus.tech.jobclockin")}</Link>
+          icon={<Icon component={FaBusinessTime} />}>
+          <Link to={`/tech/jobclock`}>{t("menus.tech.jobclockin")}</Link>
         </Menu.Item>
-        <Menu.Item key="5" disabled={!!!technician} icon={<SearchOutlined />}>
+        <Menu.Item
+          key='4'
+          disabled={!!!technician}
+          icon={<Icon component={MdTimer} />}>
+          <Link to={`/tech/shiftclock`}>{t("menus.tech.shiftclockin")}</Link>
+        </Menu.Item>
+        <Menu.Item key='5' disabled={!!!technician} icon={<SearchOutlined />}>
           <Link to={`/tech/list`}>{t("menus.tech.productionlist")}</Link>
         </Menu.Item>
-        <Menu.Item key="6" disabled={!!!technician} icon={<SearchOutlined />}>
+        <Menu.Item key='6' disabled={!!!technician} icon={<SearchOutlined />}>
           <Link to={`/tech/board`}> {t("menus.tech.productionboard")}</Link>
         </Menu.Item>
         <Menu.Item
-          key="7"
+          key='7'
           disabled={!!!technician}
           onClick={() => techLogout()}
-          icon={<Icon component={FiLogOut} />}
-        >
+          icon={<Icon component={FiLogOut} />}>
           {t("menus.tech.logout")}
         </Menu.Item>
       </Menu>
diff --git a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
index 443b01705..8d4b5dc48 100644
--- a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
+++ b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
@@ -19,15 +19,14 @@ export default function TimeTicketModalComponent({
     <div>
       <div style={{ display: "flex" }}>
         <Form.Item
-          name="jobid"
+          name='jobid'
           label={t("timetickets.fields.ro_number")}
           rules={[
             {
               required: true,
               message: t("general.validation.required"),
             },
-          ]}
-        >
+          ]}>
           <JobSearchSelect
             options={roAutoCompleteOptions}
             onBlur={() => {
@@ -40,15 +39,14 @@ export default function TimeTicketModalComponent({
           />
         </Form.Item>
         <Form.Item
-          name="employeeid"
+          name='employeeid'
           label={t("timetickets.fields.employee")}
           rules={[
             {
               required: true,
               message: t("general.validation.required"),
             },
-          ]}
-        >
+          ]}>
           <EmployeeSearchSelect options={employeeAutoCompleteOptions} />
         </Form.Item>
       </div>
@@ -56,71 +54,65 @@ export default function TimeTicketModalComponent({
       <div style={{ display: "flex" }}>
         <Form.Item
           label={t("timetickets.fields.date")}
-          name="date"
+          name='date'
           rules={[
             {
               required: true,
               message: t("general.validation.required"),
             },
-          ]}
-        >
+          ]}>
           <DatePicker />
         </Form.Item>
         <Form.Item
           label={t("timetickets.fields.productivehrs")}
-          name="productivehrs"
+          name='productivehrs'
           rules={[
             {
               required: true,
               message: t("general.validation.required"),
             },
-          ]}
-        >
-          <InputNumber />
+          ]}>
+          <InputNumber min={0} precision={1} />
         </Form.Item>
         <Form.Item
           label={t("timetickets.fields.actualhrs")}
-          name="actualhrs"
+          name='actualhrs'
           rules={[
             {
               required: true,
               message: t("general.validation.required"),
             },
-          ]}
-        >
-          <InputNumber />
+          ]}>
+          <InputNumber min={0} precision={1} />
         </Form.Item>
         <Form.Item
-          name="cost_center"
+          name='cost_center'
           label={t("timetickets.fields.cost_center")}
           rules={[
             {
               required: true,
               message: t("general.validation.required"),
             },
-          ]}
-        >
+          ]}>
           <Select
             style={{ width: "150px" }}
             onChange={() => {
               console.log("Changed.");
-            }}
-          >
+            }}>
             {responsibilityCenters.costs.map((item) => (
               <Select.Option key={item.name}>{item.name}</Select.Option>
             ))}
           </Select>
         </Form.Item>
         <Form.Item
-          name="ciecacode"
+          name='ciecacode'
           label={t("timetickets.fields.ciecacode")}
           rules={[
             {
               required: true,
               message: t("general.validation.required"),
             },
-          ]}
-        >
+          ]}>
           <Input disabled />
         </Form.Item>
       </div>
diff --git a/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx b/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx
index c433838e7..db5ea8a59 100644
--- a/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx
+++ b/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx
@@ -59,7 +59,7 @@ export function TimeTicketModalContainer({
     } else {
       insertTicket({
         variables: {
-          timeTicketInput: [values],
+          timeTicketInput: [{ ...values, bodyshop: bodyshop.id }],
         },
       })
         .then(handleMutationSuccess)
@@ -108,22 +108,21 @@ export function TimeTicketModalContainer({
       );
       form.setFieldsValue({
         cost_center: emps.length > 0 ? emps[0].cost_center : "",
-        ciecacode: Object.keys(
-          bodyshop.md_responsibility_centers.defaults
-        ).find(
-          (key) =>
-            bodyshop.md_responsibility_centers.defaults[key] ===
-            emps[0].cost_center
-        ),
+        ciecacode:
+          Object.keys(bodyshop.md_responsibility_centers.defaults.costs).find(
+            (key) =>
+              bodyshop.md_responsibility_centers.defaults.costs[key] ===
+              emps[0].cost_center
+          ) || "LAB",
       });
     }
     if (!!changedFields.cost_center && !!EmployeeAutoCompleteData) {
       form.setFieldsValue({
         ciecacode: Object.keys(
-          bodyshop.md_responsibility_centers.defaults
+          bodyshop.md_responsibility_centers.defaults.costs
         ).find(
           (key) =>
-            bodyshop.md_responsibility_centers.defaults[key] ===
+            bodyshop.md_responsibility_centers.defaults.costs[key] ===
             changedFields.cost_center
         ),
       });
@@ -152,18 +151,16 @@ export function TimeTicketModalContainer({
           </Button>
           {timeTicketModal.context && timeTicketModal.context.id ? null : (
             <Button
-              type="primary"
+              type='primary'
               onClick={() => {
                 setEnterAgain(true);
-              }}
-            >
+              }}>
               {t("general.actions.saveandnew")}
             </Button>
           )}
         </span>
       }
-      destroyOnClose
-    >
+      destroyOnClose>
       <Form
         onFinish={handleFinish}
         autoComplete={"off"}
@@ -178,8 +175,7 @@ export function TimeTicketModalContainer({
               }
             : { jobid: timeTicketModal.context.jobId || null }
         }
-        onValuesChange={handleFieldsChange}
-      >
+        onValuesChange={handleFieldsChange}>
         <TimeTicketModalComponent
           form={form}
           roAutoCompleteOptions={RoAutoCompleteData && RoAutoCompleteData.jobs}
diff --git a/client/src/components/time-ticket-shift-active/time-ticket-shift-active.component.jsx b/client/src/components/time-ticket-shift-active/time-ticket-shift-active.component.jsx
new file mode 100644
index 000000000..b24576518
--- /dev/null
+++ b/client/src/components/time-ticket-shift-active/time-ticket-shift-active.component.jsx
@@ -0,0 +1,50 @@
+import { Card, List, Typography } from "antd";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { DateTimeFormatter } from "../../utils/DateFormatter";
+import DataLabel from "../data-label/data-label.component";
+import TechClockOffButton from "../tech-job-clock-out-button/tech-job-clock-out-button.component";
+
+export default function TimeTicketShiftActive({ timetickets, refetch }) {
+  const { t } = useTranslation();
+
+  return (
+    <div>
+      {timetickets.length > 0 ? (
+        <div>
+          <Typography.Title level={2}>
+            {t("timetickets.labels.shiftalreadyclockedon")}
+          </Typography.Title>
+          <List
+            grid={{
+              gutter: 32,
+              xs: 1,
+              sm: 2,
+              md: 3,
+              lg: 4,
+              xl: 5,
+              xxl: 6,
+            }}
+            dataSource={timetickets || []}
+            renderItem={(ticket) => (
+              <List.Item>
+                <Card
+                  title={t(ticket.memo)}
+                  actions={[
+                    <TechClockOffButton
+                      timeTicketId={ticket.id}
+                      completedCallback={refetch}
+                      isShiftTicket
+                    />,
+                  ]}>
+                  <DataLabel label={t("timetickets.fields.clockon")}>
+                    <DateTimeFormatter>{ticket.clockon}</DateTimeFormatter>
+                  </DataLabel>
+                </Card>
+              </List.Item>
+            )}></List>
+        </div>
+      ) : null}
+    </div>
+  );
+}
diff --git a/client/src/components/time-ticket-shift-form/time-ticket-shift-form.component.jsx b/client/src/components/time-ticket-shift-form/time-ticket-shift-form.component.jsx
new file mode 100644
index 000000000..ee07db801
--- /dev/null
+++ b/client/src/components/time-ticket-shift-form/time-ticket-shift-form.component.jsx
@@ -0,0 +1,53 @@
+import { Form, InputNumber, Select } from "antd";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+
+export function TimeTicketShiftFormComponent({ bodyshop, form }) {
+  const { t } = useTranslation();
+  return (
+    <div>
+      <Form.Item
+        name='memo'
+        label={t("timetickets.fields.memo")}
+        rules={[
+          {
+            required: true,
+            message: t("general.validation.required"),
+          },
+        ]}>
+        <Select>
+          <Select.Option value='timetickets.labels.amshift'>
+            {t("timetickets.labels.amshift")}
+          </Select.Option>
+          <Select.Option value='timetickets.labels.ambreak'>
+            {t("timetickets.labels.ambreak")}
+          </Select.Option>
+          <Select.Option value='timetickets.labels.lunch'>
+            {t("timetickets.labels.lunch")}
+          </Select.Option>
+          <Select.Option value='timetickets.labels.pmshift'>
+            {t("timetickets.labels.pmshift")}
+          </Select.Option>
+          <Select.Option value='timetickets.labels.pmbreak'>
+            {t("timetickets.labels.pmbreak")}
+          </Select.Option>
+        </Select>
+      </Form.Item>
+    </div>
+  );
+}
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(TimeTicketShiftFormComponent);
diff --git a/client/src/components/time-ticket-shift-form/time-ticket-shift-form.container.jsx b/client/src/components/time-ticket-shift-form/time-ticket-shift-form.container.jsx
new file mode 100644
index 000000000..aefcb7136
--- /dev/null
+++ b/client/src/components/time-ticket-shift-form/time-ticket-shift-form.container.jsx
@@ -0,0 +1,90 @@
+import { useMutation } from "@apollo/react-hooks";
+import { Button, Form, notification } from "antd";
+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 TimeTicektShiftComponent from "./time-ticket-shift-form.component";
+import axios from "axios";
+import moment from "moment";
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop,
+  technician: selectTechnician,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+
+export function TimeTicektShiftContainer({
+  bodyshop,
+  technician,
+  isTechConsole,
+}) {
+  const [form] = Form.useForm();
+  const [insertTimeTicket] = useMutation(INSERT_NEW_TIME_TICKET);
+  const { t } = useTranslation();
+  const [loading, setLoading] = useState(false);
+
+  const handleFinish = async (values) => {
+    setLoading(true);
+    console.log(values);
+    const theTime = moment((await axios.post("/utils/time")).data);
+
+    const result = await insertTimeTicket({
+      variables: {
+        timeTicketInput: [
+          {
+            bodyshopid: bodyshop.id,
+            employeeid: isTechConsole
+              ? technician.id
+              : bodyshop.associations[0].user.employee.id,
+            cost_center: "timetickets.labels.shift",
+            clockon: theTime,
+            date: theTime,
+            memo: values.memo,
+          },
+        ],
+      },
+      awaitRefetchQueries: true,
+      refetchQueries: ["QUERY_ACTIVE_SHIFT_TIME_TICKETS"],
+    });
+
+    if (!!result.errors) {
+      notification["error"]({
+        message: t("timetickets.errors.clockingin", {
+          message: JSON.stringify(result.errors),
+        }),
+      });
+    } else {
+      notification["success"]({
+        message: t("timetickets.successes.clockedin"),
+      });
+    }
+    setLoading(false);
+  };
+
+  return (
+    <div>
+      The form TimeTicektShiftContainer
+      <Form
+        form={form}
+        layout='vertical'
+        autoComplete='no'
+        onFinish={handleFinish}
+        initialValues={{ cost_center: t("timetickets.labels.shift") }}>
+        <TimeTicektShiftComponent form={form} />
+        <Button htmlType='submit' loading={loading}>
+          {t("timetickets.actions.clockin")}
+        </Button>
+      </Form>
+    </div>
+  );
+}
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(TimeTicektShiftContainer);
diff --git a/client/src/components/time-ticket-shift/time-ticket-shift.container.jsx b/client/src/components/time-ticket-shift/time-ticket-shift.container.jsx
new file mode 100644
index 000000000..5ff67d8d8
--- /dev/null
+++ b/client/src/components/time-ticket-shift/time-ticket-shift.container.jsx
@@ -0,0 +1,57 @@
+import React from "react";
+import { useQuery } from "react-apollo";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { QUERY_ACTIVE_SHIFT_TIME_TICKETS } from "../../graphql/timetickets.queries";
+import { selectTechnician } from "../../redux/tech/tech.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import AlertComponent from "../alert/alert.component";
+import LoadingSpinner from "../loading-spinner/loading-spinner.component";
+import TimeTicketShiftActive from "../time-ticket-shift-active/time-ticket-shift-active.component";
+import TimeTicketShiftFormContainer from "../time-ticket-shift-form/time-ticket-shift-form.container";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+  technician: selectTechnician,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+
+export function TimeTicketShiftContainer({
+  bodyshop,
+  technician,
+  isTechConsole,
+}) {
+  const { loading, error, data, refetch } = useQuery(
+    QUERY_ACTIVE_SHIFT_TIME_TICKETS,
+    {
+      variables: {
+        employeeId: isTechConsole
+          ? technician.id
+          : bodyshop.associations[0].user.employee.id,
+      },
+    }
+  );
+
+  if (loading) return <LoadingSpinner />;
+  if (error) return <AlertComponent message={error.message} type='error' />;
+
+  return (
+    <div>
+      {data.timetickets.length > 0 ? (
+        <TimeTicketShiftActive
+          timetickets={data ? data.timetickets : []}
+          refetch={refetch}
+        />
+      ) : (
+        <TimeTicketShiftFormContainer isTechConsole={isTechConsole} />
+      )}
+    </div>
+  );
+}
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(TimeTicketShiftContainer);
diff --git a/client/src/graphql/bodyshop.queries.js b/client/src/graphql/bodyshop.queries.js
index 3762e0cb1..11252e7a6 100644
--- a/client/src/graphql/bodyshop.queries.js
+++ b/client/src/graphql/bodyshop.queries.js
@@ -8,6 +8,9 @@ export const QUERY_BODYSHOP = gql`
           authid
           email
           dashboardlayout
+          employee {
+            id
+          }
         }
       }
       address1
diff --git a/client/src/graphql/employees.queries.jsx b/client/src/graphql/employees.queries.jsx
index 6dd015e57..cd9aebbdc 100644
--- a/client/src/graphql/employees.queries.jsx
+++ b/client/src/graphql/employees.queries.jsx
@@ -14,6 +14,7 @@ export const QUERY_EMPLOYEES = gql`
       cost_center
       base_rate
       pin
+      user_email
     }
   }
 `;
@@ -43,6 +44,7 @@ export const UPDATE_EMPLOYEE = gql`
         cost_center
         base_rate
         pin
+        user_email
       }
     }
   }
diff --git a/client/src/graphql/timetickets.queries.js b/client/src/graphql/timetickets.queries.js
index 090044ec0..793a6df1e 100644
--- a/client/src/graphql/timetickets.queries.js
+++ b/client/src/graphql/timetickets.queries.js
@@ -72,11 +72,13 @@ export const QUERY_ACTIVE_TIME_TICKETS = gql`
           clockoff: { _is_null: true }
           employeeid: { _eq: $employeeId }
           clockon: { _is_null: false }
+          jobid: {_is_null: false}
         }
       }
     ) {
       id
       clockon
+      memo
       job {
         id
         est_number
@@ -91,6 +93,37 @@ export const QUERY_ACTIVE_TIME_TICKETS = gql`
     }
   }
 `;
+
+export const QUERY_ACTIVE_SHIFT_TIME_TICKETS = gql`
+  query QUERY_ACTIVE_SHIFT_TIME_TICKETS($employeeId: uuid) {
+    timetickets(
+      where: {
+        _and: {
+          clockoff: { _is_null: true }
+          employeeid: { _eq: $employeeId }
+          clockon: { _is_null: false }
+          jobid: {_is_null: true}
+        }
+      }
+    ) {
+      id
+      clockon
+      memo
+      job {
+        id
+        est_number
+        ownr_fn
+        ownr_ln
+        ownr_co_nm
+        v_model_desc
+        v_make_desc
+        v_model_yr
+        ro_number
+      }
+    }
+  }
+`;
+
 export const DELETE_TIME_TICKET = gql`
   mutation DELETE_TIME_TICKET($id: uuid!) {
     delete_timetickets_by_pk(id: $id) {
diff --git a/client/src/pages/tech-shift-clock/tech-shift-clock.component.jsx b/client/src/pages/tech-shift-clock/tech-shift-clock.component.jsx
new file mode 100644
index 000000000..52e0e99c7
--- /dev/null
+++ b/client/src/pages/tech-shift-clock/tech-shift-clock.component.jsx
@@ -0,0 +1,10 @@
+import React from "react";
+import TimeTicketShift from "../../components/time-ticket-shift/time-ticket-shift.container";
+
+export default function TechShiftClock() {
+  return (
+    <div>
+      <TimeTicketShift isTechConsole />
+    </div>
+  );
+}
diff --git a/client/src/pages/tech/tech.page.component.jsx b/client/src/pages/tech/tech.page.component.jsx
index 5af9d75e5..95c5c8138 100644
--- a/client/src/pages/tech/tech.page.component.jsx
+++ b/client/src/pages/tech/tech.page.component.jsx
@@ -27,9 +27,12 @@ const ProductionListPage = lazy(() =>
 const ProductionBoardPage = lazy(() =>
   import("../production-board/production-board.container")
 );
-const TechJobClockIn = lazy(() =>
+const TechJobClock = lazy(() =>
   import("../tech-job-clock/tech-job-clock.component")
 );
+const TechShiftClock = lazy(() =>
+  import("../tech-shift-clock/tech-shift-clock.component")
+);
 
 const { Content } = Layout;
 
@@ -48,19 +51,18 @@ export function TechPage({ technician, match }) {
   }, [t]);
 
   return (
-    <Layout className="tech-layout-container">
+    <Layout className='tech-layout-container'>
       <TechSider />
       <Layout>
         {technician ? null : <Redirect to={`${match.path}/login`} />}
         <TechHeader />
-        <Content className="tech-content-container">
+        <Content className='tech-content-container'>
           <FcmNotification />
           <ErrorBoundary>
             <Suspense
               fallback={
                 <LoadingSpinner message={t("general.labels.loadingapp")} />
-              }
-            >
+              }>
               <TimeTicketModalContainer />
               <PrintCenterModalContainer />
               <Switch>
@@ -78,11 +80,16 @@ export function TechPage({ technician, match }) {
                   exact
                   path={`${match.path}/list`}
                   component={ProductionListPage}
-                />{" "}
+                />
                 <Route
                   exact
-                  path={`${match.path}/jobclockin`}
-                  component={TechJobClockIn}
+                  path={`${match.path}/jobclock`}
+                  component={TechJobClock}
+                />
+                <Route
+                  exact
+                  path={`${match.path}/shiftclock`}
+                  component={TechShiftClock}
                 />
                 <Route
                   exact
diff --git a/client/src/redux/tech/tech.reducer.js b/client/src/redux/tech/tech.reducer.js
index d8c7793e9..3a2429299 100644
--- a/client/src/redux/tech/tech.reducer.js
+++ b/client/src/redux/tech/tech.reducer.js
@@ -27,6 +27,7 @@ const applicationReducer = (state = INITIAL_STATE, action) => {
         ...state,
         technician: action.payload,
         loginLoading: false,
+        loginError: false,
       };
     case TechActionTypes.TECH_LOGIN_FAILURE:
       return {
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index ff3a17583..b5f8fbfab 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -351,8 +351,8 @@
 				"new": "New Employee"
 			},
 			"errors": {
-				"delete": "Error encountered while deleting employee.",
-				"save": "Error encountered saving employee.",
+				"delete": "Error encountered while deleting employee. {{message}}",
+				"save": "Error encountered saving employee. {{message}}",
 				"validation": "Please check all fields.",
 				"validationtitle": "Unable to save employee."
 			},
@@ -1117,16 +1117,24 @@
 				"cost_center": "Cost Center",
 				"date": "Ticket Date",
 				"employee": "Employee",
+				"memo": "Memo",
 				"productivehrs": "Productive Hours",
 				"ro_number": "Job to Post Against"
 			},
 			"labels": {
 				"alreadyclockedon": "You are already clocked in to the following job(s):",
+				"ambreak": "AM Break",
+				"amshift": "AM Shift",
 				"clockintojob": "Clock In to Job",
 				"deleteconfirm": "Are you sure you want to delete this time ticket? This cannot be undone.",
 				"edit": "Edit Time Ticket",
 				"flat_rate": "Flat Rate",
+				"lunch": "Lunch",
 				"new": "New Time Ticket",
+				"pmbreak": "PM Break",
+				"pmshift": "PM Shift",
+				"shift": "Shift",
+				"shiftalreadyclockedon": "Active Shift Time Tickets",
 				"straight_time": "Straight Time"
 			},
 			"successes": {
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 456039d95..95f340af6 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -351,8 +351,8 @@
 				"new": "Nuevo empleado"
 			},
 			"errors": {
-				"delete": "Se encontró un error al eliminar al empleado.",
-				"save": "Se encontró un error al salvar al empleado.",
+				"delete": "Se encontró un error al eliminar al empleado. {{message}}",
+				"save": "Se encontró un error al salvar al empleado. {{message}}",
 				"validation": "Por favor verifique todos los campos.",
 				"validationtitle": "No se puede salvar al empleado."
 			},
@@ -1117,16 +1117,24 @@
 				"cost_center": "",
 				"date": "",
 				"employee": "",
+				"memo": "",
 				"productivehrs": "",
 				"ro_number": ""
 			},
 			"labels": {
 				"alreadyclockedon": "",
+				"ambreak": "",
+				"amshift": "",
 				"clockintojob": "",
 				"deleteconfirm": "",
 				"edit": "",
 				"flat_rate": "",
+				"lunch": "",
 				"new": "",
+				"pmbreak": "",
+				"pmshift": "",
+				"shift": "",
+				"shiftalreadyclockedon": "",
 				"straight_time": ""
 			},
 			"successes": {
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 7914a9984..894073f9d 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -351,8 +351,8 @@
 				"new": "Nouvel employé"
 			},
 			"errors": {
-				"delete": "Erreur rencontrée lors de la suppression de l'employé.",
-				"save": "Une erreur s'est produite lors de l'enregistrement de l'employé.",
+				"delete": "Erreur rencontrée lors de la suppression de l'employé. {{message}}",
+				"save": "Une erreur s'est produite lors de l'enregistrement de l'employé. {{message}}",
 				"validation": "Veuillez cocher tous les champs.",
 				"validationtitle": "Impossible d'enregistrer l'employé."
 			},
@@ -1117,16 +1117,24 @@
 				"cost_center": "",
 				"date": "",
 				"employee": "",
+				"memo": "",
 				"productivehrs": "",
 				"ro_number": ""
 			},
 			"labels": {
 				"alreadyclockedon": "",
+				"ambreak": "",
+				"amshift": "",
 				"clockintojob": "",
 				"deleteconfirm": "",
 				"edit": "",
 				"flat_rate": "",
+				"lunch": "",
 				"new": "",
+				"pmbreak": "",
+				"pmshift": "",
+				"shift": "",
+				"shiftalreadyclockedon": "",
 				"straight_time": ""
 			},
 			"successes": {
diff --git a/hasura/migrations/1594851818607_alter_table_public_employees_add_column_user_email/down.yaml b/hasura/migrations/1594851818607_alter_table_public_employees_add_column_user_email/down.yaml
new file mode 100644
index 000000000..1dc83f416
--- /dev/null
+++ b/hasura/migrations/1594851818607_alter_table_public_employees_add_column_user_email/down.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."employees" DROP COLUMN "user_email";
+  type: run_sql
diff --git a/hasura/migrations/1594851818607_alter_table_public_employees_add_column_user_email/up.yaml b/hasura/migrations/1594851818607_alter_table_public_employees_add_column_user_email/up.yaml
new file mode 100644
index 000000000..6726affb4
--- /dev/null
+++ b/hasura/migrations/1594851818607_alter_table_public_employees_add_column_user_email/up.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."employees" ADD COLUMN "user_email" text NULL UNIQUE;
+  type: run_sql
diff --git a/hasura/migrations/1594851844985_set_fk_public_employees_user_email/down.yaml b/hasura/migrations/1594851844985_set_fk_public_employees_user_email/down.yaml
new file mode 100644
index 000000000..48005327a
--- /dev/null
+++ b/hasura/migrations/1594851844985_set_fk_public_employees_user_email/down.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: alter table "public"."employees" drop constraint "employees_user_email_fkey";
+  type: run_sql
diff --git a/hasura/migrations/1594851844985_set_fk_public_employees_user_email/up.yaml b/hasura/migrations/1594851844985_set_fk_public_employees_user_email/up.yaml
new file mode 100644
index 000000000..576e41aee
--- /dev/null
+++ b/hasura/migrations/1594851844985_set_fk_public_employees_user_email/up.yaml
@@ -0,0 +1,10 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: |-
+      alter table "public"."employees"
+                 add constraint "employees_user_email_fkey"
+                 foreign key ("user_email")
+                 references "public"."users"
+                 ("email") on update restrict on delete restrict;
+  type: run_sql
diff --git a/hasura/migrations/1594851857360_set_fk_public_employees_user_email/down.yaml b/hasura/migrations/1594851857360_set_fk_public_employees_user_email/down.yaml
new file mode 100644
index 000000000..c6cbe2afe
--- /dev/null
+++ b/hasura/migrations/1594851857360_set_fk_public_employees_user_email/down.yaml
@@ -0,0 +1,12 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: |-
+      alter table "public"."employees" drop constraint "employees_user_email_fkey",
+                add constraint "employees_user_email_fkey"
+                foreign key ("shopid")
+                references "public"."bodyshops"
+                ("id")
+                on update cascade
+                on delete cascade;
+  type: run_sql
diff --git a/hasura/migrations/1594851857360_set_fk_public_employees_user_email/up.yaml b/hasura/migrations/1594851857360_set_fk_public_employees_user_email/up.yaml
new file mode 100644
index 000000000..1eb438597
--- /dev/null
+++ b/hasura/migrations/1594851857360_set_fk_public_employees_user_email/up.yaml
@@ -0,0 +1,10 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: |-
+      alter table "public"."employees" drop constraint "employees_user_email_fkey",
+                   add constraint "employees_user_email_fkey"
+                   foreign key ("user_email")
+                   references "public"."users"
+                   ("email") on update set null on delete set null;
+  type: run_sql
diff --git a/hasura/migrations/1594851876967_add_relationship_employee_table_public_undefined/down.yaml b/hasura/migrations/1594851876967_add_relationship_employee_table_public_undefined/down.yaml
new file mode 100644
index 000000000..20b527075
--- /dev/null
+++ b/hasura/migrations/1594851876967_add_relationship_employee_table_public_undefined/down.yaml
@@ -0,0 +1,6 @@
+- args:
+    relationship: employee
+    table:
+      name: users
+      schema: public
+  type: drop_relationship
diff --git a/hasura/migrations/1594851876967_add_relationship_employee_table_public_undefined/up.yaml b/hasura/migrations/1594851876967_add_relationship_employee_table_public_undefined/up.yaml
new file mode 100644
index 000000000..8bfb787a2
--- /dev/null
+++ b/hasura/migrations/1594851876967_add_relationship_employee_table_public_undefined/up.yaml
@@ -0,0 +1,13 @@
+- args:
+    name: employee
+    table:
+      name: users
+      schema: public
+    using:
+      manual_configuration:
+        column_mapping:
+          email: user_email
+        remote_table:
+          name: employees
+          schema: public
+  type: create_object_relationship
diff --git a/hasura/migrations/1594851879473_add_relationship_user_table_public_undefined/down.yaml b/hasura/migrations/1594851879473_add_relationship_user_table_public_undefined/down.yaml
new file mode 100644
index 000000000..494b1abba
--- /dev/null
+++ b/hasura/migrations/1594851879473_add_relationship_user_table_public_undefined/down.yaml
@@ -0,0 +1,6 @@
+- args:
+    relationship: user
+    table:
+      name: employees
+      schema: public
+  type: drop_relationship
diff --git a/hasura/migrations/1594851879473_add_relationship_user_table_public_undefined/up.yaml b/hasura/migrations/1594851879473_add_relationship_user_table_public_undefined/up.yaml
new file mode 100644
index 000000000..fb48d7ff9
--- /dev/null
+++ b/hasura/migrations/1594851879473_add_relationship_user_table_public_undefined/up.yaml
@@ -0,0 +1,8 @@
+- args:
+    name: user
+    table:
+      name: employees
+      schema: public
+    using:
+      foreign_key_constraint_on: user_email
+  type: create_object_relationship
diff --git a/hasura/migrations/1594852259471_update_permission_user_public_table_employees/down.yaml b/hasura/migrations/1594852259471_update_permission_user_public_table_employees/down.yaml
new file mode 100644
index 000000000..87a93588c
--- /dev/null
+++ b/hasura/migrations/1594852259471_update_permission_user_public_table_employees/down.yaml
@@ -0,0 +1,38 @@
+- args:
+    role: user
+    table:
+      name: employees
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      columns:
+      - active
+      - base_rate
+      - cost_center
+      - created_at
+      - employee_number
+      - first_name
+      - flat_rate
+      - hire_date
+      - id
+      - last_name
+      - pin
+      - shopid
+      - termination_date
+      - updated_at
+      set: {}
+    role: user
+    table:
+      name: employees
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1594852259471_update_permission_user_public_table_employees/up.yaml b/hasura/migrations/1594852259471_update_permission_user_public_table_employees/up.yaml
new file mode 100644
index 000000000..71581edc3
--- /dev/null
+++ b/hasura/migrations/1594852259471_update_permission_user_public_table_employees/up.yaml
@@ -0,0 +1,39 @@
+- args:
+    role: user
+    table:
+      name: employees
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      columns:
+      - active
+      - base_rate
+      - cost_center
+      - created_at
+      - employee_number
+      - first_name
+      - flat_rate
+      - hire_date
+      - id
+      - last_name
+      - pin
+      - shopid
+      - termination_date
+      - updated_at
+      - user_email
+      set: {}
+    role: user
+    table:
+      name: employees
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1594852265828_update_permission_user_public_table_employees/down.yaml b/hasura/migrations/1594852265828_update_permission_user_public_table_employees/down.yaml
new file mode 100644
index 000000000..3c4900c14
--- /dev/null
+++ b/hasura/migrations/1594852265828_update_permission_user_public_table_employees/down.yaml
@@ -0,0 +1,39 @@
+- args:
+    role: user
+    table:
+      name: employees
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - active
+      - base_rate
+      - cost_center
+      - created_at
+      - employee_number
+      - first_name
+      - flat_rate
+      - hire_date
+      - id
+      - last_name
+      - pin
+      - shopid
+      - termination_date
+      - updated_at
+      computed_fields: []
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+    role: user
+    table:
+      name: employees
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1594852265828_update_permission_user_public_table_employees/up.yaml b/hasura/migrations/1594852265828_update_permission_user_public_table_employees/up.yaml
new file mode 100644
index 000000000..8655d5eaf
--- /dev/null
+++ b/hasura/migrations/1594852265828_update_permission_user_public_table_employees/up.yaml
@@ -0,0 +1,40 @@
+- args:
+    role: user
+    table:
+      name: employees
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - active
+      - base_rate
+      - cost_center
+      - created_at
+      - employee_number
+      - first_name
+      - flat_rate
+      - hire_date
+      - id
+      - last_name
+      - pin
+      - shopid
+      - termination_date
+      - updated_at
+      - user_email
+      computed_fields: []
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+    role: user
+    table:
+      name: employees
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1594852271012_update_permission_user_public_table_employees/down.yaml b/hasura/migrations/1594852271012_update_permission_user_public_table_employees/down.yaml
new file mode 100644
index 000000000..cd16e8032
--- /dev/null
+++ b/hasura/migrations/1594852271012_update_permission_user_public_table_employees/down.yaml
@@ -0,0 +1,38 @@
+- args:
+    role: user
+    table:
+      name: employees
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - active
+      - base_rate
+      - cost_center
+      - created_at
+      - employee_number
+      - first_name
+      - flat_rate
+      - hire_date
+      - id
+      - last_name
+      - pin
+      - shopid
+      - termination_date
+      - updated_at
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      set: {}
+    role: user
+    table:
+      name: employees
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1594852271012_update_permission_user_public_table_employees/up.yaml b/hasura/migrations/1594852271012_update_permission_user_public_table_employees/up.yaml
new file mode 100644
index 000000000..e0859b31d
--- /dev/null
+++ b/hasura/migrations/1594852271012_update_permission_user_public_table_employees/up.yaml
@@ -0,0 +1,39 @@
+- args:
+    role: user
+    table:
+      name: employees
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - active
+      - base_rate
+      - cost_center
+      - created_at
+      - employee_number
+      - first_name
+      - flat_rate
+      - hire_date
+      - id
+      - last_name
+      - pin
+      - shopid
+      - termination_date
+      - updated_at
+      - user_email
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      set: {}
+    role: user
+    table:
+      name: employees
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1594915350729_update_permission_user_public_table_timetickets/down.yaml b/hasura/migrations/1594915350729_update_permission_user_public_table_timetickets/down.yaml
new file mode 100644
index 000000000..bc6e43c69
--- /dev/null
+++ b/hasura/migrations/1594915350729_update_permission_user_public_table_timetickets/down.yaml
@@ -0,0 +1,38 @@
+- args:
+    role: user
+    table:
+      name: timetickets
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+      columns:
+      - id
+      - created_at
+      - updated_at
+      - date
+      - cost_center
+      - employeeid
+      - jobid
+      - rate
+      - productivehrs
+      - actualhrs
+      - clockon
+      - clockoff
+      - ciecacode
+      set: {}
+    role: user
+    table:
+      name: timetickets
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1594915350729_update_permission_user_public_table_timetickets/up.yaml b/hasura/migrations/1594915350729_update_permission_user_public_table_timetickets/up.yaml
new file mode 100644
index 000000000..240ecfad3
--- /dev/null
+++ b/hasura/migrations/1594915350729_update_permission_user_public_table_timetickets/up.yaml
@@ -0,0 +1,29 @@
+- args:
+    role: user
+    table:
+      name: timetickets
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check: {}
+      columns:
+      - id
+      - created_at
+      - updated_at
+      - date
+      - cost_center
+      - employeeid
+      - jobid
+      - rate
+      - productivehrs
+      - actualhrs
+      - clockon
+      - clockoff
+      - ciecacode
+      set: {}
+    role: user
+    table:
+      name: timetickets
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1594915426388_alter_table_public_timetickets_add_column_bodyshopid/down.yaml b/hasura/migrations/1594915426388_alter_table_public_timetickets_add_column_bodyshopid/down.yaml
new file mode 100644
index 000000000..96c564400
--- /dev/null
+++ b/hasura/migrations/1594915426388_alter_table_public_timetickets_add_column_bodyshopid/down.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."timetickets" DROP COLUMN "bodyshopid";
+  type: run_sql
diff --git a/hasura/migrations/1594915426388_alter_table_public_timetickets_add_column_bodyshopid/up.yaml b/hasura/migrations/1594915426388_alter_table_public_timetickets_add_column_bodyshopid/up.yaml
new file mode 100644
index 000000000..ee1d6c0ee
--- /dev/null
+++ b/hasura/migrations/1594915426388_alter_table_public_timetickets_add_column_bodyshopid/up.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."timetickets" ADD COLUMN "bodyshopid" uuid NOT NULL;
+  type: run_sql
diff --git a/hasura/migrations/1594915475076_set_fk_public_timetickets_bodyshopid/down.yaml b/hasura/migrations/1594915475076_set_fk_public_timetickets_bodyshopid/down.yaml
new file mode 100644
index 000000000..0d7986c4a
--- /dev/null
+++ b/hasura/migrations/1594915475076_set_fk_public_timetickets_bodyshopid/down.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: alter table "public"."timetickets" drop constraint "timetickets_bodyshopid_fkey";
+  type: run_sql
diff --git a/hasura/migrations/1594915475076_set_fk_public_timetickets_bodyshopid/up.yaml b/hasura/migrations/1594915475076_set_fk_public_timetickets_bodyshopid/up.yaml
new file mode 100644
index 000000000..6c8c4e6af
--- /dev/null
+++ b/hasura/migrations/1594915475076_set_fk_public_timetickets_bodyshopid/up.yaml
@@ -0,0 +1,10 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: |-
+      alter table "public"."timetickets"
+                 add constraint "timetickets_bodyshopid_fkey"
+                 foreign key ("bodyshopid")
+                 references "public"."bodyshops"
+                 ("id") on update restrict on delete restrict;
+  type: run_sql
diff --git a/hasura/migrations/1594915490297_track_all_relationships/down.yaml b/hasura/migrations/1594915490297_track_all_relationships/down.yaml
new file mode 100644
index 000000000..497f44e49
--- /dev/null
+++ b/hasura/migrations/1594915490297_track_all_relationships/down.yaml
@@ -0,0 +1,12 @@
+- args:
+    relationship: timetickets
+    table:
+      name: bodyshops
+      schema: public
+  type: drop_relationship
+- args:
+    relationship: bodyshop
+    table:
+      name: timetickets
+      schema: public
+  type: drop_relationship
diff --git a/hasura/migrations/1594915490297_track_all_relationships/up.yaml b/hasura/migrations/1594915490297_track_all_relationships/up.yaml
new file mode 100644
index 000000000..5f3da62f5
--- /dev/null
+++ b/hasura/migrations/1594915490297_track_all_relationships/up.yaml
@@ -0,0 +1,20 @@
+- args:
+    name: timetickets
+    table:
+      name: bodyshops
+      schema: public
+    using:
+      foreign_key_constraint_on:
+        column: bodyshopid
+        table:
+          name: timetickets
+          schema: public
+  type: create_array_relationship
+- args:
+    name: bodyshop
+    table:
+      name: timetickets
+      schema: public
+    using:
+      foreign_key_constraint_on: bodyshopid
+  type: create_object_relationship
diff --git a/hasura/migrations/1594915535846_update_permission_user_public_table_timetickets/down.yaml b/hasura/migrations/1594915535846_update_permission_user_public_table_timetickets/down.yaml
new file mode 100644
index 000000000..240ecfad3
--- /dev/null
+++ b/hasura/migrations/1594915535846_update_permission_user_public_table_timetickets/down.yaml
@@ -0,0 +1,29 @@
+- args:
+    role: user
+    table:
+      name: timetickets
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check: {}
+      columns:
+      - id
+      - created_at
+      - updated_at
+      - date
+      - cost_center
+      - employeeid
+      - jobid
+      - rate
+      - productivehrs
+      - actualhrs
+      - clockon
+      - clockoff
+      - ciecacode
+      set: {}
+    role: user
+    table:
+      name: timetickets
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1594915535846_update_permission_user_public_table_timetickets/up.yaml b/hasura/migrations/1594915535846_update_permission_user_public_table_timetickets/up.yaml
new file mode 100644
index 000000000..4602bb169
--- /dev/null
+++ b/hasura/migrations/1594915535846_update_permission_user_public_table_timetickets/up.yaml
@@ -0,0 +1,37 @@
+- args:
+    role: user
+    table:
+      name: timetickets
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      columns:
+      - id
+      - created_at
+      - updated_at
+      - date
+      - cost_center
+      - employeeid
+      - jobid
+      - rate
+      - productivehrs
+      - actualhrs
+      - clockon
+      - clockoff
+      - ciecacode
+      set: {}
+    role: user
+    table:
+      name: timetickets
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1594915560544_update_permission_user_public_table_timetickets/down.yaml b/hasura/migrations/1594915560544_update_permission_user_public_table_timetickets/down.yaml
new file mode 100644
index 000000000..2385c1c75
--- /dev/null
+++ b/hasura/migrations/1594915560544_update_permission_user_public_table_timetickets/down.yaml
@@ -0,0 +1,39 @@
+- args:
+    role: user
+    table:
+      name: timetickets
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - date
+      - actualhrs
+      - productivehrs
+      - rate
+      - ciecacode
+      - cost_center
+      - clockoff
+      - clockon
+      - created_at
+      - updated_at
+      - employeeid
+      - id
+      - jobid
+      computed_fields: []
+      filter:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+    role: user
+    table:
+      name: timetickets
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1594915560544_update_permission_user_public_table_timetickets/up.yaml b/hasura/migrations/1594915560544_update_permission_user_public_table_timetickets/up.yaml
new file mode 100644
index 000000000..578083106
--- /dev/null
+++ b/hasura/migrations/1594915560544_update_permission_user_public_table_timetickets/up.yaml
@@ -0,0 +1,39 @@
+- args:
+    role: user
+    table:
+      name: timetickets
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - actualhrs
+      - bodyshopid
+      - ciecacode
+      - clockoff
+      - clockon
+      - cost_center
+      - created_at
+      - date
+      - employeeid
+      - id
+      - jobid
+      - productivehrs
+      - rate
+      - updated_at
+      computed_fields: []
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+    role: user
+    table:
+      name: timetickets
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1594915572129_update_permission_user_public_table_timetickets/down.yaml b/hasura/migrations/1594915572129_update_permission_user_public_table_timetickets/down.yaml
new file mode 100644
index 000000000..4602bb169
--- /dev/null
+++ b/hasura/migrations/1594915572129_update_permission_user_public_table_timetickets/down.yaml
@@ -0,0 +1,37 @@
+- args:
+    role: user
+    table:
+      name: timetickets
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      columns:
+      - id
+      - created_at
+      - updated_at
+      - date
+      - cost_center
+      - employeeid
+      - jobid
+      - rate
+      - productivehrs
+      - actualhrs
+      - clockon
+      - clockoff
+      - ciecacode
+      set: {}
+    role: user
+    table:
+      name: timetickets
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1594915572129_update_permission_user_public_table_timetickets/up.yaml b/hasura/migrations/1594915572129_update_permission_user_public_table_timetickets/up.yaml
new file mode 100644
index 000000000..c1deea7fc
--- /dev/null
+++ b/hasura/migrations/1594915572129_update_permission_user_public_table_timetickets/up.yaml
@@ -0,0 +1,38 @@
+- args:
+    role: user
+    table:
+      name: timetickets
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      columns:
+      - actualhrs
+      - bodyshopid
+      - ciecacode
+      - clockoff
+      - clockon
+      - cost_center
+      - created_at
+      - date
+      - employeeid
+      - id
+      - jobid
+      - productivehrs
+      - rate
+      - updated_at
+      set: {}
+    role: user
+    table:
+      name: timetickets
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1594915585321_update_permission_user_public_table_timetickets/down.yaml b/hasura/migrations/1594915585321_update_permission_user_public_table_timetickets/down.yaml
new file mode 100644
index 000000000..87f016c2f
--- /dev/null
+++ b/hasura/migrations/1594915585321_update_permission_user_public_table_timetickets/down.yaml
@@ -0,0 +1,38 @@
+- args:
+    role: user
+    table:
+      name: timetickets
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - date
+      - actualhrs
+      - productivehrs
+      - rate
+      - ciecacode
+      - cost_center
+      - clockoff
+      - clockon
+      - created_at
+      - updated_at
+      - employeeid
+      - id
+      - jobid
+      filter:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+      set: {}
+    role: user
+    table:
+      name: timetickets
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1594915585321_update_permission_user_public_table_timetickets/up.yaml b/hasura/migrations/1594915585321_update_permission_user_public_table_timetickets/up.yaml
new file mode 100644
index 000000000..607a87ce6
--- /dev/null
+++ b/hasura/migrations/1594915585321_update_permission_user_public_table_timetickets/up.yaml
@@ -0,0 +1,38 @@
+- args:
+    role: user
+    table:
+      name: timetickets
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - actualhrs
+      - bodyshopid
+      - ciecacode
+      - clockoff
+      - clockon
+      - cost_center
+      - created_at
+      - date
+      - employeeid
+      - id
+      - jobid
+      - productivehrs
+      - rate
+      - updated_at
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      set: {}
+    role: user
+    table:
+      name: timetickets
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1594915594328_update_permission_user_public_table_timetickets/down.yaml b/hasura/migrations/1594915594328_update_permission_user_public_table_timetickets/down.yaml
new file mode 100644
index 000000000..d6cac164e
--- /dev/null
+++ b/hasura/migrations/1594915594328_update_permission_user_public_table_timetickets/down.yaml
@@ -0,0 +1,23 @@
+- args:
+    role: user
+    table:
+      name: timetickets
+      schema: public
+  type: drop_delete_permission
+- args:
+    permission:
+      filter:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+    role: user
+    table:
+      name: timetickets
+      schema: public
+  type: create_delete_permission
diff --git a/hasura/migrations/1594915594328_update_permission_user_public_table_timetickets/up.yaml b/hasura/migrations/1594915594328_update_permission_user_public_table_timetickets/up.yaml
new file mode 100644
index 000000000..c2f88054f
--- /dev/null
+++ b/hasura/migrations/1594915594328_update_permission_user_public_table_timetickets/up.yaml
@@ -0,0 +1,22 @@
+- args:
+    role: user
+    table:
+      name: timetickets
+      schema: public
+  type: drop_delete_permission
+- args:
+    permission:
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+    role: user
+    table:
+      name: timetickets
+      schema: public
+  type: create_delete_permission
diff --git a/hasura/migrations/1594918801030_alter_table_public_timetickets_add_column_memo/down.yaml b/hasura/migrations/1594918801030_alter_table_public_timetickets_add_column_memo/down.yaml
new file mode 100644
index 000000000..e2f8bd8a1
--- /dev/null
+++ b/hasura/migrations/1594918801030_alter_table_public_timetickets_add_column_memo/down.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."timetickets" DROP COLUMN "memo";
+  type: run_sql
diff --git a/hasura/migrations/1594918801030_alter_table_public_timetickets_add_column_memo/up.yaml b/hasura/migrations/1594918801030_alter_table_public_timetickets_add_column_memo/up.yaml
new file mode 100644
index 000000000..9fe67874e
--- /dev/null
+++ b/hasura/migrations/1594918801030_alter_table_public_timetickets_add_column_memo/up.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."timetickets" ADD COLUMN "memo" text NULL;
+  type: run_sql
diff --git a/hasura/migrations/1594918812708_update_permission_user_public_table_timetickets/down.yaml b/hasura/migrations/1594918812708_update_permission_user_public_table_timetickets/down.yaml
new file mode 100644
index 000000000..c1deea7fc
--- /dev/null
+++ b/hasura/migrations/1594918812708_update_permission_user_public_table_timetickets/down.yaml
@@ -0,0 +1,38 @@
+- args:
+    role: user
+    table:
+      name: timetickets
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      columns:
+      - actualhrs
+      - bodyshopid
+      - ciecacode
+      - clockoff
+      - clockon
+      - cost_center
+      - created_at
+      - date
+      - employeeid
+      - id
+      - jobid
+      - productivehrs
+      - rate
+      - updated_at
+      set: {}
+    role: user
+    table:
+      name: timetickets
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1594918812708_update_permission_user_public_table_timetickets/up.yaml b/hasura/migrations/1594918812708_update_permission_user_public_table_timetickets/up.yaml
new file mode 100644
index 000000000..2738367b3
--- /dev/null
+++ b/hasura/migrations/1594918812708_update_permission_user_public_table_timetickets/up.yaml
@@ -0,0 +1,39 @@
+- args:
+    role: user
+    table:
+      name: timetickets
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      columns:
+      - actualhrs
+      - bodyshopid
+      - ciecacode
+      - clockoff
+      - clockon
+      - cost_center
+      - created_at
+      - date
+      - employeeid
+      - id
+      - jobid
+      - memo
+      - productivehrs
+      - rate
+      - updated_at
+      set: {}
+    role: user
+    table:
+      name: timetickets
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1594918823530_update_permission_user_public_table_timetickets/down.yaml b/hasura/migrations/1594918823530_update_permission_user_public_table_timetickets/down.yaml
new file mode 100644
index 000000000..578083106
--- /dev/null
+++ b/hasura/migrations/1594918823530_update_permission_user_public_table_timetickets/down.yaml
@@ -0,0 +1,39 @@
+- args:
+    role: user
+    table:
+      name: timetickets
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - actualhrs
+      - bodyshopid
+      - ciecacode
+      - clockoff
+      - clockon
+      - cost_center
+      - created_at
+      - date
+      - employeeid
+      - id
+      - jobid
+      - productivehrs
+      - rate
+      - updated_at
+      computed_fields: []
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+    role: user
+    table:
+      name: timetickets
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1594918823530_update_permission_user_public_table_timetickets/up.yaml b/hasura/migrations/1594918823530_update_permission_user_public_table_timetickets/up.yaml
new file mode 100644
index 000000000..9b9382fa6
--- /dev/null
+++ b/hasura/migrations/1594918823530_update_permission_user_public_table_timetickets/up.yaml
@@ -0,0 +1,40 @@
+- args:
+    role: user
+    table:
+      name: timetickets
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - actualhrs
+      - bodyshopid
+      - ciecacode
+      - clockoff
+      - clockon
+      - cost_center
+      - created_at
+      - date
+      - employeeid
+      - id
+      - jobid
+      - memo
+      - productivehrs
+      - rate
+      - updated_at
+      computed_fields: []
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+    role: user
+    table:
+      name: timetickets
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1594918834840_update_permission_user_public_table_timetickets/down.yaml b/hasura/migrations/1594918834840_update_permission_user_public_table_timetickets/down.yaml
new file mode 100644
index 000000000..607a87ce6
--- /dev/null
+++ b/hasura/migrations/1594918834840_update_permission_user_public_table_timetickets/down.yaml
@@ -0,0 +1,38 @@
+- args:
+    role: user
+    table:
+      name: timetickets
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - actualhrs
+      - bodyshopid
+      - ciecacode
+      - clockoff
+      - clockon
+      - cost_center
+      - created_at
+      - date
+      - employeeid
+      - id
+      - jobid
+      - productivehrs
+      - rate
+      - updated_at
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      set: {}
+    role: user
+    table:
+      name: timetickets
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1594918834840_update_permission_user_public_table_timetickets/up.yaml b/hasura/migrations/1594918834840_update_permission_user_public_table_timetickets/up.yaml
new file mode 100644
index 000000000..81b11bf65
--- /dev/null
+++ b/hasura/migrations/1594918834840_update_permission_user_public_table_timetickets/up.yaml
@@ -0,0 +1,39 @@
+- args:
+    role: user
+    table:
+      name: timetickets
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - actualhrs
+      - bodyshopid
+      - ciecacode
+      - clockoff
+      - clockon
+      - cost_center
+      - created_at
+      - date
+      - employeeid
+      - id
+      - jobid
+      - memo
+      - productivehrs
+      - rate
+      - updated_at
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      set: {}
+    role: user
+    table:
+      name: timetickets
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/metadata.yaml b/hasura/migrations/metadata.yaml
index 3b47da12d..f61352519 100644
--- a/hasura/migrations/metadata.yaml
+++ b/hasura/migrations/metadata.yaml
@@ -433,6 +433,13 @@ tables:
         table:
           schema: public
           name: templates
+  - name: timetickets
+    using:
+      foreign_key_constraint_on:
+        column: bodyshopid
+        table:
+          schema: public
+          name: timetickets
   - name: vehicles
     using:
       foreign_key_constraint_on:
@@ -1175,6 +1182,9 @@ tables:
   - name: bodyshop
     using:
       foreign_key_constraint_on: shopid
+  - name: user
+    using:
+      foreign_key_constraint_on: user_email
   array_relationships:
   - name: allocations
     using:
@@ -1217,6 +1227,7 @@ tables:
       - shopid
       - termination_date
       - updated_at
+      - user_email
   select_permissions:
   - role: user
     permission:
@@ -1235,6 +1246,7 @@ tables:
       - shopid
       - termination_date
       - updated_at
+      - user_email
       filter:
         bodyshop:
           associations:
@@ -1262,6 +1274,7 @@ tables:
       - shopid
       - termination_date
       - updated_at
+      - user_email
       filter:
         bodyshop:
           associations:
@@ -3538,6 +3551,9 @@ tables:
     schema: public
     name: timetickets
   object_relationships:
+  - name: bodyshop
+    using:
+      foreign_key_constraint_on: bodyshopid
   - name: employee
     using:
       foreign_key_constraint_on: employeeid
@@ -3548,100 +3564,111 @@ tables:
   - role: user
     permission:
       check:
-        job:
-          bodyshop:
-            associations:
-              _and:
-              - user:
-                  authid:
-                    _eq: X-Hasura-User-Id
-              - active:
-                  _eq: true
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
       columns:
-      - id
-      - created_at
-      - updated_at
-      - date
-      - cost_center
-      - employeeid
-      - jobid
-      - rate
-      - productivehrs
       - actualhrs
-      - clockon
-      - clockoff
+      - bodyshopid
       - ciecacode
+      - clockoff
+      - clockon
+      - cost_center
+      - created_at
+      - date
+      - employeeid
+      - id
+      - jobid
+      - memo
+      - productivehrs
+      - rate
+      - updated_at
   select_permissions:
   - role: user
     permission:
       columns:
-      - date
       - actualhrs
-      - productivehrs
-      - rate
+      - bodyshopid
       - ciecacode
-      - cost_center
       - clockoff
       - clockon
+      - cost_center
       - created_at
-      - updated_at
+      - date
       - employeeid
       - id
       - jobid
+      - memo
+      - productivehrs
+      - rate
+      - updated_at
       filter:
-        job:
-          bodyshop:
-            associations:
-              _and:
-              - user:
-                  authid:
-                    _eq: X-Hasura-User-Id
-              - active:
-                  _eq: true
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
   update_permissions:
   - role: user
     permission:
       columns:
-      - date
       - actualhrs
-      - productivehrs
-      - rate
+      - bodyshopid
       - ciecacode
-      - cost_center
       - clockoff
       - clockon
+      - cost_center
       - created_at
-      - updated_at
+      - date
       - employeeid
       - id
       - jobid
+      - memo
+      - productivehrs
+      - rate
+      - updated_at
       filter:
-        job:
-          bodyshop:
-            associations:
-              _and:
-              - user:
-                  authid:
-                    _eq: X-Hasura-User-Id
-              - active:
-                  _eq: true
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
       check: null
   delete_permissions:
   - role: user
     permission:
       filter:
-        job:
-          bodyshop:
-            associations:
-              _and:
-              - user:
-                  authid:
-                    _eq: X-Hasura-User-Id
-              - active:
-                  _eq: true
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
 - table:
     schema: public
     name: users
+  object_relationships:
+  - name: employee
+    using:
+      manual_configuration:
+        remote_table:
+          schema: public
+          name: employees
+        column_mapping:
+          email: user_email
   array_relationships:
   - name: associations
     using: