Merge branch 'release/2023-04-28' into feature/america

client/src/graphql/bills.queries.js

@@ -69,6 +69,7 @@ export const QUERY_BILLS_BY_JOBID = gql`
       vendor {
         id
         name
+        email
       }
       order_date
       deliver_by
@@ -104,6 +105,7 @@ export const QUERY_BILLS_BY_JOBID = gql`
       vendor {
         id
         name
+        email
       }
       total
       invoice_number

client/src/graphql/bodyshop.queries.js

@@ -117,6 +117,7 @@ export const QUERY_BODYSHOP = gql`
       md_parts_scan
       enforce_conversion_category
       tt_enforce_hours_for_tech_console
+      use_paint_scale_data
       employees {
         user_email
         id

client/src/graphql/jobs.queries.js

@@ -1279,7 +1279,7 @@ export const SEARCH_JOBS_BY_ID_FOR_AUTOCOMPLETE = gql`
 
 export const SEARCH_FOR_JOBS = gql`
   query SEARCH_FOR_JOBS($search: String!) {
-    search_jobs(args: { search: $search }) {
+    search_jobs(args: { search: $search }, limit: 25) {
       id
       ro_number
       ownr_fn

client/src/graphql/notes.queries.js

@@ -4,7 +4,15 @@ export const INSERT_NEW_NOTE = gql`
   mutation INSERT_NEW_NOTE($noteInput: [notes_insert_input!]!) {
     insert_notes(objects: $noteInput) {
       returning {
+        created_at
+        created_by
+        critical
         id
+        jobid
+        private
+        text
+        updated_at
+        audit
       }
     }
   }
@@ -15,8 +23,8 @@ export const QUERY_NOTES_BY_JOB_PK = gql`
     jobs_by_pk(id: $id) {
       id
       ro_number
-      vehicle{
-        jobs{
+      vehicle {
+        jobs {
           id
           ro_number
           status

client/src/graphql/scoreboard.queries.js

@@ -19,6 +19,7 @@ export const QUERY_SCOREBOARD = gql`
         v_make_desc
         v_model_desc
         v_model_yr
+        job_totals
       }
     }
   }

client/src/graphql/search.queries.js

@@ -2,22 +2,20 @@ import { gql } from "@apollo/client";
 
 export const GLOBAL_SEARCH_QUERY = gql`
   query GLOBAL_SEARCH_QUERY($search: String) {
-    search_jobs(args: { search: $search }) {
+    search_jobs(args: { search: $search }, limit: 25) {
       id
       ro_number
       status
-
       clm_no
       v_model_yr
       v_model_desc
       v_make_desc
       v_color
-
       ownr_fn
       ownr_ln
       ownr_co_nm
     }
-    search_owners(args: { search: $search }) {
+    search_owners(args: { search: $search }, limit: 25) {
       id
       ownr_fn
       ownr_ln
@@ -25,7 +23,7 @@ export const GLOBAL_SEARCH_QUERY = gql`
       ownr_ph1
       ownr_ph2
     }
-    search_vehicles(args: { search: $search }) {
+    search_vehicles(args: { search: $search }, limit: 25) {
       id
       v_model_yr
       v_model_desc
@@ -34,7 +32,7 @@ export const GLOBAL_SEARCH_QUERY = gql`
       v_vin
       plate_no
     }
-    search_payments(args: { search: $search }) {
+    search_payments(args: { search: $search }, limit: 25) {
       id
       amount
       paymentnum
@@ -45,7 +43,7 @@ export const GLOBAL_SEARCH_QUERY = gql`
       memo
       transactionid
     }
-    search_bills(args: { search: $search }) {
+    search_bills(args: { search: $search }, limit: 25) {
       id
       date
       invoice_number
@@ -54,7 +52,7 @@ export const GLOBAL_SEARCH_QUERY = gql`
         name
       }
     }
-    search_phonebook(args: { search: $search }) {
+    search_phonebook(args: { search: $search }, limit: 25) {
       id
       firstname
       lastname

client/src/graphql/timetickets.queries.js

@@ -59,6 +59,81 @@ export const QUERY_TIME_TICKETS_IN_RANGE = gql`
   }
 `;
 
+export const QUERY_TIME_TICKETS_TECHNICIAN_IN_RANGE = gql`
+  query QUERY_TIME_TICKETS_TECHNICIAN_IN_RANGE(
+    $employeeid: uuid!
+    $start: date!
+    $end: date!
+    $fixedStart: date!
+    $fixedEnd: date!
+  ) {
+    timetickets(
+      where: {
+        date: { _gte: $start, _lte: $end }
+        employeeid: { _eq: $employeeid }
+      }
+      order_by: { date: desc_nulls_first }
+    ) {
+      actualhrs
+      ciecacode
+      clockoff
+      clockon
+      cost_center
+      created_at
+      date
+      id
+      rate
+      productivehrs
+      memo
+      jobid
+      flat_rate
+      job {
+        id
+        ro_number
+      }
+      employeeid
+      employee {
+        id
+        employee_number
+        first_name
+        last_name
+      }
+    }
+    fixedperiod: timetickets(
+      where: {
+        date: { _gte: $fixedStart, _lte: $fixedEnd }
+        employeeid: { _eq: $employeeid }
+      }
+      order_by: { date: desc_nulls_first }
+    ) {
+      actualhrs
+      ciecacode
+      clockoff
+      clockon
+      cost_center
+      created_at
+      date
+      id
+      rate
+      productivehrs
+      memo
+      jobid
+      flat_rate
+      job {
+        id
+        ro_number
+      }
+      employeeid
+      employee {
+        id
+        employee_number
+        first_name
+        last_name
+      }
+    }
+  }
+`;
+
 export const QUERY_TIME_TICKETS_IN_RANGE_SB = gql`
   query QUERY_TIME_TICKETS_IN_RANGE_SB(
     $start: date!