diff --git a/apps/OpenSign/src/components/opensigndrive/DriveBody.js b/apps/OpenSign/src/components/opensigndrive/DriveBody.js index ca9c254d2..89241f54f 100644 --- a/apps/OpenSign/src/components/opensigndrive/DriveBody.js +++ b/apps/OpenSign/src/components/opensigndrive/DriveBody.js @@ -302,18 +302,7 @@ function DriveBody(props) { status = "Completed"; } else if (isDecline) { status = "Declined"; - } else if (!signerExist || signerExist?.length === 0) { - status = "Draft"; - } else if ( - signerExist?.length > 0 && - (!isPlaceholder || isPlaceholder?.length === 0) - ) { - status = "Draft"; - } else if ( - signerExist?.length > 0 && - isPlaceholder?.length > 0 && - !signedUrl - ) { + } else if (!signedUrl) { status = "Draft"; } else if (isExpire) { status = "Expired"; diff --git a/apps/OpenSignServer/cloud/parsefunction/reportsJson.js b/apps/OpenSignServer/cloud/parsefunction/reportsJson.js index 199210639..2aa126dd5 100644 --- a/apps/OpenSignServer/cloud/parsefunction/reportsJson.js +++ b/apps/OpenSignServer/cloud/parsefunction/reportsJson.js @@ -11,11 +11,7 @@ export default function reportJson(id, userId) { IsCompleted: { $ne: true }, IsDeclined: { $ne: true }, IsArchive: { $ne: true }, - $or: [ - { Signers: { $eq: [] } }, - { Signers: null }, - { Signers: { $exists: true }, Placeholders: null }, - ], + SignedUrl: { $exists: false }, CreatedBy: { __type: 'Pointer', className: '_User', @@ -33,6 +29,7 @@ export default function reportJson(id, userId) { 'Signers.Phone', ], }; + // Need your sign report case '4Hhwbp482K': return { @@ -273,11 +270,7 @@ export default function reportJson(id, userId) { IsCompleted: { $ne: true }, IsDeclined: { $ne: true }, IsArchive: { $ne: true }, - $or: [ - { Signers: { $eq: [] } }, - { Signers: null }, - { Signers: { $exists: true }, Placeholders: null }, - ], + SignedUrl: { $exists: false }, CreatedBy: { __type: 'Pointer', className: '_User',