From 3fa78b383d128a4a14f10877b9cd604fb8ffd65f Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Wed, 28 Oct 2020 20:02:06 -0700
Subject: [PATCH 1/7] Package update

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index db0f24f..f2a446f 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "productName": "ImEX RPS",
   "author": "ImEX Systems Inc. <support@thinkimex.com>",
   "description": "ImEX RPS",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "main": "electron/main.js",
   "homepage": "./",
   "dependencies": {

From 0bb53bd1be66f5ef8d354874c1150625b30ed05d Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Thu, 29 Oct 2020 15:47:50 -0700
Subject: [PATCH 2/7] Added filteringa nd sorting on reporting screen. RPS-36

---
 .../reporting-jobs-list.molecule.jsx          | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/components/molecules/reporting-jobs-list/reporting-jobs-list.molecule.jsx b/src/components/molecules/reporting-jobs-list/reporting-jobs-list.molecule.jsx
index 51bae82..ec732ae 100644
--- a/src/components/molecules/reporting-jobs-list/reporting-jobs-list.molecule.jsx
+++ b/src/components/molecules/reporting-jobs-list/reporting-jobs-list.molecule.jsx
@@ -11,6 +11,8 @@ import {
   selectReportLoading,
   selectScorecard,
 } from "../../../redux/reporting/reporting.selectors";
+import { alphaSort } from "../../../util/sorters";
+import moment from "moment";
 
 const { ipcRenderer } = window;
 
@@ -41,21 +43,34 @@ export function ReportingJobsListMolecule({
           {text}
         </Link>
       ),
+      sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
+    },
+    {
+      title: "Close Date",
+      dataIndex: "close_date",
+      key: "close_date",
+      render: (text, record) => moment(record.close_date).format("MM/DD/yyyy"),
+      defaultSortOrder: "ascend",
+      sorter: (a, b) =>
+        moment(a.close_date).unix() - moment(b.close_date).unix(),
     },
     {
       title: "Ins Co.",
       dataIndex: "ins_co_nm",
       key: "ins_co_nm",
+      sorter: (a, b) => alphaSort(a.ins_co_nm, b.ins_co_nm),
     },
     {
       title: "First Name",
       dataIndex: "ownr_fn",
       key: "ownr_fn",
+      sorter: (a, b) => alphaSort(a.ownr_fn, b.ownr_fn),
     },
     {
       title: "Last Name",
       dataIndex: "ownr_ln",
       key: "ownr_ln",
+      sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
     },
     {
       title: "Vehicle",
@@ -72,12 +87,14 @@ export function ReportingJobsListMolecule({
       title: "Database Price Sum",
       dataIndex: "dbPriceSum",
       key: "dbPriceSum",
+      sorter: (a, b) => a.dbPriceSum.getAmount() - b.dbPriceSum.getAmount(),
       render: (text, record) => record.dbPriceSum.toFormat(),
     },
     {
       title: "Actual Price Sum ",
       dataIndex: "actPriceSum",
       key: "actPriceSum",
+      sorter: (a, b) => a.actPriceSum.getAmount() - b.actPriceSum.getAmount(),
       render: (text, record) => record.actPriceSum.toFormat(),
     },
     {
@@ -104,7 +121,7 @@ export function ReportingJobsListMolecule({
             color: record.jobRpsPc > record.jobTarget ? "seagreen" : "tomato",
           }}
         >
-          {`${(record.jobRpsPc * 100).toFixed(1)}% / ${(
+          {`${(record.jobRpsPc * 100 || 0).toFixed(1)}% / ${(
             record.jobTarget * 100
           ).toFixed(1)}%`}
         </span>
@@ -163,7 +180,6 @@ export function ReportingJobsListMolecule({
               {scoreCard && scoreCard.allJobsSumDbPrice.toFormat()}
             </Table.Summary.Cell>
             <Table.Summary.Cell index={6}>
-              {" "}
               {scoreCard && scoreCard.allJobsSumActPrice.toFormat()}
             </Table.Summary.Cell>
             <Table.Summary.Cell index={7}></Table.Summary.Cell>

From 8507ba455acd48e21147ebea7167b30b162617d4 Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Thu, 29 Oct 2020 18:53:17 -0700
Subject: [PATCH 3/7] Added alert and setting for PP differences less than a
 set amount. RPS-34

---
 Xdev-app-update.yml => dev-app-update.yml     |  0
 .../down.yaml                                 |  5 ++++
 .../up.yaml                                   |  6 ++++
 .../down.yaml                                 | 28 ++++++++++++++++++
 .../up.yaml                                   | 29 +++++++++++++++++++
 .../down.yaml                                 | 24 +++++++++++++++
 .../up.yaml                                   | 25 ++++++++++++++++
 hasura/migrations/metadata.yaml               |  2 ++
 package.json                                  |  2 +-
 .../price-diff-pc-formatter.atom.jsx          |  6 +++-
 .../update-available.atom.jsx                 | 17 -----------
 .../shop-settings-form.molecule.jsx           | 12 ++++++++
 .../update-manager.organism.jsx               |  5 ++++
 src/graphql/bodyshop.queries.js               |  2 ++
 14 files changed, 144 insertions(+), 19 deletions(-)
 rename Xdev-app-update.yml => dev-app-update.yml (100%)
 create mode 100644 hasura/migrations/1604011931472_alter_table_public_bodyshops_add_column_ppd_diff_alert/down.yaml
 create mode 100644 hasura/migrations/1604011931472_alter_table_public_bodyshops_add_column_ppd_diff_alert/up.yaml
 create mode 100644 hasura/migrations/1604011938755_update_permission_user_public_table_bodyshops/down.yaml
 create mode 100644 hasura/migrations/1604011938755_update_permission_user_public_table_bodyshops/up.yaml
 create mode 100644 hasura/migrations/1604011944447_update_permission_user_public_table_bodyshops/down.yaml
 create mode 100644 hasura/migrations/1604011944447_update_permission_user_public_table_bodyshops/up.yaml
 delete mode 100644 src/components/atoms/update-available/update-available.atom.jsx

diff --git a/Xdev-app-update.yml b/dev-app-update.yml
similarity index 100%
rename from Xdev-app-update.yml
rename to dev-app-update.yml
diff --git a/hasura/migrations/1604011931472_alter_table_public_bodyshops_add_column_ppd_diff_alert/down.yaml b/hasura/migrations/1604011931472_alter_table_public_bodyshops_add_column_ppd_diff_alert/down.yaml
new file mode 100644
index 0000000..d0245ef
--- /dev/null
+++ b/hasura/migrations/1604011931472_alter_table_public_bodyshops_add_column_ppd_diff_alert/down.yaml
@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."bodyshops" DROP COLUMN "ppd_diff_alert";
+  type: run_sql
diff --git a/hasura/migrations/1604011931472_alter_table_public_bodyshops_add_column_ppd_diff_alert/up.yaml b/hasura/migrations/1604011931472_alter_table_public_bodyshops_add_column_ppd_diff_alert/up.yaml
new file mode 100644
index 0000000..00ae49f
--- /dev/null
+++ b/hasura/migrations/1604011931472_alter_table_public_bodyshops_add_column_ppd_diff_alert/up.yaml
@@ -0,0 +1,6 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."bodyshops" ADD COLUMN "ppd_diff_alert" numeric NULL
+      DEFAULT .05;
+  type: run_sql
diff --git a/hasura/migrations/1604011938755_update_permission_user_public_table_bodyshops/down.yaml b/hasura/migrations/1604011938755_update_permission_user_public_table_bodyshops/down.yaml
new file mode 100644
index 0000000..da91d45
--- /dev/null
+++ b/hasura/migrations/1604011938755_update_permission_user_public_table_bodyshops/down.yaml
@@ -0,0 +1,28 @@
+- args:
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - accepted_ins_co
+      - created_at
+      - groups
+      - id
+      - shopname
+      - targets
+      - updated_at
+      computed_fields: []
+      filter:
+        associations:
+          user:
+            authid:
+              _eq: X-Hasura-User-Id
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1604011938755_update_permission_user_public_table_bodyshops/up.yaml b/hasura/migrations/1604011938755_update_permission_user_public_table_bodyshops/up.yaml
new file mode 100644
index 0000000..1883517
--- /dev/null
+++ b/hasura/migrations/1604011938755_update_permission_user_public_table_bodyshops/up.yaml
@@ -0,0 +1,29 @@
+- args:
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: false
+      columns:
+      - accepted_ins_co
+      - created_at
+      - groups
+      - id
+      - ppd_diff_alert
+      - shopname
+      - targets
+      - updated_at
+      computed_fields: []
+      filter:
+        associations:
+          user:
+            authid:
+              _eq: X-Hasura-User-Id
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: create_select_permission
diff --git a/hasura/migrations/1604011944447_update_permission_user_public_table_bodyshops/down.yaml b/hasura/migrations/1604011944447_update_permission_user_public_table_bodyshops/down.yaml
new file mode 100644
index 0000000..1ff07f9
--- /dev/null
+++ b/hasura/migrations/1604011944447_update_permission_user_public_table_bodyshops/down.yaml
@@ -0,0 +1,24 @@
+- args:
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - accepted_ins_co
+      - groups
+      - shopname
+      - targets
+      filter:
+        associations:
+          user:
+            authid:
+              _eq: X-Hasura-User-Id
+      set: {}
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/1604011944447_update_permission_user_public_table_bodyshops/up.yaml b/hasura/migrations/1604011944447_update_permission_user_public_table_bodyshops/up.yaml
new file mode 100644
index 0000000..f52f9fc
--- /dev/null
+++ b/hasura/migrations/1604011944447_update_permission_user_public_table_bodyshops/up.yaml
@@ -0,0 +1,25 @@
+- args:
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: drop_update_permission
+- args:
+    permission:
+      columns:
+      - accepted_ins_co
+      - groups
+      - ppd_diff_alert
+      - shopname
+      - targets
+      filter:
+        associations:
+          user:
+            authid:
+              _eq: X-Hasura-User-Id
+      set: {}
+    role: user
+    table:
+      name: bodyshops
+      schema: public
+  type: create_update_permission
diff --git a/hasura/migrations/metadata.yaml b/hasura/migrations/metadata.yaml
index f864e4b..171c7b2 100644
--- a/hasura/migrations/metadata.yaml
+++ b/hasura/migrations/metadata.yaml
@@ -46,6 +46,7 @@ tables:
       - created_at
       - groups
       - id
+      - ppd_diff_alert
       - shopname
       - targets
       - updated_at
@@ -60,6 +61,7 @@ tables:
       columns:
       - accepted_ins_co
       - groups
+      - ppd_diff_alert
       - shopname
       - targets
       filter:
diff --git a/package.json b/package.json
index f2a446f..922a77e 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "productName": "ImEX RPS",
   "author": "ImEX Systems Inc. <support@thinkimex.com>",
   "description": "ImEX RPS",
-  "version": "1.0.8",
+  "version": "1.0.2",
   "main": "electron/main.js",
   "homepage": "./",
   "dependencies": {
diff --git a/src/components/atoms/price-diff-pc-formatter/price-diff-pc-formatter.atom.jsx b/src/components/atoms/price-diff-pc-formatter/price-diff-pc-formatter.atom.jsx
index d5c7628..6552071 100644
--- a/src/components/atoms/price-diff-pc-formatter/price-diff-pc-formatter.atom.jsx
+++ b/src/components/atoms/price-diff-pc-formatter/price-diff-pc-formatter.atom.jsx
@@ -3,13 +3,16 @@ import React from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectSelectedJobTargetPc } from "../../../redux/application/application.selectors";
+import { selectBodyshop } from "../../../redux/user/user.selectors";
 import "./price-diff-pc-formatter.styles.scss";
 
 const mapStateToProps = createStructuredSelector({
   selectedJobTargetPc: selectSelectedJobTargetPc,
+  bodyshop: selectBodyshop,
 });
 
 export function PriceDiffPcFormatterAtom({
+  bodyshop,
   price_diff_pc,
   selectedJobTargetPc,
 }) {
@@ -22,7 +25,8 @@ export function PriceDiffPcFormatterAtom({
       }}
     >
       {(price_diff_pc * 100).toFixed(1)}%
-      {price_diff_pc === 1 ? (
+      {price_diff_pc === 1 ||
+      (price_diff_pc <= bodyshop.ppd_diff_alert && price_diff_pc > 0) ? (
         <AlertFilled style={{ color: "tomato" }} className="blink_me" />
       ) : null}
     </div>
diff --git a/src/components/atoms/update-available/update-available.atom.jsx b/src/components/atoms/update-available/update-available.atom.jsx
deleted file mode 100644
index 684b25e..0000000
--- a/src/components/atoms/update-available/update-available.atom.jsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from "react";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectUpdateAvailable } from "../../../redux/application/application.selectors";
-const mapStateToProps = createStructuredSelector({
-  //scanLoading: selectScanLoading,
-  updateAvailable: selectUpdateAvailable,
-});
-const mapDispatchToProps = (dispatch) => ({});
-
-export function UpdateAvailableAtom({ available }) {
-  return <div>Update Available!</div>;
-}
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(UpdateAvailableAtom);
diff --git a/src/components/molecules/shop-settings-form/shop-settings-form.molecule.jsx b/src/components/molecules/shop-settings-form/shop-settings-form.molecule.jsx
index 38584c6..6b1e54a 100644
--- a/src/components/molecules/shop-settings-form/shop-settings-form.molecule.jsx
+++ b/src/components/molecules/shop-settings-form/shop-settings-form.molecule.jsx
@@ -60,6 +60,18 @@ export default function ShopSettingsFormMolecule({ form, saveLoading }) {
         >
           <Select mode="tags" onBlur={handleBlur} />
         </Form.Item>
+
+        <Form.Item
+          label="Alert whne Parts Price Difference Less Than"
+          name="ppd_diff_alert"
+          rules={[
+            {
+              required: true,
+            },
+          ]}
+        >
+          <InputNumber />
+        </Form.Item>
       </LayoutFormRow>
       <Typography.Title level={4}>Group Definitions</Typography.Title>
       <Form.List name={["targets"]}>
diff --git a/src/components/organisms/update-manager/update-manager.organism.jsx b/src/components/organisms/update-manager/update-manager.organism.jsx
index a8c468c..2de43db 100644
--- a/src/components/organisms/update-manager/update-manager.organism.jsx
+++ b/src/components/organisms/update-manager/update-manager.organism.jsx
@@ -19,6 +19,11 @@ const mapDispatchToProps = (dispatch) => ({
 });
 
 export function UpdateManagerOrganism({ updateAvailable, updateProgress }) {
+  console.log(
+    "UpdateManagerOrganism -> updateAvailable, updateProgress",
+    updateAvailable,
+    updateProgress
+  );
   if (!updateAvailable) return null;
   return (
     <Layout.Footer>
diff --git a/src/graphql/bodyshop.queries.js b/src/graphql/bodyshop.queries.js
index 8c170af..e66da44 100644
--- a/src/graphql/bodyshop.queries.js
+++ b/src/graphql/bodyshop.queries.js
@@ -7,6 +7,7 @@ export const QUERY_BODYSHOP = gql`
       targets
       accepted_ins_co
       groups
+      ppd_diff_alert
     }
   }
 `;
@@ -20,6 +21,7 @@ export const UPDATE_SHOP = gql`
         targets
         accepted_ins_co
         groups
+        ppd_diff_alert
       }
     }
   }

From 2a5f94c558425988a01f126ac28f16f69351e5a0 Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Thu, 29 Oct 2020 18:54:46 -0700
Subject: [PATCH 4/7] Reverted package number back to 1.0.8.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 922a77e..f2a446f 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "productName": "ImEX RPS",
   "author": "ImEX Systems Inc. <support@thinkimex.com>",
   "description": "ImEX RPS",
-  "version": "1.0.2",
+  "version": "1.0.8",
   "main": "electron/main.js",
   "homepage": "./",
   "dependencies": {

From 8b775ee49438f737ec62fee69e88979d79b0ca1e Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Fri, 6 Nov 2020 07:20:21 -0800
Subject: [PATCH 5/7] Added refresh all button.

---
 electron/main.js                                     |  7 ++++---
 hasura/config.yaml                                   |  3 ++-
 .../jobs-list-item/jobs-list-item.molecule.jsx       | 12 +++++++++++-
 .../jobs-list-item/jobs-list-item.styles.scss        | 11 +++++++++++
 .../jobs-list-latest/jobs-list-latest.organism.jsx   |  2 +-
 5 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/electron/main.js b/electron/main.js
index c2a55f0..de809a8 100644
--- a/electron/main.js
+++ b/electron/main.js
@@ -255,9 +255,10 @@ function createTray() {
 // autoUpdater.on("update-not-available", (ev, info) => {
 //   log.log("Update not available.");
 // });
-// autoUpdater.on("error", (ev, err) => {
-//   log.log("Error in auto-updater.");
-// });
+
+autoUpdater.on("error", (ev, err) => {
+  log.log("Error in auto-updater.", ev, err);
+});
 
 // // autoUpdater.on("update-downloaded", (ev, info) => {
 // //   console.log("Update downloaded; will install in 5 seconds");
diff --git a/hasura/config.yaml b/hasura/config.yaml
index 80a8d8e..5909335 100644
--- a/hasura/config.yaml
+++ b/hasura/config.yaml
@@ -1 +1,2 @@
-endpoint: https://rps.bodyshop.app
\ No newline at end of file
+#endpoint: https://rps.bodyshop.app
+endpoint: https://db.rps.imex.online
diff --git a/src/components/molecules/jobs-list-item/jobs-list-item.molecule.jsx b/src/components/molecules/jobs-list-item/jobs-list-item.molecule.jsx
index 6af24c8..8a8dd6b 100644
--- a/src/components/molecules/jobs-list-item/jobs-list-item.molecule.jsx
+++ b/src/components/molecules/jobs-list-item/jobs-list-item.molecule.jsx
@@ -1,4 +1,4 @@
-import { List } from "antd";
+import { Button, List } from "antd";
 import React from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -24,6 +24,16 @@ export function JobsListItemMolecule({
     setSelectedJobId(jobId);
   };
 
+  if (item.isRefresh)
+    return (
+      <List.Item
+        className="jobs-list-item-refresh"
+        key="refreshItem"
+        onClick={() => console.log("Refresh")}
+      >
+        <div style={{ flex: 1 }}>Refresh</div>
+      </List.Item>
+    );
   return (
     <List.Item
       className="jobs-list-item"
diff --git a/src/components/molecules/jobs-list-item/jobs-list-item.styles.scss b/src/components/molecules/jobs-list-item/jobs-list-item.styles.scss
index d320abc..5d8d5ae 100644
--- a/src/components/molecules/jobs-list-item/jobs-list-item.styles.scss
+++ b/src/components/molecules/jobs-list-item/jobs-list-item.styles.scss
@@ -19,3 +19,14 @@
     background-color: #e6f7ff;
   }
 }
+.jobs-list-item-refresh {
+  padding: 0.1rem !important;
+  margin: 0;
+  border-bottom: 0.8rem solid #f0f0f0 !important;
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+  &:hover {
+    background-color: #e6f7ff;
+  }
+}
diff --git a/src/components/organisms/jobs-list-latest/jobs-list-latest.organism.jsx b/src/components/organisms/jobs-list-latest/jobs-list-latest.organism.jsx
index ea66ce0..775bb13 100644
--- a/src/components/organisms/jobs-list-latest/jobs-list-latest.organism.jsx
+++ b/src/components/organisms/jobs-list-latest/jobs-list-latest.organism.jsx
@@ -80,7 +80,7 @@ export default function JobsTableOrganism() {
           <Dropdown overlay={menu} trigger={["contextMenu"]}>
             <List
               bordered
-              dataSource={data ? data.jobs : []}
+              dataSource={data ? [{ isRefresh: true }, ...data.jobs] : []}
               renderItem={(item) => <JobsListItemMolecule item={item} />}
             >
               {loading && state.hasMore && (

From 83f71888222539891aa77facc42258792faef7aa Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Fri, 6 Nov 2020 08:10:34 -0800
Subject: [PATCH 6/7] Fixed refresh all. Fixed Updating Methods. Removed Jira
 Widget.

---
 dev-app-update.yml => Xdev-app-update.yml     |  0
 electron/main.js                              | 30 +++++-----
 public/index.html                             |  4 +-
 .../jobs-list-item.molecule.jsx               | 11 ++--
 .../jobs-list-item/jobs-list-item.styles.scss |  8 ++-
 .../reporting-dates.molecule.jsx              |  4 +-
 .../shop-settings-form.molecule.jsx           |  2 +-
 .../jobs-list-latest.organism.jsx             | 59 ++++++++++---------
 8 files changed, 68 insertions(+), 50 deletions(-)
 rename dev-app-update.yml => Xdev-app-update.yml (100%)

diff --git a/dev-app-update.yml b/Xdev-app-update.yml
similarity index 100%
rename from dev-app-update.yml
rename to Xdev-app-update.yml
diff --git a/electron/main.js b/electron/main.js
index de809a8..f8f6d25 100644
--- a/electron/main.js
+++ b/electron/main.js
@@ -249,12 +249,13 @@ function createTray() {
 // autoUpdater.on("checking-for-update", () => {
 //   log.log("Checking for update...");
 // });
-// autoUpdater.on("update-available", (ev, info) => {
-//   log.log("Update available.");
-// });
-// autoUpdater.on("update-not-available", (ev, info) => {
-//   log.log("Update not available.");
-// });
+autoUpdater.on("update-available", (ev) => {
+  log.log("Update available.", ev);
+  mainWindow.webContents.send(ipcTypes.app.toRenderer.updateAvailable, ev);
+});
+autoUpdater.on("update-not-available", (ev) => {
+  log.log("Update not available.", ev);
+});
 
 autoUpdater.on("error", (ev, err) => {
   log.log("Error in auto-updater.", ev, err);
@@ -327,15 +328,16 @@ autoUpdater.on("update-downloaded", (ev, info) => {
 async function checkForUpdates() {
   try {
     log.info("Checking for updates.");
-    const result = await autoUpdater.checkForUpdates();
-    const { updateInfo } = result;
+    //const result = await
+    autoUpdater.checkForUpdates();
+    // const { updateInfo } = result;
 
-    if (updateInfo.version !== app.getVersion()) {
-      mainWindow.webContents.send(
-        ipcTypes.app.toRenderer.updateAvailable,
-        updateInfo
-      );
-    }
+    // if (updateInfo.version !== app.getVersion()) {
+    //   mainWindow.webContents.send(
+    //     ipcTypes.app.toRenderer.updateAvailable,
+    //     updateInfo
+    //   );
+    // }
   } catch (error) {
     log.error("Error while checking for update", error);
   }
diff --git a/public/index.html b/public/index.html
index 3ef2c51..e861641 100644
--- a/public/index.html
+++ b/public/index.html
@@ -3,7 +3,9 @@
   <head>
     <meta charset="utf-8" />
     <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
-
+   <!--
+<script data-jsd-embedded data-key="51adb36e-ee16-46b1-a4c6-4b6d5fcd8530" data-base-url="https://jsd-widget.atlassian.com" src="https://jsd-widget.atlassian.com/assets/embed.js"></script>
+   --> 
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#002366" />
     <meta
diff --git a/src/components/molecules/jobs-list-item/jobs-list-item.molecule.jsx b/src/components/molecules/jobs-list-item/jobs-list-item.molecule.jsx
index 8a8dd6b..b4bae83 100644
--- a/src/components/molecules/jobs-list-item/jobs-list-item.molecule.jsx
+++ b/src/components/molecules/jobs-list-item/jobs-list-item.molecule.jsx
@@ -1,4 +1,5 @@
-import { Button, List } from "antd";
+import { WarningOutlined } from "@ant-design/icons";
+import { List } from "antd";
 import React from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -6,7 +7,6 @@ import { setSelectedJobId } from "../../../redux/application/application.actions
 import { selectSelectedJobId } from "../../../redux/application/application.selectors";
 import TimeAgoFormatter from "../../atoms/time-ago-formatter/time-ago-formatter.atom";
 import "./jobs-list-item.styles.scss";
-import { WarningOutlined } from "@ant-design/icons";
 
 const mapStateToProps = createStructuredSelector({
   selectedJobId: selectSelectedJobId,
@@ -19,6 +19,7 @@ export function JobsListItemMolecule({
   selectedJobId,
   setSelectedJobId,
   item,
+  refetch,
 }) {
   const handleSelect = (jobId) => {
     setSelectedJobId(jobId);
@@ -29,9 +30,11 @@ export function JobsListItemMolecule({
       <List.Item
         className="jobs-list-item-refresh"
         key="refreshItem"
-        onClick={() => console.log("Refresh")}
+        onClick={() => {
+          refetch();
+        }}
       >
-        <div style={{ flex: 1 }}>Refresh</div>
+        <div className="jobs-list-item-refresh-content">Refresh All</div>
       </List.Item>
     );
   return (
diff --git a/src/components/molecules/jobs-list-item/jobs-list-item.styles.scss b/src/components/molecules/jobs-list-item/jobs-list-item.styles.scss
index 5d8d5ae..37e3ea6 100644
--- a/src/components/molecules/jobs-list-item/jobs-list-item.styles.scss
+++ b/src/components/molecules/jobs-list-item/jobs-list-item.styles.scss
@@ -23,8 +23,12 @@
   padding: 0.1rem !important;
   margin: 0;
   border-bottom: 0.8rem solid #f0f0f0 !important;
-  display: flex;
-  align-items: center;
+  &-content {
+    width: 100%;
+    display: flex;
+    justify-content: center;
+  }
+
   cursor: pointer;
   &:hover {
     background-color: #e6f7ff;
diff --git a/src/components/molecules/reporting-dates/reporting-dates.molecule.jsx b/src/components/molecules/reporting-dates/reporting-dates.molecule.jsx
index 8e70573..e1b59ce 100644
--- a/src/components/molecules/reporting-dates/reporting-dates.molecule.jsx
+++ b/src/components/molecules/reporting-dates/reporting-dates.molecule.jsx
@@ -36,6 +36,9 @@ export function ReportingDatesMolecule({ queryReportingData }) {
           <DatePicker.RangePicker
             ranges={{
               Today: [moment(), moment()],
+              "Last 7 days": [moment().subtract(7, "days"), moment()],
+              "Next 7 days": [moment(), moment().add(7, "days")],
+              "Next 14 days": [moment(), moment().add(14, "days")],
               "Last Month": [
                 moment().startOf("month").subtract(1, "month"),
                 moment().startOf("month").subtract(1, "month").endOf("month"),
@@ -48,7 +51,6 @@ export function ReportingDatesMolecule({ queryReportingData }) {
                 moment().startOf("month").add(1, "month"),
                 moment().startOf("month").add(1, "month").endOf("month"),
               ],
-              "Last 7 days": [moment().subtract(7, "days"), moment()],
             }}
           />
         </Form.Item>
diff --git a/src/components/molecules/shop-settings-form/shop-settings-form.molecule.jsx b/src/components/molecules/shop-settings-form/shop-settings-form.molecule.jsx
index 6b1e54a..bb3baad 100644
--- a/src/components/molecules/shop-settings-form/shop-settings-form.molecule.jsx
+++ b/src/components/molecules/shop-settings-form/shop-settings-form.molecule.jsx
@@ -62,7 +62,7 @@ export default function ShopSettingsFormMolecule({ form, saveLoading }) {
         </Form.Item>
 
         <Form.Item
-          label="Alert whne Parts Price Difference Less Than"
+          label="Alert when Parts Price Difference Less Than"
           name="ppd_diff_alert"
           rules={[
             {
diff --git a/src/components/organisms/jobs-list-latest/jobs-list-latest.organism.jsx b/src/components/organisms/jobs-list-latest/jobs-list-latest.organism.jsx
index 775bb13..6fce11f 100644
--- a/src/components/organisms/jobs-list-latest/jobs-list-latest.organism.jsx
+++ b/src/components/organisms/jobs-list-latest/jobs-list-latest.organism.jsx
@@ -32,32 +32,33 @@ export default function JobsTableOrganism() {
   );
 
   const handleInfiniteOnLoad = (page) => {
-    fetchMore({
-      variables: {
-        offset: limit * page,
-      },
-      updateQuery: (prev, { fetchMoreResult }) => {
-        if (!fetchMoreResult) {
-          console.log("No more results. Fetch More was empty.");
-          setState({ ...state, hasMore: false });
-          return prev;
-        }
+    fetchMore &&
+      fetchMore({
+        variables: {
+          offset: limit * page,
+        },
+        updateQuery: (prev, { fetchMoreResult }) => {
+          if (!fetchMoreResult) {
+            console.log("No more results. Fetch More was empty.");
+            setState({ ...state, hasMore: false });
+            return prev;
+          }
 
-        const newCache = Object.assign({}, prev, {
-          jobs: [...prev.jobs, ...fetchMoreResult.jobs],
-        });
+          const newCache = Object.assign({}, prev, {
+            jobs: [...prev.jobs, ...fetchMoreResult.jobs],
+          });
 
-        if (
-          newCache.jobs.length >= data &&
-          data.jobs_aggregate.aggregate.count
-        ) {
-          console.log("No more results.");
-          setState({ ...state, hasMore: false });
-        }
+          if (
+            newCache.jobs.length >= data &&
+            data.jobs_aggregate.aggregate.count
+          ) {
+            console.log("No more results.");
+            setState({ ...state, hasMore: false });
+          }
 
-        return newCache;
-      },
-    });
+          return newCache;
+        },
+      });
   };
 
   if (error)
@@ -81,7 +82,9 @@ export default function JobsTableOrganism() {
             <List
               bordered
               dataSource={data ? [{ isRefresh: true }, ...data.jobs] : []}
-              renderItem={(item) => <JobsListItemMolecule item={item} />}
+              renderItem={(item) => (
+                <JobsListItemMolecule item={item} refetch={refetch} />
+              )}
             >
               {loading && state.hasMore && (
                 <div>
@@ -92,9 +95,11 @@ export default function JobsTableOrganism() {
           </Dropdown>
         </InfiniteScroll>
       </div>
-      {`${data ? data.jobs.length : 0} jobs loaded. ${
-        data ? data.jobs_aggregate.aggregate.count : 0
-      } total jobs.`}
+      <div>
+        {`${data ? data.jobs.length : 0} jobs loaded. ${
+          data ? data.jobs_aggregate.aggregate.count : 0
+        } total jobs.`}
+      </div>
     </div>
   );
 }

From de7df6bf16238b1c96a92cd8832bb7fc2249c87e Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Fri, 6 Nov 2020 08:17:52 -0800
Subject: [PATCH 7/7] Adjusted reporting summary columns to correct area.

---
 .../reporting-jobs-list/reporting-jobs-list.molecule.jsx    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/molecules/reporting-jobs-list/reporting-jobs-list.molecule.jsx b/src/components/molecules/reporting-jobs-list/reporting-jobs-list.molecule.jsx
index ec732ae..ae9e6f2 100644
--- a/src/components/molecules/reporting-jobs-list/reporting-jobs-list.molecule.jsx
+++ b/src/components/molecules/reporting-jobs-list/reporting-jobs-list.molecule.jsx
@@ -176,13 +176,13 @@ export function ReportingJobsListMolecule({
             <Table.Summary.Cell index={2}></Table.Summary.Cell>
             <Table.Summary.Cell index={3}></Table.Summary.Cell>
             <Table.Summary.Cell index={4}></Table.Summary.Cell>
-            <Table.Summary.Cell index={5}>
+            <Table.Summary.Cell index={5}></Table.Summary.Cell>
+            <Table.Summary.Cell index={6}>
               {scoreCard && scoreCard.allJobsSumDbPrice.toFormat()}
             </Table.Summary.Cell>
-            <Table.Summary.Cell index={6}>
+            <Table.Summary.Cell index={7}>
               {scoreCard && scoreCard.allJobsSumActPrice.toFormat()}
             </Table.Summary.Cell>
-            <Table.Summary.Cell index={7}></Table.Summary.Cell>
             <Table.Summary.Cell index={8}></Table.Summary.Cell>
           </Table.Summary.Row>
         )}