Skip to content

Commit 4f3c034

Browse files
Merge pull request #1864 from OpenSignLabs/updates-16597572999
Fix: show signers list in completed documents
2 parents 47cc0ef + e7d3453 commit 4f3c034

File tree

4 files changed

+107
-143
lines changed

4 files changed

+107
-143
lines changed

apps/OpenSign/package-lock.json

Lines changed: 21 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/OpenSign/src/primitives/GetReportDisplay.jsx

Lines changed: 40 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -994,6 +994,7 @@ const ReportTable = (props) => {
994994
const timezone = extClass?.[0]?.Timezone || "";
995995
const DateFormat = extClass?.[0]?.DateFormat || "MM/DD/YYYY";
996996
const Is12Hr = extClass?.[0]?.Is12HourTime || false;
997+
const isCompletedReport = props?.ReportName === "Completed Documents";
997998
const signers = item?.Placeholders?.map((x, i) => {
998999
const audit = item?.AuditTrail?.find(
9991000
(audit) => audit?.UserPtr?.objectId === x.signerObjId
@@ -1021,20 +1022,22 @@ const ReportTable = (props) => {
10211022
key={i}
10221023
className="text-sm font-medium flex flex-row gap-2 items-center"
10231024
>
1024-
<button
1025-
onClick={() => setIsModal({ [`${item.objectId}_${i}`]: true })}
1026-
className={`${
1027-
x.Activity === "SIGNED"
1028-
? "op-border-primary op-text-primary"
1029-
: x.Activity === "VIEWED"
1030-
? "border-green-400 text-green-400"
1031-
: "border-base-content text-base-content"
1032-
} focus:outline-none border-2 w-[60px] h-[30px] text-[11px] rounded-full`}
1033-
>
1034-
{x?.Activity?.toUpperCase() || "-"}
1035-
</button>
1025+
{!isCompletedReport && (
1026+
<button
1027+
onClick={() => setIsModal({ [`${item.objectId}_${i}`]: true })}
1028+
className={`${
1029+
x.Activity === "SIGNED"
1030+
? "op-border-primary op-text-primary"
1031+
: x.Activity === "VIEWED"
1032+
? "border-green-400 text-green-400"
1033+
: "border-base-content text-base-content"
1034+
} focus:outline-none border-2 w-[60px] h-[30px] text-[11px] rounded-full`}
1035+
>
1036+
{x?.Activity?.toUpperCase() || "-"}
1037+
</button>
1038+
)}
10361039
<div className="py-2 font-bold text-[12px]">{x?.Email || "-"}</div>
1037-
{isModal[`${item.objectId}_${i}`] && (
1040+
{!isCompletedReport && isModal[`${item.objectId}_${i}`] && (
10381041
<ModalUi
10391042
isOpen
10401043
title={t("document-logs")}
@@ -1657,21 +1660,22 @@ const ReportTable = (props) => {
16571660
<React.Fragment key={index}>
16581661
<th className="p-2">
16591662
{t(`report-heading.${item}`)}
1660-
{props.ReportName === "Contactbook" && item === "Name" && (
1661-
<button
1662-
type="button"
1663-
onClick={toggleSortOrder}
1664-
className="ml-1"
1665-
>
1666-
<i
1667-
className={
1668-
sortOrder === "asc"
1669-
? "fa-light fa-arrow-down-a-z"
1670-
: "fa-light fa-arrow-up-a-z"
1671-
}
1672-
></i>
1673-
</button>
1674-
)}
1663+
{props.ReportName === "Contactbook" &&
1664+
item === "Name" && (
1665+
<button
1666+
type="button"
1667+
onClick={toggleSortOrder}
1668+
className="ml-1"
1669+
>
1670+
<i
1671+
className={
1672+
sortOrder === "asc"
1673+
? "fa-light fa-arrow-down-a-z"
1674+
: "fa-light fa-arrow-up-a-z"
1675+
}
1676+
></i>
1677+
</button>
1678+
)}
16751679
</th>
16761680
</React.Fragment>
16771681
))}
@@ -1807,12 +1811,16 @@ const ReportTable = (props) => {
18071811
</td>
18081812
)}
18091813
{props.heading.includes("Signers") &&
1810-
["In-progress documents", "Need your sign"].includes(
1811-
props.ReportName
1812-
) ? (
1814+
[
1815+
"In-progress documents",
1816+
"Need your sign",
1817+
"Completed Documents"
1818+
].includes(props.ReportName) ? (
18131819
<td className="px-1 py-2">
1814-
{!item?.IsSignyourself && item?.Placeholders && (
1820+
{!item?.IsSignyourself && item?.Placeholders ? (
18151821
<>{formatStatusRow(item)}</>
1822+
) : (
1823+
<>-</>
18161824
)}
18171825
</td>
18181826
) : (

0 commit comments

Comments
 (0)