Jannex
/
admin-dashboard-web
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated at

main
alex 2024-03-09 20:58:38 +01:00
parent 6230375513
commit fc2eb7a01e
9 changed files with 1912 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1801
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

1
package.json
View File

@ -19,6 +19,7 @@
"react-dom": "^18.2.0",
"react-highlight-words": "^0.20.0",
"react-i18next": "^13.0.1",
"react-markdown": "^9.0.1",
"react-qr-scanner": "^1.0.0-alpha.11",
"react-router-dom": "^6.10.0",
"react-scripts": "5.0.1",

BIN
public/favicon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 16 KiB

BIN
public/favicon2.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

1
public/locales/de/translation.json
View File

@ -295,6 +295,7 @@
"email": "E-Mail",
"lastContact": "Letzter Kontakt",
"createdBy": "Erstellt von",
"updatedAt": "Aktualisiert am",
"notes": "Notizen"
},
"placeholderSearch": "Suche nach",

1
public/locales/en/translation.json
View File

@ -295,6 +295,7 @@
"email": "Email",
"lastContact": "Last Contact",
"createdBy": "Created by",
"updatedAt":"Updated at",
"notes": "Notes"
},
"placeholderSearch": "Search for",

37
src/Handlers/WebSocketMessageHandler.js
View File

@ -1036,13 +1036,10 @@ export function handleWebSocketMessage(
break;
case ReceivedMessagesCommands.CrmCustomerUpdated:
// update drawer customer if it is the same customer
if (crmContext.currentDrawerCustomerRef.current !== null) {
if (crmContext.currentDrawerCustomerRef.current.Id === body.Id) {
if (crmContext.openDrawerCustomerId.current === body.Id) {
for (const property in body) {
if (
crmContext.changedDrawerCustomerFieldsRef.current.includes(
property
)
crmContext.changedDrawerCustomerFieldsRef.current.includes(property)
)
continue;
@ -1057,7 +1054,6 @@ export function handleWebSocketMessage(
}
}
}
}
// update customers list
crmContext.setCustomers((arr) => {
@ -1082,24 +1078,33 @@ export function handleWebSocketMessage(
crmContext.setCustomers((arr) => [...arr, body]);
break;
case ReceivedMessagesCommands.CrmCallProtocolCreated:
if (crmContext.currentDrawerCustomerRef.current !== null) {
if (
crmContext.currentDrawerCustomerRef.current.Id === body.CustomerId
) {
crmContext.setCurrentDrawerCallProtocols((arr) => [...arr, body]);
if (crmContext.openDrawerCustomerId.current === body.Customer.Id) {
crmContext.setCurrentDrawerCallProtocols((arr) => [
...arr,
body.CallProtocol,
]);
}
crmContext.setCustomers((arr) => {
const newArr = [...arr];
const arrIndex = arr.findIndex(
(customer) => customer.Id === body.Customer.Id
);
if (arrIndex !== -1) {
newArr[arrIndex].LastContact = body.Customer.LastContact;
}
return newArr;
});
break;
case ReceivedMessagesCommands.CrmCallProtocolDeleted:
if (crmContext.currentDrawerCustomerRef.current !== null) {
if (
crmContext.currentDrawerCustomerRef.current.Id === body.CustomerId
) {
if (crmContext.openDrawerCustomerId.current === body.CustomerId) {
crmContext.setCurrentDrawerCallProtocols((arr) =>
arr.filter((callProtocol) => callProtocol.Id !== body.Id)
);
}
}
break;
default:
console.error("unknown command", cmd);

92
src/Pages/CrmTest/CrmTest.js
View File

@ -22,7 +22,6 @@ import {
Empty,
Flex,
Popconfirm,
Affix,
} from "antd";
import { useTranslation } from "react-i18next";
import {
@ -66,6 +65,7 @@ import MyModal, {
MyModalCloseCreateButtonFooter,
} from "../../Components/MyModal";
import dayjs from "dayjs";
import Markdown from "react-markdown";
const CRM_TYPE = {
CUSTOMERS: 0,
@ -153,6 +153,14 @@ export default function CrmTest() {
return 0;
};
const sorterDates = (a, b) => {
return a === Constants.TEXT_EMPTY_PLACEHOLDER
? 0
: new Date(a) - b === Constants.TEXT_EMPTY_PLACEHOLDER
? 0
: new Date(b);
};
const handleSearch = (selectedKeys, confirm, dataIndex) => {
confirm();
setSearchText(selectedKeys[0]);
@ -315,14 +323,7 @@ export default function CrmTest() {
title: t("crm.table.createdAt"),
dataIndex: "createdAt",
key: "createdAt",
sorter: (a, b) => {
return a.createdAt === Constants.TEXT_EMPTY_PLACEHOLDER
? 0
: new Date(a.createdAt) - b.createdAt ===
Constants.TEXT_EMPTY_PLACEHOLDER
? 0
: new Date(b.createdAt);
},
sorter: (a, b) => sorterDates(a.createdAt, b.createdAt),
sortDirections: ["descend"],
},
{
@ -343,7 +344,14 @@ export default function CrmTest() {
title: t("crm.table.lastContact"),
dataIndex: "lastContact",
key: "lastContact",
sorter: (a, b) => a.lastContact.length - b.lastContact.length,
sorter: (a, b) => sorterDates(a.lastContact, b.lastContact),
sortDirections: ["descend"],
},
{
title: t("crm.table.updatedAt"),
dataIndex: "updatedAt",
key: "updatedAt",
sorter: (a, b) => sorterDates(a.updatedAt, b.updatedAt),
sortDirections: ["descend"],
},
{
@ -410,6 +418,7 @@ export default function CrmTest() {
telephone: item.Telephone,
email: item.Email,
lastContact: FormatDatetime(item.LastContact),
updatedAt: FormatDatetime(item.UpdatedAt),
createdBy: (
<>
<Popover
@ -1268,6 +1277,32 @@ function ActivityCallProtocols({ notificationApi }) {
}
});
const notes = [];
notes.push(`${FormatDatetime(item.CalledAt)} Uhr`);
if (item.Telephone !== "") {
notes.push(`Tel: ${item.Telephone}`);
}
if (item.Notes !== "") {
notes.push(`${t("crm.callProtocolModal.notes")}: ${item.Notes}`);
}
/*
{`${FormatDatetime(item.CalledAt)} Uhr${
item.Telephone !== "" ? ` - Tel: ${item.Telephone}` : ""
} ${
item.Notes !== ""
? `- ${t("crm.callProtocolModal.notes")}: ${(
<>
<Markdown>{item.Notes}</Markdown>
</>
)}`
: ""
}`}
*/
return (
<Card key={item.Id}>
<Card.Meta
@ -1294,16 +1329,12 @@ function ActivityCallProtocols({ notificationApi }) {
cancelText={t("common.button.cancel")}
okText={t("common.button.confirm")}
onConfirm={() => {
myFetch(`/crm/calls/delete/${item.Id}`, "DELETE")
.then(() => {
console.log("deleted");
})
.catch(() => {
showUnkownErrorNotification(notificationApi, t);
});
myFetch(`/crm/calls/delete/${item.Id}`, "DELETE").catch(
() => showUnkownErrorNotification(notificationApi, t)
);
}}
>
<DeleteOutlined />
<DeleteOutlined style={{ color: "darkred" }} />
</Popconfirm>
</Flex>
}
@ -1316,13 +1347,7 @@ function ActivityCallProtocols({ notificationApi }) {
symbol: t("common.text.more"),
}}
>
{`${FormatDatetime(item.CalledAt)} Uhr${
item.Telephone !== "" ? ` - ${item.Telephone}` : ""
} ${
item.Notes !== ""
? `- ${t("crm.callProtocolModal.notes")}: ${item.Notes}`
: ""
}`}
{notes.join(" - ")}
</Typography.Paragraph>
}
/>
@ -1351,14 +1376,25 @@ function CallProtocolModal({ formDealInfo, notificationApi }) {
const telephone = Form.useWatch("telephone", form);
const handleCancel = () => {
setIsOpen(false);
};
// used to check if the customer has changed and reset the form
const lastCustomerIdRef = useRef(null);
const handleCancel = () => setIsOpen(false);
useEffect(() => {
if (isOpen) {
const currentDate = new Date();
// check if the customer has changed and reset the form
if (
lastCustomerIdRef.current !== crmContext.openDrawerCustomerId.current
) {
lastCustomerIdRef.current = crmContext.openDrawerCustomerId.current;
setCallResult(typeCallResult);
form.resetFields();
}
form.setFieldsValue({
callType: 1,
reached: "Ja",

10
src/utils.js
View File

@ -1293,7 +1293,15 @@ export function FormatDatetime(datetime) {
return Constants.TEXT_EMPTY_PLACEHOLDER;
}
return new Date(datetime).toLocaleString("de-DE");
const date = new Date(datetime);
const day = String(date.getDate()).padStart(2, "0");
const month = String(date.getMonth() + 1).padStart(2, "0");
const year = date.getFullYear();
const hours = String(date.getHours()).padStart(2, "0");
const minutes = String(date.getMinutes()).padStart(2, "0");
const seconds = String(date.getSeconds()).padStart(2, "0");
return `${day}.${month}.${year} ${hours}:${minutes}:${seconds}`;
}
export function GetDuration(startTime, endTime) {