From 2c100ad399d3a6d601a07fe8a12713a994d0a3e6 Mon Sep 17 00:00:00 2001 From: RaktimaNXG Date: Mon, 18 Mar 2024 17:40:27 +0530 Subject: [PATCH 1/4] fix: show warning on placeholder_sign page for document already send to signers for signature --- apps/OpenSign/src/pages/PlaceHolderSign.js | 77 +++++++++++++++++++--- 1 file changed, 68 insertions(+), 9 deletions(-) diff --git a/apps/OpenSign/src/pages/PlaceHolderSign.js b/apps/OpenSign/src/pages/PlaceHolderSign.js index cffa2d77d..bb50006ac 100644 --- a/apps/OpenSign/src/pages/PlaceHolderSign.js +++ b/apps/OpenSign/src/pages/PlaceHolderSign.js @@ -102,6 +102,10 @@ function PlaceHolderSign() { const [widgetName, setWidgetName] = useState(false); const [mailStatus, setMailStatus] = useState(""); const [isCurrUser, setIsCurrUser] = useState(false); + const [isAlreadyPlace, setIsAlreadyPlace] = useState({ + status: false, + message: "" + }); const color = [ "#93a3db", "#e6c3db", @@ -193,15 +197,39 @@ function PlaceHolderSign() { //getting document details const documentData = await contractDocument(documentId); if (documentData && documentData.length > 0) { - // const alreadyPlaceholder = - // documentData[0].Placeholders && documentData[0].Placeholders; - // if (alreadyPlaceholder && alreadyPlaceholder.length > 0) { - // setIsAlreadyPlace(true); - // } - // setSignersData(documentData[0]); - // setIsSelectId(0); - // setSignerObjId(documentData[0].Signers[0].objectId); - // setContractName(documentData[0].Signers[0].className); + const alreadyPlaceholder = documentData[0]?.SignedUrl; + + if (alreadyPlaceholder) { + const isCompleted = + documentData[0].IsCompleted && documentData[0]?.IsCompleted; + const expireDate = documentData[0].ExpiryDate.iso; + const declined = + documentData[0].IsDeclined && documentData[0]?.IsDeclined; + const expireUpdateDate = new Date(expireDate).getTime(); + const currDate = new Date().getTime(); + if (isCompleted) { + setIsAlreadyPlace({ + status: true, + message: "This document has been signed by all Signers." + }); + } else if (declined) { + setIsAlreadyPlace({ + status: true, + message: "This document has been declined by one or more person(s)." + }); + } else if (currDate > expireUpdateDate) { + setIsAlreadyPlace({ + status: true, + message: "This Document is no longer available." + }); + } else { + setIsAlreadyPlace({ + status: true, + message: "The document has already been dispatched to be signed." + }); + } + } + setPdfDetails(documentData); if (documentData[0].Signers && documentData[0].Signers.length > 0) { @@ -333,6 +361,7 @@ function PlaceHolderSign() { let dropData = []; let placeHolder; const dragTypeValue = item?.text ? item.text : monitor.type; + console.log("option", dragTypeValue); if (item === "onclick") { const dropObj = { //onclick put placeholder center on pdf @@ -1752,6 +1781,36 @@ function PlaceHolderSign() { + { + // setIsAlreadyPlace({status:false}); + // }} + > +
+

{isAlreadyPlace.message}

+ +
+ +
+ Date: Mon, 18 Mar 2024 18:22:14 +0530 Subject: [PATCH 2/4] fix: remove console --- apps/OpenSign/src/pages/PlaceHolderSign.js | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/OpenSign/src/pages/PlaceHolderSign.js b/apps/OpenSign/src/pages/PlaceHolderSign.js index bb50006ac..ff73a158e 100644 --- a/apps/OpenSign/src/pages/PlaceHolderSign.js +++ b/apps/OpenSign/src/pages/PlaceHolderSign.js @@ -361,7 +361,6 @@ function PlaceHolderSign() { let dropData = []; let placeHolder; const dragTypeValue = item?.text ? item.text : monitor.type; - console.log("option", dragTypeValue); if (item === "onclick") { const dropObj = { //onclick put placeholder center on pdf From 7373b086e4fdbe4729f41ecce9ad5b4012e9601f Mon Sep 17 00:00:00 2001 From: RaktimaNXG Date: Mon, 18 Mar 2024 19:00:02 +0530 Subject: [PATCH 3/4] fix: change warning messages --- apps/OpenSign/src/pages/PdfRequestFiles.js | 2 +- apps/OpenSign/src/pages/PlaceHolderSign.js | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/OpenSign/src/pages/PdfRequestFiles.js b/apps/OpenSign/src/pages/PdfRequestFiles.js index bdb017394..7f2bf551d 100644 --- a/apps/OpenSign/src/pages/PdfRequestFiles.js +++ b/apps/OpenSign/src/pages/PdfRequestFiles.js @@ -988,7 +988,7 @@ function PdfRequestFiles() { : isDecline.currnt === "YouDeclined" ? "You have declined this document!" : isDecline.currnt === "another" && - "You cannot sign this document as it has been declined by one or more person(s)." + "You cannot sign this document as it has been declined by one or more recipient(s)." } footerMessage={isDecline.currnt === "Sure"} declineDoc={declineDoc} diff --git a/apps/OpenSign/src/pages/PlaceHolderSign.js b/apps/OpenSign/src/pages/PlaceHolderSign.js index ff73a158e..e32e5e910 100644 --- a/apps/OpenSign/src/pages/PlaceHolderSign.js +++ b/apps/OpenSign/src/pages/PlaceHolderSign.js @@ -215,7 +215,8 @@ function PlaceHolderSign() { } else if (declined) { setIsAlreadyPlace({ status: true, - message: "This document has been declined by one or more person(s)." + message: + "This document has been declined by one or more recipient(s)." }); } else if (currDate > expireUpdateDate) { setIsAlreadyPlace({ @@ -225,7 +226,7 @@ function PlaceHolderSign() { } else { setIsAlreadyPlace({ status: true, - message: "The document has already been dispatched to be signed." + message: "The document has already been dispatched for signing." }); } } From 76491a77f186418843555da9dc02280f75d1d5cf Mon Sep 17 00:00:00 2001 From: RaktimaNXG Date: Tue, 19 Mar 2024 10:27:41 +0530 Subject: [PATCH 4/4] fix: add comment --- apps/OpenSign/src/pages/PlaceHolderSign.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/apps/OpenSign/src/pages/PlaceHolderSign.js b/apps/OpenSign/src/pages/PlaceHolderSign.js index e32e5e910..1d8496a80 100644 --- a/apps/OpenSign/src/pages/PlaceHolderSign.js +++ b/apps/OpenSign/src/pages/PlaceHolderSign.js @@ -198,32 +198,41 @@ function PlaceHolderSign() { const documentData = await contractDocument(documentId); if (documentData && documentData.length > 0) { const alreadyPlaceholder = documentData[0]?.SignedUrl; - + // Check if document is sent for signing if (alreadyPlaceholder) { + // Check if the document is completed const isCompleted = documentData[0].IsCompleted && documentData[0]?.IsCompleted; + // Get the expiration date of the document const expireDate = documentData[0].ExpiryDate.iso; + // Check if the document has been declined const declined = documentData[0].IsDeclined && documentData[0]?.IsDeclined; + // Get the expiration update date in milliseconds const expireUpdateDate = new Date(expireDate).getTime(); + // Get the current date in milliseconds const currDate = new Date().getTime(); if (isCompleted) { + // If document is completed setIsAlreadyPlace({ status: true, message: "This document has been signed by all Signers." }); } else if (declined) { + // If document has been declined setIsAlreadyPlace({ status: true, message: "This document has been declined by one or more recipient(s)." }); } else if (currDate > expireUpdateDate) { + // If document has expired setIsAlreadyPlace({ status: true, message: "This Document is no longer available." }); } else { + // If document is dispatched for signing setIsAlreadyPlace({ status: true, message: "The document has already been dispatched for signing." @@ -1786,9 +1795,6 @@ function PlaceHolderSign() { isOpen={isAlreadyPlace.status} title={"Document Alert"} showClose={false} - // handleClose={() => { - // setIsAlreadyPlace({status:false}); - // }} >

{isAlreadyPlace.message}