Merge branch 'feature/IO-1828-Front-End-Package-Updates' into feature/IO-2456-Customized-Report-Filtering

Signed-off-by: Dave Richer <dave@imexsystems.ca>

.editorconfig

@@ -0,0 +1,18 @@
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 4
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.yml]
+indent_size = 2
+
+[*.json]
+indent_size = 2

.prettierrc.js

@@ -1,16 +0,0 @@
-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

@@ -1,316 +0,0 @@
-## 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

@@ -3,15 +3,6 @@
 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
@@ -45,42 +36,6 @@ const schema = {
 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",`
@@ -116,8 +71,8 @@ query gendoc_hours_sold_detail_open($starttz: timestamptz!, $endtz: timestamptz!
 }
 ```
 
-### Path with brackets,top level
 
+### 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.
 
@@ -152,38 +107,14 @@ query gendoc_hours_sold_detail_open($starttz: timestamptz!, $endtz: timestamptz!
 ```
 
 ## 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.
+- 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 `dates` object is not yet implemented and will be added in a future release.
+- The type object must be 'string' or 'number' 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 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"
-    }
-}
-```
+- 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.

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.2.1",
+    "@reduxjs/toolkit": "^2.2.0",
     "@sentry/cli": "^2.28.6",
-    "@sentry/react": "^7.104.0",
-    "@sentry/tracing": "^7.104.0",
+    "@sentry/react": "^7.101.0",
+    "@sentry/tracing": "^7.101.0",
     "@splitsoftware/splitio-react": "^1.11.0",
     "@tanem/react-nprogress": "^5.0.51",
-    "antd": "^5.14.2",
+    "antd": "^5.14.1",
     "apollo-link-logger": "^2.0.1",
     "apollo-link-sentry": "^3.3.0",
     "axios": "^1.6.7",
@@ -25,30 +25,30 @@
     "dayjs": "^1.11.10",
     "dayjs-business-days2": "^1.2.2",
     "dinero.js": "^1.9.1",
-    "dotenv": "^16.4.5",
+    "dotenv": "^16.4.4",
     "enquire-js": "^0.2.1",
     "env-cmd": "^10.1.0",
     "exifr": "^7.1.3",
-    "firebase": "^10.8.1",
+    "firebase": "^10.8.0",
     "graphql": "^16.6.0",
-    "i18next": "^23.10.0",
+    "i18next": "^23.8.2",
     "i18next-browser-languagedetector": "^7.0.2",
     "jsoneditor": "^10.0.1",
     "jsreport-browser-client-dist": "^1.3.0",
-    "libphonenumber-js": "^1.10.57",
+    "libphonenumber-js": "^1.10.55",
     "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": "^9.0.0",
+    "query-string": "^8.2.0",
     "rc-queue-anim": "^2.0.0",
     "rc-scroll-anim": "^2.7.6",
     "react": "^18.2.0",
-    "react-big-calendar": "^1.11.0",
+    "react-big-calendar": "^1.10.1",
     "react-color": "^2.19.3",
-    "react-cookie": "^7.1.0",
+    "react-cookie": "^7.0.2",
     "react-dom": "^18.2.0",
     "react-drag-listview": "^2.0.0",
     "react-grid-gallery": "^1.0.0",
@@ -56,23 +56,23 @@
     "react-i18next": "^14.0.5",
     "react-icons": "^5.0.1",
     "react-image-lightbox": "^5.1.4",
-    "react-intersection-observer": "^9.8.1",
+    "react-intersection-observer": "^9.8.0",
     "react-markdown": "^9.0.1",
-    "react-number-format": "^5.3.3",
+    "react-number-format": "^5.1.4",
     "react-redux": "^9.1.0",
     "react-resizable": "^3.0.5",
-    "react-router-dom": "^6.22.2",
+    "react-router-dom": "^6.22.0",
     "react-scripts": "^5.0.1",
     "react-sticky": "^6.0.3",
     "react-sublime-video": "^0.2.5",
     "react-virtualized": "^9.22.5",
-    "recharts": "^2.12.2",
+    "recharts": "^2.12.0",
     "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.71.1",
+    "sass": "^1.70.0",
     "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": "^3.1.1"
+    "yauzl": "^2.10.0"
   },
   "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.2",
+    "@sentry/webpack-plugin": "^2.14.0",
     "@testing-library/cypress": "^10.0.1",
-    "cypress": "^13.6.6",
+    "cypress": "^13.6.4",
     "eslint-plugin-cypress": "^2.15.1",
     "react-error-overlay": "6.0.11",
     "redux-logger": "^3.0.6",

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

@@ -1,20 +1,21 @@
-import {Card, Checkbox, Input, Space, Table} from "antd";import queryString from "query-string";
+import {Card, Checkbox, Input, Space, Table} from "antd";
 import React, {useState} from "react";
 import {useTranslation} from "react-i18next";
-import {connect } from "react-redux";
 import {Link} from "react-router-dom";
-import { createStructuredSelector } from "reselect";
-import {logImEXEvent} from "../../firebase/firebase.utils";
-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 PayableExportAll from "../payable-export-all-button/payable-export-all-button.component";
+import {DateFormatter} from "../../utils/DateFormatter";
+import queryString from "query-string";
+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 ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
+import BillMarkSelectedExported from "../payable-mark-selected-exported/payable-mark-selected-exported.component";
+import {pageLimit} from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
     bodyshop: selectBodyshop,
@@ -146,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) => (
                 <PayableExportButton

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

@@ -8,16 +8,14 @@ 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, {
-  OwnerNameDisplayFunction,
-} from "../owner-name-display/owner-name-display.component";
+import OwnerNameDisplay 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,
@@ -77,11 +75,7 @@ export function AccountingPayablesTableComponent({
             dataIndex: "owner",
             key: "owner",
             ellipsis: true,
-            sorter: (a, b) =>
-        alphaSort(
-          OwnerNameDisplayFunction(a.job),
-          OwnerNameDisplayFunction(b.job)
-        ),
+            sorter: (a, b) => alphaSort(a.job.ownr_ln, b.job.ownr_ln),
             sortOrder:
                 state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
             render: (text, record) => {
@@ -100,9 +94,7 @@ export function AccountingPayablesTableComponent({
             title: t("payments.fields.amount"),
             dataIndex: "amount",
             key: "amount",
-            sorter: (a, b) => a.amount - b.amount,
-      sortOrder:
-        state.sortedInfo.columnKey === "amount" && state.sortedInfo.order,render: (text, record) => (
+            render: (text, record) => (
                 <CurrencyFormatter>{record.amount}</CurrencyFormatter>
             ),
         },
@@ -119,21 +111,19 @@ export function AccountingPayablesTableComponent({
         {
             title: t("payments.fields.created_at"),
             dataIndex: "created_at",
-            key: "created_at",sorter: (a, b) => dateSort(a.created_at, b.created_at),
-      sortOrder:
-        state.sortedInfo.columnKey === "created_at" && state.sortedInfo.order,
+            key: "created_at",
             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",
@@ -147,7 +137,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,19 +4,17 @@ 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, statusSort } from "../../utils/sorters";
+import {alphaSort, dateSort} 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 {DateFormatter} from "../../utils/DateFormatter";
-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";
+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";
 
 const mapStateToProps = createStructuredSelector({
     bodyshop: selectBodyshop,
@@ -65,7 +63,7 @@ export function AccountingReceivablesTableComponent({
             title: t("jobs.fields.status"),
             dataIndex: "status",
             key: "status",
-            sorter: (a, b) => statusSort(a, b, bodyshop.md_ro_statuses.statuses),
+            sorter: (a, b) => a.status - b.status,
             sortOrder:
                 state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
         },
@@ -85,8 +83,7 @@ export function AccountingReceivablesTableComponent({
             title: t("jobs.fields.owner"),
             dataIndex: "owner",
             key: "owner",
-            sorter: (a, b) =>
-        alphaSort(OwnerNameDisplayFunction(a), OwnerNameDisplayFunction(b)),
+            sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
             sortOrder:
                 state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
             render: (text, record) => {
@@ -106,15 +103,7 @@ export function AccountingReceivablesTableComponent({
             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) => {
+            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,22 +5,10 @@ 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";
 
-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 }) {
+export default function BillDeleteButton({bill, callback}) {
     const [loading, setLoading] = useState(false);
-    const { t } = useTranslation();
+    const {t} = useTranslation();
     const [deleteBill] = useMutation(DELETE_BILL);
 
     const handleDelete = async () => {
@@ -47,12 +35,7 @@ export function BillDeleteButton({ bill, jobid, callback, insertAuditTrail }) {
         });
 
         if (!!!result.errors) {
-            notification["success"]({ message: t("bills.successes.deleted") });
-            insertAuditTrail({
-                jobid: jobid,
-                operation: AuditTrailMapping.billdeleted(bill.invoice_number),
-            type: "billdeleted",
-      });
+            notification["success"]({message: t("bills.successes.deleted")});
 
             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, type}) =>
-        dispatch(insertAuditTrail({jobid, operation, type })),
+    insertAuditTrail: ({jobid, operation}) =>
+        dispatch(insertAuditTrail({jobid, operation})),
 });
 
 export default connect(
@@ -145,8 +145,7 @@ 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, type}) =>
-        dispatch(insertAuditTrail({jobid, operation, type })),
+    insertAuditTrail: ({jobid, operation}) =>
+        dispatch(insertAuditTrail({jobid, operation})),
 });
 
 export default connect(

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

@@ -31,8 +31,8 @@ const mapStateToProps = createStructuredSelector({
 });
 const mapDispatchToProps = (dispatch) => ({
     toggleModalVisible: () => dispatch(toggleModalVisible("billEnter")),
-    insertAuditTrail: ({jobid, billid, operation, type}) =>
-        dispatch(insertAuditTrail({jobid, billid, operation, type })),
+    insertAuditTrail: ({jobid, billid, operation}) =>
+        dispatch(insertAuditTrail({jobid, billid, operation})),
 });
 
 const Templates = TemplateList("job_special");
@@ -165,7 +165,7 @@ function BillEnterModalContainer({
                         mod_lbr_ty: key,
                         hours: adjustmentsToInsert[key].toFixed(1),
                     }),
-                type: "jobmodifylbradj",});
+                });
             });
 
             const jobUpdate = client.mutate({
@@ -314,8 +314,7 @@ function BillEnterModalContainer({
             operation: AuditTrailMapping.billposted(
                 r1.data.insert_bills.returning[0].invoice_number
             ),
-        type: "billposted",
-    });
+        });
 
         if (enterAgain) {
             form.resetFields();

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} jobid={job.id} />
+            <BillDeleteButton bill={record}/>
             <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, type}) =>
-        dispatch(insertAuditTrail({jobid, operation, type})),
+    insertAuditTrail: ({jobid, operation}) =>
+        dispatch(insertAuditTrail({jobid, operation})),
     toggleModalVisible: () => dispatch(toggleModalVisible("cardPayment")),
 });
 
@@ -88,7 +88,7 @@ const CardPaymentModalComponent = ({
                 insertAuditTrail({
                     jobid: payment.jobid,
                     operation: AuditTrailMapping.failedpayment(),
-                type: "failedpayment",})
+                })
             );
         });
     };

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

@@ -66,30 +66,7 @@ export default function ContractFormComponent({
                         <FormDateTimePicker/>
                     </Form.Item>
                 )}
-                {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>
             <LayoutFormRow grow>
                 <Form.Item
                     label={t("contracts.fields.kmstart")}
@@ -111,17 +88,16 @@ export default function ContractFormComponent({
                     >
                         {() => {
                             const mileageOver =
-                                selectedCar && selectedCar.nextservicekm
-                                    ? selectedCar.nextservicekm <= form.getFieldValue("kmstart")
-                                    : false;
+                                selectedCar &&
+                                selectedCar.nextservicekm <= form.getFieldValue("kmstart");
+
                             const dueForService =
                                 selectedCar &&
                                 selectedCar.nextservicedate &&
-                                dayjs(selectedCar.nextservicedate)
-                                    .endOf("day")
-                                    .isSameOrBefore(
+                                dayjs(selectedCar.nextservicedate).isBefore(
                                     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,34 +1,22 @@
-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 useLocalStorage from "../../utils/useLocalStorage";
-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 {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 [filter, setFilter] = useLocalStorage(
-        "filter_courtesy_cars_list",
-        null
-    );
-    const { t } = useTranslation();
+    const {t} = useTranslation();
 
     const columns = [
         {
@@ -54,7 +42,6 @@ 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"),
@@ -77,34 +64,19 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
             sortOrder:
                 state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
             render: (text, record) => {
-                const { nextservicedate, nextservicekm, mileage, insuranceexpires } =
-                    record;
+                const {nextservicedate, nextservicekm, mileage} = 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 || 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" }} />
+                        {(mileageOver || dueForService) && (
+                            <Tooltip title={t("contracts.labels.cardueforservice")}>
+                                <WarningFilled style={{color: "tomato"}}/>
                             </Tooltip>
                         )}
                     </Space>
@@ -116,7 +88,6 @@ 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"),
@@ -232,8 +203,7 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
     ];
 
     const handleTableChange = (pagination, filters, sorter) => {
-        setState({ ...state, sortedInfo: sorter });
-        setFilter(filters);
+        setState({...state, filteredInfo: filters, sortedInfo: sorter});
     };
 
     const tableData = searchText

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

@@ -1,169 +0,0 @@
-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,469 +1,221 @@
-import {
-  BranchesOutlined,
-  ExclamationCircleFilled,
-  PauseCircleOutlined,
-} from "@ant-design/icons";
-import { Card, Space, Switch, Table, Tooltip, Typography } from "antd";
+import {BranchesOutlined, ExclamationCircleFilled, PauseCircleOutlined,} from "@ant-design/icons";
+import {Card, 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 { TimeFormatter } from "../../../utils/DateFormatter";
-import { onlyUnique } from "../../../utils/arrayHelper";
-import { alphaSort, dateSort } from "../../../utils/sorters";
-import useLocalStorage from "../../../utils/useLocalStorage";
+import React, {useState} from "react";
+import {useTranslation} from "react-i18next";
+import {Link} from "react-router-dom";
 import ChatOpenButton from "../../chat-open-button/chat-open-button.component";
-import OwnerNameDisplay, {
-  OwnerNameDisplayFunction,
-} from "../../owner-name-display/owner-name-display.component";
+import OwnerNameDisplay 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: {},
-    filteredInfo: {},
-  });
+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} />;
 
-  const [isTvModeScheduledIn, setIsTvModeScheduledIn] = useLocalStorage(
-    "isTvModeScheduledIn",
-    false
-  );
+    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);
+    });
 
-  if (!data) return null;
-  if (!data.scheduled_in_today)
-    return <DashboardRefreshRequired {...cardProps} />;
-
-  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);
-  });
-
-  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()}
-        >
-          <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} />
+    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.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>
-      ),
-    },
-  ];
+                );
+            },
+        },
+        {
+            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"],
+        },
+    ];
 
-  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()}
+    const handleTableChange = (sorter) => {
+        setState({...state, sortedInfo: sorter});
+    };
+
+    return (
+        <Card
+            title={t("dashboard.titles.scheduledintoday", {
+                date: dayjs().startOf("day").format("MM/DD/YYYY"),
+            })}
+            {...cardProps}
         >
-          <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>
-  );
+            <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>
+    );
 }
 
 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,273 +1,37 @@
 import {BranchesOutlined, ExclamationCircleFilled, PauseCircleOutlined,} from "@ant-design/icons";
-import {Card, Space, Switch, Table, Tooltip, Typography} from "antd";
+import {Card, 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 {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, {OwnerNameDisplayFunction,} from "../../owner-name-display/owner-name-display.component";
+import OwnerNameDisplay 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 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;
+    const filteredScheduledOutToday = data.scheduled_out_today.map((item) => {
         return {
             ...item,
-            joblines_body,
-            joblines_ref,
-        };
-    });
-
-    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>
-            ),
-        },
-    ];
+            scheduled_completion: dayjs(item.scheduled_completion).format("hh:mm a"),
+            timestamp: dayjs(item.scheduled_completion).valueOf(),
+        }
+    }).sort((a, b) => a.timestamp - b.timestamp);
 
     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) => (
+            render: (text, record) => (
                 <Link
                     to={"/manage/jobs/" + record.jobid}
                     onClick={(e) => e.stopPropagation()}
@@ -294,10 +58,7 @@ export default function DashboardScheduledOutToday({data, ...cardProps}) {
             dataIndex: "owner",
             key: "owner",
             ellipsis: true,
-            sorter: (a, b) =>
-                alphaSort(OwnerNameDisplayFunction(a), OwnerNameDisplayFunction(b)),
-            sortOrder:
-                state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
+            responsive: ["md"],
             render: (text, record) => {
                 return record.ownerid ? (
                     <Link
@@ -314,16 +75,24 @@ export default function DashboardScheduledOutToday({data, ...cardProps}) {
             },
         },
         {
-            title: t("dashboard.labels.phone"),
-            dataIndex: "ownr_ph",
-            key: "ownr_ph",
+            title: t("jobs.fields.ownr_ph1"),
+            dataIndex: "ownr_ph1",
+            key: "ownr_ph1",
             ellipsis: true,
             responsive: ["md"],
-            render: (text, record) => (<Space size="small" wrap>
+            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}/>
-            </Space>),
+            ),
         },
         {
             title: t("jobs.fields.ownr_ea"),
@@ -332,7 +101,7 @@ export default function DashboardScheduledOutToday({data, ...cardProps}) {
             ellipsis: true,
             responsive: ["md"],
             render: (text, record) => (
-                <a href={`mailto:${record.ownr_ea}`}>{record.ownr_ea}</a>
+                <ChatOpenButton phone={record.ownr_ea} jobid={record.jobid}/>
             ),
         },
         {
@@ -340,15 +109,7 @@ export default function DashboardScheduledOutToday({data, ...cardProps}) {
             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) => {
+            render: (text, record) => {
                 return record.vehicleid ? (
                     <Link
                         to={"/manage/vehicles/" + record.vehicleid}
@@ -371,78 +132,43 @@ export default function DashboardScheduledOutToday({data, ...cardProps}) {
             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:
-                (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("jobs.fields.scheduled_completion"),
+            dataIndex: "scheduled_completion",
+            key: "scheduled_completion",
+            ellipsis: true,
+            responsive: ["md"],
         },
         {
             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),},
+            responsive: ["md"],
+        },
     ];
 
-    const handleTableChange = (pagination, filters, sorter) => {
-        setState({...state, filteredInfo: filters, sortedInfo: sorter});
+    const handleTableChange = (sorter) => {
+        setState({...state, sortedInfo: sorter});
     };
 
     return (
         <Card
-            title={t("dashboard.titles.scheduledoutdate", {
+            title={t("dashboard.titles.scheduledouttoday", {
                 date: dayjs().startOf("day").format("MM/DD/YYYY"),
             })}
-            extra={
-                <Space>
-                    <Typography.Text>{t("general.labels.tvmode")}</Typography.Text>
-                    <Switch
-                        onClick={() => setIsTvModeScheduledOut(!isTvModeScheduledOut)}
-                        defaultChecked={isTvModeScheduledOut}
-                    />
-                </Space>
-            }{...cardProps}
+            {...cardProps}
         >
             <div style={{height: "100%"}}>
                 <Table
                     onChange={handleTableChange}
-                    pagination={false}
-                    columns={isTvModeScheduledOut ? tvColumns : columns}
+                    pagination={{position: "top", defaultPageSize: pageLimit}}
+                    columns={columns}
                     scroll={{x: true, y: "calc(100% - 2em)"}}
                     rowKey="id"
                     style={{height: "85%"}}
-                    dataSource={scheduledOutToday}
-                    size={isTvModeScheduledOut ? "small" : "middle"}
+                    dataSource={filteredScheduledOutToday}
                 />
             </div>
         </Card>
@@ -459,10 +185,6 @@ 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
@@ -475,7 +197,6 @@ 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,9 +42,6 @@ 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";
 
@@ -263,7 +260,6 @@ 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,
@@ -274,31 +270,26 @@ const componentList = {
         h: 2,
     },
     ScheduleInToday: {
-        label: i18next.t("dashboard.titles.scheduledintoday"),
+        label: i18next.t("dashboard.titles.scheduledintoday", {
+            date: dayjs().startOf("day").format("MM/DD/YYYY"),
+        }),
         component: DashboardScheduledInToday,
         gqlFragment: DashboardScheduledInTodayGql,
-        minW: 6,
+        minW: 10,
         minH: 2,
         w: 10,
-        h: 3,
+        h: 2,
     },
     ScheduleOutToday: {
-        label: i18next.t("dashboard.titles.scheduledouttoday"),
+        label: i18next.t("dashboard.titles.scheduledouttoday", {
+            date: dayjs().startOf("day").format("MM/DD/YYYY"),
+        }),
         component: DashboardScheduledOutToday,
         gqlFragment: DashboardScheduledOutTodayGql,
-        minW: 6,
+        minW: 10,
         minH: 2,
         w: 10,
-        h: 3,
-    },
-    JobLifecycle: {
-        label: i18next.t("dashboard.titles.joblifecycle"),
-        component: JobLifecycleDashboardComponent,
-        gqlFragment: JobLifecycleDashboardGQL,
-        minW: 6,
-        minH: 3,
-        w: 6,
-        h: 3,
+        h: 2,
     },
 };
 
@@ -310,7 +301,8 @@ 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()
@@ -320,7 +312,7 @@ const createDashboardQuery = (state) => {
     .endOf("month")
     .endOf("day")
     .toISOString()}"}}]}) {
-      id
+    id
                 ro_number
                 date_invoiced
                 job_totals
@@ -384,5 +376,6 @@ const createDashboardQuery = (state) => {
                     }
                 }
                 }
-            }`;
+            }
+    `;
 };

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

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

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-checklist/components/job-checklist-form/job-checklist-form.component.jsx

@@ -28,8 +28,8 @@ const mapStateToProps = createStructuredSelector({
     currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
-    insertAuditTrail: ({jobid, operation, type}) =>
-        dispatch(insertAuditTrail({jobid, operation, type })),
+    insertAuditTrail: ({jobid, operation}) =>
+        dispatch(insertAuditTrail({jobid, operation})),
 });
 
 export function JobChecklistForm({
@@ -183,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-detail-cards/job-detail-cards.totals.component.jsx

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

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, type}) =>
-        dispatch(insertAuditTrail({jobid, operation, type })),
+    insertAuditTrail: ({jobid, operation}) =>
+        dispatch(insertAuditTrail({jobid, operation})),
 });
 export default connect(
     mapStateToProps,
@@ -47,8 +47,7 @@ export function JobEmployeeAssignmentsContainer({
         insertAuditTrail({
             jobid: job.id,
             operation: AuditTrailMapping.jobassignmentchange(operation, name),
-        type: "jobassignmentchange",
-    });
+        });
 
         if (!!result.errors) {
             notification["error"]({
@@ -78,7 +77,7 @@ export function JobEmployeeAssignmentsContainer({
         insertAuditTrail({
             jobid: job.id,
             operation: AuditTrailMapping.jobassignmentremoved(operation),
-        type: "jobassignmentremoved",});
+        });
         setLoading(false);
     };
 

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, type}) =>
-        dispatch(insertAuditTrail({jobid, operation, type })),
+    insertAuditTrail: ({jobid, operation}) =>
+        dispatch(insertAuditTrail({jobid, operation})),
 });
 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-scoreboard-add-button/job-scoreboard-add-button.component.jsx

@@ -42,7 +42,6 @@ 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;
@@ -170,7 +169,7 @@ export default function ScoreboardAddButton({
                     return acc + job.lbr_adjustments[val];
                 }, 0);
         form.setFieldsValue({
-            date: dayjs(),
+            date: new dayjs(),
             bodyhrs: Math.round(v.bodyhrs * 10) / 10,
             painthrs: Math.round(v.painthrs * 10) / 10,
         });

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, type}) =>
-        dispatch(insertAuditTrail({jobid, operation, type })),
+    insertAuditTrail: ({jobid, operation}) =>
+        dispatch(insertAuditTrail({jobid, operation})),
 });
 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, type}) =>
-        dispatch(insertAuditTrail({jobid, operation, type })),
+    insertAuditTrail: ({jobid, operation}) =>
+        dispatch(insertAuditTrail({jobid, operation})),
 });
 
 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

@@ -24,8 +24,8 @@ const mapStateToProps = createStructuredSelector({
     currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
-    insertAuditTrail: ({jobid, operation, type}) =>
-        dispatch(insertAuditTrail({jobid, operation, type })),
+    insertAuditTrail: ({jobid, operation}) =>
+        dispatch(insertAuditTrail({jobid, operation})),
 });
 export default connect(
     mapStateToProps,
@@ -60,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", {
@@ -100,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", {
@@ -125,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

@@ -10,8 +10,8 @@ import AuditTrailMapping from "../../utils/AuditTrailMappings";
 
 const mapStateToProps = createStructuredSelector({});
 const mapDispatchToProps = (dispatch) => ({
-    insertAuditTrail: ({jobid, operation, type}) =>
-        dispatch(insertAuditTrail({jobid, operation, type })),
+    insertAuditTrail: ({jobid, operation}) =>
+        dispatch(insertAuditTrail({jobid, operation})),
 });
 
 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, type}) =>
-        dispatch(insertAuditTrail({jobid, operation, type })),
+    insertAuditTrail: ({jobid, operation}) =>
+        dispatch(insertAuditTrail({jobid, operation})),
 });
 export default connect(mapStateToProps, mapDispatchToProps)(JobsAdminUnvoid);
 
@@ -46,7 +46,6 @@ 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-table.container.jsx

@@ -1,6 +1,6 @@
 import {gql, useApolloClient, useLazyQuery, useMutation, useQuery,} from "@apollo/client";
 import {useSplitTreatments} from "@splitsoftware/splitio-react";
-import {Col, Row, notification} from "antd";
+import {Col, notification, Row} from "antd";
 import Axios from "axios";
 import Dinero from "dinero.js";
 import dayjs from "../../utils/day";
@@ -21,8 +21,8 @@ import {INSERT_NEW_NOTE} from "../../graphql/notes.queries";
 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 AuditTrailMapping from "../../utils/AuditTrailMappings";
 import CriticalPartsScan from "../../utils/criticalPartsScan";
 import AlertComponent from "../alert/alert.component";
 import JobsAvailableScan from "../jobs-available-scan/jobs-available-scan.component";
@@ -38,8 +38,8 @@ const mapStateToProps = createStructuredSelector({
     currentUser: selectCurrentUser,
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation, type }) =>
-    dispatch(insertAuditTrail({ jobid, operation, type })),
+    insertAuditTrail: ({jobid, operation}) =>
+        dispatch(insertAuditTrail({jobid, operation})),
 });
 
 export function JobsAvailableContainer({bodyshop, currentUser, insertAuditTrail,}) {
@@ -63,15 +63,7 @@ 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 [updateSchComp, setSchComp] = useState({
-        actual_in: dayjs(),
-        checked: false,
-        scheduled_completion: dayjs(),
-        automatic: false,
-    });
+    const [partsQueueToggle, setPartsQueueToggle] = useState(bodyshop.md_functionality_toggles.parts_queue_toggle);
 
     const [insertLoading, setInsertLoading] = useState(false);
 
@@ -177,11 +169,10 @@ 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(),
-        type: "jobimported",
-      });
+            insertAuditTrail({
+                jobid: r.data.insert_jobs.returning[0].id,
+                operation: AuditTrailMapping.jobimported(),
+            });
 
             deleteJob({
                 variables: {id: estData.id},
@@ -196,10 +187,8 @@ export function JobsAvailableContainer({bodyshop, currentUser, insertAuditTrail,
             notification["error"]({
                 message: t("jobs.errors.creating", {error: err.message}),
             });
-            refetch().catch((e) => {
-                console.error(`Something went wrong in jobs available table container - ${err.message || ""
-                    }`
-                );
+            refetch().catch(e => {
+                console.error(`Something went wrong in jobs available table container - ${err.message || ''}`)
             });
             setInsertLoading(false);
             setPartsQueueToggle(bodyshop.md_functionality_toggles.parts_queue_toggle);
@@ -228,23 +217,6 @@ export function JobsAvailableContainer({bodyshop, currentUser, insertAuditTrail,
             //IO-539 Check for Parts Rate on PAL for SGI use case.
             await CheckTaxRates(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;
@@ -326,25 +298,24 @@ 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(),
-        type: "jobsupplement",
-      });
-    }
-  };
+            await insertNote({
+                variables: {
+                    noteInput: [
+                        {
+                            jobid: selectedJob,
+                            created_by: currentUser.email,
+                            audit: true,
+                            text: t("jobs.labels.supplementnote"),
+                        },
+                    ],
+                },
+            });
+            insertAuditTrail({
+                jobid: selectedJob,
+                operation: AuditTrailMapping.jobsupplement(),
+            });
+        }
+    };
 
     const owner =
         estDataRaw.data &&
@@ -418,8 +389,7 @@ export function JobsAvailableContainer({bodyshop, currentUser, insertAuditTrail,
                 onCancel={onJobModalCancel}
                 modalSearchState={modalSearchState}
                 partsQueueToggle={partsQueueToggle}
-                setPartsQueueToggle={setPartsQueueToggle} updateSchComp={updateSchComp}
-                setSchComp={setSchComp}
+                setPartsQueueToggle={setPartsQueueToggle}
             />
             <Row gutter={[16, 16]}>
                 <Col span={24}>

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, type}) =>
-        dispatch(insertAuditTrail({jobid, operation, type })),
+    insertAuditTrail: ({jobid, operation}) =>
+        dispatch(insertAuditTrail({jobid, operation})),
 });
 
 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-export-button/jobs-close-export-button.component.jsx

@@ -9,12 +9,10 @@ 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 { 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({
@@ -22,11 +20,6 @@ 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",
@@ -47,10 +40,9 @@ 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);
@@ -189,10 +181,6 @@ 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)
                     );
@@ -204,20 +192,12 @@ 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(
@@ -247,7 +227,4 @@ export function JobsCloseExportButton({
     );
 }
 
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(JobsCloseExportButton);
+export default connect(mapStateToProps, null)(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, type}) =>
-        dispatch(insertAuditTrail({jobid, operation, type })),
+    insertAuditTrail: ({jobid, operation}) =>
+        dispatch(insertAuditTrail({jobid, operation})),
 });
 
 export function JobsConvertButton({
@@ -70,8 +70,7 @@ export function JobsConvertButton({
                 operation: AuditTrailMapping.jobconverted(
                     res.data.update_jobs.returning[0].ro_number
                 ),
-            type: "jobconverted",
-      });
+            });
 
             setOpen(false);
         }

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

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

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

@@ -48,8 +48,8 @@ const mapDispatchToProps = (dispatch) => ({
         dispatch(setModalContext({context: context, modal: "timeTicket"})),
     setCardPaymentContext: (context) =>
         dispatch(setModalContext({context: context, modal: "cardPayment"})),
-    insertAuditTrail: ({ jobid, operation, type }) =>
-        dispatch(insertAuditTrail({ jobid, operation, type })),
+    insertAuditTrail: ({jobid, operation}) =>
+        dispatch(insertAuditTrail({jobid, operation})),
     setEmailOptions: (e) => dispatch(setEmailOptions(e)),
     openChatByPhone: (phone) => dispatch(openChatByPhone(phone)),
     setMessage: (text) => dispatch(setMessage(text)),
@@ -237,11 +237,6 @@ export function JobsDetailHeaderActions({
                             message: JSON.stringify(result.errors),
                         }),
                     });
-                    insertAuditTrail({
-                        jobid: job.id,
-                        operation: AuditTrailMapping.jobvoid(),
-                        type: "jobvoid",
-                    });
                     return;
                 }
                 if (e.key === "email")
@@ -356,11 +351,6 @@ 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 {
@@ -477,29 +467,9 @@ 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 () => {
@@ -529,12 +499,24 @@ 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>

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, Divider, Row, Space, Tag, Tooltip} from "antd";
+import {Card, Col, Row, Space, Tag, Tooltip} from "antd";
 import React, {useState} from "react";
 import {useTranslation} from "react-i18next";
 import {connect} from "react-redux";
@@ -22,7 +22,6 @@ 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,
@@ -59,13 +58,6 @@ 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 (
@@ -97,9 +89,7 @@ export function JobsDetailHeader({job, bodyshop, disabled}) {
                                 {job.status === bodyshop.md_ro_statuses.default_scheduled &&
                                 job.scheduled_in ? (
                                     <Tag>
-                                        <Link to={`/manage/schedule?date=${dayjs(job.scheduled_in).format('YYYY-MM-DD')}`}>
-                                            <DateTimeFormatter>{job.scheduled_in}</DateTimeFormatter>
-                                        </Link>
+                                        <DateTimeFormatter>{job.scheduled_in}</DateTimeFormatter>
                                     </Tag>
                                 ) : null}
                             </Space>
@@ -129,14 +119,11 @@ export function JobsDetailHeader({job, bodyshop, disabled}) {
                         </DataLabel>
                         {job?.cccontracts?.length > 0 && (
                             <DataLabel label={t("jobs.labels.contracts")}>
-                                {job.cccontracts.map((c, index) => (
-                                    <Space wrap>
+                                {job.cccontracts.map((c) => (
                                     <Link
                                         key={c.id}
                                         to={`/manage/courtesycars/contracts/${c.id}`}
-                                    >{`${c.agreementnumber} - ${c.courtesycar.fleetnumber} ${c.courtesycar.year} ${c.courtesycar.make} ${c.courtesycar.model}`}{index !== job.cccontracts.length - 1 ? "," : null}
-                                    </Link>
-                                    </Space>
+                                    >{`${c.agreementnumber} - ${c.courtesycar.fleetnumber} ${c.courtesycar.year} ${c.courtesycar.make} ${c.courtesycar.model}`}</Link>
                                 ))}
                             </DataLabel>
                         )}
@@ -145,7 +132,7 @@ export function JobsDetailHeader({job, bodyshop, disabled}) {
                             <ProductionListColumnProductionNote record={job}/>
                         </DataLabel>
 
-                        <Space wrap>
+                        <Space>
                             {job.special_coverage_policy && (
                                 <Tag color="tomato">
                                     <Space>
@@ -305,11 +292,6 @@ 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-export-all-button/jobs-export-all-button.component.jsx

@@ -9,12 +9,7 @@ import {createStructuredSelector} from "reselect";
 import {auth, logImEXEvent} from "../../firebase/firebase.utils";
 import {INSERT_EXPORT_LOG} from "../../graphql/accounting.queries";
 import {UPDATE_JOBS} from "../../graphql/jobs.queries";
-import { insertAuditTrail } from "../../redux/application/application.actions";
-import AuditTrailMapping from "../../utils/AuditTrailMappings";
-import {
-    selectBodyshop,
-    selectCurrentUser,
-} from "../../redux/user/user.selectors";
+import {selectBodyshop, selectCurrentUser,} from "../../redux/user/user.selectors";
 import client from "../../utils/GraphQLClient";
 
 const mapStateToProps = createStructuredSelector({
@@ -22,11 +17,6 @@ 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",
@@ -48,9 +38,8 @@ export function JobsExportAllButton({
                                         loadingCallback,
                                         completedCallback,
                                         refetch,
-                                        insertAuditTrail,
                                     }) {
-    const { t } = useTranslation();
+    const {t} = useTranslation();
     const [updateJob] = useMutation(UPDATE_JOBS);
     const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
 
@@ -179,66 +168,47 @@ export function JobsExportAllButton({
                             },
                         });
 
-            if (!!!jobUpdateResponse.errors) {
-              notification.open({
-                type: "success",
-                key: "jobsuccessexport",
-                message: t("jobs.successes.exported"),
-              });
-              jobUpdateResponse.data.update_jobs.returning.forEach((job) => {
-                insertAuditTrail({
-                  jobid: job.id,
-                  operation: AuditTrailMapping.jobexported(),
-                  type: "jobexported",
-                });
-              });
-              updateJobCache(
-                jobUpdateResponse.data.update_jobs.returning.map(
-                  (job) => job.id
-                )
-              );
-            } else {
-              notification["error"]({
-                message: t("jobs.errors.exporting", {
-                  error: JSON.stringify(jobUpdateResponse.error),
-                }),
-              });
-            }
-          }
-          if (
-            bodyshop.accountingconfig &&
-            bodyshop.accountingconfig.qbo &&
-            successfulTransactions.length > 0
-          ) {
-            notification.open({
-              type: "success",
-              key: "jobsuccessexport",
-              message: t("jobs.successes.exported"),
-            });
-            const successfulTransactionsSet = [
-              ...new Set(
-                successfulTransactions.map(
-                  (st) =>
-                    st[
-                      bodyshop.accountingconfig && bodyshop.accountingconfig.qbo
-                        ? "jobid"
-                        : "id"
-                    ]
-                )
-              ),
-            ];
-            if (successfulTransactionsSet.length > 0) {
-              insertAuditTrail({
-                jobid: successfulTransactionsSet[0],
-                operation: AuditTrailMapping.jobexported(),
-                type: "jobexported",
-              });
-            }
-            updateJobCache(successfulTransactionsSet);
-          }
-        }
-      })
-    );
+                        if (!!!jobUpdateResponse.errors) {
+                            notification.open({
+                                type: "success",
+                                key: "jobsuccessexport",
+                                message: t("jobs.successes.exported"),
+                            });
+                            updateJobCache(
+                                jobUpdateResponse.data.update_jobs.returning.map(
+                                    (job) => job.id
+                                )
+                            );
+                        } else {
+                            notification["error"]({
+                                message: t("jobs.errors.exporting", {
+                                    error: JSON.stringify(jobUpdateResponse.error),
+                                }),
+                            });
+                        }
+                    }
+                    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && successfulTransactions.length > 0) {
+                        notification.open({
+                            type: "success",
+                            key: "jobsuccessexport",
+                            message: t("jobs.successes.exported"),
+                        });
+                        updateJobCache([
+                            ...new Set(
+                                successfulTransactions.map(
+                                    (st) =>
+                                        st[
+                                            bodyshop.accountingconfig && bodyshop.accountingconfig.qbo
+                                                ? "jobid"
+                                                : "id"
+                                            ]
+                                )
+                            ),
+                        ]);
+                    }
+                }
+            })
+        );
 
         if (!!completedCallback) completedCallback([]);
         if (!!loadingCallback) loadingCallback(false);
@@ -252,7 +222,4 @@ export function JobsExportAllButton({
     );
 }
 
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(JobsExportAllButton);
+export default connect(mapStateToProps, null)(JobsExportAllButton);

client/src/components/jobs-find-modal/jobs-find-modal.component.jsx

@@ -1,11 +1,9 @@
 import {SyncOutlined} from "@ant-design/icons";
-import {Button, Checkbox, Divider, Input, Space, Table} from "antd";
-import dayjs from "../../utils/day";
-import React, {useState} from "react";
+import {Button, Checkbox, Divider, Input, Table} from "antd";
+import React from "react";
 import {useTranslation} from "react-i18next";
 import {Link} from "react-router-dom";
 import PhoneFormatter from "../../utils/PhoneFormatter";
-import FormDateTimePickerComponent from "../form-date-time-picker/form-date-time-picker.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 
 export default function JobsFindModalComponent({
@@ -18,13 +16,11 @@ export default function JobsFindModalComponent({
                                                    jobsListRefetch,
                                                    partsQueueToggle,
                                                    setPartsQueueToggle,
-                                                   updateSchComp,
-                                                   setSchComp,
                                                }) {
     const {t} = useTranslation();
     const [modalSearch, setModalSearch] = modalSearchState;
     const [importOptions, setImportOptions] = importOptionsState;
-    const [checkUTT, setCheckUTT] = useState(false);
+
     const columns = [
         {
             title: t("jobs.fields.ro_number"),
@@ -146,35 +142,6 @@ export default function JobsFindModalComponent({
         if (record) {
             if (record.id) {
                 setSelectedJob(record.id);
-                if (record.actual_in && record.scheduled_completion) {
-                    setSchComp({
-                        ...updateSchComp,
-                        actual_in: record.actual_in,
-                        scheduled_completion: record.scheduled_completion,
-                    });
-                } else {
-                    if (record.actual_in && !record.scheduled_completion) {
-                        setSchComp({
-                            ...updateSchComp,
-                            actual_in: record.actual_in,
-                            scheduled_completion: dayjs(),
-                        });
-                    }
-                    if (!record.actual_in && record.scheduled_completion) {
-                        setSchComp({
-                            ...updateSchComp,
-                            actual_in: dayjs(),
-                            scheduled_completion: dayjs(record.scheduled_completion),
-                        });
-                    }
-                    if (!record.actual_in && !record.scheduled_completion) {
-                        setSchComp({
-                            ...updateSchComp,
-                            actual_in: dayjs(),
-                            scheduled_completion: dayjs(),
-                        });
-                    }
-                }
                 return;
             }
         }
@@ -210,35 +177,6 @@ export default function JobsFindModalComponent({
                 rowSelection={{
                     onSelect: (props) => {
                         setSelectedJob(props.id);
-                        if (props.actual_in && props.scheduled_completion) {
-                            setSchComp({
-                                ...updateSchComp,
-                                actual_in: props.actual_in,
-                                scheduled_completion: props.scheduled_completion,
-                            });
-                        } else {
-                            if (props.actual_in && !props.scheduled_completion) {
-                                setSchComp({
-                                    ...updateSchComp,
-                                    actual_in: props.actual_in,
-                                    scheduled_completion: dayjs(),
-                                });
-                            }
-                            if (!props.actual_in && props.scheduled_completion) {
-                                setSchComp({
-                                    ...updateSchComp,
-                                    actual_in: dayjs(),
-                                    scheduled_completion: dayjs(props.scheduled_completion),
-                                });
-                            }
-                            if (!props.actual_in && !props.scheduled_completion) {
-                                setSchComp({
-                                    ...updateSchComp,
-                                    actual_in: dayjs(),
-                                    scheduled_completion: dayjs(),
-                                });
-                            }
-                        }
                     },
                     type: "radio",
                     selectedRowKeys: [selectedJob],
@@ -251,7 +189,7 @@ export default function JobsFindModalComponent({
                     };
                 }}
             />
-            <Divider/><Space>
+            <Divider/>
             <Checkbox
                 defaultChecked={importOptions.overrideHeader}
                 onChange={(e) =>
@@ -268,40 +206,7 @@ export default function JobsFindModalComponent({
                 onChange={(e) => setPartsQueueToggle(e.target.checked)}
             >
                 {t("bodyshop.fields.md_functionality_toggles.parts_queue_toggle")}
-            </Checkbox><Checkbox
-            checked={updateSchComp.checked}
-            onChange={(e) =>
-                setSchComp({...updateSchComp, checked: e.target.checked})
-            }
-        >
-            {t("jobs.labels.update_scheduled_completion")}
-        </Checkbox>
-            {updateSchComp.checked === true ? (
-                <>
-                    {checkUTT === false ? (
-                        <FormDateTimePickerComponent
-                            value={updateSchComp.scheduled_completion}
-                            onChange={(e) => {
-                                setSchComp({...updateSchComp, scheduled_completion: e});
-                            }}
-                        />
-                    ) : null}
-                    <Checkbox
-                        checked={checkUTT}
-                        onChange={(e) => {
-                            setCheckUTT(e.target.checked);
-                            setSchComp({
-                                ...updateSchComp,
-                                scheduled_completion: null,
-                                automatic: true,
-                            });
-                        }}
-                    >
-                        {t("jobs.labels.calc_scheuled_completion")}
-                    </Checkbox>
-                </>
-            ) : null}
-        </Space>
+            </Checkbox>
         </div>
     );
 }

client/src/components/jobs-find-modal/jobs-find-modal.container.jsx

@@ -27,8 +27,7 @@ export default connect(
                                       modalSearchState,
                                       partsQueueToggle,
                                       setPartsQueueToggle,
-                                                            updateSchComp,
-                                                            setSchComp, ...modalProps
+                                      ...modalProps
                                   }) {
     const {t} = useTranslation();
 
@@ -96,8 +95,7 @@ export default connect(
                 modalSearchState={modalSearchState}
                 partsQueueToggle={partsQueueToggle}
                 setPartsQueueToggle={setPartsQueueToggle}
-                updateSchComp={updateSchComp}
-                setSchComp={setSchComp}/>
+            />
         </Modal>
     );
 });

client/src/components/jobs-list/jobs-list.component.jsx

@@ -16,7 +16,6 @@ import useLocalStorage from "../../utils/useLocalStorage";
 import AlertComponent from "../alert/alert.component";
 import ChatOpenButton from "../chat-open-button/chat-open-button.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
-import { OwnerNameDisplayFunction } from "./../owner-name-display/owner-name-display.component";
 
 const mapStateToProps = createStructuredSelector({
     bodyshop: selectBodyshop,
@@ -143,8 +142,7 @@ export function JobsList({bodyshop}) {
             ellipsis: true,
 
             responsive: ["md"],
-            sorter: (a, b) =>
-        alphaSort(OwnerNameDisplayFunction(a), OwnerNameDisplayFunction(b)),
+            sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
             sortOrder:
                 state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
             render: (text, record) => {
@@ -189,8 +187,7 @@ export function JobsList({bodyshop}) {
             key: "status",
             ellipsis: true,
 
-            sorter: (a, b) =>
-        statusSort(a.status, b.status, bodyshop.md_ro_statuses.active_statuses),
+            sorter: (a, b) => alphaSort(a.status, b.status),
             sortOrder:
                 state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
             filteredValue: filter?.status || null,
@@ -221,15 +218,7 @@ export function JobsList({bodyshop}) {
             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) => {
+            render: (text, record) => {
                 return record.vehicleid ? (
                     <Link
                         to={"/manage/vehicles/" + record.vehicleid}
@@ -276,9 +265,7 @@ export function JobsList({bodyshop}) {
             dataIndex: "ins_co_nm",
             key: "ins_co_nm",
             ellipsis: true,
-            sorter: (a, b) => alphaSort(a.ins_co_nm, b.ins_co_nm),
-      sortOrder:
-        state.sortedInfo.columnKey === "ins_co_nm" && state.sortedInfo.order,filteredValue: filter?.ins_co_nm || null,
+            filteredValue: filter?.ins_co_nm || null,
             filters:
                 (jobs &&
                     jobs
@@ -314,13 +301,7 @@ export function JobsList({bodyshop}) {
             dataIndex: "jobs.labels.estimator",
             key: "jobs.labels.estimator",
             ellipsis: true,
-            responsive: ["xl"],sorter: (a, b) =>
-        alphaSort(
-          `${a.est_ct_fn || ""} ${a.est_ct_ln || ""}`.trim(),
-          `${b.est_ct_fn || ""} ${b.est_ct_ln || ""}`.trim()
-        ),
-      sortOrder:
-        state.sortedInfo.columnKey === "estimator" && state.sortedInfo.order,
+            responsive: ["xl"],
             filterSearch: true,
             filteredValue: filter?.estimator || null,
             filters:

client/src/components/jobs-notes/jobs-notes.container.jsx

@@ -16,8 +16,8 @@ const mapStateToProps = createStructuredSelector({
     //currentUser: selectCurrentUser
 });
 const mapDispatchToProps = (dispatch) => ({
-    insertAuditTrail: ({jobid, operation, type}) =>
-        dispatch(insertAuditTrail({jobid, operation, type })),
+    insertAuditTrail: ({jobid, operation}) =>
+        dispatch(insertAuditTrail({jobid, operation})),
 });
 export default connect(mapStateToProps, mapDispatchToProps)(JobNotesContainer);
 
@@ -46,7 +46,7 @@ export function JobNotesContainer({jobId, insertAuditTrail}) {
             insertAuditTrail({
                 jobid: jobId,
                 operation: AuditTrailMapping.jobnotedeleted(),
-            type: "jobnotedeleted",});
+            });
         });
         setDeleteLoading(false);
     };

client/src/components/labor-allocations-adjustment-edit/labor-allocations-adjustment-edit.component.jsx

@@ -21,8 +21,8 @@ const mapStateToProps = createStructuredSelector({
     //currentUser: selectCurrentUser
 });
 const mapDispatchToProps = (dispatch) => ({
-    insertAuditTrail: ({jobid, operation, type}) =>
-        dispatch(insertAuditTrail({jobid, operation, type })),
+    insertAuditTrail: ({jobid, operation}) =>
+        dispatch(insertAuditTrail({jobid, operation})),
 });
 export default connect(
     mapStateToProps,
@@ -77,7 +77,7 @@ export function LaborAllocationsAdjustmentEdit({
                         values.hours -
                         ((adjustments && adjustments[mod_lbr_ty]) || 0).toFixed(1),
                 }),
-            type: "jobmodifylbradj",});
+            });
         }
         setLoading(false);
         setOpen(false);

client/src/components/note-upsert-modal/note-upsert-modal.container.jsx

@@ -19,8 +19,8 @@ const mapStateToProps = createStructuredSelector({
 });
 const mapDispatchToProps = (dispatch) => ({
     toggleModalVisible: () => dispatch(toggleModalVisible("noteUpsert")),
-    insertAuditTrail: ({jobid, operation, type}) =>
-        dispatch(insertAuditTrail({jobid, operation, type })),
+    insertAuditTrail: ({jobid, operation}) =>
+        dispatch(insertAuditTrail({jobid, operation})),
 });
 
 export function NoteUpsertModalContainer({
@@ -70,7 +70,7 @@ export function NoteUpsertModalContainer({
                 insertAuditTrail({
                     jobid: context.jobId,
                     operation: AuditTrailMapping.jobnoteupdated(),
-                type: "jobnoteupdated",});
+                });
             });
             if (refetch) refetch();
             toggleModalVisible();
@@ -102,7 +102,7 @@ export function NoteUpsertModalContainer({
                     insertAuditTrail({
                         jobid: newJobId,
                         operation: AuditTrailMapping.jobnoteadded(),
-                    type: "jobnoteadded",});
+                    });
                 });
             }
 
@@ -115,7 +115,7 @@ export function NoteUpsertModalContainer({
             insertAuditTrail({
                 jobid: context.jobId,
                 operation: AuditTrailMapping.jobnoteadded(),
-            type: "jobnoteadded",});
+            });
         }
     };
 

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

@@ -44,15 +44,6 @@ function OwnerDetailJobsComponent({bodyshop, owner}) {
             title: t("jobs.fields.vehicle"),
             dataIndex: "vehicleid",
             key: "vehicleid",
-            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 === "vehicleid" && state.sortedInfo.order,
             render: (text, record) =>
                 record.vehicleid ? (
                     <Link to={`/manage/vehicles/${record.vehicleid}`}>
@@ -76,15 +67,9 @@ function OwnerDetailJobsComponent({bodyshop, owner}) {
             title: t("jobs.fields.status"),
             dataIndex: "status",
             key: "status",
-            sorter: (a, b) =>
-                statusSort(a.status, b.status, bodyshop.md_ro_statuses.statuses),
+            sorter: (a, b) => statusSort(a.status, b.status, bodyshop.md_ro_statuses.statuses),
             sortOrder:
                 state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
-            filters: bodyshop.md_ro_statuses.statuses.map((status) => ({
-                text: status,
-                value: status,
-            })),
-            onFilter: (value, record) => value.includes(record.status),
         },
 
         {

client/src/components/parts-order-modal/parts-order-modal.container.jsx

@@ -1,28 +1,19 @@
-import { useMutation, useQuery, useApolloClient } from "@apollo/client";
-import { Form, Modal, notification } from "antd";
-import dayjs from '../../utils/day';
-import React, { useEffect, useState } from "react";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { logImEXEvent, auth } from "../../firebase/firebase.utils";
-import { UPDATE_JOB_LINE_STATUS } from "../../graphql/jobs-lines.queries";
-import {
-  INSERT_NEW_PARTS_ORDERS,
-  QUERY_PARTS_ORDER_OEC,
-} from "../../graphql/parts-orders.queries";
-import { QUERY_ALL_VENDORS_FOR_ORDER } from "../../graphql/vendors.queries";
-import { insertAuditTrail } from "../../redux/application/application.actions";
-import { setEmailOptions } from "../../redux/email/email.actions";
-import {
-  setModalContext,
-  toggleModalVisible,
-} from "../../redux/modals/modals.actions";
-import { selectPartsOrder } from "../../redux/modals/modals.selectors";
-import {
-  selectBodyshop,
-  selectCurrentUser,
-} from "../../redux/user/user.selectors";
+import {useApolloClient, useMutation, useQuery} from "@apollo/client";
+import {Form, Modal, notification} from "antd";
+import dayjs from "../../utils/day";
+import React, {useEffect, useState} from "react";
+import {useTranslation} from "react-i18next";
+import {connect} from "react-redux";
+import {createStructuredSelector} from "reselect";
+import {auth, logImEXEvent} from "../../firebase/firebase.utils";
+import {UPDATE_JOB_LINE_STATUS} from "../../graphql/jobs-lines.queries";
+import {INSERT_NEW_PARTS_ORDERS, QUERY_PARTS_ORDER_OEC,} from "../../graphql/parts-orders.queries";
+import {QUERY_ALL_VENDORS_FOR_ORDER} from "../../graphql/vendors.queries";
+import {insertAuditTrail} from "../../redux/application/application.actions";
+import {setEmailOptions} from "../../redux/email/email.actions";
+import {setModalContext, toggleModalVisible,} from "../../redux/modals/modals.actions";
+import {selectPartsOrder} from "../../redux/modals/modals.selectors";
+import {selectBodyshop, selectCurrentUser,} from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import {GenerateDocument} from "../../utils/RenderTemplate";
 import {TemplateList} from "../../utils/TemplateConstants";
@@ -45,8 +36,8 @@ const mapDispatchToProps = (dispatch) => ({
     toggleModalVisible: () => dispatch(toggleModalVisible("partsOrder")),
     setBillEnterContext: (context) =>
         dispatch(setModalContext({context: context, modal: "billEnter"})),
-    insertAuditTrail: ({jobid, operation, type}) =>
-        dispatch(insertAuditTrail({jobid, operation, type })),
+    insertAuditTrail: ({jobid, operation}) =>
+        dispatch(insertAuditTrail({jobid, operation})),
 });
 
 export function PartsOrderModalContainer({
@@ -144,8 +135,7 @@ export function PartsOrderModalContainer({
                 : AuditTrailMapping.jobspartsorder(
                     insertResult.data.insert_parts_orders.returning[0].order_number
                 ),
-        type: isReturn ? "jobspartsreturn" : "jobspartsorder",
-    });
+        });
 
         const jobLinesResult = await updateJobLines({
             variables: {

client/src/components/parts-queue-list/parts-queue.list.component.jsx

@@ -100,7 +100,8 @@ export function PartsQueueListComponent({bodyshop}) {
     };
 
     const handleOnRowClick = (record) => {
-            if (record?.id) {
+        if (record) {
+            if (record.id) {
                 history({
                     search: queryString.stringify({
                         ...searchParams,
@@ -108,6 +109,7 @@ export function PartsQueueListComponent({bodyshop}) {
                     }),
                 });
             }
+        }
     };
     const columns = [
         {
@@ -352,15 +354,7 @@ export function PartsQueueListComponent({bodyshop}) {
                     },
                     selectedRowKeys: [selected],
                     type: "radio",
-                }}
-                onRow={(record, rowIndex) => {
-                    return {
-                        onClick: (event) => {
-                            handleOnRowClick(record);
-                        },
-                    };
-                }}
-            />
+                }}/>
         </Card>
     );
 }

client/src/components/payment-expanded-row/payment-expanded-row.component.jsx

@@ -59,8 +59,8 @@ const PaymentExpandedRowComponent = ({record, bodyshop}) => {
         await insertPayment({
             variables: {
                 paymentInput: {
-                    amount: -refund_response?.data?.amount,
-                    transactionid: payment_response?.response?.receiptelements?.transid,
+                    amount: -refund_response.data.amount,
+                    transactionid: payment_response.response.receiptelements.transid,
                     payer: record.payer,
                     type: "Refund",
                     jobid: payment_response.jobid,

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

@@ -2,17 +2,14 @@ import {Button, Form, Input, Space} from "antd";
 import {PageHeader} from "@ant-design/pro-layout";
 import React from "react";
 import {useTranslation} from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import {
-  selectAuthLevel,
-  selectBodyshop,
-} from "../../redux/user/user.selectors";
 import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
 import FormItemEmail from "../form-items-formatted/email-form-item.component";
 import PhoneFormItem, {PhoneItemFormatterValidation,} from "../form-items-formatted/phone-form-item.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import {HasRbacAccess} from "../rbac-wrapper/rbac-wrapper.component";
+import {connect} from "react-redux";
+import {createStructuredSelector} from "reselect";
+import {selectAuthLevel, selectBodyshop,} from "../../redux/user/user.selectors";
 
 const mapStateToProps = createStructuredSelector({
     authLevel: selectAuthLevel,
@@ -46,16 +43,13 @@ export function PhonebookFormComponent({
     return (
         <div>
             <PageHeader
-                title={<Form.Item shouldUpdate>
-            {() =>`${form.getFieldValue("firstname") || ""} ${
+                title={`${form.getFieldValue("firstname") || ""} ${
                     form.getFieldValue("lastname") || ""
                 }${
                     form.getFieldValue("company")
                         ? ` - ${form.getFieldValue("company")}`
-                        : ""}`
-            }
-          </Form.Item>
-                }
+                        : ""
+                }`}
                 extra={
                     <Space>
                         <Button

client/src/components/production-board-kanban/production-board-kanban.component.jsx

@@ -31,8 +31,8 @@ const mapStateToProps = createStructuredSelector({
 });
 
 const mapDispatchToProps = (dispatch) => ({
-    insertAuditTrail: ({jobid, operation, type}) =>
-        dispatch(insertAuditTrail({jobid, operation, type })),
+    insertAuditTrail: ({jobid, operation}) =>
+        dispatch(insertAuditTrail({jobid, operation})),
 });
 
 export function ProductionBoardKanbanComponent({
@@ -135,8 +135,7 @@ export function ProductionBoardKanbanComponent({
         insertAuditTrail({
             jobid: card.id,
             operation: AuditTrailMapping.jobstatuschange(destination.toColumnId),
-        type: "jobstatuschange",
-    });
+        });
 
         if (update.errors) {
             notification["error"]({

client/src/components/production-list-columns/production-list-columns.add.component.jsx

@@ -27,7 +27,6 @@ export function ProductionColumnsComponent({
                                                bodyshop,
                                                data,
                                                tableState,
-                                                refetch,
                                            }) {
     const [columns, setColumns] = columnState;
     const {t} = useTranslation();
@@ -51,7 +50,6 @@ export function ProductionColumnsComponent({
         data,
         state: tableState,
         activeStatuses: bodyshop.md_ro_statuses.active_statuses,
-        refetch,
     });
 
     const menu = {

client/src/components/production-list-columns/production-list-columns.alert.component.jsx

@@ -13,8 +13,8 @@ import AuditTrailMapping from "../../utils/AuditTrailMappings";
 const mapStateToProps = createStructuredSelector({});
 
 const mapDispatchToProps = (dispatch) => ({
-    insertAuditTrail: ({jobid, operation, type}) =>
-        dispatch(insertAuditTrail({jobid, operation, type })),
+    insertAuditTrail: ({jobid, operation}) =>
+        dispatch(insertAuditTrail({jobid, operation})),
 });
 
 export function ProductionListColumnAlert({record, insertAuditTrail}) {
@@ -46,7 +46,7 @@ export function ProductionListColumnAlert({record, insertAuditTrail}) {
                     ? !record.production_vars.alert
                     : true
             ),
-        type: "alertToggle",}).then(() => {
+        }).then(() => {
             if (record.refetch) record.refetch();
         });
     };

client/src/components/production-list-columns/production-list-columns.data.js

@@ -1,6 +1,7 @@
 import {BranchesOutlined, PauseCircleOutlined} from "@ant-design/icons";
-import {Checkbox,Space, Tooltip} from "antd";
+import {Space, Tooltip} from "antd";
 import i18n from "i18next";
+import dayjs from "../../utils/day";
 import {Link} from "react-router-dom";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import {TimeFormatter} from "../../utils/DateFormatter";
@@ -9,9 +10,7 @@ import {onlyUnique} from "../../utils/arrayHelper";
 import {alphaSort, dateSort, statusSort} from "../../utils/sorters";
 import JobAltTransportChange from "../job-at-change/job-at-change.component";
 import JobPartsQueueCount from "../job-parts-queue-count/job-parts-queue-count.component";
-import OwnerNameDisplay, {
-  OwnerNameDisplayFunction,
-} from "../owner-name-display/owner-name-display.component";
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import ProductionSubletsManageComponent from "../production-sublets-manage/production-sublets-manage.component";
 import ProductionListColumnAlert from "./production-list-columns.alert.component";
 import ProductionListColumnBodyPriority from "./production-list-columns.bodypriority.component";
@@ -27,7 +26,7 @@ import ProductionListColumnCategory from "./production-list-columns.status.categ
 import ProductionListColumnStatus from "./production-list-columns.status.component";
 import ProductionlistColumnTouchTime from "./prodution-list-columns.touchtime.component";
 
-const r = ({technician, state, activeStatuses, data, bodyshop, refetch}) => {
+const r = ({technician, state, activeStatuses, data, bodyshop}) => {
     return [
         {
             title: i18n.t("jobs.actions.viewdetail"),
@@ -85,7 +84,7 @@ const r = ({technician, state, activeStatuses, data, bodyshop, refetch}) => {
                         <OwnerNameDisplay ownerObject={record}/>
                     </Link>
                 ),
-            sorter: (a, b) => alphaSort(OwnerNameDisplayFunction(a), OwnerNameDisplayFunction(b)),
+            sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
             sortOrder:
                 state.sortedInfo.columnKey === "ownr" && state.sortedInfo.order,
         },
@@ -96,10 +95,8 @@ const r = ({technician, state, activeStatuses, data, bodyshop, refetch}) => {
             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 || ""}`
+                    a.v_make_desc + a.v_model_desc,
+                    b.v_make_desc + b.v_model_desc
                 ),
             sortOrder:
                 state.sortedInfo.columnKey === "vehicle" && state.sortedInfo.order,
@@ -188,12 +185,17 @@ const r = ({technician, state, activeStatuses, data, bodyshop, refetch}) => {
                 state.sortedInfo.columnKey === "date_next_contact" &&
                 state.sortedInfo.order,
             render: (text, record) => (
-                <ProductionListDate
-                    record={record}
-                    field="date_next_contact"
-                    pastIndicator
-                    time
-                />
+                <span
+                    style={{
+                        color:
+                            record.date_next_contact &&
+                            dayjs(record.date_next_contact).isBefore(dayjs())
+                                ? "red"
+                                : "",
+                    }}
+                >
+          <ProductionListDate record={record} field="date_next_contact" time/>
+        </span>
             ),
         },
         {
@@ -289,21 +291,7 @@ const r = ({technician, state, activeStatuses, data, bodyshop, refetch}) => {
             dataIndex: "special_coverage_policy",
             key: "special_coverage_policy",
             ellipsis: true,
-        sorter: (a, b) =>
-        Number(a.special_coverage_policy) - Number(b.special_coverage_policy),
-      sortOrder:
-        state.sortedInfo.columnKey === "special_coverage_policy" &&
-        state.sortedInfo.order,
-      filters: [
-        { text: "True", value: true },
-        { text: "False", value: false },
-      ],
-      onFilter: (value, record) =>
-        value.includes(record.special_coverage_policy),
-      render: (text, record) => (
-        <Checkbox disabled checked={record.special_coverage_policy} />
-      ),
-    },
+        },
 
         {
             title: i18n.t("jobs.fields.alt_transport"),
@@ -314,16 +302,7 @@ const r = ({technician, state, activeStatuses, data, bodyshop, refetch}) => {
             sortOrder:
                 state.sortedInfo.columnKey === "alt_transport" &&
                 state.sortedInfo.order,
-            filters:
-        (bodyshop &&
-          bodyshop.appt_alt_transport.map((s) => {
-            return {
-              text: s,
-              value: [s],
-            };
-          })) ||
-        [],
-      onFilter: (value, record) => value.includes(record.alt_transport),render: (text, record) => (
+            render: (text, record) => (
                 <div>
                     {record.alt_transport}
                     <JobAltTransportChange job={record}/>
@@ -403,11 +382,7 @@ const r = ({technician, state, activeStatuses, data, bodyshop, refetch}) => {
             title: i18n.t("production.labels.alert"),
             dataIndex: "alert",
             key: "alert",
-      sorter: (a, b) =>
-        Number(a.production_vars?.alert || false) -
-        Number(b.production_vars?.alert || false),
-      sortOrder:
-        state.sortedInfo.columnKey === "alert" && state.sortedInfo.order,
+
             render: (text, record) => <ProductionListColumnAlert record={record}/>,
         },
         {
@@ -498,7 +473,6 @@ const r = ({technician, state, activeStatuses, data, bodyshop, refetch}) => {
                 ),
             render: (text, record) => (
                 <ProductionListEmployeeAssignment
-                    refetch={refetch}
                     record={record}
                     type="employee_body"
                 />
@@ -519,7 +493,6 @@ const r = ({technician, state, activeStatuses, data, bodyshop, refetch}) => {
             render: (text, record) => (
                 <ProductionListEmployeeAssignment
                     record={record}
-                    refetch={refetch}
                     type="employee_prep"
                 />
             ),
@@ -536,7 +509,7 @@ const r = ({technician, state, activeStatuses, data, bodyshop, refetch}) => {
                     bodyshop.employees?.find((e) => e.id === b.employee_csr)?.first_name
                 ),
             render: (text, record) => (
-                <ProductionListEmployeeAssignment  refetch={refetch} record={record} type="employee_csr"/>
+                <ProductionListEmployeeAssignment record={record} type="employee_csr"/>
             ),
         },
         {
@@ -556,7 +529,6 @@ const r = ({technician, state, activeStatuses, data, bodyshop, refetch}) => {
             render: (text, record) => (
                 <ProductionListEmployeeAssignment
                     record={record}
-                    refetch={refetch}
                     type="employee_refinish"
                 />
             ),

client/src/components/production-list-columns/production-list-columns.empassignment.component.jsx

@@ -3,12 +3,12 @@ import {useMutation} from "@apollo/client";
 import {
     Button,
     Col,
-
+    notification,
     Popover,
     Row,
     Select,
     Space,
-    Spin,notification,
+    Spin,
 } from "antd";
 import React, {useState} from "react";
 import {useTranslation} from "react-i18next";
@@ -25,15 +25,14 @@ const mapStateToProps = createStructuredSelector({
     bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
-    insertAuditTrail: ({jobid, operation, type}) =>
-        dispatch(insertAuditTrail({jobid, operation, type })),
+    insertAuditTrail: ({jobid, operation}) =>
+        dispatch(insertAuditTrail({jobid, operation})),
 });
 
 export function ProductionListEmpAssignment({
                                                 insertAuditTrail,
                                                 bodyshop,
                                                 record,
-                                                refetch,
                                                 type,
                                             }) {
     const {t} = useTranslation();
@@ -56,8 +55,7 @@ export function ProductionListEmpAssignment({
         insertAuditTrail({
             jobid: record.id,
             operation: AuditTrailMapping.jobassignmentchange(empAssignment, name),
-        type: "jobassignmentchange",
-    });
+        });
 
         if (!!result.errors) {
             notification["error"]({
@@ -66,9 +64,6 @@ export function ProductionListEmpAssignment({
                 }),
             });
         }
-
-        await refetch();
-
         setLoading(false);
     };
     const handleRemove = async (operation) => {
@@ -85,8 +80,7 @@ export function ProductionListEmpAssignment({
         insertAuditTrail({
             jobid: record.id,
             operation: AuditTrailMapping.jobassignmentremoved(empAssignment),
-        type: "jobassignmentremoved",
-    });
+        });
 
         if (!!result.errors) {
             notification["error"]({
@@ -95,9 +89,6 @@ export function ProductionListEmpAssignment({
                 }),
             });
         }
-
-        await refetch();
-
         setLoading(false);
     };
 

client/src/components/production-list-columns/production-list-columns.status.category.jsx

@@ -12,8 +12,8 @@ const mapStateToProps = createStructuredSelector({
     bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
-    insertAuditTrail: ({jobid, operation, type}) =>
-        dispatch(insertAuditTrail({jobid, operation, type })),
+    insertAuditTrail: ({jobid, operation}) =>
+        dispatch(insertAuditTrail({jobid, operation})),
 });
 
 export function ProductionListColumnCategory({record, bodyshop}) {

client/src/components/production-list-columns/production-list-columns.status.component.jsx

@@ -5,15 +5,16 @@ import {connect} from "react-redux";
 import {createStructuredSelector} from "reselect";
 import {logImEXEvent} from "../../firebase/firebase.utils";
 import {UPDATE_JOB} from "../../graphql/jobs.queries";
-import {insertAuditTrail} from "../../redux/application/application.actions";import { selectBodyshop } from "../../redux/user/user.selectors";
+import {selectBodyshop} from "../../redux/user/user.selectors";
+import {insertAuditTrail} from "../../redux/application/application.actions";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 
 const mapStateToProps = createStructuredSelector({
     bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
-    insertAuditTrail: ({jobid, operation, type}) =>
-        dispatch(insertAuditTrail({jobid, operation, type })),
+    insertAuditTrail: ({jobid, operation}) =>
+        dispatch(insertAuditTrail({jobid, operation})),
 });
 
 export function ProductionListColumnStatus({
@@ -40,8 +41,7 @@ export function ProductionListColumnStatus({
         insertAuditTrail({
             jobid: record.id,
             operation: AuditTrailMapping.jobstatuschange(key),
-        type: "jobstatuschange",
-    });
+        });
 
         setLoading(false);
     };

client/src/components/production-list-table/production-list-table-view-select.component.jsx

@@ -18,7 +18,6 @@ const mapStateToProps = createStructuredSelector({
 });
 
 export function ProductionListTable({
-                                        refetch,
                                         bodyshop,
                                         technician,
                                         currentUser,
@@ -39,7 +38,6 @@ export function ProductionListTable({
                 return {
                     ...ProductionListColumns({
                         bodyshop,
-                        refetch,
                         technician,
                         state,
                         data: data,
@@ -97,7 +95,6 @@ export function ProductionListTable({
                     ...ProductionListColumns({
                         technician,
                         state,
-                        refetch,
                         data: data,
                         activeStatuses: bodyshop.md_ro_statuses.active_statuses,
                     }).find((e) => e.key === k.key),

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

@@ -64,7 +64,6 @@ export function ProductionListTable({loading, data, refetch, bodyshop, technicia
                 return {
                     ...ProductionListColumns({
                         bodyshop,
-                        refetch,
                         technician,
                         state,
                         data,
@@ -85,7 +84,6 @@ export function ProductionListTable({loading, data, refetch, bodyshop, technicia
                         ...ProductionListColumns({
                             bodyshop,
                             technician,
-                            refetch,
                             state,
                             data: data,
                             activeStatuses: bodyshop.md_ro_statuses.active_statuses,
@@ -264,7 +262,6 @@ export function ProductionListTable({loading, data, refetch, bodyshop, technicia
                             state={state}
                             setState={setState}
                             setColumns={setColumns}
-                            refetch={refetch}
                             data={data}
                         />
 

client/src/components/report-center-modal/report-center-modal-filters-sorters-component.jsx

@@ -1,48 +1,56 @@
-import {Button, Card, Checkbox, Col, Form, Input, InputNumber, Row, Select} from "antd";
-import React, {useCallback, useEffect, useMemo, useState} from "react";
+import {Button, Col, Form, Input, InputNumber, Row, Select} from "antd";
+import React, {useEffect, useState} from "react";
 import {fetchFilterData} from "../../utils/RenderTemplate";
 import {DeleteFilled} from "@ant-design/icons";
 import {useTranslation} from "react-i18next";
-import {getOrderOperatorsByType, getWhereOperatorsByType} from "../../utils/graphQLmodifier";
-import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
-import {generateInternalReflections} from "./report-center-modal-utils";
-import {FormDatePicker} from "../form-date-picker/form-date-picker.component.jsx";
+import {getOperatorsByType} from "../../utils/graphQLmodifier";
 
-export default function ReportCenterModalFiltersSortersComponent({form, bodyshop}) {
+export default function ReportCenterModalFiltersSortersComponent({form}) {
     return (
         <Form.Item style={{margin: 0, padding: 0}} dependencies={["key"]}>
             {() => {
                 const key = form.getFieldValue("key");
-                return <RenderFilters form={form} templateId={key} bodyshop={bodyshop}/>;
+                return <RenderFilters form={form} templateId={key}/>;
             }}
         </Form.Item>
     );
 }
 
-/**
- * Filters Section
- * @param filters
- * @param form
- * @param bodyshop
- * @returns {JSX.Element}
- * @constructor
- */
-function FiltersSection({filters, form, bodyshop}) {
+function RenderFilters({templateId, form}) {
+    const [state, setState] = useState(null);
     const {t} = useTranslation();
 
+    useEffect(() => {
+        const fetch = async () => {
+            const data = await fetchFilterData({name: templateId});
+            if (data?.success) {
+                setState(data.data);
+            } else {
+                setState(null);
+            }
+        };
+
+        if (templateId) {
+            fetch();
+        }
+    }, [templateId]);
+
+
+    if (!templateId || !state) return null;
     return (
-        <Card type='inner' title={t('reportcenter.labels.advanced_filters_filters')} style={{marginTop: '10px'}}>
+        <div>
             <Form.List name={["filters"]}>
-                {(fields, {add, remove}) => {
+                {(fields, {add, remove, move}) => {
                     return (
                         <div>
+                            Filters
                             {fields.map((field, index) => (
                                 <Form.Item key={field.key}>
                                     <Row gutter={[16, 16]}>
                                         <Col span={10}>
                                             <Form.Item
                                                 key={`${index}field`}
-                                                label={t('reportcenter.labels.advanced_filters_filter_field')}
+                                                label="field"
                                                 name={[field.name, "field"]}
                                                 rules={[
                                                     {
@@ -52,36 +60,31 @@ function FiltersSection({filters, form, bodyshop}) {
                                                 ]}
                                             >
                                                 <Select
-                                                    getPopupContainer={trigger => trigger.parentNode}
-                                                    onChange={() => {
-                                                        // Clear related Fields
-                                                        form.setFieldValue(['filters', field.name, 'value'], null);
-                                                        form.setFieldValue(['filters', field.name, 'operator'], null);
-                                                    }}
                                                     options={
-                                                        filters.map((f) => {
-                                                            return {
-                                                                value: f.name,
-                                                                label: f?.translation ? (t(f.translation) === f.translation ? f.label : t(f.translation)) : f.label,
-                                                            }
-                                                        })
+                                                        state.filters
+                                                            ? state.filters.map((f) => {
+                                                                return {
+                                                                    value: f.name,
+                                                                    label: f?.translation ? (t(f.translation) === f.translation ? f.label : t(f.translation)) : f.label,
+                                                                }
+                                                            })
+                                                            : []
                                                     }
                                                 />
                                             </Form.Item>
                                         </Col>
                                         <Col span={6}>
-                                            <Form.Item
-                                                dependencies={[['filters', field.name, "field"],['filters', field.name, "value"]]}
-                                            >
+                                            <Form.Item dependencies={[['filters', field.name, "field"]]}>
                                                 {
                                                     () => {
                                                         const name = form.getFieldValue(['filters', field.name, "field"]);
-                                                        const type = filters.find(f => f.name === name)?.type;
+                                                        const type = state.filters.find(f => f.name === name)?.type;
 
                                                         return <Form.Item
                                                             key={`${index}operator`}
-                                                            label={t('reportcenter.labels.advanced_filters_filter_operator')}
+                                                            label="operator"
                                                             name={[field.name, "operator"]}
+                                                            dependencies={[]}
                                                             rules={[
                                                                 {
                                                                     required: true,
@@ -89,38 +92,23 @@ function FiltersSection({filters, form, bodyshop}) {
                                                                 },
                                                             ]}
                                                         >
-                                                            <Select
-                                                                getPopupContainer={trigger => trigger.parentNode}
-                                                                options={   getWhereOperatorsByType(type)}
-                                                                onChange={() => {
-                                                                    // Clear related Fields
-
-                                                                    form.setFieldValue(['filters', field.name, 'value'], undefined);
-                                                                }}
-                                                            />
+                                                            <Select options={getOperatorsByType(type)}/>
                                                         </Form.Item>
                                                     }
                                                 }
                                             </Form.Item>
+
                                         </Col>
                                         <Col span={6}>
-                                            <Form.Item dependencies={[
-                                                ['filters', field.name, "field"],
-                                                ['filters', field.name, "operator"]
-                                            ]}
-                                            >
+                                            <Form.Item dependencies={[['filters', field.name, "field"]]}>
                                                 {
                                                     () => {
-                                                        // Because it looks cleaner than inlining.
                                                         const name = form.getFieldValue(['filters', field.name, "field"]);
-                                                        const type = filters.find(f => f.name === name)?.type;
-                                                        const reflector = filters.find(f => f.name === name)?.reflector;
-                                                        const operator = form.getFieldValue(['filters', field.name, "operator"]);
-                                                        const operatorType = operator ? getWhereOperatorsByType(type).find((o) => o.value === operator)?.type : null;
+                                                        const type = state.filters.find(f => f.name === name)?.type;
 
                                                         return <Form.Item
                                                             key={`${index}value`}
-                                                            label={t('reportcenter.labels.advanced_filters_filter_value')}
+                                                            label="value"
                                                             name={[field.name, "value"]}
                                                             rules={[
                                                                 {
@@ -129,99 +117,18 @@ function FiltersSection({filters, form, bodyshop}) {
                                                                 },
                                                             ]}
                                                         >
-                                                            {
-                                                                (() => {
-                                                                    const generateReflections = (reflector) => {
-                                                                        if (!reflector) return [];
-
-                                                                        const {name} = reflector;
-                                                                        const path = name?.split('.');
-                                                                        const upperPath = path?.[0];
-                                                                        const finalPath = path?.slice(1).join('.');
-
-                                                                        return generateInternalReflections({
-                                                                            bodyshop,
-                                                                            upperPath,
-                                                                            finalPath,
-                                                                            t
-                                                                        });
-                                                                    };
-
-                                                                    const reflections = reflector ? generateReflections(reflector) : [];
-                                                                    const fieldPath = [[field.name, "value"]];
-                                                                    // We have reflections so we will use a select box
-                                                                    if (reflections.length > 0) {
-                                                                        // We have reflections and the operator type is array, so we will use a select box with multiple options
-                                                                        if (operatorType === "array") {
-                                                                            return (
-                                                                                <Select
-                                                                                    disabled={!operator}
-                                                                                    mode="multiple"
-                                                                                    options={reflections}
-                                                                                    getPopupContainer={trigger => trigger.parentNode}
-                                                                                    onChange={(value) => {
-                                                                                        form.setFieldValue(fieldPath, value);
-                                                                                    }}
-                                                                                />
-                                                                            );
-                                                                        }
-                                                                        return (
-                                                                            <Select
-                                                                                options={reflections}
-                                                                                getPopupContainer={trigger => trigger.parentNode}
-                                                                                onChange={(value) => {
-                                                                                    form.setFieldValue(fieldPath, value);
-                                                                                }}
-                                                                            />
-                                                                        );
-                                                                    }
-
-                                                                    // We have a type of number, so we will use a number input
-                                                                    if (type === "number") {
-                                                                        return (
-                                                                            <InputNumber
-                                                                                disabled={!operator}
-                                                                                onChange={(value) => form.setFieldValue(fieldPath, value)}/>
-                                                                        );
-                                                                    }
-
-                                                                    // We have a type of date, so we will use a date picker
-                                                                    if (type === "date") {
-                                                                        return (
-                                                                            <FormDatePicker
-                                                                                disabled={!operator}
-                                                                                onChange={(date) => form.setFieldValue(fieldPath, date)}
-                                                                            />
-                                                                        );
-                                                                    }
-
-                                                                    // we have a type of boolean, so we will use a select box with a true or false option.
-                                                                    if (type === "boolean" || type === "bool") {
-                                                                        return (
-                                                                            <Select
-                                                                                disabled={!operator}
-                                                                                getPopupContainer={trigger => trigger.parentNode}
-                                                                                options={[
-                                                                                    {
-                                                                                        label: t('reportcenter.labels.advanced_filters_true'),
-                                                                                        value: true
-                                                                                    },
-                                                                                    {
-                                                                                        label: t('reportcenter.labels.advanced_filters_false'),
-                                                                                        value: false
-                                                                                    }
-                                                                                ]}
-                                                                                onChange={(value) => form.setFieldValue(fieldPath, value)}
-                                                                            />
-                                                                        );
-                                                                    }
-                                                                    return (
-                                                                        <Input
-                                                                            disabled={!operator}
-                                                                            onChange={(e) => form.setFieldValue(fieldPath, e.target.value)}
-                                                                        />
-                                                                    );
-                                                                })()
+                                                            {type === 'number' ?
+                                                                <InputNumber
+                                                                    onChange={(value) => {
+                                                                        form.setFieldsValue({[field.name]: {value: parseInt(value)}});
+                                                                    }}
+                                                                />
+                                                                :
+                                                                <Input
+                                                                    onChange={(value) => {
+                                                                        form.setFieldsValue({[field.name]: {value: value.toString()}});
+                                                                    }}
+                                                                />
                                                             }
                                                         </Form.Item>
                                                     }
@@ -231,7 +138,7 @@ function FiltersSection({filters, form, bodyshop}) {
                                         </Col>
                                         <Col span={2}>
                                             <DeleteFilled
-                                                style={{margin: "1rem", paddingTop: '23px'}}
+                                                style={{margin: "1rem"}}
                                                 onClick={() => {
                                                     remove(field.name);
                                                 }}
@@ -255,23 +162,8 @@ function FiltersSection({filters, form, bodyshop}) {
                     );
                 }}
             </Form.List>
-        </Card>
-    );
-}
-
-/**
- * Sorters Section
- * @param sorters
- * @param form
- * @returns {JSX.Element}
- * @constructor
- */
-function SortersSection({sorters}) {
-    const {t} = useTranslation();
-    return (
-        <Card type='inner' title={t('reportcenter.labels.advanced_filters_sorters')} style={{marginTop: '10px'}}>
             <Form.List name={["sorters"]}>
-                {(fields, {add, remove}) => {
+                {(fields, {add, remove, move}) => {
                     return (
                         <div>
                             Sorters
@@ -281,7 +173,7 @@ function SortersSection({sorters}) {
                                         <Col span={11}>
                                             <Form.Item
                                                 key={`${index}field`}
-                                                label={t('reportcenter.labels.advanced_filters_sorter_field')}
+                                                label="field"
                                                 name={[field.name, "field"]}
                                                 rules={[
                                                     {
@@ -292,19 +184,20 @@ function SortersSection({sorters}) {
                                             >
                                                 <Select
                                                     options={
-                                                        sorters.map((f) => ({
-                                                            value: f.name,
-                                                            label: f?.translation ? (t(f.translation) === f.translation ? f.label : t(f.translation)) : f.label,
-                                                        }))
+                                                        state.sorters
+                                                            ? state.sorters.map((f) => ({
+                                                                value: f.name,
+                                                                label: t(f.translation),
+                                                            }))
+                                                            : []
                                                     }
-                                                    getPopupContainer={trigger => trigger.parentNode}
                                                 />
                                             </Form.Item>
                                         </Col>
                                         <Col span={11}>
                                             <Form.Item
                                                 key={`${index}direction`}
-                                                label={t('reportcenter.labels.advanced_filters_sorter_direction')}
+                                                label="direction"
                                                 name={[field.name, "direction"]}
                                                 rules={[
                                                     {
@@ -314,15 +207,17 @@ function SortersSection({sorters}) {
                                                 ]}
                                             >
                                                 <Select
-                                                    options={getOrderOperatorsByType()}
-                                                    getPopupContainer={trigger => trigger.parentNode}
+                                                    options={[
+                                                        {value: "desc", label: "Descending"},
+                                                        {value: "asc", label: "Ascending"},
+                                                    ]}
                                                 />
                                             </Form.Item>
                                         </Col>
 
                                         <Col span={2}>
                                             <DeleteFilled
-                                                style={{margin: "1rem", paddingTop: '23px'}}
+                                                style={{margin: "1rem"}}
                                                 onClick={() => {
                                                     remove(field.name);
                                                 }}
@@ -346,87 +241,6 @@ function SortersSection({sorters}) {
                     );
                 }}
             </Form.List>
-        </Card>
-    );
-}
-
-/**
- * Render Filters
- * @param templateId
- * @param form
- * @param bodyshop
- * @returns {JSX.Element|null}
- * @constructor
- */
-function RenderFilters({templateId, form, bodyshop}) {
-    const [state, setState] = useState(null);
-    const [visible, setVisible] = useState(false);
-    const [isLoading, setIsLoading] = useState(false);
-    const {t} = useTranslation();
-
-    const fetch = useCallback(async () => {
-        // Reset all the filters and Sorters.
-        form.resetFields(['filters']);
-        form.resetFields(['sorters']);
-        form.resetFields(['defaultSorters']);
-
-        setIsLoading(true);
-
-        const data = await fetchFilterData({name: templateId});
-
-        // We have Success
-        if (data?.success) {
-            if (data?.data?.sorters && data?.data?.sorters.length > 0) {
-                const defaultSorters = data?.data?.sorters.filter((sorter) => sorter.hasOwnProperty('default')).map((sorter) => {
-                    return {
-                        field: sorter.name,
-                        direction: sorter.default.direction
-                    };
-                }).sort((a, b) => a.default.order - b.default.order);
-
-                form.setFieldValue('defaultSorters', JSON.stringify(defaultSorters));
-            }
-            // Set the state
-            setState(data.data);
-        }
-        // Something went wrong fetching filter data
-        else {
-            setState(null);
-        }
-        setIsLoading(false);
-    }, [templateId, form]);
-
-    useEffect(() => {
-        if (templateId) {
-            fetch();
-
-        }
-    }, [templateId, fetch]);
-
-    const filters = useMemo(() => state?.filters || [], [state]);
-    const sorters = useMemo(() => state?.sorters || [], [state]);
-
-    if (!templateId) return null;
-    if (isLoading) return <LoadingSkeleton/>;
-    if (!state) return null;
-
-    return (
-        <div style={{marginTop: '10px'}}>
-            <Checkbox
-                checked={visible}
-                onChange={(e) => setVisible(e.target.checked)}
-                children={t('reportcenter.labels.advanced_filters')}
-            />
-            {visible && (
-                <div>
-                    {filters.length > 0 && (
-                        <FiltersSection filters={filters} form={form} bodyshop={bodyshop}/>
-                    )}
-                    {sorters.length > 0 && (
-                        <SortersSection sorters={sorters} form={form}/>
-                    )}
-                </div>
-            )}
         </div>
     );
-}
+}

client/src/components/report-center-modal/report-center-modal-utils.js

@@ -1,161 +0,0 @@
-import {uniqBy} from "lodash";
-
-/**
- * Get value from path
- * @param obj
- * @param path
- * @returns {*}
- */
-const getValueFromPath = (obj, path) => path.split('.').reduce((prev, curr) => prev?.[curr], obj);
-
-/**
- * Generate options from array
- * @param bodyshop
- * @param path
- * @returns {unknown[]}
- */
-const generateOptionsFromArray = (bodyshop, path) => {
-    const options = getValueFromPath(bodyshop, path);
-    return uniqBy(options.map((value) => ({
-        label: value,
-        value: value,
-    })), 'value');
-}
-
-/**
- * Valid internal reflections
- * Note: This is intended for future functionality
- * @type {{special: string[], bodyshop: [{name: string, type: string}]}}
- */
-const VALID_INTERNAL_REFLECTIONS = {
-    bodyshop: [
-        {
-            name: 'md_ro_statuses.statuses',
-            type: 'kv-to-v'
-        }
-    ],
-};
-
-/**
- * Generate options
- * @param bodyshop
- * @param path
- * @param labelPath
- * @param valuePath
- * @returns {{label: *, value: *}[]}
- */
-const generateOptionsFromObject = (bodyshop, path, labelPath, valuePath) => {
-    const options = getValueFromPath(bodyshop, path);
-    return uniqBy(Object.values(options).map((value) => ({
-        label: value[labelPath],
-        value: value[valuePath],
-    })), 'value');
-}
-
-/**
- * Generate special reflections
- * @param bodyshop
- * @param finalPath
- * @param t - i18n
- * @returns {{label: *, value: *}[]|{label: *, value: *}[]|{label: string, value: *}[]|*[]}
- */
-const generateSpecialReflections = (bodyshop, finalPath, t) => {
-    switch (finalPath) {
-        case 'payment_payers':
-            return [
-                {
-                    label: t("payments.labels.customer"),
-                    value: t("payments.labels.customer"),
-                },
-                {
-                    label: t("payments.labels.insurance"),
-                    value: t("payments.labels.insurance"),
-                },
-                // This is a weird one supposedly only used by one shop and could potentially be
-                // placed behind a SplitSDK
-                {
-                    label: t("payments.labels.external"),
-                    value: t("payments.labels.external"),
-                }
-            ];
-        case 'payment_types':
-            return generateOptionsFromArray(bodyshop, 'md_payment_types');
-        case 'alt_transports':
-            return generateOptionsFromArray(bodyshop, 'appt_alt_transport');
-        case 'lost_sale_reasons':
-            return generateOptionsFromArray(bodyshop, 'md_lost_sale_reasons');
-        // Special case because Referral Sources is an Array, not an Object.
-        case 'referral_source':
-            return generateOptionsFromArray(bodyshop, 'md_referral_sources');
-        case 'class':
-            return generateOptionsFromArray(bodyshop, 'md_classes');
-        case 'cost_centers':
-            return generateOptionsFromObject(bodyshop, 'md_responsibility_centers.costs', 'name', 'name');
-        // Special case because Categories is an Array, not an Object.
-        case 'categories':
-            return generateOptionsFromArray(bodyshop, 'md_categories');
-        case 'insurance_companies':
-            return generateOptionsFromObject(bodyshop, 'md_ins_cos', 'name', 'name');
-        case 'employee_teams':
-            return generateOptionsFromObject(bodyshop, 'employee_teams', 'name', 'id');
-        // Special case because Employees uses a concatenation of first_name and last_name
-        case 'employees':
-            const employeesOptions = getValueFromPath(bodyshop, 'employees');
-            return uniqBy(Object.values(employeesOptions).map((value) => ({
-                label: `${value.first_name} ${value.last_name}`,
-                value: value.id,
-            })), 'value');
-        case 'last_names':
-            return generateOptionsFromObject(bodyshop, 'employees', 'last_name', 'last_name');
-        case 'first_names':
-            return generateOptionsFromObject(bodyshop, 'employees', 'first_name', 'first_name');
-        case 'job_statuses':
-            const statusOptions = getValueFromPath(bodyshop, 'md_ro_statuses.statuses');
-            return Object.values(statusOptions).map((value) => ({
-                label: value,
-                value
-            }));
-        default:
-            console.error('Invalid Special reflection provided by  Report Filters');
-            return [];
-    }
-}
-
-/**
- *  Generate bodyshop reflections
- * @param bodyshop
- * @param finalPath
- * @returns {{label: *, value: *}[]|*[]}
- */
-const generateBodyshopReflections = (bodyshop, finalPath) => {
-    const options = getValueFromPath(bodyshop, finalPath);
-    const reflectionRenderer = VALID_INTERNAL_REFLECTIONS.bodyshop.find(reflection => reflection.name === finalPath);
-    if (reflectionRenderer?.type === 'kv-to-v') {
-        return Object.values(options).map((value) => ({
-            label: value,
-            value
-        }));
-    }
-    return [];
-}
-
-/**
- * Generate internal reflections based on the path and bodyshop
- * @param bodyshop
- * @param upperPath
- * @param finalPath
- * @param t - i18n
- * @returns {{label: *, value: *}[]|[]|{label: *, value: *}[]|{label: string, value: *}[]|{label: *, value: *}[]|*[]}
- */
-const generateInternalReflections = ({bodyshop, upperPath, finalPath, t}) => {
-    switch (upperPath) {
-        case 'special':
-            return generateSpecialReflections(bodyshop, finalPath, t);
-        case 'bodyshop':
-            return generateBodyshopReflections(bodyshop, finalPath);
-        default:
-            return [];
-    }
-};
-
-export {generateInternalReflections}

client/src/components/report-center-modal/report-center-modal.component.jsx

@@ -16,11 +16,9 @@ import EmployeeSearchSelect from "../employee-search-select/employee-search-sele
 import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
 import "./report-center-modal.styles.scss";
 import ReportCenterModalFiltersSortersComponent from "./report-center-modal-filters-sorters-component";
-import {selectBodyshop} from "../../redux/user/user.selectors";
 
 const mapStateToProps = createStructuredSelector({
     reportCenterModal: selectReportCenter,
-    bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
     //setUserLanguage: language => dispatch(setUserLanguage(language))
@@ -30,7 +28,7 @@ export default connect(
     mapDispatchToProps
 )(ReportCenterModalComponent);
 
-export function ReportCenterModalComponent({reportCenterModal, bodyshop}) {
+export function ReportCenterModalComponent({reportCenterModal}) {
     const [form] = Form.useForm();
     const [search, setSearch] = useState("");
 
@@ -64,33 +62,24 @@ export function ReportCenterModalComponent({reportCenterModal, bodyshop}) {
         setLoading(true);
         const start = values.dates ? values.dates[0] : null;
         const end = values.dates ? values.dates[1] : null;
-        const {id} = values;
+        const { id } = values;
 
-        const templateConfig =
+        await GenerateDocument(
             {
                 name: values.key,
                 variables: {
                     ...(start
-                        ? {start: dayjs(start).startOf("day").format("YYYY-MM-DD")}
+                        ? { start: dayjs(start).startOf("day").format("YYYY-MM-DD") }
                         : {}),
-                    ...(end
-                        ? {end: dayjs(end).endOf("day").format("YYYY-MM-DD")}
-                        : {}),
-                    ...(start ? {starttz: dayjs(start).startOf("day")} : {}),
-                    ...(end ? {endtz: dayjs(end).endOf("day")} : {}),
+                    ...(end ? { end: dayjs(end).endOf("day").format("YYYY-MM-DD") } : {}),
+                    ...(start ? { starttz: dayjs(start).startOf("day") } : {}),
+                    ...(end ? { endtz: dayjs(end).endOf("day") } : {}),
 
-                    ...(id ? {id: id} : {}),
+                    ...(id ? { id: id } : {}),
                 },
                 filters: values.filters,
                 sorters: values.sorters,
-            };
-
-        if (_.isString(values.defaultSorters) && !_.isEmpty(values.defaultSorters)) {
-            templateConfig.defaultSorters = JSON.parse(values.defaultSorters);
-        }
-
-        await GenerateDocument(
-            templateConfig,
+            },
             {
                 to: values.to,
                 subject: Templates[values.key]?.subject,
@@ -128,7 +117,6 @@ export function ReportCenterModalComponent({reportCenterModal, bodyshop}) {
                     onChange={(e) => setSearch(e.target.value)}
                     value={search}
                 />
-                <Form.Item name="defaultSorters" hidden/>
                 <Form.Item
                     name="key"
                     label={t("reportcenter.labels.key")}
@@ -161,7 +149,7 @@ export function ReportCenterModalComponent({reportCenterModal, bodyshop}) {
                                         <Typography.Title level={4}>
                                             {t(`reportcenter.labels.groups.${key}`)}
                                         </Typography.Title>
-                                        <ul style={{listStyleType: 'none', columns: "2 auto"}}>
+                                        <ul style={{  listStyleType: 'none', columns: "2 auto"}}>
                                             {grouped[key].map((item) => (
                                                 <li key={item.key}>
                                                     <Radio key={item.key} value={item.key}>
@@ -193,7 +181,7 @@ export function ReportCenterModalComponent({reportCenterModal, bodyshop}) {
                         );
                     }}
                 </Form.Item>
-                <ReportCenterModalFiltersSortersComponent form={form} bodyshop={bodyshop}/>
+                <ReportCenterModalFiltersSortersComponent form={form} />
                 <Form.Item style={{margin: 0, padding: 0}} dependencies={["key"]}>
                     {() => {
                         const key = form.getFieldValue("key");
@@ -318,4 +306,3 @@ export function ReportCenterModalComponent({reportCenterModal, bodyshop}) {
         </div>
     );
 }
-

client/src/components/schedule-job-modal/schedule-job-modal.container.jsx

@@ -30,8 +30,8 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = (dispatch) => ({
     toggleModalVisible: () => dispatch(toggleModalVisible("schedule")),
     setEmailOptions: (e) => dispatch(setEmailOptions(e)),
-    insertAuditTrail: ({jobid, operation, type}) =>
-        dispatch(insertAuditTrail({jobid, operation, type })),
+    insertAuditTrail: ({jobid, operation}) =>
+        dispatch(insertAuditTrail({jobid, operation})),
 });
 
 export function ScheduleJobModalContainer({
@@ -142,7 +142,7 @@ export function ScheduleJobModalContainer({
                 operation: AuditTrailMapping.appointmentinsert(
                     DateTimeFormat(values.start)
                 ),
-            type: "appointmentinsert",});
+            });
         }
 
         if (!!appt.errors) {

client/src/components/scoreboard-day-stats/scoreboard-day-stats.component.jsx

@@ -26,8 +26,6 @@ export function ScoreboardDayStats({bodyshop, date, entries}) {
         return acc + value.bodyhrs;
     }, 0);
 
-    const numJobs = entries.length;
-
     return (
         <Card
             title={dayjs(date).format("D - ddd")}
@@ -36,18 +34,17 @@ export function ScoreboardDayStats({bodyshop, date, entries}) {
         >
             <Statistic
                 valueStyle={{color: dailyBodyTarget > bodyHrs ? "red" : "green"}}
-                label="Body"
+                label="B"
                 value={bodyHrs.toFixed(1)}
             />
             <Statistic
                 valueStyle={{color: dailyPaintTarget > paintHrs ? "red" : "green"}}
-                label="Refinish"
+                label="P"
                 value={paintHrs.toFixed(1)}
             />
             <Divider style={{margin: 0}}/>
-            <Statistic label="Total" value={(bodyHrs + paintHrs).toFixed(1)}/>
-            <Divider style={{ margin: 0 }} />
-            <Statistic label="Jobs" value={numJobs} />
+
+            <Statistic value={(bodyHrs + paintHrs).toFixed(1)}/>
         </Card>
     );
 }

client/src/components/scoreboard-entry-edit/scoreboard-entry-edit.component.jsx

@@ -1,6 +1,5 @@
 import {useMutation} from "@apollo/client";
-import {Button, Card, Dropdown, Form, InputNumber, notification, Space,} from "antd";
-import dayjs from "../../utils/day";
+import {Button, Card, Dropdown, Form, InputNumber, notification} from "antd";
 import React, {useState} from "react";
 import {useTranslation} from "react-i18next";
 import {UPDATE_SCOREBOARD_ENTRY} from "../../graphql/scoreboard.queries";
@@ -14,7 +13,6 @@ export default function ScoreboardEntryEdit({entry}) {
 
     const handleFinish = async (values) => {
         setLoading(true);
-        values.date = dayjs(values.date).format("YYYY-MM-DD");
         const result = await updateScoreboardentry({
             variables: {sbId: entry.id, sbInput: values},
         });
@@ -84,14 +82,13 @@ export default function ScoreboardEntryEdit({entry}) {
                             >
                                 <InputNumber precision={1}/>
                             </Form.Item>
-                            <Space wrap>
+
                             <Button type="primary" loading={loading} htmlType="submit">
                                 {t("general.actions.save")}
                             </Button>
                             <Button onClick={() => setOpen(false)}>
                                 {t("general.actions.cancel")}
                             </Button>
-                            </Space>
                         </Form>
                     </Card>
                 )

client/src/components/scoreboard-jobs-list/scoreboard-jobs-list.component.jsx

@@ -1,4 +1,3 @@
-import {SyncOutlined} from "@ant-design/icons";
 import {useQuery} from "@apollo/client";
 import {Button, Card, Input, Modal, Space, Table, Typography} from "antd";
 import React, {useState} from "react";
@@ -6,13 +5,12 @@ import {useTranslation} from "react-i18next";
 import {Link} from "react-router-dom";
 import {QUERY_SCOREBOARD_PAGINATED} from "../../graphql/scoreboard.queries";
 import {DateFormatter} from "../../utils/DateFormatter";
-import {pageLimit} from "../../utils/config";
-import {alphaSort, dateSort} from "../../utils/sorters";
 import AlertComponent from "../alert/alert.component";
-import OwnerNameDisplay, {OwnerNameDisplayFunction,} from "../owner-name-display/owner-name-display.component";
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import ScoreboardEntryEdit from "../scoreboard-entry-edit/scoreboard-entry-edit.component";
 import ScoreboardRemoveButton from "../scoreboard-remove-button/scorebard-remove-button.component";
-
+import {SyncOutlined} from "@ant-design/icons";
+import {pageLimit} from "../../utils/config";
 
 export default function ScoreboardJobsList({scoreBoardlist}) {
     const {t} = useTranslation();
@@ -47,7 +45,7 @@ export default function ScoreboardJobsList({scoreBoardlist}) {
             title: t("jobs.fields.ro_number"),
             dataIndex: "ro_number",
             key: "ro_number",
-            sorter: (a, b) => alphaSort(a.job.ro_number, b.job.ro_number), render: (text, record) => (
+            render: (text, record) => (
                 <Link to={"/manage/jobs/" + record.job.id}>
                     {record.job.ro_number || t("general.labels.na")}
                 </Link>
@@ -57,11 +55,8 @@ export default function ScoreboardJobsList({scoreBoardlist}) {
             title: t("jobs.fields.owner"),
             dataIndex: "owner",
             key: "owner",
-            ellipsis: true, sorter: (a, b) =>
-                alphaSort(
-                    OwnerNameDisplayFunction(a.job),
-                    OwnerNameDisplayFunction(b.job)
-                ),
+            ellipsis: true,
+
             render: (text, record) => <OwnerNameDisplay ownerObject={record.job}/>,
         },
         {
@@ -69,15 +64,7 @@ export default function ScoreboardJobsList({scoreBoardlist}) {
             dataIndex: "vehicle",
             key: "vehicle",
             ellipsis: true,
-            sorter: (a, b) =>
-                alphaSort(
-                    `${a.job.v_model_yr || ""} ${a.job.v_make_desc || ""} ${
-                        a.job.v_model_desc || ""
-                    }`,
-                    `${b.job.v_model_yr || ""} ${b.job.v_make_desc || ""} ${
-                        b.job.v_model_desc || ""
-                    }`
-                ), render: (text, record) => (
+            render: (text, record) => (
                 <span>{`${record.job.v_model_yr || ""} ${
                     record.job.v_make_desc || ""
                 } ${record.job.v_model_desc || ""}`}</span>
@@ -87,20 +74,17 @@ export default function ScoreboardJobsList({scoreBoardlist}) {
             title: t("scoreboard.fields.date"),
             dataIndex: "date",
             key: "date",
-            sorter: (a, b) => dateSort(a.date, b.date),
             render: (text, record) => <DateFormatter>{record.date}</DateFormatter>,
         },
-        {
-            title: t("scoreboard.fields.bodyhrs"),
-            dataIndex: "bodyhrs",
-            key: "bodyhrs",
-            sorter: (a, b) => Number(a.bodyhrs) - Number(b.bodyhrs),
-        },
         {
             title: t("scoreboard.fields.painthrs"),
             dataIndex: "painthrs",
             key: "painthrs",
-            sorter: (a, b) => Number(a.painthrs) - Number(b.painthrs),
+        },
+        {
+            title: t("scoreboard.fields.bodyhrs"),
+            dataIndex: "bodyhrs",
+            key: "bodyhrs",
         },
         {
             title: t("general.labels.actions"),
@@ -121,9 +105,11 @@ export default function ScoreboardJobsList({scoreBoardlist}) {
                 open={state.open}
                 destroyOnClose
                 width="80%"
-                closable={false}
                 cancelButtonProps={{style: {display: "none"}}}
-                onOk={() =>
+                onOk={() => {
+                    setState((state) => ({...state, open: false}));
+                }}
+                onCancel={() =>
                     setState((state) => ({
                         ...state,
                         open: false,
@@ -175,7 +161,9 @@ export default function ScoreboardJobsList({scoreBoardlist}) {
                 </Card>
             </Modal>
             <Button
-                onClick={() => setState((state) => ({...state, open: true}))}
+                onClick={() => {
+                    setState((state) => ({...state, open: true}))
+                }}
             >
                 {t("scoreboard.labels.entries")}
             </Button>

client/src/components/scoreboard-targets-table/scoreboard-targets-table.component.jsx

@@ -26,260 +26,227 @@ export function ScoreboardTargetsTable({bodyshop, scoreBoardlist}) {
     const values = useMemo(() => {
         const dateHash = _.groupBy(scoreBoardlist, "date");
 
-    let ret = {
-      todayBody: 0,
-      todayPaint: 0,
-      todayJobs: 0,
-      weeklyPaint: 0,
-      weeklyJobs: 0,
-      weeklyBody: 0,
-      toDateBody: 0,
-      toDatePaint: 0,
-      toDateJobs: 0,
-    };
+        let ret = {
+            todayBody: 0,
+            todayPaint: 0,
+            weeklyPaint: 0,
+            weeklyBody: 0,
+            toDateBody: 0,
+            toDatePaint: 0,
+        };
 
-    const today = dayjs();
-    if (dateHash[today.format("YYYY-MM-DD")]) {
-      dateHash[today.format("YYYY-MM-DD")].forEach((d) => {
-        ret.todayBody = ret.todayBody + d.bodyhrs;
-        ret.todayPaint = ret.todayPaint + d.painthrs;
-        ret.todayJobs++;
-      });
-    }
+        const today = dayjs();
+        if (dateHash[today.format("YYYY-MM-DD")]) {
+            dateHash[today.format("YYYY-MM-DD")].forEach((d) => {
+                ret.todayBody = ret.todayBody + d.bodyhrs;
+                ret.todayPaint = ret.todayPaint + d.painthrs;
+            });
+        }
 
-    let StartOfWeek = dayjs().startOf("week");
-    while (StartOfWeek.isSameOrBefore(today)) {
-      if (dateHash[StartOfWeek.format("YYYY-MM-DD")]) {
-        dateHash[StartOfWeek.format("YYYY-MM-DD")].forEach((d) => {
-          ret.weeklyBody = ret.weeklyBody + d.bodyhrs;
-          ret.weeklyPaint = ret.weeklyPaint + d.painthrs;
-          ret.weeklyJobs++;
-        });
-      }
-      StartOfWeek = StartOfWeek.add(1, "day");
-    }
+        let StartOfWeek = dayjs().startOf("week");
+        while (StartOfWeek.isSameOrBefore(today)) {
+            if (dateHash[StartOfWeek.format("YYYY-MM-DD")]) {
+                dateHash[StartOfWeek.format("YYYY-MM-DD")].forEach((d) => {
+                    ret.weeklyBody = ret.weeklyBody + d.bodyhrs;
+                    ret.weeklyPaint = ret.weeklyPaint + d.painthrs;
+                });
+            }
+            StartOfWeek = StartOfWeek.add(1, "day");
+        }
 
-    let startOfMonth = dayjs().startOf("month");
-    while (startOfMonth.isSameOrBefore(today)) {
-      if (dateHash[startOfMonth.format("YYYY-MM-DD")]) {
-        dateHash[startOfMonth.format("YYYY-MM-DD")].forEach((d) => {
-          ret.toDateBody = ret.toDateBody + d.bodyhrs;
-          ret.toDatePaint = ret.toDatePaint + d.painthrs;
-          ret.toDateJobs++;
-        });
-      }
-      startOfMonth = startOfMonth.add(1, "day");
-    }
+        let startOfMonth = dayjs().startOf("month");
+        while (startOfMonth.isSameOrBefore(today)) {
+            if (dateHash[startOfMonth.format("YYYY-MM-DD")]) {
+                dateHash[startOfMonth.format("YYYY-MM-DD")].forEach((d) => {
+                    ret.toDateBody = ret.toDateBody + d.bodyhrs;
+                    ret.toDatePaint = ret.toDatePaint + d.painthrs;
+                });
+            }
+            startOfMonth = startOfMonth.add(1, "day");
+        }
 
         return ret;
     }, [scoreBoardlist]);
 
-  return (
-    <Card
-      title={t("scoreboard.labels.targets")}
-      extra={<ScoreboardJobsList scoreBoardlist={scoreBoardlist} />}
-    >
-      <Row gutter={rowGutter}>
-        <Col xs={24} sm={{ offset: 0, span: 4 }} lg={{ span: 4 }}>
-          <Statistic
-            title={t("scoreboard.labels.workingdays")}
-            value={Util.CalculateWorkingDaysThisMonth()}
-            prefix={<CalendarOutlined />}
-          />
-        </Col>
-        <Col xs={24} sm={{ offset: 0, span: 20 }} lg={{ offset: 0, span: 20 }}>
-          <Row>
-            <Col {...statSpans}>
-              <Statistic
-                title={t("scoreboard.labels.dailytarget")}
-                value={bodyshop.scoreboard_target.dailyBodyTarget}
-                prefix={t("scoreboard.labels.bodyabbrev")}
-              />
-            </Col>
-            <Col {...statSpans}>
-              <Statistic
-                title={t("scoreboard.labels.dailyactual")}
-                value={values.todayBody.toFixed(1)}
-              />
-            </Col>
-            <Col {...statSpans}>
-              <Statistic
-                title={t("scoreboard.labels.weeklytarget")}
-                value={Util.WeeklyTargetHrs(
-                  bodyshop.scoreboard_target.dailyBodyTarget,
-                  bodyshop
-                )}
-              />
-            </Col>
-            <Col {...statSpans}>
-              <Statistic
-                title={t("scoreboard.labels.weeklyactual")}
-                value={values.weeklyBody.toFixed(1)}
-              />
-            </Col>
-            <Col {...statSpans}>
-              <Statistic
-                title={t("scoreboard.labels.monthlytarget")}
-                value={Util.MonthlyTargetHrs(
-                  bodyshop.scoreboard_target.dailyBodyTarget,
-                  bodyshop
-                )}
-              />
-            </Col>
-            <Col {...statSpans}>
-              <Statistic
-                title={t("scoreboard.labels.asoftodaytarget")}
-                value={Util.AsOfTodayTargetHrs(
-                  bodyshop.scoreboard_target.dailyBodyTarget,
-                  bodyshop
-                )}
-              />
-            </Col>
-            <Col {...statSpans}>
-              <Statistic
-                title={t("scoreboard.labels.todateactual")}
-                value={values.toDateBody.toFixed(1)}
-              />
-            </Col>
-          </Row>
-          <Row>
-            <Col {...statSpans}>
-              <Statistic
-                value={bodyshop.scoreboard_target.dailyPaintTarget}
-                prefix={t("scoreboard.labels.refinishabbrev")}
-              />
-            </Col>
-            <Col {...statSpans}>
-              <Statistic value={values.todayPaint.toFixed(1)} />
-            </Col>
-            <Col {...statSpans}>
-              <Statistic
-                value={Util.WeeklyTargetHrs(
-                  bodyshop.scoreboard_target.dailyPaintTarget,
-                  bodyshop
-                )}
-              />
-            </Col>
-            <Col {...statSpans}>
-              <Statistic value={values.weeklyPaint.toFixed(1)} />
-            </Col>
-            <Col {...statSpans}>
-              <Statistic
-                value={Util.MonthlyTargetHrs(
-                  bodyshop.scoreboard_target.dailyPaintTarget,
-                  bodyshop
-                )}
-              />
-            </Col>
-            <Col {...statSpans}>
-              <Statistic
-                value={Util.AsOfTodayTargetHrs(
-                  bodyshop.scoreboard_target.dailyPaintTarget,
-                  bodyshop
-                )}
-              />
-            </Col>
-            <Col {...statSpans}>
-              <Statistic value={values.toDatePaint.toFixed(1)} />
-            </Col>
-          </Row>
-          <Row>
-            <Divider style={{ margin: 5 }} />
-          </Row>
-          <Row>
-            <Col {...statSpans}>
-              <Statistic
-                value={"\u00A0"}
-                prefix={t("scoreboard.labels.total")}
-              />
-            </Col>
-            <Col {...statSpans}>
-              <Statistic
-                value={(values.todayPaint + values.todayBody).toFixed(1)}
-              />
-            </Col>
-            <Col {...statSpans}>
-              <Statistic
-                value={(
-                  Util.WeeklyTargetHrs(
-                    bodyshop.scoreboard_target.dailyBodyTarget,
-                    bodyshop
-                  ) +
-                  Util.WeeklyTargetHrs(
-                    bodyshop.scoreboard_target.dailyPaintTarget,
-                    bodyshop
-                  )
-                ).toFixed(1)}
-              />
-            </Col>
-            <Col {...statSpans}>
-              <Statistic
-                value={(values.weeklyPaint + values.weeklyBody).toFixed(1)}
-              />
-            </Col>
-            <Col {...statSpans}>
-              <Statistic
-                value={(
-                  Util.MonthlyTargetHrs(
-                    bodyshop.scoreboard_target.dailyBodyTarget,
-                    bodyshop
-                  ) +
-                  Util.MonthlyTargetHrs(
-                    bodyshop.scoreboard_target.dailyPaintTarget,
-                    bodyshop
-                  )
-                ).toFixed(1)}
-              />
-            </Col>
-            <Col {...statSpans}>
-              <Statistic
-                value={(
-                  Util.AsOfTodayTargetHrs(
-                    bodyshop.scoreboard_target.dailyBodyTarget,
-                    bodyshop
-                  ) +
-                  Util.AsOfTodayTargetHrs(
-                    bodyshop.scoreboard_target.dailyPaintTarget,
-                    bodyshop
-                  )
-                ).toFixed(1)}
-              />
-            </Col>
-            <Col {...statSpans}>
-              <Statistic
-                value={(values.toDatePaint + values.toDateBody).toFixed(1)}
-              />
-            </Col>
-          </Row>
-          <Row>
-            <Divider style={{ margin: 5 }} />
-          </Row>
-          <Row>
-            <Col {...statSpans}>
-              <Statistic
-                value={"\u00A0"}
-                prefix={t("scoreboard.labels.jobs")}
-              />
-            </Col>
-            <Col {...statSpans}>
-              <Statistic value={values.todayJobs} />
-            </Col>
-            <Col {...statSpans} />
-            <Col {...statSpans}>
-              <Statistic value={values.weeklyJobs} />
-            </Col>
-            <Col {...statSpans} />
-            <Col {...statSpans} />
-            <Col {...statSpans}>
-              <Statistic value={values.toDateJobs} />
-            </Col>
-          </Row>
-        </Col>
-      </Row>
-    </Card>
-  );
+    return (
+        <Card
+            title={t("scoreboard.labels.targets")}
+            extra={<ScoreboardJobsList scoreBoardlist={scoreBoardlist}/>}
+        >
+            <Row gutter={rowGutter}>
+                <Col xs={24} sm={{offset: 0, span: 4}} lg={{span: 4}}>
+                    <Statistic
+                        title={t("scoreboard.labels.workingdays")}
+                        value={Util.CalculateWorkingDaysThisMonth()}
+                        prefix={<CalendarOutlined/>}
+                    />
+                </Col>
+                <Col xs={24} sm={{offset: 0, span: 20}} lg={{offset: 0, span: 20}}>
+                    <Row>
+                        <Col {...statSpans}>
+                            <Statistic
+                                title={t("scoreboard.labels.dailytarget")}
+                                value={bodyshop.scoreboard_target.dailyBodyTarget}
+                                prefix="B"
+                            />
+                        </Col>
+                        <Col {...statSpans}>
+                            <Statistic
+                                title={t("scoreboard.labels.dailyactual")}
+                                value={values.todayBody.toFixed(1)}
+                            />
+                        </Col>
+                        <Col {...statSpans}>
+                            <Statistic
+                                title={t("scoreboard.labels.weeklytarget")}
+                                value={Util.WeeklyTargetHrs(
+                                    bodyshop.scoreboard_target.dailyBodyTarget,
+                                    bodyshop
+                                )}
+                            />
+                        </Col>
+                        <Col {...statSpans}>
+                            <Statistic
+                                title={t("scoreboard.labels.weeklyactual")}
+                                value={values.weeklyBody.toFixed(1)}
+                            />
+                        </Col>
+                        <Col {...statSpans}>
+                            <Statistic
+                                title={t("scoreboard.labels.monthlytarget")}
+                                value={Util.MonthlyTargetHrs(
+                                    bodyshop.scoreboard_target.dailyBodyTarget,
+                                    bodyshop
+                                )}
+                            />
+                        </Col>
+                        <Col {...statSpans}>
+                            <Statistic
+                                title={t("scoreboard.labels.asoftodaytarget")}
+                                value={Util.AsOfTodayTargetHrs(
+                                    bodyshop.scoreboard_target.dailyBodyTarget,
+                                    bodyshop
+                                )}
+                            />
+                        </Col>
+                        <Col {...statSpans}>
+                            <Statistic
+                                title={t("scoreboard.labels.todateactual")}
+                                value={values.toDateBody.toFixed(1)}
+                            />
+                        </Col>
+                    </Row>
+                    <Row>
+                        <Col {...statSpans}>
+                            <Statistic
+                                value={bodyshop.scoreboard_target.dailyPaintTarget}
+                                prefix="P"
+                            />
+                        </Col>
+                        <Col {...statSpans}>
+                            <Statistic value={values.todayPaint.toFixed(1)}/>
+                        </Col>
+                        <Col {...statSpans}>
+                            <Statistic
+                                value={Util.WeeklyTargetHrs(
+                                    bodyshop.scoreboard_target.dailyPaintTarget,
+                                    bodyshop
+                                )}
+                            />
+                        </Col>
+                        <Col {...statSpans}>
+                            <Statistic value={values.weeklyPaint.toFixed(1)}/>
+                        </Col>
+                        <Col {...statSpans}>
+                            <Statistic
+                                value={Util.MonthlyTargetHrs(
+                                    bodyshop.scoreboard_target.dailyPaintTarget,
+                                    bodyshop
+                                )}
+                            />
+                        </Col>
+                        <Col {...statSpans}>
+                            <Statistic
+                                value={Util.AsOfTodayTargetHrs(
+                                    bodyshop.scoreboard_target.dailyPaintTarget,
+                                    bodyshop
+                                )}
+                            />
+                        </Col>
+                        <Col {...statSpans}>
+                            <Statistic value={values.toDatePaint.toFixed(1)}/>
+                        </Col>
+                    </Row>
+                    <Row>
+                        <Divider style={{margin: 5}}/>
+                    </Row>
+                    <Row>
+                        <Col {...statSpans}></Col>
+                        <Col {...statSpans}>
+                            <Statistic
+                                value={(values.todayPaint + values.todayBody).toFixed(1)}
+                            />
+                        </Col>
+                        <Col {...statSpans}>
+                            <Statistic
+                                value={(
+                                    Util.WeeklyTargetHrs(
+                                        bodyshop.scoreboard_target.dailyBodyTarget,
+                                        bodyshop
+                                    ) +
+                                    Util.WeeklyTargetHrs(
+                                        bodyshop.scoreboard_target.dailyPaintTarget,
+                                        bodyshop
+                                    )
+                                ).toFixed(1)}
+                            />
+                        </Col>
+                        <Col {...statSpans}>
+                            <Statistic
+                                value={(values.weeklyPaint + values.weeklyBody).toFixed(1)}
+                            />
+                        </Col>
+                        <Col {...statSpans}>
+                            <Statistic
+                                value={(
+                                    Util.MonthlyTargetHrs(
+                                        bodyshop.scoreboard_target.dailyBodyTarget,
+                                        bodyshop
+                                    ) +
+                                    Util.MonthlyTargetHrs(
+                                        bodyshop.scoreboard_target.dailyPaintTarget,
+                                        bodyshop
+                                    )
+                                ).toFixed(1)}
+                            />
+                        </Col>
+                        <Col {...statSpans}>
+                            <Statistic
+                                value={(
+                                    Util.AsOfTodayTargetHrs(
+                                        bodyshop.scoreboard_target.dailyBodyTarget,
+                                        bodyshop
+                                    ) +
+                                    Util.AsOfTodayTargetHrs(
+                                        bodyshop.scoreboard_target.dailyPaintTarget,
+                                        bodyshop
+                                    )
+                                ).toFixed(1)}
+                            />
+                        </Col>
+                        <Col {...statSpans}>
+                            <Statistic
+                                value={(values.toDatePaint + values.toDateBody).toFixed(1)}
+                            />
+                        </Col>
+                    </Row>
+                </Col>
+            </Row>
+        </Card>
+    );
 }
+
 export default connect(
-  mapStateToProps,
-  mapDispatchToProps
+    mapStateToProps,
+    mapDispatchToProps
 )(ScoreboardTargetsTable);

client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx

@@ -1,5 +1,5 @@
 import {DeleteFilled} from "@ant-design/icons";
-import {Button, Form, Input, InputNumber, Select, Space, Switch, Typography,} from "antd";
+import {Button, Form, Input, InputNumber, Select, Switch, Typography,} from "antd";
 import React, {useState} from "react";
 import {useTranslation} from "react-i18next";
 import styled from "styled-components";
@@ -9,7 +9,6 @@ import {selectBodyshop} from "../../redux/user/user.selectors";
 import {connect} from "react-redux";
 import {createStructuredSelector} from "reselect";
 import {useSplitTreatments} from "@splitsoftware/splitio-react";
-import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
 
 const SelectorDiv = styled.div`
     .ant-form-item .ant-select {
@@ -181,7 +180,7 @@ export function ShopInfoResponsibilityCenterComponent({bodyshop, form}) {
                     </LayoutFormRow>
                     <LayoutFormRow header={t("bodyshop.labels.dms.cdk.payers")}>
                         <Form.List name={["cdk_configuration", "payers"]}>
-                            {(fields, {add, remove,  move}) => {
+                            {(fields, {add, remove}) => {
                                 return (
                                     <div>
                                         {fields.map((field, index) => (
@@ -239,18 +238,11 @@ export function ShopInfoResponsibilityCenterComponent({bodyshop, form}) {
                                                         </Select>
                                                     </Form.Item>
 
-                                                                                        <Space align="center">
-                                                                        d
-                                                            onClick={() => {
-                                                                remove(field.name);
-                                                            }}
-                                                        />
-                                                        <FormListMoveArrows
-                                                            move={move}
-                                                            index={index}
-                                                            total={fields.length}
-                                                        />
-                                                    </Space>
+                                                    <DeleteFilled
+                                                        onClick={() => {
+                                                            remove(field.name);
+                                                        }}
+                                                    />
                                                 </LayoutFormRow>
                                             </Form.Item>
                                         ))}
@@ -342,7 +334,7 @@ export function ShopInfoResponsibilityCenterComponent({bodyshop, form}) {
                 id="costs"
             >
                 <Form.List name={["md_responsibility_centers", "costs"]}>
-                    {(fields, {add, remove, move}) => {
+                    {(fields, {add, remove}) => {
                         return (
                             <div>
                                 {fields.map((field, index) => (
@@ -459,18 +451,12 @@ export function ShopInfoResponsibilityCenterComponent({bodyshop, form}) {
                                                     <Input onBlur={handleBlur}/>
                                                 </Form.Item>
                                             )}
-                                            <Space align="center">
-                                                <DeleteFilled
-                                                    onClick={() => {
-                                                        remove(field.name);
-                                                    }}
-                                                />
-                                                <FormListMoveArrows
-                                                    move={move}
-                                                    index={index}
-                                                    total={fields.length}
-                                                />
-                                            </Space>
+
+                                            <DeleteFilled
+                                                onClick={() => {
+                                                    remove(field.name);
+                                                }}
+                                            />
                                         </LayoutFormRow>
                                     </Form.Item>
                                 ))}
@@ -496,7 +482,7 @@ export function ShopInfoResponsibilityCenterComponent({bodyshop, form}) {
                 id="profits"
             >
                 <Form.List name={["md_responsibility_centers", "profits"]}>
-                    {(fields, {add, remove, move}) => {
+                    {(fields, {add, remove}) => {
                         return (
                             <div>
                                 {fields.map((field, index) => (
@@ -598,18 +584,11 @@ export function ShopInfoResponsibilityCenterComponent({bodyshop, form}) {
                                                     <Input onBlur={handleBlur}/>
                                                 </Form.Item>
                                             )}
-                                            <Space align="center">
-                                                <DeleteFilled
-                                                    onClick={() => {
-                                                        remove(field.name);
-                                                    }}
-                                                />
-                                                <FormListMoveArrows
-                                                    move={move}
-                                                    index={index}
-                                                    total={fields.length}
-                                                />
-                                            </Space>
+                                            <DeleteFilled
+                                                onClick={() => {
+                                                    remove(field.name);
+                                                }}
+                                            />
                                         </LayoutFormRow>
                                     </Form.Item>
                                 ))}
@@ -634,7 +613,7 @@ export function ShopInfoResponsibilityCenterComponent({bodyshop, form}) {
                 {(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
                     <>
                         <Form.List name={["md_responsibility_centers", "dms_defaults"]}>
-                            {(fields, {add, remove, move}) => {
+                            {(fields, {add, remove}) => {
                                 return (
                                     <div>
                                         {fields.map((field, index) => (

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

@@ -6,10 +6,8 @@ import {Link} from "react-router-dom";
 import {createStructuredSelector} from "reselect";
 import {selectBodyshop} from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import { alphaSort, statusSort } from "../../utils/sorters";
-import OwnerNameDisplay, {
-    OwnerNameDisplayFunction,
-} from "../owner-name-display/owner-name-display.component";
+import {alphaSort, statusSort} from "../../utils/sorters";
+import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import VehicleDetailUpdateJobsComponent from "../vehicle-detail-update-jobs/vehicle-detail-update-jobs.component";
 
 const mapStateToProps = createStructuredSelector({
@@ -47,10 +45,6 @@ export function VehicleDetailJobsComponent({vehicle, bodyshop}) {
             title: t("jobs.fields.owner"),
             dataIndex: "owner",
             key: "owner",
-            sorter: (a, b) =>
-                alphaSort(OwnerNameDisplayFunction(a), OwnerNameDisplayFunction(b)),
-            sortOrder:
-                state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
             render: (text, record) => (
                 <Link to={`/manage/owners/${record.owner.id}`}>
                     <OwnerNameDisplay ownerObject={record}/>
@@ -69,15 +63,9 @@ export function VehicleDetailJobsComponent({vehicle, bodyshop}) {
             title: t("jobs.fields.status"),
             dataIndex: "status",
             key: "status",
-            sorter: (a, b) =>
-                statusSort(a.status, b.status, bodyshop.md_ro_statuses.statuses),
+            sorter: (a, b) => statusSort(a.status, b.status, bodyshop.md_ro_statuses.statuses),
             sortOrder:
                 state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
-            filters: bodyshop.md_ro_statuses.statuses.map((status) => ({
-                text: status,
-                value: status,
-            })),
-            onFilter: (value, record) => value.includes(record.status),
         },
 
         {

client/src/components/vehicles-list/vehicles-list.component.jsx

@@ -6,7 +6,6 @@ import {useTranslation} from "react-i18next";
 import {Link, useLocation, useNavigate} from "react-router-dom";
 import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component";
 import {pageLimit} from "../../utils/config";
-import { alphaSort } from '../../utils/sorters';
 
 export default function VehiclesListComponent({
                                                   loading,
@@ -33,8 +32,6 @@ export default function VehiclesListComponent({
             title: t("vehicles.fields.v_vin"),
             dataIndex: "v_vin",
             key: "v_vin",
-            sorter: (a, b) => alphaSort(a.v_vin, b.v_vin),
-            sortOrder: state.sortedInfo.columnKey === "v_vin" && state.sortedInfo.order,
             render: (text, record) => (
                 <Link to={"/manage/vehicles/" + record.id}>
                     <VehicleVinDisplay>{record.v_vin || "N/A"}</VehicleVinDisplay>
@@ -55,10 +52,8 @@ export default function VehiclesListComponent({
         },
         {
             title: t("vehicles.fields.plate_no"),
-            dataIndex: "plate_no",
-            key: "plate_no",
-            sorter: (a, b) => alphaSort(a.plate_no, b.plate_no),
-            sortOrder: state.sortedInfo.columnKey === "plate_no" && state.sortedInfo.order,
+            dataIndex: "plate",
+            key: "plate",
             render: (text, record) => {
                 return (
                     <span>{`${record.plate_st || ""} | ${record.plate_no || ""}`}</span>

client/src/firebase/firebase.utils.js

@@ -4,8 +4,6 @@ import {getAuth, updatePassword, updateProfile} from "firebase/auth";
 import {getFirestore} from "firebase/firestore";
 import {getMessaging, getToken, onMessage} from "firebase/messaging";
 import {store} from "../redux/store";
-import axios from "axios";
-import { checkBeta } from "../utils/handleBeta";
 
 const config = JSON.parse(process.env.REACT_APP_FIREBASE_CONFIG);
 initializeApp(config);
@@ -88,17 +86,6 @@ export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
             null,
         ...additionalParams,
     };
-    axios.post("/ioevent", {
-        useremail:
-            (state.user && state.user.currentUser && state.user.currentUser.email) ||
-            null,
-        bodyshopid:
-            (state.user && state.user.bodyshop && state.user.bodyshop.id) || null,
-        operationName: eventName,
-        variables: additionalParams,
-        dbevent: false,
-        env: checkBeta() ? "beta" : "master",
-    });
     // console.log(
     //   "%c[Analytics]",
     //   "background-color: green ;font-weight:bold;",

client/src/graphql/audit_trail.queries.js

@@ -40,7 +40,6 @@ export const INSERT_AUDIT_TRAIL = gql`
             bodyshopid
             created
             operation
-            type
             useremail
         }
     }

client/src/graphql/courtesy-car.queries.js

@@ -22,7 +22,6 @@ export const QUERY_AVAILABLE_CC = gql`
         ]
         status: { _eq: "courtesycars.status.in" }
       }
-        order_by: { fleetnumber: asc }
     ) {
       color
       dailycost
@@ -30,7 +29,6 @@ export const QUERY_AVAILABLE_CC = gql`
       fleetnumber
       fuel
       id
-        insuranceexpires
       make
       mileage
       model
@@ -59,7 +57,7 @@ export const CHECK_CC_FLEET_NUMBER = gql`
 `;
 export const QUERY_ALL_CC = gql`
   query QUERY_ALL_CC {
-      courtesycars(order_by: { fleetnumber: asc }) {
+    courtesycars {
       color
       created_at
       dailycost

client/src/graphql/vehicles.queries.js

@@ -1,48 +1,47 @@
 import {gql} from "@apollo/client";
 
 export const QUERY_VEHICLE_BY_ID = gql`
-  query QUERY_VEHICLE_BY_ID($id: uuid!) {
-    vehicles_by_pk(id: $id) {
-      created_at
-      db_v_code
-      id
-      plate_no
-      plate_st
-      v_vin
-      v_type
-      v_trimcode
-      v_tone
-      v_stage
-      v_prod_dt
-      v_paint_codes
-      v_options
-      v_model_yr
-      v_model_desc
-      v_mldgcode
-      v_makecode
-      v_make_desc
-      v_engine
-      v_cond
-      v_color
-      v_bstyle
-      updated_at
-      trim_color
-      notes
-      jobs(order_by: { date_open: desc }) {
-        id
-        ro_number
-        ownr_co_nm
-        ownr_fn
-        ownr_ln
-        owner {
-          id
+    query QUERY_VEHICLE_BY_ID($id: uuid!) {
+        vehicles_by_pk(id: $id) {
+            created_at
+            db_v_code
+            id
+            plate_no
+            plate_st
+            v_vin
+            v_type
+            v_trimcode
+            v_tone
+            v_stage
+            v_prod_dt
+            v_paint_codes
+            v_options
+            v_model_yr
+            v_model_desc
+            v_mldgcode
+            v_makecode
+            v_make_desc
+            v_engine
+            v_cond
+            v_color
+            v_bstyle
+            updated_at
+            trim_color
+            notes
+            jobs(order_by: { date_open: desc }) {
+                id
+                ro_number
+                ownr_fn
+                ownr_ln
+                owner {
+                    id
+                }
+                clm_no
+                status
+                clm_total
+            }
         }
-        clm_no
-        status
-        clm_total
-      }
     }
-  }
 `;
 
 export const UPDATE_VEHICLE = gql`

client/src/pages/dms/dms.container.jsx

@@ -16,13 +16,8 @@ import LoadingSpinner from "../../components/loading-spinner/loading-spinner.com
 import {OwnerNameDisplayFunction} from "../../components/owner-name-display/owner-name-display.component";
 import {auth} from "../../firebase/firebase.utils";
 import {QUERY_JOB_EXPORT_DMS} from "../../graphql/jobs.queries";
-import {
-    insertAuditTrail,
-    setBreadcrumbs,
-    setSelectedHeader,
-} from "../../redux/application/application.actions";
+import {setBreadcrumbs, setSelectedHeader,} from "../../redux/application/application.actions";
 import {selectBodyshop} from "../../redux/user/user.selectors";
-import AuditTrailMapping from "../../utils/AuditTrailMappings";
 
 const mapStateToProps = createStructuredSelector({
     bodyshop: selectBodyshop,
@@ -31,8 +26,6 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = (dispatch) => ({
     setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
     setSelectedHeader: (key) => dispatch(setSelectedHeader(key)),
-    insertAuditTrail: ({ jobid, operation, type }) =>
-        dispatch(insertAuditTrail({ jobid, operation, type })),
 });
 
 export default connect(mapStateToProps, mapDispatchToProps)(DmsContainer);
@@ -52,12 +45,7 @@ export const socket = SocketIO(
     }
 );
 
-export function DmsContainer({
-                                 bodyshop,
-                                 setBreadcrumbs,
-                                 setSelectedHeader,
-                                 insertAuditTrail,
-     }) {
+export function DmsContainer({bodyshop, setBreadcrumbs, setSelectedHeader}) {
     const {t} = useTranslation();
     const [logLevel, setLogLevel] = useState("DEBUG");
     const history = useNavigate();
@@ -115,10 +103,6 @@ export function DmsContainer({
             notification.success({
                 message: t("jobs.successes.exported"),
             });
-            insertAuditTrail({
-                jobid: payload,
-                operation: AuditTrailMapping.jobexported(),
-            type: "jobexported",});
             history("/manage/accounting/receivables");
         });
 

client/src/pages/export-logs/export-logs.page.component.jsx

@@ -12,8 +12,7 @@ import AlertComponent from "../../components/alert/alert.component";
 import {QUERY_EXPORT_LOG_PAGINATED} from "../../graphql/accounting.queries";
 import {selectBodyshop} from "../../redux/user/user.selectors";
 import {DateTimeFormatter} from "../../utils/DateFormatter";
-import { pageLimit } from "../../utils/config";
-import { alphaSort, dateSort } from "./../../utils/sorters";
+import {pageLimit} from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
     bodyshop: selectBodyshop,
@@ -35,42 +34,11 @@ export function ExportLogsPageComponent({bodyshop}) {
                 limit: pageLimit,
                 order: [
                     {
-                        ...(sortcolumn === "ro_number"
-              ? {
-                  job: {
-                    [sortcolumn|| "created_at"]: sortorder
+                        [sortcolumn || "created_at"]: sortorder
                             ? sortorder === "descend"
                                 ? "desc"
                                 : "asc"
-                            : "desc",},
-                }
-              : sortcolumn === "invoice_number"
-              ? {
-                  bill: {
-                    [sortcolumn || "created_at"]: sortorder
-                      ? sortorder === "descend"
-                        ? "desc"
-                        : "asc"
-                      : "desc",
-                  },
-                }
-              : sortcolumn === "paymentnum"
-              ? {
-                  payment: {
-                    [sortcolumn || "created_at"]: sortorder
-                      ? sortorder === "descend"
-                        ? "desc"
-                        : "asc"
-                      : "desc",
-                  },
-                }
-              : {
-                  [sortcolumn || "created_at"]: sortorder
-                    ? sortorder === "descend"
-                      ? "desc"
-                      : "asc"
-                    : "desc",
-                }),
+                            : "desc",
                     },
                 ],
             },
@@ -100,8 +68,7 @@ export function ExportLogsPageComponent({bodyshop}) {
             title: t("general.labels.created_at"),
             dataIndex: "created_at",
             key: "created_at",
-            sorter: (a, b) => dateSort(a.created_at, b.created_at),
-      sortOrder: sortcolumn === "created_at" && sortorder,render: (text, record) => (
+            render: (text, record) => (
                 <DateTimeFormatter>{record.created_at}</DateTimeFormatter>
             ),
         },
@@ -114,8 +81,7 @@ export function ExportLogsPageComponent({bodyshop}) {
             title: t("jobs.fields.ro_number"),
             dataIndex: "ro_number",
             key: "ro_number",
-sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
-      sortOrder: sortcolumn === "ro_number" && sortorder,
+
             render: (text, record) =>
                 record.job && (
                     <Link to={`/manage/jobs/${record.job.id}`}>
@@ -127,8 +93,7 @@ sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
             title: t("bills.fields.invoice_number"),
             dataIndex: "invoice_number",
             key: "invoice_number",
-            sorter: (a, b) => alphaSort(a.invoice_number, b.invoice_number),
-      sortOrder: sortcolumn === "invoice_number" && sortorder,render: (text, record) =>
+            render: (text, record) =>
                 record.bill && (
                     <Link to={"/manage/bills?billid=" + (record.bill && record.bill.id)}>
                         {record.bill && record.bill.invoice_number}
@@ -138,8 +103,7 @@ sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
         {
             title: t("payments.fields.paymentnum"),
             dataIndex: "paymentnum",
-            key: "paymentnum",sorter: (a, b) => alphaSort(a.paymentnum, b.paymentnum),
-      sortOrder: sortcolumn === "paymentnum" && sortorder,
+            key: "paymentnum",
             render: (text, record) =>
                 record.payment && (
                     <Link
@@ -155,13 +119,7 @@ sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
         {
             title: t("general.labels.successful"),
             dataIndex: "successful",
-            key: "successful",sorter: (a, b) => Number(a.successful) - Number(b.successful),
-      sortOrder: sortcolumn === "successful" && sortorder,
-      filters: [
-        { text: "True", value: true },
-        { text: "False", value: false },
-      ],
-      onFilter: (value, record) => record.successful === value,
+            key: "successful",
             render: (text, record) => (
                 <Checkbox disabled checked={record.successful}/>
             ),

client/src/pages/jobs-close/jobs-close.component.jsx

@@ -48,11 +48,11 @@ const mapStateToProps = createStructuredSelector({
 });
 
 const mapDispatchToProps = (dispatch) => ({
-    insertAuditTrail: ({jobid, operation, type}) =>
-        dispatch(insertAuditTrail({jobid, operation, type })),
+    insertAuditTrail: ({jobid, operation}) =>
+        dispatch(insertAuditTrail({jobid, operation})),
 });
 
-export function JobsCloseComponent({job, bodyshop, jobRO, insertAuditTrail}) {
+export function JobsCloseComponent({job, bodyshop, jobRO, insertAuditTrail,}) {
     const {t} = useTranslation();
     const [form] = Form.useForm();
     const client = useApolloClient();
@@ -118,7 +118,7 @@ export function JobsCloseComponent({job, bodyshop, jobRO, insertAuditTrail}) {
             insertAuditTrail({
                 jobid: job.id,
                 operation: AuditTrailMapping.jobinvoiced(),
-            type: "jobinvoiced",});
+            });
             // history.push(`/manage/jobs/${job.id}`);
         } else {
             setLoading(false);

client/src/pages/jobs-detail/jobs-detail.page.component.jsx

@@ -23,7 +23,6 @@ import {createStructuredSelector} from "reselect";
 import FormFieldsChanged from "../../components/form-fields-changed-alert/form-fields-changed-alert.component";
 import JobAuditTrail from "../../components/job-audit-trail/job-audit-trail.component";
 import JobsLinesContainer from "../../components/job-detail-lines/job-lines.container";
-import JobLifecycleComponent from "../../components/job-lifecycle/job-lifecycle.component";
 import JobLineUpsertModalContainer from "../../components/job-lines-upsert-modal/job-lines-upsert-modal.container";
 import JobReconciliationModal from "../../components/job-reconciliation-modal/job-reconciliation.modal.container";
 import JobSyncButton from "../../components/job-sync-button/job-sync-button.component";
@@ -50,6 +49,7 @@ import {selectBodyshop} from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import UndefinedToNull from "../../utils/undefinedtonull";
 import {DateTimeFormat} from "./../../utils/DateFormatter";
+import JobLifecycleComponent from "../../components/job-lifecycle/job-lifecycle.component";
 
 const mapStateToProps = createStructuredSelector({
     bodyshop: selectBodyshop,
@@ -58,8 +58,8 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = (dispatch) => ({
     setPrintCenterContext: (context) =>
         dispatch(setModalContext({context: context, modal: "printCenter"})),
-    insertAuditTrail: ({jobid, operation, type}) =>
-        dispatch(insertAuditTrail({jobid, operation, type })),
+    insertAuditTrail: ({jobid, operation}) =>
+        dispatch(insertAuditTrail({jobid, operation})),
 });
 
 export function JobsDetailPage({
@@ -172,7 +172,7 @@ export function JobsDetailPage({
                             ? DateTimeFormat(changedAuditFields[key])
                             : changedAuditFields[key]
                     ),
-                type: "jobfieldchange",});
+                });
             });
 
             await refetch();
@@ -304,7 +304,7 @@ export function JobsDetailPage({
                         {
                             key: 'lifecycle',
                             icon: <BarsOutlined/>,
-                            label: t("menus.jobsdetail.lifecycle"),
+                            label: t('menus.jobsdetail.lifecycle'),
                             children: <JobLifecycleComponent job={job} statuses={bodyshop.md_ro_statuses}/>,
                         },
                         {

client/src/redux/application/application.actions.js

@@ -54,9 +54,9 @@ export const setOnline = (isOnline) => ({
     payload: isOnline,
 });
 
-export const insertAuditTrail = ({jobid, billid, operation, type}) => ({
+export const insertAuditTrail = ({jobid, billid, operation}) => ({
     type: ApplicationActionTypes.INSERT_AUDIT_TRAIL,
-    payload: {jobid, billid, operation, type },
+    payload: {jobid, billid, operation},
 });
 export const setProblemJobs = (problemJobs) => ({
     type: ApplicationActionTypes.SET_PROBLEM_JOBS,

client/src/redux/application/application.sagas.js

@@ -263,7 +263,7 @@ export function* onInsertAuditTrail() {
 }
 
 export function* insertAuditTrailSaga({
-                                          payload: {jobid, billid, operation, type},
+                                          payload: {jobid, billid, operation},
                                       }) {
     const state = yield select();
     const bodyshop = state.user.bodyshop;
@@ -275,18 +275,18 @@ export function* insertAuditTrailSaga({
             jobid,
             billid,
             operation,
-            type,useremail: currentUser.email,
+            useremail: currentUser.email,
         },
     };
     yield client.mutate({
         mutation: INSERT_AUDIT_TRAIL,
         variables,
-        update(cache, { data }) {
+        update(cache, {data}) {
             cache.modify({
                 fields: {
-                    audit_trail(existingAuditTrail, { readField }) {
+                    audit_trail(existingAuditTrail, {readField}) {
                         const newAuditTrail = cache.writeQuery({
-                            data: data,
+                            data: data.insert_audit_trail_one,
                             query: INSERT_AUDIT_TRAIL,
                             variables,
                         });

client/src/translations/en_us/common.json

@@ -107,14 +107,13 @@
         "alerttoggle": "Alert Toggle set to {{status}}",
         "appointmentcancel": "Appointment canceled. Lost Reason: {{lost_sale_reason}}.",
         "appointmentinsert": "Appointment created. Appointment Date: {{start}}.",
-        "billdeleted": "Bill with invoice number {{invoice_number}} deleted.",
-				"billposted": "Bill with invoice number {{invoice_number}} posted.",
+        "billposted": "Bill with invoice number {{invoice_number}} posted.",
         "billupdated": "Bill with invoice number {{invoice_number}} updated.",
         "failedpayment": "Failed payment",
         "jobassignmentchange": "Employee {{name}} assigned to {{operation}}",
         "jobassignmentremoved": "Employee assignment removed for {{operation}}",
         "jobchecklist": "Checklist type \"{{type}}\" completed.  In production set to {{inproduction}}.  Status set to {{status}}.",
-        "jobconverted": "Job converted and assigned number {{ro_number}}.","jobexported": "Job has been exported.",
+        "jobconverted": "Job converted and assigned number {{ro_number}}.",
         "jobfieldchanged": "Job field $t(jobs.fields.{{field}}) changed to {{value}}.",
         "jobimported": "Job imported.",
         "jobinproductionchange": "Job production status set to {{inproduction}}",
@@ -127,9 +126,8 @@
         "jobspartsorder": "Parts order {{order_number}} added to Job.",
         "jobspartsreturn": "Parts return {{order_number}} added to Job.",
         "jobstatuschange": "Job status changed to {{status}}.",
-        "jobsupplement": "Job supplement imported.",
-      "jobsuspend": "Suspend Toggle set to {{status}}",
-				"jobvoid": "Job has been voided."}
+        "jobsupplement": "Job supplement imported."
+      }
     },
     "billlines": {
       "actions": {
@@ -257,7 +255,6 @@
         "saving": "Error encountered while saving. {{message}}"
       },
       "fields": {
-        "ReceivableCustomField": "QBO Receivable Custom Field {{number}}",
         "address1": "Address 1",
         "address2": "Address 2",
         "appt_alt_transport": "Appointment Alternative Transportation Options",
@@ -476,7 +473,7 @@
             "editaccess": "Users -> Edit access"
           }
         },
-
+        "ReceivableCustomField": "QBO Receivable Custom Field {{number}}",
         "responsibilitycenter": "Responsibility Center",
         "responsibilitycenter_accountdesc": "Account Description",
         "responsibilitycenter_accountitem": "Item",
@@ -607,7 +604,7 @@
         "dms": {
           "cdk": {
             "controllist": "Control Number List",
-            "payers": " Payers"
+            "payers": "CDK Payers"
           },
           "cdk_dealerid": "CDK Dealer ID",
           "pbs_serialnumber": "PBS Serial Number",
@@ -750,7 +747,6 @@
         "driverinformation": "Driver's Information",
         "findcontract": "Find Contract",
         "findermodal": "Contract Finder",
-        "insuranceexpired": "The courtesy car insurance expires before the car is expected to return.",
         "noteconvertedfrom": "R.O. created from converted Courtesy Car Contract {{agreementnumber}}.",
         "populatefromjob": "Populate from Job",
         "rates": "Contract Rates",
@@ -843,8 +839,8 @@
         "notconfigured": "You do not have any current CSI Question Sets configured.",
         "notfoundsubtitle": "We were unable to find a survey using the link you provided. Please ensure the URL is correct or reach out to your shop for more help.",
         "notfoundtitle": "No survey found.",
-        "surveycompletesubtitle": "This survey was already completed on {{date}}.",
-        "surveycompletetitle": "Survey previously completed"
+        "surveycompletetitle": "Survey previously completed",
+        "surveycompletesubtitle": "This survey was already completed on {{date}}."
       },
       "fields": {
         "completedon": "Completed On",
@@ -853,13 +849,13 @@
         "validuntil": "Valid Until"
       },
       "labels": {
-        "copyright": "Copyright © $t(titles.app). All Rights Reserved.",
-        "greeting": "Hi {{name}}!",
-        "intro": "At {{shopname}}, we value your feedback. We would love to hear what you have to say. Please fill out the form below.",
         "nologgedinuser": "Please log out of $t(titles.app)",
         "nologgedinuser_sub": "Users of $t(titles.app) cannot complete CSI surveys while logged in. Please log out and try again.",
         "noneselected": "No response selected.",
-        "title": "Customer Satisfaction Survey"
+        "title": "Customer Satisfaction Survey",
+        "greeting": "Hi {{name}}!",
+        "intro": "At {{shopname}}, we value your feedback. We would love to hear what you have to say. Please fill out the form below.",
+        "copyright": "Copyright © $t(titles.app). All Rights Reserved."
       },
       "successes": {
         "created": "CSI created successfully. ",
@@ -878,7 +874,6 @@
       "labels": {
         "bodyhrs": "Body Hrs",
         "dollarsinproduction": "Dollars in Production",
-        "phone": "Phone",
         "prodhrs": "Production Hrs",
         "refhrs": "Refinish Hrs"
       },
@@ -894,11 +889,8 @@
         "productiondollars": "Total Dollars in Production",
         "productionhours": "Total Hours in Production",
         "projectedmonthlysales": "Projected Monthly Sales",
-        "scheduledindate": "Sheduled In Today: {{date}}",
-        "scheduledintoday": "Sheduled In Today",
-        "scheduledoutdate": "Sheduled Out Today: {{date}}",
-        "scheduledouttoday": "Sheduled Out Today",
-        "joblifecycle": "Job Lifecycle"
+        "scheduledintoday": "Sheduled In Today: {{date}}",
+        "scheduledouttoday": "Sheduled Out Today: {{date}}"
       }
     },
     "dms": {
@@ -1271,15 +1263,7 @@
         "relative_end": "Relative End",
         "relative_start": "Relative Start",
         "start": "Start",
-        "value": "Value",
-        "status": "Status",
-        "percentage": "Percentage",
-        "human_readable": "Human Readable",
-        "status_count": "In Status"
-      },
-      "titles": {
-        "dashboard": "Job Lifecycle",
-        "top_durations": "Top Durations"
+        "value": "Value"
       },
       "content": {
         "current_status_accumulated_time": "Current Status Accumulated Time",
@@ -1291,9 +1275,7 @@
         "title": "Job Lifecycle Component",
         "title_durations": "Historical Status Durations",
         "title_loading": "Loading",
-        "title_transitions": "Transitions",
-        "calculated_based_on": "Calculated based on",
-        "jobs_in_since": "Jobs in since"
+        "title_transitions": "Transitions"
       },
       "errors": {
         "fetch": "Error getting Job Lifecycle Data"
@@ -1785,7 +1767,6 @@
         "ca_gst_all_if_null": "If the Job is marked as a \"GST Registrant\" and this value is set to $0,  the customer will be responsible for paying all of the GST by default. ",
         "calc_repair_days": "Calculated Repair Days",
         "calc_repair_days_tt": "This is the approximate number of days required to complete the repair according to the target touch time in your shop configuration (current set to {{target_touchtime}}).",
-        "calc_scheuled_completion": "Calculate Scheduled Completion",
         "cards": {
           "customer": "Customer Information",
           "damage": "Area of Damage",
@@ -1868,7 +1849,6 @@
         "job": "Job Details",
         "jobcosting": "Job Costing",
         "jobtotals": "Job Totals",
-        "labor_hrs": "B/P/T Hrs",
         "labor_rates_subtotal": "Labor Rates Subtotal",
         "laborallocations": "Labor Allocations",
         "labortotals": "Labor Totals",
@@ -1946,7 +1926,6 @@
         "total_sales": "Total Sales",
         "totals": "Totals",
         "unvoidnote": "This Job was unvoided.",
-        "update_scheduled_completion": "Update Scheduled Completion?",
         "vehicle_info": "Vehicle",
         "vehicleassociation": "Vehicle Association",
         "viewallocations": "View Allocations",
@@ -2463,7 +2442,6 @@
         "invoice_total_payable": "Invoice (Total Payable)",
         "iou_form": "IOU Form",
         "job_costing_ro": "Job Costing",
-        "job_lifecycle_ro": "Job Lifecycle",
         "job_notes": "Job Notes",
         "key_tag": "Key Tag",
         "labels": {
@@ -2629,18 +2607,6 @@
         "generate": "Generate"
       },
       "labels": {
-        "advanced_filters": "Advanced Filters and Sorters",
-        "advanced_filters_false": "False",
-        "advanced_filters_filter_field": "Field",
-        "advanced_filters_filter_operator": "Operator",
-        "advanced_filters_filter_value": "Value",
-        "advanced_filters_filters": "Filters",
-        "advanced_filters_hide": "Hide",
-        "advanced_filters_show": "Show",
-        "advanced_filters_sorter_direction": "Direction",
-        "advanced_filters_sorter_field": "Field",
-        "advanced_filters_sorters": "Sorters",
-        "advanced_filters_true": "True",
         "dates": "Dates",
         "employee": "Employee",
         "filterson": "Filters on {{object}}: {{field}}",
@@ -2722,8 +2688,6 @@
         "job_costing_ro_date_summary": "Job Costing by RO - Summary",
         "job_costing_ro_estimator": "Job Costing by Estimator",
         "job_costing_ro_ins_co": "Job Costing by RO Source",
-        "job_lifecycle_date_detail": "Job Lifecycle by Date - Detail",
-        "job_lifecycle_date_summary": "Job Lifecycle by Date - Summary",
         "jobs_completed_not_invoiced": "Jobs Completed not Invoiced",
         "jobs_invoiced_not_exported": "Jobs Invoiced not Exported",
         "jobs_reconcile": "Parts/Sublet/Labor Reconciliation",
@@ -2813,8 +2777,7 @@
         "allemployeetimetickets": "All Employee Time Tickets",
         "asoftodaytarget": "As of Today",
         "body": "Body",
-        "bodyabbrev": "B",
-				"bodycharttitle": "Body Targets vs Actual",
+        "bodycharttitle": "Body Targets vs Actual",
         "calendarperiod": "Periods based on calendar weeks/months.",
         "combinedcharttitle": "Combined Targets vs Actual",
         "dailyactual": "Actual (D)",
@@ -2829,14 +2792,14 @@
         "priorweek": "Prior Week",
         "productivestatistics": "Productive Hours Statistics",
         "productivetimeticketsoverdate": "Productive Hours over Selected Dates",
-        "refinish": "Refinish","refinishabbrev": "R",
+        "refinish": "Refinish",
         "refinishcharttitle": "Refinish Targets vs Actual",
         "targets": "Targets",
         "thismonth": "This Month",
         "thisweek": "This Week",
         "timetickets": "Time Tickets",
         "timeticketsemployee": "Time Tickets by Employee",
-        "todateactual": "Actual (MTD)","total": "Total",
+        "todateactual": "Actual (MTD)",
         "totalhrs": "Total Hours",
         "totaloverperiod": "Total over Selected Dates",
         "weeklyactual": "Actual (W)",

client/src/translations/es/common.json

@@ -107,16 +107,14 @@
         "alerttoggle": "",
         "appointmentcancel": "",
         "appointmentinsert": "",
-        "billdeleted": "",
-				"billposted": "",
+        "billposted": "",
         "billupdated": "",
         "failedpayment": "",
         "jobassignmentchange": "",
         "jobassignmentremoved": "",
         "jobchecklist": "",
         "jobconverted": "",
-        "jobexported": "",
-				"jobfieldchanged": "",
+        "jobfieldchanged": "",
         "jobimported": "",
         "jobinproductionchange": "",
         "jobinvoiced": "",
@@ -128,9 +126,8 @@
         "jobspartsorder": "",
         "jobspartsreturn": "",
         "jobstatuschange": "",
-        "jobsupplement": "",
-      "jobsuspend": "",
-				"jobvoid": ""}
+        "jobsupplement": ""
+      }
     },
     "billlines": {
       "actions": {
@@ -258,7 +255,6 @@
         "saving": ""
       },
       "fields": {
-        "ReceivableCustomField": "",
         "address1": "",
         "address2": "",
         "appt_alt_transport": "",
@@ -477,7 +473,7 @@
             "editaccess": ""
           }
         },
-
+        "ReceivableCustomField": "",
         "responsibilitycenter": "",
         "responsibilitycenter_accountdesc": "",
         "responsibilitycenter_accountitem": "",
@@ -751,7 +747,6 @@
         "driverinformation": "",
         "findcontract": "",
         "findermodal": "",
-        "insuranceexpired": "",
         "noteconvertedfrom": "",
         "populatefromjob": "",
         "rates": "",
@@ -844,8 +839,8 @@
         "notconfigured": "",
         "notfoundsubtitle": "",
         "notfoundtitle": "",
-        "surveycompletesubtitle": "",
-        "surveycompletetitle": ""
+        "surveycompletetitle": "",
+        "surveycompletesubtitle": ""
       },
       "fields": {
         "completedon": "",
@@ -854,13 +849,13 @@
         "validuntil": ""
       },
       "labels": {
-        "copyright": "",
-        "greeting": "",
-        "intro": "",
         "nologgedinuser": "",
         "nologgedinuser_sub": "",
         "noneselected": "",
-        "title": ""
+        "title": "",
+        "greeting": "",
+        "intro": "",
+        "copyright": ""
       },
       "successes": {
         "created": "",
@@ -879,7 +874,6 @@
       "labels": {
         "bodyhrs": "",
         "dollarsinproduction": "",
-        "phone": "",
         "prodhrs": "",
         "refhrs": ""
       },
@@ -895,11 +889,8 @@
         "productiondollars": "",
         "productionhours": "",
         "projectedmonthlysales": "",
-        "scheduledindate": "",
         "scheduledintoday": "",
-        "scheduledoutdate": "",
-        "scheduledouttoday": "",
-        "joblifecycle": ""
+        "scheduledouttoday": ""
       }
     },
     "dms": {
@@ -1272,15 +1263,7 @@
         "relative_end": "",
         "relative_start": "",
         "start": "",
-        "value": "",
-        "status": "",
-        "percentage": "",
-        "human_readable": "",
-        "status_count": ""
-      },
-      "titles": {
-        "dashboard": "",
-        "top_durations": ""
+        "value": ""
       },
       "content": {
         "current_status_accumulated_time": "",
@@ -1292,9 +1275,7 @@
         "title": "",
         "title_durations": "",
         "title_loading": "",
-        "title_transitions": "",
-        "calculated_based_on": "",
-        "jobs_in_since": ""
+        "title_transitions": ""
       },
       "errors": {
         "fetch": "Error al obtener los datos del ciclo de vida del trabajo"
@@ -1786,7 +1767,6 @@
         "ca_gst_all_if_null": "",
         "calc_repair_days": "",
         "calc_repair_days_tt": "",
-        "calc_scheuled_completion": "",
         "cards": {
           "customer": "Información al cliente",
           "damage": "Área de Daño",
@@ -1869,7 +1849,6 @@
         "job": "",
         "jobcosting": "",
         "jobtotals": "",
-        "labor_hrs": "",
         "labor_rates_subtotal": "",
         "laborallocations": "",
         "labortotals": "",
@@ -1947,7 +1926,6 @@
         "total_sales": "",
         "totals": "",
         "unvoidnote": "",
-        "update_scheduled_completion": "",
         "vehicle_info": "Vehículo",
         "vehicleassociation": "",
         "viewallocations": "",
@@ -2464,7 +2442,6 @@
         "invoice_total_payable": "",
         "iou_form": "",
         "job_costing_ro": "",
-        "job_lifecycle_ro": "",
         "job_notes": "",
         "key_tag": "",
         "labels": {
@@ -2630,18 +2607,6 @@
         "generate": ""
       },
       "labels": {
-        "advanced_filters": "",
-        "advanced_filters_false": "",
-        "advanced_filters_filter_field": "",
-        "advanced_filters_filter_operator": "",
-        "advanced_filters_filter_value": "",
-        "advanced_filters_filters": "",
-        "advanced_filters_hide": "",
-        "advanced_filters_show": "",
-        "advanced_filters_sorter_direction": "",
-        "advanced_filters_sorter_field": "",
-        "advanced_filters_sorters": "",
-        "advanced_filters_true": "",
         "dates": "",
         "employee": "",
         "filterson": "",
@@ -2723,8 +2688,6 @@
         "job_costing_ro_date_summary": "",
         "job_costing_ro_estimator": "",
         "job_costing_ro_ins_co": "",
-        "job_lifecycle_date_detail": "",
-        "job_lifecycle_date_summary": "",
         "jobs_completed_not_invoiced": "",
         "jobs_invoiced_not_exported": "",
         "jobs_reconcile": "",
@@ -2814,8 +2777,7 @@
         "allemployeetimetickets": "",
         "asoftodaytarget": "",
         "body": "",
-        "bodyabbrev": "",
-				"bodycharttitle": "",
+        "bodycharttitle": "",
         "calendarperiod": "",
         "combinedcharttitle": "",
         "dailyactual": "",
@@ -2831,14 +2793,13 @@
         "productivestatistics": "",
         "productivetimeticketsoverdate": "",
         "refinish": "",
-        "refinishabbrev": "",
-				"refinishcharttitle": "",
+        "refinishcharttitle": "",
         "targets": "",
         "thismonth": "",
         "thisweek": "",
         "timetickets": "",
         "timeticketsemployee": "",
-        "todateactual": "","total": "",
+        "todateactual": "",
         "totalhrs": "",
         "totaloverperiod": "",
         "weeklyactual": "",

client/src/translations/fr/common.json

@@ -107,16 +107,14 @@
         "alerttoggle": "",
         "appointmentcancel": "",
         "appointmentinsert": "",
-        "billdeleted": "",
-				"billposted": "",
+        "billposted": "",
         "billupdated": "",
         "failedpayment": "",
         "jobassignmentchange": "",
         "jobassignmentremoved": "",
         "jobchecklist": "",
         "jobconverted": "",
-        "jobexported": "",
-				"jobfieldchanged": "",
+        "jobfieldchanged": "",
         "jobimported": "",
         "jobinproductionchange": "",
         "jobinvoiced": "",
@@ -128,9 +126,8 @@
         "jobspartsorder": "",
         "jobspartsreturn": "",
         "jobstatuschange": "",
-        "jobsupplement": "",
-      "jobsuspend": "",
-				"jobvoid": ""}
+        "jobsupplement": ""
+      }
     },
     "billlines": {
       "actions": {
@@ -258,7 +255,6 @@
         "saving": ""
       },
       "fields": {
-        "ReceivableCustomField": "",
         "address1": "",
         "address2": "",
         "appt_alt_transport": "",
@@ -477,7 +473,7 @@
             "editaccess": ""
           }
         },
-
+        "ReceivableCustomField": "",
         "responsibilitycenter": "",
         "responsibilitycenter_accountdesc": "",
         "responsibilitycenter_accountitem": "",
@@ -751,7 +747,6 @@
         "driverinformation": "",
         "findcontract": "",
         "findermodal": "",
-        "insuranceexpired": "",
         "noteconvertedfrom": "",
         "populatefromjob": "",
         "rates": "",
@@ -844,8 +839,8 @@
         "notconfigured": "",
         "notfoundsubtitle": "",
         "notfoundtitle": "",
-        "surveycompletesubtitle": "",
-        "surveycompletetitle": ""
+        "surveycompletetitle": "",
+        "surveycompletesubtitle": ""
       },
       "fields": {
         "completedon": "",
@@ -854,13 +849,13 @@
         "validuntil": ""
       },
       "labels": {
-        "copyright": "",
-        "greeting": "",
-        "intro": "",
         "nologgedinuser": "",
         "nologgedinuser_sub": "",
         "noneselected": "",
-        "title": ""
+        "title": "",
+        "greeting": "",
+        "intro": "",
+        "copyright": ""
       },
       "successes": {
         "created": "",
@@ -879,7 +874,6 @@
       "labels": {
         "bodyhrs": "",
         "dollarsinproduction": "",
-        "phone": "",
         "prodhrs": "",
         "refhrs": ""
       },
@@ -895,9 +889,7 @@
         "productiondollars": "",
         "productionhours": "",
         "projectedmonthlysales": "",
-        "scheduledindate": "",
         "scheduledintoday": "",
-        "scheduledoutdate": "",
         "scheduledouttoday": ""
       }
     },
@@ -1271,15 +1263,7 @@
         "relative_end": "",
         "relative_start": "",
         "start": "",
-        "value": "",
-        "status": "",
-        "percentage": "",
-        "human_readable": "",
-        "status_count": ""
-      },
-      "titles": {
-        "dashboard": "",
-        "top_durations": ""
+        "value": ""
       },
       "content": {
         "current_status_accumulated_time": "",
@@ -1291,10 +1275,7 @@
         "title": "",
         "title_durations": "",
         "title_loading": "",
-        "title_transitions": "",
-        "calculated_based_on": "",
-        "jobs_in_since": "",
-        "joblifecycle": ""
+        "title_transitions": ""
       },
       "errors": {
         "fetch": "Erreur lors de l'obtention des données du cycle de vie des tâches"
@@ -1786,7 +1767,6 @@
         "ca_gst_all_if_null": "",
         "calc_repair_days": "",
         "calc_repair_days_tt": "",
-        "calc_scheuled_completion": "",
         "cards": {
           "customer": "Informations client",
           "damage": "Zone de dommages",
@@ -1869,7 +1849,6 @@
         "job": "",
         "jobcosting": "",
         "jobtotals": "",
-        "labor_hrs": "",
         "labor_rates_subtotal": "",
         "laborallocations": "",
         "labortotals": "",
@@ -1947,7 +1926,6 @@
         "total_sales": "",
         "totals": "",
         "unvoidnote": "",
-        "update_scheduled_completion": "",
         "vehicle_info": "Véhicule",
         "vehicleassociation": "",
         "viewallocations": "",
@@ -2464,7 +2442,6 @@
         "invoice_total_payable": "",
         "iou_form": "",
         "job_costing_ro": "",
-        "job_lifecycle_ro": "",
         "job_notes": "",
         "key_tag": "",
         "labels": {
@@ -2630,18 +2607,6 @@
         "generate": ""
       },
       "labels": {
-        "advanced_filters": "",
-        "advanced_filters_false": "",
-        "advanced_filters_filter_field": "",
-        "advanced_filters_filter_operator": "",
-        "advanced_filters_filter_value": "",
-        "advanced_filters_filters": "",
-        "advanced_filters_hide": "",
-        "advanced_filters_show": "",
-        "advanced_filters_sorter_direction": "",
-        "advanced_filters_sorter_field": "",
-        "advanced_filters_sorters": "",
-        "advanced_filters_true": "",
         "dates": "",
         "employee": "",
         "filterson": "",
@@ -2723,8 +2688,6 @@
         "job_costing_ro_date_summary": "",
         "job_costing_ro_estimator": "",
         "job_costing_ro_ins_co": "",
-        "job_lifecycle_date_detail": "",
-        "job_lifecycle_date_summary": "",
         "jobs_completed_not_invoiced": "",
         "jobs_invoiced_not_exported": "",
         "jobs_reconcile": "",
@@ -2814,8 +2777,7 @@
         "allemployeetimetickets": "",
         "asoftodaytarget": "",
         "body": "",
-        "bodyabbrev": "",
-				"bodycharttitle": "",
+        "bodycharttitle": "",
         "calendarperiod": "",
         "combinedcharttitle": "",
         "dailyactual": "",
@@ -2831,14 +2793,13 @@
         "productivestatistics": "",
         "productivetimeticketsoverdate": "",
         "refinish": "",
-        "refinishabbrev": "",
-				"refinishcharttitle": "",
+        "refinishcharttitle": "",
         "targets": "",
         "thismonth": "",
         "thisweek": "",
         "timetickets": "",
         "timeticketsemployee": "",
-        "todateactual": "","total": "",
+        "todateactual": "",
         "totalhrs": "",
         "totaloverperiod": "",
         "weeklyactual": "",

client/src/utils/AuditTrailMappings.js

@@ -20,8 +20,6 @@ const AuditTrailMapping = {
         i18n.t("audit_trail.messages.appointmentcancel", {lost_sale_reason}),
     appointmentinsert: (start) =>
         i18n.t("audit_trail.messages.appointmentinsert", {start}),
-    billdeleted: (invoice_number) =>
-        i18n.t("audit_trail.messages.billdeleted", { invoice_number }),
     billposted: (invoice_number) =>
         i18n.t("audit_trail.messages.billposted", {invoice_number}),
     billupdated: (invoice_number) =>
@@ -35,7 +33,6 @@ const AuditTrailMapping = {
         i18n.t("audit_trail.messages.jobchecklist", {type, inproduction, status}),
     jobconverted: (ro_number) =>
         i18n.t("audit_trail.messages.jobconverted", {ro_number}),
-    jobexported: () => i18n.t("audit_trail.messages.jobexported"),
     jobfieldchange: (field, value) =>
         i18n.t("audit_trail.messages.jobfieldchanged", {field, value}),
     jobimported: () => i18n.t("audit_trail.messages.jobimported"),
@@ -54,8 +51,6 @@ const AuditTrailMapping = {
     jobstatuschange: (status) =>
         i18n.t("audit_trail.messages.jobstatuschange", {status}),
     jobsupplement: () => i18n.t("audit_trail.messages.jobsupplement"),
-    jobsuspend: (status) => i18n.t("audit_trail.messages.jobsuspend", { status }),
-    jobvoid: () => i18n.t("audit_trail.messages.jobvoid"),
 };
 
 export default AuditTrailMapping;

client/src/utils/DatePickerRanges.js

@@ -57,16 +57,6 @@ const range = [
         label: 'Last 90 Days',
         value: [dayjs().add(-90, "day"), dayjs()],
     }
-];
-
-if (process.env.NODE_ENV === "development") {
-    range.push({
-        label: 'Last Year',
-        value: [
-            dayjs().subtract(1, "year"),
-            dayjs(),
-        ]
-    })
-}
+]
 
 export default range;

client/src/utils/RenderTemplate.js

@@ -9,7 +9,7 @@ import {store} from "../redux/store";
 import client from "../utils/GraphQLClient";
 import cleanAxios from "./CleanAxios";
 import {TemplateList} from "./TemplateConstants";
-import {generateTemplate} from "./graphQLmodifier";
+import {applyFilters, applySorters, parseQuery, printQuery, wrapFiltersInAnd} from "./graphQLmodifier";
 
 const server = process.env.REACT_APP_REPORTS_SERVER_URL;
 
@@ -75,10 +75,7 @@ export default async function RenderTemplate(
             headerpath: `/${bodyshop.imexshopid}/header.html`,
             footerpath: `/${bodyshop.imexshopid}/footer.html`,
             bodyshop: bodyshop,
-            filters: templateObject?.filters,
-            sorters: templateObject?.sorters,
             offset: bodyshop.timezone, //dayjs().utcOffset(),
-            defaultSorters: templateObject?.defaultSorters,
         },
     };
 
@@ -151,6 +148,7 @@ export async function RenderTemplates(
     templateObjects.forEach((template) => {
         proms.push(
             (async () => {
+                console.log(' RENDER TEMPLATE 2 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!')
                 let {contextData, useShopSpecificTemplate} = await fetchContextData(
                     template,
                     jsrAuth
@@ -296,7 +294,7 @@ export const GenerateDocument = async (
             })
         );
     } else if (sendType === "x") {
-
+        console.log("excel");
         await RenderTemplate(template, bodyshop, false, true);
     } else if (sendType === "text") {
         await RenderTemplate(template, bodyshop, false, false, true);
@@ -311,58 +309,59 @@ export const GenerateDocuments = async (templates) => {
 };
 
 export const fetchFilterData = async ({name}) => {
-    try {
-        const bodyshop = store.getState().user.bodyshop;
-        const jsrAuth = (await axios.post("/utils/jsr")).data;
-        jsreport.headers["FirebaseAuthorization"] =
-            "Bearer " + (await auth.currentUser.getIdToken());
+try {
+    const bodyshop = store.getState().user.bodyshop;
+    const jsrAuth = (await axios.post("/utils/jsr")).data;
+    jsreport.headers["FirebaseAuthorization"] =
+        "Bearer " + (await auth.currentUser.getIdToken());
 
-        const folders = await cleanAxios.get(`${server}/odata/folders`, {
-            headers: {Authorization: jsrAuth},
-        });
-        const shopSpecificFolder = folders.data.value.find(
-            (f) => f.name === bodyshop.imexshopid
+    const folders = await cleanAxios.get(`${server}/odata/folders`, {
+        headers: {Authorization: jsrAuth},
+    });
+    const shopSpecificFolder = folders.data.value.find(
+        (f) => f.name === bodyshop.imexshopid
+    );
+
+    const jsReportFilters = await cleanAxios.get(
+        `${server}/odata/assets?$filter=name eq '${name}.filters'`,
+        {headers: {Authorization: jsrAuth}}
+    );
+    console.log("🚀 ~ fetchFilterData ~ jsReportFilters:", jsReportFilters);
+
+    let parsedFilterData;
+    let useShopSpecificTemplate = false;
+    // let shopSpecificTemplate;
+
+    if (shopSpecificFolder) {
+        let shopSpecificTemplate = jsReportFilters.data.value.find(
+            (f) => f?.folder?.shortid === shopSpecificFolder.shortid
         );
-
-        const jsReportFilters = await cleanAxios.get(
-            `${server}/odata/assets?$filter=name eq '${name}.filters'`,
-            {headers: {Authorization: jsrAuth}}
-        );
-        console.log("🚀 ~ fetchFilterData ~ jsReportFilters:", jsReportFilters);
-
-        let parsedFilterData;
-        let useShopSpecificTemplate = false;
-        // let shopSpecificTemplate;
-
-        if (shopSpecificFolder) {
-            let shopSpecificTemplate = jsReportFilters.data.value.find(
-                (f) => f?.folder?.shortid === shopSpecificFolder.shortid
-            );
-            if (shopSpecificTemplate) {
-                useShopSpecificTemplate = true;
-                parsedFilterData = atob(shopSpecificTemplate.content);
-            }
-        }
-
-        if (!parsedFilterData) {
-            const generalTemplate = jsReportFilters.data.value.find((f) => !f.folder);
-            useShopSpecificTemplate = false;
-            if (generalTemplate) parsedFilterData = atob(generalTemplate.content);
-        }
-        const data = JSON.parse(parsedFilterData);
-        return {
-            data,
-            useShopSpecificTemplate,
-            success: true,
-        }
-    } catch {
-        return {
-            success: false,
+        if (shopSpecificTemplate) {
+            useShopSpecificTemplate = true;
+            parsedFilterData = atob(shopSpecificTemplate.content);
         }
     }
+
+    if (!parsedFilterData) {
+        const generalTemplate = jsReportFilters.data.value.find((f) => !f.folder);
+        useShopSpecificTemplate = false;
+        if (generalTemplate) parsedFilterData = atob(generalTemplate.content);
+    }
+    const data = JSON.parse(parsedFilterData);
+    return {
+        data,
+        useShopSpecificTemplate,
+        success: true,
+    }
+} catch {
+    return {
+        success: false,
+    }
+}
 };
 
 const fetchContextData = async (templateObject, jsrAuth) => {
+    console.log(' FETCH CONTEXT DATA !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!')
     const bodyshop = store.getState().user.bodyshop;
 
     jsreport.headers["FirebaseAuthorization"] =
@@ -400,34 +399,58 @@ const fetchContextData = async (templateObject, jsrAuth) => {
         templateQueryToExecute = atob(generalTemplate.content);
     }
 
-    // Commented out for future revision debugging
-    // console.log('Template Object');
-    // console.dir(templateObject);
-    // console.log('Unmodified Query');
-    // console.dir(templateQueryToExecute);
+    console.log('Template Object');
+    console.dir(templateObject);
+    console.log('Unmodified Query');
+    console.dir(templateQueryToExecute);
 
-    const hasFilters = templateObject?.filters?.length > 0;
-    const hasSorters = templateObject?.sorters?.length > 0;
-    const hasDefaultSorters = templateObject?.defaultSorters?.length > 0;
 
     // We have no template filters or sorters, so we can just execute the query and return the data
-    if (!hasFilters && !hasSorters && !hasDefaultSorters) {
+    if ((!templateObject?.filters && !templateObject?.filters?.length && !templateObject?.sorters && !templateObject?.sorters?.length)) {
+        console.log('No filters or sorters');
         let contextData = {};
+        if (templateQueryToExecute) {
+            const {data} = await client.query({
+                query: gql(templateQueryToExecute),
+                variables: {...templateObject.variables},
+            });
+            contextData = data;
+        }
+
+        return {contextData, useShopSpecificTemplate};
+    }
+
+    // Parse the query and apply the filters and sorters
+    const ast = parseQuery(templateQueryToExecute);
+
+    let filterFields = [];
+
+    if (templateObject?.filters && templateObject?.filters?.length) {
+        console.log('Applying filters')
+        applyFilters(ast, templateObject.filters, filterFields);
+        wrapFiltersInAnd(ast, filterFields);
+    }
+
+    if (templateObject?.sorters && templateObject?.sorters?.length) {
+        console.log('Applying sorters')
+        applySorters(ast, templateObject.sorters);
+    }
+
+    const finalQuery = printQuery(ast);
+
+    console.log('Modified Query');
+    console.log(finalQuery);
+
+    let contextData = {};
     if (templateQueryToExecute) {
         const {data} = await client.query({
-            query: gql(templateQueryToExecute),
+            query: gql(finalQuery),
             variables: {...templateObject.variables},
         });
         contextData = data;
     }
-        return {contextData, useShopSpecificTemplate};
-    }
 
-    return await generateTemplate(
-        templateQueryToExecute,
-        templateObject,
-        useShopSpecificTemplate
-    );
+    return {contextData, useShopSpecificTemplate};
 };
 
 //export const displayTemplateInWindow = (html) => {
@@ -480,4 +503,4 @@ function extend(o1, o2, o3) {
         }
     }
     return result;
-}
+}

client/src/utils/TemplateConstants.js

@@ -514,14 +514,6 @@ export const TemplateList = (type, context) => {
                     group: "financial",
                     dms: true,
                 },
-                job_lifecycle_ro: {
-                    title: i18n.t("printcenter.jobs.job_lifecycle_ro"),
-                    description: "",
-                    subject: i18n.t("printcenter.jobs.job_lifecycle_ro"),
-                    key: "job_lifecycle_ro",
-                    disabled: false,
-                    group: "post",
-                },
             }
             : {}),
         ...(!type || type === "job_special"
@@ -2056,30 +2048,6 @@ export const TemplateList = (type, context) => {
                     datedisable: true,
                     group: "customers",
                 },
-                job_lifecycle_date_detail: {
-                    title: i18n.t("reportcenter.templates.job_lifecycle_date_detail"),
-                    subject: i18n.t("reportcenter.templates.job_lifecycle_date_detail"),
-                    key: "job_lifecycle_date_detail",
-                    //idtype: "vendor",
-                    disabled: false,
-                    rangeFilter: {
-                        object: i18n.t("reportcenter.labels.objects.jobs"),
-                        field: i18n.t("jobs.fields.date_invoiced"),
-                    },
-                    group: "jobs",
-                },
-                job_lifecycle_date_summary: {
-                    title: i18n.t("reportcenter.templates.job_lifecycle_date_summary"),
-                    subject: i18n.t("reportcenter.templates.job_lifecycle_date_summary"),
-                    key: "job_lifecycle_date_summary",
-                    //idtype: "vendor",
-                    disabled: false,
-                    rangeFilter: {
-                        object: i18n.t("reportcenter.labels.objects.jobs"),
-                        field: i18n.t("jobs.fields.date_invoiced"),
-                    },
-                    group: "jobs",
-                },
             }
             : {}),
         ...(!type || type === "courtesycarcontract"

client/src/utils/graphQLmodifier.js

@@ -1,96 +1,32 @@
 import {Kind, parse, print, visit} from "graphql";
-import client from "./GraphQLClient";
-import {gql} from "@apollo/client";
 
-/* eslint-disable no-loop-func */
-
-/**
- * The available operators for filtering (string)
- * @type {[{label: string, value: string},{label: string, value: string},{label: string, value: string},{label: string, value: string},{label: string, value: string},null,null,null]}
- */
 const STRING_OPERATORS = [
     {value: "_eq", label: "equals"},
     {value: "_neq", label: "does not equal"},
     {value: "_like", label: "contains"},
     {value: "_nlike", label: "does not contain"},
     {value: "_ilike", label: "contains case-insensitive"},
-    {value: "_nilike", label: "does not contain case-insensitive"},
-    {value: "_in", label: "in", type: "array"},
-    {value: "_nin", label: "not in", type: "array"}
+    {value: "_nilike", label: "does not contain case-insensitive"}
 ];
-
-/**
- * The available operators for filtering (dates)
- * @type {[{label: string, value: string},{label: string, value: string},{label: string, value: string},{label: string, value: string},{label: string, value: string},null,null,null]}
- */
-const DATE_OPERATORS = [
-    {value: "_eq", label: "equals"},
-    {value: "_neq", label: "does not equal"},
-    {value: "_gt", label: "greater than"},
-    {value: "_lt", label: "less than"},
-    {value: "_gte", label: "greater than or equal"},
-    {value: "_lte", label: "less than or equal"},
-    {value: "_in", label: "in", type: "array"},
-    {value: "_nin", label: "not in", type: "array"}
-];
-
-/**
- * The available operators for filtering (booleans)
- * @type {[{label: string, value: string},{label: string, value: string}]}
- */
-const BOOLEAN_OPERATORS = [
-    {value: "_eq", label: "equals"},
-    {value: "_neq", label: "does not equal"},
-];
-
-/**
- * The available operators for filtering (numbers)
- * @type {[{label: string, value: string},{label: string, value: string},{label: string, value: string},{label: string, value: string},{label: string, value: string},null,null,null]}
- */
 const NUMBER_OPERATORS = [
     {value: "_eq", label: "equals"},
     {value: "_neq", label: "does not equal"},
     {value: "_gt", label: "greater than"},
     {value: "_lt", label: "less than"},
     {value: "_gte", label: "greater than or equal"},
-    {value: "_lte", label: "less than or equal"},
-    {value: "_in", label: "in", type: "array"},
-    {value: "_nin", label: "not in", type: "array"}
+    {value: "_lte", label: "less than or equal"}
 ];
 
-/**
- * The available operators for sorting
- * @type {[{label: string, value: string},{label: string, value: string}]}
- */
-const ORDER_BY_OPERATORS = [
-    {value: "asc", label: "ascending"},
-    {value: "desc", label: "descending"}
-];
-
-/**
- * Get the available operators for filtering
- * @returns {[{label: string, value: string},{label: string, value: string}]}
- */
-export function getOrderOperatorsByType() {
-    return ORDER_BY_OPERATORS;
-}
-
-/**
- * Get the available operators for filtering
- * @param type
- * @returns {[{label: string, value: string},{label: string, value: string},{label: string, value: string},{label: string, value: string},{label: string, value: string},null]}
- */
-export function getWhereOperatorsByType(type = 'string') {
+export function getOperatorsByType(type = 'string') {
     const operators = {
         string: STRING_OPERATORS,
-        number: NUMBER_OPERATORS,
-        boolean: BOOLEAN_OPERATORS,
-        bool: BOOLEAN_OPERATORS,
-        date: DATE_OPERATORS
+        number: NUMBER_OPERATORS
     };
     return operators[type];
 }
 
+/* eslint-disable no-loop-func */
+
 /**
  * Parse a GraphQL query into an AST
  * @param query
@@ -108,49 +44,6 @@ export function parseQuery(query) {
 export function printQuery(query) {
     return print(query);
 }
-
-/**
- * Generate a template based on the query and object
- * @param templateQueryToExecute
- * @param templateObject
- * @param useShopSpecificTemplate
- * @returns {Promise<{contextData: {}, useShopSpecificTemplate}>}
- */
-export async function generateTemplate(templateQueryToExecute, templateObject, useShopSpecificTemplate) {
-    // Advanced Filtering and Sorting modifications start here
-
-    // Parse the query and apply the filters and sorters
-    const ast = parseQuery(templateQueryToExecute);
-
-
-    if (templateObject?.filters && templateObject?.filters?.length) {
-        applyFilters(ast, templateObject.filters);
-    }
-
-    if (templateObject?.sorters && templateObject?.sorters?.length) {
-        applySorters(ast, templateObject.sorters);
-    } else if (templateObject?.defaultSorters && templateObject?.defaultSorters?.length) {
-        applySorters(ast, templateObject.defaultSorters);
-    }
-
-    const finalQuery = printQuery(ast);
-
-    // commented out for future revision debugging
-    // console.log('Modified Query');
-    // console.log(finalQuery);
-
-    let contextData = {};
-    if (templateQueryToExecute) {
-        const {data} = await client.query({
-            query: gql(finalQuery),
-            variables: {...templateObject.variables},
-        });
-        contextData = data;
-    }
-
-    return {contextData, useShopSpecificTemplate};
-}
-
 /**
  * Apply sorters to the AST
  * @param ast
@@ -190,16 +83,16 @@ export function applySorters(ast, sorters) {
                         if (!orderByArg) {
                             orderByArg = {
                                 kind: Kind.ARGUMENT,
-                                name: {kind: Kind.NAME, value: 'order_by'},
-                                value: {kind: Kind.OBJECT, fields: []},
+                                name: { kind: Kind.NAME, value: 'order_by' },
+                                value: { kind: Kind.OBJECT, fields: [] },
                             };
                             currentSelection.arguments.push(orderByArg);
                         }
 
                         const sorterField = {
                             kind: Kind.OBJECT_FIELD,
-                            name: {kind: Kind.NAME, value: targetFieldName},
-                            value: {kind: Kind.ENUM, value: sorter.direction}, // Adjust if your schema uses a different type for sorting directions
+                            name: { kind: Kind.NAME, value: targetFieldName },
+                            value: { kind: Kind.ENUM, value: sorter.direction }, // Adjust if your schema uses a different type for sorting directions
                         };
 
                         // Add the new sorter condition
@@ -211,59 +104,10 @@ export function applySorters(ast, sorters) {
     });
 }
 
-/**
- * Apply Top Level Sub to the AST
- * @param node
- * @param fieldPath
- * @param filterField
- */
-function applyTopLevelSub(node, fieldPath, filterField) {
-    // Find or create the where argument for the top-level subfield
-    let whereArg = node.selectionSet.selections
-        .find(selection => selection.name.value === fieldPath[0])
-        ?.arguments.find(arg => arg.name.value === 'where');
-
-    if (!whereArg) {
-        whereArg = {
-            kind: Kind.ARGUMENT,
-            name: {kind: Kind.NAME, value: 'where'},
-            value: {kind: Kind.OBJECT, fields: []},
-        };
-        const topLevelSubSelection = node.selectionSet.selections.find(selection =>
-            selection.name.value === fieldPath[0]
-        );
-        if (topLevelSubSelection) {
-            topLevelSubSelection.arguments = topLevelSubSelection.arguments || [];
-            topLevelSubSelection.arguments.push(whereArg);
-        }
-    }
-
-    // Correctly position the nested filter without an extra 'where'
-    if (fieldPath.length > 2) { // More than one level deep
-        let currentField = whereArg.value;
-        fieldPath.slice(1, -1).forEach((path, index) => {
-            let existingField = currentField.fields.find(f => f.name.value === path);
-            if (!existingField) {
-                existingField = {
-                    kind: Kind.OBJECT_FIELD,
-                    name: {kind: Kind.NAME, value: path},
-                    value: {kind: Kind.OBJECT, fields: []}
-                };
-                currentField.fields.push(existingField);
-            }
-            currentField = existingField.value;
-        });
-        currentField.fields.push(filterField);
-    } else { // Directly under the top level
-        whereArg.value.fields.push(filterField);
-    }
-}
-
 /**
  * Apply filters to the AST
  * @param ast
  * @param filters
- * @returns {ASTNode}
  */
 export function applyFilters(ast, filters) {
     return visit(ast, {
@@ -272,179 +116,152 @@ export function applyFilters(ast, filters) {
                 filters.forEach(filter => {
                     const fieldPath = filter.field.split('.');
                     let topLevel = false;
-                    let topLevelSub = false;
 
                     // Determine if the filter should be applied at the top level
-                    if (fieldPath.length === 2) {
+                    if (fieldPath[0].startsWith('[') && fieldPath[0].endsWith(']')) {
+                        fieldPath[0] = fieldPath[0].substring(1, fieldPath[0].length - 1); // Strip the brackets
                         topLevel = true;
                     }
 
-                    if (fieldPath.length > 2 && fieldPath[0].startsWith('[') && fieldPath[0].endsWith(']')) {
-                        fieldPath[0] = fieldPath[0].substring(1, fieldPath[0].length - 1); // Strip the brackets
-                        topLevelSub = true;
-                    }
-
-                    // Construct the filter for a top-level application
-                    const targetFieldName = fieldPath[fieldPath.length - 1];
-
-                    let filterValue = createFilterValue(filter);
-                    let filterField = createFilterField(targetFieldName, filter, filterValue);
-
                     if (topLevel) {
-                        applyTopLevelFilter(node, fieldPath, filterField);
-                    } else if (topLevelSub) {
-                        applyTopLevelSub(node, fieldPath, filterField);
+                        // Construct the filter for a top-level application
+                        const targetFieldName = fieldPath[fieldPath.length - 1];
+                        const filterValue = {
+                            kind: getGraphQLKind(filter.value),
+                            value: filter.value,
+                        };
+
+                        const nestedFilter = {
+                            kind: Kind.OBJECT_FIELD,
+                            name: { kind: Kind.NAME, value: targetFieldName },
+                            value: {
+                                kind: Kind.OBJECT,
+                                fields: [{
+                                    kind: Kind.OBJECT_FIELD,
+                                    name: { kind: Kind.NAME, value: filter.operator },
+                                    value: filterValue,
+                                }],
+                            },
+                        };
+
+                        // Find or create the where argument for the top-level field
+                        let whereArg = node.selectionSet.selections
+                            .find(selection => selection.name.value === fieldPath[0])
+                            ?.arguments.find(arg => arg.name.value === 'where');
+
+                        if (!whereArg) {
+                            whereArg = {
+                                kind: Kind.ARGUMENT,
+                                name: { kind: Kind.NAME, value: 'where' },
+                                value: { kind: Kind.OBJECT, fields: [] },
+                            };
+                            const topLevelSelection = node.selectionSet.selections.find(selection =>
+                                selection.name.value === fieldPath[0]
+                            );
+                            if (topLevelSelection) {
+                                topLevelSelection.arguments = topLevelSelection.arguments || [];
+                                topLevelSelection.arguments.push(whereArg);
+                            }
+                        }
+
+                        // Correctly position the nested filter without an extra 'where'
+                        if (fieldPath.length > 2) { // More than one level deep
+                            let currentField = whereArg.value;
+                            fieldPath.slice(1, -1).forEach((path, index) => {
+                                let existingField = currentField.fields.find(f => f.name.value === path);
+                                if (!existingField) {
+                                    existingField = {
+                                        kind: Kind.OBJECT_FIELD,
+                                        name: { kind: Kind.NAME, value: path },
+                                        value: { kind: Kind.OBJECT, fields: [] }
+                                    };
+                                    currentField.fields.push(existingField);
+                                }
+                                currentField = existingField.value;
+                            });
+                            currentField.fields.push(nestedFilter);
+                        } else { // Directly under the top level
+                            whereArg.value.fields.push(nestedFilter);
+                        }
                     } else {
-                        applyNestedFilter(node, fieldPath, filterField);
+                        // Initialize a reference to the current selection to traverse down the AST
+                        let currentSelection = node;
+                        let whereArgFound = false;
+
+                        // Iterate over the fieldPath, except for the last entry, to navigate the structure
+                        for (let i = 0; i < fieldPath.length - 1; i++) {
+                            const fieldName = fieldPath[i];
+                            let fieldFound = false;
+
+                            // Check if the current selection has a selectionSet and selections
+                            if (currentSelection.selectionSet && currentSelection.selectionSet.selections) {
+                                // Look for the field in the current selection's selections
+                                const selection = currentSelection.selectionSet.selections.find(sel => sel.name.value === fieldName);
+                                if (selection) {
+                                    // Move down the AST to the found selection
+                                    currentSelection = selection;
+                                    fieldFound = true;
+                                }
+                            }
+
+                            // If the field was not found in the current path, it's an issue
+                            if (!fieldFound) {
+                                console.error(`Field ${fieldName} not found in the current selection.`);
+                                return; // Exit the loop and function due to error
+                            }
+                        }
+
+                        // At this point, currentSelection should be the parent field where the filter needs to be applied
+                        // Check if the 'where' argument already exists in the current selection
+                        const whereArg = currentSelection.arguments.find(arg => arg.name.value === 'where');
+                        if (whereArg) {
+                            whereArgFound = true;
+                        } else {
+                            // If not found, create a new 'where' argument for the current selection
+                            currentSelection.arguments.push({
+                                kind: Kind.ARGUMENT,
+                                name: { kind: Kind.NAME, value: 'where' },
+                                value: { kind: Kind.OBJECT, fields: [] } // Empty fields array to be populated with the filter
+                            });
+                        }
+
+                        // Assuming the last entry in fieldPath is the field to apply the filter on
+                        const targetField = fieldPath[fieldPath.length - 1];
+                        const filterValue = {
+                            kind: getGraphQLKind(filter.value),
+                            value: filter.value,
+                        };
+
+                        // Construct the filter field object
+                        const filterField = {
+                            kind: Kind.OBJECT_FIELD,
+                            name: { kind: Kind.NAME, value: targetField },
+                            value: {
+                                kind: Kind.OBJECT,
+                                fields: [{
+                                    kind: Kind.OBJECT_FIELD,
+                                    name: { kind: Kind.NAME, value: filter.operator },
+                                    value: filterValue,
+                                }],
+                            },
+                        };
+
+                        // Add the filter field to the 'where' clause of the current selection
+                        if (whereArgFound) {
+                            whereArg.value.fields.push(filterField);
+                        } else {
+                            // If the whereArg was newly created, find it again (since we didn't store its reference) and add the filter
+                            currentSelection.arguments.find(arg => arg.name.value === 'where').value.fields.push(filterField);
+                        }
                     }
+
                 });
             }
         }
     });
 }
 
-/**
- * Create a filter value based on the filter
- * @param filter
- * @returns {{kind: (Kind|Kind.INT), value}|{kind: Kind.LIST, values: *}}
- */
-function createFilterValue(filter) {
-    if (Array.isArray(filter.value)) {
-        // If it's an array, create a list value with the array items
-        return {
-            kind: Kind.LIST,
-            values: filter.value.map(item => ({
-                kind: getGraphQLKind(item),
-                value: item,
-            })),
-        };
-    } else {
-        // If it's not an array, use the existing logic
-        return {
-            kind: getGraphQLKind(filter.value),
-            value: filter.value,
-        };
-    }
-}
 
-/**
- * Create a filter field based on the target field and filter
- * @param targetFieldName
- * @param filter
- * @param filterValue
- * @returns {{kind: Kind.OBJECT_FIELD, name: {kind: Kind.NAME, value}, value: {kind: Kind.OBJECT, fields: [{kind: Kind.OBJECT_FIELD, name: {kind: Kind.NAME, value}, value}]}}}
- */
-function createFilterField(targetFieldName, filter, filterValue) {
-    return {
-        kind: Kind.OBJECT_FIELD,
-        name: {kind: Kind.NAME, value: targetFieldName},
-        value: {
-            kind: Kind.OBJECT,
-            fields: [{
-                kind: Kind.OBJECT_FIELD,
-                name: {kind: Kind.NAME, value: filter.operator},
-                value: filterValue,
-            }],
-        },
-    };
-}
-
-/**
- * Apply a top-level filter to the AST
- * @param node
- * @param fieldPath
- * @param filterField
- */
-function applyTopLevelFilter(node, fieldPath, filterField) {
-    // Find or create the where argument for the top-level field
-    let whereArg = node.selectionSet.selections
-        .find(selection => selection.name.value === fieldPath[0])
-        ?.arguments.find(arg => arg.name.value === 'where');
-
-    if (!whereArg) {
-        whereArg = {
-            kind: Kind.ARGUMENT,
-            name: {kind: Kind.NAME, value: 'where'},
-            value: {kind: Kind.OBJECT, fields: []},
-        };
-        const topLevelSelection = node.selectionSet.selections.find(selection =>
-            selection.name.value === fieldPath[0]
-        );
-        if (topLevelSelection) {
-            topLevelSelection.arguments = topLevelSelection.arguments || [];
-            topLevelSelection.arguments.push(whereArg);
-        }
-    }
-
-    // Correctly position the nested filter without an extra 'where'
-    if (fieldPath.length > 2) { // More than one level deep
-        let currentField = whereArg.value;
-        fieldPath.slice(1, -1).forEach((path, index) => {
-            let existingField = currentField.fields.find(f => f.name.value === path);
-            if (!existingField) {
-                existingField = {
-                    kind: Kind.OBJECT_FIELD,
-                    name: {kind: Kind.NAME, value: path},
-                    value: {kind: Kind.OBJECT, fields: []}
-                };
-                currentField.fields.push(existingField);
-            }
-            currentField = existingField.value;
-        });
-        currentField.fields.push(filterField);
-    } else { // Directly under the top level
-        whereArg.value.fields.push(filterField);
-    }
-}
-
-/**
- * Apply a nested filter to the AST
- * @param node
- * @param fieldPath
- * @param filterField
- */
-function applyNestedFilter(node, fieldPath, filterField) {
-    // Initialize a reference to the current selection to traverse down the AST
-    let currentSelection = node;
-
-    // Iterate over the fieldPath, except for the last entry, to navigate the structure
-    for (let i = 0; i < fieldPath.length - 1; i++) {
-        const fieldName = fieldPath[i];
-        let fieldFound = false;
-
-        // Check if the current selection has a selectionSet and selections
-        if (currentSelection.selectionSet && currentSelection.selectionSet.selections) {
-            // Look for the field in the current selection's selections
-            const selection = currentSelection.selectionSet.selections.find(sel => sel.name.value === fieldName);
-            if (selection) {
-                // Move down the AST to the found selection
-                currentSelection = selection;
-                fieldFound = true;
-            }
-        }
-
-        // If the field was not found in the current path, it's an issue
-        if (!fieldFound) {
-            console.error(`Field ${fieldName} not found in the current selection.`);
-            return; // Exit the loop and function due to error
-        }
-    }
-
-    // At this point, currentSelection should be the parent field where the filter needs to be applied
-    // Check if the 'where' argument already exists in the current selection
-    const whereArg = currentSelection.arguments.find(arg => arg.name.value === 'where');
-    if (!whereArg) {
-        // If not found, create a new 'where' argument for the current selection
-        currentSelection.arguments.push({
-            kind: Kind.ARGUMENT,
-            name: {kind: Kind.NAME, value: 'where'},
-            value: {kind: Kind.OBJECT, fields: []} // Empty fields array to be populated with the filter
-        });
-    }
-
-    // Add the filter field to the 'where' clause of the current selection
-    currentSelection.arguments.find(arg => arg.name.value === 'where').value.fields.push(filterField);
-}
 
 /**
  * Get the GraphQL kind for a value
@@ -452,17 +269,41 @@ function applyNestedFilter(node, fieldPath, filterField) {
  * @returns {Kind|Kind.INT}
  */
 function getGraphQLKind(value) {
-    if (Array.isArray(value)) {
-        return Kind.LIST;
-    } else if (typeof value === 'number') {
+    if (typeof value === 'number') {
         return value % 1 === 0 ? Kind.INT : Kind.FLOAT;
     } else if (typeof value === 'boolean') {
         return Kind.BOOLEAN;
     } else if (typeof value === 'string') {
         return Kind.STRING;
-    } else if (value instanceof Date) {
-        return Kind.STRING; // GraphQL does not have a Date type, so we return it as a string
     }
+    // Extend with more types as needed
+}
+
+/**
+ * Wrap filters in an 'and' object
+ * @param ast
+ * @param filterFields
+ */
+export function wrapFiltersInAnd(ast, filterFields) {
+    visit(ast, {
+        OperationDefinition: {
+            enter(node) {
+                node.selectionSet.selections.forEach((selection) => {
+                    let whereArg = selection.arguments.find(arg => arg.name.value === 'where');
+                    if (filterFields.length > 1) {
+                        const andFilter = {
+                            kind: Kind.OBJECT_FIELD,
+                            name: {kind: Kind.NAME, value: '_and'},
+                            value: {kind: Kind.LIST, values: filterFields}
+                        };
+                        whereArg.value.fields.push(andFilter);
+                    } else if (filterFields.length === 1) {
+                        whereArg.value.fields.push(filterFields[0].fields[0]);
+                    }
+                });
+            }
+        }
+    });
 }
 
 /* eslint-enable no-loop-func */

hasura/metadata/tables.yaml

@@ -259,30 +259,28 @@
                 - active:
                     _eq: true
         columns:
-          - billid
-          - bodyshopid
-          - created
           - id
-          - jobid
+          - created
+          - operation
           - new_val
           - old_val
-          - operation
-          - type
           - useremail
+          - bodyshopid
+          - jobid
+          - billid
   select_permissions:
     - role: user
       permission:
         columns:
-          - billid
-          - bodyshopid
-          - created
           - id
-          - jobid
           - new_val
           - old_val
           - operation
-          - type
           - useremail
+          - created
+          - billid
+          - bodyshopid
+          - jobid
         filter:
           bodyshop:
             associations:
@@ -4200,7 +4198,7 @@
         interval_sec: 10
         num_retries: 0
         timeout_sec: 60
-      webhook: https://worktest.home.irony.online
+      webhook_from_env: HASURA_API_URL
       headers:
         - name: event-secret
           value_from_env: EVENT_SECRET

hasura/migrations/1709671738458_alter_table_public_audit_trail_add_column_type/down.sql

@@ -1,4 +0,0 @@
--- Could not auto-generate a down migration.
--- Please write an appropriate down migration for the SQL below:
--- alter table "public"."audit_trail" add column "type" text
---  null;

hasura/migrations/1709671738458_alter_table_public_audit_trail_add_column_type/up.sql

@@ -1,2 +0,0 @@
-alter table "public"."audit_trail" add column "type" text
- null;

hasura/migrations/1710520532230_alter_table_public_ioevents_add_column_useremail/down.sql

@@ -1,4 +0,0 @@
--- Could not auto-generate a down migration.
--- Please write an appropriate down migration for the SQL below:
--- alter table "public"."ioevents" add column "useremail" text
---  not null;

hasura/migrations/1710520532230_alter_table_public_ioevents_add_column_useremail/up.sql

@@ -1 +0,0 @@
-alter table "public"."ioevents" add column "useremail" text;

hasura/migrations/1710520551755_alter_table_public_ioevents_add_column_bodyshopid/down.sql

@@ -1,4 +0,0 @@
--- Could not auto-generate a down migration.
--- Please write an appropriate down migration for the SQL below:
--- alter table "public"."ioevents" add column "bodyshopid" uuid
---  null;

hasura/migrations/1710520551755_alter_table_public_ioevents_add_column_bodyshopid/up.sql

@@ -1,2 +0,0 @@
-alter table "public"."ioevents" add column "bodyshopid" uuid
- null;

hasura/migrations/1710520563676_alter_table_public_ioevents_alter_column_useremail/down.sql

@@ -1 +0,0 @@
-alter table "public"."ioevents" alter column "useremail" set not null;

hasura/migrations/1710520563676_alter_table_public_ioevents_alter_column_useremail/up.sql

@@ -1 +0,0 @@
-alter table "public"."ioevents" alter column "useremail" drop not null;