From c6fa6c710d467479e8e2486cdd8e72799e29ebdc Mon Sep 17 00:00:00 2001 From: RaktimaNXG Date: Fri, 12 Apr 2024 11:32:51 +0530 Subject: [PATCH] fix: auto sign issue , change template report and sopen sign drive tour field name --- apps/OpenSign/src/constant/Utils.js | 8 ++++---- apps/OpenSign/src/pages/Opensigndrive.js | 20 +++++++++---------- .../OpenSign/src/pages/TemplatePlaceholder.js | 12 +++++------ .../src/primitives/GetReportDisplay.js | 16 ++++++++------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/apps/OpenSign/src/constant/Utils.js b/apps/OpenSign/src/constant/Utils.js index 4d32a960e..849a59c32 100644 --- a/apps/OpenSign/src/constant/Utils.js +++ b/apps/OpenSign/src/constant/Utils.js @@ -1153,10 +1153,10 @@ export const multiSignEmbed = async ( const newUrl = await convertPNGtoJPEG(signUrl); signUrl = newUrl; } - const checkUrl = urlValidator(signUrl); - if (checkUrl) { - signUrl = signUrl + "?get"; - } + // const checkUrl = urlValidator(signUrl); + // if (checkUrl) { + // signUrl = signUrl + "?get"; + // } const res = await fetch(signUrl); return res.arrayBuffer(); } diff --git a/apps/OpenSign/src/pages/Opensigndrive.js b/apps/OpenSign/src/pages/Opensigndrive.js index c405358e1..ac31379e1 100644 --- a/apps/OpenSign/src/pages/Opensigndrive.js +++ b/apps/OpenSign/src/pages/Opensigndrive.js @@ -480,16 +480,16 @@ function Opensigndrive() { let updatedTourStatus = []; if (tourStatusArr.length > 0) { updatedTourStatus = [...tourStatusArr]; - const opensignTourIndex = tourStatusArr.findIndex( - (obj) => obj["opensignTour"] === false || obj["opensignTour"] === true + const driveTourIndex = tourStatusArr.findIndex( + (obj) => obj["driveTour"] === false || obj["driveTour"] === true ); - if (opensignTourIndex !== -1) { - updatedTourStatus[opensignTourIndex] = { opensignTour: true }; + if (driveTourIndex !== -1) { + updatedTourStatus[driveTourIndex] = { driveTour: true }; } else { - updatedTourStatus.push({ opensignTour: true }); + updatedTourStatus.push({ driveTour: true }); } } else { - updatedTourStatus = [{ opensignTour: true }]; + updatedTourStatus = [{ driveTour: true }]; } await axios.put( serverUrl + "classes/" + extUserClass + "/" + extUserId, @@ -514,13 +514,11 @@ function Opensigndrive() { if (res.data && res.data.TourStatus && res.data.TourStatus.length > 0) { const tourStatus = res.data.TourStatus; setTourStatusArr(tourStatus); - const filteredtourStatus = tourStatus.filter( - (obj) => obj["opensignTour"] - ); + const filteredtourStatus = tourStatus.filter((obj) => obj["driveTour"]); if (filteredtourStatus.length > 0) { - const opensignTour = filteredtourStatus[0]["opensignTour"]; + const driveTour = filteredtourStatus[0]["driveTour"]; // console.log("loginTour", loginTour); - if (opensignTour) { + if (driveTour) { setIsTour(false); } else { setIsTour(true); diff --git a/apps/OpenSign/src/pages/TemplatePlaceholder.js b/apps/OpenSign/src/pages/TemplatePlaceholder.js index 2b54f2aab..3870d86db 100644 --- a/apps/OpenSign/src/pages/TemplatePlaceholder.js +++ b/apps/OpenSign/src/pages/TemplatePlaceholder.js @@ -311,10 +311,10 @@ const TemplatePlaceholder = () => { if (tourstatus && tourstatus.length > 0) { setTourStatus(tourstatus); const checkTourRecipients = tourstatus.filter( - (data) => data.templatetour + (data) => data.templateTour ); if (checkTourRecipients && checkTourRecipients.length > 0) { - setCheckTourStatus(checkTourRecipients[0].templatetour); + setCheckTourStatus(checkTourRecipients[0].templateTour); } } const loadObj = { @@ -805,15 +805,15 @@ const TemplatePlaceholder = () => { if (tourStatus.length > 0) { updatedTourStatus = [...tourStatus]; const templatetourIndex = tourStatus.findIndex( - (obj) => obj["templatetour"] === false || obj["templatetour"] === true + (obj) => obj["templateTour"] === false || obj["templateTour"] === true ); if (templatetourIndex !== -1) { - updatedTourStatus[templatetourIndex] = { templatetour: true }; + updatedTourStatus[templatetourIndex] = { templateTour: true }; } else { - updatedTourStatus.push({ templatetour: true }); + updatedTourStatus.push({ templateTour: true }); } } else { - updatedTourStatus = [{ templatetour: true }]; + updatedTourStatus = [{ templateTour: true }]; } await axios .put( diff --git a/apps/OpenSign/src/primitives/GetReportDisplay.js b/apps/OpenSign/src/primitives/GetReportDisplay.js index 0ea1b96c5..914da3515 100644 --- a/apps/OpenSign/src/primitives/GetReportDisplay.js +++ b/apps/OpenSign/src/primitives/GetReportDisplay.js @@ -263,12 +263,12 @@ const ReportTable = ({ // console.log("res ", res.data.TourStatus); setTourStatusArr(tourStatus); const filteredtourStatus = tourStatus.filter( - (obj) => obj["templateTour"] + (obj) => obj["templateReportTour"] ); if (filteredtourStatus.length > 0) { - const templateTour = filteredtourStatus[0]["templateTour"]; + const templateReportTour = filteredtourStatus[0]["templateReportTour"]; - if (templateTour) { + if (templateReportTour) { setIsTour(false); } else { setIsTour(true); @@ -296,15 +296,17 @@ const ReportTable = ({ if (tourStatusArr.length > 0) { updatedTourStatus = [...tourStatusArr]; const templateTourIndex = tourStatusArr.findIndex( - (obj) => obj["templateTour"] === false || obj["templateTour"] === true + (obj) => + obj["templateReportTour"] === false || + obj["templateReportTour"] === true ); if (templateTourIndex !== -1) { - updatedTourStatus[templateTourIndex] = { templateTour: true }; + updatedTourStatus[templateTourIndex] = { templateReportTour: true }; } else { - updatedTourStatus.push({ templateTour: true }); + updatedTourStatus.push({ templateReportTour: true }); } } else { - updatedTourStatus = [{ templateTour: true }]; + updatedTourStatus = [{ templateReportTour: true }]; } await axios.put(