WEBDIENSTE/OpenSign
1
0
Fork 0
mirror of https://github.com/OpenSignLabs/OpenSign.git synced 2026-08-17 21:25:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: report visibility issue of Need your sign and Recent signature request

Browse Source
This commit is contained in:
prafull-opensignlabs
2023-11-03 12:49:43 +05:30
parent bc4d2547fd
commit 2fe79dc2a8
4 changed files with 99 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/OpenSign/src/components/dashboard/DashboardCard.js
+29 -1
View File
@@ -156,7 +156,35 @@ const DashboardCard = (props) => {
if (props.Data.key !== "count") {
setresponse(res.data.results[0][props.Data.key]);
} else {
setresponse(res.data[props.Data.key]);
if (props.Label === "Need your Signature") {
const listData = res.data?.results.filter(
(x) => x.Signers.length > 0
);
let arr = [];
for (const obj of listData) {
const isSigner = obj.Signers.some(
(item) => item.UserId.objectId === currentUser.id
);
if (isSigner) {
let isRecord;
if (obj?.AuditTrail && obj?.AuditTrail.length > 0) {
isRecord = obj?.AuditTrail.some(
(item) =>
item?.UserPtr?.UserId?.objectId === currentUser.id &&
item.Activity === "Signed"
);
} else {
isRecord = false;
}
if (isRecord === false) {
arr.push(obj);
}
}
}
setresponse(arr.length);
} else {
setresponse(res.data[props.Data.key]);
}
}
} else {
setresponse(0);
apps/OpenSign/src/components/dashboard/DashboardReport.js
+31 -2
View File
@@ -34,10 +34,39 @@ function DashboardReport(props) {
"X-Parse-Session-Token": localStorage.getItem("accesstoken")
};
try {
const url = `${serverURL}?where=${strParams}&keys=${strKeys}&order=${orderBy}`;
const url = `${serverURL}?where=${strParams}&keys=${strKeys}&order=${orderBy}&include=AuditTrail.UserPtr`;
const res = await axios.get(url, { headers: headers });
// console.log("res ", res.data?.results);
setList(res.data?.results);
if (id === "5Go51Q7T8r") {
const currentUser = Parse.User.current().id;
const listData = res.data?.results.filter(
(x) => x.Signers.length > 0
);
let arr = [];
for (const obj of listData) {
const isSigner = obj.Signers.some(
(item) => item.UserId.objectId === currentUser
);
if (isSigner) {
let isRecord;
if (obj?.AuditTrail && obj?.AuditTrail.length > 0) {
isRecord = obj?.AuditTrail.some(
(item) =>
item?.UserPtr?.UserId?.objectId === currentUser &&
item.Activity === "Signed"
);
} else {
isRecord = false;
}
if (isRecord === false) {
arr.push(obj);
}
}
}
setList(arr);
} else {
setList(res.data?.results);
}
setIsLoader(false);
} catch (err) {
console.log("err ", err);
apps/OpenSign/src/json/ReportJson.js
+8 -48
View File
@@ -1,8 +1,6 @@
import Parse from "parse";
export default function reportJson(id) {
const currentUserId = Parse.User.current().id;
// const extendedCls = localStorage.getItem("Extand_Class");
// const json = JSON.parse(extendedCls)?.[0];
// console.log("json ", json);
switch (id) {
@@ -55,28 +53,7 @@ export default function reportJson(id) {
ExpiryDate: {
$gt: { __type: "Date", iso: new Date().toISOString() }
},
$and: [
{
"AuditTrail.UserPtr": {
$ne: {
__type: "Pointer",
className: "contracts_Users",
objectId: "CkpaR0F6mj"
}
}
},
{ "AuditTrail.Activity": { $ne: "Signed" } }
],
Placeholders: { $ne: null },
Signers: {
$in: [
{
__type: "Pointer",
className: "contracts_Users",
objectId: "CkpaR0F6mj"
}
]
}
Placeholders: { $ne: null }
},
keys: [
"Name",
@@ -84,7 +61,9 @@ export default function reportJson(id) {
"Folder.Name",
"URL",
"ExtUserPtr.Name",
"Signers.Name"
"Signers.Name",
"Signers.UserId",
"AuditTrail"
],
orderBy: "-updatedAt",
actions: [
@@ -342,28 +321,7 @@ export default function reportJson(id) {
ExpiryDate: {
$gt: { __type: "Date", iso: new Date().toISOString() }
},
$and: [
{
"AuditTrail.UserPtr": {
$ne: {
__type: "Pointer",
className: "contracts_Users",
objectId: "CkpaR0F6mj"
}
}
},
{ "AuditTrail.Activity": { $ne: "Signed" } }
],
Placeholders: { $ne: null },
Signers: {
$in: [
{
__type: "Pointer",
className: "contracts_Users",
objectId: "CkpaR0F6mj"
}
]
}
Placeholders: { $ne: null }
},
keys: [
"Name",
@@ -371,7 +329,9 @@ export default function reportJson(id) {
"Folder.Name",
"URL",
"ExtUserPtr.Name",
"Signers.Name"
"Signers.Name",
"Signers.UserId",
"AuditTrail"
],
orderBy: "-updatedAt",
actions: [
apps/OpenSign/src/routes/Report.js
+31 -3
View File
@@ -27,6 +27,7 @@ const Report = () => {
const { className, params, keys, orderBy } = json;
Parse.serverURL = localStorage.getItem("BaseUrl12");
Parse.initialize(localStorage.getItem("AppID12"));
const currentUser = Parse.User.current().id;
const serverURL =
localStorage.getItem("BaseUrl12") + "classes/" + className;
@@ -38,10 +39,37 @@ const Report = () => {
"X-Parse-Session-Token": localStorage.getItem("accesstoken")
};
try {
const url = `${serverURL}?where=${strParams}&keys=${strKeys}&order=${orderBy}`;
const url = `${serverURL}?where=${strParams}&keys=${strKeys}&order=${orderBy}&include=AuditTrail.UserPtr`;
const res = await axios.get(url, { headers: headers });
// console.log("res ", res.data?.results);
setList(res.data?.results);
if (id === "4Hhwbp482K") {
const listData = res.data?.results.filter(
(x) => x.Signers.length > 0
);
let arr = [];
for (const obj of listData) {
const isSigner = obj.Signers.some(
(item) => item.UserId.objectId === currentUser
);
if (isSigner) {
let isRecord;
if (obj?.AuditTrail && obj?.AuditTrail.length > 0) {
isRecord = obj?.AuditTrail.some(
(item) =>
item?.UserPtr?.UserId?.objectId === currentUser &&
item.Activity === "Signed"
);
} else {
isRecord = false;
}
if (isRecord === false) {
arr.push(obj);
}
}
}
setList(arr);
} else {
setList(res.data?.results);
}
setIsLoader(false);
} catch (err) {
console.log("err ", err);