Skip to content

🔥 The free & Open Source DocuSign alternative

change query of progress and recent sent for signtuare reports

prafull-opensignlabsd49b7bd201c7
diff --git a/apps/OpenSign/src/components/fields/CreateFolder.js b/apps/OpenSign/src/components/fields/CreateFolder.js
index 1f921e904..7c13e6145 100644
--- a/apps/OpenSign/src/components/fields/CreateFolder.js
+++ b/apps/OpenSign/src/components/fields/CreateFolder.js
@@ -74,15 +74,15 @@ const CreateFolder = ({ parentFolderId, onSuccess, folderCls }) => {
template.set("CreatedBy", Parse.User.createWithoutData(currentUser.id));
const res = await template.save();
if (res) {
+ setAlert({
+ type: "success",
+ message: "Folder created successfully!"
+ });
+ setIsAlert(true);
+ setTimeout(() => {
+ setIsAlert(false);
+ }, 1000);
if (onSuccess) {
- setAlert({
- type: "success",
- message: "Folder created successfully!"
- });
- setIsAlert(true);
- setTimeout(() => {
- setIsAlert(false);
- }, 1000);
onSuccess(res);
}
}
diff --git a/apps/OpenSign/src/components/fields/SelectFolder.js b/apps/OpenSign/src/components/fields/SelectFolder.js
index 13c2ff157..38694b740 100644
--- a/apps/OpenSign/src/components/fields/SelectFolder.js
+++ b/apps/OpenSign/src/components/fields/SelectFolder.js
@@ -135,6 +135,7 @@ const SelectFolder = ({ required, onSuccess, folderCls }) => {
} else {
fetchFolder();
}
+ handleCreate();
};
return (
<div className="text-xs mt-2 ">
@@ -253,101 +254,6 @@ const SelectFolder = ({ required, onSuccess, folderCls }) => {
</div>
</div>
</ModalUi>
- {/* {isOpen && (
- <div
- className={`fixed z-40 top-20 left-1/2 transform -translate-x-1/2 border-[1px] text-sm bg-white rounded `}
- >
- <div className="flex justify-between items-center py-[.75rem] px-[1.25rem] bg-[#f5f5f5]">
- <div className="font-semibold text-lg text-black">
- Select Folder
- </div>
- <div
- onClick={handleCancel}
- className="px-2 py-1 border-[1px] border-[#8a8a8a] bg-white rounded cursor-pointer"
- >
- <i className="fa-solid fa-xmark"></i>
- </div>
- </div>
- <hr />
- <div className="w-full min-w-[300px] md:min-w-[500px] px-3">
- <div className="py-2 text-[#ac4848] text-[14px] font-[500]">
- <span
- className="cursor-pointer"
- title="Root"
- onClick={(e) => removeTabListItem(e)}
- >
- Root /{" "}
- </span>
- {tabList &&
- tabList.map((tab, i) => (
- <React.Fragment key={`${tab.objectId}-${i}`}>
- <span
- className="cursor-pointer"
- title={tab.Name}
- onClick={(e) => removeTabListItem(e, i)}
- >
- {tab.Name}
- </span>
- {" / "}
- </React.Fragment>
- ))}
- <hr />
- </div>
- <div className="mt-2 mb-3">
- {!isAdd &&
- folderList.length > 0 &&
- folderList.map((folder) => (
- <div
- key={folder.Name}
- className="border-[1px] border-[#8a8a8a] px-2 py-2 mb-2 cursor-pointer"
- onClick={() => handleSelect(folder)}
- >
- <div className="flex items-center gap-2">
- <i
- className="fa fa-folder text-[#33bbff] text-[1.4rem]"
- aria-hidden="true"
- ></i>
- <span className="font-semibold">{folder.Name}</span>
- </div>
- </div>
- ))}
- {isAdd && (
- <CreateFolder
- parentFolderId={clickFolder && clickFolder.ObjectId}
- folderCls={folderCls}
- onSuccess={handleAddFolder}
- />
- )}
- {isLoader && (
- <div className="flex justify-center">
- <i className="fa-solid fa-spinner fa-spin-pulse text-[30px]"></i>
- </div>
- )}
- </div>
- </div>
- <hr />
- <div className="flex justify-between items-center py-[.75rem] px-[1.25rem]">
- <div
- className="text-[30px] cursor-pointer text-[#33bbff]"
- title="Save Here"
- onClick={handleCreate}
- >
- {isAdd ? (
- <i className="fa-solid fa-arrow-left" aria-hidden="true"></i>
- ) : (
- <i className="fa-solid fa-square-plus" aria-hidden="true"></i>
- )}
- </div>
- <div
- className="text-[30px] cursor-pointer"
- title="Save Here"
- onClick={handleSubmit}
- >
- <i className="fas fa-save" aria-hidden="true"></i>
- </div>
- </div>
- </div>
- )} */}
</div>
);
};
diff --git a/apps/OpenSign/src/layout/HomeLayout.js b/apps/OpenSign/src/layout/HomeLayout.js
index c877b90a7..07531f020 100644
--- a/apps/OpenSign/src/layout/HomeLayout.js
+++ b/apps/OpenSign/src/layout/HomeLayout.js
@@ -211,14 +211,9 @@ const HomeLayout = ({ children }) => {
/>
</>
) : (
- <ModalUi
- title={"Session Expired"}
- headColor={"#dc3545"}
- isOpen={true}
- showClose={false}
- >
- <div className="flex flex-col justify-center items-center py-5 gap-5">
- <p className="text-xl font-semibold ">Your Session has Expired.</p>
+ <ModalUi title={"Session Expired"} isOpen={true} showClose={false}>
+ <div className="flex flex-col justify-center items-center py-4 md:py-5 gap-5">
+ <p className="text-xl font-semibold ">Your session has expired.</p>
<button
onClick={handleLoginBtn}
className="text-base px-3 py-1.5 rounded shadow-md text-white bg-[#1ab6ce]"
diff --git a/apps/OpenSign/src/primitives/ModalUi.js b/apps/OpenSign/src/primitives/ModalUi.js
index c3e1721cf..a00a28b61 100644
--- a/apps/OpenSign/src/primitives/ModalUi.js
+++ b/apps/OpenSign/src/primitives/ModalUi.js
@@ -12,7 +12,7 @@ const ModalUi = ({
<>
{isOpen && (
<div className="fixed z-[999] top-0 left-0 w-[100%] h-[100%] bg-black bg-opacity-[75%]">
- <div className="fixed z-[1000] top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 text-sm bg-white rounded shadow-md max-h-90 md:min-w-[500px] overflow-y-auto hide-scrollbar">
+ <div className="fixed z-[1000] top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 text-sm bg-white rounded shadow-md max-h-90 min-w-[90%] md:min-w-[500px] overflow-y-auto hide-scrollbar">
{showHeader && (
<div
className="flex justify-between rounded-t items-center py-[15px] px-[20px] text-white"
diff --git a/apps/OpenSignServer/cloud/parsefunction/reportsJson.js b/apps/OpenSignServer/cloud/parsefunction/reportsJson.js
index 238846b83..12adf13a8 100644
--- a/apps/OpenSignServer/cloud/parsefunction/reportsJson.js
+++ b/apps/OpenSignServer/cloud/parsefunction/reportsJson.js
@@ -62,7 +62,7 @@ export default function reportJson(id, userId) {
reportName: 'In-progress documents',
params: {
Type: { $ne: 'Folder' },
- Signers: { $ne: null },
+ Signers: { $exists: true, $ne: [] },
Placeholders: { $ne: null },
IsCompleted: { $ne: true },
IsDeclined: { $ne: true },
@@ -153,7 +153,7 @@ export default function reportJson(id, userId) {
reportName: 'Recently sent for signatures',
params: {
Type: { $ne: 'Folder' },
- Signers: { $ne: null },
+ Signers: { $exists: true, $ne: [] },
Placeholders: { $ne: null },
IsCompleted: { $ne: true },
IsDeclined: { $ne: true },