IO-2186 Production Over Time

Add new report requested by Loewen Body Shop

README.MD

@@ -1,14 +1,3 @@
-Yarn Dependency Management:
-To force upgrades for some packages:
-yarn upgrade-interactive --latest
-
-To Start Hasura CLI:
-npx hasura console
-
-Migrating to Staging:
-npx hasura migrate apply --endpoint https://db.imex.online/ --admin-secret 'Production-ImEXOnline!@#'
-npx hasura migrate apply --endpoint https://db.test.bodyshop.app/ --admin-secret 'Test-ImEXOnlineBySnaptSoftware!'
-
 NGROK TEsting:
 ./ngrok.exe http http://localhost:4000 -host-header="localhost:4000"
 
@@ -21,4 +10,4 @@ hasura migrate apply --version "1620771761757" --skip-execution --endpoint https
 hasura migrate status --endpoint https://db.imex.online/ --admin-secret 'Production-ImEXOnline!@#'
 
 Generate the license file: 
-$ generate-license-file --input package.json --output third-party-licenses.txt --overwrite
+$ generate-license-file --input package.json --output third-party-licenses.txt --overwrite

client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx

@@ -289,7 +289,7 @@ export function JobLinesUpsertModalComponent({
             name="prt_dsmk_p"
             initialValue={0}
           >
-            <InputNumber precision={0} min={0} max={100} />
+            <InputNumber precision={0} min={-100} max={100} />
           </Form.Item>
           <Form.Item
             label={t("joblines.fields.tax_part")}

client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.container.jsx

@@ -13,6 +13,7 @@ import { selectJobLineEditModal } from "../../redux/modals/modals.selectors";
 import UndefinedToNull from "../../utils/undefinedtonull";
 import JobLinesUpdsertModal from "./job-lines-upsert-modal.component";
 import Axios from "axios";
+import Dinero from "dinero.js";
 const mapStateToProps = createStructuredSelector({
   jobLineEditModal: selectJobLineEditModal,
 });
@@ -40,7 +41,15 @@ function JobLinesUpsertModalContainer({
               manual_line: !(
                 jobLineEditModal.context && jobLineEditModal.context.id
               ),
-              ...UndefinedToNull(values),
+              ...UndefinedToNull({
+                ...values,
+                prt_dsmk_m: Dinero({
+                  amount: Math.round((values.act_price || 0) * 100),
+                })
+                  .percentage(Math.abs(values.prt_dsmk_p || 0))
+                  .multiply(values.prt_dsmk_p >= 0 ? 1 : -1)
+                  .toFormat(0.0),
+              }),
             },
           ],
         },
@@ -68,7 +77,15 @@ function JobLinesUpsertModalContainer({
       const r = await updateJobLine({
         variables: {
           lineId: jobLineEditModal.context.id,
-          line: values,
+          line: {
+            ...values,
+            prt_dsmk_m: Dinero({
+              amount: Math.round(values.act_price * 100),
+            })
+              .percentage(Math.abs(values.prt_dsmk_p || 0))
+              .multiply(values.prt_dsmk_p >= 0 ? 1 : -1)
+              .toFormat(0.0),
+          },
         },
         refetchQueries: ["GET_LINE_TICKET_BY_PK"],
       });

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

@@ -256,7 +256,7 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
       </FormRow>
       <FormRow header={t("jobs.forms.other")}>
         <Form.Item label={t("jobs.fields.category")} name="category">
-          <Select disabled={jobRO}>
+          <Select disabled={jobRO} allowClear>
             {bodyshop.md_categories.map((s) => (
               <Select.Option key={s} value={s}>
                 {s}

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

@@ -51,6 +51,7 @@ import JobAuditTrail from "../../components/job-audit-trail/job-audit-trail.comp
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import JobsDocumentsLocalGallery from "../../components/jobs-documents-local-gallery/jobs-documents-local-gallery.container";
+import UndefinedToNull from "../../utils/undefinedtonull";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -96,7 +97,7 @@ export function JobsDetailPage({
       variables: {
         jobId: job.id,
         job: {
-          ...values,
+          ...UndefinedToNull(values, ["alt_transport", "category", "referral_source"]),
           parts_tax_rates: {
             ...job.parts_tax_rates,
             ...values.parts_tax_rates,

client/src/translations/en_us/common.json

@@ -2485,6 +2485,7 @@
 				"production_by_target_date": "Production by Target Date",
 				"production_by_technician": "Production by Technician",
 				"production_by_technician_one": "Production filtered by Technician",
+				"production_over_time": "Production Level over Time",
 				"psr_by_make": "Percent of Sales by Vehicle Make",
 				"purchase_return_ratio_grouped_by_vendor_detail": "Purchase & Return Ratio by Vendor (Detail)",
 				"purchase_return_ratio_grouped_by_vendor_summary": "Purchase & Return Ratio by Vendor (Summary)",

client/src/translations/es/common.json

@@ -2485,6 +2485,7 @@
 				"production_by_target_date": "",
 				"production_by_technician": "",
 				"production_by_technician_one": "",
+				"production_over_time": "",
 				"psr_by_make": "",
 				"purchase_return_ratio_grouped_by_vendor_detail": "",
 				"purchase_return_ratio_grouped_by_vendor_summary": "",

client/src/translations/fr/common.json

@@ -2485,6 +2485,7 @@
 				"production_by_target_date": "",
 				"production_by_technician": "",
 				"production_by_technician_one": "",
+				"production_over_time": "",
 				"psr_by_make": "",
 				"purchase_return_ratio_grouped_by_vendor_detail": "",
 				"purchase_return_ratio_grouped_by_vendor_summary": "",

client/src/utils/TemplateConstants.js

@@ -1841,6 +1841,20 @@ export const TemplateList = (type, context) => {
             },
             group: "purchases",
           },
+          production_over_time: {
+            title: i18n.t("reportcenter.templates.production_over_time"),
+            subject: i18n.t(
+              "reportcenter.templates.production_over_time"
+            ),
+            key: "production_over_time",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.actual_in"),
+            },
+            group: "jobs",
+          },
         }
       : {}),
     ...(!type || type === "courtesycarcontract"

client/src/utils/undefinedtonull.js

@@ -1,6 +1,10 @@
-export default function UndefinedToNull(obj) {
+export default function UndefinedToNull(obj, keys) {
   Object.keys(obj).forEach((key) => {
+    if (keys && keys.indexOf(key) >= 0) {
+        if (obj[key] === undefined) obj[key] = null;
+    } else {
     if (obj[key] === undefined) obj[key] = null;
+    }
   });
   return obj;
 }

hasura/metadata/tables.yaml

@@ -4502,6 +4502,62 @@
                         _eq: X-Hasura-User-Id
                   - active:
                       _eq: true
+- table:
+    name: payment_response
+    schema: public
+  object_relationships:
+    - name: bodyshop
+      using:
+        foreign_key_constraint_on: bodyshopid
+    - name: job
+      using:
+        foreign_key_constraint_on: jobid
+    - name: payment
+      using:
+        foreign_key_constraint_on: paymentid
+  insert_permissions:
+    - role: user
+      permission:
+        check:
+          bodyshop:
+            associations:
+              _and:
+                - user:
+                    authid:
+                      _eq: X-Hasura-User-Id
+                - active:
+                    _eq: true
+        columns:
+          - amount
+          - bodyshopid
+          - declinereason
+          - ext_paymentid
+          - jobid
+          - paymentid
+          - response
+          - successful
+  select_permissions:
+    - role: user
+      permission:
+        columns:
+          - successful
+          - response
+          - amount
+          - declinereason
+          - ext_paymentid
+          - bodyshopid
+          - id
+          - jobid
+          - paymentid
+        filter:
+          bodyshop:
+            associations:
+              _and:
+                - user:
+                    authid:
+                      _eq: X-Hasura-User-Id
+                - active:
+                    _eq: true
 - table:
     name: payments
     schema: public

hasura/migrations/1676311861487_create_index_jobs_idx_date_open/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."jobs_idx_date_open";

hasura/migrations/1676311861487_create_index_jobs_idx_date_open/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "jobs_idx_date_open" on
+  "public"."jobs" using btree ("date_open");

hasura/migrations/1676311892023_create_index_jobs_idx_date_invoiced/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."jobs_idx_date_invoiced";

hasura/migrations/1676311892023_create_index_jobs_idx_date_invoiced/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "jobs_idx_date_invoiced" on
+  "public"."jobs" using btree ("date_invoiced");

hasura/migrations/1676312062111_create_index_idx_bills_vendorid/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_bills_vendorid";

hasura/migrations/1676312062111_create_index_idx_bills_vendorid/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "idx_bills_vendorid" on
+  "public"."bills" using btree ("vendorid");

hasura/migrations/1676312093483_create_index_idx_parts_orders_vendorid/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_parts_orders_vendorid";

hasura/migrations/1676312093483_create_index_idx_parts_orders_vendorid/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "idx_parts_orders_vendorid" on
+  "public"."parts_orders" using btree ("vendorid");

hasura/migrations/1676312128665_create_index_idx_ccc_jobid/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_ccc_jobid";

hasura/migrations/1676312128665_create_index_idx_ccc_jobid/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "idx_ccc_jobid" on
+  "public"."cccontracts" using btree ("jobid");

hasura/migrations/1676312151899_create_index_idx_ccc_courtesycarid/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_ccc_courtesycarid";

hasura/migrations/1676312151899_create_index_idx_ccc_courtesycarid/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "idx_ccc_courtesycarid" on
+  "public"."cccontracts" using btree ("courtesycarid");

hasura/migrations/1676312254069_create_index_idx_jobs_actual_completion/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_jobs_actual_completion";

hasura/migrations/1676312254069_create_index_idx_jobs_actual_completion/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "idx_jobs_actual_completion" on
+  "public"."jobs" using btree ("actual_completion");

hasura/migrations/1676312270714_create_index_idx_jobs_actual_in/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_jobs_actual_in";

hasura/migrations/1676312270714_create_index_idx_jobs_actual_in/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "idx_jobs_actual_in" on
+  "public"."jobs" using btree ("actual_in");

hasura/migrations/1676312432487_create_index_idx_jobs_employee_csr/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_jobs_employee_csr";

hasura/migrations/1676312432487_create_index_idx_jobs_employee_csr/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "idx_jobs_employee_csr" on
+  "public"."jobs" using btree ("employee_csr");

hasura/migrations/1676312451545_create_index_idx_jobs_body_csr/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_jobs_body_csr";

hasura/migrations/1676312451545_create_index_idx_jobs_body_csr/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "idx_jobs_body_csr" on
+  "public"."jobs" using btree ("employee_body");

hasura/migrations/1676312468816_create_index_idx_jobs_employee_refinish/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_jobs_employee_refinish";

hasura/migrations/1676312468816_create_index_idx_jobs_employee_refinish/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "idx_jobs_employee_refinish" on
+  "public"."jobs" using btree ("employee_refinish");

hasura/migrations/1676312526720_create_index_idx_timetickets_employeeid/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_timetickets_employeeid";

hasura/migrations/1676312526720_create_index_idx_timetickets_employeeid/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "idx_timetickets_employeeid" on
+  "public"."timetickets" using btree ("employeeid");

hasura/migrations/1676312560280_create_index_idx_timetickets_cost_center/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_timetickets_cost_center";

hasura/migrations/1676312560280_create_index_idx_timetickets_cost_center/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "idx_timetickets_cost_center" on
+  "public"."timetickets" using btree ("cost_center");

hasura/migrations/1676312770241_create_index_idx_scoreboard_jobid/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_scoreboard_jobid";

hasura/migrations/1676312770241_create_index_idx_scoreboard_jobid/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "idx_scoreboard_jobid" on
+  "public"."scoreboard" using btree ("jobid");

hasura/migrations/1676312783297_create_index_idx_scoreboard_date/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_scoreboard_date";

hasura/migrations/1676312783297_create_index_idx_scoreboard_date/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "idx_scoreboard_date" on
+  "public"."scoreboard" using btree ("date");

hasura/migrations/1676312895007_create_index_idx_payments_date/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_payments_date";

hasura/migrations/1676312895007_create_index_idx_payments_date/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "idx_payments_date" on
+  "public"."payments" using btree ("date");

hasura/migrations/1676313363752_create_index_exportlog_createdat/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."exportlog_createdat";

hasura/migrations/1676313363752_create_index_exportlog_createdat/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "exportlog_createdat" on
+  "public"."exportlog" using btree ("created_at");

hasura/migrations/1676314283711_create_index_idx_transitions_jobid/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_transitions_jobid";

hasura/migrations/1676314283711_create_index_idx_transitions_jobid/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "idx_transitions_jobid" on
+  "public"."transitions" using btree ("jobid");

hasura/migrations/1676314300650_create_index_idx_transitions_start/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_transitions_start";

hasura/migrations/1676314300650_create_index_idx_transitions_start/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "idx_transitions_start" on
+  "public"."transitions" using btree ("start");

hasura/migrations/1676314314574_create_index_idx_transitions_end/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_transitions_end";

hasura/migrations/1676314314574_create_index_idx_transitions_end/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "idx_transitions_end" on
+  "public"."transitions" using btree ("end");

hasura/migrations/1676314562876_create_index_idx_audit_bodyshopid/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_audit_bodyshopid";

hasura/migrations/1676314562876_create_index_idx_audit_bodyshopid/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "idx_audit_bodyshopid" on
+  "public"."audit_trail" using btree ("bodyshopid");

hasura/migrations/1676314573827_create_index_idx_audit_jobid/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_audit_jobid";

hasura/migrations/1676314573827_create_index_idx_audit_jobid/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "idx_audit_jobid" on
+  "public"."audit_trail" using btree ("jobid");

hasura/migrations/1676314593147_create_index_idx_audit_billid/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."idx_audit_billid";

hasura/migrations/1676314593147_create_index_idx_audit_billid/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "idx_audit_billid" on
+  "public"."audit_trail" using btree ("billid");

hasura/migrations/1676337846761_run_sql_migration/down.sql

@@ -0,0 +1,11 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- CREATE INDEX idx_phonebook_firstname ON public.phonebook USING gin (firstname public.gin_trgm_ops);
+-- CREATE INDEX idx_phonebook_lastname ON public.phonebook USING gin (lastname public.gin_trgm_ops);
+-- CREATE INDEX idx_phonebook_company ON public.phonebook USING gin (company public.gin_trgm_ops);
+-- CREATE INDEX idx_phonebook_address1 ON public.phonebook USING gin (address1 public.gin_trgm_ops);
+-- CREATE INDEX idx_phonebook_phone1 ON public.phonebook USING gin (phone1 public.gin_trgm_ops);
+-- CREATE INDEX idx_phonebook_phone2 ON public.phonebook USING gin (phone2 public.gin_trgm_ops);
+-- CREATE INDEX idx_phonebook_email ON public.phonebook USING gin (email public.gin_trgm_ops);
+-- CREATE INDEX idx_phonebook_category ON public.phonebook USING gin (category public.gin_trgm_ops);
+-- CREATE INDEX idx_vendor_name ON public.vendors USING gin (name public.gin_trgm_ops);

hasura/migrations/1676337846761_run_sql_migration/up.sql

@@ -0,0 +1,9 @@
+CREATE INDEX idx_phonebook_firstname ON public.phonebook USING gin (firstname public.gin_trgm_ops);
+CREATE INDEX idx_phonebook_lastname ON public.phonebook USING gin (lastname public.gin_trgm_ops);
+CREATE INDEX idx_phonebook_company ON public.phonebook USING gin (company public.gin_trgm_ops);
+CREATE INDEX idx_phonebook_address1 ON public.phonebook USING gin (address1 public.gin_trgm_ops);
+CREATE INDEX idx_phonebook_phone1 ON public.phonebook USING gin (phone1 public.gin_trgm_ops);
+CREATE INDEX idx_phonebook_phone2 ON public.phonebook USING gin (phone2 public.gin_trgm_ops);
+CREATE INDEX idx_phonebook_email ON public.phonebook USING gin (email public.gin_trgm_ops);
+CREATE INDEX idx_phonebook_category ON public.phonebook USING gin (category public.gin_trgm_ops);
+CREATE INDEX idx_vendor_name ON public.vendors USING gin (name public.gin_trgm_ops);

hasura/migrations/1677082378941_create_table_public_payment_response/down.sql

@@ -0,0 +1 @@
+DROP TABLE "public"."payment_response";

hasura/migrations/1677082378941_create_table_public_payment_response/up.sql

@@ -0,0 +1,2 @@
+CREATE TABLE "public"."payment_response" ("id" uuid NOT NULL DEFAULT gen_random_uuid(), "bodyshopid" uuid NOT NULL, "jobid" uuid, "paymentid" uuid, "successful" boolean NOT NULL DEFAULT false, "ext_paymentid" text NOT NULL, "amount" numeric NOT NULL, "declinereason" text, "response" jsonb NOT NULL DEFAULT jsonb_build_object(), PRIMARY KEY ("id") , FOREIGN KEY ("bodyshopid") REFERENCES "public"."bodyshops"("id") ON UPDATE cascade ON DELETE cascade, FOREIGN KEY ("jobid") REFERENCES "public"."jobs"("id") ON UPDATE cascade ON DELETE cascade, FOREIGN KEY ("paymentid") REFERENCES "public"."payments"("id") ON UPDATE cascade ON DELETE cascade);
+CREATE EXTENSION IF NOT EXISTS pgcrypto;

server/email/sendemail.js

@@ -28,7 +28,7 @@ exports.sendServerEmail = async function ({ subject, text }) {
     transporter.sendMail(
       {
         from: `ImEX Online API - ${process.env.NODE_ENV} <noreply@imex.online>`,
-        to: ["patrick@snapt.ca"],
+        to: ["patrick@imexsystems.ca"],
         subject: subject,
         text: text,
         ses: {