diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 285be0ac8..465de8c3b 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -27410,6 +27410,27 @@
+
+ employee
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
generateasemail
false
diff --git a/client/src/components/report-center-modal/report-center-modal.component.jsx b/client/src/components/report-center-modal/report-center-modal.component.jsx
index c8202658d..652b86aa7 100644
--- a/client/src/components/report-center-modal/report-center-modal.component.jsx
+++ b/client/src/components/report-center-modal/report-center-modal.component.jsx
@@ -1,7 +1,7 @@
import { useLazyQuery } from "@apollo/client";
import { Button, DatePicker, Form, Select, Switch } from "antd";
import moment from "moment";
-import React from "react";
+import React, { useState } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
@@ -11,6 +11,8 @@ import { GenerateDocument } from "../../utils/RenderTemplate";
import { TemplateList } from "../../utils/TemplateConstants";
import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
import DatePIckerRanges from "../../utils/DatePickerRanges";
+import EmployeeSearchSelect from "../employee-search-select/employee-search-select.component";
+import { QUERY_ACTIVE_EMPLOYEES } from "../../graphql/employees.queries";
const mapStateToProps = createStructuredSelector({
reportCenterModal: selectReportCenter,
@@ -25,11 +27,15 @@ export default connect(
export function ReportCenterModalComponent({ reportCenterModal }) {
const [form] = Form.useForm();
+ const [loading, setLoading] = useState(false);
const { t } = useTranslation();
const Templates = TemplateList("report_center");
const { visible } = reportCenterModal;
- const [callVendorQuery, { data, called }] = useLazyQuery(QUERY_ALL_VENDORS, {
+ const [
+ callVendorQuery,
+ { data: vendorData, called: vendorCalled },
+ ] = useLazyQuery(QUERY_ALL_VENDORS, {
skip: !(
visible &&
Templates[form.getFieldValue("key")] &&
@@ -37,12 +43,24 @@ export function ReportCenterModalComponent({ reportCenterModal }) {
),
});
- const handleFinish = (values) => {
+ const [
+ callEmployeeQuery,
+ { data: employeeData, called: employeeCalled },
+ ] = useLazyQuery(QUERY_ACTIVE_EMPLOYEES, {
+ skip: !(
+ visible &&
+ Templates[form.getFieldValue("key")] &&
+ Templates[form.getFieldValue("key")].idtype
+ ),
+ });
+
+ const handleFinish = async (values) => {
+ setLoading(true);
const start = values.dates[0];
const end = values.dates[1];
const { id } = values;
console.log("values", values);
- GenerateDocument(
+ await GenerateDocument(
{
name: values.key,
variables: {
@@ -56,6 +74,7 @@ export function ReportCenterModalComponent({ reportCenterModal }) {
},
values.email ? "e" : "p"
);
+ setLoading(false);
};
return (
@@ -89,7 +108,8 @@ export function ReportCenterModalComponent({ reportCenterModal }) {
//Kind of Id
const idtype = Templates[key] && Templates[key].idtype;
if (!idtype) return null;
- if (!called && idtype === "vendor") callVendorQuery();
+ if (!vendorCalled && idtype === "vendor") callVendorQuery();
+ if (!employeeCalled && idtype === "employee") callEmployeeQuery();
if (idtype === "vendor")
return (
-
+
+
+ );
+ if (idtype === "employee")
+ return (
+
+
);
else return null;
@@ -138,7 +177,7 @@ export function ReportCenterModalComponent({ reportCenterModal }) {
marginTop: "1rem",
}}
>
-