From 400dfabcecaa5de26701b861070bb22b6f342272 Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Wed, 22 Apr 2020 11:09:47 -0700
Subject: [PATCH] BOD-21 Added some custom components to render CT, BP, PP to
 production. Schema changes for view to include body and refinish hrs.

---
 bodyshop_translations.babel                   | 254 +++++++++++++++++-
 .../components/header/header.component.jsx    | 131 +++++----
 ...roduction-list-columns.alert.component.jsx |  48 ++++
 ...on-list-columns.bodypriority.component.jsx |  51 ++++
 .../production-list-columns.data.js           |  73 +++--
 ...n-list-columns.paintpriority.component.jsx |  51 ++++
 .../production-list-table.component.jsx       |   8 +-
 .../production-list-table.container.jsx       |   2 +-
 .../production-list-table.styles.scss         |   3 +-
 client/src/graphql/jobs.queries.js            |   5 +-
 client/src/translations/en_us/common.json     |  14 +-
 client/src/translations/es/common.json        |  14 +-
 client/src/translations/fr/common.json        |  14 +-
 .../1587574775829_run_sql_migration/down.yaml |   1 +
 .../1587574775829_run_sql_migration/up.yaml   |  23 ++
 .../down.yaml                                 |   6 +
 .../up.yaml                                   |  13 +
 .../1587575091197_run_sql_migration/down.yaml |   1 +
 .../1587575091197_run_sql_migration/up.yaml   |  16 ++
 .../down.yaml                                 |   8 +
 .../up.yaml                                   |   6 +
 .../down.yaml                                 |   6 +
 .../up.yaml                                   |  13 +
 .../down.yaml                                 |   6 +
 .../up.yaml                                   |  43 +++
 25 files changed, 703 insertions(+), 107 deletions(-)
 create mode 100644 client/src/components/production-list-columns/production-list-columns.alert.component.jsx
 create mode 100644 client/src/components/production-list-columns/production-list-columns.bodypriority.component.jsx
 create mode 100644 client/src/components/production-list-columns/production-list-columns.paintpriority.component.jsx
 create mode 100644 hasura/migrations/1587574775829_run_sql_migration/down.yaml
 create mode 100644 hasura/migrations/1587574775829_run_sql_migration/up.yaml
 create mode 100644 hasura/migrations/1587574953110_create_relationship_bodyshop_public_table_productionview/down.yaml
 create mode 100644 hasura/migrations/1587574953110_create_relationship_bodyshop_public_table_productionview/up.yaml
 create mode 100644 hasura/migrations/1587575091197_run_sql_migration/down.yaml
 create mode 100644 hasura/migrations/1587575091197_run_sql_migration/up.yaml
 create mode 100644 hasura/migrations/1587575103804_drop_relationship_bodyshop_public_table_productionview/down.yaml
 create mode 100644 hasura/migrations/1587575103804_drop_relationship_bodyshop_public_table_productionview/up.yaml
 create mode 100644 hasura/migrations/1587575121219_create_relationship_bodyshop_public_table_productionview/down.yaml
 create mode 100644 hasura/migrations/1587575121219_create_relationship_bodyshop_public_table_productionview/up.yaml
 create mode 100644 hasura/migrations/1587575154011_update_permission_user_public_table_productionview/down.yaml
 create mode 100644 hasura/migrations/1587575154011_update_permission_user_public_table_productionview/up.yaml

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index e9bf09b71..7ee01f302 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.6.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.6.1">
     <!--
 
     BabelEdit project file
@@ -8184,6 +8184,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>bodyhours</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>
                                     <folder_node>
                                         <name>cards</name>
                                         <children>
@@ -8850,6 +8871,27 @@
                                             </concept_node>
                                         </children>
                                     </folder_node>
+                                    <concept_node>
+                                        <name>refinishhours</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>vehicle_info</name>
                                         <definition_loaded>false</definition_loaded>
@@ -9437,6 +9479,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>productionlist</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>schedule</name>
                                         <definition_loaded>false</definition_loaded>
@@ -11011,6 +11074,90 @@
                             <folder_node>
                                 <name>actions</name>
                                 <children>
+                                    <concept_node>
+                                        <name>bodypriority-clear</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>bodypriority-set</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>paintpriority-clear</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>paintpriority-set</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>saveconfig</name>
                                         <definition_loaded>false</definition_loaded>
@@ -11058,6 +11205,90 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>alertoff</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>alerton</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>bodypriority</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>cycletime</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>note</name>
                                         <definition_loaded>false</definition_loaded>
@@ -11079,6 +11310,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>paintpriority</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>
                         </children>
diff --git a/client/src/components/header/header.component.jsx b/client/src/components/header/header.component.jsx
index d7d158480..f1722a591 100644
--- a/client/src/components/header/header.component.jsx
+++ b/client/src/components/header/header.component.jsx
@@ -42,29 +42,28 @@ function Header({
   //TODO Add
 
   return (
-    <Row type="flex" justify="space-around" align="middle">
+    <Row type='flex' justify='space-around' align='middle'>
       {logo ? (
         <Col span={3}>
-          <img alt="Shop Logo" src={logo} style={{ height: "40px" }} />
+          <img alt='Shop Logo' src={logo} style={{ height: "40px" }} />
         </Col>
       ) : null}
       <Col span={21}>
         {landingHeader ? (
           <Menu
-            theme="dark"
-            className="header"
+            theme='dark'
+            className='header'
             selectedKeys={selectedNavItem}
-            mode="horizontal"
-            onClick={handleMenuClick}
-          >
+            mode='horizontal'
+            onClick={handleMenuClick}>
             <ManageSignInButton />
 
             <Menu.SubMenu
               title={
                 <div>
                   <Avatar
-                    size="medium"
-                    alt="Avatar"
+                    size='medium'
+                    alt='Avatar'
                     src={
                       currentUser.photoURL ? currentUser.photoURL : UserImage
                     }
@@ -72,13 +71,12 @@ function Header({
                   />
                   {currentUser.displayName || t("general.labels.unknown")}
                 </div>
-              }
-            >
+              }>
               <Menu.Item onClick={() => signOutStart()}>
                 {t("user.actions.signout")}
               </Menu.Item>
               <Menu.Item>
-                <Link to="/manage/profile">
+                <Link to='/manage/profile'>
                   {t("menus.currentuser.profile")}
                 </Link>
               </Menu.Item>
@@ -88,15 +86,14 @@ function Header({
                     <GlobalOutlined />
                     <span>{t("menus.currentuser.languageselector")}</span>
                   </span>
-                }
-              >
-                <Menu.Item actiontype="lang-select" key="en-US">
+                }>
+                <Menu.Item actiontype='lang-select' key='en-US'>
                   {t("general.languages.english")}
                 </Menu.Item>
-                <Menu.Item actiontype="lang-select" key="fr-CA">
+                <Menu.Item actiontype='lang-select' key='fr-CA'>
                   {t("general.languages.french")}
                 </Menu.Item>
-                <Menu.Item actiontype="lang-select" key="es-MX">
+                <Menu.Item actiontype='lang-select' key='es-MX'>
                   {t("general.languages.spanish")}
                 </Menu.Item>
               </Menu.SubMenu>
@@ -104,14 +101,13 @@ function Header({
           </Menu>
         ) : (
           <Menu
-            theme="dark"
-            className="header"
+            theme='dark'
+            className='header'
             selectedKeys={selectedNavItem}
-            mode="horizontal"
-            onClick={handleMenuClick}
-          >
-            <Menu.Item key="home">
-              <Link to="/manage">
+            mode='horizontal'
+            onClick={handleMenuClick}>
+            <Menu.Item key='home'>
+              <Link to='/manage'>
                 <HomeFilled />
                 {t("menus.header.home")}
               </Link>
@@ -122,32 +118,37 @@ function Header({
                   <Icon component={FaCarCrash} />
                   <span>{t("menus.header.jobs")}</span>
                 </span>
-              }
-            >
-              <Menu.Item key="schedule">
-                <Link to="/manage/schedule">
+              }>
+              <Menu.Item key='schedule'>
+                <Link to='/manage/schedule'>
                   <Icon component={FaCalendarAlt} />
                   {t("menus.header.schedule")}
                 </Link>
               </Menu.Item>
-              <Menu.Item key="activejobs">
-                <Link to="/manage/jobs">{t("menus.header.activejobs")}</Link>
+              <Menu.Item key='production'>
+                <Link to='/manage/production/list'>
+                  <Icon component={FaCalendarAlt} />
+                  {t("menus.header.productionlist")}
+                </Link>
               </Menu.Item>
-              <Menu.Item key="availablejobs">
-                <Link to="/manage/available">
+              <Menu.Item key='activejobs'>
+                <Link to='/manage/jobs'>{t("menus.header.activejobs")}</Link>
+              </Menu.Item>
+              <Menu.Item key='availablejobs'>
+                <Link to='/manage/available'>
                   {t("menus.header.availablejobs")}
                 </Link>
               </Menu.Item>
             </Menu.SubMenu>
             <Menu.SubMenu title={t("menus.header.customers")}>
-              <Menu.Item key="owners">
-                <Link to="/manage/owners">
+              <Menu.Item key='owners'>
+                <Link to='/manage/owners'>
                   <TeamOutlined />
                   {t("menus.header.owners")}
                 </Link>
               </Menu.Item>
-              <Menu.Item key="vehicles">
-                <Link to="/manage/vehicles">
+              <Menu.Item key='vehicles'>
+                <Link to='/manage/vehicles'>
                   <CarFilled />
                   {t("menus.header.vehicles")}
                 </Link>
@@ -160,22 +161,21 @@ function Header({
                   <CarFilled />
                   <span>{t("menus.header.courtesycars")}</span>
                 </span>
-              }
-            >
-              <Menu.Item key="courtesycarsall">
-                <Link to="/manage/courtesycars">
+              }>
+              <Menu.Item key='courtesycarsall'>
+                <Link to='/manage/courtesycars'>
                   <CarFilled />
                   {t("menus.header.courtesycars-all")}
                 </Link>
               </Menu.Item>
-              <Menu.Item key="contracts">
-                <Link to="/manage/courtesycars/contracts">
+              <Menu.Item key='contracts'>
+                <Link to='/manage/courtesycars/contracts'>
                   <FileFilled />
                   {t("menus.header.courtesycars-contracts")}
                 </Link>
               </Menu.Item>
-              <Menu.Item key="newcontract">
-                <Link to="/manage/courtesycars/contracts/new">
+              <Menu.Item key='newcontract'>
+                <Link to='/manage/courtesycars/contracts/new'>
                   <FileAddFilled />
                   {t("menus.header.courtesycars-newcontract")}
                 </Link>
@@ -188,41 +188,38 @@ function Header({
                   <DollarCircleFilled />
                   <span>{t("menus.header.accounting")}</span>
                 </span>
-              }
-            >
+              }>
               <Menu.Item
-                key="enterinvoices"
+                key='enterinvoices'
                 onClick={() => {
                   setInvoiceEnterContext({
                     actions: {},
                     context: {},
                   });
-                }}
-              >
+                }}>
                 {t("menus.header.enterinvoices")}
               </Menu.Item>
-              <Menu.Item key="invoices">
-                <Link to="/manage/invoices">{t("menus.header.invoices")}</Link>
+              <Menu.Item key='invoices'>
+                <Link to='/manage/invoices'>{t("menus.header.invoices")}</Link>
               </Menu.Item>
               <Menu.Item
-                key="entertimetickets"
+                key='entertimetickets'
                 onClick={() => {
                   setTimeTicketContext({
                     actions: {},
                     context: {},
                   });
-                }}
-              >
+                }}>
                 {t("menus.header.entertimeticket")}
               </Menu.Item>
             </Menu.SubMenu>
 
             <Menu.SubMenu title={t("menus.header.shop")}>
-              <Menu.Item key="shop">
-                <Link to="/manage/shop">{t("menus.header.shop_config")}</Link>
+              <Menu.Item key='shop'>
+                <Link to='/manage/shop'>{t("menus.header.shop_config")}</Link>
               </Menu.Item>
-              <Menu.Item key="shop-vendors">
-                <Link to="/manage/shop/vendors">
+              <Menu.Item key='shop-vendors'>
+                <Link to='/manage/shop/vendors'>
                   {t("menus.header.shop_vendors")}
                 </Link>
               </Menu.Item>
@@ -232,8 +229,8 @@ function Header({
               title={
                 <div>
                   <Avatar
-                    size="medium"
-                    alt="Avatar"
+                    size='medium'
+                    alt='Avatar'
                     src={
                       currentUser.photoURL ? currentUser.photoURL : UserImage
                     }
@@ -241,13 +238,12 @@ function Header({
                   />
                   {currentUser.displayName || t("general.labels.unknown")}
                 </div>
-              }
-            >
+              }>
               <Menu.Item onClick={() => signOutStart()}>
                 {t("user.actions.signout")}
               </Menu.Item>
               <Menu.Item>
-                <Link to="/manage/profile">
+                <Link to='/manage/profile'>
                   {t("menus.currentuser.profile")}
                 </Link>
               </Menu.Item>
@@ -257,15 +253,14 @@ function Header({
                     <GlobalOutlined />
                     <span>{t("menus.currentuser.languageselector")}</span>
                   </span>
-                }
-              >
-                <Menu.Item actiontype="lang-select" key="en-US">
+                }>
+                <Menu.Item actiontype='lang-select' key='en-US'>
                   {t("general.languages.english")}
                 </Menu.Item>
-                <Menu.Item actiontype="lang-select" key="fr-CA">
+                <Menu.Item actiontype='lang-select' key='fr-CA'>
                   {t("general.languages.french")}
                 </Menu.Item>
-                <Menu.Item actiontype="lang-select" key="es-MX">
+                <Menu.Item actiontype='lang-select' key='es-MX'>
                   {t("general.languages.spanish")}
                 </Menu.Item>
               </Menu.SubMenu>
diff --git a/client/src/components/production-list-columns/production-list-columns.alert.component.jsx b/client/src/components/production-list-columns/production-list-columns.alert.component.jsx
new file mode 100644
index 000000000..d04892d74
--- /dev/null
+++ b/client/src/components/production-list-columns/production-list-columns.alert.component.jsx
@@ -0,0 +1,48 @@
+import { ExclamationCircleFilled } from "@ant-design/icons";
+import { Dropdown, Menu } from "antd";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { useMutation } from "@apollo/react-hooks";
+import { UPDATE_JOB } from "../../graphql/jobs.queries";
+
+export default function ProductionListColumnAlert({ record }) {
+  const { t } = useTranslation();
+
+  const [updateAlert] = useMutation(UPDATE_JOB);
+
+  const handleAlertToggle = () => {
+    updateAlert({
+      variables: {
+        jobId: record.id,
+        job: {
+          production_vars: {
+            ...record.production_vars,
+            alert: !record.production_vars.alert,
+          },
+        },
+      },
+    }).then(() => {
+      if (record.refetch) record.refetch();
+    });
+  };
+
+  return (
+    <Dropdown
+      overlay={
+        <Menu>
+          <Menu.Item key='toggleAlert' onClick={handleAlertToggle}>
+            {record.production_vars && record.production_vars.alert
+              ? t("production.labels.alertoff")
+              : t("production.labels.alerton")}
+          </Menu.Item>
+        </Menu>
+      }
+      trigger={["contextMenu"]}>
+      <div style={{ width: "100%", height: "19px" }}>
+        {record.production_vars && record.production_vars.alert ? (
+          <ExclamationCircleFilled className='production-alert' />
+        ) : null}
+      </div>
+    </Dropdown>
+  );
+}
diff --git a/client/src/components/production-list-columns/production-list-columns.bodypriority.component.jsx b/client/src/components/production-list-columns/production-list-columns.bodypriority.component.jsx
new file mode 100644
index 000000000..e0cb514ec
--- /dev/null
+++ b/client/src/components/production-list-columns/production-list-columns.bodypriority.component.jsx
@@ -0,0 +1,51 @@
+import { useMutation } from "@apollo/react-hooks";
+import { Dropdown, Menu } from "antd";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { UPDATE_JOB } from "../../graphql/jobs.queries";
+
+export default function ProductionListColumnBodyPriority({ record }) {
+  const { t } = useTranslation();
+
+  const [updateAlert] = useMutation(UPDATE_JOB);
+
+  const handleSetBodyPriority = (e) => {
+    const { key } = e;
+    updateAlert({
+      variables: {
+        jobId: record.id,
+        job: {
+          production_vars: {
+            ...record.production_vars,
+            bodypriority: key === "clearBodyPriority" ? null : key,
+          },
+        },
+      },
+    }).then(() => {
+      if (record.refetch) record.refetch();
+    });
+  };
+
+  return (
+    <Dropdown
+      overlay={
+        <Menu onClick={handleSetBodyPriority}>
+          <Menu.Item key='clearBodyPriority'>
+            {t("production.actions.bodypriority-clear")}
+          </Menu.Item>
+          <Menu.SubMenu
+            key='set'
+            title={t("production.actions.bodypriority-set")}>
+            {new Array(9).fill().map((value, index) => (
+              <Menu.Item key={index + 1}>{index + 1}</Menu.Item>
+            ))}
+          </Menu.SubMenu>
+        </Menu>
+      }
+      trigger={["contextMenu"]}>
+      <div style={{ width: "100%", height: "19px" }}>
+        {record.production_vars && record.production_vars.bodypriority}
+      </div>
+    </Dropdown>
+  );
+}
diff --git a/client/src/components/production-list-columns/production-list-columns.data.js b/client/src/components/production-list-columns/production-list-columns.data.js
index 246944bc3..5b8843f5a 100644
--- a/client/src/components/production-list-columns/production-list-columns.data.js
+++ b/client/src/components/production-list-columns/production-list-columns.data.js
@@ -5,8 +5,9 @@ import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter } from "../../utils/DateFormatter";
 import PhoneFormatter from "../../utils/PhoneFormatter";
 import { alphaSort } from "../../utils/sorters";
-import { ExclamationCircleFilled } from "@ant-design/icons";
-import { Menu, Dropdown } from "antd";
+import ProductionListColumnAlert from "./production-list-columns.alert.component";
+import ProductionListColumnBodyPriority from "./production-list-columns.bodypriority.component";
+import ProductionListColumnPaintPriority from "./production-list-columns.paintpriority.component";
 
 export default [
   {
@@ -133,32 +134,25 @@ export default [
     dataIndex: "status",
     key: "status",
     ellipsis: true,
+    sorter: (a, b) => alphaSort(a.status, b.status),
+  },
+  {
+    title: i18n.t("jobs.labels.bodyhours"),
+    dataIndex: "labhrs",
+    key: "labhrs",
+    sorter: (a, b) => a.labhrs - b.labhrs,
+  },
+  {
+    title: i18n.t("jobs.labels.refinishhours"),
+    dataIndex: "larhrs",
+    key: "larhrs",
+    sorter: (a, b) => a.larhrs - b.larhrs,
   },
   {
     title: i18n.t("production.labels.alert"),
     dataIndex: "alert",
     key: "alert",
-    render: (text, record) => (
-      <Dropdown
-        overlay={
-          <Menu>
-            <Menu.Item key="1">1st menu item {text}</Menu.Item>
-            <Menu.Item key="2">2nd menu item</Menu.Item>
-            <Menu.Item key="3">3rd menu item</Menu.Item>
-          </Menu>
-        }
-        trigger={["contextMenu"]}
-      >
-        <div
-          onClick={() => console.log("Hi")}
-          style={{ width: "100%", height: "19px" }}
-        >
-          {record.production_vars && record.production_vars.alert ? (
-            <ExclamationCircleFilled className="production-alert" />
-          ) : null}
-        </div>
-      </Dropdown>
-    ),
+    render: (text, record) => <ProductionListColumnAlert record={record} />,
   },
   {
     title: i18n.t("production.labels.note"),
@@ -175,11 +169,34 @@ export default [
     dataIndex: "ct",
     key: "ct",
     render: (text, record) => {
-      return (
-        <span>
-          {(record.production_vars && record.production_vars.note) || ""}
-        </span>
-      );
+      let ct = 0;
+      if (!!record.actual_in) {
+        const totalHrs = record.larhrs + record.labhrs;
+        const Difference_In_Time = new Date() - new Date(record.actual_in);
+        const Difference_In_Days = Difference_In_Time / (1000 * 3600 * 24);
+        ct = (totalHrs / Difference_In_Days).toFixed(2);
+      }
+      return <span>{ct || 0}</span>;
     },
   },
+  {
+    title: i18n.t("production.labels.bodypriority"),
+    dataIndex: "bodypriority",
+    key: "bodypriority",
+    sorter: (a, b) =>
+      a.production_vars.bodypriority - b.production_vars.bodypriority,
+    render: (text, record) => (
+      <ProductionListColumnBodyPriority record={record} />
+    ),
+  },
+  {
+    title: i18n.t("production.labels.paintpriority"),
+    dataIndex: "paintpriority",
+    key: "paintpriority",
+    sorter: (a, b) =>
+      a.production_vars.paintpriority - b.production_vars.paintpriority,
+    render: (text, record) => (
+      <ProductionListColumnPaintPriority record={record} />
+    ),
+  },
 ];
diff --git a/client/src/components/production-list-columns/production-list-columns.paintpriority.component.jsx b/client/src/components/production-list-columns/production-list-columns.paintpriority.component.jsx
new file mode 100644
index 000000000..007776b92
--- /dev/null
+++ b/client/src/components/production-list-columns/production-list-columns.paintpriority.component.jsx
@@ -0,0 +1,51 @@
+import { useMutation } from "@apollo/react-hooks";
+import { Dropdown, Menu } from "antd";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { UPDATE_JOB } from "../../graphql/jobs.queries";
+
+export default function ProductionListColumnPaintPriority({ record }) {
+  const { t } = useTranslation();
+
+  const [updateAlert] = useMutation(UPDATE_JOB);
+
+  const handleSetPaintPriority = (e) => {
+    const { key } = e;
+    updateAlert({
+      variables: {
+        jobId: record.id,
+        job: {
+          production_vars: {
+            ...record.production_vars,
+            paintpriority: key === "clearPaintPriority" ? null : key,
+          },
+        },
+      },
+    }).then(() => {
+      if (record.refetch) record.refetch();
+    });
+  };
+
+  return (
+    <Dropdown
+      overlay={
+        <Menu onClick={handleSetPaintPriority}>
+          <Menu.Item key='clearPaintPriority'>
+            {t("production.actions.paintpriority-clear")}
+          </Menu.Item>
+          <Menu.SubMenu
+            key='set'
+            title={t("production.actions.paintpriority-set")}>
+            {new Array(9).fill().map((value, index) => (
+              <Menu.Item key={index + 1}>{index + 1}</Menu.Item>
+            ))}
+          </Menu.SubMenu>
+        </Menu>
+      }
+      trigger={["contextMenu"]}>
+      <div style={{ width: "100%", height: "19px" }}>
+        {record.production_vars && record.production_vars.paintpriority}
+      </div>
+    </Dropdown>
+  );
+}
diff --git a/client/src/components/production-list-table/production-list-table.component.jsx b/client/src/components/production-list-table/production-list-table.component.jsx
index dc0066541..7805eb4ce 100644
--- a/client/src/components/production-list-table/production-list-table.component.jsx
+++ b/client/src/components/production-list-table/production-list-table.component.jsx
@@ -45,9 +45,10 @@ export function ProductionListTable({
   if (!!!columns) return <div>No columns found.</div>;
 
   return (
-    <ReactDragListView.DragColumn onDragEnd={onDragEnd} nodeSelector="th">
+    <ReactDragListView.DragColumn onDragEnd={onDragEnd} nodeSelector='th'>
       <Table
-        size="small"
+        size='small'
+        pagination={false}
         title={() => (
           <div>
             <ProductionListSaveConfigButton
@@ -67,11 +68,12 @@ export function ProductionListTable({
               state.sortedInfo.columnKey === c.key && state.sortedInfo.order,
           };
         })}
-        rowKey="id"
+        rowKey='id'
         loading={loading}
         dataSource={data}
         onChange={handleTableChange}
         rowClassName={(record, index) => (index % 2 === 0 ? "red" : "blue")} //TODO What could be good usage here?
+        onRow={(record, index) => (record.refetch = refetch)}
       />
     </ReactDragListView.DragColumn>
   );
diff --git a/client/src/components/production-list-table/production-list-table.container.jsx b/client/src/components/production-list-table/production-list-table.container.jsx
index f27a4ad28..652601a01 100644
--- a/client/src/components/production-list-table/production-list-table.container.jsx
+++ b/client/src/components/production-list-table/production-list-table.container.jsx
@@ -12,7 +12,7 @@ export default function ProductionListTableContainer({ columnState }) {
     <div>
       <ProductionListTable
         loading={loading}
-        data={data ? data.jobs : []}
+        data={data ? data.productionview : []}
         refetch={refetch}
         columnState={columnState}
       />
diff --git a/client/src/components/production-list-table/production-list-table.styles.scss b/client/src/components/production-list-table/production-list-table.styles.scss
index 2c0f587de..43bf298ff 100644
--- a/client/src/components/production-list-table/production-list-table.styles.scss
+++ b/client/src/components/production-list-table/production-list-table.styles.scss
@@ -1,9 +1,10 @@
 .production-alert {
-  animation: alertBlinker 2s linear infinite;
+  animation: alertBlinker 1s linear infinite;
 }
 @keyframes alertBlinker {
   50% {
     color: red;
+    opacity: 100;
     //opacity: 0;
   }
 }
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index ebcf0b055..f303cf909 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -52,7 +52,7 @@ export const QUERY_ALL_ACTIVE_JOBS = gql`
 
 export const QUERY_JOBS_IN_PRODUCTION = gql`
   query QUERY_JOBS_IN_PRODUCTION {
-    jobs {
+    productionview {
       id
       status
       ro_number
@@ -72,8 +72,9 @@ export const QUERY_JOBS_IN_PRODUCTION = gql`
       clm_total
       ownr_ph1
       special_coverage_policy
-      status
       production_vars
+      labhrs
+      larhrs
     }
   }
 `;
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 72866dfbf..6ad894fc3 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -528,6 +528,7 @@
 				"audit": "Audit Trail",
 				"availablenew": "Available New Jobs",
 				"availablesupplements": "Available Supplements",
+				"bodyhours": "Body Hrs",
 				"cards": {
 					"appraiser": "Appraiser",
 					"customer": "Customer Information",
@@ -565,6 +566,7 @@
 				"ratetotals": {
 					"lab": "Body Total"
 				},
+				"refinishhours": "Refinish Hrs",
 				"vehicle_info": "Vehicle"
 			},
 			"successes": {
@@ -600,6 +602,7 @@
 				"invoices": "Invoices",
 				"jobs": "Jobs",
 				"owners": "Owners",
+				"productionlist": "Production - List",
 				"schedule": "Schedule",
 				"shop": "My Shop",
 				"shop_config": "Configuration",
@@ -719,11 +722,20 @@
 		},
 		"production": {
 			"actions": {
+				"bodypriority-clear": "Clear Body Priority",
+				"bodypriority-set": "Set Body Priority",
+				"paintpriority-clear": "Clear Paint Priority",
+				"paintpriority-set": "Set Paint Priority",
 				"saveconfig": "Save Configuration"
 			},
 			"labels": {
 				"alert": "Alert",
-				"note": "Production Note"
+				"alertoff": "Remove alert from job",
+				"alerton": "Add alert to job",
+				"bodypriority": "B/P",
+				"cycletime": "C/T",
+				"note": "Production Note",
+				"paintpriority": "P/P"
 			}
 		},
 		"profile": {
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 3722edf55..09c47fcbc 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -528,6 +528,7 @@
 				"audit": "",
 				"availablenew": "",
 				"availablesupplements": "",
+				"bodyhours": "",
 				"cards": {
 					"appraiser": "Tasador",
 					"customer": "Información al cliente",
@@ -565,6 +566,7 @@
 				"ratetotals": {
 					"lab": ""
 				},
+				"refinishhours": "",
 				"vehicle_info": "Vehículo"
 			},
 			"successes": {
@@ -600,6 +602,7 @@
 				"invoices": "",
 				"jobs": "Trabajos",
 				"owners": "propietarios",
+				"productionlist": "",
 				"schedule": "Programar",
 				"shop": "Mi tienda",
 				"shop_config": "Configuración",
@@ -719,11 +722,20 @@
 		},
 		"production": {
 			"actions": {
+				"bodypriority-clear": "",
+				"bodypriority-set": "",
+				"paintpriority-clear": "",
+				"paintpriority-set": "",
 				"saveconfig": ""
 			},
 			"labels": {
 				"alert": "",
-				"note": ""
+				"alertoff": "",
+				"alerton": "",
+				"bodypriority": "",
+				"cycletime": "",
+				"note": "",
+				"paintpriority": ""
 			}
 		},
 		"profile": {
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 42a793663..abd197d87 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -528,6 +528,7 @@
 				"audit": "",
 				"availablenew": "",
 				"availablesupplements": "",
+				"bodyhours": "",
 				"cards": {
 					"appraiser": "Expert",
 					"customer": "Informations client",
@@ -565,6 +566,7 @@
 				"ratetotals": {
 					"lab": ""
 				},
+				"refinishhours": "",
 				"vehicle_info": "Véhicule"
 			},
 			"successes": {
@@ -600,6 +602,7 @@
 				"invoices": "",
 				"jobs": "Emplois",
 				"owners": "Propriétaires",
+				"productionlist": "",
 				"schedule": "Programme",
 				"shop": "Mon magasin",
 				"shop_config": "Configuration",
@@ -719,11 +722,20 @@
 		},
 		"production": {
 			"actions": {
+				"bodypriority-clear": "",
+				"bodypriority-set": "",
+				"paintpriority-clear": "",
+				"paintpriority-set": "",
 				"saveconfig": ""
 			},
 			"labels": {
 				"alert": "",
-				"note": ""
+				"alertoff": "",
+				"alerton": "",
+				"bodypriority": "",
+				"cycletime": "",
+				"note": "",
+				"paintpriority": ""
 			}
 		},
 		"profile": {
diff --git a/hasura/migrations/1587574775829_run_sql_migration/down.yaml b/hasura/migrations/1587574775829_run_sql_migration/down.yaml
new file mode 100644
index 000000000..fe51488c7
--- /dev/null
+++ b/hasura/migrations/1587574775829_run_sql_migration/down.yaml
@@ -0,0 +1 @@
+[]
diff --git a/hasura/migrations/1587574775829_run_sql_migration/up.yaml b/hasura/migrations/1587574775829_run_sql_migration/up.yaml
new file mode 100644
index 000000000..2619b9b6c
--- /dev/null
+++ b/hasura/migrations/1587574775829_run_sql_migration/up.yaml
@@ -0,0 +1,23 @@
+- args:
+    cascade: true
+    read_only: false
+    sql: "create view productionview as \r\nselect       j.id                      ,\r\n
+      \     j.status                  ,\r\n      j.ro_number               ,\r\n      j.est_number
+      \             ,\r\n      j.ownr_fn                 ,\r\n      j.ownr_ln                 ,\r\n
+      \     j.v_model_yr              ,\r\n      j.v_model_desc            ,\r\n      j.clm_no
+      \                 ,\r\n      j.v_make_desc             ,\r\n      j.v_color
+      \                ,\r\n      j.plate_no                ,\r\n      j.actual_in
+      \              ,\r\n      j.scheduled_completion    ,\r\n      j.scheduled_delivery
+      \     ,\r\n      j.ins_co_nm               ,\r\n      j.clm_total               ,\r\n
+      \     j.ownr_ph1                ,\r\n      j.special_coverage_policy ,\r\n      j.production_vars
+      \        ,\r\n      lab.labhrs, lar.larhrs\r\n      from public.jobs j\r\n      left
+      join       \r\n      (select l.jobid, sum(l.mod_lb_hrs )  labhrs from public.joblines
+      l where mod_lbr_ty = 'LAB' group by l.jobid )  lab on lab.jobid = j.id  \r\n
+      \     left join (select l2.jobid, sum(l2.mod_lb_hrs )  larhrs from public.joblines
+      l2 where mod_lbr_ty = 'LAR' group by l2.jobid )  lar on lar.jobid = j.id\r\n
+      \     where j.inproduction =true;"
+  type: run_sql
+- args:
+    name: productionview
+    schema: public
+  type: add_existing_table_or_view
diff --git a/hasura/migrations/1587574953110_create_relationship_bodyshop_public_table_productionview/down.yaml b/hasura/migrations/1587574953110_create_relationship_bodyshop_public_table_productionview/down.yaml
new file mode 100644
index 000000000..c8bccabac
--- /dev/null
+++ b/hasura/migrations/1587574953110_create_relationship_bodyshop_public_table_productionview/down.yaml
@@ -0,0 +1,6 @@
+- args:
+    relationship: bodyshop
+    table:
+      name: productionview
+      schema: public
+  type: drop_relationship
diff --git a/hasura/migrations/1587574953110_create_relationship_bodyshop_public_table_productionview/up.yaml b/hasura/migrations/1587574953110_create_relationship_bodyshop_public_table_productionview/up.yaml
new file mode 100644
index 000000000..f8844bb39
--- /dev/null
+++ b/hasura/migrations/1587574953110_create_relationship_bodyshop_public_table_productionview/up.yaml
@@ -0,0 +1,13 @@
+- args:
+    name: bodyshop
+    table:
+      name: productionview
+      schema: public
+    using:
+      manual_configuration:
+        column_mapping:
+          id: id
+        remote_table:
+          name: jobs
+          schema: public
+  type: create_object_relationship
diff --git a/hasura/migrations/1587575091197_run_sql_migration/down.yaml b/hasura/migrations/1587575091197_run_sql_migration/down.yaml
new file mode 100644
index 000000000..fe51488c7
--- /dev/null
+++ b/hasura/migrations/1587575091197_run_sql_migration/down.yaml
@@ -0,0 +1 @@
+[]
diff --git a/hasura/migrations/1587575091197_run_sql_migration/up.yaml b/hasura/migrations/1587575091197_run_sql_migration/up.yaml
new file mode 100644
index 000000000..a537dc96a
--- /dev/null
+++ b/hasura/migrations/1587575091197_run_sql_migration/up.yaml
@@ -0,0 +1,16 @@
+- args:
+    cascade: true
+    read_only: false
+    sql: "CREATE OR REPLACE VIEW \"public\".\"productionview\" AS \n SELECT j.id,\n
+      \   j.status,\n    j.ro_number,\n    j.est_number,\n    j.ownr_fn,\n    j.ownr_ln,\n
+      \   j.v_model_yr,\n    j.v_model_desc,\n    j.clm_no,\n    j.v_make_desc,\n
+      \   j.v_color,\n    j.plate_no,\n    j.actual_in,\n    j.scheduled_completion,\n
+      \   j.scheduled_delivery,\n    j.ins_co_nm,\n    j.clm_total,\n    j.ownr_ph1,\n
+      \   j.special_coverage_policy,\n    j.production_vars,\n    lab.labhrs,\n    lar.larhrs,\n
+      \   j.shopid\n   FROM ((jobs j\n     LEFT JOIN ( SELECT l.jobid,\n            sum(l.mod_lb_hrs)
+      AS labhrs\n           FROM joblines l\n          WHERE (l.mod_lbr_ty = 'LAB'::text)\n
+      \         GROUP BY l.jobid) lab ON ((lab.jobid = j.id)))\n     LEFT JOIN ( SELECT
+      l2.jobid,\n            sum(l2.mod_lb_hrs) AS larhrs\n           FROM joblines
+      l2\n          WHERE (l2.mod_lbr_ty = 'LAR'::text)\n          GROUP BY l2.jobid)
+      lar ON ((lar.jobid = j.id)))\n  WHERE (j.inproduction = true);"
+  type: run_sql
diff --git a/hasura/migrations/1587575103804_drop_relationship_bodyshop_public_table_productionview/down.yaml b/hasura/migrations/1587575103804_drop_relationship_bodyshop_public_table_productionview/down.yaml
new file mode 100644
index 000000000..cceca611c
--- /dev/null
+++ b/hasura/migrations/1587575103804_drop_relationship_bodyshop_public_table_productionview/down.yaml
@@ -0,0 +1,8 @@
+- args:
+    name: bodyshop
+    table:
+      name: productionview
+      schema: public
+    using:
+      foreign_key_constraint_on: id
+  type: create_object_relationship
diff --git a/hasura/migrations/1587575103804_drop_relationship_bodyshop_public_table_productionview/up.yaml b/hasura/migrations/1587575103804_drop_relationship_bodyshop_public_table_productionview/up.yaml
new file mode 100644
index 000000000..c8bccabac
--- /dev/null
+++ b/hasura/migrations/1587575103804_drop_relationship_bodyshop_public_table_productionview/up.yaml
@@ -0,0 +1,6 @@
+- args:
+    relationship: bodyshop
+    table:
+      name: productionview
+      schema: public
+  type: drop_relationship
diff --git a/hasura/migrations/1587575121219_create_relationship_bodyshop_public_table_productionview/down.yaml b/hasura/migrations/1587575121219_create_relationship_bodyshop_public_table_productionview/down.yaml
new file mode 100644
index 000000000..c8bccabac
--- /dev/null
+++ b/hasura/migrations/1587575121219_create_relationship_bodyshop_public_table_productionview/down.yaml
@@ -0,0 +1,6 @@
+- args:
+    relationship: bodyshop
+    table:
+      name: productionview
+      schema: public
+  type: drop_relationship
diff --git a/hasura/migrations/1587575121219_create_relationship_bodyshop_public_table_productionview/up.yaml b/hasura/migrations/1587575121219_create_relationship_bodyshop_public_table_productionview/up.yaml
new file mode 100644
index 000000000..b91854674
--- /dev/null
+++ b/hasura/migrations/1587575121219_create_relationship_bodyshop_public_table_productionview/up.yaml
@@ -0,0 +1,13 @@
+- args:
+    name: bodyshop
+    table:
+      name: productionview
+      schema: public
+    using:
+      manual_configuration:
+        column_mapping:
+          shopid: id
+        remote_table:
+          name: bodyshops
+          schema: public
+  type: create_object_relationship
diff --git a/hasura/migrations/1587575154011_update_permission_user_public_table_productionview/down.yaml b/hasura/migrations/1587575154011_update_permission_user_public_table_productionview/down.yaml
new file mode 100644
index 000000000..d2ca2e22f
--- /dev/null
+++ b/hasura/migrations/1587575154011_update_permission_user_public_table_productionview/down.yaml
@@ -0,0 +1,6 @@
+- args:
+    role: user
+    table:
+      name: productionview
+      schema: public
+  type: drop_select_permission
diff --git a/hasura/migrations/1587575154011_update_permission_user_public_table_productionview/up.yaml b/hasura/migrations/1587575154011_update_permission_user_public_table_productionview/up.yaml
new file mode 100644
index 000000000..197dd8d08
--- /dev/null
+++ b/hasura/migrations/1587575154011_update_permission_user_public_table_productionview/up.yaml
@@ -0,0 +1,43 @@
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - id
+      - status
+      - ro_number
+      - est_number
+      - ownr_fn
+      - ownr_ln
+      - v_model_yr
+      - v_model_desc
+      - clm_no
+      - v_make_desc
+      - v_color
+      - plate_no
+      - actual_in
+      - scheduled_completion
+      - scheduled_delivery
+      - ins_co_nm
+      - clm_total
+      - ownr_ph1
+      - special_coverage_policy
+      - production_vars
+      - labhrs
+      - larhrs
+      - shopid
+      computed_fields: []
+      filter:
+        bodyshop:
+          associations:
+            _and:
+            - user:
+                authid:
+                  _eq: X-Hasura-User-Id
+            - active:
+                _eq: true
+      limit: null
+    role: user
+    table:
+      name: productionview
+      schema: public
+  type: create_select_permission