{record.status}
{loading &&
}
diff --git a/client/src/components/production-list-table/production-list-print.component.jsx b/client/src/components/production-list-table/production-list-print.component.jsx
index 81e8a4051..b198fcf2a 100644
--- a/client/src/components/production-list-table/production-list-print.component.jsx
+++ b/client/src/components/production-list-table/production-list-print.component.jsx
@@ -1,4 +1,4 @@
-import { Button, Dropdown, Menu } from "antd";
+import { Button, Dropdown } from "antd";
import React, { useState } from "react";
import { TemplateList } from "../../utils/TemplateConstants";
import { useTranslation } from "react-i18next";
@@ -28,58 +28,55 @@ export default connect(
export function ProductionListPrint({ bodyshop }) {
const { t } = useTranslation();
const [loading, setLoading] = useState(false);
- return (
-
{
- setLoading(true);
- await GenerateDocument(
- {
- name: ProdTemplates[e.key].key,
- // variables: { id: contract.id },
- },
- {},
- "p"
- );
- setLoading(false);
- }}
- items={[
- ...Object.keys(ProdTemplates).map((key) => ({
- key: key,
- label: ProdTemplates[key].title,
- })),
- {
- key: "production_by_technician_one",
- label: t("reportcenter.templates.production_by_technician_one"),
- children: bodyshop.employees
- .filter((e) => e.active)
- .map((e) => ({
+ const menu = {
+ items: [
+ ...Object.keys(ProdTemplates).map((key) => ({
+ key: key,
+ label: ProdTemplates[key].title,
+ })),
+ {
+ key: "production_by_technician_one",
+ label: t("reportcenter.templates.production_by_technician_one"),
+ children: bodyshop.employees
+ .filter((e) => e.active)
+ .map((e) => ({
key: e.id,
label: `${e.first_name} ${e.last_name}`,
- })),
- },
- {
- key: "production_by_category_one",
- label: t("reportcenter.templates.production_by_category_one"),
- children: bodyshop.md_categories.map((e) => ({
+ })),
+ },
+ {
+ key: "production_by_category_one",
+ label: t("reportcenter.templates.production_by_category_one"),
+ children: bodyshop.md_categories.map((e) => ({
key: e,
label: e,
- })),
- },
- {
- key: "production_by_repair_status_one",
- label: t("reportcenter.templates.production_by_repair_status_one"),
- children: bodyshop.md_ro_statuses.production_statuses.map((e) => ({
+ })),
+ },
+ {
+ key: "production_by_repair_status_one",
+ label: t("reportcenter.templates.production_by_repair_status_one"),
+ children: bodyshop.md_ro_statuses.production_statuses.map((e) => ({
key: e,
label: e,
- })),
+ })),
+ },
+ ],
+ onClick: async (e) => {
+ setLoading(true);
+ await GenerateDocument(
+ {
+ name: ProdTemplates[e.key].key,
+ // variables: { id: contract.id },
},
- ]}
- />
- }
- >
+ {},
+ "p"
+ );
+ setLoading(false);
+ },
+
+ }
+ return (
+
);
diff --git a/client/src/components/production-list-table/production-list-table.component.jsx b/client/src/components/production-list-table/production-list-table.component.jsx
index 30bc4028a..b817a379d 100644
--- a/client/src/components/production-list-table/production-list-table.component.jsx
+++ b/client/src/components/production-list-table/production-list-table.component.jsx
@@ -1,6 +1,6 @@
import {SyncOutlined} from "@ant-design/icons";
import {useSplitTreatments} from "@splitsoftware/splitio-react";
-import {Button, Dropdown, Input, Menu, Space, Statistic, Table,} from "antd";
+import {Button, Dropdown, Input, Space, Statistic, Table,} from "antd";
import {PageHeader} from "@ant-design/pro-layout";
import React, {useMemo, useState} from "react";
import ReactDragListView from "react-drag-listview";
@@ -28,10 +28,10 @@ export function ProductionListTable({loading, data, refetch, bodyshop, technicia
const [searchText, setSearchText] = useState("");
- const { treatments: {Production_List_Status_Colors} } = useSplitTreatments({
+ const {treatments: {Production_List_Status_Colors}} = useSplitTreatments({
attributes: {},
names: ["Production_List_Status_Colors"],
- splitKey: bodyshop.imexshopid,
+ splitKey: bodyshop.imexshopid,
});
@@ -105,25 +105,28 @@ export function ProductionListTable({loading, data, refetch, bodyshop, technicia
setColumns(nextColumns);
};
- const headerItem = (col) => (
-
- }
- trigger={["contextMenu"]}
- >
- {col.title}
-
- );
+
+ const headerItem = (col) => {
+ const menu = {
+ onClick: removeColumn,
+ items: [
+ {
+ key: col.key,
+ label: t("production.actions.removecolumn"),
+ },
+ ]
+ }
+
+ return (
+
+ {col.title}
+
+ )
+ };
const dataSource =
searchText === ""
diff --git a/client/src/components/schedule-block-day/schedule-block-day.component.jsx b/client/src/components/schedule-block-day/schedule-block-day.component.jsx
index 8eab30a51..ad80b2b77 100644
--- a/client/src/components/schedule-block-day/schedule-block-day.component.jsx
+++ b/client/src/components/schedule-block-day/schedule-block-day.component.jsx
@@ -1,5 +1,5 @@
import { useMutation } from "@apollo/client";
-import { Dropdown, Menu, notification } from "antd";
+import { Dropdown, notification } from "antd";
import dayjs from "../../utils/day";
import React from "react";
import { useTranslation } from "react-i18next";
@@ -55,17 +55,15 @@ export function ScheduleBlockDay({
}
};
- const menu = (
-
- );
+ const menu = {
+ items: [
+ {
+ key: "block",
+ label: t("appointments.actions.block"),
+ },
+ ],
+ onClick: handleMenu,
+ }
return (
template.name);
- const availableTemplateKeys = Object.keys(TemplateList()).filter(
- (tkey) => !shopTemplateKeys.includes(tkey)
- );
+ const shopTemplateKeys = shopTemplateList.map((template) => template.name);
+ const availableTemplateKeys = Object.keys(TemplateList()).filter(
+ (tkey) => !shopTemplateKeys.includes(tkey)
+ );
- const handleAdd = async (item) => {
- logImEXEvent("shop_template_add");
+ const handleAdd = async (item) => {
+ logImEXEvent("shop_template_add");
- const defaultTemplateData = await client.query({
- query: QUERY_TEMPLATES_BY_NAME_FOR_DUPE,
- variables: { name: item.key },
- });
+ const defaultTemplateData = await client.query({
+ query: QUERY_TEMPLATES_BY_NAME_FOR_DUPE,
+ variables: {name: item.key},
+ });
- const template = defaultTemplateData.data.templates.filter(
- (t) => t.bodyshopid === null
- )[0];
+ const template = defaultTemplateData.data.templates.filter(
+ (t) => t.bodyshopid === null
+ )[0];
- const result = await insertTemplate({
- variables: {
- template: {
- name: item.key,
- bodyshopid: bodyshop.id,
- jsontemplate: template && template.jsontemplate,
- html: template && template.html,
- query: template && template.query,
- },
- },
- });
+ const result = await insertTemplate({
+ variables: {
+ template: {
+ name: item.key,
+ bodyshopid: bodyshop.id,
+ jsontemplate: template && template.jsontemplate,
+ html: template && template.html,
+ query: template && template.query,
+ },
+ },
+ });
- const returningId = result.data.insert_templates.returning[0].id;
- search.customTemplateId = returningId;
- history({ search: queryString.stringify(search) });
- if (!!refetch) refetch();
- };
- const TemplateListGenerated = TemplateList();
- const menu = (
-