Merged in feature/IO-1828-Front-End-Package-Updates (pull request #1359)

Feature/IO-1828 Front End Package Updates

.circleci/config.yml

@@ -41,7 +41,7 @@ jobs:
   app-build:
     docker:
       - image: cimg/node:16.15.0
-
+    resource_class: large
     working_directory: ~/repo/client
 
     steps:
@@ -58,118 +58,6 @@ jobs:
           to: "s3://imex-online-production/"
           arguments: "--exclude '*.map'"
 
-  rome-api-deploy:
-    docker:
-      - image: "cimg/base:stable"
-    steps:
-      - checkout
-      - eb/setup
-      - run:
-          command: |
-            eb init romeonline-productionapi -r us-east-2 -p "Node.js 18 running on 64bit Amazon Linux 2"
-            eb status --verbose
-            eb deploy
-            eb status
-
-  rome-hasura-migrate:
-    docker:
-      - image: cimg/node:16.15.0
-    parameters:
-      secret:
-        type: string
-        default: $HASURA_PROD_SECRET
-    working_directory: ~/repo/hasura
-    steps:
-      - checkout:
-          path: ~/repo
-      - run:
-          name: Execute migration
-          command: |
-            npm install hasura-cli -g
-            hasura migrate apply --endpoint https://db.romeonline.io/ --admin-secret << parameters.secret >>
-            hasura metadata apply --endpoint https://db.romeonline.io/ --admin-secret << parameters.secret >>
-            hasura metadata reload --endpoint https://db.romeonline.io/ --admin-secret << parameters.secret >>
-
-  rome-app-build:
-    docker:
-      - image: cimg/node:16.15.0
-
-    working_directory: ~/repo/client
-
-    steps:
-      - checkout:
-          path: ~/repo
-
-      - restore_cache:
-          name: Restore Yarn Package Cache
-          keys:
-            - yarn-packages-{{ checksum "yarn.lock" }}
-      - run:
-          name: Install Dependencies
-          command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
-      - save_cache:
-          name: Save Yarn Package Cache
-          key: yarn-packages-{{ checksum "yarn.lock" }}
-          paths:
-            - ~/.cache/yarn
-
-      - run: yarn run build
-
-      - aws-s3/sync:
-          from: build
-          to: "s3://rome-online-production/"
-      - jira/notify
-
-  test-rome-hasura-migrate:
-    docker:
-      - image: cimg/node:16.15.0
-    parameters:
-      secret:
-        type: string
-        default: $HASURA_ROME_TEST_SECRET
-    working_directory: ~/repo/hasura
-    steps:
-      - checkout:
-          path: ~/repo
-      - run:
-          name: Execute migration
-          command: |
-            npm install hasura-cli -g
-            echo ${HASURA_TEST_SECRET}
-            hasura migrate apply --endpoint https://db.test.romeonline.io/ --admin-secret << parameters.secret >>
-            hasura metadata apply --endpoint https://db.test.romeonline.io/ --admin-secret << parameters.secret >>
-            hasura metadata reload --endpoint https://db.test.romeonline.io/ --admin-secret << parameters.secret >>
-
-  test-rome-app-build:
-    docker:
-      - image: cimg/node:16.15.0
-
-    working_directory: ~/repo/client
-
-    steps:
-      - checkout:
-          path: ~/repo
-
-      - restore_cache:
-          name: Restore Yarn Package Cache
-          keys:
-            - yarn-packages-{{ checksum "yarn.lock" }}
-      - run:
-          name: Install Dependencies
-          command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
-      - save_cache:
-          name: Save Yarn Package Cache
-          key: yarn-packages-{{ checksum "yarn.lock" }}
-          paths:
-            - ~/.cache/yarn
-
-      - run: yarn run build:test
-
-      - aws-s3/sync:
-          from: build
-          to: "s3://rome-online-test/"
-      - jira/notify
-
   app-beta-build:
     docker:
       - image: cimg/node:18.18.2
@@ -194,27 +82,6 @@ jobs:
           from: build
           to: "s3://imex-online-beta/"
           arguments: "--exclude '*.map'"
-      - jira/notify
-
-  rome-app-beta-build:
-    docker:
-      - image: cimg/node:18.18.2
-    resource_class: large
-    working_directory: ~/repo/client
-
-    steps:
-      - checkout:
-          path: ~/repo
-      - run:
-          name: Install Dependencies
-          command: npm i
-
-      - run: npm run build
-
-      - aws-s3/sync:
-          from: build
-          to: "s3://rome-online-production-beta/"
-      - jira/notify
 
   test-hasura-migrate:
     docker:
@@ -239,7 +106,7 @@ jobs:
   test-app-build:
     docker:
       - image: cimg/node:16.15.0
-
+    resource_class: large
     working_directory: ~/repo/client
 
     steps:
@@ -284,27 +151,6 @@ jobs:
           to: "s3://imex-online-test-beta/"
           arguments: "--exclude '*.map'"
 
-  rome-test-app-beta-build:
-    docker:
-      - image: cimg/node:18.18.2
-    resource_class: large
-    working_directory: ~/repo/client
-
-    steps:
-      - checkout:
-          path: ~/repo
-
-      - run:
-          name: Install Dependencies
-          command: npm i
-
-      - run: npm run build:test
-
-      - aws-s3/sync:
-          from: build
-          to: "s3://rome-online-test-beta/"
-
-
   admin-app-build:
     docker:
       - image: cimg/node:16.15.0
@@ -350,36 +196,15 @@ workflows:
           filters:
             branches:
               only: master-beta
-      - rome-app-beta-build:
-          filters:
-            branches:
-              only: rome/master-beta
       - hasura-migrate:
           secret: ${HASURA_PROD_SECRET}
           filters:
             branches:
               only: master
-      - rome-api-deploy:
-          filters:
-            branches:
-              only: rome/master
-      - rome-app-build:
-          filters:
-            branches:
-              only: rome/master
-      - rome-hasura-migrate:
-          secret: ${HASURA_PROD_SECRET}
-          filters:
-            branches:
-              only: rome/master
       - test-app-build:
           filters:
             branches:
               only: test
-      - rome-test-app-beta-build:
-          filters:
-            branches:
-              only: rome/test-beta
       - test-app-beta-build:
           filters:
             branches:
@@ -389,16 +214,7 @@ workflows:
           filters:
             branches:
               only: test
-      - test-rome-app-build:
-          filters:
-            branches:
-              only: rome/test
-      - test-rome-hasura-migrate:
-          secret: ${HASURA_ROME_TEST_SECRET}
-          filters:
-            branches:
-              only: rome/test
       #- admin-app-build:
       #filters:
       #branches:
-      #only: master
+      #only: master

.prettierrc.js

@@ -0,0 +1,16 @@
+exports.default = {
+  printWidth: 120,
+  useTabs: false,
+  tabWidth: 2,
+  trailingComma: "es5",
+  semi: true,
+  singleQuote: false,
+  bracketSpacing: true,
+  arrowParens: "always",
+  jsxSingleQuote: false,
+  bracketSameLine: false,
+  endOfLine: "lf",
+  importOrder: ["^@core/(.*)$", "^@server/(.*)$", "^@ui/(.*)$", "^[./]"],
+  importOrderSeparation: true,
+  importOrderSortSpecifiers: true,
+};

_reference/TeamsSlackInvestigationFinalVersion.md

@@ -0,0 +1,316 @@
+## Microsoft Teams
+
+Integrating Microsoft Teams into your Node.js backend and React frontend application can enhance communication and workflow efficiency,
+especially in a body shop management context for the automotive industry. Microsoft Teams provides several ways to integrate its functionalities into your application, 
+including bots, tabs, messaging extensions, webhooks, and connectors. Here's an overview of the options and how to implement them:
+
+### 0.5 - Share to Teams (TM)
+
+- https://learn.microsoft.com/en-us/microsoftteams/platform/concepts/build-and-test/share-to-teams-from-web-apps
+- https://learn.microsoft.com/en-us/microsoftteams/platform/concepts/build-and-test/share-to-teams-from-personal-app-or-tab
+- https://learn.microsoft.com/en-us/microsoftteams/platform/concepts/device-capabilities/people-picker-capability
+- (Example of some Teams code Integrations) https://github.com/microsoft/teams-powerapps-app-templates/
+
+### 1. Microsoft Graph API
+The Microsoft Graph API is the gateway to data and intelligence in Microsoft 365, including Teams. It allows you to work with Teams data like channels, messages, and more. You can use it to post status changes back to Teams or read data from Teams to affect your site.
+
+Backend (Node.js): Use the @microsoft/microsoft-graph-client package to make API calls to Teams. You will need to handle authentication with Azure AD, which can be done using the @azure/identity package to get tokens for Graph API requests.
+
+*Implementation Steps*:
+
+Register your application in Azure AD to get the client_id and client_secret.
+
+(Is client_id and client_secret going to be something required for every customer or is it going to be a singleton)
+Implement OAuth 2.0 authorization flow to obtain access tokens.
+(This will need to be tracked by association to a bodyshop)
+
+bodyshop->Channels | People ->Messages
+
+Use the access token to make requests to the Microsoft Graph API to interact with Teams.
+
+### 2. Webhooks and Connectors
+Webhooks allow your application to send notifications to a Teams channel, which is useful for posting status changes. Connectors are a set of predefined webhooks that offer a more integrated experience.
+
+Setup:
+In Microsoft Teams, configure an incoming webhook for the channel you want to post messages to.
+Use the webhook URL to send JSON payloads from your Node.js backend, which can then be displayed in Teams.
+
+
+### 3. Bots
+Bots in Teams can interact with users to take commands or post information. You can use the Bot Framework along with the Teams activity handler to create bots that can communicate with your React frontend and Node.js backend.
+
+Backend (Node.js): Use the botbuilder package to create and manage your bot's interactions with Teams.
+
+*Implementation Steps*:
+
+Create a bot registration in Azure Bot Services.
+Implement the bot logic in your Node.js application using the Bot Framework SDK.
+Use the Microsoft Bot Framework's TeamsActivityHandler to respond to Teams-specific activities.
+
+### 4. Tabs
+Tabs in Teams allow you to integrate web-based content as part of Teams, which can be your React application or specific parts of it. This is particularly useful for creating a seamless experience within Teams.
+
+*Implementation Steps*:
+- Create a Teams app manifest that defines your tab and its configuration.
+- Host your React application or the specific parts you want to embed as a tab.
+- Use the Teams SDK in your React application to interact with Teams context and APIs.
+
+*Getting Started*:
+Microsoft Teams Toolkit for Visual Studio Code: This toolkit simplifies the process of setting up your Teams application, including authentication, configuration, and deployment.
+Documentation and Samples: Microsoft provides extensive documentation and sample code for developing Teams applications, which can be invaluable for getting started and solving specific challenges.
+Implementing these features requires a good understanding of both the Microsoft Teams platform and your application's architecture. 
+Start small, perhaps by implementing notifications via webhooks, and gradually add more complex integrations like bots or tabs based on your needs and user feedback.
+
+### Examples:
+
+##### Posting Messages to a Teams Channel Using Incoming Webhooks
+
+1 - Set up an Incoming Webhook in Microsoft Teams:
+- Go to the Teams channel where you want to post messages.
+- Click on the three dots (...) next to the channel name and select Connectors.
+- Search for Incoming Webhook, click Add, and then Configure.
+- Name your webhook, upload an image if desired, and click Create.
+- Copy the webhook URL provided.
+
+  (Patrick Note: The clients might have issues with setting up webhooks, it requires a lot of user configuration and our users are not technical).
+
+2 - Node.js Code to Post a Message:
+
+Ensure you have axios or any HTTP client library installed in your Node.js project. If not, you can install axios via npm: npm install axios.
+Use the following code snippet to post a message to the Teams channel:
+
+```javascript 
+const axios = require('axios');
+
+// Replace 'YOUR_WEBHOOK_URL' with your actual webhook URL
+const webhookUrl = 'YOUR_WEBHOOK_URL';
+
+const message = {
+  "@type": "MessageCard",
+  "@context": "http://schema.org/extensions",
+  "summary": "Issue 176715375",
+  "themeColor": "0078D7",
+  "title": "Issue opened: \"Push notifications not working\"",
+  "sections": [{
+    "activityTitle": "A new issue was created",
+    "activitySubtitle": "Today, 2:36 PM",
+    "activityImage": "https://example.com/issues/image.png",
+    "facts": [{
+        "name": "Repository:",
+        "value": "Repo name"
+      },
+      {
+        "name": "Issue #:",
+        "value": "176715375"
+      }
+    ],
+    "markdown": true
+  }]
+};
+
+axios.post(webhookUrl, message)
+  .then(response => console.log('Successfully sent message to Teams channel'))
+  .catch(error => console.error('Error sending message to Teams channel', error));
+```
+
+#### Creating a Simple Bot for Teams
+1 Prerequisites:
+- Register your bot with the Microsoft Bot Framework and get your bot's App ID and App Password.
+- Use the Bot Framework SDK for JavaScript.
+  2 Install Dependencies:
+- You need to install the botbuilder package. Run npm install botbuilder.
+
+The following example demonstrates a simple bot that echoes back received messages.
+
+```javascript
+const { BotFrameworkAdapter, MemoryStorage, ConversationState, TurnContext } = require('botbuilder');
+
+// Create adapter.
+// See https://aka.ms/about-bot-adapter to learn more about adapters.
+const adapter = new BotFrameworkAdapter({
+    appId: process.env.MicrosoftAppId,
+    appPassword: process.env.MicrosoftAppPassword
+});
+
+// Create conversation state with in-memory storage provider.
+const conversationState = new ConversationState(new MemoryStorage());
+adapter.use(conversationState);
+
+// Listen for incoming requests.
+server.post('/api/messages', (req, res) => {
+    adapter.processActivity(req, res, async (context) => {
+        // Echo back what the user said
+        if (context.activity.type === 'message') {
+            await context.sendActivity(`You said '${context.activity.text}'`);
+        }
+    });
+});
+```
+
+Running Your Bot:
+- Make sure to expose your bot endpoint (/api/messages in this case) to the internet using a service like ngrok.
+- Update your bot's messaging endpoint in the Microsoft Bot Framework portal to point to the ngrok URL.
+
+### Slash Commands (Bot)
+1 -  Create a Microsoft Teams App: You need to develop a Teams app that can interact with users through commands. This involves using the Microsoft Teams Developer Platform and possibly the Bot Framework.
+2 - Use Bots for Custom Commands: The primary way to introduce custom slash commands in Teams is through bots. Bots can respond to specific commands (or messages) that are input by users. When you create a bot for Teams, you can define custom commands that the bot will recognize and respond to.
+3 - Developing the Bot: You can develop a bot using the Microsoft Bot Framework. This allows your bot to receive and send messages to a Teams channel or chat. Within your bot's code, you can define what actions to take when it receives specific commands.
+4 - Register Your Bot with Microsoft Bot Framework: Register your bot with the Microsoft Bot Framework and configure it to work with Microsoft Teams. This step involves getting a Microsoft App ID and password that are necessary for your bot to communicate with the Teams platform.
+5 - Add Your Bot to Microsoft Teams: Once your bot is developed and registered, you can package your Teams app (which includes the bot) and upload it to Microsoft Teams. This will make your bot available to users within Teams, where they can interact with it using the custom commands you've defined.
+6 - Handling Slash Commands: In the context of your bot's code, you will need to interpret messages that start with a slash (/) as commands. You can then parse the command text and perform the appropriate actions or respond accordingly.
+7 - Publish Your App: For broader distribution, you can publish your Teams app to the Teams app store or distribute it within your organization through the Teams admin center.
+/ <command> <arb> ....
+(Unrelated to teams but then used in teams for functionality)
+- A Job has a todo list
+- a todo item may have an employee
+- a todo item may have a due date
+- a todo item may have a priority
+
+--- Call notes ----
+- Tasks (TODO List)
+- EMail reminders
+
+## Slack
+
+Integrating Slack into your Node.js backend and React frontend application can significantly streamline communication and operations for your automotive industry body shop management software. Slack offers various integration points including bots, apps, webhooks, and its rich API to facilitate interactions between your application and Slack workspace. Here's how you can leverage these integration points:
+
+### 1. **Slack Web API**
+
+The Slack Web API allows you to interact with Slack, enabling functionalities like sending messages, managing channels, and more directly from your application.
+
+- **Backend (Node.js)**: Utilize the `@slack/web-api` package to make API calls from your Node.js backend. This will be the backbone for actions such as posting status updates to Slack channels or handling commands from Slack that can affect your site.
+
+- **Implementation Steps**:
+    1. Create a Slack app in your Slack workspace and obtain the API tokens.
+    2. Use the `@slack/web-api` package to authenticate and interact with Slack API endpoints.
+    3. Implement features such as sending messages or processing events from Slack.
+
+### 2. **Incoming Webhooks**
+
+For simpler integrations focused on sending notifications to Slack channels, incoming webhooks are straightforward and effective. They allow you to send messages to a specific channel without a full-blown app.
+
+- **Setup**:
+    1. Create an incoming webhook from the Slack app configuration page.
+    2. Use the webhook URL to send messages from your Node.js backend by making simple HTTP POST requests with your message payload.
+
+### 3. **Bots**
+
+Slack bots can facilitate interactive experiences within your Slack workspace, responding to commands, posting notifications, or even pulling data from your site on demand.
+
+- **Backend (Node.js)**: Leverage the `@slack/bolt` framework, which simplifies creating Slack bots with event handling, messaging, and built-in OAuth support.
+
+- **Implementation Steps**:
+    1. Create a Slack app and enable bot features.
+    2. Use the `@slack/bolt` package to develop your bot, handling events like messages or commands.
+    3. Deploy your bot and set it to listen to incoming events from Slack.
+
+### 4. **Slack Block Kit**
+
+For more engaging and interactive messages, Slack's Block Kit provides a UI framework that allows you to create richly formatted messages, modals, and more.
+
+- **Frontend (React)** and **Backend (Node.js)**: Utilize Slack's Block Kit to design complex messages with buttons, sections, and interactive components. You can send these payloads through the Web API or from bots to enhance your app's interaction with users.
+
+### Getting Started
+
+- **Slack API Documentation and Tools**: Slack's API documentation is comprehensive and includes tutorials, tooling (like Block Kit Builder), and SDK documentation to help you get started.
+
+- **Testing and Development**: Slack provides a sandbox environment for you to test your app's integrations and interactions without affecting your live workspace.
+
+To integrate Slack into your application effectively, start by planning out the interactions you need (e.g., notifications, commands, information retrieval) and map these to the appropriate Slack features. Then, incrementally build and test each integration, utilizing Slack's development tools and your existing Node.js and React knowledge to create a seamless experience for your users.
+
+#### Examples
+
+1. Incoming Webhooks
+   Incoming Webhooks are a simple way to post messages from your Node.js application into Slack channels. They're perfect for notifying team members about status changes or updates.
+
+Setup:
+
+1 - Create a new Slack app in your workspace and enable incoming webhooks.
+2 - Add a new webhook to your app and choose the channel it will post to.
+3 - Use the webhook URL to send messages from your backend.
+
+Node.js Example:
+
+```javascript
+
+const axios = require('axios');
+const webhookUrl = 'YOUR_SLACK_WEBHOOK_URL';
+
+async function postMessageToSlack(message) {
+  await axios.post(webhookUrl, {
+    text: message, // Your message here
+  });
+}
+
+postMessageToSlack('New status update on the automotive project!').catch(console.error);
+```
+2. Bots
+   Slack bots can interact with users via messages, respond to commands, and even post updates. They're great for building interactive features.
+
+Setup:
+
+1 - Create a Slack app and add the Bot Token Scopes (like chat:write).
+2 - Install the app to your workspace to get your bot token.
+3 - Use the @slack/bolt framework for easy bot development in Node.js.
+
+Node.js Example:
+
+```javascript
+const { App } = require('@slack/bolt');
+
+const app = new App({
+  token: process.env.SLACK_BOT_TOKEN, // Set your bot's access token here
+  signingSecret: process.env.SLACK_SIGNING_SECRET // Set your app's signing secret here
+});
+
+app.message('hello', async ({ message, say }) => {
+  await say(`Hey there <@${message.user}>!`);
+});
+
+(async () => {
+  await app.start(process.env.PORT || 3000);
+  console.log('Slack bot is running!');
+})();
+```
+
+3. Slash Commands
+   Slash Commands allow users to interact with your application directly from Slack by typing commands that start with /.
+
+Setup:
+
+1 - Create a Slack app and configure a new Slash Command (e.g., /statusupdate).
+2 - Point the command request URL to your Node.js backend endpoint.
+3 - Implement the endpoint to handle the command and respond accordingly.
+
+Node.js Example:
+
+```javascript
+const express = require('express');
+const bodyParser = require('body-parser');
+
+const app = express();
+app.use(bodyParser.urlencoded({ extended: false }));
+
+app.post('/slack/commands/statusupdate', (req, res) => {
+  const { text, user_name } = req.body; // Command input and user info
+  // Logic to handle the command goes here. For example, update a status or fetch information.
+  res.send(`Status update received: ${text} - from ${user_name}`);
+});
+
+app.listen(process.env.PORT || 3000, () => console.log('Server is running'));
+```
+
+4. Interactive Components
+   Interactive components like buttons or menus can make your Slack messages more engaging and interactive.
+
+Setup:
+1 - Enable Interactivity in your Slack app settings.
+2 - Implement an endpoint in your Node.js backend to handle interactions.
+3 - Send messages with interactive components from your backend.
+
+Implementing these features into your Node.js and React application will enable a more dynamic and integrated experience for users of your body shop management software. Start with the simpler integrations like webhooks and progressively incorporate bots and interactive components as needed.
+
+ACTION ITEMS:
+- Slot in tasks, this will be a dependency for things we want to do in the future.
+- This would involve GUI components
+- This would involve a backend component

_reference/reportFiltersAndSorters.md

@@ -0,0 +1,189 @@
+# Filters and Sorters
+
+This documentation details the schema required for `.filters` files on the report server. It is used to dynamically
+modify the graphQL query and provide the user more power over their reports.
+
+For filters and sorters, valid types include (`type` key in the schema):
+- string (default)
+- number
+- bool or boolean
+- date
+
+## Special Notes
+- When passing the data to the template server, the property filters and sorters is added to the data object and will reflect the filters and sorters the user has selected
+
+## High level Schema Overview
+
+```javascript
+const schema = {
+    "filters": [
+        {
+            "name": "jobs.joblines.mod_lb_hrs", // Name and path of the field in the graphQL query
+            "translation": "jobs.joblines.mod_lb_hrs_1", // Translation key for the label used in the GUI
+            "label": "mod_lb_hrs_1",    // Label used in the case the GUI does not contain a translation
+            "type": "number" // Type of field, can be number or string currently
+        },
+        // ... more filters
+    ],
+    "sorters": [
+        {
+            "name": "jobs.joblines.mod_lb_hrs",  // Name and path of the field in the graphQL query
+            "translation": "jobs.joblines.mod_lb_hrs_1",  // Translation key for the label used in the GUI
+            "label": "mod_lb_hrs_1", // Label used in the case the GUI does not contain a translation
+            "type": "number"  // Type of field, can be number or string currently
+        },
+        // ... more sorters
+    ],
+    "dates": {
+        // This is not yet implemented and will be added in a future release
+    }
+}
+```
+
+## Filters
+
+Filters effect the where clause of the graphQL query. They are used to filter the data returned from the server.
+A note on special notation used in the `name` field.
+
+## Reflection
+
+Filters can make use of reflection to pre-fill select boxes, the following is an example of that in the filters file.
+
+```json
+    {
+      "name": "jobs.status",
+      "translation": "jobs.fields.status",
+      "label": "Status",
+      "type": "string",
+      "reflector": {
+        "type": "internal",
+        "name": "special.job_statuses"
+      }
+    }
+```
+
+in this example, a reflector with the type 'internal' (all types at the moment require this, and it is used for future functionality), with a name of `special.job_statuses`
+
+The following cases are available
+
+- `special.job_statuses` - This will reflect the statuses of the jobs table `bodyshop.md_ro_statuses.statuses'`
+- `special.cost_centers` - This will reflect the cost centers `bodyshop.md_responsibility_centers.costs`
+- `special.categories` - This will reflect the categories `bodyshop.md_categories`
+- `special.insurance_companies` - This will reflect the insurance companies `bodyshop.md_ins_cos`'
+- `special.employee_teams` - This will reflect the employee teams `bodyshop.employee_teams`
+- `special.employees` - This will reflect the employees `bodyshop.employees`
+- `special.first_names` - This will reflect the first names `bodyshop.employees`
+- `special.last_names` - This will reflect the last names `bodyshop.employees`
+- `special.referral_sources` - This will reflect the referral sources `bodyshop.md_referral_sources`
+- `special.class`- This will reflect the class `bodyshop.md_classes`
+- `special.lost_sale_reasons` - This will reflect the lost sale reasons `bodyshop.md_lost_sale_reasons`
+- `special.alt_transports` - This will reflect the alternative transports `bodyshop.appt_alt_transport`
+- `special.payment_types` - This will reflect the payment types `bodyshop.md_payment_types`
+- `special.payment_payers` - This is a special case with a key value set of [Customer, Insurance]
+
+### Path without brackets, multi level
+
+`"name": "jobs.joblines.mod_lb_hrs",`
+This will produce a where clause at the `joblines` level of the graphQL query,
+
+```graphql
+query gendoc_hours_sold_detail_open($starttz: timestamptz!, $endtz: timestamptz!) {
+    jobs(
+        where: {date_invoiced: {_is_null: true}, date_open: {_gte: $starttz, _lte: $endtz}, ro_number: {_is_null: false}, voided: {_eq: false}}
+    ) {
+        joblines(
+            order_by: {line_no: asc}
+            where: {removed: {_eq: false}, mod_lb_hrs: {_lt: 3}}
+        ) {
+            line_no
+            mod_lbr_ty
+            mod_lb_hrs
+            convertedtolbr
+            convertedtolbr_data
+        }
+        ownr_co_nm
+        ownr_fn
+        ownr_ln
+        plate_no
+        ro_number
+        status
+        v_make_desc
+        v_model_desc
+        v_model_yr
+        v_vin
+        v_color
+    }
+}
+```
+
+### Path with brackets,top level
+
+`"name": "[jobs].joblines.mod_lb_hrs",`
+This will produce a where clause at the `jobs` level of the graphQL query.
+
+```graphql
+query gendoc_hours_sold_detail_open($starttz: timestamptz!, $endtz: timestamptz!) {
+    jobs(
+        where: {date_invoiced: {_is_null: true}, date_open: {_gte: $starttz, _lte: $endtz}, ro_number: {_is_null: false}, voided: {_eq: false}, joblines: {mod_lb_hrs: {_gt: 4}}}
+    ) {
+        joblines(
+            order_by: {line_no: asc}
+            where: {removed: {_eq: false}}
+        ) {
+            line_no
+            mod_lbr_ty
+            mod_lb_hrs
+            convertedtolbr
+            convertedtolbr_data
+        }
+        ownr_co_nm
+        ownr_fn
+        ownr_ln
+        plate_no
+        ro_number
+        status
+        v_make_desc
+        v_model_desc
+        v_model_yr
+        v_vin
+        v_color
+    }
+}
+```
+
+## Known Caveats
+
+- Will only support two level of nesting in the graphQL query `jobs.joblines.mod_lb_hrs` vs `[jobs].joblines.mod_lb_hrs`
+  is fine, but `jobs.[joblines.].some_table.mod_lb_hrs` is not.
+- The type object must be 'string' or 'number'  or 'bool' or 'boolean' or 'date' and is case-sensitive.
+- The `translation` key is used to look up the label in the GUI, if it is not found, the `label` key is used.
+- Do not add the ability to filter things that are already filtered as part of the original query, this would be
+  redundant and could cause issues.
+- Do not add the ability to filter on things like FK constraints, must like the above example.
+- *INHERITANCE CAVEAT* If you have a filters file on a parent report that has a child that you do not want the filters inherited from, you must place a blank filters file (valid json so {}) on the child report level. This will than fetch the child filters, which are empty and move along, versus inheriting the parent filters.
+
+## Sorters
+
+- Sorters follow the same schema as filters, however, they do not do square bracket wrapping to indicate level hoisting,
+  a filter added on `job.md_status` would be added at the top level, and a filter added on `jobs.joblines.mod_lb_hrs`
+  would be added at the `joblines` level.
+- Most of the reports currently do sorting on a template level, this will need to change to actually see the results
+  using the sorters.
+
+### Default Sorters
+
+- A sorter can be given a default object containing a `order` and `direction` key value. This will be used to sort the report if the user does not select any of the sorters themselves.
+- The `order` key is the order in which the sorters are applied, and the `direction` key is the direction of the sort, either `asc` or `desc`.
+
+```json
+{
+    "name": "jobs.joblines.mod_lb_hrs",
+    "translation": "jobs.joblines.mod_lb_hrs_1",
+    "label": "mod_lb_hrs_1",
+    "type": "number",
+    "default": {
+        "order": 1,
+        "direction": "asc"
+    }
+}
+```

client/.env.development

@@ -1,14 +1,13 @@
 REACT_APP_GRAPHQL_ENDPOINT=https://db.dev.bodyshop.app/v1/graphql
 REACT_APP_GRAPHQL_ENDPOINT_WS=wss://db.dev.bodyshop.app/v1/graphql
 REACT_APP_GA_CODE=231099835
-REACT_APP_FIREBASE_CONFIG={  "apiKey": "AIzaSyAuLQR9SV5LsVxjU8wh9hvFLdhcAHU6cxE",  "authDomain": "rome-prod-1.firebaseapp.com",  "projectId": "rome-prod-1",  "storageBucket": "rome-prod-1.appspot.com",  "messagingSenderId": "147786367145",  "appId": "1:147786367145:web:9d4cba68071c3f29a8a9b8",  "measurementId": "G-G8Z9DRHTZS"}
+REACT_APP_FIREBASE_CONFIG={"apiKey":"AIzaSyDPLT8GiDHDR1R4nI66Qi0BY1aYviDPioc","authDomain":"imex-dev.firebaseapp.com","databaseURL":"https://imex-dev.firebaseio.com","projectId":"imex-dev","storageBucket":"imex-dev.appspot.com","messagingSenderId":"759548147434","appId":"1:759548147434:web:e8239868a48ceb36700993","measurementId":"G-K5XRBVVB4S"}
 REACT_APP_CLOUDINARY_ENDPOINT_API=https://api.cloudinary.com/v1_1/io-test
 REACT_APP_CLOUDINARY_ENDPOINT=https://res.cloudinary.com/io-test
 REACT_APP_CLOUDINARY_API_KEY=957865933348715
 REACT_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
-REACT_APP_FIREBASE_PUBLIC_VAPID_KEY='BP1B7ZTYpn-KMt6nOxlld6aS8Skt3Q7ZLEqP0hAvGHxG4UojPYiXZ6kPlzZkUC5jH-EcWXomTLtmadAIxurfcHo'
+REACT_APP_FIREBASE_PUBLIC_VAPID_KEY='BG3tzU7L2BXlGZ_3VLK4PNaRceoEXEnmHfxcVbRMF5o5g05ejslhVPki9kBM9cBBT-08Ad9kN3HSpS6JmrWD6h4'
 REACT_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
 REACT_APP_AXIOS_BASE_API_URL=http://localhost:4000
 REACT_APP_REPORTS_SERVER_URL=https://reports3.test.imex.online
-REACT_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
-REACT_APP_COUNTRY=USA
+REACT_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc

client/.env.production

@@ -1,14 +1,14 @@
 GENERATE_SOURCEMAP=true
-REACT_APP_GRAPHQL_ENDPOINT=https://db.romeonline.io/v1/graphql
-REACT_APP_GRAPHQL_ENDPOINT_WS=wss://db.romeonline.io/v1/graphql
+REACT_APP_GRAPHQL_ENDPOINT=https://db.imex.online/v1/graphql
+REACT_APP_GRAPHQL_ENDPOINT_WS=wss://db.imex.online/v1/graphql
 REACT_APP_GA_CODE=231103507
-REACT_APP_FIREBASE_CONFIG={  "apiKey": "AIzaSyAuLQR9SV5LsVxjU8wh9hvFLdhcAHU6cxE",  "authDomain": "rome-prod-1.firebaseapp.com",  "projectId": "rome-prod-1",  "storageBucket": "rome-prod-1.appspot.com",  "messagingSenderId": "147786367145",  "appId": "1:147786367145:web:9d4cba68071c3f29a8a9b8",  "measurementId": "G-G8Z9DRHTZS"}
+REACT_APP_FIREBASE_CONFIG={"apiKey":"AIzaSyDSezy-jGJreo7ulgpLdlpOwAOrgcaEkhU","authDomain":"imex-prod.firebaseapp.com","databaseURL":"https://imex-prod.firebaseio.com","projectId":"imex-prod","storageBucket":"imex-prod.appspot.com","messagingSenderId":"253497221485","appId":"1:253497221485:web:3c81c483b94db84b227a64","measurementId":"G-NTWBKG2L0M"}
 REACT_APP_CLOUDINARY_ENDPOINT_API=https://api.cloudinary.com/v1_1/bodyshop
 REACT_APP_CLOUDINARY_ENDPOINT=https://res.cloudinary.com/bodyshop
 REACT_APP_CLOUDINARY_API_KEY=473322739956866
 REACT_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
-REACT_APP_FIREBASE_PUBLIC_VAPID_KEY='BP1B7ZTYpn-KMt6nOxlld6aS8Skt3Q7ZLEqP0hAvGHxG4UojPYiXZ6kPlzZkUC5jH-EcWXomTLtmadAIxurfcHo'
+REACT_APP_FIREBASE_PUBLIC_VAPID_KEY='BMgZT1NZztW2DsJl8Mg2L04hgY9FzAg6b8fbzgNAfww2VDzH3VE63Ot9EaP_U7KWS2JT-7HPHaw0T_Tw_5vkZc8'
 REACT_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
-REACT_APP_AXIOS_BASE_API_URL=https://api.romeonline.io/
-REACT_APP_REPORTS_SERVER_URL=https://reports.romeonline.io
+REACT_APP_AXIOS_BASE_API_URL=https://api.imex.online/
+REACT_APP_REPORTS_SERVER_URL=https://reports.imex.online
 REACT_APP_SPLIT_API=et9pjkik6bn67he5evpmpr1agoo7gactphgk

client/.env.test

@@ -1,14 +1,14 @@
-REACT_APP_GRAPHQL_ENDPOINT=https://db.test.romeonline.io/v1/graphql
-REACT_APP_GRAPHQL_ENDPOINT_WS=wss://db.test.romeonline.io/v1/graphql
-REACT_APP_GA_CODE=231103507
-REACT_APP_FIREBASE_CONFIG={  "apiKey": "AIzaSyAuLQR9SV5LsVxjU8wh9hvFLdhcAHU6cxE",  "authDomain": "rome-prod-1.firebaseapp.com",  "projectId": "rome-prod-1",  "storageBucket": "rome-prod-1.appspot.com",  "messagingSenderId": "147786367145",  "appId": "1:147786367145:web:9d4cba68071c3f29a8a9b8",  "measurementId": "G-G8Z9DRHTZS"}
+REACT_APP_GRAPHQL_ENDPOINT=https://db.test.bodyshop.app/v1/graphql
+REACT_APP_GRAPHQL_ENDPOINT_WS=wss://db.test.bodyshop.app/v1/graphql
+REACT_APP_GA_CODE=231099835
+REACT_APP_FIREBASE_CONFIG={   "apiKey":"AIzaSyBw7_GTy7GtQyfkIRPVrWHEGKfcqeyXw0c",   "authDomain":"imex-test.firebaseapp.com",   "projectId":"imex-test",   "storageBucket":"imex-test.appspot.com",   "messagingSenderId":"991923618608",   "appId":"1:991923618608:web:633437569cdad78299bef5",   "measurementId":"G-TW0XLZEH18"}
 REACT_APP_CLOUDINARY_ENDPOINT_API=https://api.cloudinary.com/v1_1/bodyshop
 REACT_APP_CLOUDINARY_ENDPOINT=https://res.cloudinary.com/bodyshop
 REACT_APP_CLOUDINARY_API_KEY=473322739956866
 REACT_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
-REACT_APP_FIREBASE_PUBLIC_VAPID_KEY='BP1B7ZTYpn-KMt6nOxlld6aS8Skt3Q7ZLEqP0hAvGHxG4UojPYiXZ6kPlzZkUC5jH-EcWXomTLtmadAIxurfcHo'
+REACT_APP_FIREBASE_PUBLIC_VAPID_KEY='BN2GcDPjipR5MTEosO5dT4CfQ3cmrdBIsI4juoOQrRijn_5aRiHlwj1mlq0W145mOusx6xynEKl_tvYJhpCc9lo'
 REACT_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
-REACT_APP_AXIOS_BASE_API_URL=https://api.test.romeonline.io/
-REACT_APP_REPORTS_SERVER_URL=https://reports.test.romeonline.io
+REACT_APP_AXIOS_BASE_API_URL=https://api.test.imex.online/
+REACT_APP_REPORTS_SERVER_URL=https://reports3.test.imex.online
 REACT_APP_IS_TEST=true
 REACT_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc

client/craco.config.js

@@ -20,7 +20,7 @@ module.exports = {
         //         authToken:
         //             "6b45b028a02342db97a9a2f92c0959058665443d379d4a3a876430009e744260",
         //         org: "snapt-software",
-        //         project: "rome-online",
+        //         project: "imexonline",
         //         release: process.env.REACT_APP_GIT_SHA,
         //
         //         // webpack-specific configuration

client/package.json

@@ -11,13 +11,13 @@
     "@craco/craco": "^7.1.0",
     "@fingerprintjs/fingerprintjs": "^4.2.2",
     "@jsreport/browser-client": "^3.1.0",
-    "@reduxjs/toolkit": "^2.1.0",
-    "@sentry/cli": "^2.28.0",
-    "@sentry/react": "^7.100.0",
-    "@sentry/tracing": "^7.100.0",
+    "@reduxjs/toolkit": "^2.2.1",
+    "@sentry/cli": "^2.28.6",
+    "@sentry/react": "^7.104.0",
+    "@sentry/tracing": "^7.104.0",
     "@splitsoftware/splitio-react": "^1.11.0",
     "@tanem/react-nprogress": "^5.0.51",
-    "antd": "^5.14.0",
+    "antd": "^5.14.2",
     "apollo-link-logger": "^2.0.1",
     "apollo-link-sentry": "^3.3.0",
     "axios": "^1.6.7",
@@ -25,54 +25,54 @@
     "dayjs": "^1.11.10",
     "dayjs-business-days2": "^1.2.2",
     "dinero.js": "^1.9.1",
-    "dotenv": "^16.4.1",
+    "dotenv": "^16.4.5",
     "enquire-js": "^0.2.1",
     "env-cmd": "^10.1.0",
     "exifr": "^7.1.3",
-    "firebase": "^10.8.0",
+    "firebase": "^10.8.1",
     "graphql": "^16.6.0",
-    "i18next": "^23.8.2",
+    "i18next": "^23.10.0",
     "i18next-browser-languagedetector": "^7.0.2",
-    "jsoneditor": "^10.0.0",
+    "jsoneditor": "^10.0.1",
     "jsreport-browser-client-dist": "^1.3.0",
-    "libphonenumber-js": "^1.10.55",
-    "logrocket": "^7.0.0",
+    "libphonenumber-js": "^1.10.57",
+    "logrocket": "^8.0.1",
     "markerjs2": "^2.32.0",
     "normalize-url": "^8.0.0",
     "phone": "^3.1.42",
     "preval.macro": "^5.0.0",
     "prop-types": "^15.8.1",
-    "query-string": "^8.2.0",
+    "query-string": "^9.0.0",
     "rc-queue-anim": "^2.0.0",
     "rc-scroll-anim": "^2.7.6",
     "react": "^18.2.0",
-    "react-big-calendar": "^1.8.7",
+    "react-big-calendar": "^1.11.0",
     "react-color": "^2.19.3",
-    "react-cookie": "^7.0.2",
+    "react-cookie": "^7.1.0",
     "react-dom": "^18.2.0",
     "react-drag-listview": "^2.0.0",
     "react-grid-gallery": "^1.0.0",
     "react-grid-layout": "1.3.4",
-    "react-i18next": "^14.0.4",
+    "react-i18next": "^14.0.5",
     "react-icons": "^5.0.1",
     "react-image-lightbox": "^5.1.4",
-    "react-intersection-observer": "^9.7.0",
+    "react-intersection-observer": "^9.8.1",
     "react-markdown": "^9.0.1",
-    "react-number-format": "^5.1.4",
+    "react-number-format": "^5.3.3",
     "react-redux": "^9.1.0",
     "react-resizable": "^3.0.5",
-    "react-router-dom": "^6.22.0",
+    "react-router-dom": "^6.22.2",
     "react-scripts": "^5.0.1",
     "react-sticky": "^6.0.3",
     "react-sublime-video": "^0.2.5",
     "react-virtualized": "^9.22.5",
-    "recharts": "^2.11.0",
+    "recharts": "^2.12.2",
     "redux": "^5.0.1",
     "redux-persist": "^6.0.0",
     "redux-saga": "^1.3.0",
     "redux-state-sync": "^3.1.4",
     "reselect": "^5.1.0",
-    "sass": "^1.70.0",
+    "sass": "^1.71.1",
     "socket.io-client": "^4.7.4",
     "styled-components": "^6.1.8",
     "subscriptions-transport-ws": "^0.11.0",
@@ -84,7 +84,7 @@
     "workbox-precaching": "^7.0.0",
     "workbox-routing": "^7.0.0",
     "workbox-strategies": "^7.0.0",
-    "yauzl": "^2.10.0"
+    "yauzl": "^3.1.1"
   },
   "scripts": {
     "analyze": "source-map-explorer 'build/static/js/*.js'",
@@ -123,9 +123,9 @@
   },
   "devDependencies": {
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
-    "@sentry/webpack-plugin": "^2.14.0",
+    "@sentry/webpack-plugin": "^2.14.2",
     "@testing-library/cypress": "^10.0.1",
-    "cypress": "^13.6.4",
+    "cypress": "^13.6.6",
     "eslint-plugin-cypress": "^2.15.1",
     "react-error-overlay": "6.0.11",
     "redux-logger": "^3.0.6",

client/public/firebase-messaging-sw.js

@@ -28,17 +28,6 @@ switch (this.location.hostname) {
             // measurementId: "${config.measurementId}",
         };
         break;
-    case "romeonline.io":
-        firebaseConfig = {
-            apiKey: "AIzaSyAuLQR9SV5LsVxjU8wh9hvFLdhcAHU6cxE",
-            authDomain: "rome-prod-1.firebaseapp.com",
-            projectId: "rome-prod-1",
-            storageBucket: "rome-prod-1.appspot.com",
-            messagingSenderId: "147786367145",
-            appId: "1:147786367145:web:9d4cba68071c3f29a8a9b8",
-            measurementId: "G-G8Z9DRHTZS",
-        };
-        break;
     case "imex.online":
     default:
         firebaseConfig = {

client/public/index.html

@@ -2,82 +2,23 @@
 <html lang="en">
 <head>
     <meta charset="utf-8"/>
-    <link href="%PUBLIC_URL%/ro-favicon.png" rel="icon"/>
+    <link href="%PUBLIC_URL%/favicon.png" rel="icon"/>
     <meta content="width=device-width, initial-scale=1" name="viewport"/>
     <meta content="#002366" name="theme-color"/>
-    <meta content="Rome Online" name="description"/>
+    <meta content="ImEX Online" name="description"/>
     <!-- <link rel="apple-touch-icon" href="logo192.png" /> -->
-
-    <!--Use the below code snippet to provide real time updates to the live chat plugin without the need of copying and paste each time to your website when changes are made via PBX-->
-
-    <call-us-selector party="LiveChat528346" phonesystem-url=https://rometech.east.3cx.us:5001></call-us-selector>
-
-    <!--Incase you don't want real time updates to the live chat plugin when options are changed, use the below code snippet. Please note that each time you change the settings you will need to copy and paste the snippet code to your website-->
-
-    <!--<call-us
-
-    phonesystem-url=https://rometech.east.3cx.us:5001
-
-    style="position:fixed;font-size:16px;line-height:17px;z-index: 99999;right: 20px; bottom: 20px;"
-
-    id="wp-live-chat-by-3CX"
-
-    minimized="true"
-
-    animation-style="noanimation"
-
-    party="LiveChat528346"
-
-    minimized-style="bubbleright"
-
-    allow-call="true"
-
-    allow-video="false"
-
-    allow-soundnotifications="true"
-
-    enable-mute="true"
-
-    enable-onmobile="true"
-
-    offline-enabled="true"
-
-    enable="true"
-
-    ignore-queueownership="false"
-
-    authentication="both"
-
-    show-operator-actual-name="true"
-
-    aknowledge-received="true"
-
-    gdpr-enabled="false"
-
-    message-userinfo-format="name"
-
-    message-dateformat="both"
-
-    lang="browser"
-
-    button-icon-type="default"
-
-    greeting-visibility="none"
-
-    greeting-offline-visibility="none"
-
-    chat-delay="2000"
-
-    enable-direct-call="true"
-
-    enable-ga="false"
-
-    ></call-us>-->
-
-    <script charset="utf-8" defer id="tcx-callus-js"
-            src=https://downloads-global.3cx.com/downloads/livechatandtalk/v1/callus.js></script>
-
     <link href="logo192.png" rel="apple-touch-icon"/>
+    <script type="text/javascript">
+        window.$crisp = [];
+        window.CRISP_WEBSITE_ID = "36724f62-2eb0-4b29-9cdd-9905fb99913e";
+        (function () {
+            d = document;
+            s = d.createElement("script");
+            s.src = "https://client.crisp.chat/l.js";
+            s.async = 1;
+            d.getElementsByTagName("head")[0].appendChild(s);
+        })();
+    </script>
     <script>
         !(function () {
             "use strict";
@@ -138,7 +79,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>Rome Online</title>
+    <title>ImEX Online</title>
 </head>
 <body>
 <noscript>You need to enable JavaScript to run this app.</noscript>

client/public/manifest.json

@@ -1,6 +1,6 @@
 {
-  "short_name": "Rome Online",
-  "name": "Rome Online",
+  "short_name": "ImEX Online",
+  "name": "ImEX Online",
   "description": "The ultimate bodyshop management system.",
   "icons": [
     {

client/src/App/App.jsx

@@ -90,10 +90,10 @@ export function App({bodyshop, checkUserSession, currentUser, online, setOnline,
 
             if (
                 client.getTreatment("LogRocket_Tracking") === "on" ||
-                window.location.hostname === 'beta.romeonline.io'
+                window.location.hostname === 'beta.imex.online'
             ) {
                 console.log("LR Start");
-                LogRocket.init("rome-online/rome-online");
+                LogRocket.init("gvfvfw/bodyshopapp");
             }
         }
     }, [bodyshop, client, currentUser.authorized]);
@@ -129,7 +129,7 @@ export function App({bodyshop, checkUserSession, currentUser, online, setOnline,
 
     // Any route that is not assigned and matched will default to the Landing Page component
     return (
-        <Suspense fallback={<LoadingSpinner message="Rome Online"/>}>
+        <Suspense fallback={<LoadingSpinner message="ImEX Online"/>}>
             <Routes>
                 <Route path="*" element={<ErrorBoundary><LandingPage/></ErrorBoundary>}/>
                 <Route path="/signin" element={<ErrorBoundary><SignInPage/></ErrorBoundary>}/>

client/src/App/themeProvider.js

@@ -23,8 +23,7 @@ const defaultTheme = {
         }
     },
     token: {
-        colorPrimary: "#326ade",
-        colorInfo: "#326ade"
+        colorPrimary: '#1677ff'
     }
 };
 

client/src/components/accounting-payables-table/accounting-payables-table.component.jsx

@@ -1,21 +1,20 @@
-import {Card, Checkbox, Input, Space, Table} from "antd";
+import {Card, Checkbox, Input, Space, Table} from "antd";import queryString from "query-string";
 import React, {useState} from "react";
 import {useTranslation} from "react-i18next";
+import {connect } from "react-redux";
 import {Link} from "react-router-dom";
-import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import {alphaSort, dateSort} from "../../utils/sorters";
-import PayableExportButton from "../payable-export-button/payable-export-button.component";
-import PayableExportAll from "../payable-export-all-button/payable-export-all-button.component";
-import {DateFormatter} from "../../utils/DateFormatter";
-import queryString from "query-string";
+import { createStructuredSelector } from "reselect";
 import {logImEXEvent} from "../../firebase/firebase.utils";
-import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
-import {connect} from "react-redux";
-import {createStructuredSelector} from "reselect";
-import {selectBodyshop} from "../../redux/user/user.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import CurrencyFormatter from "../../utils/CurrencyFormatter";
+import {DateFormatter} from "../../utils/DateFormatter";
+import { pageLimit } from "../../utils/config";
+import {alphaSort, dateSort} from "../../utils/sorters";
 import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
+import PayableExportAll from "../payable-export-all-button/payable-export-all-button.component";
+import PayableExportButton from "../payable-export-button/payable-export-button.component";
 import BillMarkSelectedExported from "../payable-mark-selected-exported/payable-mark-selected-exported.component";
-import {pageLimit} from "../../utils/config";
+import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
 
 const mapStateToProps = createStructuredSelector({
     bodyshop: selectBodyshop,
@@ -147,7 +146,7 @@ export function AccountingPayablesTableComponent({
             title: t("general.labels.actions"),
             dataIndex: "actions",
             key: "actions",
-            sorter: (a, b) => a.clm_total - b.clm_total,
+
 
             render: (text, record) => (
                 <PayableExportButton

client/src/components/accounting-payments-table/accounting-payments-table.component.jsx

@@ -8,14 +8,16 @@ import {logImEXEvent} from "../../firebase/firebase.utils";
 import {selectBodyshop} from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import {DateFormatter, DateTimeFormatter} from "../../utils/DateFormatter";
+import {pageLimit } from "../../utils/config";
 import {alphaSort, dateSort} from "../../utils/sorters";
 import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+import OwnerNameDisplay, {
+  OwnerNameDisplayFunction,
+} from "../owner-name-display/owner-name-display.component";
 import PaymentExportButton from "../payment-export-button/payment-export-button.component";
 import PaymentMarkSelectedExported from "../payment-mark-selected-exported/payment-mark-selected-exported.component";
 import PaymentsExportAllButton from "../payments-export-all-button/payments-export-all-button.component";
 import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
-import {pageLimit} from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
     bodyshop: selectBodyshop,
@@ -75,7 +77,11 @@ export function AccountingPayablesTableComponent({
             dataIndex: "owner",
             key: "owner",
             ellipsis: true,
-            sorter: (a, b) => alphaSort(a.job.ownr_ln, b.job.ownr_ln),
+            sorter: (a, b) =>
+        alphaSort(
+          OwnerNameDisplayFunction(a.job),
+          OwnerNameDisplayFunction(b.job)
+        ),
             sortOrder:
                 state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
             render: (text, record) => {
@@ -94,7 +100,9 @@ export function AccountingPayablesTableComponent({
             title: t("payments.fields.amount"),
             dataIndex: "amount",
             key: "amount",
-            render: (text, record) => (
+            sorter: (a, b) => a.amount - b.amount,
+      sortOrder:
+        state.sortedInfo.columnKey === "amount" && state.sortedInfo.order,render: (text, record) => (
                 <CurrencyFormatter>{record.amount}</CurrencyFormatter>
             ),
         },
@@ -111,19 +119,21 @@ export function AccountingPayablesTableComponent({
         {
             title: t("payments.fields.created_at"),
             dataIndex: "created_at",
-            key: "created_at",
+            key: "created_at",sorter: (a, b) => dateSort(a.created_at, b.created_at),
+      sortOrder:
+        state.sortedInfo.columnKey === "created_at" && state.sortedInfo.order,
             render: (text, record) => (
                 <DateTimeFormatter>{record.created_at}</DateTimeFormatter>
             ),
         },
-        {
-            title: t("payments.fields.exportedat"),
-            dataIndex: "exportedat",
-            key: "exportedat",
-            render: (text, record) => (
-                <DateTimeFormatter>{record.exportedat}</DateTimeFormatter>
-            ),
-        },
+        //{
+          //  title: t("payments.fields.exportedat"),
+          //  dataIndex: "exportedat",
+          //  key: "exportedat",
+          //  render: (text, record) => (
+            //    <DateTimeFormatter>{record.exportedat}</DateTimeFormatter>
+          //  ),
+        //},
         {
             title: t("exportlogs.labels.attempts"),
             dataIndex: "attempts",
@@ -137,7 +147,7 @@ export function AccountingPayablesTableComponent({
             title: t("general.labels.actions"),
             dataIndex: "actions",
             key: "actions",
-            sorter: (a, b) => a.clm_total - b.clm_total,
+
 
             render: (text, record) => (
                 <PaymentExportButton

client/src/components/accounting-receivables-table/accounting-receivables-table.component.jsx

@@ -4,17 +4,19 @@ import {useTranslation} from "react-i18next";
 import {Link} from "react-router-dom";
 import {logImEXEvent} from "../../firebase/firebase.utils";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import {alphaSort, dateSort} from "../../utils/sorters";
+import {alphaSort, dateSort, statusSort } from "../../utils/sorters";
 import JobExportButton from "../jobs-close-export-button/jobs-close-export-button.component";
 import JobsExportAllButton from "../jobs-export-all-button/jobs-export-all-button.component";
 
 import {connect} from "react-redux";
 import {createStructuredSelector} from "reselect";
 import {selectBodyshop} from "../../redux/user/user.selectors";
-import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
 import {DateFormatter} from "../../utils/DateFormatter";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
+import OwnerNameDisplay, {
+  OwnerNameDisplayFunction,
+} from "../owner-name-display/owner-name-display.component";
+import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
 
 const mapStateToProps = createStructuredSelector({
     bodyshop: selectBodyshop,
@@ -63,7 +65,7 @@ export function AccountingReceivablesTableComponent({
             title: t("jobs.fields.status"),
             dataIndex: "status",
             key: "status",
-            sorter: (a, b) => a.status - b.status,
+            sorter: (a, b) => statusSort(a, b, bodyshop.md_ro_statuses.statuses),
             sortOrder:
                 state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
         },
@@ -83,7 +85,8 @@ export function AccountingReceivablesTableComponent({
             title: t("jobs.fields.owner"),
             dataIndex: "owner",
             key: "owner",
-            sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
+            sorter: (a, b) =>
+        alphaSort(OwnerNameDisplayFunction(a), OwnerNameDisplayFunction(b)),
             sortOrder:
                 state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
             render: (text, record) => {
@@ -103,7 +106,15 @@ export function AccountingReceivablesTableComponent({
             dataIndex: "vehicle",
             key: "vehicle",
             ellipsis: true,
-            render: (text, record) => {
+            sorter: (a, b) =>
+        alphaSort(
+          `${a.v_model_yr || ""} ${a.v_make_desc || ""} ${
+            a.v_model_desc || ""
+          }`,
+          `${b.v_model_yr || ""} ${b.v_make_desc || ""} ${b.v_model_desc || ""}`
+        ),
+      sortOrder:
+        state.sortedInfo.columnKey === "vehicle" && state.sortedInfo.order,render: (text, record) => {
                 return record.vehicleid ? (
                     <Link to={"/manage/vehicles/" + record.vehicleid}>
                         {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${

client/src/components/bill-delete-button/bill-delete-button.component.jsx

@@ -5,10 +5,22 @@ import React, {useState} from "react";
 import {useTranslation} from "react-i18next";
 import {DELETE_BILL} from "../../graphql/bills.queries";
 import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
+import {insertAuditTrail} from "../../redux/application/application.actions";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
 
-export default function BillDeleteButton({bill, callback}) {
+const mapStateToProps = createStructuredSelector({});
+const mapDispatchToProps = (dispatch) => ({
+    insertAuditTrail: ({ jobid, operation, type }) =>
+        dispatch(insertAuditTrail({ jobid, operation, type })),
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(BillDeleteButton);
+
+export function BillDeleteButton({ bill, jobid, callback, insertAuditTrail }) {
     const [loading, setLoading] = useState(false);
-    const {t} = useTranslation();
+    const { t } = useTranslation();
     const [deleteBill] = useMutation(DELETE_BILL);
 
     const handleDelete = async () => {
@@ -35,7 +47,12 @@ export default function BillDeleteButton({bill, callback}) {
         });
 
         if (!!!result.errors) {
-            notification["success"]({message: t("bills.successes.deleted")});
+            notification["success"]({ message: t("bills.successes.deleted") });
+            insertAuditTrail({
+                jobid: jobid,
+                operation: AuditTrailMapping.billdeleted(bill.invoice_number),
+            type: "billdeleted",
+      });
 
             if (callback && typeof callback === "function") callback(bill.id);
         } else {

client/src/components/bill-detail-edit/bill-detail-edit-component.jsx

@@ -30,8 +30,8 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = (dispatch) => ({
     setPartsOrderContext: (context) =>
         dispatch(setModalContext({context: context, modal: "partsOrder"})),
-    insertAuditTrail: ({jobid, operation}) =>
-        dispatch(insertAuditTrail({jobid, operation})),
+    insertAuditTrail: ({jobid, operation, type}) =>
+        dispatch(insertAuditTrail({jobid, operation, type })),
 });
 
 export default connect(
@@ -145,7 +145,8 @@ export function BillDetailEditcontainer({setPartsOrderContext, insertAuditTrail,
             jobid: bill.jobid,
             billid: search.billid,
             operation: AuditTrailMapping.billupdated(bill.invoice_number),
-        });
+        type: "billupdated",
+    });
 
         await refetch();
         form.setFieldsValue(transformData(data));

client/src/components/bill-detail-edit/bill-detail-edit-return.component.jsx

@@ -16,8 +16,8 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = (dispatch) => ({
     setPartsOrderContext: (context) =>
         dispatch(setModalContext({context: context, modal: "partsOrder"})),
-    insertAuditTrail: ({jobid, operation}) =>
-        dispatch(insertAuditTrail({jobid, operation})),
+    insertAuditTrail: ({jobid, operation, type}) =>
+        dispatch(insertAuditTrail({jobid, operation, type })),
 });
 
 export default connect(

client/src/components/bill-enter-modal/bill-enter-modal.container.jsx

@@ -1,5 +1,4 @@
 import {useApolloClient, useMutation} from "@apollo/client";
-import {useSplitTreatments} from "@splitsoftware/splitio-react";
 import {Button, Checkbox, Form, Modal, notification, Space} from "antd";
 import _ from "lodash";
 import React, {useEffect, useMemo, useState} from "react";
@@ -32,8 +31,8 @@ const mapStateToProps = createStructuredSelector({
 });
 const mapDispatchToProps = (dispatch) => ({
     toggleModalVisible: () => dispatch(toggleModalVisible("billEnter")),
-    insertAuditTrail: ({jobid, billid, operation}) =>
-        dispatch(insertAuditTrail({jobid, billid, operation})),
+    insertAuditTrail: ({jobid, billid, operation, type}) =>
+        dispatch(insertAuditTrail({jobid, billid, operation, type })),
 });
 
 const Templates = TemplateList("job_special");
@@ -58,21 +57,9 @@ function BillEnterModalContainer({
         "enter_bill_generate_label",
         false
     );
-
-    const {treatments: {Enhanced_Payroll}} = useSplitTreatments({
-        attributes: {},
-        names: ["Enhanced_Payroll"],
-        splitKey: bodyshop.imexshopid,
-    });
-
     const formValues = useMemo(() => {
         return {
             ...billEnterModal.context.bill,
-            //Added as a part of IO-2436 for capturing parts price changes.
-            billlines: billEnterModal.context?.bill?.billlines?.map((line) => ({
-                ...line,
-                original_actual_price: line.actual_price,
-            })),
             jobid:
                 (billEnterModal.context.job && billEnterModal.context.job.id) || null,
             federal_tax_rate:
@@ -101,11 +88,11 @@ function BillEnterModalContainer({
             location,
             outstanding_returns,
             inventory,
+            federal_tax_exempt,
             ...remainingValues
         } = values;
 
         let adjustmentsToInsert = {};
-        let payrollAdjustmentsToInsert = [];
 
         const r1 = await insertBill({
             variables: {
@@ -121,33 +108,14 @@ function BillEnterModalContainer({
                                         lbr_adjustment,
                                         location: lineLocation,
                                         part_type,
-                                        create_ppc,
-                                        original_actual_price,
                                         ...restI
                                     } = i;
 
-                                    if (Enhanced_Payroll.treatment === "on") {
-                                        if (
-                                            deductedfromlbr &&
-                                            true //payroll is on
-                                        ) {
-                                            payrollAdjustmentsToInsert.push({
-                                                id: i.joblineid,
-                                                convertedtolbr: true,
-                                                convertedtolbr_data: {
-                                                    mod_lb_hrs: lbr_adjustment.mod_lb_hrs * -1,
-                                                    mod_lbr_ty: lbr_adjustment.mod_lbr_ty,
-                                                },
-                                            });
-                                        }
-                                    } else {
-                                        if (deductedfromlbr) {
-                                            adjustmentsToInsert[lbr_adjustment.mod_lbr_ty] =
-                                                (adjustmentsToInsert[lbr_adjustment.mod_lbr_ty] || 0) -
-                                                restI.actual_price / lbr_adjustment.rate;
-                                        }
+                                    if (deductedfromlbr) {
+                                        adjustmentsToInsert[lbr_adjustment.mod_lbr_ty] =
+                                            (adjustmentsToInsert[lbr_adjustment.mod_lbr_ty] || 0) -
+                                            restI.actual_price / lbr_adjustment.rate;
                                     }
-
                                     return {
                                         ...restI,
                                         deductedfromlbr: deductedfromlbr,
@@ -173,20 +141,6 @@ function BillEnterModalContainer({
             refetchQueries: ["QUERY_PARTS_BILLS_BY_JOBID", "GET_JOB_BY_PK"],
         });
 
-        await Promise.all(
-            payrollAdjustmentsToInsert.map((li) => {
-                return updateJobLines({
-                    variables: {
-                        lineId: li.id,
-                        line: {
-                            convertedtolbr: li.convertedtolbr,
-                            convertedtolbr_data: li.convertedtolbr_data,
-                        },
-                    },
-                });
-            })
-        );
-
         const adjKeys = Object.keys(adjustmentsToInsert);
         if (adjKeys.length > 0) {
             //Query the adjustments, merge, and update them.
@@ -211,7 +165,7 @@ function BillEnterModalContainer({
                         mod_lbr_ty: key,
                         hours: adjustmentsToInsert[key].toFixed(1),
                     }),
-                });
+                type: "jobmodifylbradj",});
             });
 
             const jobUpdate = client.mutate({
@@ -295,14 +249,6 @@ function BillEnterModalContainer({
                                     location: li.location || location,
                                     status:
                                         bodyshop.md_order_statuses.default_received || "Received*",
-                                    //Added parts price changes.
-                                    ...(li.create_ppc &&
-                                    li.original_actual_price !== li.actual_price
-                                        ? {
-                                            act_price_before_ppc: li.original_actual_price,
-                                            act_price: li.actual_price,
-                                        }
-                                        : {}),
                                 },
                             },
                         });
@@ -368,15 +314,16 @@ function BillEnterModalContainer({
             operation: AuditTrailMapping.billposted(
                 r1.data.insert_bills.returning[0].invoice_number
             ),
-        });
+        type: "billposted",
+    });
 
         if (enterAgain) {
-            // form.resetFields();
+            form.resetFields();
+            form.resetFields();
             form.setFieldsValue({
                 ...formValues,
                 billlines: [],
             });
-            form.resetFields();
         } else {
             toggleModalVisible();
         }

client/src/components/bill-form-lines-extended/bill-form-lines.extended.formitem.component.jsx

@@ -1,6 +1,10 @@
 import React from "react";
-import {MinusCircleFilled, PlusCircleFilled, WarningOutlined,} from "@ant-design/icons";
-import {Button, Form, Input, InputNumber, Select, Space, Switch} from "antd";
+import {
+    PlusCircleFilled,
+    MinusCircleFilled,
+    WarningOutlined,
+} from "@ant-design/icons";
+import {Form, Button, InputNumber, Input, Select, Switch, Space} from "antd";
 import {useTranslation} from "react-i18next";
 
 import {connect} from "react-redux";

client/src/components/bill-form/bill-form.component.jsx

@@ -67,19 +67,19 @@ export function BillFormComponent({
         });
     };
 
-    // const handleFederalTaxExemptSwitchToggle = (checked) => {
-    //   // Early gate
-    //   if (!checked) return;
-    //   const values = form.getFieldsValue("billlines");
-    //   // Gate bill lines
-    //   if (!values?.billlines?.length) return;
+    const handleFederalTaxExemptSwitchToggle = (checked) => {
+        // Early gate
+        if (!checked) return;
+        const values = form.getFieldsValue("billlines");
+        // Gate bill lines
+        if (!values?.billlines?.length) return;
 
-        //   const billlines = values.billlines.map((b) => {
-    //     b.applicable_taxes.federal = false;
-    //     return b;
-    //   });
-    //   form.setFieldsValue({ billlines });
-    // };
+        const billlines = values.billlines.map((b) => {
+            b.applicable_taxes.federal = false;
+            return b;
+        });
+        form.setFieldsValue({billlines});
+    };
 
     useEffect(() => {
         if (job) form.validateFields(["is_credit_memo"]);
@@ -368,15 +368,13 @@ export function BillFormComponent({
                 )}
             </LayoutFormRow>
             <LayoutFormRow>
-                {
-                    // <Form.Item
-                    //   span={3}
-                    //   label={t("bills.fields.federal_tax_rate")}
-                    //   name="federal_tax_rate"
-                    // >
-                    //   <CurrencyInput min={0} disabled={disabled} />
-                    // </Form.Item>
-                }
+                <Form.Item
+                    span={3}
+                    label={t("bills.fields.federal_tax_rate")}
+                    name="federal_tax_rate"
+                >
+                    <CurrencyInput min={0} disabled={disabled}/>
+                </Form.Item>
                 <Form.Item
                     span={3}
                     label={t("bills.fields.state_tax_rate")}
@@ -384,22 +382,22 @@ export function BillFormComponent({
                 >
                     <CurrencyInput min={0} disabled={disabled}/>
                 </Form.Item>
-                {/*<Form.Item*/}
-                {/*  span={3}*/}
-                {/*  label={t("bills.fields.local_tax_rate")}*/}
-                {/*  name="local_tax_rate"*/}
-                {/*>*/}
-                {/*  <CurrencyInput min={0} />*/}
-                {/*</Form.Item>*/}
-                {/*  {bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid ? (*/}
-                {/*      <Form.Item*/}
-                      {/*          span={2}*/}
-                      {/*          label={t("bills.labels.federal_tax_exempt")}*/}
-                      {/*          name="federal_tax_exempt"*/}
-                {/*      >*/}
-                      {/*          <Switch onChange={handleFederalTaxExemptSwitchToggle} />*/}
-                {/*      </Form.Item>*/}
-                {/*  ) : null}*/}
+                <Form.Item
+                    span={3}
+                    label={t("bills.fields.local_tax_rate")}
+                    name="local_tax_rate"
+                >
+                    <CurrencyInput min={0}/>
+                </Form.Item>
+                {bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid ? (
+                    <Form.Item
+                        span={2}
+                        label={t("bills.labels.federal_tax_exempt")}
+                        name="federal_tax_exempt"
+                    >
+                        <Switch onChange={handleFederalTaxExemptSwitchToggle}/>
+                    </Form.Item>
+                ) : null}
                 <Form.Item shouldUpdate span={13}>
                     {() => {
                         const values = form.getFieldsValue([
@@ -425,25 +423,21 @@ export function BillFormComponent({
                                             value={totals.subtotal.toFormat()}
                                             precision={2}
                                         />
-                                        {
-                                            // <Statistic
-                                            //   title={t("bills.labels.federal_tax")}
-                                            //   value={totals.federalTax.toFormat()}
-                                            //   precision={2}
-                                            // />
-                                        }
+                                        <Statistic
+                                            title={t("bills.labels.federal_tax")}
+                                            value={totals.federalTax.toFormat()}
+                                            precision={2}
+                                        />
                                         <Statistic
                                             title={t("bills.labels.state_tax")}
                                             value={totals.stateTax.toFormat()}
                                             precision={2}
                                         />
-                                        {
-                                            // <Statistic
-                                            //   title={t("bills.labels.local_tax")}
-                                            //   value={totals.localTax.toFormat()}
-                                            //   precision={2}
-                                            // />
-                                        }
+                                        <Statistic
+                                            title={t("bills.labels.local_tax")}
+                                            value={totals.localTax.toFormat()}
+                                            precision={2}
+                                        />
                                         <Statistic
                                             title={t("bills.labels.entered_total")}
                                             value={totals.enteredTotal.toFormat()}

client/src/components/bill-form/bill-form.lines.component.jsx

@@ -1,6 +1,6 @@
 import {DeleteFilled, DollarCircleFilled} from "@ant-design/icons";
 import {useSplitTreatments} from "@splitsoftware/splitio-react";
-import {Button, Checkbox, Form, Input, InputNumber, Select, Space, Switch, Table, Tooltip,} from "antd";
+import {Button, Form, Input, InputNumber, Select, Space, Switch, Table, Tooltip,} from "antd";
 import React from "react";
 import {useTranslation} from "react-i18next";
 import {connect} from "react-redux";
@@ -32,9 +32,9 @@ export function BillEnterModalLinesComponent({
     const {t} = useTranslation();
     const {setFieldsValue, getFieldsValue, getFieldValue} = form;
 
-    const {treatments: {Simple_Inventory, Enhanced_Payroll}} = useSplitTreatments({
+    const {treatments: {Simple_Inventory}} = useSplitTreatments({
         attributes: {},
-        names: ["Simple_Inventory", "Enhanced_Payroll"],
+        names: ["Simple_Inventory"],
         splitKey: bodyshop && bodyshop.imexshopid,
     });
 
@@ -87,7 +87,6 @@ export function BillEnterModalLinesComponent({
                                                 line_desc: opt.line_desc,
                                                 quantity: opt.part_qty || 1,
                                                 actual_price: opt.cost,
-                                                original_actual_price: opt.cost,
                                                 cost_center: opt.part_type
                                                     ? bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid
                                                         ? opt.part_type !== "PAE"
@@ -214,43 +213,6 @@ export function BillEnterModalLinesComponent({
                         }}
                     />
                 ),
-                additional: (record, index) => (
-                    <Form.Item
-                        dependencies={["billlines", record.name, "actual_price"]}
-                        noStyle
-                    >
-                        {() => {
-                            const billLine = getFieldValue(["billlines", record.name]);
-                            const jobLine = lineData.find(
-                                (line) => line.id === billLine?.joblineid
-                            );
-
-                            if (
-                                !billEdit &&
-                                billLine &&
-                                jobLine &&
-                                billLine?.actual_price !== jobLine?.act_price
-                            ) {
-                                return (
-                                    <Space size="small">
-                                        <Form.Item
-                                            noStyle
-                                            label={t("joblines.fields.create_ppc")}
-                                            key={`${index}ppc`}
-                                            valuePropName="checked"
-                                            name={[record.name, "create_ppc"]}
-                                        >
-                                            <Checkbox/>
-                                        </Form.Item>
-                                        {t("joblines.fields.create_ppc")}
-                                    </Space>
-                                );
-                            } else {
-                                return null;
-                            }
-                        }}
-                    </Form.Item>
-                ),
             },
             {
                 title: t("billlines.fields.actual_cost"),
@@ -392,7 +354,7 @@ export function BillEnterModalLinesComponent({
                 },
                 formInput: (record, index) => <Switch disabled={disabled}/>,
                 additional: (record, index) => (
-                    <Form.Item shouldUpdate noStyle style={{display: "inline-block"}}>
+                    <Form.Item shouldUpdate style={{display: "inline-block"}}>
                         {() => {
                             const price = getFieldValue([
                                 "billlines",
@@ -407,31 +369,12 @@ export function BillEnterModalLinesComponent({
                                 "rate",
                             ]);
 
-                            const billline = getFieldValue(["billlines", record.name]);
-
-                            const jobline = lineData.find(
-                                (line) => line.id === billline?.joblineid
-                            );
-
-                            const employeeTeamName = bodyshop.employee_teams.find(
-                                (team) => team.id === jobline?.assigned_team
-                            );
-
                             if (getFieldValue(["billlines", record.name, "deductedfromlbr"]))
                                 return (
                                     <div>
-                                        <Space>
-                                            {t("joblines.fields.assigned_team", {
-                                                name: employeeTeamName?.name,
-                                            })}
-                                            {`${jobline.mod_lb_hrs} units/${t(
-                                                `joblines.fields.lbr_types.${jobline.mod_lbr_ty}`
-                                            )}`}
-                                        </Space>
                                         <Form.Item
                                             label={t("joblines.fields.mod_lbr_ty")}
                                             key={`${index}modlbrty`}
-                                            initialValue={jobline ? jobline.mod_lbr_ty : null}
                                             rules={[
                                                 {
                                                     required: true,
@@ -485,44 +428,22 @@ export function BillEnterModalLinesComponent({
                                                 </Select.Option>
                                             </Select>
                                         </Form.Item>
-                                        {Enhanced_Payroll.treatment === "on" ? (
-                                            <Form.Item
-                                                label={t("billlines.labels.mod_lbr_adjustment")}
-                                                name={[record.name, "lbr_adjustment", "mod_lb_hrs"]}
-                                                rules={[
-                                                    {
-                                                        required: true,
-                                                        //message: t("general.validation.required"),
-                                                    },
-                                                ]}
-                                            >
-                                                <InputNumber
-                                                    precision={5}
-                                                    min={0.01}
-                                                    max={jobline ? jobline.mod_lb_hrs : 0}
-                                                />
-                                            </Form.Item>
-                                        ) : (
-                                            <Form.Item
-                                                label={t("jobs.labels.adjustmentrate")}
-                                                name={[record.name, "lbr_adjustment", "rate"]}
-                                                initialValue={bodyshop.default_adjustment_rate}
-                                                rules={[
-                                                    {
-                                                        required: true,
-                                                        //message: t("general.validation.required"),
-                                                    },
-                                                ]}
-                                            >
-                                                <InputNumber precision={2} min={0.01}/>
-                                            </Form.Item>
-                                        )}
-
-                                        <Space>
-                                            {price &&
-                                                adjustmentRate &&
-                                                `${(price / adjustmentRate).toFixed(1)} hrs`}
-                                        </Space>
+                                        <Form.Item
+                                            label={t("jobs.labels.adjustmentrate")}
+                                            name={[record.name, "lbr_adjustment", "rate"]}
+                                            initialValue={bodyshop.default_adjustment_rate}
+                                            rules={[
+                                                {
+                                                    required: true,
+                                                    //message: t("general.validation.required"),
+                                                },
+                                            ]}
+                                        >
+                                            <InputNumber precision={2} min={0.01}/>
+                                        </Form.Item>
+                                        {price &&
+                                            adjustmentRate &&
+                                            `${(price / adjustmentRate).toFixed(1)} hrs`}
                                     </div>
                                 );
                             return <></>;
@@ -530,21 +451,22 @@ export function BillEnterModalLinesComponent({
                     </Form.Item>
                 ),
             },
-            // {
-            //   title: t("billlines.fields.federal_tax_applicable"),
-            //   dataIndex: "applicable_taxes.federal",
-            //   editable: true,
+            {
+                title: t("billlines.fields.federal_tax_applicable"),
+                dataIndex: "applicable_taxes.federal",
+                editable: true,
 
-            //   formItemProps: (field) => {
-            //     return {
-            //       key: `${field.index}fedtax`,
-            //       valuePropName: "checked",
-            //       //  initialValue: true,
-                        //       name: [field.name, "applicable_taxes", "federal"],
-            //     };
-            //   },
-            //   formInput: (record, index) => <Switch disabled={disabled} />,
-            // },
+                formItemProps: (field) => {
+                    return {
+                        key: `${field.index}fedtax`,
+                        valuePropName: "checked",
+                        initialValue:
+                            form.getFieldValue("federal_tax_exempt") === true ? false : true,
+                        name: [field.name, "applicable_taxes", "federal"],
+                    };
+                },
+                formInput: (record, index) => <Switch disabled={disabled}/>,
+            },
             {
                 title: t("billlines.fields.state_tax_applicable"),
                 dataIndex: "applicable_taxes.state",
@@ -559,20 +481,20 @@ export function BillEnterModalLinesComponent({
                 },
                 formInput: (record, index) => <Switch disabled={disabled}/>,
             },
-            // {
-            //   title: t("billlines.fields.local_tax_applicable"),
-            //   dataIndex: "applicable_taxes.local",
-            //   editable: true,
+            {
+                title: t("billlines.fields.local_tax_applicable"),
+                dataIndex: "applicable_taxes.local",
+                editable: true,
 
-            //   formItemProps: (field) => {
-            //     return {
-            //       key: `${field.index}localtax`,
-            //       valuePropName: "checked",
-            //       name: [field.name, "applicable_taxes", "local"],
-            //     };
-            //   },
-            //   formInput: (record, index) => <Switch disabled={disabled} />,
-            // },
+                formItemProps: (field) => {
+                    return {
+                        key: `${field.index}localtax`,
+                        valuePropName: "checked",
+                        name: [field.name, "applicable_taxes", "local"],
+                    };
+                },
+                formInput: (record, index) => <Switch disabled={disabled}/>,
+            },
             {
                 title: t("general.labels.actions"),
 
@@ -697,7 +619,7 @@ const EditableCell = ({
     if (additional)
         return (
             <td {...restProps}>
-                <div size="small">
+                <Space size="small">
                     <Form.Item
                         name={dataIndex}
                         labelCol={{span: 0}}
@@ -706,7 +628,7 @@ const EditableCell = ({
                         {(formInput && formInput(record, record.name)) || children}
                     </Form.Item>
                     {additional && additional(record, record.name)}
-                </div>
+                </Space>
             </td>
         );
     if (wrapper)

client/src/components/bill-form/bill-form.totals.utility.js

@@ -19,14 +19,14 @@ export const CalculateBillTotal = (invoice) => {
             }).multiply(i.quantity || 1);
 
             subtotal = subtotal.add(itemTotal);
-            if (i.applicable_taxes?.federal) {
+            if (i.applicable_taxes.federal) {
                 federalTax = federalTax.add(
                     itemTotal.percentage(federal_tax_rate || 0)
                 );
             }
-            if (i.applicable_taxes?.state)
+            if (i.applicable_taxes.state)
                 stateTax = stateTax.add(itemTotal.percentage(state_tax_rate || 0));
-            if (i.applicable_taxes?.local)
+            if (i.applicable_taxes.local)
                 localTax = localTax.add(itemTotal.percentage(local_tax_rate || 0));
         }
     });

client/src/components/bill-line-search-select/bill-line-search-select.component.jsx

@@ -67,12 +67,6 @@ const BillLineSearchSelect = (
                     item.oem_partno ? ` - ${item.oem_partno}` : ""
                 }${item.alt_partno ? ` (${item.alt_partno})` : ""}`.trim()}
               </span>
-                        {item.act_price === 0 && item.mod_lb_hrs > 0 && (
-                            <span style={{float: "right", paddingleft: "1rem"}}>
-                  {`${item.mod_lb_hrs} units`}
-                </span>
-                        )}
-
                         <span style={{float: "right", paddingleft: "1rem"}}>
                 {item.act_price
                     ? `$${item.act_price && item.act_price.toFixed(2)}`

client/src/components/bills-list-table/bills-list-table.component.jsx

@@ -50,17 +50,17 @@ export function BillsListTableComponent({
 
     const Templates = TemplateList("bill");
     const bills = billsQuery.data ? billsQuery.data.bills : [];
-    const {refetch} = billsQuery;
+    const { refetch } = billsQuery;
     const recordActions = (record, showView = false) => (
         <Space wrap>
             {showView && (
                 <Button onClick={() => handleOnRowClick(record)}>
-                    <EditFilled/>
+                    <EditFilled />
                 </Button>
             )}
-            <BillDeleteButton bill={record}/>
+            <BillDeleteButton bill={record} jobid={job.id} />
             <BillDetailEditReturnComponent
-                data={{bills_by_pk: {...record, jobid: job.id}}}
+                data={{ bills_by_pk: { ...record, jobid: job.id } }}
                 disabled={
                     record.is_credit_memo ||
                     record.vendorid === bodyshop.inhousevendorid ||

client/src/components/card-payment-modal/card-payment-modal.component..jsx

@@ -23,8 +23,8 @@ const mapStateToProps = createStructuredSelector({
 });
 
 const mapDispatchToProps = (dispatch) => ({
-    insertAuditTrail: ({jobid, operation}) =>
-        dispatch(insertAuditTrail({jobid, operation})),
+    insertAuditTrail: ({jobid, operation, type}) =>
+        dispatch(insertAuditTrail({jobid, operation, type})),
     toggleModalVisible: () => dispatch(toggleModalVisible("cardPayment")),
 });
 
@@ -88,7 +88,7 @@ const CardPaymentModalComponent = ({
                 insertAuditTrail({
                     jobid: payment.jobid,
                     operation: AuditTrailMapping.failedpayment(),
-                })
+                type: "failedpayment",})
             );
         });
     };
@@ -280,24 +280,22 @@ const CardPaymentModalComponent = ({
                                     <Input
                                         className="ipayfield"
                                         data-ipayname="account"
-                                        //type="hidden"
+                                        type="hidden"
                                         value={
                                             payments && data && data.jobs.length > 0
                                                 ? data.jobs.map((j) => j.ro_number).join(", ")
                                                 : null
                                         }
-                                        hidden
                                     />
                                     <Input
                                         className="ipayfield"
                                         data-ipayname="email"
-                                        // type="hidden"
+                                        type="hidden"
                                         value={
                                             payments && data && data.jobs.length > 0
                                                 ? data.jobs.filter((j) => j.ownr_ea)[0]?.ownr_ea
                                                 : null
                                         }
-                                        hidden
                                     />
                                 </>
                             );
@@ -325,9 +323,8 @@ const CardPaymentModalComponent = ({
                                     <Input
                                         className="ipayfield"
                                         data-ipayname="amount"
-                                        //type="hidden"
+                                        type="hidden"
                                         value={totalAmountToCharge?.toFixed(2)}
-                                        hidden
                                     />
                                     <Button
                                         type="primary"

client/src/components/contract-form/contract-form.component.jsx

@@ -66,7 +66,30 @@ export default function ContractFormComponent({
                         <FormDateTimePicker/>
                     </Form.Item>
                 )}
-            </LayoutFormRow>
+                {create && (
+                    <Form.Item
+                        shouldUpdate={(p, c) => p.scheduledreturn !== c.scheduledreturn}
+                    >
+                        {() => {
+                            const insuranceOver =
+                                selectedCar &&
+                                selectedCar.insuranceexpires &&
+                                dayjs(selectedCar.insuranceexpires)
+                                    .endOf("day")
+                                    .isBefore(dayjs(form.getFieldValue("scheduledreturn")));
+                            if (insuranceOver)
+                                return (
+                                    <Space direction="vertical" style={{color: "tomato"}}>
+                    <span>
+                      <WarningFilled style={{marginRight: ".3rem"}}/>
+                        {t("contracts.labels.insuranceexpired")}
+                    </span>
+                                    </Space>
+                                );
+                            return <></>;
+                        }}
+                    </Form.Item>
+                )}</LayoutFormRow>
             <LayoutFormRow grow>
                 <Form.Item
                     label={t("contracts.fields.kmstart")}
@@ -88,16 +111,17 @@ export default function ContractFormComponent({
                     >
                         {() => {
                             const mileageOver =
-                                selectedCar &&
-                                selectedCar.nextservicekm <= form.getFieldValue("kmstart");
-
+                                selectedCar && selectedCar.nextservicekm
+                                    ? selectedCar.nextservicekm <= form.getFieldValue("kmstart")
+                                    : false;
                             const dueForService =
                                 selectedCar &&
                                 selectedCar.nextservicedate &&
-                                dayjs(selectedCar.nextservicedate).isBefore(
+                                dayjs(selectedCar.nextservicedate)
+                                    .endOf("day")
+                                    .isSameOrBefore(
                                     dayjs(form.getFieldValue("scheduledreturn"))
-                                );
-
+                                    );
                             if (mileageOver || dueForService)
                                 return (
                                     <Space direction="vertical" style={{color: "tomato"}}>

client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx

@@ -1,22 +1,34 @@
-import {SyncOutlined, WarningFilled} from "@ant-design/icons";
-import {Button, Card, Dropdown, Input, Space, Table, Tooltip,} from "antd";
+import { SyncOutlined, WarningFilled } from "@ant-design/icons";
+import {
+    Button,
+    Card,
+    Dropdown,
+    Input,
+    Space,
+    Table,
+    Tooltip,
+} from "antd";
 import dayjs from "../../utils/day";
-import React, {useState} from "react";
-import {useTranslation} from "react-i18next";
-import {Link} from "react-router-dom";
-import {DateTimeFormatter} from "../../utils/DateFormatter";
-import {GenerateDocument} from "../../utils/RenderTemplate";
-import {TemplateList} from "../../utils/TemplateConstants";
-import {alphaSort} from "../../utils/sorters";
-import {OwnerNameDisplayFunction} from "../owner-name-display/owner-name-display.component";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { Link } from "react-router-dom";
+import { DateTimeFormatter } from "../../utils/DateFormatter";
+import { GenerateDocument } from "../../utils/RenderTemplate";
+import { TemplateList } from "../../utils/TemplateConstants";
+import { alphaSort } from "../../utils/sorters";
+import useLocalStorage from "../../utils/useLocalStorage";
+import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
 
-export default function CourtesyCarsList({loading, courtesycars, refetch}) {
+export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
     const [state, setState] = useState({
         sortedInfo: {},
-        filteredInfo: {text: ""},
     });
     const [searchText, setSearchText] = useState("");
-    const {t} = useTranslation();
+    const [filter, setFilter] = useLocalStorage(
+        "filter_courtesy_cars_list",
+        null
+    );
+    const { t } = useTranslation();
 
     const columns = [
         {
@@ -42,6 +54,7 @@ export default function CourtesyCarsList({loading, courtesycars, refetch}) {
             dataIndex: "status",
             key: "status",
             sorter: (a, b) => alphaSort(a.status, b.status),
+            filteredValue: filter?.status || null,
             filters: [
                 {
                     text: t("courtesycars.status.in"),
@@ -64,19 +77,34 @@ export default function CourtesyCarsList({loading, courtesycars, refetch}) {
             sortOrder:
                 state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
             render: (text, record) => {
-                const {nextservicedate, nextservicekm, mileage} = record;
+                const { nextservicedate, nextservicekm, mileage, insuranceexpires } =
+                    record;
 
                 const mileageOver = nextservicekm ? nextservicekm <= mileage : false;
 
                 const dueForService =
                     nextservicedate && dayjs(nextservicedate).endOf('day').isSameOrBefore(dayjs());
 
+                const insuranceOver =
+                    insuranceexpires &&
+                    dayjs(insuranceexpires).endOf("day").isBefore(dayjs());
+
                 return (
                     <Space>
                         {t(record.status)}
-                        {(mileageOver || dueForService) && (
-                            <Tooltip title={t("contracts.labels.cardueforservice")}>
-                                <WarningFilled style={{color: "tomato"}}/>
+                        {(mileageOver || dueForService || insuranceOver) && (
+                            <Tooltip
+                                title={
+                                    (mileageOver || dueForService) && insuranceOver
+                                        ? t("contracts.labels.insuranceexpired") +
+                                        " / " +
+                                        t("contracts.labels.cardueforservice")
+                                        : insuranceOver
+                                            ? t("contracts.labels.insuranceexpired")
+                                            : t("contracts.labels.cardueforservice")
+                                }
+                            >
+                                <WarningFilled style={{ color: "tomato" }} />
                             </Tooltip>
                         )}
                     </Space>
@@ -88,6 +116,7 @@ export default function CourtesyCarsList({loading, courtesycars, refetch}) {
             dataIndex: "readiness",
             key: "readiness",
             sorter: (a, b) => alphaSort(a.readiness, b.readiness),
+            filteredValue: filter?.readiness || null,
             filters: [
                 {
                     text: t("courtesycars.readiness.ready"),
@@ -203,7 +232,8 @@ export default function CourtesyCarsList({loading, courtesycars, refetch}) {
     ];
 
     const handleTableChange = (pagination, filters, sorter) => {
-        setState({...state, filteredInfo: filters, sortedInfo: sorter});
+        setState({ ...state, sortedInfo: sorter });
+        setFilter(filters);
     };
 
     const tableData = searchText

client/src/components/csi-response-form/csi-response-form.container.jsx

@@ -5,6 +5,7 @@ import React, {useEffect} from "react";
 import {useTranslation} from "react-i18next";
 import {useLocation} from "react-router-dom";
 import {QUERY_CSI_RESPONSE_BY_PK} from "../../graphql/csi.queries";
+import {DateFormatter} from "../../utils/DateFormatter";
 import AlertComponent from "../alert/alert.component";
 import ConfigFormComponents from "../config-form-components/config-form-components.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
@@ -44,7 +45,13 @@ export default function CsiResponseFormContainer() {
                     readOnly
                     componentList={data.csi_by_pk.csiquestion.config}
                 />
-            </Form>
+                {data.csi_by_pk.validuntil ? (
+                    <>
+                        {t("csi.fields.validuntil")}
+                        {": "}
+                        <DateFormatter>{data.csi_by_pk.validuntil}</DateFormatter>
+                    </>
+                ) : null}</Form>
         </Card>
     );
 }

client/src/components/csi-response-list-paginated/csi-response-list-paginated.component.jsx

@@ -5,9 +5,9 @@ import React, {useState} from "react";
 import {useTranslation} from "react-i18next";
 import {Link, useLocation, useNavigate} from "react-router-dom";
 import {DateFormatter} from "../../utils/DateFormatter";
-import {alphaSort} from "../../utils/sorters";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import {pageLimit} from "../../utils/config";
+import {alphaSort, dateSort} from "../../utils/sorters";
+import OwnerNameDisplay, {OwnerNameDisplayFunction,} from "../owner-name-display/owner-name-display.component";
 
 export default function CsiResponseListPaginated({
                                                      refetch,
@@ -16,23 +16,25 @@ export default function CsiResponseListPaginated({
                                                      total,
                                                  }) {
     const search = queryString.parse(useLocation().search);
-    const {responseid, page, sortcolumn, sortorder} = search;
+    const {responseid} = search;
     const history = useNavigate();
+    const {t} = useTranslation();
     const [state, setState] = useState({
         sortedInfo: {},
         filteredInfo: {text: ""},
+        page: "",
     });
 
-    const {t} = useTranslation();
+
     const columns = [
         {
             title: t("jobs.fields.ro_number"),
             dataIndex: "ro_number",
             key: "ro_number",
-            width: "8%",
-            sorter: (a, b) => alphaSort(a.job.ro_number, b.job.ro_number),
-            sortOrder: sortcolumn === "ro_number" && sortorder,
 
+            sorter: (a, b) => alphaSort(a.job.ro_number, b.job.ro_number),
+            sortOrder:
+                state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
             render: (text, record) => (
                 <Link to={"/manage/jobs/" + record.job.id}>
                     {record.job.ro_number || t("general.labels.na")}
@@ -41,15 +43,15 @@ export default function CsiResponseListPaginated({
         },
         {
             title: t("jobs.fields.owner"),
-            dataIndex: "owner",
-            key: "owner",
-            ellipsis: true,
-            sorter: (a, b) => alphaSort(a.job.ownr_ln, b.job.ownr_ln),
-            width: "25%",
-            sortOrder: sortcolumn === "owner" && sortorder,
+            dataIndex: "owner_name",
+            key: "owner_name",
+            sorter: (a, b) => alphaSort(OwnerNameDisplayFunction(a.job),
+                OwnerNameDisplayFunction(b.job)
+            ),
+            sortOrder: state.sortedInfo.columnKey === "owner_name" && state.sortedInfo.order,
             render: (text, record) => {
-                return record.job.owner ? (
-                    <Link to={"/manage/owners/" + record.job.owner.id}>
+                return record.job.ownerid ? (
+                    <Link to={"/manage/owners/" + record.job.ownerid}>
                         <OwnerNameDisplay ownerObject={record.job}/>
                     </Link>
                 ) : (
@@ -64,9 +66,8 @@ export default function CsiResponseListPaginated({
             dataIndex: "completedon",
             key: "completedon",
             ellipsis: true,
-            sorter: (a, b) => a.completedon - b.completedon,
-            width: "25%",
-            sortOrder: sortcolumn === "completedon" && sortorder,
+            sorter: (a, b) => dateSort(a.completedon, b.completedon),
+            sortOrder: state.sortedInfo.columnKey === "completedon" && state.sortedInfo.order,
             render: (text, record) => {
                 return record.completedon ? (
                     <DateFormatter>{record.completedon}</DateFormatter>
@@ -76,11 +77,12 @@ export default function CsiResponseListPaginated({
     ];
 
     const handleTableChange = (pagination, filters, sorter) => {
-        setState({...state, filteredInfo: filters, sortedInfo: sorter});
-        search.page = pagination.current;
-        search.sortcolumn = sorter.columnKey;
-        search.sortorder = sorter.order;
-        history({search: queryString.stringify(search)});
+        setState({
+            ...state,
+            filteredInfo: filters,
+            sortedInfo: sorter,
+            page: pagination.current,
+        });
     };
 
     const handleOnRowClick = (record) => {
@@ -108,7 +110,7 @@ export default function CsiResponseListPaginated({
                 pagination={{
                     position: "top",
                     pageSize: pageLimit,
-                    current: parseInt(page || 1),
+                    current: parseInt(state.page || 1),
                     total: total,
                 }}
                 columns={columns}
@@ -121,13 +123,7 @@ export default function CsiResponseListPaginated({
                     },
                     selectedRowKeys: [responseid],
                     type: "radio",
-                }}
-                onRow={(record, rowIndex) => {
-                    return {
-                        onClick: (event) => {
-                            handleOnRowClick(record);
-                        }, // click row
-                    };
+
                 }}
             />
         </Card>

client/src/components/dashboard-components/job-lifecycle/job-lifecycle-dashboard.component.jsx

@@ -0,0 +1,169 @@
+import {Card, Table, Tag} from "antd";
+import LoadingSkeleton from "../../loading-skeleton/loading-skeleton.component";
+import {useTranslation} from "react-i18next";
+import React, {useEffect, useState} from "react";
+import dayjs from '../../../utils/day';
+import DashboardRefreshRequired from "../refresh-required.component";
+import axios from "axios";
+
+const fortyFiveDaysAgo = () => dayjs().subtract(45, 'day').toLocaleString();
+
+export default function JobLifecycleDashboardComponent({data, bodyshop, ...cardProps}) {
+    const {t} = useTranslation();
+    const [loading, setLoading] = useState(false);
+    const [lifecycleData, setLifecycleData] = useState(null);
+
+    useEffect(() => {
+        async function getLifecycleData() {
+            if (data && data.job_lifecycle) {
+                setLoading(true);
+                const response = await axios.post("/job/lifecycle", {
+                    jobids: data.job_lifecycle.map(x => x.id),
+                    statuses: bodyshop.md_order_statuses
+                });
+                setLifecycleData(response.data.durations);
+                setLoading(false);
+            }
+        }
+
+        getLifecycleData().catch(e => {
+            console.error(`Error in getLifecycleData: ${e}`);
+        })
+    }, [data, bodyshop]);
+
+    const columns = [
+        {
+            title: t('job_lifecycle.columns.status'),
+            dataIndex: 'status',
+            bgColor: 'red',
+            key: 'status',
+            render: (text, record) => {
+                return <Tag color={record.color}>{record.status}</Tag>
+            }
+        },
+        {
+            title: t('job_lifecycle.columns.human_readable'),
+            dataIndex: 'humanReadable',
+            key: 'humanReadable',
+        },
+        {
+            title: t('job_lifecycle.columns.status_count'),
+            key: 'statusCount',
+            render: (text, record) => {
+                return lifecycleData.statusCounts[record.status];
+            }
+        },
+        {
+            title: t('job_lifecycle.columns.percentage'),
+            dataIndex: 'percentage',
+            key: 'percentage',
+            render: (text, record) => {
+                return record.percentage.toFixed(2) + '%';
+            }
+        },
+    ];
+
+    if (!data) return null;
+
+    if (!data.job_lifecycle || !lifecycleData) return <DashboardRefreshRequired {...cardProps} />;
+
+    const extra = `${t('job_lifecycle.content.calculated_based_on')} ${lifecycleData.jobs} ${t('job_lifecycle.content.jobs_in_since')} ${fortyFiveDaysAgo()}`
+
+    return (
+        <Card title={t("job_lifecycle.titles.dashboard")} {...cardProps}>
+            <LoadingSkeleton loading={loading}>
+                <div style={{overflow: 'scroll', height: "100%"}}>
+                    <div id="bar-container" style={{
+                        display: 'flex',
+                        width: '100%',
+                        height: '100px',
+                        textAlign: 'center',
+                        borderRadius: '5px',
+                        borderWidth: '5px',
+                        borderStyle: 'solid',
+                        borderColor: '#f0f2f5',
+                        margin: 0,
+                        padding: 0
+                    }}>
+                        {lifecycleData.summations.map((key, index, array) => {
+                            const isFirst = index === 0;
+                            const isLast = index === array.length - 1;
+                            return (
+                                <div key={key.status} style={{
+                                    overflow: 'hidden',
+                                    display: 'flex',
+                                    flexDirection: 'column',
+                                    justifyContent: 'center',
+                                    alignItems: 'center',
+                                    margin: 0,
+                                    padding: 0,
+
+                                    borderTop: '1px solid #f0f2f5',
+                                    borderBottom: '1px solid #f0f2f5',
+                                    borderLeft: isFirst ? '1px solid #f0f2f5' : undefined,
+                                    borderRight: isLast ? '1px solid #f0f2f5' : undefined,
+
+                                    backgroundColor: key.color,
+                                    width: `${key.percentage}%`
+                                }}
+                                     aria-label={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
+                                     title={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
+                                >
+
+                                    {key.percentage > 15 ?
+                                        <>
+                                            <div>{key.roundedPercentage}</div>
+                                            <div style={{
+                                                backgroundColor: '#f0f2f5',
+                                                borderRadius: '5px',
+                                                paddingRight: '2px',
+                                                paddingLeft: '2px',
+                                                fontSize: '0.8rem',
+                                            }}>
+                                                {key.status}
+                                            </div>
+                                        </>
+                                        : null}
+                                </div>
+                            );
+                        })}
+                    </div>
+                    <Card extra={extra} type='inner' title={t('job_lifecycle.content.legend_title')}
+                          style={{marginTop: '10px'}}>
+                        <div>
+                            {lifecycleData.summations.map((key) => (
+                                <Tag color={key.color} style={{width: '13vh', padding: '4px', margin: '4px'}}>
+                                    <div
+                                        aria-label={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
+                                        title={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
+                                        style={{
+                                            backgroundColor: '#f0f2f5',
+                                            color: '#000',
+                                            padding: '4px',
+                                            textAlign: 'center'
+                                        }}>
+                                        {key.status} [{lifecycleData.statusCounts[key.status]}] ({key.roundedPercentage})
+                                    </div>
+                                </Tag>
+                            ))}
+                        </div>
+                    </Card>
+                    <Card style={{marginTop: "5px"}} type='inner' title={t("job_lifecycle.titles.top_durations")}>
+                        <Table size="small" pagination={false} columns={columns}
+                               dataSource={lifecycleData.summations.sort((a, b) => b.value - a.value).slice(0, 3)}/>
+                    </Card>
+                </div>
+            </LoadingSkeleton>
+        </Card>
+    );
+}
+
+export const JobLifecycleDashboardGQL = `
+job_lifecycle: jobs(where: {
+    actual_in: {
+        _gte: "${dayjs().subtract(45, 'day').toISOString()}"
+    }
+}) {
+    id
+    actual_in
+} `;

client/src/components/dashboard-components/scheduled-in-today/scheduled-in-today.component.jsx

@@ -1,221 +1,469 @@
-import {BranchesOutlined, ExclamationCircleFilled, PauseCircleOutlined,} from "@ant-design/icons";
-import {Card, Space, Table, Tooltip} from "antd";
+import {
+  BranchesOutlined,
+  ExclamationCircleFilled,
+  PauseCircleOutlined,
+} from "@ant-design/icons";
+import { Card, Space, Switch, Table, Tooltip, Typography } from "antd";
 import dayjs from "../../../utils/day";
-import React, {useState} from "react";
-import {useTranslation} from "react-i18next";
-import {Link} from "react-router-dom";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { Link } from "react-router-dom";
+import { TimeFormatter } from "../../../utils/DateFormatter";
+import { onlyUnique } from "../../../utils/arrayHelper";
+import { alphaSort, dateSort } from "../../../utils/sorters";
+import useLocalStorage from "../../../utils/useLocalStorage";
 import ChatOpenButton from "../../chat-open-button/chat-open-button.component";
-import OwnerNameDisplay from "../../owner-name-display/owner-name-display.component";
+import OwnerNameDisplay, {
+  OwnerNameDisplayFunction,
+} from "../../owner-name-display/owner-name-display.component";
 import DashboardRefreshRequired from "../refresh-required.component";
-import {pageLimit} from "../../../utils/config";
 
-export default function DashboardScheduledInToday({data, ...cardProps}) {
-    const {t} = useTranslation();
-    const [state, setState] = useState({
-        sortedInfo: {},
-    });
-    if (!data) return null;
-    if (!data.scheduled_in_today)
-        return <DashboardRefreshRequired {...cardProps} />;
+export default function DashboardScheduledInToday({ data, ...cardProps }) {
+  const { t } = useTranslation();
+  const [state, setState] = useState({
+    sortedInfo: {},
+    filteredInfo: {},
+  });
 
-    const appt = []; // Flatten Data
-    data.scheduled_in_today.forEach((item) => {
-        if (item.job) {
-            var i = {
-                canceled: item.canceled,
-                id: item.id,
-                alt_transport: item.job.alt_transport,
-                clm_no: item.job.clm_no,
-                jobid: item.job.jobid,
-                ins_co_nm: item.job.ins_co_nm,
-                iouparent: item.job.iouparent,
-                ownerid: item.job.ownerid,
-                ownr_co_nm: item.job.ownr_co_nm,
-                ownr_ea: item.job.ownr_ea,
-                ownr_fn: item.job.ownr_fn,
-                ownr_ln: item.job.ownr_ln,
-                ownr_ph1: item.job.ownr_ph1,
-                ownr_ph2: item.job.ownr_ph2,
-                production_vars: item.job.production_vars,
-                ro_number: item.job.ro_number,
-                suspended: item.job.suspended,
-                v_make_desc: item.job.v_make_desc,
-                v_model_desc: item.job.v_model_desc,
-                v_model_yr: item.job.v_model_yr,
-                v_vin: item.job.v_vin,
-                vehicleid: item.job.vehicleid,
-                note: item.note,
-                start: dayjs(item.start).format("hh:mm a"),
-                title: item.title,
-            };
-            appt.push(i);
-        }
-    });
-    appt.sort(function (a, b) {
-        return new dayjs(a.start) - new dayjs(b.start);
-    });
+  const [isTvModeScheduledIn, setIsTvModeScheduledIn] = useLocalStorage(
+    "isTvModeScheduledIn",
+    false
+  );
 
-    const columns = [
-        {
-            title: t("jobs.fields.ro_number"),
-            dataIndex: "ro_number",
-            key: "ro_number",
-            render: (text, record) => (
-                <Link
-                    to={"/manage/jobs/" + record.jobid}
-                    onClick={(e) => e.stopPropagation()}
-                >
-                    <Space>
-                        {record.ro_number || t("general.labels.na")}
-                        {record.production_vars && record.production_vars.alert ? (
-                            <ExclamationCircleFilled className="production-alert"/>
-                        ) : null}
-                        {record.suspended && (
-                            <PauseCircleOutlined style={{color: "orangered"}}/>
-                        )}
-                        {record.iouparent && (
-                            <Tooltip title={t("jobs.labels.iou")}>
-                                <BranchesOutlined style={{color: "orangered"}}/>
-                            </Tooltip>
-                        )}
-                    </Space>
-                </Link>
-            ),
-        },
-        {
-            title: t("jobs.fields.owner"),
-            dataIndex: "owner",
-            key: "owner",
-            ellipsis: true,
-            responsive: ["md"],
-            render: (text, record) => {
-                return record.ownerid ? (
-                    <Link
-                        to={"/manage/owners/" + record.ownerid}
-                        onClick={(e) => e.stopPropagation()}
-                    >
-                        <OwnerNameDisplay ownerObject={record}/>
-                    </Link>
-                ) : (
-                    <span>
-            <OwnerNameDisplay ownerObject={record}/>
-          </span>
-                );
-            },
-        },
-        {
-            title: t("jobs.fields.ownr_ph1"),
-            dataIndex: "ownr_ph1",
-            key: "ownr_ph1",
-            ellipsis: true,
-            responsive: ["md"],
-            render: (text, record) => (
-                <ChatOpenButton phone={record.ownr_ph1} jobid={record.jobid}/>
-            ),
-        },
-        {
-            title: t("jobs.fields.ownr_ph2"),
-            dataIndex: "ownr_ph2",
-            key: "ownr_ph2",
-            ellipsis: true,
-            responsive: ["md"],
-            render: (text, record) => (
-                <ChatOpenButton phone={record.ownr_ph2} jobid={record.jobid}/>
-            ),
-        },
-        {
-            title: t("jobs.fields.ownr_ea"),
-            dataIndex: "ownr_ea",
-            key: "ownr_ea",
-            ellipsis: true,
-            responsive: ["md"],
-            render: (text, record) => (
-                <ChatOpenButton phone={record.ownr_ea} jobid={record.jobid}/>
-            ),
-        },
-        {
-            title: t("jobs.fields.vehicle"),
-            dataIndex: "vehicle",
-            key: "vehicle",
-            ellipsis: true,
-            render: (text, record) => {
-                return record.vehicleid ? (
-                    <Link
-                        to={"/manage/vehicles/" + record.vehicleid}
-                        onClick={(e) => e.stopPropagation()}
-                    >
-                        {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
-                            record.v_model_desc || ""
-                        }`}
-                    </Link>
-                ) : (
-                    <span>{`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
-                        record.v_model_desc || ""
-                    }`}</span>
-                );
-            },
-        },
-        {
-            title: t("jobs.fields.ins_co_nm"),
-            dataIndex: "ins_co_nm",
-            key: "ins_co_nm",
-            ellipsis: true,
-            responsive: ["md"],
-        },
-        {
-            title: t("appointments.fields.time"),
-            dataIndex: "start",
-            key: "start",
-            ellipsis: true,
-            responsive: ["md"],
-        },
-        {
-            title: t("appointments.fields.alt_transport"),
-            dataIndex: "alt_transport",
-            key: "alt_transport",
-            ellipsis: true,
-            responsive: ["md"],
-        },
-    ];
+  if (!data) return null;
+  if (!data.scheduled_in_today)
+    return <DashboardRefreshRequired {...cardProps} />;
 
-    const handleTableChange = (sorter) => {
-        setState({...state, sortedInfo: sorter});
-    };
+  const appt = []; // Flatten Data
+  data.scheduled_in_today.forEach((item) => {
+    if (item.job) {
+      var i = {
+        canceled: item.canceled,
+        id: item.id,
+        alt_transport: item.job.alt_transport,
+        clm_no: item.job.clm_no,
+        jobid: item.job.jobid,
+        joblines_body: item.job.joblines
+          .filter((l) => l.mod_lbr_ty !== "LAR")
+          .reduce((acc, val) => acc + val.mod_lb_hrs, 0),
+        joblines_ref: item.job.joblines
+          .filter((l) => l.mod_lbr_ty === "LAR")
+          .reduce((acc, val) => acc + val.mod_lb_hrs, 0),
+        ins_co_nm: item.job.ins_co_nm,
+        iouparent: item.job.iouparent,
+        ownerid: item.job.ownerid,
+        ownr_co_nm: item.job.ownr_co_nm,
+        ownr_ea: item.job.ownr_ea,
+        ownr_fn: item.job.ownr_fn,
+        ownr_ln: item.job.ownr_ln,
+        ownr_ph1: item.job.ownr_ph1,
+        ownr_ph2: item.job.ownr_ph2,
+        production_vars: item.job.production_vars,
+        ro_number: item.job.ro_number,
+        suspended: item.job.suspended,
+        v_make_desc: item.job.v_make_desc,
+        v_model_desc: item.job.v_model_desc,
+        v_model_yr: item.job.v_model_yr,
+        v_vin: item.job.v_vin,
+        vehicleid: item.job.vehicleid,
+        note: item.note,
+        start: item.start,
+        title: item.title,
+      };
+      appt.push(i);
+    }
+  });
+  appt.sort(function (a, b) {
+    return  dayjs(a.start) -  dayjs(b.start);
+  });
 
-    return (
-        <Card
-            title={t("dashboard.titles.scheduledintoday", {
-                date: dayjs().startOf("day").format("MM/DD/YYYY"),
-            })}
-            {...cardProps}
+  const tvFontSize = 16;
+  const tvFontWeight = "bold";
+
+  const tvColumns = [
+    {
+      title: t("appointments.fields.time"),
+      dataIndex: "start",
+      key: "start",
+      ellipsis: true,
+      sorter: (a, b) => dateSort(a.start, b.start),
+      sortOrder:
+        state.sortedInfo.columnKey === "start" && state.sortedInfo.order,
+      render: (text, record) => (
+        <span style={{ fontSize: tvFontSize, fontWeight: tvFontWeight }}>
+          <TimeFormatter>{record.start}</TimeFormatter>
+        </span>
+      ),
+    },
+    {
+      title: t("jobs.fields.ro_number"),
+      dataIndex: "ro_number",
+      key: "ro_number",
+      sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
+      sortOrder:
+        state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
+      render: (text, record) => (
+        <Link
+          to={"/manage/jobs/" + record.jobid}
+          onClick={(e) => e.stopPropagation()}
         >
-            <div style={{height: "100%"}}>
-                <Table
-                    onChange={handleTableChange}
-                    pagination={{position: "top", defaultPageSize: pageLimit}}
-                    columns={columns}
-                    scroll={{x: true, y: "calc(100% - 2em)"}}
-                    rowKey="id"
-                    style={{height: "85%"}}
-                    dataSource={appt}
-                />
-            </div>
-        </Card>
-    );
+          <Space>
+            <span style={{ fontSize: tvFontSize, fontWeight: tvFontWeight }}>
+              {record.ro_number || t("general.labels.na")}
+              {record.production_vars && record.production_vars.alert ? (
+                <ExclamationCircleFilled className="production-alert" />
+              ) : null}
+              {record.suspended && (
+                <PauseCircleOutlined style={{ color: "orangered" }} />
+              )}
+              {record.iouparent && (
+                <Tooltip title={t("jobs.labels.iou")}>
+                  <BranchesOutlined style={{ color: "orangered" }} />
+                </Tooltip>
+              )}
+            </span>
+          </Space>
+        </Link>
+      ),
+    },
+    {
+      title: t("jobs.fields.owner"),
+      dataIndex: "owner",
+      key: "owner",
+      ellipsis: true,
+      sorter: (a, b) =>
+        alphaSort(OwnerNameDisplayFunction(a), OwnerNameDisplayFunction(b)),
+      sortOrder:
+        state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
+      render: (text, record) => {
+        return record.ownerid ? (
+          <Link
+            to={"/manage/owners/" + record.ownerid}
+            onClick={(e) => e.stopPropagation()}
+          >
+            <span style={{ fontSize: tvFontSize, fontWeight: tvFontWeight }}>
+              <OwnerNameDisplay ownerObject={record} />
+            </span>
+          </Link>
+        ) : (
+          <span style={{ fontSize: tvFontSize, fontWeight: tvFontWeight }}>
+            <OwnerNameDisplay ownerObject={record} />
+          </span>
+        );
+      },
+    },
+    {
+      title: t("jobs.fields.vehicle"),
+      dataIndex: "vehicle",
+      key: "vehicle",
+      ellipsis: true,
+      sorter: (a, b) =>
+        alphaSort(
+          `${a.v_model_yr || ""} ${a.v_make_desc || ""} ${
+            a.v_model_desc || ""
+          }`,
+          `${b.v_model_yr || ""} ${b.v_make_desc || ""} ${b.v_model_desc || ""}`
+        ),
+      sortOrder:
+        state.sortedInfo.columnKey === "vehicle" && state.sortedInfo.order,
+      render: (text, record) => {
+        return record.vehicleid ? (
+          <Link
+            to={"/manage/vehicles/" + record.vehicleid}
+            onClick={(e) => e.stopPropagation()}
+          >
+            <span style={{ fontSize: tvFontSize, fontWeight: tvFontWeight }}>
+              {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
+                record.v_model_desc || ""
+              }`}
+            </span>
+          </Link>
+        ) : (
+          <span style={{ fontSize: tvFontSize, fontWeight: tvFontWeight }}>{`${
+            record.v_model_yr || ""
+          } ${record.v_make_desc || ""} ${record.v_model_desc || ""}`}</span>
+        );
+      },
+    },
+    {
+      title: t("appointments.fields.alt_transport"),
+      dataIndex: "alt_transport",
+      key: "alt_transport",
+      ellipsis: true,
+      sorter: (a, b) => alphaSort(a.alt_transport, b.alt_transport),
+      sortOrder:
+        state.sortedInfo.columnKey === "alt_transport" &&
+        state.sortedInfo.order,
+      filters:
+        (appt &&
+          appt
+            .map((j) => j.alt_transport)
+            .filter(onlyUnique)
+            .map((s) => {
+              return {
+                text: s || "No Alt. Transport",
+                value: [s],
+              };
+            })
+            .sort((a, b) => alphaSort(a.text, b.text))) ||
+        [],
+      onFilter: (value, record) => value.includes(record.alt_transport),
+      render: (text, record) => (
+        <span style={{ fontSize: tvFontSize, fontWeight: tvFontWeight }}>
+          {record.alt_transport}
+        </span>
+      ),
+    },
+    {
+      title: t("jobs.fields.lab"),
+      dataIndex: "joblines_body",
+      key: "joblines_body",
+      sorter: (a, b) => a.joblines_body - b.joblines_body,
+      sortOrder:
+        state.sortedInfo.columnKey === "joblines_body" &&
+        state.sortedInfo.order,
+      align: "right",
+      render: (text, record) => (
+        <span style={{ fontSize: tvFontSize, fontWeight: tvFontWeight }}>
+          {record.joblines_body.toFixed(1)}
+        </span>
+      ),
+    },
+    {
+      title: t("jobs.fields.lar"),
+      dataIndex: "joblines_ref",
+      key: "joblines_ref",
+      sorter: (a, b) => a.joblines_ref - b.joblines_ref,
+      sortOrder:
+        state.sortedInfo.columnKey === "joblines_ref" && state.sortedInfo.order,
+      align: "right",
+      render: (text, record) => (
+        <span style={{ fontSize: tvFontSize, fontWeight: tvFontWeight }}>
+          {record.joblines_ref.toFixed(1)}
+        </span>
+      ),
+    },
+  ];
+
+  const columns = [
+    {
+      title: t("appointments.fields.time"),
+      dataIndex: "start",
+      key: "start",
+      ellipsis: true,
+      sorter: (a, b) => dateSort(a.start, b.start),
+      sortOrder:
+        state.sortedInfo.columnKey === "start" && state.sortedInfo.order,
+      render: (text, record) => <TimeFormatter>{record.start}</TimeFormatter>,
+    },
+    {
+      title: t("jobs.fields.ro_number"),
+      dataIndex: "ro_number",
+      key: "ro_number",
+      sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
+      sortOrder:
+        state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
+      render: (text, record) => (
+        <Link
+          to={"/manage/jobs/" + record.jobid}
+          onClick={(e) => e.stopPropagation()}
+        >
+          <Space>
+            {record.ro_number || t("general.labels.na")}
+            {record.production_vars && record.production_vars.alert ? (
+              <ExclamationCircleFilled className="production-alert" />
+            ) : null}
+            {record.suspended && (
+              <PauseCircleOutlined style={{ color: "orangered" }} />
+            )}
+            {record.iouparent && (
+              <Tooltip title={t("jobs.labels.iou")}>
+                <BranchesOutlined style={{ color: "orangered" }} />
+              </Tooltip>
+            )}
+          </Space>
+        </Link>
+      ),
+    },
+    {
+      title: t("jobs.fields.owner"),
+      dataIndex: "owner",
+      key: "owner",
+      ellipsis: true,
+      sorter: (a, b) =>
+        alphaSort(OwnerNameDisplayFunction(a), OwnerNameDisplayFunction(b)),
+      sortOrder:
+        state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
+      render: (text, record) => {
+        return record.ownerid ? (
+          <Link
+            to={"/manage/owners/" + record.ownerid}
+            onClick={(e) => e.stopPropagation()}
+          >
+            <OwnerNameDisplay ownerObject={record} />
+          </Link>
+        ) : (
+          <span>
+            <OwnerNameDisplay ownerObject={record} />
+          </span>
+        );
+      },
+    },
+    {
+      title: t("dashboard.labels.phone"),
+      dataIndex: "ownr_ph",
+      key: "ownr_ph",
+      ellipsis: true,
+      responsive: ["md"],
+      render: (text, record) => (
+        <Space size="small" wrap>
+          <ChatOpenButton phone={record.ownr_ph1} jobid={record.jobid} />
+          <ChatOpenButton phone={record.ownr_ph2} jobid={record.jobid} />
+        </Space>
+      ),
+    },
+    {
+      title: t("jobs.fields.ownr_ea"),
+      dataIndex: "ownr_ea",
+      key: "ownr_ea",
+      ellipsis: true,
+      responsive: ["md"],
+      render: (text, record) => (
+        <a href={`mailto:${record.ownr_ea}`}>{record.ownr_ea}</a>
+      ),
+    },
+    {
+      title: t("jobs.fields.vehicle"),
+      dataIndex: "vehicle",
+      key: "vehicle",
+      ellipsis: true,
+      sorter: (a, b) =>
+        alphaSort(
+          `${a.v_model_yr || ""} ${a.v_make_desc || ""} ${
+            a.v_model_desc || ""
+          }`,
+          `${b.v_model_yr || ""} ${b.v_make_desc || ""} ${b.v_model_desc || ""}`
+        ),
+      sortOrder:
+        state.sortedInfo.columnKey === "vehicle" && state.sortedInfo.order,
+      render: (text, record) => {
+        return record.vehicleid ? (
+          <Link
+            to={"/manage/vehicles/" + record.vehicleid}
+            onClick={(e) => e.stopPropagation()}
+          >
+            {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
+              record.v_model_desc || ""
+            }`}
+          </Link>
+        ) : (
+          <span>{`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
+            record.v_model_desc || ""
+          }`}</span>
+        );
+      },
+    },
+    {
+      title: t("jobs.fields.ins_co_nm"),
+      dataIndex: "ins_co_nm",
+      key: "ins_co_nm",
+      ellipsis: true,
+      responsive: ["md"],
+      sorter: (a, b) => alphaSort(a.ins_co_nm, b.ins_co_nm),
+      sortOrder:
+        state.sortedInfo.columnKey === "ins_co_nm" && state.sortedInfo.order,
+      filters:
+        (appt &&
+          appt
+            .map((j) => j.ins_co_nm)
+            .filter(onlyUnique)
+            .map((s) => {
+              return {
+                text: s || "No Ins. Co.*",
+                value: [s],
+              };
+            })
+            .sort((a, b) => alphaSort(a.text, b.text))) ||
+        [],
+      onFilter: (value, record) => value.includes(record.ins_co_nm),
+    },
+    {
+      title: t("appointments.fields.alt_transport"),
+      dataIndex: "alt_transport",
+      key: "alt_transport",
+      ellipsis: true,
+      sorter: (a, b) => alphaSort(a.alt_transport, b.alt_transport),
+      sortOrder:
+        state.sortedInfo.columnKey === "alt_transport" &&
+        state.sortedInfo.order,
+      filters:
+        (appt &&
+          appt
+            .map((j) => j.alt_transport)
+            .filter(onlyUnique)
+            .map((s) => {
+              return {
+                text: s || "No Alt. Transport",
+                value: [s],
+              };
+            })
+            .sort((a, b) => alphaSort(a.text, b.text))) ||
+        [],
+      onFilter: (value, record) => value.includes(record.alt_transport),
+    },
+  ];
+
+  const handleTableChange = (pagination, filters, sorter) => {
+    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
+  };
+  return (
+    <Card
+      title={t("dashboard.titles.scheduledindate", {
+        date: dayjs().startOf("day").format("MM/DD/YYYY"),
+      })}
+      extra={
+        <Space>
+          <Typography.Text>{t("general.labels.tvmode")}</Typography.Text>
+          <Switch
+            onClick={() => setIsTvModeScheduledIn(!isTvModeScheduledIn)}
+            defaultChecked={isTvModeScheduledIn}
+          />
+        </Space>
+      }
+      {...cardProps}
+    >
+      <div style={{ height: "100%" }}>
+        <Table
+          onChange={handleTableChange}
+          pagination={false}
+          columns={isTvModeScheduledIn ? tvColumns : columns}
+          scroll={{ x: true, y: "calc(100% - 2em)" }}
+          rowKey="id"
+          style={{ height: "85%" }}
+          dataSource={appt}
+          size={isTvModeScheduledIn ? "small" : "middle"}
+        />
+      </div>
+    </Card>
+  );
 }
 
 export const DashboardScheduledInTodayGql = `
   scheduled_in_today: appointments(where: {start: {_gte: "${dayjs()
     .startOf("day")
     .toISOString()}", _lte: "${dayjs()
-    .endOf("day")
-    .toISOString()}"}, canceled: {_eq: false}, block: {_neq: true}}) {
+  .endOf("day")
+  .toISOString()}"}, canceled: {_eq: false}, block: {_neq: true}}) {
     canceled
     id
     job {
       alt_transport
       clm_no
       jobid: id
+      joblines(where: {removed: {_eq: false}}) {
+        mod_lb_hrs
+        mod_lbr_ty
+      }
       ins_co_nm
       iouparent
       ownerid

client/src/components/dashboard-components/scheduled-out-today/scheduled-out-today.component.jsx

@@ -1,37 +1,273 @@
 import {BranchesOutlined, ExclamationCircleFilled, PauseCircleOutlined,} from "@ant-design/icons";
-import {Card, Space, Table, Tooltip} from "antd";
+import {Card, Space, Switch, Table, Tooltip, Typography} from "antd";
 import dayjs from "../../../utils/day";
 import React, {useState} from "react";
 import {useTranslation} from "react-i18next";
 import {Link} from "react-router-dom";
+import {TimeFormatter} from "../../../utils/DateFormatter";
+import {onlyUnique} from "../../../utils/arrayHelper";
+import {alphaSort, dateSort} from "../../../utils/sorters";
+import useLocalStorage from "../../../utils/useLocalStorage";
 import ChatOpenButton from "../../chat-open-button/chat-open-button.component";
-import OwnerNameDisplay from "../../owner-name-display/owner-name-display.component";
+import OwnerNameDisplay, {OwnerNameDisplayFunction,} from "../../owner-name-display/owner-name-display.component";
 import DashboardRefreshRequired from "../refresh-required.component";
-import {pageLimit} from "../../../utils/config";
 
 export default function DashboardScheduledOutToday({data, ...cardProps}) {
     const {t} = useTranslation();
     const [state, setState] = useState({
         sortedInfo: {},
-    });
+    filteredInfo: {},});
+    const [isTvModeScheduledOut, setIsTvModeScheduledOut] = useLocalStorage(
+        "isTvModeScheduledOut",
+        false
+    );
     if (!data) return null;
     if (!data.scheduled_out_today)
         return <DashboardRefreshRequired {...cardProps} />;
 
-    const filteredScheduledOutToday = data.scheduled_out_today.map((item) => {
+    const scheduledOutToday = data.scheduled_out_today.map((item) => {
+        const joblines_body = item.joblines
+            ? item.joblines
+                .filter((l) => l.mod_lbr_ty !== "LAR")
+                .reduce((acc, val) => acc + val.mod_lb_hrs, 0)
+            : 0;
+        const joblines_ref = item.joblines
+            ? item.joblines
+                .filter((l) => l.mod_lbr_ty === "LAR")
+                .reduce((acc, val) => acc + val.mod_lb_hrs, 0)
+            : 0;
         return {
             ...item,
-            scheduled_completion: dayjs(item.scheduled_completion).format("hh:mm a"),
-            timestamp: dayjs(item.scheduled_completion).valueOf(),
-        }
-    }).sort((a, b) => a.timestamp - b.timestamp);
+            joblines_body,
+            joblines_ref,
+        };
+    });
 
-    const columns = [
+    console.log('Scheduled Out Today')
+    console.dir(scheduledOutToday);
+
+    const tvFontSize = 18;
+    const tvFontWeight = "bold";
+
+    const tvColumns = [
+        {
+            title: t("jobs.fields.scheduled_completion"),
+            dataIndex: "scheduled_completion",
+            key: "scheduled_completion",
+            ellipsis: true,
+            sorter: (a, b) =>
+                dateSort(a.scheduled_completion, b.scheduled_completion),
+            sortOrder:
+                state.sortedInfo.columnKey === "scheduled_completion" &&
+                state.sortedInfo.order,
+            render: (text, record) => (
+                <span style={{fontSize: tvFontSize, fontWeight: tvFontWeight}}>
+          <TimeFormatter>{record.scheduled_completion}</TimeFormatter>
+        </span>
+            ),
+        },
         {
             title: t("jobs.fields.ro_number"),
             dataIndex: "ro_number",
             key: "ro_number",
+            sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
+            sortOrder:
+                state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
             render: (text, record) => (
+                <Link
+                    to={"/manage/jobs/" + record.jobid}
+                    onClick={(e) => e.stopPropagation()}
+                >
+                    <Space>
+            <span style={{fontSize: tvFontSize, fontWeight: tvFontWeight}}>
+              {record.ro_number || t("general.labels.na")}
+                {record.production_vars && record.production_vars.alert ? (
+                    <ExclamationCircleFilled className="production-alert"/>
+                ) : null}
+                {record.suspended && (
+                    <PauseCircleOutlined style={{color: "orangered"}}/>
+                )}
+                {record.iouparent && (
+                    <Tooltip title={t("jobs.labels.iou")}>
+                        <BranchesOutlined style={{color: "orangered"}}/>
+                    </Tooltip>
+                )}
+            </span>
+                    </Space>
+                </Link>
+            ),
+        },
+        {
+            title: t("jobs.fields.owner"),
+            dataIndex: "owner",
+            key: "owner",
+            ellipsis: true,
+            sorter: (a, b) =>
+                alphaSort(OwnerNameDisplayFunction(a), OwnerNameDisplayFunction(b)),
+            sortOrder:
+                state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
+            render: (text, record) => {
+                console.log('Render record out today');
+                console.dir(record);
+                return record.ownerid ? (
+                    <Link
+                        to={"/manage/owners/" + record.ownerid}
+                        onClick={(e) => e.stopPropagation()}
+                    >
+            <span style={{fontSize: tvFontSize, fontWeight: tvFontWeight}}>
+              <OwnerNameDisplay ownerObject={record}/>
+            </span>
+                    </Link>
+                ) : (
+                    <span style={{fontSize: tvFontSize, fontWeight: tvFontWeight}}>
+            <OwnerNameDisplay ownerObject={record}/>
+          </span>
+                );
+            },
+        },
+        {
+            title: t("jobs.fields.vehicle"),
+            dataIndex: "vehicle",
+            key: "vehicle",
+            ellipsis: true,
+            sorter: (a, b) =>
+                alphaSort(
+                    `${a.v_model_yr || ""} ${a.v_make_desc || ""} ${
+                        a.v_model_desc || ""
+                    }`,
+                    `${b.v_model_yr || ""} ${b.v_make_desc || ""} ${b.v_model_desc || ""}`
+                ),
+            sortOrder:
+                state.sortedInfo.columnKey === "vehicle" && state.sortedInfo.order,
+            render: (text, record) => {
+                return record.vehicleid ? (
+                    <Link
+                        to={"/manage/vehicles/" + record.vehicleid}
+                        onClick={(e) => e.stopPropagation()}
+                    >
+            <span style={{fontSize: tvFontSize, fontWeight: tvFontWeight}}>
+              {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
+                  record.v_model_desc || ""
+              }`}
+            </span>
+                    </Link>
+                ) : (
+                    <span
+                        style={{fontSize: tvFontSize, fontWeight: tvFontWeight}}>{`${
+                    record.v_model_yr || ""} ${record.v_make_desc || ""} ${
+                        record.v_model_desc || ""
+                    }`}</span>
+                );
+            },
+        },
+        {
+            title: t("appointments.fields.alt_transport"),
+            dataIndex: "alt_transport",
+            key: "alt_transport",
+            ellipsis: true,
+            sorter: (a, b) => alphaSort(a.alt_transport, b.alt_transport),
+            sortOrder:
+                state.sortedInfo.columnKey === "alt_transport" &&
+                state.sortedInfo.order,
+            filters:
+                (scheduledOutToday &&
+                    scheduledOutToday
+                        .map((j) => j.alt_transport)
+                        .filter(onlyUnique)
+                        .map((s) => {
+                            return {
+                                text: s || "No Alt. Transport*",
+                                value: [s],
+                            };
+                        })
+                        .sort((a, b) => alphaSort(a.text, b.text))) ||
+                [],onFilter: (value, record) => value.includes(record.alt_transport),
+            render: (text, record) => (
+                <span style={{fontSize: tvFontSize, fontWeight: tvFontWeight}}>
+          {record.alt_transport}
+        </span>
+            ),
+        },
+        {
+            title: t("jobs.fields.status"),
+            dataIndex: "status",
+            key: "status",
+            ellipsis: true,
+            sorter: (a, b) => alphaSort(a.alt_transport, b.alt_transport),
+            sortOrder:
+                state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
+            filters:
+                (scheduledOutToday &&
+                    scheduledOutToday
+                        .map((j) => j.status)
+                        .filter(onlyUnique)
+                        .map((s) => {
+                            return {
+                                text: s || "No Status*",
+                                value: [s],
+                            };
+                        })
+                        .sort((a, b) => alphaSort(a.text, b.text))) ||
+                [],
+            onFilter: (value, record) => value.includes(record.status),render: (text, record) => (
+                <span style={{fontSize: tvFontSize, fontWeight: tvFontWeight}}>
+          {record.status}
+        </span>
+            ),
+        },
+        {
+            title: t("jobs.fields.lab"),
+            dataIndex: "joblines_body",
+            key: "joblines_body",
+            sorter: (a, b) => a.joblines_body - b.joblines_body,
+            sortOrder:
+                state.sortedInfo.columnKey === "joblines_body" &&
+                state.sortedInfo.order,
+            align: "right",
+            render: (text, record) => (
+                <span style={{fontSize: tvFontSize, fontWeight: tvFontWeight}}>
+          {record.joblines_body.toFixed(1)}
+        </span>
+            ),
+        },
+        {
+            title: t("jobs.fields.lar"),
+            dataIndex: "joblines_ref",
+            key: "joblines_ref",
+            sorter: (a, b) => a.joblines_ref - b.joblines_ref,
+            sortOrder:
+                state.sortedInfo.columnKey === "joblines_ref" && state.sortedInfo.order,
+            align: "right",
+            render: (text, record) => (
+                <span style={{fontSize: tvFontSize, fontWeight: tvFontWeight}}>
+          {record.joblines_ref.toFixed(1)}
+        </span>
+            ),
+        },
+    ];
+
+    const columns = [
+        {
+            title: t("jobs.fields.scheduled_completion"),
+            dataIndex: "scheduled_completion",
+            key: "scheduled_completion",
+            ellipsis: true,
+            sorter: (a, b) =>
+                dateSort(a.scheduled_completion, b.scheduled_completion),
+            sortOrder:
+                state.sortedInfo.columnKey === "scheduled_completion" &&
+                state.sortedInfo.order,
+            render: (text, record) => (
+                <TimeFormatter>{record.scheduled_completion}</TimeFormatter>
+            ),
+        },
+        {
+            title: t("jobs.fields.ro_number"),
+            dataIndex: "ro_number",
+            key: "ro_number",
+            sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
+            sortOrder:
+                state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order, render: (text, record) => (
                 <Link
                     to={"/manage/jobs/" + record.jobid}
                     onClick={(e) => e.stopPropagation()}
@@ -58,7 +294,10 @@ export default function DashboardScheduledOutToday({data, ...cardProps}) {
             dataIndex: "owner",
             key: "owner",
             ellipsis: true,
-            responsive: ["md"],
+            sorter: (a, b) =>
+                alphaSort(OwnerNameDisplayFunction(a), OwnerNameDisplayFunction(b)),
+            sortOrder:
+                state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
             render: (text, record) => {
                 return record.ownerid ? (
                     <Link
@@ -75,24 +314,16 @@ export default function DashboardScheduledOutToday({data, ...cardProps}) {
             },
         },
         {
-            title: t("jobs.fields.ownr_ph1"),
-            dataIndex: "ownr_ph1",
-            key: "ownr_ph1",
+            title: t("dashboard.labels.phone"),
+            dataIndex: "ownr_ph",
+            key: "ownr_ph",
             ellipsis: true,
             responsive: ["md"],
-            render: (text, record) => (
+            render: (text, record) => (<Space size="small" wrap>
                 <ChatOpenButton phone={record.ownr_ph1} jobid={record.jobid}/>
-            ),
-        },
-        {
-            title: t("jobs.fields.ownr_ph2"),
-            dataIndex: "ownr_ph2",
-            key: "ownr_ph2",
-            ellipsis: true,
-            responsive: ["md"],
-            render: (text, record) => (
+
                 <ChatOpenButton phone={record.ownr_ph2} jobid={record.jobid}/>
-            ),
+            </Space>),
         },
         {
             title: t("jobs.fields.ownr_ea"),
@@ -101,7 +332,7 @@ export default function DashboardScheduledOutToday({data, ...cardProps}) {
             ellipsis: true,
             responsive: ["md"],
             render: (text, record) => (
-                <ChatOpenButton phone={record.ownr_ea} jobid={record.jobid}/>
+                <a href={`mailto:${record.ownr_ea}`}>{record.ownr_ea}</a>
             ),
         },
         {
@@ -109,7 +340,15 @@ export default function DashboardScheduledOutToday({data, ...cardProps}) {
             dataIndex: "vehicle",
             key: "vehicle",
             ellipsis: true,
-            render: (text, record) => {
+            sorter: (a, b) =>
+                alphaSort(
+                    `${a.v_model_yr || ""} ${a.v_make_desc || ""} ${
+                        a.v_model_desc || ""
+                    }`,
+                    `${b.v_model_yr || ""} ${b.v_make_desc || ""} ${b.v_model_desc || ""}`
+                ),
+            sortOrder:
+                state.sortedInfo.columnKey === "vehicle" && state.sortedInfo.order, render: (text, record) => {
                 return record.vehicleid ? (
                     <Link
                         to={"/manage/vehicles/" + record.vehicleid}
@@ -132,43 +371,78 @@ export default function DashboardScheduledOutToday({data, ...cardProps}) {
             key: "ins_co_nm",
             ellipsis: true,
             responsive: ["md"],
-        },
-        {
-            title: t("jobs.fields.scheduled_completion"),
-            dataIndex: "scheduled_completion",
-            key: "scheduled_completion",
-            ellipsis: true,
-            responsive: ["md"],
+            sorter: (a, b) => alphaSort(a.ins_co_nm, b.ins_co_nm),
+            sortOrder:
+                state.sortedInfo.columnKey === "ins_co_nm" && state.sortedInfo.order,
+            filters:
+                (scheduledOutToday &&
+                    scheduledOutToday
+                        .map((j) => j.ins_co_nm)
+                        .filter(onlyUnique)
+                        .map((s) => {
+                            return {
+                                text: s || "No Ins. Co.*",
+                                value: [s],
+                            };
+                        })
+                        .sort((a, b) => alphaSort(a.text, b.text))) ||
+                [],
+            onFilter: (value, record) => value.includes(record.ins_co_nm),
         },
         {
             title: t("appointments.fields.alt_transport"),
             dataIndex: "alt_transport",
             key: "alt_transport",
             ellipsis: true,
-            responsive: ["md"],
-        },
+            sorter: (a, b) => alphaSort(a.alt_transport, b.alt_transport),
+            sortOrder:
+                state.sortedInfo.columnKey === "alt_transport" &&
+                state.sortedInfo.order,
+            filters:
+                (scheduledOutToday &&
+                    scheduledOutToday
+                        .map((j) => j.alt_transport)
+                        .filter(onlyUnique)
+                        .map((s) => {
+                            return {
+                                text: s || "No Alt. Transport*",
+                                value: [s],
+                            };
+                        })
+                        .sort((a, b) => alphaSort(a.text, b.text))) ||
+                [],
+        onFilter: (value, record) => value.includes(record.alt_transport),},
     ];
 
-    const handleTableChange = (sorter) => {
-        setState({...state, sortedInfo: sorter});
+    const handleTableChange = (pagination, filters, sorter) => {
+        setState({...state, filteredInfo: filters, sortedInfo: sorter});
     };
 
     return (
         <Card
-            title={t("dashboard.titles.scheduledouttoday", {
+            title={t("dashboard.titles.scheduledoutdate", {
                 date: dayjs().startOf("day").format("MM/DD/YYYY"),
             })}
-            {...cardProps}
+            extra={
+                <Space>
+                    <Typography.Text>{t("general.labels.tvmode")}</Typography.Text>
+                    <Switch
+                        onClick={() => setIsTvModeScheduledOut(!isTvModeScheduledOut)}
+                        defaultChecked={isTvModeScheduledOut}
+                    />
+                </Space>
+            }{...cardProps}
         >
             <div style={{height: "100%"}}>
                 <Table
                     onChange={handleTableChange}
-                    pagination={{position: "top", defaultPageSize: pageLimit}}
-                    columns={columns}
+                    pagination={false}
+                    columns={isTvModeScheduledOut ? tvColumns : columns}
                     scroll={{x: true, y: "calc(100% - 2em)"}}
                     rowKey="id"
                     style={{height: "85%"}}
-                    dataSource={filteredScheduledOutToday}
+                    dataSource={scheduledOutToday}
+                    size={isTvModeScheduledOut ? "small" : "middle"}
                 />
             </div>
         </Card>
@@ -185,6 +459,10 @@ export const DashboardScheduledOutTodayGql = `
       alt_transport
       clm_no
       jobid: id
+      joblines(where: {removed: {_eq: false}}) {
+        mod_lb_hrs
+        mod_lbr_ty
+      }
       ins_co_nm
       iouparent
       ownerid
@@ -197,6 +475,7 @@ export const DashboardScheduledOutTodayGql = `
       production_vars
       ro_number
       scheduled_completion
+      status
       suspended
       v_make_desc
       v_model_desc

client/src/components/dashboard-grid/dashboard-grid.component.jsx

@@ -42,6 +42,9 @@ import DashboardScheduledInToday, {
 import DashboardScheduledOutToday, {
     DashboardScheduledOutTodayGql,
 } from "../dashboard-components/scheduled-out-today/scheduled-out-today.component";
+import JobLifecycleDashboardComponent, {
+    JobLifecycleDashboardGQL
+} from "../dashboard-components/job-lifecycle/job-lifecycle-dashboard.component";
 import "./dashboard-grid.styles.scss";
 import {GenerateDashboardData} from "./dashboard-grid.utils";
 
@@ -260,6 +263,7 @@ const componentList = {
         w: 2,
         h: 2,
     },
+    // Typo in Efficency should be Efficiency, but changing it would reset users dashboard settings
     MonthlyEmployeeEfficency: {
         label: i18next.t("dashboard.titles.monthlyemployeeefficiency"),
         component: DashboardMonthlyEmployeeEfficiency,
@@ -270,26 +274,31 @@ const componentList = {
         h: 2,
     },
     ScheduleInToday: {
-        label: i18next.t("dashboard.titles.scheduledintoday", {
-            date: dayjs().startOf("day").format("MM/DD/YYYY"),
-        }),
+        label: i18next.t("dashboard.titles.scheduledintoday"),
         component: DashboardScheduledInToday,
         gqlFragment: DashboardScheduledInTodayGql,
-        minW: 10,
+        minW: 6,
         minH: 2,
         w: 10,
-        h: 2,
+        h: 3,
     },
     ScheduleOutToday: {
-        label: i18next.t("dashboard.titles.scheduledouttoday", {
-            date: dayjs().startOf("day").format("MM/DD/YYYY"),
-        }),
+        label: i18next.t("dashboard.titles.scheduledouttoday"),
         component: DashboardScheduledOutToday,
         gqlFragment: DashboardScheduledOutTodayGql,
-        minW: 10,
+        minW: 6,
         minH: 2,
         w: 10,
-        h: 2,
+        h: 3,
+    },
+    JobLifecycle: {
+        label: i18next.t("dashboard.titles.joblifecycle"),
+        component: JobLifecycleDashboardComponent,
+        gqlFragment: JobLifecycleDashboardGQL,
+        minW: 6,
+        minH: 3,
+        w: 6,
+        h: 3,
     },
 };
 
@@ -301,8 +310,7 @@ const createDashboardQuery = (state) => {
             .map((item, index) => componentList[item.i].gqlFragment || "")
             .join("");
     return gql`
-        query QUERY_DASHBOARD_DETAILS {
-            ${componentBasedAdditions || ""}
+        query QUERY_DASHBOARD_DETAILS { ${componentBasedAdditions || ""}
             monthly_sales: jobs(where: {_and: [
                 { voided: {_eq: false}},
                 {date_invoiced: {_gte: "${dayjs()
@@ -312,7 +320,7 @@ const createDashboardQuery = (state) => {
     .endOf("month")
     .endOf("day")
     .toISOString()}"}}]}) {
-    id
+      id
                 ro_number
                 date_invoiced
                 job_totals
@@ -376,6 +384,5 @@ const createDashboardQuery = (state) => {
                     }
                 }
                 }
-            }
-    `;
+            }`;
 };

client/src/components/dashboard-grid/dashboard-grid.styles.scss

@@ -145,7 +145,7 @@
   width: 100%;
 
   .ant-card-body {
-    height: 80%;
+    height: calc(100% - 2rem);
     width: 100%;
     // //  background-color: red;
     // height: 90%;

client/src/components/dms-cdk-makes/dms-cdk-makes.refetch.component.jsx

@@ -4,7 +4,11 @@ import React, {useState} from "react";
 import {useTranslation} from "react-i18next";
 import {connect} from "react-redux";
 import {createStructuredSelector} from "reselect";
-import {selectBodyshop, selectCurrentUser,} from "../../redux/user/user.selectors";
+import {
+    selectBodyshop,
+    selectCurrentUser,
+} from "../../redux/user/user.selectors";
+
 const mapStateToProps = createStructuredSelector({
     currentUser: selectCurrentUser,
     bodyshop: selectBodyshop,

client/src/components/documents-upload/documents-upload.utility.js

@@ -187,7 +187,7 @@ export const uploadToCloudinary = async (
                 message: JSON.stringify(documentInsert.errors),
             }),
         });
-
+        return;
     }
 };
 

client/src/components/email-overlay/email-overlay.container.jsx

@@ -6,8 +6,14 @@ import {connect} from "react-redux";
 import {createStructuredSelector} from "reselect";
 import {logImEXEvent} from "../../firebase/firebase.utils";
 import {toggleEmailOverlayVisible} from "../../redux/email/email.actions";
-import {selectEmailConfig, selectEmailVisible,} from "../../redux/email/email.selectors.js";
-import {selectBodyshop, selectCurrentUser,} from "../../redux/user/user.selectors";
+import {
+    selectEmailConfig,
+    selectEmailVisible,
+} from "../../redux/email/email.selectors.js";
+import {
+    selectBodyshop,
+    selectCurrentUser,
+} from "../../redux/user/user.selectors";
 import RenderTemplate from "../../utils/RenderTemplate";
 import {EmailSettings} from "../../utils/TemplateConstants";
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";

client/src/components/employee-search-select/employee-search-select.component.jsx

@@ -1,11 +1,11 @@
 import {Select, Space, Tag} from "antd";
-import React from "react";
+import React, {forwardRef} from "react";
 import {useTranslation} from "react-i18next";
 
 const {Option} = Select;
 //To be used as a form element only.
 
-const EmployeeSearchSelect = ({options, ...props}) => {
+const EmployeeSearchSelect = ({options, ...props}, ref) => {
     const {t} = useTranslation();
 
     return (
@@ -40,4 +40,4 @@ const EmployeeSearchSelect = ({options, ...props}) => {
         </Select>
     );
 };
-export default EmployeeSearchSelect;
+export default forwardRef(EmployeeSearchSelect);

client/src/components/employee-team-search-select/employee-team-search-select.component.jsx

@@ -1,33 +0,0 @@
-import {useQuery} from "@apollo/client";
-import {Select} from "antd";
-import React, {forwardRef} from "react";
-import {QUERY_TEAMS} from "../../graphql/employee_teams.queries";
-import AlertComponent from "../alert/alert.component";
-
-//To be used as a form element only.
-
-const EmployeeTeamSearchSelect = ({...props}, ref) => {
-    const {loading, error, data} = useQuery(QUERY_TEAMS);
-
-    if (error) return <AlertComponent message={JSON.stringify(error)}/>;
-    return (
-        <Select
-            showSearch
-            allowClear
-            loading={loading}
-            style={{
-                width: 400,
-            }}
-            options={
-                data
-                    ? data.employee_teams.map((e) => ({
-                        value: JSON.stringify(e),
-                        label: e.name,
-                    }))
-                    : []
-            }
-            {...props}
-        />
-    );
-};
-export default forwardRef(EmployeeTeamSearchSelect);

client/src/components/error-boundary/error-boundary.component.jsx

@@ -37,22 +37,22 @@ class ErrorBoundary extends React.Component {
     }
 
     handleErrorSubmit = () => {
-        // window.$crisp.push([
-        //   "do",
-        //   "message:send",
-        //   [
-        //     "text",
-        //     `I hit the following error: \n\n
-        // ${this.state.error.message}\n\n
-        // ${this.state.error.stack}\n\n
-        // URL:${window.location} as ${this.props.currentUser.email} for ${
-        //       this.props.bodyshop && this.props.bodyshop.name
-        //     }
-        // `,
-        //   ],
-        // ]);
+        window.$crisp.push([
+            "do",
+            "message:send",
+            [
+                "text",
+                `I hit the following error: \n\n 
+    ${this.state.error.message}\n\n
+    ${this.state.error.stack}\n\n
+    URL:${window.location} as ${this.props.currentUser.email} for ${
+                    this.props.bodyshop && this.props.bodyshop.name
+                }
+    `,
+            ],
+        ]);
 
-        // window.$crisp.push(["do", "chat:open"]);
+        window.$crisp.push(["do", "chat:open"]);
         //     const errorDescription = `**Please add relevant details about what you were doing before you encountered this issue**
 
         // ----

client/src/components/form-date-time-picker/form-date-time-picker.component.jsx

@@ -36,7 +36,7 @@ const DateTimePicker = (
                     disabledDate: (d) => dayjs().isAfter(d),
                 })}
                 onChange={onChange}
-                showSecond={false}
+                disableSeconds={true}
                 minuteStep={15}
                 onBlur={onBlur}
                 format="hh:mm a"

client/src/components/form-items-formatted/read-only-form-item.component.jsx

@@ -1,27 +1,9 @@
 import Dinero from "dinero.js";
 import React, {forwardRef} from "react";
 
-import {connect} from "react-redux";
-import {createStructuredSelector} from "reselect";
-import {selectBodyshop} from "../../redux/user/user.selectors";
-
-const mapStateToProps = createStructuredSelector({
-    bodyshop: selectBodyshop,
-});
-const mapDispatchToProps = (dispatch) => ({
-    //setUserLanguage: language => dispatch(setUserLanguage(language))
-});
-
-const ReadOnlyFormItem = (
-    {bodyshop, value, type = "text", onChange},
-    ref
-) => {
+const ReadOnlyFormItem = ({value, type = "text", onChange}, ref) => {
     if (!value) return null;
     switch (type) {
-        case "employee":
-            const emp = bodyshop.employees.find((e) => e.id === value);
-            return `${emp?.first_name} ${emp?.last_name}`;
-
         case "text":
             return <div>{value}</div>;
         case "currency":
@@ -32,8 +14,4 @@ const ReadOnlyFormItem = (
             return <div>{value}</div>;
     }
 };
-
-export default connect(
-    mapStateToProps,
-    mapDispatchToProps
-)(forwardRef(ReadOnlyFormItem));
+export default forwardRef(ReadOnlyFormItem);

client/src/components/global-search/global-search-os.component.jsx

@@ -5,7 +5,9 @@ import React, {useState} from "react";
 import {useTranslation} from "react-i18next";
 import {Link, useNavigate} from "react-router-dom";
 import PhoneNumberFormatter from "../../utils/PhoneFormatter";
-import OwnerNameDisplay, {OwnerNameDisplayFunction,} from "../owner-name-display/owner-name-display.component";
+import OwnerNameDisplay, {
+    OwnerNameDisplayFunction,
+} from "../owner-name-display/owner-name-display.component";
 import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component";
 
 export default function GlobalSearchOs() {

client/src/components/global-search/global-search.component.jsx

@@ -7,7 +7,9 @@ import {Link, useNavigate} from "react-router-dom";
 import {GLOBAL_SEARCH_QUERY} from "../../graphql/search.queries";
 import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 import AlertComponent from "../alert/alert.component";
-import OwnerNameDisplay, {OwnerNameDisplayFunction,} from "../owner-name-display/owner-name-display.component";
+import OwnerNameDisplay, {
+    OwnerNameDisplayFunction,
+} from "../owner-name-display/owner-name-display.component";
 import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component";
 
 export default function GlobalSearch() {

client/src/components/header/header.component.jsx

@@ -174,20 +174,8 @@ function Header({
             key: 'timetickets',
             icon: <FieldTimeOutlined/>,
             label: (<Link to="/manage/timetickets">{t("menus.header.timetickets")}</Link>)
-        });
-
-    if (bodyshop?.md_tasks_presets?.use_approvals) {
-        accountingChildren.push({
-            key: 'ttapprovals',
-            icon: <FieldTimeOutlined/>,
-            label:
-                <Link to="/manage/ttapprovals">
-                    {t("menus.header.ttapprovals")}
-                </Link>
-        });
-    }
-
-    accountingChildren.push({
+        },
+        {
             key: 'entertimetickets',
             icon: <Icon component={GiPlayerTime}/>,
             label: t("menus.header.entertimeticket"),
@@ -433,17 +421,17 @@ function Header({
                     icon: <Icon component={QuestionCircleFilled}/>,
                     label: t("menus.header.help"),
                     onClick: () => {
-                        window.open("https://rometech.com//", "_blank");
+                        window.open("https://help.imex.online/", "_blank");
+                    }
+                },
+                {
+                    key: 'rescue',
+                    icon: <Icon component={CarFilled}/>,
+                    label: t("menus.header.rescueme"),
+                    onClick: () => {
+                        window.open("https://imexrescue.com/", "_blank");
                     }
                 },
-                // {
-                //     key: 'rescue',
-                //     icon: <Icon component={CarFilled}/>,
-                //     label: t("menus.header.rescueme"),
-                //     onClick: () => {
-                //         window.open("https://imexrescue.com/", "_blank");
-                //     }
-                // },
                 {
                     key: 'shiftclock',
                     icon: <Icon component={GiPlayerTime}/>,
@@ -499,9 +487,9 @@ function Header({
         key: 'beta-switch',
         style: {marginLeft: 'auto'},
         label: (
-            <Tooltip title="A more modern Rome Online is ready for you to try! You can switch back at any time.">
+            <Tooltip title="A more modern ImEX Online is ready for you to try! You can switch back at any time.">
                 <InfoCircleOutlined/>
-                <span style={{marginRight: 8}}>Try the new Rome Online</span>
+                <span style={{marginRight: 8}}>Try the new ImEX Online</span>
                 <Switch
                     checked={betaSwitch}
                     onChange={betaSwitchChange}

client/src/components/job-at-change/schedule-event.component.jsx

@@ -1,14 +1,27 @@
 import {AlertFilled} from "@ant-design/icons";
-import {Button, Divider, Dropdown, Form, Input, notification, Popover, Select, Space,} from "antd";
+import {
+    Button,
+    Divider,
+    Dropdown,
+    Form,
+    Input,
+    notification,
+    Popover,
+    Select,
+    Space,
+} from "antd";
 import parsePhoneNumber from "libphonenumber-js";
 import dayjs from "../../utils/day";
 import queryString from "query-string";
 import React, {useState} from "react";
 import {useTranslation} from "react-i18next";
 import {connect} from "react-redux";
-import {Link, useLocation, useNavigate} from "react-router-dom";
+import {Link, useNavigate, useLocation} from "react-router-dom";
 import {createStructuredSelector} from "reselect";
-import {openChatByPhone, setMessage,} from "../../redux/messaging/messaging.actions";
+import {
+    openChatByPhone,
+    setMessage,
+} from "../../redux/messaging/messaging.actions";
 import {setModalContext} from "../../redux/modals/modals.actions";
 import {selectBodyshop} from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";

client/src/components/job-at-change/schedule-event.container.jsx

@@ -53,7 +53,7 @@ export default function ScheduleEventContainer({bodyshop, event, refetch}) {
                     insertAuditTrail({
                         jobid: event.job.id,
                         operation: AuditTrailMapping.appointmentcancel(lost_sale_reason),
-                    })
+                    type: "appointmentcancel",})
                 );
             }
             if (!!jobUpdate.errors) {

client/src/components/job-bills-total/job-bills-total.component.jsx

@@ -39,7 +39,7 @@ export default function JobBillsTotalComponent({
                 );
 
                 if (pol.cm_received === null) {
-                    // Skip this calculation for bills posted prior to the CNR change.
+                    return; // Skip this calculation for bills posted prior to the CNR change.
                 } else {
                     if (pol.cm_received === false) {
                         totalReturnsMarkedNotReceived = totalReturnsMarkedNotReceived.add(
@@ -87,8 +87,7 @@ export default function JobBillsTotalComponent({
     const totalPartsSublet = Dinero(totals.parts.parts.total)
         .add(Dinero(totals.parts.sublets.total))
         .add(Dinero(totals.additional.shipping))
-        .add(Dinero(totals.additional.towing))
-        .add(Dinero(totals.additional.additionalCosts));
+        .add(Dinero(totals.additional.towing));
 
     const discrepancy = totalPartsSublet.subtract(billTotals);
 

client/src/components/job-calculate-totals/job-calculate-totals.component.jsx

@@ -1,53 +1,48 @@
 import {Button, notification} from "antd";
 import Axios from "axios";
 import React, {useState} from "react";
+import {useMutation} from "@apollo/client";
 import {useTranslation} from "react-i18next";
+import {UPDATE_JOB} from "../../graphql/jobs.queries";
+import Dinero from "dinero.js";
 
-export default function JobCalculateTotals({job, disabled, refetch}) {
+export default function JobCalculateTotals({job, disabled}) {
     const {t} = useTranslation();
     const [loading, setLoading] = useState(false);
+    const [updateJob] = useMutation(UPDATE_JOB);
 
     const handleCalculate = async () => {
-        try {
-            setLoading(true);
+        setLoading(true);
+        const newTotals = (
+            await Axios.post("/job/totals", {
+                job: job,
+            })
+        ).data;
 
-            await Axios.post("/job/totalsssu", {
-                id: job.id,
-            });
-
-            if (refetch) refetch();
-            // const result = await updateJob({
-            //   refetchQueries: ["GET_JOB_BY_PK"],
-            //   awaitRefetchQueries: true,
-            //   variables: {
-            //     jobId: job.id,
-            //     job: {
-            //       job_totals: newTotals,
-            //       clm_total: Dinero(newTotals.totals.total_repairs).toFormat("0.00"),
-            //       owner_owing: Dinero(newTotals.totals.custPayable.total).toFormat(
-            //         "0.00"
-            //       ),
-            //     },
-            //   },
-            // });
-            // if (!!!result.errors) {
-            //   notification["success"]({ message: t("jobs.successes.updated") });
-            // } else {
-            //   notification["error"]({
-            //     message: t("jobs.errors.updating", {
-            //       error: JSON.stringify(result.errors),
-            //     }),
-            //   });
-            // }
-        } catch (error) {
+        const result = await updateJob({
+            refetchQueries: ["GET_JOB_BY_PK"],
+            awaitRefetchQueries: true,
+            variables: {
+                jobId: job.id,
+                job: {
+                    job_totals: newTotals,
+                    clm_total: Dinero(newTotals.totals.total_repairs).toFormat("0.00"),
+                    owner_owing: Dinero(newTotals.totals.custPayable.total).toFormat(
+                        "0.00"
+                    ),
+                },
+            },
+        });
+        if (!!!result.errors) {
+            notification["success"]({message: t("jobs.successes.updated")});
+        } else {
             notification["error"]({
                 message: t("jobs.errors.updating", {
-                    error: JSON.stringify(error),
+                    error: JSON.stringify(result.errors),
                 }),
             });
-        } finally {
-            setLoading(false);
         }
+        setLoading(false);
     };
 
     return (

client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx

@@ -8,11 +8,17 @@ import {connect} from "react-redux";
 import {useLocation, useNavigate, useParams} from "react-router-dom";
 import {createStructuredSelector} from "reselect";
 import {logImEXEvent} from "../../../../firebase/firebase.utils";
-import {MARK_APPOINTMENT_ARRIVED, MARK_LATEST_APPOINTMENT_ARRIVED,} from "../../../../graphql/appointments.queries";
+import {
+    MARK_APPOINTMENT_ARRIVED,
+    MARK_LATEST_APPOINTMENT_ARRIVED,
+} from "../../../../graphql/appointments.queries";
 import {UPDATE_JOB} from "../../../../graphql/jobs.queries";
 import {UPDATE_OWNER} from "../../../../graphql/owners.queries";
 import {insertAuditTrail} from "../../../../redux/application/application.actions";
-import {selectBodyshop, selectCurrentUser,} from "../../../../redux/user/user.selectors";
+import {
+    selectBodyshop,
+    selectCurrentUser,
+} from "../../../../redux/user/user.selectors";
 import AuditTrailMapping from "../../../../utils/AuditTrailMappings";
 import ConfigFormComponents from "../../../config-form-components/config-form-components.component";
 import DateTimePicker from "../../../form-date-time-picker/form-date-time-picker.component";
@@ -22,8 +28,8 @@ const mapStateToProps = createStructuredSelector({
     currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
-    insertAuditTrail: ({jobid, operation}) =>
-        dispatch(insertAuditTrail({jobid, operation})),
+    insertAuditTrail: ({jobid, operation, type}) =>
+        dispatch(insertAuditTrail({jobid, operation, type })),
 });
 
 export function JobChecklistForm({
@@ -177,7 +183,7 @@ export function JobChecklistForm({
                     (type === "intake" && bodyshop.md_ro_statuses.default_arrived) ||
                     (type === "deliver" && bodyshop.md_ro_statuses.default_delivered)
                 ),
-            });
+            type: "jobchecklist",});
         } else {
             notification["error"]({
                 message: t("checklist.errors.complete", {

client/src/components/job-checklist/components/job-checklist-template-list/job-checklist-template-list.component.jsx

@@ -4,8 +4,12 @@ import React, {useState} from "react";
 import {useTranslation} from "react-i18next";
 import {useParams} from "react-router-dom";
 import {logImEXEvent} from "../../../../firebase/firebase.utils";
-import {GenerateDocument, GenerateDocuments,} from "../../../../utils/RenderTemplate";
+import {
+    GenerateDocument,
+    GenerateDocuments,
+} from "../../../../utils/RenderTemplate";
 import {TemplateList} from "../../../../utils/TemplateConstants";
+
 const TemplateListGenerated = TemplateList();
 
 export default function JobIntakeTemplateList({templates}) {

client/src/components/job-create-iou/job-create-iou.component.jsx

@@ -7,9 +7,9 @@ import {connect} from "react-redux";
 import {useNavigate} from "react-router-dom";
 import {createStructuredSelector} from "reselect";
 import {UPDATE_JOB_LINES_IOU} from "../../graphql/jobs-lines.queries";
+import {selectTechnician} from "../../redux/tech/tech.selectors";
 import {selectBodyshop, selectCurrentUser,} from "../../redux/user/user.selectors";
 import {CreateIouForJob} from "../jobs-detail-header-actions/jobs-detail-header-actions.duplicate.util";
-import {selectTechnician} from "../../redux/tech/tech.selectors";
 
 const mapStateToProps = createStructuredSelector({
     bodyshop: selectBodyshop,
@@ -22,7 +22,13 @@ const mapDispatchToProps = (dispatch) => ({
 });
 export default connect(mapStateToProps, mapDispatchToProps)(JobCreateIOU);
 
-export function JobCreateIOU({bodyshop, currentUser, job, selectedJobLines, technician}) {
+export function JobCreateIOU({
+                                 bodyshop,
+                                 currentUser,
+                                 job,
+                                 selectedJobLines,
+                                 technician,
+                             }) {
     const {t} = useTranslation();
     const [loading, setLoading] = useState(false);
     const client = useApolloClient();
@@ -82,13 +88,19 @@ export function JobCreateIOU({bodyshop, currentUser, job, selectedJobLines, tech
             title={t("jobs.labels.createiouwarning")}
             onConfirm={handleCreateIou}
             disabled={
-                !selectedJobLines || selectedJobLines.length === 0 || !job.converted || technician
+                !selectedJobLines ||
+                selectedJobLines.length === 0 ||
+                !job.converted ||
+                technician
             }
         >
             <Button
                 loading={loading}
                 disabled={
-                    !selectedJobLines || selectedJobLines.length === 0 || !job.converted || technician
+                    !selectedJobLines ||
+                    selectedJobLines.length === 0 ||
+                    !job.converted ||
+                    technician
                 }
             >
                 {t("jobs.actions.createiou")}

client/src/components/job-detail-cards/job-detail-cards.component.jsx

@@ -32,9 +32,9 @@ const mapDispatchToProps = (dispatch) => ({
 });
 
 const span = {
-    lg: {span: 24},
-    xl: {span: 12},
-    xxl: {span: 8},
+    sm: {span: 24},
+    md: {span: 12},
+    lg: {span: 8},
 };
 
 export function JobDetailCards({bodyshop, setPrintCenterContext}) {
@@ -137,6 +137,12 @@ export function JobDetailCards({bodyshop, setPrintCenterContext}) {
                                 data={data ? data.jobs_by_pk : null}
                             />
                         </Col>
+                        <Col {...span}>
+                            <JobDetailCardsPartsComponent
+                                loading={loading}
+                                data={data ? data.jobs_by_pk : null}
+                            />
+                        </Col>
                         <Col {...span}>
                             <JobDetailCardsNotesComponent
                                 loading={loading}
@@ -157,12 +163,6 @@ export function JobDetailCards({bodyshop, setPrintCenterContext}) {
                                 data={data ? data.jobs_by_pk : null}
                             />
                         </Col>
-                        <Col span={24}>
-                            <JobDetailCardsPartsComponent
-                                loading={loading}
-                                data={data ? data.jobs_by_pk : null}
-                            />
-                        </Col>
                     </Row>
                 </Card>
             ) : null}

client/src/components/job-detail-cards/job-detail-cards.parts.component.jsx

@@ -1,120 +1,16 @@
-import {Table} from "antd";
 import React from "react";
 import {useTranslation} from "react-i18next";
-import JobLineNotePopup from "../job-line-note-popup/job-line-note-popup.component";
 import PartsStatusPie from "../parts-status-pie/parts-status-pie.component";
 import CardTemplate from "./job-detail-cards.template.component";
 
-import {connect} from "react-redux";
-import {createStructuredSelector} from "reselect";
-import {selectJobReadOnly} from "../../redux/application/application.selectors";
-import {onlyUnique} from "../../utils/arrayHelper";
-import {alphaSort} from "../../utils/sorters";
-import JobLineLocationPopup from "../job-line-location-popup/job-line-location-popup.component";
-import JobLineStatusPopup from "../job-line-status-popup/job-line-status-popup.component";
-
-const mapStateToProps = createStructuredSelector({
-    //currentUser: selectCurrentUser
-    jobRO: selectJobReadOnly,
-});
-const mapDispatchToProps = (dispatch) => ({
-    //setUserLanguage: language => dispatch(setUserLanguage(language))
-});
-export default connect(
-    mapStateToProps,
-    mapDispatchToProps
-)(JobDetailCardsPartsComponent);
-
-export function JobDetailCardsPartsComponent({loading, data, jobRO}) {
+export default function JobDetailCardsPartsComponent({loading, data}) {
     const {t} = useTranslation();
     const {joblines_status} = data;
 
-    const columns = [
-        {
-            title: t("joblines.fields.line_desc"),
-            dataIndex: "line_desc",
-            fixed: "left",
-            key: "line_desc",
-            sorter: (a, b) => alphaSort(a.line_desc, b.line_desc),
-            onCell: (record) => ({
-                className: record.manual_line && "job-line-manual",
-                style: {
-                    ...(record.critical ? {boxShadow: " -.5em 0 0 #FFC107"} : {}),
-                },
-            }),
-            width: "30%",
-            ellipsis: true,
-        },
-        {
-            title: t("joblines.fields.part_type"),
-            dataIndex: "part_type",
-            key: "part_type",
-            width: "15%",
-            sorter: (a, b) =>
-                alphaSort(
-                    t(`joblines.fields.part_types.${a.part_type}`),
-                    t(`joblines.fields.part_types.${b.part_type}`)
-                ),
-            render: (text, record) =>
-                record.part_type
-                    ? t(`joblines.fields.part_types.${record.part_type}`)
-                    : null,
-        },
-        {
-            title: t("joblines.fields.part_qty"),
-            dataIndex: "part_qty",
-            key: "part_qty",
-            width: "10%",
-        },
-        {
-            title: t("joblines.fields.notes"),
-            dataIndex: "notes",
-            key: "notes",
-            render: (text, record) => (
-                <JobLineNotePopup disabled={jobRO} jobline={record}/>
-            ),
-        },
-        {
-            title: t("joblines.fields.location"),
-            dataIndex: "location",
-            key: "location",
-            sorter: (a, b) => alphaSort(a.location, b.location),
-            render: (text, record) => (
-                <JobLineLocationPopup jobline={record} disabled={jobRO}/>
-            ),
-        },
-        {
-            title: t("joblines.fields.status"),
-            dataIndex: "status",
-            key: "status",
-            sorter: (a, b) => alphaSort(a.status, b.status),
-            filters:
-                (data &&
-                    data.joblines
-                        ?.map((l) => l.status)
-                        .filter(onlyUnique)
-                        .map((s) => {
-                            return {
-                                text: s || "No Status*",
-                                value: [s],
-                            };
-                        })) ||
-                [],
-            onFilter: (value, record) => value.includes(record.status),
-            render: (text, record) => (
-                <JobLineStatusPopup jobline={record} disabled={jobRO}/>
-            ),
-        },
-    ];
     return (
         <div>
             <CardTemplate loading={loading} title={t("jobs.labels.cards.parts")}>
                 <PartsStatusPie joblines_status={joblines_status}/>
-                <Table
-                    key="id"
-                    columns={columns}
-                    dataSource={data ? data.joblines : []}
-                />
             </CardTemplate>
         </div>
     );

client/src/components/job-detail-cards/job-detail-cards.totals.component.jsx

@@ -18,10 +18,8 @@ export default function JobDetailCardsTotalsComponent({loading, data}) {
                     />
                     <Statistic
                         className="imex-flex-row__margin-large"
-                        title={t("jobs.fields.ded_amt")}
-                        value={Dinero({
-                            amount: Math.round((data.ded_amt || 0) * 100),
-                        }).toFormat()}
+                        title={t("jobs.fields.customerowing")}
+                        value={Dinero(data.job_totals.totals.custPayable.total).toFormat()}
                     />
                     <Statistic
                         className="imex-flex-row__margin-large"

client/src/components/job-detail-lines/job-lines-expander.component.jsx

@@ -8,19 +8,7 @@ import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import {DateFormatter} from "../../utils/DateFormatter";
 import AlertComponent from "../alert/alert.component";
 
-import {connect} from "react-redux";
-import {createStructuredSelector} from "reselect";
-import {selectBodyshop} from "../../redux/user/user.selectors";
-
-const mapStateToProps = createStructuredSelector({
-    bodyshop: selectBodyshop,
-});
-const mapDispatchToProps = (dispatch) => ({
-    //setUserLanguage: language => dispatch(setUserLanguage(language))
-});
-export default connect(mapStateToProps, mapDispatchToProps)(JobLinesExpander);
-
-export function JobLinesExpander({jobline, jobid, bodyshop}) {
+export default function JobLinesExpander({jobline, jobid}) {
     const {t} = useTranslation();
     const {loading, error, data} = useQuery(GET_JOB_LINE_ORDERS, {
         fetchPolicy: "network-only",
@@ -35,7 +23,7 @@ export function JobLinesExpander({jobline, jobid, bodyshop}) {
 
     return (
         <Row>
-            <Col md={24} lg={8}>
+            <Col md={24} lg={12}>
                 <Typography.Title level={4}>
                     {t("parts_orders.labels.parts_orders")}
                 </Typography.Title>
@@ -64,7 +52,7 @@ export function JobLinesExpander({jobline, jobid, bodyshop}) {
                             ]
                     }
                 /> </Col>
-            <Col md={24} lg={8}>
+            <Col md={24} lg={12}>
                 <Typography.Title level={4}>{t("bills.labels.bills")}</Typography.Title>
                 <Timeline
                     items={
@@ -102,37 +90,6 @@ export function JobLinesExpander({jobline, jobid, bodyshop}) {
                     }
                 />
             </Col>
-            <Col md={24} lg={8}>
-                <Typography.Title level={4}>
-                    {t("parts_dispatch.labels.parts_dispatch")}
-                </Typography.Title>
-                <Timeline items={
-                    data.parts_dispatch_lines.length > 0 ? (
-                        data.parts_dispatch_lines.map((line) => ({
-                            key: line.id,
-                            children: (
-                                <Space split={<Divider type="vertical"/>} wrap>
-                                    <Link to={`/manage/jobs/${jobid}?partsorderid=${line.id}`}>
-                                        {line.parts_dispatch.number}
-                                    </Link>
-                                    {
-                                        bodyshop.employees.find(
-                                            (e) => e.id === line.parts_dispatch.employeeid
-                                        )?.first_name
-                                    }
-                                    <Space>
-                                        {t("parts_dispatch_lines.fields.accepted_at")}
-                                        <DateFormatter>{line.accepted_at}</DateFormatter>
-                                    </Space>
-                                </Space>
-                            )
-                        }))
-                    ) : ({
-                        key: 'dispatch-lines',
-                        children: t("parts_orders.labels.notyetordered"),
-                    })
-                }/>
-            </Col>
         </Row>
     );
 }

client/src/components/job-detail-lines/job-lines-part-price-change.component.jsx

@@ -1,98 +0,0 @@
-import {useMutation} from "@apollo/client";
-import {Button, Form, notification, Popover, Tooltip} from "antd";
-import {t} from "i18next";
-import React, {useState} from "react";
-import {UPDATE_LINE_PPC} from "../../graphql/jobs-lines.queries";
-import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import CurrencyFormItemComponent from "../form-items-formatted/currency-form-item.component";
-import JobLineConvertToLabor from "../job-line-convert-to-labor/job-line-convert-to-labor.component";
-import axios from "axios";
-
-export default function JobLinesPartPriceChange({job, line, refetch}) {
-    const [loading, setLoading] = useState(false);
-    const [updatePartPrice] = useMutation(UPDATE_LINE_PPC);
-
-    const handleFinish = async (values) => {
-        try {
-            setLoading(true);
-            const result = await updatePartPrice({
-                variables: {
-                    id: line.id,
-                    jobline: {
-                        act_price_before_ppc: line.act_price_before_ppc
-                            ? line.act_price_before_ppc
-                            : line.act_price,
-                        act_price: values.act_price,
-                    },
-                },
-            });
-            await axios.post("/job/totalsssu", {
-                id: job.id,
-            });
-            if (result.errors) {
-                notification.open({
-                    type: "error",
-                    message: t("joblines.errors.saving", {
-                        error: JSON.stringify(result.errors),
-                    }),
-                });
-                if (refetch) refetch();
-            } else {
-                notification.open({
-                    type: "success",
-                    message: t("joblines.successes.saved"),
-                });
-            }
-        } catch (error) {
-            notification.open({
-                type: "error",
-                message: t("joblines.errors.saving", {error: JSON.stringify(error)}),
-            });
-        } finally {
-            setLoading(false);
-        }
-    };
-
-    const popcontent = (
-        <Form layout="vertical" onFinish={handleFinish} initialValues={{act_price: line.act_price}}>
-            <Form.Item
-                name="act_price"
-                label={t("jobs.labels.act_price_ppc")}
-                rules={[{required: true}]}
-            >
-                <CurrencyFormItemComponent/>
-            </Form.Item>
-            <Button loading={loading} htmlType="primary">
-                {t("general.actions.save")}
-            </Button>
-        </Form>
-    );
-
-    return (
-        <JobLineConvertToLabor jobline={line} job={job}>
-            <Popover trigger="click" disabled={line.manual_line} content={popcontent}>
-                <CurrencyFormatter>
-                    {line.db_ref === "900510" || line.db_ref === "900511"
-                        ? line.prt_dsmk_m
-                        : line.act_price}
-                </CurrencyFormatter>
-                {line.prt_dsmk_p && line.prt_dsmk_p !== 0 ? (
-                    <span style={{marginLeft: ".2rem"}}>{`(${line.prt_dsmk_p}%)`}</span>
-                ) : (
-                    <></>
-                )}
-                {line.act_price_before_ppc && line.act_price_before_ppc !== 0 ? (
-                    <Tooltip title={t("jobs.labels.ppc")}>
-            <span style={{marginLeft: ".2rem", color: "tomato"}}>
-              (
-              <CurrencyFormatter>{line.act_price_before_ppc}</CurrencyFormatter>
-              )
-            </span>
-                    </Tooltip>
-                ) : (
-                    <></>
-                )}
-            </Popover>
-        </JobLineConvertToLabor>
-    );
-}

client/src/components/job-detail-lines/job-lines.component.jsx

@@ -21,6 +21,7 @@ import {selectJobReadOnly} from "../../redux/application/application.selectors";
 import {setModalContext} from "../../redux/modals/modals.actions";
 import {selectTechnician} from "../../redux/tech/tech.selectors";
 import {onlyUnique} from "../../utils/arrayHelper";
+import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import {alphaSort} from "../../utils/sorters";
 import JobLineLocationPopup from "../job-line-location-popup/job-line-location-popup.component";
 import JobLineNotePopup from "../job-line-note-popup/job-line-note-popup.component";
@@ -29,18 +30,13 @@ import JobLinesBillRefernece from "../job-lines-bill-reference/job-lines-bill-re
 // import AllocationsAssignmentContainer from "../allocations-assignment/allocations-assignment.container";
 // import AllocationsBulkAssignmentContainer from "../allocations-bulk-assignment/allocations-bulk-assignment.container";
 // import AllocationsEmployeeLabelContainer from "../allocations-employee-label/allocations-employee-label.container";
+import PartsOrderModalContainer from "../parts-order-modal/parts-order-modal.container";
 import _ from "lodash";
 import JobCreateIOU from "../job-create-iou/job-create-iou.component";
-import JobSendPartPriceChangeComponent from "../job-send-parts-price-change/job-send-parts-price-change.component";
-import PartsOrderModalContainer from "../parts-order-modal/parts-order-modal.container";
 import JobLinesExpander from "./job-lines-expander.component";
 import {selectBodyshop} from "../../redux/user/user.selectors";
 import dayjs from "../../utils/day";
-import JobLinesPartPriceChange from "./job-lines-part-price-change.component";
-import JoblineTeamAssignment from "../job-line-team-assignment/job-line-team-assignmnent.component";
-import JobLineDispatchButton from "../job-line-dispatch-button/job-line-dispatch-button.component";
-import JobLineBulkAssignComponent from "../job-line-bulk-assign/job-line-bulk-assign.component";
-import {useSplitTreatments} from "@splitsoftware/splitio-react";
+import JobLineConvertToLabor from "../job-line-convert-to-labor/job-line-convert-to-labor.component";
 
 const mapStateToProps = createStructuredSelector({
     bodyshop: selectBodyshop,
@@ -72,17 +68,8 @@ export function JobLinesComponent({
                                       setBillEnterContext,
                                   }) {
     const [deleteJobLine] = useMutation(DELETE_JOB_LINE_BY_PK);
-    const {treatments: {Enhanced_Payroll}} = useSplitTreatments({
-        attributes: {},
-        names: ["Enhanced_Payroll"],
-        splitKey: bodyshop.imexshopid,
-    });
 
     const [selectedLines, setSelectedLines] = useState([]);
-    console.log(
-        "🚀 ~ file: job-lines.component.jsx:89 ~ selectedLines:",
-        selectedLines
-    );
     const [state, setState] = useState({
         sortedInfo: {},
         filteredInfo: {},
@@ -126,21 +113,10 @@ export function JobLinesComponent({
             sortOrder:
                 state.sortedInfo.columnKey === "oem_partno" && state.sortedInfo.order,
             ellipsis: true,
-            onCell: (record) => ({
-                className: record.manual_line && "job-line-manual",
-                style: {
-                    ...(record.parts_dispatch_lines[0]?.accepted_at
-                        ? {boxShadow: " -.5em 0 0 #FFC107"}
-                        : {}),
-                },
-            }),
-            render: (text, record) => (
-                <span class="ant-table-cell-content">
-          {`${record.oem_partno || ""} ${
-              record.alt_partno ? `(${record.alt_partno})` : ""
-          }`.trim()}
-        </span>
-            ),
+            render: (text, record) =>
+                `${record.oem_partno || ""} ${
+                    record.alt_partno ? `(${record.alt_partno})` : ""
+                }`.trim(),
         },
         {
             title: t("joblines.fields.op_code_desc"),
@@ -236,7 +212,20 @@ export function JobLinesComponent({
                 state.sortedInfo.columnKey === "act_price" && state.sortedInfo.order,
             ellipsis: true,
             render: (text, record) => (
-                <JobLinesPartPriceChange line={record} job={job} refetch={refetch}/>
+                <JobLineConvertToLabor jobline={record} job={job}>
+                    <CurrencyFormatter>
+                        {record.db_ref === "900510" || record.db_ref === "900511"
+                            ? record.prt_dsmk_m
+                            : record.act_price}
+                    </CurrencyFormatter>
+                    {record.prt_dsmk_p && record.prt_dsmk_p !== 0 ? (
+                        <span
+                            style={{marginLeft: ".2rem"}}
+                        >{`(${record.prt_dsmk_p}%)`}</span>
+                    ) : (
+                        <></>
+                    )}
+                </JobLineConvertToLabor>
             ),
         },
         {
@@ -289,23 +278,6 @@ export function JobLinesComponent({
                 state.sortedInfo.columnKey === "line_ind" && state.sortedInfo.order,
             responsive: ["md"],
         },
-        ...(Enhanced_Payroll.treatment === "on"
-            ? [
-                {
-                    title: t("joblines.fields.assigned_team"),
-                    dataIndex: "assigned_team",
-                    key: "assigned_team",
-                    render: (text, record) => (
-                        <JoblineTeamAssignment
-                            disabled={jobRO}
-                            jobline={record}
-                            jobId={job.id}
-                        />
-                    ),
-                },
-            ]
-            : []),
-
         {
             title: t("joblines.fields.notes"),
             dataIndex: "notes",
@@ -424,11 +396,7 @@ export function JobLinesComponent({
             setSelectedLines((selectedLines) =>
                 _.uniq([
                     ...selectedLines,
-                    ...jobLines.filter(
-                        (item) =>
-                            markedTypes.includes(item.part_type) ||
-                            markedTypes.includes(item.mod_lbr_ty)
-                    ),
+                    ...jobLines.filter((item) => markedTypes.includes(item.part_type)),
                 ])
             );
         }
@@ -442,21 +410,6 @@ export function JobLinesComponent({
             {key: "PAL", label: t("joblines.fields.part_types.PAL")},
             {key: "PAS", label: t("joblines.fields.part_types.PAS")},
             {type: 'divider'},
-            {key: "LAA", label: t("joblines.fields.lbr_types.LAA")},
-            {key: "LAB", label: t("joblines.fields.lbr_types.LAB")},
-            {key: "LAD", label: t("joblines.fields.part_types.LAD")},
-            {key: "LAE", label: t("joblines.fields.part_types.LAE")},
-            {key: "LAF", label: t("joblines.fields.part_types.LAF")},
-            {key: "LAG", label: t("joblines.fields.part_types.LAG")},
-            {key: "LAM", label: t("joblines.fields.part_types.LAM")},
-            {key: "LAR", label: t("joblines.fields.part_types.LAR")},
-            {key: "LAS", label: t("joblines.fields.part_types.LAS")},
-            {key: "LAU", label: t("joblines.fields.part_types.LAU")},
-            {key: "LA1", label: t("joblines.fields.part_types.LA1")},
-            {key: "LA2", label: t("joblines.fields.part_types.LA2")},
-            {key: "LA3", label: t("joblines.fields.part_types.LA3")},
-            {key: "LA4", label: t("joblines.fields.part_types.LA4")},
-            {type: 'divider'},
             {key: "clear", label: t("general.labels.clear")},
         ]
     };
@@ -480,18 +433,6 @@ export function JobLinesComponent({
                                 </Space>
                             </Tag>
                         )}
-                        <JobLineDispatchButton
-                            selectedLines={selectedLines}
-                            setSelectedLines={setSelectedLines}
-                            job={job}
-                        />
-                        {Enhanced_Payroll.treatment === "on" && (
-                            <JobLineBulkAssignComponent
-                                selectedLines={selectedLines}
-                                setSelectedLines={setSelectedLines}
-                                job={job}
-                            />
-                        )}
                         <Button
                             disabled={
                                 (job && !job.converted) ||
@@ -500,6 +441,15 @@ export function JobLinesComponent({
                                 technician
                             }
                             onClick={() => {
+                                // setPartsOrderContext({
+                                //   actions: { refetch: refetch },
+                                //   context: {
+                                //     jobId: job.id,
+                                //     job: job,
+                                //     linesToOrder: selectedLines,
+                                //   },
+                                // });
+
                                 setBillEnterContext({
                                     actions: {refetch: refetch},
                                     context: {
@@ -606,9 +556,6 @@ export function JobLinesComponent({
                         >
                             {t("joblines.actions.new")}
                         </Button>
-                        {bodyshop.region_config.toLowerCase().startsWith("us") && (
-                            <JobSendPartPriceChangeComponent job={job}/>
-                        )}
                         <JobCreateIOU job={job} selectedJobLines={selectedLines}/>
                         <Input.Search
                             placeholder={t("general.labels.search")}

client/src/components/job-employee-assignments/job-employee-assignments.container.jsx

@@ -15,8 +15,8 @@ const mapStateToProps = createStructuredSelector({
     //currentUser: selectCurrentUser
 });
 const mapDispatchToProps = (dispatch) => ({
-    insertAuditTrail: ({jobid, operation}) =>
-        dispatch(insertAuditTrail({jobid, operation})),
+    insertAuditTrail: ({jobid, operation, type}) =>
+        dispatch(insertAuditTrail({jobid, operation, type })),
 });
 export default connect(
     mapStateToProps,
@@ -47,7 +47,8 @@ export function JobEmployeeAssignmentsContainer({
         insertAuditTrail({
             jobid: job.id,
             operation: AuditTrailMapping.jobassignmentchange(operation, name),
-        });
+        type: "jobassignmentchange",
+    });
 
         if (!!result.errors) {
             notification["error"]({
@@ -77,7 +78,7 @@ export function JobEmployeeAssignmentsContainer({
         insertAuditTrail({
             jobid: job.id,
             operation: AuditTrailMapping.jobassignmentremoved(operation),
-        });
+        type: "jobassignmentremoved",});
         setLoading(false);
     };
 

client/src/components/job-line-bulk-assign/job-line-bulk-assign.component.jsx

@@ -1,147 +0,0 @@
-import React, {useState} from "react";
-
-import {useMutation} from "@apollo/client";
-import {Button, Form, notification, Popover, Select, Space} from "antd";
-import {useTranslation} from "react-i18next";
-import {connect} from "react-redux";
-import {createStructuredSelector} from "reselect";
-import {UPDATE_LINE_BULK_ASSIGN} from "../../graphql/jobs-lines.queries";
-import {selectJobReadOnly} from "../../redux/application/application.selectors";
-import {selectBodyshop, selectCurrentUser,} from "../../redux/user/user.selectors";
-import {insertAuditTrail} from "../../redux/application/application.actions";
-import AuditTrailMapping from "../../utils/AuditTrailMappings";
-
-const mapStateToProps = createStructuredSelector({
-    bodyshop: selectBodyshop,
-    jobRO: selectJobReadOnly,
-    currentUser: selectCurrentUser,
-});
-const mapDispatchToProps = (dispatch) => ({
-    insertAuditTrail: ({jobid, operation}) =>
-        dispatch(insertAuditTrail({jobid, operation})),
-});
-export default connect(mapStateToProps, mapDispatchToProps)(JoblineBulkAssign);
-
-export function JoblineBulkAssign({
-                                      setSelectedLines,
-                                      selectedLines,
-                                      insertAuditTrail,
-                                      bodyshop,
-                                      jobRO,
-                                      job,
-                                      currentUser,
-                                  }) {
-    const [visible, setVisible] = useState(false);
-    const [loading, setLoading] = useState(false);
-    const [form] = Form.useForm();
-
-    const {t} = useTranslation();
-    const [assignLines] = useMutation(UPDATE_LINE_BULK_ASSIGN);
-
-    const handleConvert = async (values) => {
-        try {
-            setLoading(true);
-            const result = await assignLines({
-                variables: {
-                    jobline: {
-                        assigned_team: values.assigned_team,
-                    },
-                    ids: selectedLines.map((l) => l.id),
-                },
-            });
-            if (result.errors) {
-                notification.open({
-                    type: "error",
-                    message: t("parts_dispatch.errors.creating", {
-                        error: JSON.stringify(result.errors),
-                    }),
-                });
-            } else {
-                //Insert the audit trail here.
-
-                const teamName = bodyshop.employee_teams.find(
-                    (et) => et.id === values.assigned_team
-                )?.name;
-
-                const hours = selectedLines.reduce(
-                    (acc, val) => (acc += val.mod_lb_hrs),
-                    0
-                );
-
-                insertAuditTrail({
-                    jobid: job.id,
-                    operation: AuditTrailMapping.assignedlinehours(
-                        teamName,
-                        hours.toFixed(1)
-                    ),
-                });
-                setSelectedLines([]);
-                setVisible(false);
-            }
-        } catch (error) {
-            notification.open({
-                type: "error",
-                message: t("parts_dispatch.errors.creating", {
-                    error: error,
-                }),
-            });
-        } finally {
-            setLoading(false);
-        }
-    };
-
-    const popMenu = (
-        <div>
-            <Form layout="vertical" form={form} onFinish={handleConvert}>
-                <Form.Item
-                    name={"assigned_team"}
-                    label={t("joblines.fields.assigned_team")}
-                    rules={[
-                        {
-                            required: true,
-                            //message: t("general.validation.required"),
-                        },
-                    ]}
-                >
-                    <Select
-                        showSearch
-                        style={{width: 200}}
-                        optionFilterProp="children"
-                        filterOption={(input, option) =>
-                            option.props.children
-                                .toLowerCase()
-                                .indexOf(input.toLowerCase()) >= 0
-                        }
-                    >
-                        {bodyshop.employee_teams.map((team) => (
-                            <Select.Option value={team.id} key={team.id} name={team.name}>
-                                {team.name}
-                            </Select.Option>
-                        ))}
-                    </Select>
-                </Form.Item>
-
-                <Space wrap>
-                    <Button type="danger" onClick={() => form.submit()} loading={loading}>
-                        {t("general.actions.save")}
-                    </Button>
-                    <Button onClick={() => setVisible(false)}>
-                        {t("general.actions.cancel")}
-                    </Button>
-                </Space>
-            </Form>
-        </div>
-    );
-
-    return (
-        <Popover open={visible} content={popMenu}>
-            <Button
-                disabled={selectedLines.length === 0 || jobRO}
-                loading={loading}
-                onClick={() => setVisible(true)}
-            >
-                {t("joblines.actions.assign_team", {count: selectedLines.length})}
-            </Button>
-        </Popover>
-    );
-}

client/src/components/job-line-convert-to-labor/job-line-convert-to-labor.component.jsx

@@ -17,8 +17,8 @@ const mapStateToProps = createStructuredSelector({
     //currentUser: selectCurrentUser
 });
 const mapDispatchToProps = (dispatch) => ({
-    insertAuditTrail: ({jobid, operation}) =>
-        dispatch(insertAuditTrail({jobid, operation})),
+    insertAuditTrail: ({jobid, operation, type}) =>
+        dispatch(insertAuditTrail({jobid, operation, type })),
 });
 export default connect(
     mapStateToProps,
@@ -102,7 +102,7 @@ export function JobLineConvertToLabor({
                 hours: calculateAdjustment({mod_lbr_ty, job, jobline}).toFixed(1),
                 mod_lbr_ty,
             }),
-        });
+        type: "jobmodifylbradj",});
         setLoading(false);
         setVisibility(false);
     };

client/src/components/job-line-dispatch-button/job-line-dispatch-button.component.jsx

@@ -1,165 +0,0 @@
-import React, {useState} from "react";
-
-import {useMutation} from "@apollo/client";
-import {Button, Form, notification, Popover, Select, Space} from "antd";
-import day from "../../utils/day";
-import {useTranslation} from "react-i18next";
-import {connect} from "react-redux";
-import {createStructuredSelector} from "reselect";
-import {INSERT_PARTS_DISPATCH} from "../../graphql/parts-dispatch.queries";
-import {selectJobReadOnly} from "../../redux/application/application.selectors";
-import {selectBodyshop, selectCurrentUser,} from "../../redux/user/user.selectors";
-import {GenerateDocument} from "../../utils/RenderTemplate";
-import {TemplateList} from "../../utils/TemplateConstants";
-
-const mapStateToProps = createStructuredSelector({
-    bodyshop: selectBodyshop,
-    jobRO: selectJobReadOnly,
-    currentUser: selectCurrentUser,
-});
-const mapDispatchToProps = (dispatch) => ({
-    //setUserLanguage: language => dispatch(setUserLanguage(language))
-});
-export default connect(
-    mapStateToProps,
-    mapDispatchToProps
-)(JobLineDispatchButton);
-
-export function JobLineDispatchButton({
-                                          setSelectedLines,
-                                          selectedLines,
-
-                                          bodyshop,
-                                          jobRO,
-                                          job,
-                                          currentUser,
-                                      }) {
-    const [visible, setVisible] = useState(false);
-    const [loading, setLoading] = useState(false);
-    const [form] = Form.useForm();
-    const Templates = TemplateList("job_special", {
-        ro_number: job.ro_number,
-    });
-    const {t} = useTranslation();
-    const [dispatchLines] = useMutation(INSERT_PARTS_DISPATCH);
-
-    const handleConvert = async (values) => {
-        try {
-            setLoading(true);
-            //THIS HAS NOT YET BEEN TESTED. START BY FINISHING THIS FUNCTION.
-            const result = await dispatchLines({
-                variables: {
-                    partsDispatch: {
-                        dispatched_at: day(),
-                        employeeid: values.employeeid,
-                        jobid: job.id,
-                        dispatched_by: currentUser.email,
-                        parts_dispatch_lines: {
-                            data: selectedLines.map((l) => ({
-                                joblineid: l.id,
-                                quantity: l.part_qty,
-                            })),
-                        },
-                    },
-                    //joblineids: selectedLines.map((l) => l.id),
-                },
-            });
-            if (result.errors) {
-                notification.open({
-                    type: "error",
-                    message: t("parts_dispatch.errors.creating", {
-                        error: result.errors,
-                    }),
-                });
-            } else {
-                setSelectedLines([]);
-                await GenerateDocument(
-                    {
-                        name: Templates.parts_dispatch.key,
-                        variables: {
-                            id: result.data.insert_parts_dispatch_one.id,
-                        },
-                    },
-                    {},
-                    "p"
-                );
-            }
-            setVisible(false);
-        } catch (error) {
-            notification.open({
-                type: "error",
-                message: t("parts_dispatch.errors.creating", {
-                    error: error,
-                }),
-            });
-        } finally {
-            setLoading(false);
-        }
-    };
-
-    const popMenu = (
-        <div>
-            <Form layout="vertical" form={form} onFinish={handleConvert}>
-                <Form.Item
-                    name={"employeeid"}
-                    label={t("timetickets.fields.employee")}
-                    rules={[
-                        {
-                            required: true,
-                            //message: t("general.validation.required"),
-                        },
-                    ]}
-                >
-                    <Select
-                        showSearch
-                        style={{width: 200}}
-                        optionFilterProp="children"
-                        filterOption={(input, option) =>
-                            option.props.children
-                                .toLowerCase()
-                                .indexOf(input.toLowerCase()) >= 0
-                        }
-                    >
-                        {bodyshop.employees
-                            .filter((emp) => emp.active)
-                            .map((emp) => (
-                                <Select.Option
-                                    value={emp.id}
-                                    key={emp.id}
-                                    name={`${emp.first_name} ${emp.last_name}`}
-                                >
-                                    {`${emp.first_name} ${emp.last_name}`}
-                                </Select.Option>
-                            ))}
-                    </Select>
-                </Form.Item>
-
-                <Space wrap>
-                    <Button
-                        type="danger"
-                        onClick={() => form.submit()}
-                        loading={loading}
-                        disabled={selectedLines.length === 0}
-                    >
-                        {t("general.actions.save")}
-                    </Button>
-                    <Button onClick={() => setVisible(false)}>
-                        {t("general.actions.cancel")}
-                    </Button>
-                </Space>
-            </Form>
-        </div>
-    );
-
-    return (
-        <Popover open={visible} content={popMenu}>
-            <Button
-                disabled={selectedLines.length === 0 || jobRO}
-                loading={loading}
-                onClick={() => setVisible(true)}
-            >
-                {t("joblines.actions.dispatchparts", {count: selectedLines.length})}
-            </Button>
-        </Popover>
-    );
-}

client/src/components/job-line-location-popup/job-line-location-popup.component.jsx

@@ -1,5 +1,5 @@
 import {useMutation} from "@apollo/client";
-import {notification, Select, Space} from "antd";
+import {notification, Select} from "antd";
 import React, {useEffect, useState} from "react";
 import {useTranslation} from "react-i18next";
 import {connect} from "react-redux";
@@ -77,10 +77,7 @@ export function JobLineLocationPopup({bodyshop, jobline, disabled}) {
             style={{width: "100%", minHeight: "2rem", cursor: "pointer"}}
             onClick={() => !disabled && setEditing(true)}
         >
-            <Space wrap>
-                {jobline.location}
-                {jobline.parts_dispatch_lines?.length > 0 && "-Disp"}
-            </Space>
+            {jobline.location}
         </div>
     );
 }

client/src/components/job-line-team-assignment/job-line-team-assignmnent.component.jsx

@@ -1,116 +0,0 @@
-import {notification, Select} from "antd";
-import React, {useEffect, useState} from "react";
-import {useMutation} from "@apollo/client";
-import {useTranslation} from "react-i18next";
-import {connect} from "react-redux";
-import {createStructuredSelector} from "reselect";
-import {UPDATE_JOB_LINE} from "../../graphql/jobs-lines.queries";
-import {selectBodyshop} from "../../redux/user/user.selectors";
-import LoadingSpinner from "../loading-spinner/loading-spinner.component";
-import {insertAuditTrail} from "../../redux/application/application.actions";
-import AuditTrailMapping from "../../utils/AuditTrailMappings";
-
-const mapStateToProps = createStructuredSelector({
-    //currentUser: selectCurrentUser
-    bodyshop: selectBodyshop,
-});
-const mapDispatchToProps = (dispatch) => ({
-    insertAuditTrail: ({jobid, operation}) =>
-        dispatch(insertAuditTrail({jobid, operation})),
-});
-
-export function JoblineTeamAssignment({
-                                          bodyshop,
-                                          jobline,
-                                          disabled,
-                                          jobId,
-                                          insertAuditTrail,
-                                      }) {
-    const [editing, setEditing] = useState(false);
-    const [loading, setLoading] = useState(false);
-    const [assignedTeam, setAssignedTeam] = useState(jobline.assigned_team);
-    const [updateJob] = useMutation(UPDATE_JOB_LINE);
-    const {t} = useTranslation();
-
-    useEffect(() => {
-        if (editing) setAssignedTeam(jobline.assigned_team);
-    }, [editing, jobline.assigned_team]);
-
-    const handleChange = (e) => {
-        setAssignedTeam(e);
-    };
-
-    const handleSave = async (e) => {
-        setLoading(true);
-        const result = await updateJob({
-            variables: {
-                lineId: jobline.id,
-                line: {assigned_team: assignedTeam},
-            },
-        });
-
-        if (!!!result.errors) {
-            notification["success"]({message: t("joblines.successes.saved")});
-            //insert the audit trail here.
-            const teamName = bodyshop.employee_teams.find(
-                (et) => et.id === assignedTeam
-            )?.name;
-            insertAuditTrail({
-                jobid: jobId,
-                operation: AuditTrailMapping.assignedlinehours(
-                    teamName,
-                    jobline.mod_lb_hrs
-                ),
-            });
-        } else {
-            notification["error"]({
-                message: t("joblines.errors.saving", {
-                    error: JSON.stringify(result.errors),
-                }),
-            });
-        }
-        setLoading(false);
-        setEditing(false);
-    };
-
-    if (editing)
-        return (
-            <div>
-                <LoadingSpinner loading={loading}>
-                    <Select
-                        autoFocus
-                        allowClear
-                        dropdownMatchSelectWidth={100}
-                        value={assignedTeam}
-                        onSelect={handleChange}
-                        onBlur={handleSave}
-                        onClear={() => handleChange(null)}
-                    >
-                        {Object.values(bodyshop.employee_teams).map((s, idx) => (
-                            <Select.Option key={idx} value={s.id}>
-                                {s.name}
-                            </Select.Option>
-                        ))}
-                    </Select>
-                </LoadingSpinner>
-            </div>
-        );
-
-    const team = bodyshop.employee_teams.find(
-        (tm) => tm.id === jobline.assigned_team
-    );
-
-    return (
-        <div
-            style={{width: "100%", minHeight: "1rem", cursor: "pointer"}}
-            onClick={() => !disabled && setEditing(true)}
-        >
-            {team?.name}
-        </div>
-    );
-}
-
-export default connect(
-    mapStateToProps,
-    mapDispatchToProps
-)(JoblineTeamAssignment);

client/src/components/job-profile-data-warning/job-profile-data-warning.component.jsx

@@ -1,18 +0,0 @@
-import {Alert} from "antd";
-import React from "react";
-import {useTranslation} from "react-i18next";
-
-export default function JobProfileDataWarning({job}) {
-    const {t} = useTranslation();
-
-    let missingProfileInfo =
-        Object.keys(job.cieca_pft).length === 0 ||
-        Object.keys(job.cieca_pfl).length === 0 ||
-        Object.keys(job.materials).length === 0;
-
-    if (missingProfileInfo)
-        return (
-            <Alert type="error" message={t("jobs.labels.missingprofileinfo")}></Alert>
-        );
-    return null;
-}

client/src/components/job-reconciliation-modal/job-reconciliation-modal.component.jsx

@@ -19,8 +19,7 @@ export default function JobReconciliationModalComponent({job, bills}) {
 
     const jobLineData = job.joblines.filter(
         (j) =>
-            (j.part_type !== "PAE" && j.act_price !== 0 && j.part_qty !== 0) ||
-            j.misc_amt !== 0 ||
+            (j.part_type !== null && j.part_type !== "PAE") ||
             (j.line_desc &&
                 j.line_desc.toLowerCase().includes("towing") &&
                 j.lbr_op === "OP13") ||

client/src/components/job-scoreboard-add-button/job-scoreboard-add-button.component.jsx

@@ -42,6 +42,7 @@ export default function ScoreboardAddButton({
 
     const handleFinish = async (values) => {
         logImEXEvent("job_close_add_to_scoreboard");
+        values.date = dayjs(values.date).format("YYYY-MM-DD");
 
         setLoading(true);
         let result;
@@ -169,7 +170,7 @@ export default function ScoreboardAddButton({
                     return acc + job.lbr_adjustments[val];
                 }, 0);
         form.setFieldsValue({
-            date: new dayjs(),
+            date: dayjs(),
             bodyhrs: Math.round(v.bodyhrs * 10) / 10,
             painthrs: Math.round(v.painthrs * 10) / 10,
         });

client/src/components/job-send-parts-price-change/job-send-parts-price-change.component.jsx

@@ -1,31 +0,0 @@
-import {Button, notification} from "antd";
-import axios from "axios";
-import React, {useState} from "react";
-import {useTranslation} from "react-i18next";
-
-export default function JobSendPartPriceChangeComponent({job}) {
-    const {t} = useTranslation();
-    const [loading, setLoading] = useState(false);
-    const handleClick = async () => {
-        setLoading(true);
-        try {
-            const ppcData = await axios.post("/job/ppc", {jobid: job.id});
-            await axios.post("http://localhost:1337/ppc/", ppcData.data);
-        } catch (error) {
-            notification.open({
-                type: "error",
-                message: t("jobs.errors.partspricechange", {
-                    error: JSON.stringify(error),
-                }),
-            });
-        } finally {
-            setLoading(false);
-        }
-    };
-
-    return (
-        <Button onClick={handleClick} loading={loading}>
-            {t("jobs.actions.sendpartspricechange")}
-        </Button>
-    );
-}

client/src/components/job-totals-table/job-totals-table.component.jsx

@@ -67,8 +67,7 @@ export function JobsTotalsTableComponent({jobRO, currentUser, job}) {
                                 <JobTotalsTableTotals job={job}/>
                             </Card>
                         </Col>
-                        {(currentUser.email.includes("@imex.") ||
-                            currentUser.email.includes("@rome.")) && (
+                        {currentUser.email.includes("@imex.") && (
                             <Col span={24}>
                                 <Card title="DEVELOPMENT USE ONLY">
                                     <JobCalculateTotals job={job} disabled={jobRO}/>

client/src/components/job-totals-table/job-totals.table.labor.component.jsx

@@ -123,10 +123,11 @@ export default function JobTotalsTableLabor({job}) {
                             <Space>
                                 {t("jobs.labels.mapa")}
                                 {job.materials &&
-                                    job.materials.MAPA &&
-                                    job.materials.MAPA.cal_maxdlr !== undefined &&
+                                    job.materials.mapa &&
+                                    job.materials.mapa.cal_maxdlr &&
+                                    job.materials.mapa.cal_maxdlr > 0 &&
                                     t("jobs.labels.threshhold", {
-                                        amount: job.materials.MAPA.cal_maxdlr,
+                                        amount: job.materials.mapa.cal_maxdlr,
                                     })}
                             </Space>
                         </Table.Summary.Cell>
@@ -147,10 +148,11 @@ export default function JobTotalsTableLabor({job}) {
                             <Space wrap>
                                 {t("jobs.labels.mash")}
                                 {job.materials &&
-                                    job.materials.MASH &&
-                                    job.materials.MASH.cal_maxdlr !== undefined &&
+                                    job.materials.mash &&
+                                    job.materials.mash.cal_maxdlr &&
+                                    job.materials.mash.cal_maxdlr > 0 &&
                                     t("jobs.labels.threshhold", {
-                                        amount: job.materials.MASH.cal_maxdlr,
+                                        amount: job.materials.mash.cal_maxdlr,
                                     })}
                             </Space>
                         </Table.Summary.Cell>

client/src/components/job-totals-table/job-totals.table.parts.component.jsx

@@ -11,22 +11,6 @@ export default function JobTotalsTableParts({job}) {
         filteredInfo: {},
     });
 
-    const insuranceAdjustments = useMemo(() => {
-        if (!job.job_totals) return [];
-        if (!job.job_totals?.parts?.adjustments) return [];
-        const adjs = [];
-        Object.keys(job.job_totals?.parts?.adjustments).forEach((key) => {
-            if (Dinero(job.job_totals?.parts?.adjustments[key]).getAmount() !== 0) {
-                adjs.push({
-                    id: key,
-                    amount: Dinero(job.job_totals.parts.adjustments[key]),
-                });
-            }
-        });
-
-        return adjs;
-    }, [job.job_totals]);
-
     const data = useMemo(() => {
         return Object.keys(job.job_totals.parts.parts.list)
             .filter(
@@ -90,11 +74,11 @@ export default function JobTotalsTableParts({job}) {
                         <Table.Summary.Cell>
                             {t("jobs.labels.prt_dsmk_total")}
                         </Table.Summary.Cell>
+
                         <Table.Summary.Cell align="right">
                             {Dinero(job.job_totals.parts.parts.prt_dsmk_total).toFormat()}
                         </Table.Summary.Cell>
                     </Table.Summary.Row>
-
                     <Table.Summary.Row>
                         <Table.Summary.Cell>
                             <strong>{t("jobs.labels.partstotal")}</strong>
@@ -106,24 +90,6 @@ export default function JobTotalsTableParts({job}) {
                             </strong>
                         </Table.Summary.Cell>
                     </Table.Summary.Row>
-                    {insuranceAdjustments.length > 0 && (
-                        <Table.Summary.Row>
-                            <Table.Summary.Cell colSpan={24}>
-                                {t("jobs.labels.profileadjustments")}
-                            </Table.Summary.Cell>
-                        </Table.Summary.Row>
-                    )}
-                    {insuranceAdjustments.map((adj, idx) => (
-                        <Table.Summary.Row key={idx}>
-                            <Table.Summary.Cell>
-                                {t(`jobs.fields.${adj.id.toLowerCase()}`)}
-                            </Table.Summary.Cell>
-
-                            <Table.Summary.Cell align="right">
-                                {adj.amount.toFormat()}
-                            </Table.Summary.Cell>
-                        </Table.Summary.Row>
-                    ))}
                 </>
             )}
         />

client/src/components/job-totals-table/job-totals.table.totals.component.jsx

@@ -29,109 +29,26 @@ export function JobTotalsTableTotals({bodyshop, job}) {
                 total: job.job_totals.totals.subtotal,
                 bold: true,
             },
-
-            ...(job.job_totals.totals.us_sales_tax_breakdown
+            {
+                key: t("jobs.labels.local_tax_amt"),
+                total: job.job_totals.totals.local_tax,
+            },
+            {
+                key: t("jobs.labels.state_tax_amt"),
+                total: job.job_totals.totals.state_tax,
+            },
+            ...(bodyshop.region_config === "CA_BC"
                 ? [
                     {
-                        key: `${
-                            bodyshop.md_responsibility_centers.taxes.tax_ty1?.tax_type1 ||
-                            "T1"
-                        } - ${[
-                            job.cieca_pft.ty1_rate1,
-                            job.cieca_pft.ty1_rate2,
-                            job.cieca_pft.ty1_rate3,
-                            job.cieca_pft.ty1_rate4,
-                            job.cieca_pft.ty1_rate5,
-                        ]
-                            .filter((i) => i > 0)
-                            .join(", ")}%`,
-                        total: job.job_totals.totals.us_sales_tax_breakdown.ty1Tax,
+                        key: t("jobs.fields.ca_bc_pvrt"),
+                        total: job.job_totals.additional.pvrt,
                     },
-                    {
-                        key: `${
-                            bodyshop.md_responsibility_centers.taxes.tax_ty2?.tax_type2 ||
-                            "T2"
-                        } - ${[
-                            job.cieca_pft.ty2_rate1,
-                            job.cieca_pft.ty2_rate2,
-                            job.cieca_pft.ty2_rate3,
-                            job.cieca_pft.ty2_rate4,
-                            job.cieca_pft.ty2_rate5,
-                        ]
-                            .filter((i) => i > 0)
-                            .join(", ")}%`,
-                        total: job.job_totals.totals.us_sales_tax_breakdown.ty2Tax,
-                    },
-                    {
-                        key: `${
-                            bodyshop.md_responsibility_centers.taxes.tax_ty3?.tax_type3 ||
-                            "T3"
-                        } - ${[
-                            job.cieca_pft.ty3_rate1,
-                            job.cieca_pft.ty3_rate2,
-                            job.cieca_pft.ty3_rate3,
-                            job.cieca_pft.ty3_rate4,
-                            job.cieca_pft.ty3_rate5,
-                        ]
-                            .filter((i) => i > 0)
-                            .join(", ")}%`,
-                        total: job.job_totals.totals.us_sales_tax_breakdown.ty3Tax,
-                    },
-                    {
-                        key: `${
-                            bodyshop.md_responsibility_centers.taxes.tax_ty4?.tax_type4 ||
-                            "T4"
-                        } - ${[
-                            job.cieca_pft.ty4_rate1,
-                            job.cieca_pft.ty4_rate2,
-                            job.cieca_pft.ty4_rate3,
-                            job.cieca_pft.ty4_rate4,
-                            job.cieca_pft.ty4_rate5,
-                        ]
-                            .filter((i) => i > 0)
-                            .join(", ")}%`,
-                        total: job.job_totals.totals.us_sales_tax_breakdown.ty4Tax,
-                    },
-                    {
-                        key: `${
-                            bodyshop.md_responsibility_centers.taxes.tax_ty5?.tax_type5 ||
-                            "TT"
-                        } - ${[
-                            job.cieca_pft.ty5_rate1,
-                            job.cieca_pft.ty5_rate2,
-                            job.cieca_pft.ty5_rate3,
-                            job.cieca_pft.ty5_rate4,
-                            job.cieca_pft.ty5_rate5,
-                        ]
-                            .filter((i) => i > 0)
-                            .join(", ")}%`,
-                        total: job.job_totals.totals.us_sales_tax_breakdown.ty5Tax,
-                    },
-                    {
-                        key: t("jobs.labels.total_sales_tax"),
-                        bold: true,
-                        total: Dinero(job.job_totals.totals.us_sales_tax_breakdown.ty1Tax)
-                            .add(
-                                Dinero(job.job_totals.totals.us_sales_tax_breakdown.ty2Tax)
-                            )
-                            .add(
-                                Dinero(job.job_totals.totals.us_sales_tax_breakdown.ty3Tax)
-                            )
-                            .add(
-                                Dinero(job.job_totals.totals.us_sales_tax_breakdown.ty4Tax)
-                            )
-                            .add(
-                                Dinero(job.job_totals.totals.us_sales_tax_breakdown.ty5Tax)
-                            ).toJSON(),
-                    },
-                ].filter((item) => item.total.amount !== 0)
-                : [
-                    {
-                        key: t("jobs.labels.state_tax_amt"),
-                        total: job.job_totals.totals.state_tax,
-                    },
-                ]),
-
+                ]
+                : []),
+            {
+                key: t("jobs.labels.federal_tax_amt"),
+                total: job.job_totals.totals.federal_tax,
+            },
             {
                 key: t("jobs.labels.total_repairs"),
                 total: job.job_totals.totals.total_repairs,
@@ -141,10 +58,10 @@ export function JobTotalsTableTotals({bodyshop, job}) {
                 key: t("jobs.fields.ded_amt"),
                 total: job.job_totals.totals.custPayable.deductible,
             },
-            // {
-            //   key: t("jobs.fields.federal_tax_payable"),
-            //   total: job.job_totals.totals.custPayable.federal_tax,
-            // },
+            {
+                key: t("jobs.fields.federal_tax_payable"),
+                total: job.job_totals.totals.custPayable.federal_tax,
+            },
             {
                 key: t("jobs.fields.other_amount_payable"),
                 total: job.job_totals.totals.custPayable.other_customer_amount,
@@ -165,7 +82,7 @@ export function JobTotalsTableTotals({bodyshop, job}) {
                 bold: true,
             },
         ];
-    }, [job.job_totals, job.cieca_pft, t, bodyshop.md_responsibility_centers]);
+    }, [job.job_totals, t, bodyshop.region_config]);
 
     const columns = [
         {

client/src/components/jobs-admin-change-status/jobs-admin-change.status.component.jsx

@@ -14,8 +14,8 @@ const mapStateToProps = createStructuredSelector({
     bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
-    insertAuditTrail: ({jobid, operation}) =>
-        dispatch(insertAuditTrail({jobid, operation})),
+    insertAuditTrail: ({jobid, operation, type}) =>
+        dispatch(insertAuditTrail({jobid, operation, type })),
 });
 export default connect(mapStateToProps, mapDispatchToProps)(JobsAdminStatus);
 
@@ -32,7 +32,7 @@ export function JobsAdminStatus({insertAuditTrail, bodyshop, job}) {
                 insertAuditTrail({
                     jobid: job.id,
                     operation: AuditTrailMapping.admin_jobstatuschange(status),
-                });
+                type: "admin_jobstatuschange",});
                 // refetch();
             })
             .catch((error) => {

client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx

@@ -20,8 +20,8 @@ const mapStateToProps = createStructuredSelector({
 });
 
 const mapDispatchToProps = (dispatch) => ({
-    insertAuditTrail: ({jobid, operation}) =>
-        dispatch(insertAuditTrail({jobid, operation})),
+    insertAuditTrail: ({jobid, operation, type}) =>
+        dispatch(insertAuditTrail({jobid, operation, type })),
 });
 
 export default connect(
@@ -57,7 +57,7 @@ export function JobsAdminDatesChange({insertAuditTrail, job}) {
                         ? DateTimeFormat(changedAuditFields[key])
                         : changedAuditFields[key]
                 ),
-            });
+            type: "admin_jobfieldchange",});
         });
 
         if (!!!result.errors) {

client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx

@@ -2,7 +2,8 @@ import {useMutation} from "@apollo/client";
 import {Button, Space, notification} from "antd";
 import React, {useState} from "react";
 import {useTranslation} from "react-i18next";
-import dayjs from '../../utils/day';
+
+import dayjs from "../../utils/day";
 import {connect} from "react-redux";
 import {createStructuredSelector} from "reselect";
 import {INSERT_EXPORT_LOG} from "../../graphql/accounting.queries";
@@ -23,8 +24,8 @@ const mapStateToProps = createStructuredSelector({
     currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
-    insertAuditTrail: ({jobid, operation}) =>
-        dispatch(insertAuditTrail({jobid, operation})),
+    insertAuditTrail: ({jobid, operation, type}) =>
+        dispatch(insertAuditTrail({jobid, operation, type })),
 });
 export default connect(
     mapStateToProps,
@@ -59,7 +60,7 @@ export function JobAdminMarkReexport({
             insertAuditTrail({
                 jobid: job.id,
                 operation: AuditTrailMapping.admin_jobmarkforreexport(),
-            });
+            type: "admin_jobmarkforreexport",});
         } else {
             notification["error"]({
                 message: t("jobs.errors.saving", {
@@ -99,7 +100,7 @@ export function JobAdminMarkReexport({
             insertAuditTrail({
                 jobid: job.id,
                 operation: AuditTrailMapping.admin_jobmarkexported(),
-            });
+            type: "admin_jobmarkexported",});
         } else {
             notification["error"]({
                 message: t("jobs.errors.saving", {
@@ -124,7 +125,7 @@ export function JobAdminMarkReexport({
             insertAuditTrail({
                 jobid: job.id,
                 operation: AuditTrailMapping.admin_jobuninvoice(),
-            });
+            type: "admin_jobuninvoice",});
         } else {
             notification["error"]({
                 message: t("jobs.errors.saving", {

client/src/components/jobs-admin-remove-ar/jobs-admin-remove-ar.component.jsx

@@ -1,5 +1,5 @@
 import {useMutation} from "@apollo/client";
-import { notification, Switch} from "antd";
+import {notification, Switch} from "antd";
 import React, {useState} from "react";
 import {useTranslation} from "react-i18next";
 import {connect} from "react-redux";
@@ -10,8 +10,8 @@ import AuditTrailMapping from "../../utils/AuditTrailMappings";
 
 const mapStateToProps = createStructuredSelector({});
 const mapDispatchToProps = (dispatch) => ({
-    insertAuditTrail: ({jobid, operation}) =>
-        dispatch(insertAuditTrail({jobid, operation})),
+    insertAuditTrail: ({jobid, operation, type}) =>
+        dispatch(insertAuditTrail({jobid, operation, type })),
 });
 
 export default connect(mapStateToProps, mapDispatchToProps)(JobsAdminRemoveAR);
@@ -34,7 +34,7 @@ export function JobsAdminRemoveAR({insertAuditTrail, job}) {
             insertAuditTrail({
                 jobid: job.id,
                 operation: AuditTrailMapping.admin_job_remove_from_ar(value),
-            });
+            type: "admin_job_remove_from_ar",});
             setSwitchValue(value);
         } else {
             notification["error"]({

client/src/components/jobs-admin-unvoid/jobs-admin-unvoid.component.jsx

@@ -14,8 +14,8 @@ const mapStateToProps = createStructuredSelector({
     currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
-    insertAuditTrail: ({jobid, operation}) =>
-        dispatch(insertAuditTrail({jobid, operation})),
+    insertAuditTrail: ({jobid, operation, type}) =>
+        dispatch(insertAuditTrail({jobid, operation, type })),
 });
 export default connect(mapStateToProps, mapDispatchToProps)(JobsAdminUnvoid);
 
@@ -46,6 +46,7 @@ export function JobsAdminUnvoid({
             insertAuditTrail({
                 jobid: job.id,
                 operation: AuditTrailMapping.admin_jobunvoid(),
+                type: "admin_jobunvoid",
             });
         } else {
             notification["error"]({

client/src/components/jobs-available-table/jobs-available-supplement.estlines.util.js

@@ -25,7 +25,7 @@ export const GetSupplementDelta = async (client, jobId, newLines) => {
             //Found a relevant matching line. Add it to lines to update.
             linesToUpdate.push({
                 id: existingLines[matchingIndex].id,
-                newData: {...newLine, removed: false, act_price_before_ppc: null},
+                newData: {...newLine, removed: false},
             });
 
             //Splice out item we found for performance.

client/src/components/jobs-available-table/jobs-available-table.container.jsx

@@ -1,8 +1,8 @@
 import {gql, useApolloClient, useLazyQuery, useMutation, useQuery,} from "@apollo/client";
 import {useSplitTreatments} from "@splitsoftware/splitio-react";
-import {Button, Col, notification, Row} from "antd";
+import {Col, Row, notification} from "antd";
 import Axios from "axios";
-import _ from "lodash";
+import Dinero from "dinero.js";
 import dayjs from "../../utils/day";
 import queryString from "query-string";
 import React, {useCallback, useEffect, useState} from "react";
@@ -22,6 +22,7 @@ import {SEARCH_VEHICLE_BY_VIN} from "../../graphql/vehicles.queries";
 import {insertAuditTrail} from "../../redux/application/application.actions";
 import {selectBodyshop, selectCurrentUser,} from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
+import confirmDialog from "../../utils/asyncConfirm";
 import CriticalPartsScan from "../../utils/criticalPartsScan";
 import AlertComponent from "../alert/alert.component";
 import JobsAvailableScan from "../jobs-available-scan/jobs-available-scan.component";
@@ -37,8 +38,8 @@ const mapStateToProps = createStructuredSelector({
     currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
-    insertAuditTrail: ({jobid, operation}) =>
-        dispatch(insertAuditTrail({jobid, operation})),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export function JobsAvailableContainer({bodyshop, currentUser, insertAuditTrail,}) {
@@ -62,7 +63,15 @@ export function JobsAvailableContainer({bodyshop, currentUser, insertAuditTrail,
 
     const [selectedJob, setSelectedJob] = useState(null);
     const [selectedOwner, setSelectedOwner] = useState(null);
-    const [partsQueueToggle, setPartsQueueToggle] = useState(bodyshop.md_functionality_toggles.parts_queue_toggle);
+    const [partsQueueToggle, setPartsQueueToggle] = useState(
+        bodyshop.md_functionality_toggles.parts_queue_toggle
+    );
+    const [updateSchComp, setSchComp] = useState({
+        actual_in: dayjs(),
+        checked: false,
+        scheduled_completion: dayjs(),
+        automatic: false,
+    });
 
     const [insertLoading, setInsertLoading] = useState(false);
 
@@ -81,15 +90,14 @@ export function JobsAvailableContainer({bodyshop, currentUser, insertAuditTrail,
     const modalSearchState = useState("");
 
     //Import Scenario
-    const onOwnerFindModalOk = async (lazyData) => {
+    const onOwnerFindModalOk = async () => {
         logImEXEvent("job_import_new");
 
         setOwnerModalVisible(false);
 
         setInsertLoading(true);
-        const estData = replaceEmpty(
-            lazyData?.available_jobs_by_pk || estDataRaw.data.available_jobs_by_pk
-        );
+
+        const estData = replaceEmpty(estDataRaw.data.available_jobs_by_pk);
 
         if (!(estData && estData.est_data)) {
             //We don't have the right data. Error!
@@ -99,21 +107,17 @@ export function JobsAvailableContainer({bodyshop, currentUser, insertAuditTrail,
             });
             return;
         }
-        // if (process.env.REACT_APP_COUNTRY === "USA") {
-        //Massage the CCC file set to remove duplicate UNQ_SEQ.
-        await ResolveCCCLineIssues(estData.est_data, bodyshop);
-        //   } else {
         //IO-539 Check for Parts Rate on PAL for SGI use case.
         await CheckTaxRates(estData.est_data, bodyshop);
-        //  }
-        // const newTotals = (
-        //   await Axios.post("/job/totals", {
-        //     job: {
-        //       ...estData.est_data,
-        //       joblines: estData.est_data.joblines.data,
-        //     },
-        //   })
-        // ).data;
+
+        const newTotals = (
+            await Axios.post("/job/totals", {
+                job: {
+                    ...estData.est_data,
+                    joblines: estData.est_data.joblines.data,
+                },
+            })
+        ).data;
 
         let existingVehicles;
         if (estData.est_data.v_vin) {
@@ -128,9 +132,9 @@ export function JobsAvailableContainer({bodyshop, currentUser, insertAuditTrail,
 
         const newJob = {
             ...estData.est_data,
-            // clm_total: Dinero(newTotals.totals.total_repairs).toFormat("0.00"),
-            // owner_owing: Dinero(newTotals.totals.custPayable.total).toFormat("0.00"),
-            // job_totals: newTotals,
+            clm_total: Dinero(newTotals.totals.total_repairs).toFormat("0.00"),
+            owner_owing: Dinero(newTotals.totals.custPayable.total).toFormat("0.00"),
+            job_totals: newTotals,
             date_open: dayjs(),
             status: bodyshop.md_ro_statuses.default_imported,
             notes: {
@@ -154,23 +158,17 @@ export function JobsAvailableContainer({bodyshop, currentUser, insertAuditTrail,
             delete newJob.vehicle;
         }
 
-        if (typeof newJob.kmin === "string") {
-            newJob.kmin = null;
-        }
-
         try {
             const r = await insertNewJob({
                 variables: {
                     job: newJob,
                 },
             });
-            await Axios.post("/job/totalsssu", {
-                id: r.data.insert_jobs.returning[0].id,
-            });
 
             if (CriticalPartsScanning.treatment === "on") {
                 CriticalPartsScan(r.data.insert_jobs.returning[0].id);
             }
+
             notification["success"]({
                 message: t("jobs.successes.created"),
                 onClick: () => {
@@ -179,12 +177,13 @@ export function JobsAvailableContainer({bodyshop, currentUser, insertAuditTrail,
             });
             //Job has been inserted. Clean up the available jobs record.
 
-            insertAuditTrail({
-                jobid: r.data.insert_jobs.returning[0].id,
-                operation: AuditTrailMapping.jobimported(),
-            });
+      insertAuditTrail({
+        jobid: r.data.insert_jobs.returning[0].id,
+        operation: AuditTrailMapping.jobimported(),
+        type: "jobimported",
+      });
 
-            await deleteJob({
+            deleteJob({
                 variables: {id: estData.id},
             }).then((r) => {
                 refetch();
@@ -192,16 +191,20 @@ export function JobsAvailableContainer({bodyshop, currentUser, insertAuditTrail,
             });
 
             setPartsQueueToggle(bodyshop.md_functionality_toggles.parts_queue_toggle);
-        } catch (r) {
+        } catch (err) {
             //error while inserting
             notification["error"]({
-                message: t("jobs.errors.creating", {error: r.message}),
+                message: t("jobs.errors.creating", {error: err.message}),
+            });
+            refetch().catch((e) => {
+                console.error(`Something went wrong in jobs available table container - ${err.message || ""
+                    }`
+                );
             });
-            refetch();
             setInsertLoading(false);
             setPartsQueueToggle(bodyshop.md_functionality_toggles.parts_queue_toggle);
-
         }
+
     };
 
     //Supplement scenario
@@ -224,8 +227,24 @@ export function JobsAvailableContainer({bodyshop, currentUser, insertAuditTrail,
             let supp = replaceEmpty({...estData.est_data});
             //IO-539 Check for Parts Rate on PAL for SGI use case.
             await CheckTaxRates(supp, bodyshop);
-            await ResolveCCCLineIssues(supp, bodyshop);
 
+            if (updateSchComp.checked === true) {
+                if (updateSchComp.automatic === true) {
+                    const job_hrs = supp.joblines.data.reduce(
+                        (acc, val) => acc + val.mod_lb_hrs,
+                        0
+                    );
+                    const num_days = job_hrs / bodyshop.target_touchtime;
+                    supp.actual_in = updateSchComp.actual_in;
+                    supp.scheduled_completion = dayjs(
+            updateSchComp.actual_in
+                        ).businessDaysAdd(num_days,
+                        "day"
+                    );
+                } else {
+                    supp.scheduled_completion = updateSchComp.scheduled_completion;
+                }
+            }
             delete supp.owner;
             delete supp.vehicle;
             delete supp.ins_co_nm;
@@ -307,24 +326,25 @@ export function JobsAvailableContainer({bodyshop, currentUser, insertAuditTrail,
                 setInsertLoading(false);
             });
 
-            await insertNote({
-                variables: {
-                    noteInput: [
-                        {
-                            jobid: selectedJob,
-                            created_by: currentUser.email,
-                            audit: true,
-                            text: t("jobs.labels.supplementnote"),
-                        },
-                    ],
-                },
-            });
-            insertAuditTrail({
-                jobid: selectedJob,
-                operation: AuditTrailMapping.jobsupplement(),
-            });
-        }
-    };
+      await insertNote({
+        variables: {
+          noteInput: [
+            {
+              jobid: selectedJob,
+              created_by: currentUser.email,
+              audit: true,
+              text: t("jobs.labels.supplementnote"),
+            },
+          ],
+        },
+      });
+      insertAuditTrail({
+        jobid: selectedJob,
+        operation: AuditTrailMapping.jobsupplement(),
+        type: "jobsupplement",
+      });
+    }
+  };
 
     const owner =
         estDataRaw.data &&
@@ -398,27 +418,9 @@ export function JobsAvailableContainer({bodyshop, currentUser, insertAuditTrail,
                 onCancel={onJobModalCancel}
                 modalSearchState={modalSearchState}
                 partsQueueToggle={partsQueueToggle}
-                setPartsQueueToggle={setPartsQueueToggle}
+                setPartsQueueToggle={setPartsQueueToggle} updateSchComp={updateSchComp}
+                setSchComp={setSchComp}
             />
-            {currentUser.email.includes("@rome.") ||
-            currentUser.email.includes("@imex.") ? (
-                <Button
-                    onClick={async () => {
-                        for (const record of data.available_jobs) {
-                            //Query the data
-                            console.log("Start Job", record.id);
-                            const {data} = await loadEstData({
-                                variables: {id: record.id},
-                            });
-                            console.log("Query has been awaited and is complete");
-                            await onOwnerFindModalOk(data);
-                        }
-                    }}
-                >
-                    Add all jobs as new.
-                </Button>
-            ) : null}
-
             <Row gutter={[16, 16]}>
                 <Col span={24}>
                     <JobsAvailableTableComponent
@@ -451,158 +453,115 @@ function replaceEmpty(someObj, replaceValue = null) {
 }
 
 async function CheckTaxRates(estData, bodyshop) {
-    // //LKQ Check
-    // if (
-    //   !estData.parts_tax_rates?.PAL ||
-    //   estData.parts_tax_rates?.PAL?.prt_tax_rt === null ||
-    //   estData.parts_tax_rates?.PAL?.prt_tax_rt === 0
-    // ) {
-    //   const res = await confirmDialog(
-    //     `Rome Online has detected that there is a missing tax rate for LKQ parts. Pressing OK will set the tax rate to ${bodyshop.bill_tax_rates.state_tax_rate}% and enable the rate. Pressing cancel will keep the tax rate as is.`
-        //   );
-    //   if (res) {
-    //     if (!estData.parts_tax_rates.PAL) {
-    //       estData.parts_tax_rates.PAL = {
-    //         prt_discp: 0,
-    //         prt_mktyp: true,
-    //         prt_mkupp: 0,
-    //         prt_type: "PAL",
-    //       };
-    //     }
-    //     estData.parts_tax_rates.PAL.prt_tax_rt =
-    //       bodyshop.bill_tax_rates.state_tax_rate / 100;
-    //     estData.parts_tax_rates.PAL.prt_tax_in = true;
-    //   }
-    // }
-    // //PAC Check
-    // if (
-    //   !estData.parts_tax_rates?.PAC ||
-    //   estData.parts_tax_rates?.PAC?.prt_tax_rt === null ||
-    //   estData.parts_tax_rates?.PAC?.prt_tax_rt === 0
-    // ) {
-    //   const res = await confirmDialog(
-    //     `Rome Online has detected that there is a missing tax rate for rechromed parts. Pressing OK will set the tax rate to ${bodyshop.bill_tax_rates.state_tax_rate}% and enable the rate. Pressing cancel will keep the tax rate as is.`
-        //   );
-    //   if (res) {
-    //     if (!estData.parts_tax_rates.PAC) {
-    //       estData.parts_tax_rates.PAC = {
-    //         prt_discp: 0,
-    //         prt_mktyp: true,
-    //         prt_mkupp: 0,
-    //         prt_type: "PAC",
-    //       };
-    //     }
-    //     estData.parts_tax_rates.PAC.prt_tax_rt =
-    //       bodyshop.bill_tax_rates.state_tax_rate / 100;
-    //     estData.parts_tax_rates.PAC.prt_tax_in = true;
-    //   }
-    // }
-
-        //PAM Check
-    if (!estData.parts_tax_rates?.PAM) {
-                estData.parts_tax_rates.PAM = estData.parts_tax_rates.PAC;
+    //LKQ Check
+    if (
+        !estData.parts_tax_rates?.PAL ||
+        estData.parts_tax_rates?.PAL?.prt_tax_rt === null ||
+        estData.parts_tax_rates?.PAL?.prt_tax_rt === 0
+    ) {
+        const res = await confirmDialog(
+            `ImEX Online has detected that there is a missing tax rate for LKQ parts. Pressing OK will set the tax rate to ${bodyshop.bill_tax_rates.state_tax_rate}% and enable the rate. Pressing cancel will keep the tax rate as is.`
+        );
+        if (res) {
+            if (!estData.parts_tax_rates.PAL) {
+                estData.parts_tax_rates.PAL = {
+                    prt_discp: 0,
+                    prt_mktyp: true,
+                    prt_mkupp: 0,
+                    prt_type: "PAL",
+                };
+            }
+            estData.parts_tax_rates.PAL.prt_tax_rt =
+                bodyshop.bill_tax_rates.state_tax_rate / 100;
+            estData.parts_tax_rates.PAL.prt_tax_in = true;
+        }
+    }
+    //PAC Check
+    if (
+        !estData.parts_tax_rates?.PAC ||
+        estData.parts_tax_rates?.PAC?.prt_tax_rt === null ||
+        estData.parts_tax_rates?.PAC?.prt_tax_rt === 0
+    ) {
+        const res = await confirmDialog(
+            `ImEX Online has detected that there is a missing tax rate for rechromed parts. Pressing OK will set the tax rate to ${bodyshop.bill_tax_rates.state_tax_rate}% and enable the rate. Pressing cancel will keep the tax rate as is.`
+        );
+        if (res) {
+            if (!estData.parts_tax_rates.PAC) {
+                estData.parts_tax_rates.PAC = {
+                    prt_discp: 0,
+                    prt_mktyp: true,
+                    prt_mkupp: 0,
+                    prt_type: "PAC",
+                };
+            }
+            estData.parts_tax_rates.PAC.prt_tax_rt =
+                bodyshop.bill_tax_rates.state_tax_rate / 100;
+            estData.parts_tax_rates.PAC.prt_tax_in = true;
+        }
+    }
+    //PAM Check
+    if (
+        !estData.parts_tax_rates?.PAM ||
+        estData.parts_tax_rates?.PAM?.prt_tax_rt === null ||
+        estData.parts_tax_rates?.PAM?.prt_tax_rt === 0
+    ) {
+        const res = await confirmDialog(
+            `ImEX Online has detected that there is a missing tax rate for remanufactured parts. Pressing OK will set the tax rate to ${bodyshop.bill_tax_rates.state_tax_rate}% and enable the rate. Pressing cancel will keep the tax rate as is.`
+        );
+        if (res) {
+            if (!estData.parts_tax_rates.PAM) {
+                estData.parts_tax_rates.PAM = {
+                    prt_discp: 0,
+                    prt_mktyp: true,
+                    prt_mkupp: 0,
+                    prt_type: "PAM",
+                };
+            }
+            estData.parts_tax_rates.PAM.prt_tax_rt =
+                bodyshop.bill_tax_rates.state_tax_rate / 100;
+            estData.parts_tax_rates.PAM.prt_tax_in = true;
+        }
     }
 
-    // //PAM Check
-    // if (
-    //   !estData.parts_tax_rates?.PAM ||
-    //   estData.parts_tax_rates?.PAM?.prt_tax_rt === null ||
-    //   estData.parts_tax_rates?.PAM?.prt_tax_rt === 0
-    // ) {
-    //   const res = await confirmDialog(
-    //     `Rome Online has detected that there is a missing tax rate for remanufactured parts. Pressing OK will set the tax rate to ${bodyshop.bill_tax_rates.state_tax_rate}% and enable the rate. Pressing cancel will keep the tax rate as is.`
-    //   );
-    //   if (res) {
-    //     if (!estData.parts_tax_rates.PAM) {
-    //       estData.parts_tax_rates.PAM = {
-    //         prt_discp: 0,
-    //         prt_mktyp: true,
-    //         prt_mkupp: 0,
-    //         prt_type: "PAM",
-    //       };
-    //     }
-    //     estData.parts_tax_rates.PAM.prt_tax_rt =
-    //       bodyshop.bill_tax_rates.state_tax_rate / 100;
-    //     estData.parts_tax_rates.PAM.prt_tax_in = true;
-    //   }
-    // }
-
-    // if (
-    //   !estData.parts_tax_rates?.PAR ||
-    //   estData.parts_tax_rates?.PAR?.prt_tax_rt === null ||
-    //   estData.parts_tax_rates?.PAR?.prt_tax_rt === 0
-    // ) {
-    //   const res = await confirmDialog(
-    //     `Rome Online has detected that there is a missing tax rate for recored parts. Pressing OK will set the tax rate to ${bodyshop.bill_tax_rates.state_tax_rate}% and enable the rate. Pressing cancel will keep the tax rate as is.`
-        //   );
-    //   if (res) {
-    //     if (!estData.parts_tax_rates.PAR) {
-    //       estData.parts_tax_rates.PAR = {
-    //         prt_discp: 0,
-    //         prt_mktyp: true,
-    //         prt_mkupp: 0,
-    //         prt_type: "PAR",
-    //       };
-    //     }
-    //     estData.parts_tax_rates.PAR.prt_tax_rt =
-    //       bodyshop.bill_tax_rates.state_tax_rate / 100;
-    //     estData.parts_tax_rates.PAR.prt_tax_in = true;
-    //   }
-    // }
+    if (
+        !estData.parts_tax_rates?.PAR ||
+        estData.parts_tax_rates?.PAR?.prt_tax_rt === null ||
+        estData.parts_tax_rates?.PAR?.prt_tax_rt === 0
+    ) {
+        const res = await confirmDialog(
+            `ImEX Online has detected that there is a missing tax rate for recored parts. Pressing OK will set the tax rate to ${bodyshop.bill_tax_rates.state_tax_rate}% and enable the rate. Pressing cancel will keep the tax rate as is.`
+        );
+        if (res) {
+            if (!estData.parts_tax_rates.PAR) {
+                estData.parts_tax_rates.PAR = {
+                    prt_discp: 0,
+                    prt_mktyp: true,
+                    prt_mkupp: 0,
+                    prt_type: "PAR",
+                };
+            }
+            estData.parts_tax_rates.PAR.prt_tax_rt =
+                bodyshop.bill_tax_rates.state_tax_rate / 100;
+            estData.parts_tax_rates.PAR.prt_tax_in = true;
+        }
+    }
 
     //IO-1387 If a sublet line is NOT R&R, use the labor tax. If it is, use the sublet tax rate.
     //Currently limited to SK shops only.
-    if (bodyshop.region_config === "CA_SK") {
-        estData.joblines.data.forEach((jl, index) => {
-            if (
-                (jl.part_type === "PASL" || jl.part_type === "PAS") &&
-                jl.lbr_op !== "OP11"
-            ) {
-                estData.joblines.data[index].tax_part = jl.lbr_tax;
-            }
+    //if (bodyshop.region_config === "CA_SK") {
+    estData.joblines.data.forEach((jl, index) => {
+        if (
+            (jl.part_type === "PASL" || jl.part_type === "PAS") &&
+            jl.lbr_op !== "OP11"
+        ) {
+            estData.joblines.data[index].tax_part = jl.lbr_tax;
+        }
 
-            //Set markup lines and tax lines as taxable.
-            //900510 is a mark up. 900510 is a discount.
-            if (jl.db_ref === "900510") {
-                estData.joblines.data[index].tax_part = true;
-            }
-        });
-    }
-}
-
-async function ResolveCCCLineIssues(estData, bodyshop) {
-    //Find all misc amounts, populate them to the act price.
-    //TODO Ensure that this doesnt get violated
-    //This needs to be done before cleansing unq_seq since some misc prices could move over.
-    estData.joblines.data.forEach((line) => {
-        if (line.misc_amt && line.misc_amt !== 0) {
-            line.act_price = line.act_price + line.misc_amt;
-            line.tax_part = !!line.misc_tax;
+        //Set markup lines and tax lines as taxable.
+        //900510 is a mark up. 900510 is a discount.
+        if (jl.db_ref === "900510") {
+            estData.joblines.data[index].tax_part = true;
         }
     });
-
-    //Generate the list of duplicated UNQ_SEQ that will feed into the next section to scrub the lines.
-    const unqSeqHash = _.groupBy(estData.joblines.data, "unq_seq");
-    const duplicatedUnqSeq = Object.keys(unqSeqHash).filter(
-        (key) => unqSeqHash[key].length > 1
-    );
-
-    duplicatedUnqSeq.forEach((unq_seq) => {
-        //Keys are strings, convert to int.
-        const int_unq_seq = parseInt(unq_seq);
-
-        //When line splitting, the first line is always the non-refinish line. We will keep it as is.
-        //We will cleanse the second line, which is always the next line.
-        const nonRefLineIndex = estData.joblines.data.findIndex(
-            (line) => line.unq_seq === int_unq_seq
-        );
-        estData.joblines.data[nonRefLineIndex + 1] = {
-            ...estData.joblines.data[nonRefLineIndex + 1],
-            part_type: null,
-            act_price: 0,
-            db_price: 0,
-            prt_dsmk_p: 0,
-            prt_dsmk_m: 0,
-        };
-    });
+    //}
 }

client/src/components/jobs-change-status/jobs-change-status.component.jsx

@@ -16,8 +16,8 @@ const mapStateToProps = createStructuredSelector({
     jobRO: selectJobReadOnly,
 });
 const mapDispatchToProps = (dispatch) => ({
-    insertAuditTrail: ({jobid, operation}) =>
-        dispatch(insertAuditTrail({jobid, operation})),
+    insertAuditTrail: ({jobid, operation, type}) =>
+        dispatch(insertAuditTrail({jobid, operation, type })),
 });
 
 export function JobsChangeStatus({job, bodyshop, jobRO, insertAuditTrail}) {
@@ -35,7 +35,7 @@ export function JobsChangeStatus({job, bodyshop, jobRO, insertAuditTrail}) {
                 insertAuditTrail({
                     jobid: job.id,
                     operation: AuditTrailMapping.jobstatuschange(status),
-                });
+                type: "jobstatuschange",});
                 // refetch();
             })
             .catch((error) => {

client/src/components/jobs-close-auto-allocate/jobs-close-auto-allocate.component.jsx

@@ -37,8 +37,6 @@ export function JobsCloseAutoAllocate({bodyshop, joblines, form, disabled}) {
                         ret.profitcenter_part = defaults.profits["MAPA"];
                     } else if (lineDesc.includes("ats amount")) {
                         ret.profitcenter_part = defaults.profits["ATS"];
-                    } else if (jl.act_price > 0) {
-                        ret.profitcenter_part = defaults.profits["PAO"];
                     } else {
                         ret.profitcenter_part = null;
                     }

client/src/components/jobs-close-export-button/jobs-close-export-button.component.jsx

@@ -9,7 +9,12 @@ import {createStructuredSelector} from "reselect";
 import {auth, logImEXEvent} from "../../firebase/firebase.utils";
 import {INSERT_EXPORT_LOG} from "../../graphql/accounting.queries";
 import {UPDATE_JOB} from "../../graphql/jobs.queries";
-import {selectBodyshop, selectCurrentUser,} from "../../redux/user/user.selectors";
+import { insertAuditTrail } from "../../redux/application/application.actions";
+import {
+    selectBodyshop,
+    selectCurrentUser,
+} from "../../redux/user/user.selectors";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import client from "../../utils/GraphQLClient";
 
 const mapStateToProps = createStructuredSelector({
@@ -17,6 +22,11 @@ const mapStateToProps = createStructuredSelector({
     currentUser: selectCurrentUser,
 });
 
+const mapDispatchToProps = (dispatch) => ({
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(insertAuditTrail({ jobid, operation, type })),
+});
+
 function updateJobCache(items) {
     client.cache.modify({
         id: "ROOT_QUERY",
@@ -37,9 +47,10 @@ export function JobsCloseExportButton({
                                           disabled,
                                           setSelectedJobs,
                                           refetch,
+                                          insertAuditTrail,
                                       }) {
     const history = useNavigate();
-    const {t} = useTranslation();
+    const { t } = useTranslation();
     const [updateJob] = useMutation(UPDATE_JOB);
     const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
     const [loading, setLoading] = useState(false);
@@ -178,6 +189,10 @@ export function JobsCloseExportButton({
                         key: "jobsuccessexport",
                         message: t("jobs.successes.exported"),
                     });
+                    insertAuditTrail({
+                        jobid: jobId,
+                        operation: AuditTrailMapping.jobexported(),
+                    type: "jobexported",});
                     updateJobCache(
                         jobUpdateResponse.data.update_jobs.returning.map((job) => job.id)
                     );
@@ -189,12 +204,20 @@ export function JobsCloseExportButton({
                     });
                 }
             }
-            if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && successfulTransactions.length > 0) {
+            if (
+                bodyshop.accountingconfig &&
+                bodyshop.accountingconfig.qbo &&
+                successfulTransactions.length > 0
+            ) {
                 notification.open({
                     type: "success",
                     key: "jobsuccessexport",
                     message: t("jobs.successes.exported"),
                 });
+                insertAuditTrail({
+                    jobid: jobId,
+                    operation: AuditTrailMapping.jobexported(),type: "jobexported",
+                });
                 updateJobCache([
                     ...new Set(
                         successfulTransactions.map(
@@ -224,4 +247,7 @@ export function JobsCloseExportButton({
     );
 }
 
-export default connect(mapStateToProps, null)(JobsCloseExportButton);
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(JobsCloseExportButton);

client/src/components/jobs-convert-button/jobs-convert-button.component.jsx

@@ -17,8 +17,8 @@ const mapStateToProps = createStructuredSelector({
     jobRO: selectJobReadOnly,
 });
 const mapDispatchToProps = (dispatch) => ({
-    insertAuditTrail: ({jobid, operation}) =>
-        dispatch(insertAuditTrail({jobid, operation})),
+    insertAuditTrail: ({jobid, operation, type}) =>
+        dispatch(insertAuditTrail({jobid, operation, type })),
 });
 
 export function JobsConvertButton({
@@ -70,7 +70,8 @@ export function JobsConvertButton({
                 operation: AuditTrailMapping.jobconverted(
                     res.data.update_jobs.returning[0].ro_number
                 ),
-            });
+            type: "jobconverted",
+      });
 
             setOpen(false);
         }

client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx

@@ -1,4 +1,4 @@
-import {Collapse, Form, Input, Select, Switch} from "antd";
+import {Collapse, Form, Input, InputNumber, Select, Switch} from "antd";
 import React from "react";
 import {useTranslation} from "react-i18next";
 import {connect} from "react-redux";
@@ -10,12 +10,6 @@ import FormItemEmail from "../form-items-formatted/email-form-item.component";
 import FormItemPhone, {PhoneItemFormatterValidation,} from "../form-items-formatted/phone-form-item.component";
 import JobsDetailRatesChangeButton from "../jobs-detail-rates-change-button/jobs-detail-rates-change-button.component";
 import JobsDetailRatesParts from "../jobs-detail-rates/jobs-detail-rates.parts.component";
-
-import JobsDetailRatesLabor from "../jobs-detail-rates/jobs-detail-rates.labor.component";
-import JobsDetailRatesMaterials from "../jobs-detail-rates/jobs-detail-rates.materials.component";
-import JobsDetailRatesOther from "../jobs-detail-rates/jobs-detail-rates.other.component";
-import JobsDetailRatesTaxes from "../jobs-detail-rates/jobs-detail-rates.taxes.component";
-
 import JobsMarkPstExempt from "../jobs-mark-pst-exempt/jobs-mark-pst-exempt.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 
@@ -263,28 +257,26 @@ export function JobsCreateJobsInfo({bodyshop, form, selected}) {
                             <CurrencyInput/>
                         </Form.Item>
                     </LayoutFormRow>
-                    {
-                        // <LayoutFormRow>
-                        //   <Form.Item
-                        //     label={t("jobs.fields.federal_tax_rate")}
-                        //     name="federal_tax_rate"
-                        //   >
-                        //     <InputNumber min={0} max={1} precision={2} />
-                        //   </Form.Item>
-                        //   <Form.Item
-                        //     label={t("jobs.fields.state_tax_rate")}
-                        //     name="state_tax_rate"
-                        //   >
-                        //     <InputNumber min={0} max={1} precision={2} />
-                        //   </Form.Item>
-                        //   <Form.Item
-                        //     label={t("jobs.fields.local_tax_rate")}
-                        //     name="local_tax_rate"
-                        //   >
-                        //     <InputNumber min={0} max={1} precision={2} />
-                        //   </Form.Item>
-                        // </LayoutFormRow>
-                    }
+                    <LayoutFormRow>
+                        <Form.Item
+                            label={t("jobs.fields.federal_tax_rate")}
+                            name="federal_tax_rate"
+                        >
+                            <InputNumber min={0} max={1} precision={2}/>
+                        </Form.Item>
+                        <Form.Item
+                            label={t("jobs.fields.state_tax_rate")}
+                            name="state_tax_rate"
+                        >
+                            <InputNumber min={0} max={1} precision={2}/>
+                        </Form.Item>
+                        <Form.Item
+                            label={t("jobs.fields.local_tax_rate")}
+                            name="local_tax_rate"
+                        >
+                            <InputNumber min={0} max={1} precision={2}/>
+                        </Form.Item>
+                    </LayoutFormRow>
                     <LayoutFormRow>
                         <Form.Item label={t("jobs.fields.rate_lab")} name="rate_lab">
                             <CurrencyInput/>
@@ -363,10 +355,6 @@ export function JobsCreateJobsInfo({bodyshop, form, selected}) {
                 required={selected && true}
                 form={form}
             />
-            <JobsDetailRatesLabor form={form}/>
-            <JobsDetailRatesMaterials form={form}/>
-            <JobsDetailRatesOther form={form}/>
-            <JobsDetailRatesTaxes form={form}/>
         </div>
     );
 }

client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.addtoproduction.util.jsx

@@ -29,6 +29,7 @@ export default function AddToProduction(
                 insertAuditTrail({
                     jobid: jobId,
                     operation: AuditTrailMapping.jobinproductionchange(!remove),
+                    type: "jobinproductionchange",
                 })
             );
             if (completionCallback) completionCallback();
@@ -40,7 +41,4 @@ export default function AddToProduction(
                 }),
             });
         });
-
-    //insert the new job. call the callback with the returned ID when done.
-
 }

client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx

@@ -48,10 +48,8 @@ const mapDispatchToProps = (dispatch) => ({
         dispatch(setModalContext({context: context, modal: "timeTicket"})),
     setCardPaymentContext: (context) =>
         dispatch(setModalContext({context: context, modal: "cardPayment"})),
-    insertAuditTrail: ({jobid, operation}) =>
-        dispatch(insertAuditTrail({jobid, operation})),
-    setTimeTicketTaskContext: (context) =>
-        dispatch(setModalContext({context: context, modal: "timeTicketTask"})),
+    insertAuditTrail: ({ jobid, operation, type }) =>
+        dispatch(insertAuditTrail({ jobid, operation, type })),
     setEmailOptions: (e) => dispatch(setEmailOptions(e)),
     openChatByPhone: (phone) => dispatch(openChatByPhone(phone)),
     setMessage: (text) => dispatch(setMessage(text)),
@@ -72,8 +70,7 @@ export function JobsDetailHeaderActions({
                                             insertAuditTrail,
                                             setEmailOptions,
                                             openChatByPhone,
-                                            setMessage,
-                                            setTimeTicketTaskContext,
+                                            setMessage
                                         }) {
     const {t} = useTranslation();
     const client = useApolloClient();
@@ -240,6 +237,11 @@ export function JobsDetailHeaderActions({
                             message: JSON.stringify(result.errors),
                         }),
                     });
+                    insertAuditTrail({
+                        jobid: job.id,
+                        operation: AuditTrailMapping.jobvoid(),
+                        type: "jobvoid",
+                    });
                     return;
                 }
                 if (e.key === "email")
@@ -354,6 +356,11 @@ export function JobsDetailHeaderActions({
             notification["success"]({
                 message: t("jobs.successes.voided"),
             });
+            insertAuditTrail({
+                jobid: job.id,
+                operation: AuditTrailMapping.jobvoid(),
+                type: "jobvoid",
+            });
             //go back to jobs list.
             history(`/manage/`);
         } else {
@@ -470,9 +477,29 @@ export function JobsDetailHeaderActions({
                     ? !job.production_vars.alert
                     : true
             ),
+            type: "alertToggle",
         });
     };
 
+  const handleSuspend = (e) => {
+    logImEXEvent("production_toggle_alert");
+    //e.stopPropagation();
+    updateJob({
+      variables: {
+        jobId: job.id,
+        job: {
+          suspended: !job.suspended,
+        },
+      },
+    });
+    insertAuditTrail({
+      jobid: job.id,
+      operation: AuditTrailMapping.jobsuspend(
+        !!job.suspended ? !job.suspended : true
+      ),
+      type: "jobsuspend",
+    });
+  };
 
     // Function to handle OK
     const handleCancelScheduleOK = async () => {
@@ -502,24 +529,12 @@ export function JobsDetailHeaderActions({
                 jobid: job.id,
                 operation:
                     AuditTrailMapping.appointmentcancel(lost_sale_reason),
+                type: "appointmentcancel",
             });
 
         }
     };
 
-    const handleSuspend = (e) => {
-        logImEXEvent("production_toggle_alert");
-        //e.stopPropagation();
-        updateJob({
-            variables: {
-                jobId: job.id,
-                job: {
-                    suspended: !job.suspended,
-                },
-            },
-        });
-    };
-
     const popOverContent = (
         <Card>
             <div>
@@ -681,23 +696,7 @@ export function JobsDetailHeaderActions({
                     },
                 });
             }
-        }];
-
-    if (bodyshop.md_tasks_presets.enable_tasks) {
-        menuItems.push({
-            key: 'claimtimetickettasks',
-            disabled: !job.converted || (!bodyshop.tt_allow_post_to_invoiced && job.date_invoiced),
-            onClick: () => {
-                setTimeTicketTaskContext({
-                    actions: {},
-                    context: {jobid: job.id},
-                });
-            },
-            label: t("timetickets.actions.claimtasks")
-        });
-    }
-
-    menuItems.push(
+        },
         {
             key: 'enterpayments',
             disabled: !job.converted,
@@ -710,7 +709,7 @@ export function JobsDetailHeaderActions({
                     context: {jobid: job.id},
                 });
             }
-        });
+        }];
 
     if (ImEXPay.treatment === "on") {
         menuItems.push({

client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.duplicate.util.js

@@ -59,6 +59,7 @@ export default async function DuplicateJob(
 
     //insert the new job. call the callback with the returned ID when done.
 
+    return;
 }
 
 export async function CreateIouForJob(

client/src/components/jobs-detail-header/jobs-detail-header.component.jsx

@@ -1,5 +1,5 @@
 import {BranchesOutlined, ExclamationCircleFilled, PauseCircleOutlined, WarningFilled,} from "@ant-design/icons";
-import {Card, Col, Row, Space, Tag, Tooltip} from "antd";
+import {Card, Col, Divider, Row, Space, Tag, Tooltip} from "antd";
 import React, {useState} from "react";
 import {useTranslation} from "react-i18next";
 import {connect} from "react-redux";
@@ -22,6 +22,7 @@ import ProductionListColumnProductionNote
     from "../production-list-columns/production-list-columns.productionnote.component";
 import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component";
 import "./jobs-detail-header.styles.scss";
+import dayjs from "../../utils/day";
 
 const mapStateToProps = createStructuredSelector({
     jobRO: selectJobReadOnly,
@@ -58,6 +59,13 @@ export function JobsDetailHeader({job, bodyshop, disabled}) {
   ${job.v_make_desc || ""} 
   ${job.v_model_desc || ""}`.trim();
 
+    const bodyHrs = job.joblines
+        .filter((j) => j.mod_lbr_ty !== "LAR")
+        .reduce((acc, val) => acc + val.mod_lb_hrs, 0);
+    const refinishHrs = job.joblines
+        .filter((line) => line.mod_lbr_ty === "LAR")
+        .reduce((acc, val) => acc + val.mod_lb_hrs, 0);
+
     const ownerTitle = OwnerNameDisplayFunction(job).trim();
 
     return (
@@ -89,7 +97,9 @@ export function JobsDetailHeader({job, bodyshop, disabled}) {
                                 {job.status === bodyshop.md_ro_statuses.default_scheduled &&
                                 job.scheduled_in ? (
                                     <Tag>
-                                        <DateTimeFormatter>{job.scheduled_in}</DateTimeFormatter>
+                                        <Link to={`/manage/schedule?date=${dayjs(job.scheduled_in).format('YYYY-MM-DD')}`}>
+                                            <DateTimeFormatter>{job.scheduled_in}</DateTimeFormatter>
+                                        </Link>
                                     </Tag>
                                 ) : null}
                             </Space>
@@ -119,11 +129,14 @@ export function JobsDetailHeader({job, bodyshop, disabled}) {
                         </DataLabel>
                         {job?.cccontracts?.length > 0 && (
                             <DataLabel label={t("jobs.labels.contracts")}>
-                                {job.cccontracts.map((c) => (
+                                {job.cccontracts.map((c, index) => (
+                                    <Space wrap>
                                     <Link
                                         key={c.id}
                                         to={`/manage/courtesycars/contracts/${c.id}`}
-                                    >{`${c.agreementnumber} - ${c.courtesycar.fleetnumber} ${c.courtesycar.year} ${c.courtesycar.make} ${c.courtesycar.model}`}</Link>
+                                    >{`${c.agreementnumber} - ${c.courtesycar.fleetnumber} ${c.courtesycar.year} ${c.courtesycar.make} ${c.courtesycar.model}`}{index !== job.cccontracts.length - 1 ? "," : null}
+                                    </Link>
+                                    </Space>
                                 ))}
                             </DataLabel>
                         )}
@@ -132,7 +145,7 @@ export function JobsDetailHeader({job, bodyshop, disabled}) {
                             <ProductionListColumnProductionNote record={job}/>
                         </DataLabel>
 
-                        <Space>
+                        <Space wrap>
                             {job.special_coverage_policy && (
                                 <Tag color="tomato">
                                     <Space>
@@ -292,6 +305,11 @@ export function JobsDetailHeader({job, bodyshop, disabled}) {
                 >
                     <div>
                         <JobEmployeeAssignments job={job}/>
+                        <Divider style={{ margin: ".5rem" }} />
+                        <DataLabel label={t("jobs.labels.labor_hrs")}>
+                            {bodyHrs.toFixed(1)} / {refinishHrs.toFixed(1)} /{" "}
+                            {(bodyHrs + refinishHrs).toFixed(1)}
+                        </DataLabel>
                     </div>
                 </Card>
             </Col>

client/src/components/jobs-detail-labor/jobs-detail-labor.component.jsx

@@ -5,13 +5,9 @@ import {createStructuredSelector} from "reselect";
 import {selectJobReadOnly} from "../../redux/application/application.selectors";
 import LaborAllocationsTableComponent from "../labor-allocations-table/labor-allocations-table.component";
 import TimeTicketList from "../time-ticket-list/time-ticket-list.component";
-import PayrollLaborAllocationsTable from "../labor-allocations-table/labor-allocations-table.payroll.component";
-import {selectBodyshop} from "../../redux/user/user.selectors";
-import {useSplitTreatments} from "@splitsoftware/splitio-react";
 
 const mapStateToProps = createStructuredSelector({
     jobRO: selectJobReadOnly,
-    bodyshop: selectBodyshop,
 });
 
 export default connect(mapStateToProps, null)(JobsDetailLaborContainer);
@@ -52,7 +48,6 @@ const adjSpan = {
 };
 
 export function JobsDetailLaborContainer({
-                                             bodyshop,
                                              jobRO,
                                              job,
                                              jobId,
@@ -63,13 +58,6 @@ export function JobsDetailLaborContainer({
                                              techConsole,
                                              adjustments,
                                          }) {
-    const {treatments: {Enhanced_Payroll}} = useSplitTreatments({
-        attributes: {},
-        names: ["Enhanced_Payroll"],
-        splitKey: bodyshop.imexshopid,
-    });
-
-
     return (
         <Row gutter={[16, 16]}>
             <Col {...ticketSpan}>
@@ -82,28 +70,14 @@ export function JobsDetailLaborContainer({
                     jobId={jobId}
                 />
             </Col>
-
-            {Enhanced_Payroll.treatment === "on" ? (
-                <Col {...adjSpan}>
-                    <PayrollLaborAllocationsTable
-                        jobId={jobId}
-                        joblines={joblines}
-                        timetickets={timetickets}
-                        refetch={refetch}
-                        adjustments={adjustments}
-                    />
-                </Col>
-            ) : (
-                <Col {...adjSpan}>
-                    <LaborAllocationsTableComponent
-                        jobId={jobId}
-                        joblines={joblines}
-                        timetickets={timetickets}
-                        refetch={refetch}
-                        adjustments={adjustments}
-                    />
-                </Col>
-            )}
+            <Col {...adjSpan}>
+                <LaborAllocationsTableComponent
+                    jobId={jobId}
+                    joblines={joblines}
+                    timetickets={timetickets}
+                    adjustments={adjustments}
+                />
+            </Col>
         </Row>
     );
 }

client/src/components/jobs-detail-pli/jobs-detail-pli.component.jsx

@@ -6,14 +6,12 @@ import BillsListTable from "../bills-list-table/bills-list-table.component";
 import JobBillsTotal from "../job-bills-total/job-bills-total.component";
 import PartsOrderListTableComponent from "../parts-order-list-table/parts-order-list-table.component";
 import PartsOrderModal from "../parts-order-modal/parts-order-modal.container";
-import PartsDispatchTable from "../parts-dispatch-table/parts-dispatch-table.component";
 
 export default function JobsDetailPliComponent({
                                                    job,
                                                    billsQuery,
                                                    handleBillOnRowClick,
                                                    handlePartsOrderOnRowClick,
-                                                   handlePartsDispatchOnRowClick,
                                                }) {
     return (
         <div>
@@ -45,13 +43,6 @@ export default function JobsDetailPliComponent({
                         billsQuery={billsQuery}
                     />
                 </Col>
-                <Col span={24}>
-                    <PartsDispatchTable
-                        job={job}
-                        handleOnRowClick={handlePartsDispatchOnRowClick}
-                        billsQuery={billsQuery}
-                    />
-                </Col>
             </Row>
         </div>
     );

client/src/components/jobs-detail-pli/jobs-detail-pli.container.jsx

@@ -39,24 +39,12 @@ export default function JobsDetailPliContainer({job}) {
         }
     };
 
-    const handlePartsDispatchOnRowClick = (record) => {
-        if (record) {
-            if (record.id) {
-                search.partsdispatchid = record.id;
-                history.push({search: queryString.stringify(search)});
-            }
-        } else {
-            delete search.partsdispatchid;
-            history.push({search: queryString.stringify(search)});
-        }
-    };
     return (
         <JobsDetailPliComponent
             job={job}
             billsQuery={billsQuery}
             handleBillOnRowClick={handleBillOnRowClick}
             handlePartsOrderOnRowClick={handlePartsOrderOnRowClick}
-            handlePartsDispatchOnRowClick={handlePartsDispatchOnRowClick}
         />
     );
 }