admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added report center IO-636

Browse Source
This commit is contained in:
Patrick Fic
2021-02-04 17:03:19 -08:00
parent aa1f5c6b06
commit 9993d76709
12 changed files with 408 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

146
bodyshop_translations.babel
View File

@@ -20306,6 +20306,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>reportcenter</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>schedule</name> <name>schedule</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -24357,6 +24378,131 @@
</folder_node> </folder_node>
</children> </children>
</folder_node> </folder_node>
<folder_node>
<name>reportcenter</name>
<children>
<folder_node>
<name>actions</name>
<children>
<concept_node>
<name>generate</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
</children>
</folder_node>
<folder_node>
<name>labels</name>
<children>
<concept_node>
<name>dates</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>generateasemail</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>key</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
</children>
</folder_node>
<folder_node>
<name>templates</name>
<children>
<concept_node>
<name>payment_by_date</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
</children>
</folder_node>
</children>
</folder_node>
<folder_node> <folder_node>
<name>scoreboard</name> <name>scoreboard</name>
<children> <children>

15
client/src/components/header/header.component.jsx
View File

@@ -48,6 +48,8 @@ const mapDispatchToProps = (dispatch) => ({
dispatch(setModalContext({ context: context, modal: "timeTicket" })), dispatch(setModalContext({ context: context, modal: "timeTicket" })),
setPaymentContext: (context) => setPaymentContext: (context) =>
dispatch(setModalContext({ context: context, modal: "payment" })), dispatch(setModalContext({ context: context, modal: "payment" })),
setReportCenterContext: (context) =>
dispatch(setModalContext({ context: context, modal: "reportCenter" })),
signOutStart: () => dispatch(signOutStart()), signOutStart: () => dispatch(signOutStart()),
}); });
@@ -59,6 +61,7 @@ function Header({
setBillEnterContext, setBillEnterContext,
setTimeTicketContext, setTimeTicketContext,
setPaymentContext, setPaymentContext,
setReportCenterContext,
recentItems, recentItems,
}) { }) {
const { t } = useTranslation(); const { t } = useTranslation();
@@ -268,7 +271,17 @@ function Header({
{t("menus.header.shop_templates")} {t("menus.header.shop_templates")}
</Link> </Link>
</Menu.Item> </Menu.Item>
<Menu.Item
key="reportcenter"
onClick={() => {
setReportCenterContext({
actions: {},
context: {},
});
}}
>
{t("menus.header.reportcenter")}
</Menu.Item>
<Menu.Item key="shop-vendors"> <Menu.Item key="shop-vendors">
<Link to="/manage/shop/vendors"> <Link to="/manage/shop/vendors">
{t("menus.header.shop_vendors")} {t("menus.header.shop_vendors")}

12
client/src/components/print-center-speed-print/print-center-speed-print.component.jsx
View File

@@ -72,8 +72,16 @@ const renderTemplateList = (templates) => {
<span className="imex-flex-row__margin"> <span className="imex-flex-row__margin">
{templates.map((template, idx) => { {templates.map((template, idx) => {
if (idx === templates.length - 1) if (idx === templates.length - 1)
return TemplateListGenerated[template].title; return (
return `${TemplateListGenerated[template].title}, `; (TemplateListGenerated[template] &&
TemplateListGenerated[template].title) ||
""
);
return `${
(TemplateListGenerated[template] &&
TemplateListGenerated[template].title) ||
""
}, `;
})} })}
</span> </span>
); );

131
client/src/components/report-center-modal/report-center-modal.component.jsx Normal file
View File

@@ -0,0 +1,131 @@
import { Button, DatePicker, Form, Select, Switch } from "antd";
import moment from "moment";
import React from "react";
import { useTranslation } from "react-i18next";
import { GenerateDocument } from "../../utils/RenderTemplate";
import { TemplateList } from "../../utils/TemplateConstants";
export default function ReportCenterModalComponent({ context }) {
const [form] = Form.useForm();
const { t } = useTranslation();
const Templates = TemplateList("report_center");
const handleFinish = (values) => {
const start = values.dates[0];
const end = values.dates[1];
console.log("values", values);
GenerateDocument(
{
name: values.key,
variables: {
...(start ? { start: start } : {}),
...(end ? { end: end } : {}),
},
},
{
to: values.to,
},
values.email ? "e" : "p"
);
};
return (
<div>
<Form
onFinish={handleFinish}
autoComplete={"off"}
layout="vertical"
form={form}
initialValues={{
to: [
"allan.carr@thinkimex.com",
"allanlcarr@outlook.com",
"allanlcarr@icloud.com",
],
}}
>
<Form.Item
name="key"
label={t("reportcenter.labels.key")}
rules={[
{
required: true,
message: t("general.validation.required"),
},
]}
>
<Select>
{Object.keys(Templates).map((key) => (
<Select.Option key={key}>{Templates[key].title}</Select.Option>
))}
</Select>
</Form.Item>
<Form.Item
name="dates"
label={t("reportcenter.labels.dates")}
rules={[
{
required: true,
message: t("general.validation.required"),
},
]}
>
<DatePicker.RangePicker
format="YYYY-MM-DD"
ranges={{
Today: [moment(), moment()],
"Last 14 days": [moment().subtract(14, "days"), moment()],
"Last 7 days": [moment().subtract(7, "days"), moment()],
"Next 7 days": [moment(), moment().add(7, "days")],
"Next 14 days": [moment(), moment().add(14, "days")],
"Last Month": [
moment().startOf("month").subtract(1, "month"),
moment().startOf("month").subtract(1, "month").endOf("month"),
],
"This Month": [
moment().startOf("month"),
moment().endOf("month"),
],
"Next Month": [
moment().startOf("month").add(1, "month"),
moment().startOf("month").add(1, "month").endOf("month"),
],
"Last Quarter": [
moment().startOf("quarter").subtract(1, "quarters"),
moment().startOf("quarter").subtract(1, "day"),
],
"This Quarter": [
moment().startOf("quarter"),
moment()
.startOf("quarter")
.add(1, "quarter")
.subtract(1, "day"),
],
}}
/>
</Form.Item>
<Form.Item
name="email"
label={t("reportcenter.labels.generateasemail")}
valuePropName="checked"
>
<Switch />
</Form.Item>
<div
style={{
display: "flex",
justifyContent: "center",
marginTop: "1rem",
}}
>
<Button onClick={() => form.submit()} style={{}}>
{t("reportcenter.actions.generate")}
</Button>
</div>
</Form>
</div>
);
}

42
client/src/components/report-center-modal/report-center-modal.container.jsx Normal file
View File

@@ -0,0 +1,42 @@
import { Modal } from "antd";
import React from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import { toggleModalVisible } from "../../redux/modals/modals.actions";
import { selectReportCenter } from "../../redux/modals/modals.selectors";
import ReportCenterModalComponent from "./report-center-modal.component";
const mapStateToProps = createStructuredSelector({
reportCenterModal: selectReportCenter,
});
const mapDispatchToProps = (dispatch) => ({
toggleModalVisible: () => dispatch(toggleModalVisible("reportCenter")),
});
export function ReportCenterModalContainer({
reportCenterModal,
toggleModalVisible,
}) {
const { t } = useTranslation();
const { visible } = reportCenterModal;
return (
<Modal
visible={visible}
title={t("printcenter.labels.reportcentermodal")}
onOk={() => toggleModalVisible()}
cancelButtonProps={{ style: { display: "none" } }}
destroyOnClose
>
<ReportCenterModalComponent />
</Modal>
);
}
export default connect(
mapStateToProps,
mapDispatchToProps
)(ReportCenterModalContainer);

4
client/src/pages/manage/manage.page.component.jsx
View File

@@ -80,6 +80,9 @@ const BillsListPage = lazy(() => import("../bills/bills.page.container"));
const JobCostingModal = lazy(() => const JobCostingModal = lazy(() =>
import("../../components/job-costing-modal/job-costing-modal.container") import("../../components/job-costing-modal/job-costing-modal.container")
); );
const ReportCenterModal = lazy(() =>
import("../../components/report-center-modal/report-center-modal.container")
);
const BillEnterModalContainer = lazy(() => const BillEnterModalContainer = lazy(() =>
import("../../components/bill-enter-modal/bill-enter-modal.container") import("../../components/bill-enter-modal/bill-enter-modal.container")
); );
@@ -183,6 +186,7 @@ export function Manage({ match, conflict }) {
<BreadCrumbs /> <BreadCrumbs />
<BillEnterModalContainer /> <BillEnterModalContainer />
<JobCostingModal /> <JobCostingModal />
<ReportCenterModal />
<EmailOverlayContainer /> <EmailOverlayContainer />
<TimeTicketModalContainer /> <TimeTicketModalContainer />
<PrintCenterModalContainer /> <PrintCenterModalContainer />

4
client/src/redux/modals/modals.reducer.js
View File

@@ -20,12 +20,12 @@ const INITIAL_STATE = {
reconciliation: { ...baseModal }, reconciliation: { ...baseModal },
payment: { ...baseModal }, payment: { ...baseModal },
jobCosting: { ...baseModal }, jobCosting: { ...baseModal },
reportCenter: { ...baseModal },
}; };
const modalsReducer = (state = INITIAL_STATE, action) => { const modalsReducer = (state = INITIAL_STATE, action) => {
switch (action.type) { switch (action.type) {
case ModalsActionTypes.TOGGLE_MODAL_VISIBLE: case ModalsActionTypes.TOGGLE_MODAL_VISIBLE:
//logImEXEvent("redux_toggle_modal_visible", { modal: action.payload });
return { return {
...state, ...state,
[action.payload]: { [action.payload]: {
@@ -34,8 +34,6 @@ const modalsReducer = (state = INITIAL_STATE, action) => {
}, },
}; };
case ModalsActionTypes.SET_MODAL_CONTEXT: case ModalsActionTypes.SET_MODAL_CONTEXT:
// logImEXEvent("redux_set_modal_context", { modal: action.payload.modal });
return { return {
...state, ...state,
[action.payload.modal]: { [action.payload.modal]: {

5
client/src/redux/modals/modals.selectors.js
View File

@@ -55,3 +55,8 @@ export const selectJobCosting = createSelector(
[selectModals], [selectModals],
(modals) => modals.jobCosting (modals) => modals.jobCosting
); );
export const selectReportCenter = createSelector(
[selectModals],
(modals) => modals.reportCenter
);

14
client/src/translations/en_us/common.json
View File

@@ -1218,6 +1218,7 @@
"productionboard": "Production Board - Visual", "productionboard": "Production Board - Visual",
"productionlist": "Production Board - List", "productionlist": "Production Board - List",
"recent": "Recent Items", "recent": "Recent Items",
"reportcenter": "Report Center",
"schedule": "Schedule", "schedule": "Schedule",
"scoreboard": "Scoreboard", "scoreboard": "Scoreboard",
"search": { "search": {
@@ -1492,6 +1493,19 @@
"activeshop": "Active Shop" "activeshop": "Active Shop"
} }
}, },
"reportcenter": {
"actions": {
"generate": "Generate"
},
"labels": {
"dates": "Dates",
"generateasemail": "Generate as Email?",
"key": "Report"
},
"templates": {
"payment_by_date": "Payments by Date Range"
}
},
"scoreboard": { "scoreboard": {
"actions": { "actions": {
"edit": "Edit" "edit": "Edit"

14
client/src/translations/es/common.json
View File

@@ -1218,6 +1218,7 @@
"productionboard": "", "productionboard": "",
"productionlist": "", "productionlist": "",
"recent": "", "recent": "",
"reportcenter": "",
"schedule": "Programar", "schedule": "Programar",
"scoreboard": "", "scoreboard": "",
"search": { "search": {
@@ -1492,6 +1493,19 @@
"activeshop": "" "activeshop": ""
} }
}, },
"reportcenter": {
"actions": {
"generate": ""
},
"labels": {
"dates": "",
"generateasemail": "",
"key": ""
},
"templates": {
"payment_by_date": ""
}
},
"scoreboard": { "scoreboard": {
"actions": { "actions": {
"edit": "" "edit": ""

14
client/src/translations/fr/common.json
View File

@@ -1218,6 +1218,7 @@
"productionboard": "", "productionboard": "",
"productionlist": "", "productionlist": "",
"recent": "", "recent": "",
"reportcenter": "",
"schedule": "Programme", "schedule": "Programme",
"scoreboard": "", "scoreboard": "",
"search": { "search": {
@@ -1492,6 +1493,19 @@
"activeshop": "" "activeshop": ""
} }
}, },
"reportcenter": {
"actions": {
"generate": ""
},
"labels": {
"dates": "",
"generateasemail": "",
"key": ""
},
"templates": {
"payment_by_date": ""
}
},
"scoreboard": { "scoreboard": {
"actions": { "actions": {
"edit": "" "edit": ""

14
client/src/utils/TemplateConstants.js
View File

@@ -136,6 +136,18 @@ export const TemplateList = (type, context) => {
}, },
} }
: {}), : {}),
...(!type || type === "job" ? {} : {}), ...(!type || type === "report_center"
? {
payment_by_date: {
title: i18n.t("reportcenter.templates.payment_by_date"),
description: "Est Detail",
subject: `${i18n.t("reportcenter.templates.payment_by_date")} - ${
context && context.job && context.job.ro_number
}`,
key: "payment_by_date",
disabled: false,
},
}
: {}),
}; };
}; };