From 2768414f8153321d021ec1357b65baad3804a38d Mon Sep 17 00:00:00 2001 From: hyh123a Date: Wed, 20 Apr 2022 13:34:26 +0800 Subject: [PATCH] modify the ticke application modal --- .../MyEMS/Ticket/TicketApplication.js | 62 ++++++++++++++++--- 1 file changed, 54 insertions(+), 8 deletions(-) diff --git a/myems-web/src/components/MyEMS/Ticket/TicketApplication.js b/myems-web/src/components/MyEMS/Ticket/TicketApplication.js index 74c1374b..54ab75a5 100644 --- a/myems-web/src/components/MyEMS/Ticket/TicketApplication.js +++ b/myems-web/src/components/MyEMS/Ticket/TicketApplication.js @@ -64,9 +64,11 @@ const TicketApplication = ({ setRedirect, setRedirectUrl, t }) => { const [ticketList, setTicketList] = useState([]); const [ticketApplicationfields, setTicketApplicationfields] = useState({}); - const [applyModalIsShown, setApplyModalIsShown] = useState(false); const [ticketApplicationPayload, setTicketApplicationPayload] = useState({}); + const [modalIsShown, setModalIsShown] = useState(false); + const [openedModalName, setOpenedModalName] = useState(''); + useEffect(() => { let isResponseOK = false; // Get Ticket Type @@ -150,7 +152,8 @@ const TicketApplication = ({ setRedirect, setRedirectUrl, t }) => { - console.log('View: ', id)}>{t('View Ticket')} + {t('View State')} + {t('View Workflow')} ); @@ -267,7 +270,8 @@ const TicketApplication = ({ setRedirect, setRedirectUrl, t }) => { .catch(err => { console.log(err); }); - setApplyModalIsShown(true); + setModalIsShown(true); + setOpenedModalName('Application'); }; // Submit @@ -309,7 +313,23 @@ const TicketApplication = ({ setRedirect, setRedirectUrl, t }) => { }; let hiddenModal = () => { - setApplyModalIsShown(false); + setModalIsShown(false); + }; + + let viewTicketStatusModal = () => { + console.log('View Ticket Status'); + setModalIsShown(true); + setOpenedModalName('Status'); + }; + + let hiddenTicketWorkflowModal = () => { + setModalIsShown(false); + }; + + let viewTicketWorkflowModal = () => { + console.log('View Ticket Workflow'); + setModalIsShown(true); + setOpenedModalName('Workflow'); }; let onFieldChange = (index, { target }) => { @@ -319,6 +339,25 @@ const TicketApplication = ({ setRedirect, setRedirectUrl, t }) => { setTicketApplicationPayload({ ...ticketApplicationPayload, ...temp }); }; + let getModelContent = () => { + console.log("---------------------", "getModelContent"); + switch (openedModalName) { + case 'Application': + console.log("switch application") + return {t('Ticket Application')}; + case 'Status': + console.log("switch status") + return {t('Ticket Status')}; + + case 'Workflow': + console.log("switch workflow") + return {t('Ticket Workflow')}; + default: + console.log("switch none") + return {t('Ticket None')}; + } + }; + useEffect(() => { console.log('selectedTicketType', selectedTicketType); }, [selectedTicketType]); @@ -333,12 +372,17 @@ const TicketApplication = ({ setRedirect, setRedirectUrl, t }) => { }, [ticketApplicationfields]); useEffect(() => { - console.log('applyModalIsShown', applyModalIsShown); - }, [applyModalIsShown]); + console.log('modalIsShown', modalIsShown); + }, [modalIsShown]); useEffect(() => { console.log('ticketApplicationPayload', ticketApplicationPayload); }, [ticketApplicationPayload]); + + useEffect(() => { + console.log('openedModalName', openedModalName); + }, [openedModalName]); + return (
@@ -380,8 +424,9 @@ const TicketApplication = ({ setRedirect, setRedirectUrl, t }) => { - - {t('Ticket Application')} + + {getModelContent()} + {/* {openedModalName=='Application' && ({t('Ticket Application')}) } */} {ticketApplicationfields.fields && ticketApplicationfields.fields.map((field, index) => { @@ -411,6 +456,7 @@ const TicketApplication = ({ setRedirect, setRedirectUrl, t }) => { + );