From 0af4ffc9f0ba76a58c94e12c9121692b61295a70 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Tue, 4 Aug 2020 16:37:16 -0700
Subject: [PATCH] Removed nivo package. Added saving info on multiple time
ticket entry with issues BOD-224
---
README.MD | 6 +-
client/package.json | 1 -
.../job-detail-cards.parts.component.jsx | 50 +----
.../parts-status-pie.component.jsx | 10 +-
.../time-ticket-modal.container.jsx | 15 +-
client/yarn.lock | 202 ++----------------
6 files changed, 30 insertions(+), 254 deletions(-)
diff --git a/README.MD b/README.MD
index 8406c43fd..c1e3d680b 100644
--- a/README.MD
+++ b/README.MD
@@ -15,4 +15,8 @@ npx hasura migrate apply --up 10 --endpoint https://bodyshop-staging-db.herokuap
NGROK TEsting:
-./ngrok.exe http https://localhost:5000 -host-header="localhost:5000"
\ No newline at end of file
+./ngrok.exe http https://localhost:5000 -host-header="localhost:5000"
+
+
+Finding deadfiles - run from client directory
+npx deadfile ./src/index.js --exclude build templates
diff --git a/client/package.json b/client/package.json
index e32a434a6..6c4525580 100644
--- a/client/package.json
+++ b/client/package.json
@@ -5,7 +5,6 @@
"proxy": "https://localhost:5000",
"dependencies": {
"@lourenci/react-kanban": "^2.0.0",
- "@nivo/pie": "^0.62.0",
"@stripe/react-stripe-js": "^1.1.2",
"@stripe/stripe-js": "^1.8.0",
"@tanem/react-nprogress": "^3.0.34",
diff --git a/client/src/components/job-detail-cards/job-detail-cards.parts.component.jsx b/client/src/components/job-detail-cards/job-detail-cards.parts.component.jsx
index de1aa7882..ace40e4ff 100644
--- a/client/src/components/job-detail-cards/job-detail-cards.parts.component.jsx
+++ b/client/src/components/job-detail-cards/job-detail-cards.parts.component.jsx
@@ -1,61 +1,13 @@
import React from "react";
import { useTranslation } from "react-i18next";
import CardTemplate from "./job-detail-cards.template.component";
-import { Pie } from "@nivo/pie";
export default function JobDetailCardsPartsComponent({ loading, data }) {
const { t } = useTranslation();
- const commonProperties = {
- width: 225,
- height: 225,
- margin: { top: 20, right: 30, bottom: 20, left: 30 },
- animate: true
- };
-
- const cdata = [
- {
- id: "elixir",
- label: "elixir",
- value: 558,
- color: "hsl(21, 70%, 50%)"
- },
- {
- id: "erlang",
- label: "erlang",
- value: 443,
- color: "hsl(91, 70%, 50%)"
- },
- {
- id: "css",
- label: "css",
- value: 161,
- color: "hsl(271, 70%, 50%)"
- },
- {
- id: "python",
- label: "python",
- value: 305,
- color: "hsl(33, 70%, 50%)"
- },
- {
- id: "php",
- label: "php",
- value: 360,
- color: "hsl(296, 70%, 50%)"
- }
- ];
-
return (
-
+ Placeholder piechart.
);
diff --git a/client/src/components/parts-status-pie/parts-status-pie.component.jsx b/client/src/components/parts-status-pie/parts-status-pie.component.jsx
index 7d9697a6d..eba729f37 100644
--- a/client/src/components/parts-status-pie/parts-status-pie.component.jsx
+++ b/client/src/components/parts-status-pie/parts-status-pie.component.jsx
@@ -1,4 +1,3 @@
-import { Pie } from "@nivo/pie";
import React from "react";
export default function PartsStatusPie({ partsList }) {
@@ -22,12 +21,5 @@ export default function PartsStatusPie({ partsList }) {
};
});
- const commonProperties = {
- width: 250,
- height: 250,
- margin: { top: 40, right: 60, bottom: 40, left: 60 },
- animate: true,
- };
-
- return ;
+ return {JSON.stringify(pieData)}
;
}
diff --git a/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx b/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx
index cd9a74e8e..a6c05aec5 100644
--- a/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx
+++ b/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx
@@ -73,7 +73,11 @@ export function TimeTicketModalContainer({
});
if (timeTicketModal.actions.refetch) timeTicketModal.actions.refetch();
if (enterAgain) {
+ //Capture the existing information and repopulate it.
+
+ const prev = form.getFieldsValue(["jobid", "employeeid", "date"]);
form.resetFields();
+ form.setFieldsValue(prev);
} else {
toggleModalVisible();
}
@@ -151,16 +155,18 @@ export function TimeTicketModalContainer({
{timeTicketModal.context && timeTicketModal.context.id ? null : (
)}
}
- destroyOnClose>
+ destroyOnClose
+ >