admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IO-1893 Add scheduled in to parts queue.

Browse Source
This commit is contained in:
Patrick Fic
2022-05-16 16:23:25 -07:00
parent 82c13eae9e
commit 0eaf23841a
6 changed files with 4309 additions and 4344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
client/package.json
View File

@@ -4,54 +4,54 @@
"private": true, "private": true,
"proxy": "http://localhost:4000", "proxy": "http://localhost:4000",
"dependencies": { "dependencies": {
"@apollo/client": "^3.5.10", "@apollo/client": "^3.6.2",
"@asseinfo/react-kanban": "^2.2.0", "@asseinfo/react-kanban": "^2.2.0",
"@craco/craco": "^6.4.3", "@craco/craco": "^6.4.3",
"@fingerprintjs/fingerprintjs": "^3.3.3", "@fingerprintjs/fingerprintjs": "^3.3.3",
"@sentry/react": "^6.19.6", "@sentry/react": "^6.19.7",
"@sentry/tracing": "^6.19.6", "@sentry/tracing": "^6.19.7",
"@splitsoftware/splitio-react": "^1.4.0", "@splitsoftware/splitio-react": "^1.4.1",
"@stripe/react-stripe-js": "^1.7.1", "@stripe/react-stripe-js": "^1.8.0",
"@stripe/stripe-js": "^1.27.0", "@stripe/stripe-js": "^1.29.0",
"@tanem/react-nprogress": "^4.0.12", "@tanem/react-nprogress": "^5.0.0",
"antd": "^4.19.5", "antd": "^4.20.5",
"apollo-link-logger": "^2.0.0", "apollo-link-logger": "^2.0.0",
"axios": "^0.26.1", "axios": "^0.27.2",
"craco-less": "^1.20.0", "craco-less": "^1.20.0",
"dinero.js": "^1.9.1", "dinero.js": "^1.9.1",
"dotenv": "^16.0.0", "dotenv": "^16.0.1",
"enquire-js": "^0.2.1", "enquire-js": "^0.2.1",
"env-cmd": "^10.1.0", "env-cmd": "^10.1.0",
"exifr": "^7.1.3", "exifr": "^7.1.3",
"firebase": "^9.6.11", "firebase": "^9.8.1",
"graphql": "^16.3.0", "graphql": "^16.5.0",
"i18next": "^21.6.16", "i18next": "^21.8.2",
"i18next-browser-languagedetector": "^6.1.4", "i18next-browser-languagedetector": "^6.1.4",
"jsoneditor": "^9.7.4", "jsoneditor": "^9.7.4",
"jsreport-browser-client-dist": "^1.3.0", "jsreport-browser-client-dist": "^1.3.0",
"libphonenumber-js": "^1.9.51", "libphonenumber-js": "^1.9.53",
"logrocket": "^2.2.1", "logrocket": "^3.0.0",
"markerjs2": "^2.21.1", "markerjs2": "^2.21.4",
"moment-business-days": "^1.2.0", "moment-business-days": "^1.2.0",
"moment-timezone": "^0.5.34", "moment-timezone": "^0.5.34",
"normalize-url": "^7.0.3", "normalize-url": "^7.0.3",
"phone": "^3.1.15", "phone": "^3.1.17",
"preval.macro": "^5.0.0", "preval.macro": "^5.0.0",
"prop-types": "^15.8.1", "prop-types": "^15.8.1",
"query-string": "^7.1.1", "query-string": "^7.1.1",
"rc-queue-anim": "^2.0.0", "rc-queue-anim": "^2.0.0",
"rc-scroll-anim": "^2.7.6", "rc-scroll-anim": "^2.7.6",
"react": "^17.0.2", "react": "^17.0.2",
"react-big-calendar": "^0.38.2", "react-big-calendar": "^0.40.1",
"react-color": "^2.19.3", "react-color": "^2.19.3",
"react-cookie": "^4.1.1", "react-cookie": "^4.1.1",
"react-dom": "^17.0.2", "react-dom": "^17.0.2",
"react-drag-listview": "^0.1.9", "react-drag-listview": "^0.2.0",
"react-grid-gallery": "^0.5.5", "react-grid-gallery": "^0.5.5",
"react-grid-layout": "^1.3.4", "react-grid-layout": "^1.3.4",
"react-i18next": "^11.16.6", "react-i18next": "^11.16.9",
"react-icons": "^4.3.1", "react-icons": "^4.3.1",
"react-number-format": "^4.9.1", "react-number-format": "^4.9.3",
"react-redux": "^7.2.8", "react-redux": "^7.2.8",
"react-resizable": "^3.0.4", "react-resizable": "^3.0.4",
"react-router-dom": "^5.3.0", "react-router-dom": "^5.3.0",
@@ -60,28 +60,28 @@
"react-sublime-video": "^0.2.5", "react-sublime-video": "^0.2.5",
"react-virtualized": "^9.22.3", "react-virtualized": "^9.22.3",
"recharts": "^2.1.9", "recharts": "^2.1.9",
"redux": "^4.1.2", "redux": "^4.2.0",
"redux-persist": "^6.0.0", "redux-persist": "^6.0.0",
"redux-saga": "^1.1.3", "redux-saga": "^1.1.3",
"redux-state-sync": "^3.1.2", "redux-state-sync": "^3.1.2",
"reselect": "^4.1.5", "reselect": "^4.1.5",
"sass": "^1.50.0", "sass": "^1.51.0",
"socket.io-client": "^4.4.1", "socket.io-client": "^4.5.0",
"styled-components": "^5.3.5", "styled-components": "^5.3.5",
"subscriptions-transport-ws": "^0.11.0", "subscriptions-transport-ws": "^0.11.0",
"web-vitals": "^2.1.4", "web-vitals": "^2.1.4",
"workbox-background-sync": "^6.5.2", "workbox-background-sync": "^6.5.3",
"workbox-broadcast-update": "^6.5.2", "workbox-broadcast-update": "^6.5.3",
"workbox-cacheable-response": "^6.5.2", "workbox-cacheable-response": "^6.5.3",
"workbox-core": "^6.5.2", "workbox-core": "^6.5.3",
"workbox-expiration": "^6.5.2", "workbox-expiration": "^6.5.3",
"workbox-google-analytics": "^6.5.2", "workbox-google-analytics": "^6.5.3",
"workbox-navigation-preload": "^6.5.2", "workbox-navigation-preload": "^6.5.3",
"workbox-precaching": "^6.5.2", "workbox-precaching": "^6.5.3",
"workbox-range-requests": "^6.5.2", "workbox-range-requests": "^6.5.3",
"workbox-routing": "^6.5.2", "workbox-routing": "^6.5.3",
"workbox-strategies": "^6.5.2", "workbox-strategies": "^6.5.3",
"workbox-streams": "^6.5.2", "workbox-streams": "^6.5.3",
"yauzl": "^2.10.0" "yauzl": "^2.10.0"
}, },
"scripts": { "scripts": {
@@ -118,11 +118,11 @@
"react-error-overlay": "6.0.9" "react-error-overlay": "6.0.9"
}, },
"devDependencies": { "devDependencies": {
"@sentry/webpack-plugin": "^1.18.8", "@sentry/webpack-plugin": "^1.18.9",
"@testing-library/cypress": "^8.0.2", "@testing-library/cypress": "^8.0.2",
"cypress": "^9.5.3", "cypress": "^9.6.1",
"eslint-plugin-cypress": "^2.12.1", "eslint-plugin-cypress": "^2.12.1",
"react-error-overlay": "6.0.10", "react-error-overlay": "6.0.11",
"redux-logger": "^3.0.6", "redux-logger": "^3.0.6",
"source-map-explorer": "^2.5.2" "source-map-explorer": "^2.5.2"
} }

6
client/src/graphql/jobs.queries.js
View File

@@ -75,13 +75,9 @@ export const QUERY_PARTS_QUEUE = gql`
v_make_desc v_make_desc
v_color v_color
vehicleid vehicleid
actual_completion scheduled_in
actual_delivery
actual_in
id id
clm_no clm_no
clm_total
owner_owing
ro_number ro_number
status status
updated_at updated_at

11
client/src/pages/parts-queue/parts-queue.page.component.jsx
View File

@@ -15,7 +15,7 @@ import OwnerNameDisplay from "../../components/owner-name-display/owner-name-dis
import { QUERY_PARTS_QUEUE } from "../../graphql/jobs.queries"; import { QUERY_PARTS_QUEUE } from "../../graphql/jobs.queries";
import { selectBodyshop } from "../../redux/user/user.selectors"; import { selectBodyshop } from "../../redux/user/user.selectors";
import { onlyUnique } from "../../utils/arrayHelper"; import { onlyUnique } from "../../utils/arrayHelper";
import { TimeAgoFormatter } from "../../utils/DateFormatter"; import { DateTimeFormatter, TimeAgoFormatter } from "../../utils/DateFormatter";
import { alphaSort, dateSort } from "../../utils/sorters"; import { alphaSort, dateSort } from "../../utils/sorters";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
@@ -158,6 +158,15 @@ export function PartsQueuePageComponent({ bodyshop }) {
}, },
}, },
{
title: t("jobs.fields.scheduled_in"),
dataIndex: "scheduled_in",
key: "scheduled_in",
ellipsis: true,
render: (text, record) => (
<DateTimeFormatter>{record.scheduled_in}</DateTimeFormatter>
),
},
{ {
title: t("jobs.fields.vehicle"), title: t("jobs.fields.vehicle"),
dataIndex: "vehicle", dataIndex: "vehicle",

1264
client/yarn.lock
View File

File diff suppressed because it is too large Load Diff

28
package.json
View File

@@ -17,21 +17,21 @@
"start": "node server.js" "start": "node server.js"
}, },
"dependencies": { "dependencies": {
"aws-sdk": "^2.1116.0", "aws-sdk": "^2.1136.0",
"axios": "^0.24.0", "axios": "^0.27.2",
"bluebird": "^3.7.2", "bluebird": "^3.7.2",
"body-parser": "^1.20.0", "body-parser": "^1.20.0",
"cloudinary": "^1.29.1", "cloudinary": "^1.30.0",
"compression": "^1.7.4", "compression": "^1.7.4",
"cookie-parser": "^1.4.6", "cookie-parser": "^1.4.6",
"cors": "2.8.5", "cors": "2.8.5",
"csrf": "^3.1.0", "csrf": "^3.1.0",
"dinero.js": "^1.9.1", "dinero.js": "^1.9.1",
"dotenv": "10.0.0", "dotenv": "16.0.1",
"express": "^4.17.3", "express": "^4.18.1",
"firebase-admin": "^10.0.2", "firebase-admin": "^10.2.0",
"graphql": "^16.3.0", "graphql": "^16.5.0",
"graphql-request": "^3.7.0", "graphql-request": "^4.2.0",
"graylog2": "^0.2.1", "graylog2": "^0.2.1",
"inline-css": "^3.0.0", "inline-css": "^3.0.0",
"intuit-oauth": "^4.0.0", "intuit-oauth": "^4.0.0",
@@ -40,16 +40,16 @@
"moment": "^2.29.3", "moment": "^2.29.3",
"moment-timezone": "^0.5.34", "moment-timezone": "^0.5.34",
"multer": "^1.4.4", "multer": "^1.4.4",
"node-mailjet": "^3.3.10", "node-mailjet": "^3.4.1",
"node-quickbooks": "^2.0.39", "node-quickbooks": "^2.0.39",
"nodemailer": "^6.7.3", "nodemailer": "^6.7.5",
"phone": "^3.1.15", "phone": "^3.1.17",
"query-string": "^7.1.1", "query-string": "^7.1.1",
"soap": "^0.43.0", "soap": "^0.43.0",
"socket.io": "^4.4.1", "socket.io": "^4.5.0",
"ssh2-sftp-client": "^8.0.0", "ssh2-sftp-client": "^8.0.0",
"stripe": "^8.217.0", "stripe": "^9.1.0",
"twilio": "^3.76.1", "twilio": "^3.77.0",
"uuid": "^8.3.2", "uuid": "^8.3.2",
"xml2js": "^0.4.23", "xml2js": "^0.4.23",
"xmlbuilder2": "^3.0.2" "xmlbuilder2": "^3.0.2"

7266
yarn.lock
View File

File diff suppressed because it is too large Load Diff