From 8761dafdff7ba4810744a4e20bed5efe696ae637 Mon Sep 17 00:00:00 2001
From: Patrick Fic <patrick@thinkimex.com>
Date: Thu, 6 Feb 2020 15:06:13 -0800
Subject: [PATCH] Removed job status table. Added existing appointments
 timeline to modal. Refetching on calendar on delete.

---
 bodyshop_translations.babel                   | 126 +++++++++
 .../job-detail-cards.component.jsx            |  41 +--
 .../jobs-detail-header.component.jsx          |  26 +-
 .../jobs-list/jobs-list.component.jsx         |   2 +-
 .../schedule-calendar.component.jsx           |   2 +-
 .../schedule-event.container.jsx              |  18 +-
 ...e-existing-appointments-list.component.jsx |  44 ++++
 .../schedule-job-modal.component.jsx          |  17 +-
 .../schedule-job-modal.container.jsx          |  12 +-
 client/src/graphql/appointments.queries.js    |  13 +
 client/src/graphql/jobs.queries.js            |  18 +-
 client/src/translations/en_us/common.json     |   8 +-
 client/src/translations/es/common.json        |   8 +-
 client/src/translations/fr/common.json        |   8 +-
 .../down.yaml                                 |  34 +++
 .../up.yaml                                   |  34 +++
 .../down.yaml                                 |   3 +
 .../up.yaml                                   |   3 +
 .../down.yaml                                 | 243 +++++++++++++++++
 .../up.yaml                                   | 244 ++++++++++++++++++
 .../down.yaml                                 | 241 +++++++++++++++++
 .../up.yaml                                   | 242 +++++++++++++++++
 .../down.yaml                                 | 243 +++++++++++++++++
 .../up.yaml                                   | 244 ++++++++++++++++++
 .../down.yaml                                 |  28 ++
 .../up.yaml                                   |   6 +
 .../down.yaml                                 |  26 ++
 .../up.yaml                                   |   6 +
 .../down.yaml                                 |  28 ++
 .../up.yaml                                   |   6 +
 .../down.yaml                                 |  16 ++
 .../up.yaml                                   |   6 +
 32 files changed, 1940 insertions(+), 56 deletions(-)
 create mode 100644 client/src/components/schedule-existing-appointments-list/schedule-existing-appointments-list.component.jsx
 create mode 100644 hasura/migrations/1581028719187_update_permission_user_public_table_appointments/down.yaml
 create mode 100644 hasura/migrations/1581028719187_update_permission_user_public_table_appointments/up.yaml
 create mode 100644 hasura/migrations/1581029855396_alter_table_public_jobs_add_column_status/down.yaml
 create mode 100644 hasura/migrations/1581029855396_alter_table_public_jobs_add_column_status/up.yaml
 create mode 100644 hasura/migrations/1581029864710_update_permission_user_public_table_jobs/down.yaml
 create mode 100644 hasura/migrations/1581029864710_update_permission_user_public_table_jobs/up.yaml
 create mode 100644 hasura/migrations/1581029870003_update_permission_user_public_table_jobs/down.yaml
 create mode 100644 hasura/migrations/1581029870003_update_permission_user_public_table_jobs/up.yaml
 create mode 100644 hasura/migrations/1581029875101_update_permission_user_public_table_jobs/down.yaml
 create mode 100644 hasura/migrations/1581029875101_update_permission_user_public_table_jobs/up.yaml
 create mode 100644 hasura/migrations/1581029890395_delete_permission_user_public_table_job_status/down.yaml
 create mode 100644 hasura/migrations/1581029890395_delete_permission_user_public_table_job_status/up.yaml
 create mode 100644 hasura/migrations/1581029895198_delete_permission_user_public_table_job_status/down.yaml
 create mode 100644 hasura/migrations/1581029895198_delete_permission_user_public_table_job_status/up.yaml
 create mode 100644 hasura/migrations/1581029899124_delete_permission_user_public_table_job_status/down.yaml
 create mode 100644 hasura/migrations/1581029899124_delete_permission_user_public_table_job_status/up.yaml
 create mode 100644 hasura/migrations/1581029904239_delete_permission_user_public_table_job_status/down.yaml
 create mode 100644 hasura/migrations/1581029904239_delete_permission_user_public_table_job_status/up.yaml

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 385c7c93f..5082e9758 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -113,6 +113,27 @@
                             <folder_node>
                                 <name>errors</name>
                                 <children>
+                                    <concept_node>
+                                        <name>canceling</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>saving</name>
                                         <definition_loaded>false</definition_loaded>
@@ -139,6 +160,48 @@
                             <folder_node>
                                 <name>labels</name>
                                 <children>
+                                    <concept_node>
+                                        <name>arrivedon</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>cancelledappointment</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>nodateselected</name>
                                         <definition_loaded>false</definition_loaded>
@@ -160,11 +223,74 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>priorappointments</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>scheduledfor</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>
                                 </children>
                             </folder_node>
                             <folder_node>
                                 <name>successes</name>
                                 <children>
+                                    <concept_node>
+                                        <name>canceled</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>created</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/job-detail-cards/job-detail-cards.component.jsx b/client/src/components/job-detail-cards/job-detail-cards.component.jsx
index 5c900483d..458ea0da7 100644
--- a/client/src/components/job-detail-cards/job-detail-cards.component.jsx
+++ b/client/src/components/job-detail-cards/job-detail-cards.component.jsx
@@ -18,8 +18,6 @@ import JobDetailCardsPartsComponent from "./job-detail-cards.parts.component";
 import "./job-detail-cards.styles.scss";
 import JobDetailCardsTotalsComponent from "./job-detail-cards.totals.component";
 
-
-
 export default function JobDetailCards({ selectedJob }) {
   const { loading, error, data, refetch } = useQuery(QUERY_JOB_CARD_DETAILS, {
     fetchPolicy: "network-only",
@@ -33,10 +31,10 @@ export default function JobDetailCards({ selectedJob }) {
     return <div>{t("jobs.errors.nojobselected")}</div>;
   }
   if (loading) return <LoadingSpinner />;
-  if (error) return <AlertComponent message={error.message} type='error' />;
+  if (error) return <AlertComponent message={error.message} type="error" />;
 
   return (
-    <div className='job-cards-container'>
+    <div className="job-cards-container">
       <NoteUpsertModal
         jobId={data.jobs_by_pk.id}
         visible={noteModalVisible}
@@ -47,9 +45,9 @@ export default function JobDetailCards({ selectedJob }) {
         ghost={false}
         onBack={() => window.history.back()}
         tags={
-          <span key='job-status'>
-            {data.jobs_by_pk.job_status ? (
-              <Tag color='blue'>{data.jobs_by_pk.job_status.name}</Tag>
+          <span key="job-status">
+            {data.jobs_by_pk.status ? (
+              <Tag color="blue">{data.jobs_by_pk.status}</Tag>
             ) : null}
           </span>
         }
@@ -68,31 +66,34 @@ export default function JobDetailCards({ selectedJob }) {
         }
         extra={[
           <Link
-            key='documents'
-            to={`/manage/jobs/${data.jobs_by_pk.id}#documents`}>
+            key="documents"
+            to={`/manage/jobs/${data.jobs_by_pk.id}#documents`}
+          >
             <Button>
-              <Icon type='file-image' />
+              <Icon type="file-image" />
               {t("jobs.actions.addDocuments")}
             </Button>
           </Link>,
-          <Button key='printing'>
-            <Icon type='printer' />
+          <Button key="printing">
+            <Icon type="printer" />
             {t("jobs.actions.printCenter")}
           </Button>,
           <Button
-            key='notes'
-            actiontype='addNote'
+            key="notes"
+            actiontype="addNote"
             onClick={() => {
               setNoteModalVisible(!noteModalVisible);
-            }}>
-            <Icon type='edit' />
+            }}
+          >
+            <Icon type="edit" />
             {t("jobs.actions.addNote")}
           </Button>,
-          <Button key='postinvoices'>
-            <Icon type='shopping-cart' />
+          <Button key="postinvoices">
+            <Icon type="shopping-cart" />
             {t("jobs.actions.postInvoices")}
           </Button>
-        ]}>
+        ]}
+      >
         {
           //   loading ? (
           //   <LoadingSkeleton />
@@ -113,7 +114,7 @@ export default function JobDetailCards({ selectedJob }) {
           // )
         }
 
-        <section className='job-cards'>
+        <section className="job-cards">
           <JobDetailCardsCustomerComponent
             loading={loading}
             data={data ? data.jobs_by_pk : null}
diff --git a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
index 1c5c92d16..34719d9e3 100644
--- a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
+++ b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
@@ -5,7 +5,8 @@ import {
   Descriptions,
   notification,
   PageHeader,
-  Tag
+  Tag,
+  Badge
 } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -60,15 +61,16 @@ export default function JobsDetailHeader({
   );
 
   const menuExtra = [
-    <Button
-      key="schedule"
-      //TODO: Enabled logic based on status.
-      onClick={() => {
-        setscheduleModalVisible(true);
-      }}
-    >
-      {t("jobs.actions.schedule")}
-    </Button>,
+    <Badge key="schedule" count={job.appointments_aggregate.aggregate.count}>
+      <Button
+        //TODO: Enabled logic based on status.
+        onClick={() => {
+          setscheduleModalVisible(true);
+        }}
+      >
+        {t("jobs.actions.schedule")}
+      </Button>
+    </Badge>,
     <Button
       key="convert"
       type="dashed"
@@ -106,9 +108,7 @@ export default function JobsDetailHeader({
       subTitle={tombstoneSubtitle}
       tags={
         <span key="job-status">
-          {job.job_status ? (
-            <Tag color="blue">{job.job_status.name}</Tag>
-          ) : null}
+          {job.status ? <Tag color="blue">{job.status}</Tag> : null}
         </span>
       }
       extra={menuExtra}
diff --git a/client/src/components/jobs-list/jobs-list.component.jsx b/client/src/components/jobs-list/jobs-list.component.jsx
index 497887aba..317e92513 100644
--- a/client/src/components/jobs-list/jobs-list.component.jsx
+++ b/client/src/components/jobs-list/jobs-list.component.jsx
@@ -94,7 +94,7 @@ export default withRouter(function JobsList({
       sortOrder:
         state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
       render: (text, record) => {
-        return record.job_status?.name || t("general.labels.na");
+        return record.status || t("general.labels.na");
       }
     },
 
diff --git a/client/src/components/schedule-calendar/schedule-calendar.component.jsx b/client/src/components/schedule-calendar/schedule-calendar.component.jsx
index 96fabc028..a82231f64 100644
--- a/client/src/components/schedule-calendar/schedule-calendar.component.jsx
+++ b/client/src/components/schedule-calendar/schedule-calendar.component.jsx
@@ -1,5 +1,5 @@
 import React from "react";
-import "react-big-calendar/lib/css/react-big-calendar.css";
+//import "react-big-calendar/lib/css/react-big-calendar.css";
 import ScheduleCalendarWrapperComponent from "../schedule-calendar-wrapper/scheduler-calendar-wrapper.component";
 
 export default function ScheduleCalendarComponent({ data, refetch }) {
diff --git a/client/src/components/schedule-event/schedule-event.container.jsx b/client/src/components/schedule-event/schedule-event.container.jsx
index dc31562af..7761ab049 100644
--- a/client/src/components/schedule-event/schedule-event.container.jsx
+++ b/client/src/components/schedule-event/schedule-event.container.jsx
@@ -2,14 +2,22 @@ import React from "react";
 import { useMutation } from "react-apollo";
 import { CANCEL_APPOINTMENT_BY_ID } from "../../graphql/appointments.queries";
 import ScheduleEventComponent from "./schedule-event.component";
-
+import { notification } from "antd";
+import { useTranslation } from "react-i18next";
 export default function ScheduleEventContainer({ event, refetch }) {
+  const { t } = useTranslation();
   const [cancelAppointment] = useMutation(CANCEL_APPOINTMENT_BY_ID);
-  console.log("refetch", refetch);
   const handleCancel = id => {
-    cancelAppointment({ variables: { appid: event.id } }).then(r => {
-      if (refetch) refetch();
-    });
+    cancelAppointment({ variables: { appid: event.id } })
+      .then(r => {
+        notification["success"]({
+          message: t("appointments.successes.canceled")
+        });
+        if (refetch) refetch();
+      })
+      .catch(error => {
+        notification["error"]({ message: t("appointments.errors.canceling") });
+      });
   };
 
   return <ScheduleEventComponent event={event} handleCancel={handleCancel} />;
diff --git a/client/src/components/schedule-existing-appointments-list/schedule-existing-appointments-list.component.jsx b/client/src/components/schedule-existing-appointments-list/schedule-existing-appointments-list.component.jsx
new file mode 100644
index 000000000..4435030d9
--- /dev/null
+++ b/client/src/components/schedule-existing-appointments-list/schedule-existing-appointments-list.component.jsx
@@ -0,0 +1,44 @@
+import React from "react";
+import LoadingSpinner from "../loading-spinner/loading-spinner.component";
+import AlertComponent from "../alert/alert.component";
+import { Timeline } from "antd";
+import { useTranslation } from "react-i18next";
+import { DateTimeFormatter } from "../../utils/DateFormatter";
+
+export default function ScheduleExistingAppointmentsList({
+  existingAppointments
+}) {
+  const { t } = useTranslation();
+  if (existingAppointments.loading) return <LoadingSpinner />;
+  if (existingAppointments.error)
+    return (
+      <AlertComponent
+        message={existingAppointments.error.message}
+        type="error"
+      />
+    );
+
+  return (
+    <div>
+      {t("appointments.labels.priorappointments")}
+      <Timeline>
+        {existingAppointments.data.appointments.map(item => {
+          return (
+            <Timeline.Item
+              key={item.id}
+              color={item.canceled ? "red" : item.arrived ? "green" : "blue"}
+            >
+              {item.canceled
+                ? t("appointments.labels.cancelledappointment")
+                : item.arrived
+                ? t("appointments.labels.arrivedon")
+                : t("appointments.labels.scheduledfor")}
+
+              <DateTimeFormatter>{item.start}</DateTimeFormatter>
+            </Timeline.Item>
+          );
+        })}
+      </Timeline>
+    </div>
+  );
+}
diff --git a/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx b/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
index 782abc5ce..22bfbb84b 100644
--- a/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
+++ b/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
@@ -1,8 +1,11 @@
-import { Checkbox, DatePicker, Modal, Tabs, TimePicker, Col, Row } from "antd";
+import { Checkbox, Col, DatePicker, Modal, Row, Tabs, TimePicker } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import ScheduleDayViewContainer from "../schedule-day-view/schedule-day-view.container";
+import ScheduleExistingAppointmentsList from "../schedule-existing-appointments-list/schedule-existing-appointments-list.component";
+
 export default function ScheduleJobModalComponent({
+  existingAppointments,
   appData,
   setAppData,
   formData,
@@ -10,8 +13,18 @@ export default function ScheduleJobModalComponent({
   ...props
 }) {
   const { t } = useTranslation();
+  //TODO: Existing appointments list only refreshes sometimes after modal close. May have to do with the container class.
   return (
-    <Modal {...props} width={"80%"} maskClosable={false}>
+    <Modal
+      {...props}
+      width={"80%"}
+      maskClosable={false}
+      destroyOnClose={true}
+      okButtonProps={{ disabled: appData.start ? false : true }}
+    >
+      <ScheduleExistingAppointmentsList
+        existingAppointments={existingAppointments}
+      />
       <Tabs defaultActiveKey="1">
         <Tabs.TabPane tab="SMART Scheduling" key="auto">
           Automatic Job Selection.
diff --git a/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx b/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx
index 89b47e8d7..f018ea806 100644
--- a/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx
+++ b/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx
@@ -1,7 +1,10 @@
 import React, { useState } from "react";
 import ScheduleJobModalComponent from "./schedule-job-modal.component";
-import { useMutation } from "react-apollo";
-import { INSERT_APPOINTMENT } from "../../graphql/appointments.queries";
+import { useMutation, useQuery } from "react-apollo";
+import {
+  INSERT_APPOINTMENT,
+  QUERY_APPOINTMENTS_BY_JOBID
+} from "../../graphql/appointments.queries";
 import moment from "moment";
 import { notification } from "antd";
 import { useTranslation } from "react-i18next";
@@ -9,6 +12,10 @@ export default function ScheduleJobModalContainer({
   scheduleModalState,
   jobId
 }) {
+  const existingAppointments = useQuery(QUERY_APPOINTMENTS_BY_JOBID, {
+    variables: { jobid: jobId },
+    fetchPolicy: "network-only"
+  });
   const [scheduleModalVisible, setscheduleModalVisible] = scheduleModalState;
   const [appData, setAppData] = useState({ jobid: jobId, start: null });
   const [insertAppointment] = useMutation(INSERT_APPOINTMENT);
@@ -17,6 +24,7 @@ export default function ScheduleJobModalContainer({
 
   return (
     <ScheduleJobModalComponent
+      existingAppointments={existingAppointments}
       appData={appData}
       setAppData={setAppData}
       formData={formData}
diff --git a/client/src/graphql/appointments.queries.js b/client/src/graphql/appointments.queries.js
index 99c55d265..b69d0c967 100644
--- a/client/src/graphql/appointments.queries.js
+++ b/client/src/graphql/appointments.queries.js
@@ -74,3 +74,16 @@ export const CANCEL_APPOINTMENT_BY_ID = gql`
     }
   }
 `;
+
+export const QUERY_APPOINTMENTS_BY_JOBID = gql`
+  query QUERY_APPOINTMENTS_BY_JOBID($jobid: uuid!) {
+    appointments(where: { jobid: { _eq: $jobid } }) {
+      start
+      id
+      end
+      arrived
+      canceled
+      created_at
+    }
+  }
+`;
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index 4ada884ae..fe4b3974a 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -42,10 +42,7 @@ export const QUERY_ALL_OPEN_JOBS = gql`
       scheduled_completion
       scheduled_in
       scheduled_delivery
-      job_status {
-        id
-        name
-      }
+      status
       updated_at
       clm_total
       ded_amt
@@ -195,7 +192,7 @@ export const GET_JOB_BY_PK = gql`
       date_invoiced
       date_closed
       date_exported
-
+      status
       joblines {
         id
         unq_seq
@@ -213,6 +210,11 @@ export const GET_JOB_BY_PK = gql`
         lbr_amt
         op_code_desc
       }
+      appointments_aggregate {
+        aggregate {
+          count
+        }
+      }
     }
   }
 `;
@@ -253,6 +255,7 @@ export const QUERY_JOB_CARD_DETAILS = gql`
       est_ct_fn
       est_ct_ln
       clm_no
+      status
       ro_number
       scheduled_completion
       scheduled_in
@@ -264,10 +267,7 @@ export const QUERY_JOB_CARD_DETAILS = gql`
         private
         created_at
       }
-      job_status {
-        id
-        name
-      }
+
       updated_at
       clm_total
       ded_amt
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index bd7046ac9..d407cdd0a 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -8,12 +8,18 @@
 				"viewjob": "View Job"
 			},
 			"errors": {
+				"canceling": "Error canceling appointment.",
 				"saving": "Error scheduling appointment. {{message}}"
 			},
 			"labels": {
-				"nodateselected": "No date has been selected."
+				"arrivedon": "Arrived on: ",
+				"cancelledappointment": "Canceled appointment for: ",
+				"nodateselected": "No date has been selected.",
+				"priorappointments": "Previous Appointments",
+				"scheduledfor": "Scheduled appointment for: "
 			},
 			"successes": {
+				"canceled": "Appointment canceled successfully.",
 				"created": "Appointment scheduled successfully."
 			}
 		},
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 6105a3bda..b7bf88497 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -8,12 +8,18 @@
 				"viewjob": "Ver trabajo"
 			},
 			"errors": {
+				"canceling": "Error al cancelar la cita.",
 				"saving": "Error al programar la cita. {{message}}"
 			},
 			"labels": {
-				"nodateselected": "No se ha seleccionado ninguna fecha."
+				"arrivedon": "Llegado el:",
+				"cancelledappointment": "Cita cancelada para:",
+				"nodateselected": "No se ha seleccionado ninguna fecha.",
+				"priorappointments": "Nombramientos previos",
+				"scheduledfor": "Cita programada para:"
 			},
 			"successes": {
+				"canceled": "Cita cancelada con éxito.",
 				"created": "Cita programada con éxito."
 			}
 		},
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 687277f2b..e4ec09fb4 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -8,12 +8,18 @@
 				"viewjob": "Voir le travail"
 			},
 			"errors": {
+				"canceling": "Erreur lors de l'annulation du rendez-vous.",
 				"saving": "Erreur lors de la planification du rendez-vous. {{message}}"
 			},
 			"labels": {
-				"nodateselected": "Aucune date n'a été sélectionnée."
+				"arrivedon": "Arrivé le:",
+				"cancelledappointment": "Rendez-vous annulé pour:",
+				"nodateselected": "Aucune date n'a été sélectionnée.",
+				"priorappointments": "Rendez-vous précédents",
+				"scheduledfor": "Rendez-vous prévu pour:"
 			},
 			"successes": {
+				"canceled": "Rendez-vous annulé avec succès.",
 				"created": "Rendez-vous planifié avec succès."
 			}
 		},
diff --git a/hasura/migrations/1581028719187_update_permission_user_public_table_appointments/down.yaml b/hasura/migrations/1581028719187_update_permission_user_public_table_appointments/down.yaml
new file mode 100644
index 000000000..d71784d2e
--- /dev/null
+++ b/hasura/migrations/1581028719187_update_permission_user_public_table_appointments/down.yaml
@@ -0,0 +1,34 @@
+- args:
+    role: user
+    table:
+      name: appointments
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - arrived
+      - canceled
+      - created_at
+      - end
+      - start
+      - updated_at
+      - id
+      - jobid
+      computed_fields: []
+      filter:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+    role: user
+    table:
+      name: appointments
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1581028719187_update_permission_user_public_table_appointments/up.yaml b/hasura/migrations/1581028719187_update_permission_user_public_table_appointments/up.yaml
new file mode 100644
index 000000000..7c6811bf8
--- /dev/null
+++ b/hasura/migrations/1581028719187_update_permission_user_public_table_appointments/up.yaml
@@ -0,0 +1,34 @@
+- args:
+    role: user
+    table:
+      name: appointments
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: true
+      columns:
+      - arrived
+      - canceled
+      - created_at
+      - end
+      - start
+      - updated_at
+      - id
+      - jobid
+      computed_fields: []
+      filter:
+        job:
+          bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+    role: user
+    table:
+      name: appointments
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1581029855396_alter_table_public_jobs_add_column_status/down.yaml b/hasura/migrations/1581029855396_alter_table_public_jobs_add_column_status/down.yaml
new file mode 100644
index 000000000..043b6ce61
--- /dev/null
+++ b/hasura/migrations/1581029855396_alter_table_public_jobs_add_column_status/down.yaml
@@ -0,0 +1,3 @@
+- args:
+    sql: ALTER TABLE "public"."jobs" DROP COLUMN "status";
+  type: run_sql
diff --git a/hasura/migrations/1581029855396_alter_table_public_jobs_add_column_status/up.yaml b/hasura/migrations/1581029855396_alter_table_public_jobs_add_column_status/up.yaml
new file mode 100644
index 000000000..262633fb7
--- /dev/null
+++ b/hasura/migrations/1581029855396_alter_table_public_jobs_add_column_status/up.yaml
@@ -0,0 +1,3 @@
+- args:
+    sql: ALTER TABLE "public"."jobs" ADD COLUMN "status" text NOT NULL DEFAULT 'Open';
+  type: run_sql
diff --git a/hasura/migrations/1581029864710_update_permission_user_public_table_jobs/down.yaml b/hasura/migrations/1581029864710_update_permission_user_public_table_jobs/down.yaml
new file mode 100644
index 000000000..50eccd57f
--- /dev/null
+++ b/hasura/migrations/1581029864710_update_permission_user_public_table_jobs/down.yaml
@@ -0,0 +1,243 @@
+- args:
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      columns:
+      - actual_completion
+      - actual_delivery
+      - actual_in
+      - adj_g_disc
+      - adj_strdis
+      - adj_towdis
+      - adjustment_bottom_line
+      - agt_addr1
+      - agt_addr2
+      - agt_city
+      - agt_co_id
+      - agt_co_nm
+      - agt_ct_fn
+      - agt_ct_ln
+      - agt_ct_ph
+      - agt_ct_phx
+      - agt_ctry
+      - agt_ea
+      - agt_fax
+      - agt_faxx
+      - agt_lic_no
+      - agt_ph1
+      - agt_ph1x
+      - agt_ph2
+      - agt_ph2x
+      - agt_st
+      - agt_zip
+      - area_of_damage
+      - asgn_date
+      - asgn_no
+      - asgn_type
+      - cat_no
+      - ciecaid
+      - clm_addr1
+      - clm_addr2
+      - clm_city
+      - clm_ct_fn
+      - clm_ct_ln
+      - clm_ct_ph
+      - clm_ct_phx
+      - clm_ctry
+      - clm_ea
+      - clm_fax
+      - clm_faxx
+      - clm_no
+      - clm_ofc_id
+      - clm_ofc_nm
+      - clm_ph1
+      - clm_ph1x
+      - clm_ph2
+      - clm_ph2x
+      - clm_st
+      - clm_title
+      - clm_total
+      - clm_zip
+      - converted
+      - created_at
+      - csr
+      - cust_pr
+      - date_closed
+      - date_estimated
+      - date_exported
+      - date_invoiced
+      - date_open
+      - date_scheduled
+      - ded_amt
+      - ded_status
+      - deductible
+      - depreciation_taxes
+      - est_addr1
+      - est_addr2
+      - est_city
+      - est_co_nm
+      - est_ct_fn
+      - est_ct_ln
+      - est_ctry
+      - est_ea
+      - est_number
+      - est_ph1
+      - est_st
+      - est_zip
+      - federal_tax_payable
+      - federal_tax_rate
+      - id
+      - inproduction
+      - ins_addr1
+      - ins_addr2
+      - ins_city
+      - ins_co_id
+      - ins_co_nm
+      - ins_ct_fn
+      - ins_ct_ln
+      - ins_ct_ph
+      - ins_ct_phx
+      - ins_ctry
+      - ins_ea
+      - ins_fax
+      - ins_faxx
+      - ins_memo
+      - ins_ph1
+      - ins_ph1x
+      - ins_ph2
+      - ins_ph2x
+      - ins_st
+      - ins_title
+      - ins_zip
+      - insd_addr1
+      - insd_addr2
+      - insd_city
+      - insd_co_nm
+      - insd_ctry
+      - insd_ea
+      - insd_fax
+      - insd_faxx
+      - insd_fn
+      - insd_ln
+      - insd_ph1
+      - insd_ph1x
+      - insd_ph2
+      - insd_ph2x
+      - insd_st
+      - insd_title
+      - insd_zip
+      - invoice_date
+      - kmin
+      - kmout
+      - labor_rate_desc
+      - labor_rate_id
+      - local_tax_rate
+      - loss_cat
+      - loss_date
+      - loss_desc
+      - loss_type
+      - other_amount_payable
+      - owner_owing
+      - ownerid
+      - ownr_addr1
+      - ownr_addr2
+      - ownr_city
+      - ownr_co_nm
+      - ownr_ctry
+      - ownr_ea
+      - ownr_fax
+      - ownr_faxx
+      - ownr_fn
+      - ownr_ln
+      - ownr_ph1
+      - ownr_ph1x
+      - ownr_ph2
+      - ownr_ph2x
+      - ownr_st
+      - ownr_title
+      - ownr_zip
+      - pay_amt
+      - pay_chknm
+      - pay_date
+      - pay_type
+      - payee_nms
+      - po_number
+      - policy_no
+      - rate_atp
+      - rate_la1
+      - rate_la2
+      - rate_la3
+      - rate_la4
+      - rate_laa
+      - rate_lab
+      - rate_lad
+      - rate_lae
+      - rate_laf
+      - rate_lag
+      - rate_lam
+      - rate_lar
+      - rate_las
+      - rate_lau
+      - rate_ma2s
+      - rate_ma2t
+      - rate_ma3s
+      - rate_mabl
+      - rate_macs
+      - rate_mahw
+      - rate_mapa
+      - rate_mash
+      - rate_matd
+      - referral_source
+      - regie_number
+      - ro_number
+      - scheduled_completion
+      - scheduled_delivery
+      - scheduled_in
+      - selling_dealer
+      - selling_dealer_contact
+      - service_car
+      - servicing_dealer
+      - servicing_dealer_contact
+      - shopid
+      - special_coverage_policy
+      - state_tax_rate
+      - statusid
+      - storage_payable
+      - tax_lbr_rt
+      - tax_levies_rt
+      - tax_paint_mat_rt
+      - tax_predis
+      - tax_prethr
+      - tax_pstthr
+      - tax_str_rt
+      - tax_sub_rt
+      - tax_thramt
+      - tax_tow_rt
+      - theft_ind
+      - tlos_ind
+      - towing_payable
+      - unit_number
+      - updated_at
+      - vehicleid
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1581029864710_update_permission_user_public_table_jobs/up.yaml b/hasura/migrations/1581029864710_update_permission_user_public_table_jobs/up.yaml
new file mode 100644
index 000000000..488ed01e7
--- /dev/null
+++ b/hasura/migrations/1581029864710_update_permission_user_public_table_jobs/up.yaml
@@ -0,0 +1,244 @@
+- args:
+    role: user
+    table:
+      name: jobs
+      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
+      - shopid
+      - ro_number
+      - ownerid
+      - vehicleid
+      - labor_rate_id
+      - labor_rate_desc
+      - rate_lab
+      - rate_lad
+      - rate_lae
+      - rate_lar
+      - rate_las
+      - rate_laf
+      - rate_lam
+      - rate_lag
+      - rate_atp
+      - rate_lau
+      - rate_la1
+      - rate_la2
+      - rate_la3
+      - rate_la4
+      - rate_mapa
+      - rate_mash
+      - rate_mahw
+      - rate_ma2s
+      - rate_ma3s
+      - rate_ma2t
+      - rate_mabl
+      - rate_macs
+      - rate_matd
+      - federal_tax_rate
+      - state_tax_rate
+      - local_tax_rate
+      - est_co_nm
+      - est_addr1
+      - est_addr2
+      - est_city
+      - est_st
+      - est_zip
+      - est_ctry
+      - est_ph1
+      - est_ea
+      - est_ct_ln
+      - est_ct_fn
+      - scheduled_in
+      - actual_in
+      - scheduled_completion
+      - actual_completion
+      - scheduled_delivery
+      - actual_delivery
+      - regie_number
+      - invoice_date
+      - deductible
+      - inproduction
+      - statusid
+      - ins_co_id
+      - ins_co_nm
+      - ins_addr1
+      - ins_addr2
+      - ins_city
+      - ins_st
+      - ins_zip
+      - ins_ctry
+      - ins_ph1
+      - ins_ph1x
+      - ins_ph2
+      - ins_ph2x
+      - ins_fax
+      - ins_faxx
+      - ins_ct_ln
+      - ins_ct_fn
+      - ins_title
+      - ins_ct_ph
+      - ins_ct_phx
+      - ins_ea
+      - ins_memo
+      - policy_no
+      - ded_amt
+      - ded_status
+      - asgn_no
+      - asgn_date
+      - asgn_type
+      - clm_no
+      - clm_ofc_id
+      - date_estimated
+      - date_open
+      - date_scheduled
+      - date_invoiced
+      - date_closed
+      - date_exported
+      - clm_total
+      - owner_owing
+      - converted
+      - ciecaid
+      - loss_date
+      - clm_ofc_nm
+      - clm_addr1
+      - clm_addr2
+      - clm_city
+      - clm_st
+      - clm_zip
+      - clm_ctry
+      - clm_ph1
+      - clm_ph1x
+      - clm_ph2
+      - clm_ph2x
+      - clm_fax
+      - clm_faxx
+      - clm_ct_ln
+      - clm_ct_fn
+      - clm_title
+      - clm_ct_ph
+      - clm_ct_phx
+      - clm_ea
+      - payee_nms
+      - pay_type
+      - pay_date
+      - pay_chknm
+      - pay_amt
+      - agt_co_id
+      - agt_co_nm
+      - agt_addr1
+      - agt_addr2
+      - agt_city
+      - agt_st
+      - agt_zip
+      - agt_ctry
+      - agt_ph1
+      - agt_ph1x
+      - agt_ph2
+      - agt_ph2x
+      - agt_fax
+      - agt_faxx
+      - agt_ct_ln
+      - agt_ct_fn
+      - agt_ct_ph
+      - agt_ct_phx
+      - agt_ea
+      - agt_lic_no
+      - loss_type
+      - loss_desc
+      - theft_ind
+      - cat_no
+      - tlos_ind
+      - cust_pr
+      - insd_ln
+      - insd_fn
+      - insd_title
+      - insd_co_nm
+      - insd_addr1
+      - insd_addr2
+      - insd_city
+      - insd_st
+      - insd_zip
+      - insd_ctry
+      - insd_ph1
+      - insd_ph1x
+      - insd_ph2
+      - insd_ph2x
+      - insd_fax
+      - insd_faxx
+      - insd_ea
+      - ownr_ln
+      - ownr_fn
+      - ownr_title
+      - ownr_co_nm
+      - ownr_addr1
+      - ownr_addr2
+      - ownr_city
+      - ownr_st
+      - ownr_zip
+      - ownr_ctry
+      - ownr_ph1
+      - ownr_ph1x
+      - ownr_ph2
+      - ownr_ph2x
+      - ownr_fax
+      - ownr_faxx
+      - ownr_ea
+      - area_of_damage
+      - loss_cat
+      - est_number
+      - service_car
+      - special_coverage_policy
+      - csr
+      - po_number
+      - unit_number
+      - kmin
+      - kmout
+      - referral_source
+      - selling_dealer
+      - servicing_dealer
+      - servicing_dealer_contact
+      - selling_dealer_contact
+      - depreciation_taxes
+      - federal_tax_payable
+      - other_amount_payable
+      - towing_payable
+      - storage_payable
+      - adjustment_bottom_line
+      - tax_pstthr
+      - tax_tow_rt
+      - tax_sub_rt
+      - tax_paint_mat_rt
+      - tax_levies_rt
+      - tax_prethr
+      - tax_thramt
+      - tax_str_rt
+      - tax_lbr_rt
+      - adj_g_disc
+      - adj_towdis
+      - adj_strdis
+      - tax_predis
+      - rate_laa
+      - status
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1581029870003_update_permission_user_public_table_jobs/down.yaml b/hasura/migrations/1581029870003_update_permission_user_public_table_jobs/down.yaml
new file mode 100644
index 000000000..79e220620
--- /dev/null
+++ b/hasura/migrations/1581029870003_update_permission_user_public_table_jobs/down.yaml
@@ -0,0 +1,241 @@
+- args:
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - actual_completion
+      - actual_delivery
+      - actual_in
+      - adj_g_disc
+      - adj_strdis
+      - adj_towdis
+      - adjustment_bottom_line
+      - agt_addr1
+      - agt_addr2
+      - agt_city
+      - agt_co_id
+      - agt_co_nm
+      - agt_ct_fn
+      - agt_ct_ln
+      - agt_ct_ph
+      - agt_ct_phx
+      - agt_ctry
+      - agt_ea
+      - agt_fax
+      - agt_faxx
+      - agt_lic_no
+      - agt_ph1
+      - agt_ph1x
+      - agt_ph2
+      - agt_ph2x
+      - agt_st
+      - agt_zip
+      - area_of_damage
+      - asgn_date
+      - asgn_no
+      - asgn_type
+      - cat_no
+      - ciecaid
+      - clm_addr1
+      - clm_addr2
+      - clm_city
+      - clm_ct_fn
+      - clm_ct_ln
+      - clm_ct_ph
+      - clm_ct_phx
+      - clm_ctry
+      - clm_ea
+      - clm_fax
+      - clm_faxx
+      - clm_no
+      - clm_ofc_id
+      - clm_ofc_nm
+      - clm_ph1
+      - clm_ph1x
+      - clm_ph2
+      - clm_ph2x
+      - clm_st
+      - clm_title
+      - clm_total
+      - clm_zip
+      - converted
+      - created_at
+      - csr
+      - cust_pr
+      - date_closed
+      - date_estimated
+      - date_exported
+      - date_invoiced
+      - date_open
+      - date_scheduled
+      - ded_amt
+      - ded_status
+      - deductible
+      - depreciation_taxes
+      - est_addr1
+      - est_addr2
+      - est_city
+      - est_co_nm
+      - est_ct_fn
+      - est_ct_ln
+      - est_ctry
+      - est_ea
+      - est_number
+      - est_ph1
+      - est_st
+      - est_zip
+      - federal_tax_payable
+      - federal_tax_rate
+      - id
+      - inproduction
+      - ins_addr1
+      - ins_addr2
+      - ins_city
+      - ins_co_id
+      - ins_co_nm
+      - ins_ct_fn
+      - ins_ct_ln
+      - ins_ct_ph
+      - ins_ct_phx
+      - ins_ctry
+      - ins_ea
+      - ins_fax
+      - ins_faxx
+      - ins_memo
+      - ins_ph1
+      - ins_ph1x
+      - ins_ph2
+      - ins_ph2x
+      - ins_st
+      - ins_title
+      - ins_zip
+      - insd_addr1
+      - insd_addr2
+      - insd_city
+      - insd_co_nm
+      - insd_ctry
+      - insd_ea
+      - insd_fax
+      - insd_faxx
+      - insd_fn
+      - insd_ln
+      - insd_ph1
+      - insd_ph1x
+      - insd_ph2
+      - insd_ph2x
+      - insd_st
+      - insd_title
+      - insd_zip
+      - invoice_date
+      - kmin
+      - kmout
+      - labor_rate_desc
+      - labor_rate_id
+      - local_tax_rate
+      - loss_cat
+      - loss_date
+      - loss_desc
+      - loss_type
+      - other_amount_payable
+      - owner_owing
+      - ownerid
+      - ownr_addr1
+      - ownr_addr2
+      - ownr_city
+      - ownr_co_nm
+      - ownr_ctry
+      - ownr_ea
+      - ownr_fax
+      - ownr_faxx
+      - ownr_fn
+      - ownr_ln
+      - ownr_ph1
+      - ownr_ph1x
+      - ownr_ph2
+      - ownr_ph2x
+      - ownr_st
+      - ownr_title
+      - ownr_zip
+      - pay_amt
+      - pay_chknm
+      - pay_date
+      - pay_type
+      - payee_nms
+      - po_number
+      - policy_no
+      - rate_atp
+      - rate_la1
+      - rate_la2
+      - rate_la3
+      - rate_la4
+      - rate_laa
+      - rate_lab
+      - rate_lad
+      - rate_lae
+      - rate_laf
+      - rate_lag
+      - rate_lam
+      - rate_lar
+      - rate_las
+      - rate_lau
+      - rate_ma2s
+      - rate_ma2t
+      - rate_ma3s
+      - rate_mabl
+      - rate_macs
+      - rate_mahw
+      - rate_mapa
+      - rate_mash
+      - rate_matd
+      - referral_source
+      - regie_number
+      - ro_number
+      - scheduled_completion
+      - scheduled_delivery
+      - scheduled_in
+      - selling_dealer
+      - selling_dealer_contact
+      - service_car
+      - servicing_dealer
+      - servicing_dealer_contact
+      - shopid
+      - special_coverage_policy
+      - state_tax_rate
+      - statusid
+      - storage_payable
+      - tax_lbr_rt
+      - tax_levies_rt
+      - tax_paint_mat_rt
+      - tax_predis
+      - tax_prethr
+      - tax_pstthr
+      - tax_str_rt
+      - tax_sub_rt
+      - tax_thramt
+      - tax_tow_rt
+      - theft_ind
+      - tlos_ind
+      - towing_payable
+      - unit_number
+      - updated_at
+      - vehicleid
+      computed_fields: []
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1581029870003_update_permission_user_public_table_jobs/up.yaml b/hasura/migrations/1581029870003_update_permission_user_public_table_jobs/up.yaml
new file mode 100644
index 000000000..a6ed6c817
--- /dev/null
+++ b/hasura/migrations/1581029870003_update_permission_user_public_table_jobs/up.yaml
@@ -0,0 +1,242 @@
+- args:
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - converted
+      - inproduction
+      - special_coverage_policy
+      - theft_ind
+      - tlos_ind
+      - asgn_date
+      - invoice_date
+      - loss_date
+      - pay_date
+      - kmin
+      - kmout
+      - est_number
+      - area_of_damage
+      - adj_g_disc
+      - adj_strdis
+      - adj_towdis
+      - adjustment_bottom_line
+      - clm_total
+      - ded_amt
+      - deductible
+      - depreciation_taxes
+      - federal_tax_payable
+      - federal_tax_rate
+      - local_tax_rate
+      - other_amount_payable
+      - owner_owing
+      - pay_amt
+      - rate_atp
+      - rate_la1
+      - rate_la2
+      - rate_la3
+      - rate_la4
+      - rate_laa
+      - rate_lab
+      - rate_lad
+      - rate_lae
+      - rate_laf
+      - rate_lag
+      - rate_lam
+      - rate_lar
+      - rate_las
+      - rate_lau
+      - rate_ma2s
+      - rate_ma2t
+      - rate_ma3s
+      - rate_mabl
+      - rate_macs
+      - rate_mahw
+      - rate_mapa
+      - rate_mash
+      - rate_matd
+      - state_tax_rate
+      - storage_payable
+      - tax_lbr_rt
+      - tax_levies_rt
+      - tax_paint_mat_rt
+      - tax_predis
+      - tax_prethr
+      - tax_str_rt
+      - tax_thramt
+      - towing_payable
+      - agt_addr1
+      - agt_addr2
+      - agt_city
+      - agt_co_id
+      - agt_co_nm
+      - agt_ct_fn
+      - agt_ct_ln
+      - agt_ct_ph
+      - agt_ct_phx
+      - agt_ctry
+      - agt_ea
+      - agt_fax
+      - agt_faxx
+      - agt_lic_no
+      - agt_ph1
+      - agt_ph1x
+      - agt_ph2
+      - agt_ph2x
+      - agt_st
+      - agt_zip
+      - asgn_no
+      - asgn_type
+      - cat_no
+      - ciecaid
+      - clm_addr1
+      - clm_addr2
+      - clm_city
+      - clm_ct_fn
+      - clm_ct_ln
+      - clm_ct_ph
+      - clm_ct_phx
+      - clm_ctry
+      - clm_ea
+      - clm_fax
+      - clm_faxx
+      - clm_no
+      - clm_ofc_id
+      - clm_ofc_nm
+      - clm_ph1
+      - clm_ph1x
+      - clm_ph2
+      - clm_ph2x
+      - clm_st
+      - clm_title
+      - clm_zip
+      - csr
+      - cust_pr
+      - ded_status
+      - est_addr1
+      - est_addr2
+      - est_city
+      - est_co_nm
+      - est_ct_fn
+      - est_ct_ln
+      - est_ctry
+      - est_ea
+      - est_ph1
+      - est_st
+      - est_zip
+      - ins_addr1
+      - ins_addr2
+      - ins_city
+      - ins_co_id
+      - ins_co_nm
+      - ins_ct_fn
+      - ins_ct_ln
+      - ins_ct_ph
+      - ins_ct_phx
+      - ins_ctry
+      - insd_addr1
+      - insd_addr2
+      - insd_city
+      - insd_co_nm
+      - insd_ctry
+      - insd_ea
+      - insd_fax
+      - insd_faxx
+      - insd_fn
+      - insd_ln
+      - insd_ph1
+      - insd_ph1x
+      - insd_ph2
+      - insd_ph2x
+      - insd_st
+      - insd_title
+      - insd_zip
+      - ins_ea
+      - ins_fax
+      - ins_faxx
+      - ins_memo
+      - ins_ph1
+      - ins_ph1x
+      - ins_ph2
+      - ins_ph2x
+      - ins_st
+      - ins_title
+      - ins_zip
+      - labor_rate_desc
+      - labor_rate_id
+      - loss_cat
+      - loss_desc
+      - loss_type
+      - ownr_addr1
+      - ownr_addr2
+      - ownr_city
+      - ownr_co_nm
+      - ownr_ctry
+      - ownr_ea
+      - ownr_fax
+      - ownr_faxx
+      - ownr_fn
+      - ownr_ln
+      - ownr_ph1
+      - ownr_ph1x
+      - ownr_ph2
+      - ownr_ph2x
+      - ownr_st
+      - ownr_title
+      - ownr_zip
+      - pay_chknm
+      - payee_nms
+      - pay_type
+      - policy_no
+      - po_number
+      - referral_source
+      - regie_number
+      - ro_number
+      - selling_dealer
+      - selling_dealer_contact
+      - service_car
+      - servicing_dealer
+      - servicing_dealer_contact
+      - status
+      - unit_number
+      - actual_completion
+      - actual_delivery
+      - actual_in
+      - created_at
+      - date_closed
+      - date_estimated
+      - date_exported
+      - date_invoiced
+      - date_open
+      - date_scheduled
+      - scheduled_completion
+      - scheduled_delivery
+      - scheduled_in
+      - updated_at
+      - id
+      - ownerid
+      - shopid
+      - statusid
+      - vehicleid
+      - tax_pstthr
+      - tax_sub_rt
+      - tax_tow_rt
+      computed_fields: []
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1581029875101_update_permission_user_public_table_jobs/down.yaml b/hasura/migrations/1581029875101_update_permission_user_public_table_jobs/down.yaml
new file mode 100644
index 000000000..e25202215
--- /dev/null
+++ b/hasura/migrations/1581029875101_update_permission_user_public_table_jobs/down.yaml
@@ -0,0 +1,243 @@
+- args:
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - actual_completion
+      - actual_delivery
+      - actual_in
+      - adj_g_disc
+      - adj_strdis
+      - adj_towdis
+      - adjustment_bottom_line
+      - agt_addr1
+      - agt_addr2
+      - agt_city
+      - agt_co_id
+      - agt_co_nm
+      - agt_ct_fn
+      - agt_ct_ln
+      - agt_ct_ph
+      - agt_ct_phx
+      - agt_ctry
+      - agt_ea
+      - agt_fax
+      - agt_faxx
+      - agt_lic_no
+      - agt_ph1
+      - agt_ph1x
+      - agt_ph2
+      - agt_ph2x
+      - agt_st
+      - agt_zip
+      - area_of_damage
+      - asgn_date
+      - asgn_no
+      - asgn_type
+      - cat_no
+      - ciecaid
+      - clm_addr1
+      - clm_addr2
+      - clm_city
+      - clm_ct_fn
+      - clm_ct_ln
+      - clm_ct_ph
+      - clm_ct_phx
+      - clm_ctry
+      - clm_ea
+      - clm_fax
+      - clm_faxx
+      - clm_no
+      - clm_ofc_id
+      - clm_ofc_nm
+      - clm_ph1
+      - clm_ph1x
+      - clm_ph2
+      - clm_ph2x
+      - clm_st
+      - clm_title
+      - clm_total
+      - clm_zip
+      - converted
+      - created_at
+      - csr
+      - cust_pr
+      - date_closed
+      - date_estimated
+      - date_exported
+      - date_invoiced
+      - date_open
+      - date_scheduled
+      - ded_amt
+      - ded_status
+      - deductible
+      - depreciation_taxes
+      - est_addr1
+      - est_addr2
+      - est_city
+      - est_co_nm
+      - est_ct_fn
+      - est_ct_ln
+      - est_ctry
+      - est_ea
+      - est_number
+      - est_ph1
+      - est_st
+      - est_zip
+      - federal_tax_payable
+      - federal_tax_rate
+      - id
+      - inproduction
+      - ins_addr1
+      - ins_addr2
+      - ins_city
+      - ins_co_id
+      - ins_co_nm
+      - ins_ct_fn
+      - ins_ct_ln
+      - ins_ct_ph
+      - ins_ct_phx
+      - ins_ctry
+      - ins_ea
+      - ins_fax
+      - ins_faxx
+      - ins_memo
+      - ins_ph1
+      - ins_ph1x
+      - ins_ph2
+      - ins_ph2x
+      - ins_st
+      - ins_title
+      - ins_zip
+      - insd_addr1
+      - insd_addr2
+      - insd_city
+      - insd_co_nm
+      - insd_ctry
+      - insd_ea
+      - insd_fax
+      - insd_faxx
+      - insd_fn
+      - insd_ln
+      - insd_ph1
+      - insd_ph1x
+      - insd_ph2
+      - insd_ph2x
+      - insd_st
+      - insd_title
+      - insd_zip
+      - invoice_date
+      - kmin
+      - kmout
+      - labor_rate_desc
+      - labor_rate_id
+      - local_tax_rate
+      - loss_cat
+      - loss_date
+      - loss_desc
+      - loss_type
+      - other_amount_payable
+      - owner_owing
+      - ownerid
+      - ownr_addr1
+      - ownr_addr2
+      - ownr_city
+      - ownr_co_nm
+      - ownr_ctry
+      - ownr_ea
+      - ownr_fax
+      - ownr_faxx
+      - ownr_fn
+      - ownr_ln
+      - ownr_ph1
+      - ownr_ph1x
+      - ownr_ph2
+      - ownr_ph2x
+      - ownr_st
+      - ownr_title
+      - ownr_zip
+      - pay_amt
+      - pay_chknm
+      - pay_date
+      - pay_type
+      - payee_nms
+      - po_number
+      - policy_no
+      - rate_atp
+      - rate_la1
+      - rate_la2
+      - rate_la3
+      - rate_la4
+      - rate_laa
+      - rate_lab
+      - rate_lad
+      - rate_lae
+      - rate_laf
+      - rate_lag
+      - rate_lam
+      - rate_lar
+      - rate_las
+      - rate_lau
+      - rate_ma2s
+      - rate_ma2t
+      - rate_ma3s
+      - rate_mabl
+      - rate_macs
+      - rate_mahw
+      - rate_mapa
+      - rate_mash
+      - rate_matd
+      - referral_source
+      - regie_number
+      - ro_number
+      - scheduled_completion
+      - scheduled_delivery
+      - scheduled_in
+      - selling_dealer
+      - selling_dealer_contact
+      - service_car
+      - servicing_dealer
+      - servicing_dealer_contact
+      - shopid
+      - special_coverage_policy
+      - state_tax_rate
+      - statusid
+      - storage_payable
+      - tax_lbr_rt
+      - tax_levies_rt
+      - tax_paint_mat_rt
+      - tax_predis
+      - tax_prethr
+      - tax_pstthr
+      - tax_str_rt
+      - tax_sub_rt
+      - tax_thramt
+      - tax_tow_rt
+      - theft_ind
+      - tlos_ind
+      - towing_payable
+      - unit_number
+      - updated_at
+      - vehicleid
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1581029875101_update_permission_user_public_table_jobs/up.yaml b/hasura/migrations/1581029875101_update_permission_user_public_table_jobs/up.yaml
new file mode 100644
index 000000000..973b2115c
--- /dev/null
+++ b/hasura/migrations/1581029875101_update_permission_user_public_table_jobs/up.yaml
@@ -0,0 +1,244 @@
+- args:
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - converted
+      - inproduction
+      - special_coverage_policy
+      - theft_ind
+      - tlos_ind
+      - asgn_date
+      - invoice_date
+      - loss_date
+      - pay_date
+      - kmin
+      - kmout
+      - est_number
+      - area_of_damage
+      - adj_g_disc
+      - adj_strdis
+      - adj_towdis
+      - adjustment_bottom_line
+      - clm_total
+      - ded_amt
+      - deductible
+      - depreciation_taxes
+      - federal_tax_payable
+      - federal_tax_rate
+      - local_tax_rate
+      - other_amount_payable
+      - owner_owing
+      - pay_amt
+      - rate_atp
+      - rate_la1
+      - rate_la2
+      - rate_la3
+      - rate_la4
+      - rate_laa
+      - rate_lab
+      - rate_lad
+      - rate_lae
+      - rate_laf
+      - rate_lag
+      - rate_lam
+      - rate_lar
+      - rate_las
+      - rate_lau
+      - rate_ma2s
+      - rate_ma2t
+      - rate_ma3s
+      - rate_mabl
+      - rate_macs
+      - rate_mahw
+      - rate_mapa
+      - rate_mash
+      - rate_matd
+      - state_tax_rate
+      - storage_payable
+      - tax_lbr_rt
+      - tax_levies_rt
+      - tax_paint_mat_rt
+      - tax_predis
+      - tax_prethr
+      - tax_str_rt
+      - tax_thramt
+      - towing_payable
+      - agt_addr1
+      - agt_addr2
+      - agt_city
+      - agt_co_id
+      - agt_co_nm
+      - agt_ct_fn
+      - agt_ct_ln
+      - agt_ct_ph
+      - agt_ct_phx
+      - agt_ctry
+      - agt_ea
+      - agt_fax
+      - agt_faxx
+      - agt_lic_no
+      - agt_ph1
+      - agt_ph1x
+      - agt_ph2
+      - agt_ph2x
+      - agt_st
+      - agt_zip
+      - asgn_no
+      - asgn_type
+      - cat_no
+      - ciecaid
+      - clm_addr1
+      - clm_addr2
+      - clm_city
+      - clm_ct_fn
+      - clm_ct_ln
+      - clm_ct_ph
+      - clm_ct_phx
+      - clm_ctry
+      - clm_ea
+      - clm_fax
+      - clm_faxx
+      - clm_no
+      - clm_ofc_id
+      - clm_ofc_nm
+      - clm_ph1
+      - clm_ph1x
+      - clm_ph2
+      - clm_ph2x
+      - clm_st
+      - clm_title
+      - clm_zip
+      - csr
+      - cust_pr
+      - ded_status
+      - est_addr1
+      - est_addr2
+      - est_city
+      - est_co_nm
+      - est_ct_fn
+      - est_ct_ln
+      - est_ctry
+      - est_ea
+      - est_ph1
+      - est_st
+      - est_zip
+      - ins_addr1
+      - ins_addr2
+      - ins_city
+      - ins_co_id
+      - ins_co_nm
+      - ins_ct_fn
+      - ins_ct_ln
+      - ins_ct_ph
+      - ins_ct_phx
+      - ins_ctry
+      - insd_addr1
+      - insd_addr2
+      - insd_city
+      - insd_co_nm
+      - insd_ctry
+      - insd_ea
+      - insd_fax
+      - insd_faxx
+      - insd_fn
+      - insd_ln
+      - insd_ph1
+      - insd_ph1x
+      - insd_ph2
+      - insd_ph2x
+      - insd_st
+      - insd_title
+      - insd_zip
+      - ins_ea
+      - ins_fax
+      - ins_faxx
+      - ins_memo
+      - ins_ph1
+      - ins_ph1x
+      - ins_ph2
+      - ins_ph2x
+      - ins_st
+      - ins_title
+      - ins_zip
+      - labor_rate_desc
+      - labor_rate_id
+      - loss_cat
+      - loss_desc
+      - loss_type
+      - ownr_addr1
+      - ownr_addr2
+      - ownr_city
+      - ownr_co_nm
+      - ownr_ctry
+      - ownr_ea
+      - ownr_fax
+      - ownr_faxx
+      - ownr_fn
+      - ownr_ln
+      - ownr_ph1
+      - ownr_ph1x
+      - ownr_ph2
+      - ownr_ph2x
+      - ownr_st
+      - ownr_title
+      - ownr_zip
+      - pay_chknm
+      - payee_nms
+      - pay_type
+      - policy_no
+      - po_number
+      - referral_source
+      - regie_number
+      - ro_number
+      - selling_dealer
+      - selling_dealer_contact
+      - service_car
+      - servicing_dealer
+      - servicing_dealer_contact
+      - status
+      - unit_number
+      - actual_completion
+      - actual_delivery
+      - actual_in
+      - created_at
+      - date_closed
+      - date_estimated
+      - date_exported
+      - date_invoiced
+      - date_open
+      - date_scheduled
+      - scheduled_completion
+      - scheduled_delivery
+      - scheduled_in
+      - updated_at
+      - id
+      - ownerid
+      - shopid
+      - statusid
+      - vehicleid
+      - tax_pstthr
+      - tax_sub_rt
+      - tax_tow_rt
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: jobs
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1581029890395_delete_permission_user_public_table_job_status/down.yaml b/hasura/migrations/1581029890395_delete_permission_user_public_table_job_status/down.yaml
new file mode 100644
index 000000000..d09f1309a
--- /dev/null
+++ b/hasura/migrations/1581029890395_delete_permission_user_public_table_job_status/down.yaml
@@ -0,0 +1,28 @@
+- args:
+    permission:
+      check:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      columns:
+      - id
+      - created_at
+      - updated_at
+      - shopid
+      - name
+      - isproductionstatus
+      - order
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: job_status
+      schema: public
+  type: create_insert_permission
diff --git a/hasura/migrations/1581029890395_delete_permission_user_public_table_job_status/up.yaml b/hasura/migrations/1581029890395_delete_permission_user_public_table_job_status/up.yaml
new file mode 100644
index 000000000..3c01a272c
--- /dev/null
+++ b/hasura/migrations/1581029890395_delete_permission_user_public_table_job_status/up.yaml
@@ -0,0 +1,6 @@
+- args:
+    role: user
+    table:
+      name: job_status
+      schema: public
+  type: drop_insert_permission
diff --git a/hasura/migrations/1581029895198_delete_permission_user_public_table_job_status/down.yaml b/hasura/migrations/1581029895198_delete_permission_user_public_table_job_status/down.yaml
new file mode 100644
index 000000000..646e591b4
--- /dev/null
+++ b/hasura/migrations/1581029895198_delete_permission_user_public_table_job_status/down.yaml
@@ -0,0 +1,26 @@
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - isproductionstatus
+      - order
+      - name
+      - created_at
+      - updated_at
+      - id
+      - shopid
+      computed_fields: []
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+    role: user
+    table:
+      name: job_status
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1581029895198_delete_permission_user_public_table_job_status/up.yaml b/hasura/migrations/1581029895198_delete_permission_user_public_table_job_status/up.yaml
new file mode 100644
index 000000000..85d7d08dd
--- /dev/null
+++ b/hasura/migrations/1581029895198_delete_permission_user_public_table_job_status/up.yaml
@@ -0,0 +1,6 @@
+- args:
+    role: user
+    table:
+      name: job_status
+      schema: public
+  type: drop_select_permission
diff --git a/hasura/migrations/1581029899124_delete_permission_user_public_table_job_status/down.yaml b/hasura/migrations/1581029899124_delete_permission_user_public_table_job_status/down.yaml
new file mode 100644
index 000000000..31c3a7b89
--- /dev/null
+++ b/hasura/migrations/1581029899124_delete_permission_user_public_table_job_status/down.yaml
@@ -0,0 +1,28 @@
+- args:
+    permission:
+      columns:
+      - isproductionstatus
+      - order
+      - name
+      - created_at
+      - updated_at
+      - id
+      - shopid
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      localPresets:
+      - key: ""
+        value: ""
+      set: {}
+    role: user
+    table:
+      name: job_status
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1581029899124_delete_permission_user_public_table_job_status/up.yaml b/hasura/migrations/1581029899124_delete_permission_user_public_table_job_status/up.yaml
new file mode 100644
index 000000000..42b51ea3e
--- /dev/null
+++ b/hasura/migrations/1581029899124_delete_permission_user_public_table_job_status/up.yaml
@@ -0,0 +1,6 @@
+- args:
+    role: user
+    table:
+      name: job_status
+      schema: public
+  type: drop_update_permission
diff --git a/hasura/migrations/1581029904239_delete_permission_user_public_table_job_status/down.yaml b/hasura/migrations/1581029904239_delete_permission_user_public_table_job_status/down.yaml
new file mode 100644
index 000000000..e26a5a3ac
--- /dev/null
+++ b/hasura/migrations/1581029904239_delete_permission_user_public_table_job_status/down.yaml
@@ -0,0 +1,16 @@
+- args:
+    permission:
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+    role: user
+    table:
+      name: job_status
+      schema: public
+  type: create_delete_permission
diff --git a/hasura/migrations/1581029904239_delete_permission_user_public_table_job_status/up.yaml b/hasura/migrations/1581029904239_delete_permission_user_public_table_job_status/up.yaml
new file mode 100644
index 000000000..05f10e122
--- /dev/null
+++ b/hasura/migrations/1581029904239_delete_permission_user_public_table_job_status/up.yaml
@@ -0,0 +1,6 @@
+- args:
+    role: user
+    table:
+      name: job_status
+      schema: public
+  type: drop_delete_permission