IO-2398 Hours Sold by Estimator

client/src/translations/en_us/common.json

@@ -2565,18 +2565,22 @@
 				"gsr_labor_only": "Gross Sales - Labor Only",
 				"hours_sold_detail_closed": "Hours Sold Detail - Closed",
 				"hours_sold_detail_closed_csr": "Hours Sold Detail - Closed by CSR",
+				"hours_sold_detail_closed_estimator": "Hours Sold Detail - Closed by Estimator",
 				"hours_sold_detail_closed_ins_co": "Hours Sold Detail - Closed by Source",
 				"hours_sold_detail_closed_status": "Hours Sold Detail - Closed by Status",
 				"hours_sold_detail_open": "Hours Sold Detail - Open",
 				"hours_sold_detail_open_csr": "Hours Sold Detail - Open by CSR",
+				"hours_sold_detail_open_estimator": "Hours Sold Detail - Open by Estimator",
 				"hours_sold_detail_open_ins_co": "Hours Sold Detail - Open by Source",
 				"hours_sold_detail_open_status": "Hours Sold Detail - Open by Status",
 				"hours_sold_summary_closed": "Hours Sold Summary - Closed",
 				"hours_sold_summary_closed_csr": "Hours Sold Summary - Closed by CSR",
+				"hours_sold_summary_closed_estimator": "Hours Sold Summary - Closed by Estimator",
 				"hours_sold_summary_closed_ins_co": "Hours Sold Summary - Closed by Source",
 				"hours_sold_summary_closed_status": "Hours Sold Summary - Closed by Status",
 				"hours_sold_summary_open": "Hours Sold Summary - Open",
 				"hours_sold_summary_open_csr": "Hours Sold Summary - Open CSR",
+				"hours_sold_summary_open_estimator": "Hours Sold Summary - Open Estimator",
 				"hours_sold_summary_open_ins_co": "Hours Sold Summary - Open by Source",
 				"hours_sold_summary_open_status": "Hours Sold Summary - Open by Status",
 				"job_costing_ro_csr": "Job Costing by CSR",

client/src/translations/es/common.json

@@ -2565,18 +2565,22 @@
 				"gsr_labor_only": "",
 				"hours_sold_detail_closed": "",
 				"hours_sold_detail_closed_csr": "",
+				"hours_sold_detail_closed_estimator": "",
 				"hours_sold_detail_closed_ins_co": "",
 				"hours_sold_detail_closed_status": "",
 				"hours_sold_detail_open": "",
 				"hours_sold_detail_open_csr": "",
+				"hours_sold_detail_open_estimator": "",
 				"hours_sold_detail_open_ins_co": "",
 				"hours_sold_detail_open_status": "",
 				"hours_sold_summary_closed": "",
 				"hours_sold_summary_closed_csr": "",
+				"hours_sold_summary_closed_estimator": "",
 				"hours_sold_summary_closed_ins_co": "",
 				"hours_sold_summary_closed_status": "",
 				"hours_sold_summary_open": "",
 				"hours_sold_summary_open_csr": "",
+				"hours_sold_summary_open_estimator": "",
 				"hours_sold_summary_open_ins_co": "",
 				"hours_sold_summary_open_status": "",
 				"job_costing_ro_csr": "",

client/src/translations/fr/common.json

@@ -2565,18 +2565,22 @@
 				"gsr_labor_only": "",
 				"hours_sold_detail_closed": "",
 				"hours_sold_detail_closed_csr": "",
+				"hours_sold_detail_closed_estimator": "",
 				"hours_sold_detail_closed_ins_co": "",
 				"hours_sold_detail_closed_status": "",
 				"hours_sold_detail_open": "",
 				"hours_sold_detail_open_csr": "",
+				"hours_sold_detail_open_estimator": "",
 				"hours_sold_detail_open_ins_co": "",
 				"hours_sold_detail_open_status": "",
 				"hours_sold_summary_closed": "",
 				"hours_sold_summary_closed_csr": "",
+				"hours_sold_summary_closed_estimator": "",
 				"hours_sold_summary_closed_ins_co": "",
 				"hours_sold_summary_closed_status": "",
 				"hours_sold_summary_open": "",
 				"hours_sold_summary_open_csr": "",
+				"hours_sold_summary_open_estimator": "",
 				"hours_sold_summary_open_ins_co": "",
 				"hours_sold_summary_open_status": "",
 				"job_costing_ro_csr": "",

client/src/utils/RenderTemplate.js

@@ -1,14 +1,15 @@
 import { gql } from "@apollo/client";
-import jsreport from "@jsreport/browser-client";
 import { notification } from "antd";
-import axios from "axios";
+import jsreport from "@jsreport/browser-client";
 import _ from "lodash";
+import moment from "moment";
 import { auth } from "../firebase/firebase.utils";
 import { setEmailOptions } from "../redux/email/email.actions";
 import { store } from "../redux/store";
 import client from "../utils/GraphQLClient";
-import cleanAxios from "./CleanAxios";
 import { TemplateList } from "./TemplateConstants";
+import cleanAxios from "./CleanAxios";
+import axios from "axios";
 const server = process.env.REACT_APP_REPORTS_SERVER_URL;
 
 jsreport.serverUrl = server;
@@ -254,7 +255,7 @@ export async function RenderTemplates(
       headerpath: `/${bodyshop.imexshopid}/header.html`,
       footerpath: `/${bodyshop.imexshopid}/footer.html`,
       bodyshop: bodyshop,
-      offset: bodyshop.timezone,
+      offset: moment().utcOffset(),
     },
   };
 

client/src/utils/TemplateConstants.js

@@ -818,6 +818,74 @@ export const TemplateList = (type, context) => {
             },
             group: "sales",
           },
+          hours_sold_detail_closed_estimator: {
+            title: i18n.t(
+              "reportcenter.templates.hours_sold_detail_closed_estimator"
+            ),
+            description: "",
+            subject: i18n.t(
+              "reportcenter.templates.hours_sold_detail_closed_estimator"
+            ),
+            key: "hours_sold_detail_closed_estimator",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced"),
+            },
+            group: "sales",
+          },
+          hours_sold_detail_open_estimator: {
+            title: i18n.t(
+              "reportcenter.templates.hours_sold_detail_open_estimator"
+            ),
+            description: "",
+            subject: i18n.t(
+              "reportcenter.templates.hours_sold_detail_open_estimator"
+            ),
+            key: "hours_sold_detail_open_estimator",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_open"),
+            },
+            group: "sales",
+          },
+          hours_sold_summary_closed_estimator: {
+            title: i18n.t(
+              "reportcenter.templates.hours_sold_summary_closed_estimator"
+            ),
+            description: "",
+            subject: i18n.t(
+              "reportcenter.templates.hours_sold_summary_closed_estimator"
+            ),
+            key: "hours_sold_summary_closed_estimator",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced"),
+            },
+            group: "sales",
+          },
+          hours_sold_summary_open_estimator: {
+            title: i18n.t(
+              "reportcenter.templates.hours_sold_summary_open_estimator"
+            ),
+            description: "",
+            subject: i18n.t(
+              "reportcenter.templates.hours_sold_summary_open_estimator"
+            ),
+            key: "hours_sold_summary_open_estimator",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced"),
+            },
+            group: "sales",
+          },
           hours_sold_summary_open_status: {
             title: i18n.t(
               "reportcenter.templates.hours_sold_summary_open_status"