Skip to content

feat: add document logs in in-progress report #1226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 19, 2024
Merged

feat: add document logs in in-progress report #1226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions apps/OpenSign/public/locales/en/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,8 @@
"Name": "Name",
"Status": "Status",
"created-date": "Created Date",
"Type": "Type"
"Type": "Type",
"Logs": "Logs"
},
"report-help": {
"Draft Documents": "These are documents you have started but have not finalized for sending.",
Expand Down Expand Up @@ -648,5 +649,7 @@
"p4": "Please choose the option that best suits your document signing requirements."
},
"advanced-options":"Advanced options",
"hide-advanced-options":"Hide Advanced options"
"hide-advanced-options":"Hide Advanced options",
"document-logs":"Document logs"

}
6 changes: 4 additions & 2 deletions apps/OpenSign/public/locales/fr/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,8 @@
"Name": "Nom",
"Status": "Statut",
"created-date": "Date de création",
"Type": "Saisir"
"Type": "Saisir",
"Logs": "Journaux"
},
"btnLabel": {
"sign": "Signer",
Expand Down Expand Up @@ -647,6 +648,7 @@
"p4": "Veuillez choisir l'option qui correspond le mieux à vos exigences en matière de signature de documents."
},
"advanced-options":"Options avancées",
"hide-advanced-options": "Masquer les options avancées"
"hide-advanced-options": "Masquer les options avancées",
"document-logs":"Journaux de documents"

}
11 changes: 10 additions & 1 deletion apps/OpenSign/src/json/ReportJson.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,15 @@ export default function reportJson(id) {
"Owner",
"Signers"
];
const iphead = [
"Sr.No",
"Title",
"Note",
"Folder",
"File",
"Logs",
"Signers"
];
const contactbook = ["Sr.No", "Name", "Email", "Phone"];
const dashboardReportHead = ["Title", "File", "Owner", "Signers"];
const templateReport = ["Sr.No", "Title", "File", "Owner", "Signers"];
Expand Down Expand Up @@ -63,7 +72,7 @@ export default function reportJson(id) {
case "1MwEuxLEkF":
return {
reportName: "In-progress documents",
heading: head,
heading: iphead,
actions: [
{
btnId: "8901",
Expand Down
59 changes: 51 additions & 8 deletions apps/OpenSign/src/primitives/GetReportDisplay.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ const ReportTable = (props) => {
const [publicUserName, setIsPublicUserName] = useState("");
const [isViewShare, setIsViewShare] = useState({});
const [isSubscribe, setIsSubscribe] = useState(true);
const [isModal, setIsModal] = useState({});
const [reason, setReason] = useState("");
const Extand_Class = localStorage.getItem("Extand_Class");
const extClass = Extand_Class && JSON.parse(Extand_Class);
Expand Down Expand Up @@ -1288,9 +1289,55 @@ const ReportTable = (props) => {
{item?.URL ? t("download") : "-"}
</button>
</td>
<td className="px-4 py-2">
{formatRow(item?.ExtUserPtr)}
</td>
{props.ReportName === "In-progress documents" ? (
<td className="px-4 py-2">
<button
onClick={() =>
item?.AuditTrail?.length > 0 &&
setIsModal({ [item?.objectId]: true })
}
className={`${
item?.AuditTrail?.length
? "border-green-400"
: "cursor-default op-border-primary"
} focus:outline-none w-[60px] border-[2px] text-[12px] rounded-full md:self-center`}
>
{item?.AuditTrail?.length ? "VIEWED" : "SENT"}
</button>
{isModal[item.objectId] && (
<ModalUi
isOpen
title={t("document-logs")}
handleClose={() => setIsModal({})}
>
{item?.AuditTrail?.map((x, i) => (
<div
key={i}
className="pl-3 first:mt-2 text-sm font-medium flex flex-col md:flex-row items-start md:gap-4 border-t-[1px] border-gray-600"
>
<div className="py-2 break-all font-bold md:text-[12px] md:col-span-2 w-full md:w-[210px]">
{x?.UserPtr?.Email || "-"}
</div>
<button className="px-2 cursor-default border-[2px] text-[12px] border-green-400 rounded-full md:self-center">
{x?.Activity?.toUpperCase() || "-"}
</button>
<div className=" text-[12px] py-2">
{x?.Activity === "Signed"
? new Date(x?.SignedOn)?.toUTCString()
: new Date(
x?.ViewedOn
)?.toUTCString() || "-"}
</div>
</div>
))}
</ModalUi>
)}
</td>
) : (
<td className="px-4 py-2">
{formatRow(item?.ExtUserPtr)}
</td>
)}
<td className="px-4 py-2">
{!item?.IsSignyourself && item?.Placeholders ? (
<button
Expand All @@ -1308,11 +1355,7 @@ const ReportTable = (props) => {
<td className=" pl-[20px] py-2">
{props.ReportName === "Templates" && (
<div className="flex flex-row">
<label
className={
"cursor-pointer relative inline-flex items-center mb-0"
}
>
<label className="cursor-pointer relative inline-flex items-center mb-0">
<input
checked={props.isPublic?.[item.objectId]}
onChange={(e) =>
Expand Down
7 changes: 5 additions & 2 deletions apps/OpenSign/src/script/locales/en/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,8 @@
"Name": "Name",
"Status": "Status",
"created-date": "Created Date",
"Type": "Type"
"Type": "Type",
"Logs": "Logs"
},
"report-help": {
"Draft Documents": "These are documents you have started but have not finalized for sending.",
Expand Down Expand Up @@ -648,5 +649,7 @@
"p4": "Please choose the option that best suits your document signing requirements."
},
"advanced-options":"Advanced options",
"hide-advanced-options":"Hide Advanced options"
"hide-advanced-options":"Hide Advanced options",
"document-logs":"Document logs"

}
6 changes: 4 additions & 2 deletions apps/OpenSign/src/script/locales/fr/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,8 @@
"Name": "Nom",
"Status": "Statut",
"created-date": "Date de création",
"Type": "Saisir"
"Type": "Saisir",
"Logs": "Journaux"
},
"btnLabel": {
"sign": "Signer",
Expand Down Expand Up @@ -647,6 +648,7 @@
"p4": "Veuillez choisir l'option qui correspond le mieux à vos exigences en matière de signature de documents."
},
"advanced-options":"Options avancées",
"hide-advanced-options": "Masquer les options avancées"
"hide-advanced-options": "Masquer les options avancées",
"document-logs":"Journaux de documents"

}