Skip to content

🔥 The free & Open Source DocuSign alternative

feat: add column for expiry date in in-progress and expired report

prafull-opensignlabscb07e376d555
diff --git a/apps/OpenSign/public/locales/en/translation.json b/apps/OpenSign/public/locales/en/translation.json
index 8c1b1e395..afa45e8e8 100644
--- a/apps/OpenSign/public/locales/en/translation.json
+++ b/apps/OpenSign/public/locales/en/translation.json
@@ -155,7 +155,8 @@
"Status": "Status",
"created-date": "Created Date",
"Type": "Type",
- "Logs": "Logs"
+ "Logs": "Logs",
+ "Expiry-date": "Expiry Date"
},
"report-help": {
"Draft Documents": "These are documents you have started but have not finalized for sending.",
diff --git a/apps/OpenSign/public/locales/es/translation.json b/apps/OpenSign/public/locales/es/translation.json
index c29145420..f7856af7a 100644
--- a/apps/OpenSign/public/locales/es/translation.json
+++ b/apps/OpenSign/public/locales/es/translation.json
@@ -155,7 +155,8 @@
"Status": "Estado",
"created-date": "Fecha de creación",
"Type": "Tipo",
- "Logs": "Registros"
+ "Logs": "Registros",
+ "Expiry-date": "Date d'expiration"
},
"report-help": {
"Draft Documents": "Estos son documentos que has iniciado pero no has finalizado para su envío.",
diff --git a/apps/OpenSign/public/locales/fr/translation.json b/apps/OpenSign/public/locales/fr/translation.json
index 9514db916..03a717a55 100644
--- a/apps/OpenSign/public/locales/fr/translation.json
+++ b/apps/OpenSign/public/locales/fr/translation.json
@@ -138,7 +138,8 @@
"Status": "Statut",
"created-date": "Date de création",
"Type": "Saisir",
- "Logs": "Journaux"
+ "Logs": "Journaux",
+ "Expiry-date": "Fecha de caducidad"
},
"btnLabel": {
"sign": "Signer",
diff --git a/apps/OpenSign/src/json/ReportJson.js b/apps/OpenSign/src/json/ReportJson.js
index c3c0a0cc7..bd59b452f 100644
--- a/apps/OpenSign/src/json/ReportJson.js
+++ b/apps/OpenSign/src/json/ReportJson.js
@@ -19,7 +19,8 @@ export default function reportJson(id) {
"Folder",
"File",
"Status",
- "Signers"
+ "Signers",
+ "Expiry-date"
];
const contactbook = ["Sr.No", "Name", "Email", "Phone"];
const dashboardReportHead = ["Title", "File", "Owner", "Signers"];
@@ -211,7 +212,7 @@ export default function reportJson(id) {
case "zNqBHXHsYH":
return {
reportName: "Expired Documents",
- heading: head,
+ heading: [...head, "Expiry-date"],
actions: [
{
btnId: "1898",
@@ -237,7 +238,7 @@ export default function reportJson(id) {
case "d9k3UfYHBc":
return {
reportName: "Recently sent for signatures",
- heading: dashboardReportHead,
+ heading: [...dashboardReportHead, "Expiry-date"],
actions: [
{
btnId: "1999",
diff --git a/apps/OpenSign/src/primitives/GetReportDisplay.js b/apps/OpenSign/src/primitives/GetReportDisplay.js
index 13ef840e7..0cd0faf2d 100644
--- a/apps/OpenSign/src/primitives/GetReportDisplay.js
+++ b/apps/OpenSign/src/primitives/GetReportDisplay.js
@@ -1475,6 +1475,16 @@ const ReportTable = (props) => {
"-"
)}
</td>
+ {props.heading.includes("Expiry-date") &&
+ item?.ExpiryDate?.iso && (
+ <td className="px-4 py-2">
+ <span>
+ {new Date(
+ item?.ExpiryDate?.iso
+ )?.toLocaleDateString()}
+ </span>
+ </td>
+ )}
{props.ReportName === "Templates" &&
isEnableSubscription && (
<td className=" pl-[20px] py-2">
diff --git a/apps/OpenSign/src/script/locales/en/translation.json b/apps/OpenSign/src/script/locales/en/translation.json
index af33885a1..49e0c88d8 100644
--- a/apps/OpenSign/src/script/locales/en/translation.json
+++ b/apps/OpenSign/src/script/locales/en/translation.json
@@ -155,7 +155,8 @@
"Status": "Status",
"created-date": "Created Date",
"Type": "Type",
- "Logs": "Logs"
+ "Logs": "Logs",
+ "Expiry-date": "Expiry Date"
},
"report-help": {
"Draft Documents": "These are documents you have started but have not finalized for sending.",
diff --git a/apps/OpenSign/src/script/locales/es/translation.json b/apps/OpenSign/src/script/locales/es/translation.json
index f459b4fd7..7ef921ffc 100644
--- a/apps/OpenSign/src/script/locales/es/translation.json
+++ b/apps/OpenSign/src/script/locales/es/translation.json
@@ -155,7 +155,8 @@
"Status": "Estado",
"created-date": "Fecha de creación",
"Type": "Tipo",
- "Logs": "Registros"
+ "Logs": "Registros",
+ "Expiry-date": "Date d'expiration"
},
"report-help": {
"Draft Documents": "Estos son documentos que has iniciado pero no has finalizado para su envío.",
diff --git a/apps/OpenSign/src/script/locales/fr/translation.json b/apps/OpenSign/src/script/locales/fr/translation.json
index 875a0a368..376f444d0 100644
--- a/apps/OpenSign/src/script/locales/fr/translation.json
+++ b/apps/OpenSign/src/script/locales/fr/translation.json
@@ -138,7 +138,8 @@
"Status": "Statut",
"created-date": "Date de création",
"Type": "Saisir",
- "Logs": "Journaux"
+ "Logs": "Journaux",
+ "Expiry-date": "Fecha de caducidad"
},
"btnLabel": {
"sign": "Signer",
diff --git a/apps/OpenSignServer/cloud/parsefunction/reportsJson.js b/apps/OpenSignServer/cloud/parsefunction/reportsJson.js
index 4f98fd07e..2d827ce5b 100644
--- a/apps/OpenSignServer/cloud/parsefunction/reportsJson.js
+++ b/apps/OpenSignServer/cloud/parsefunction/reportsJson.js
@@ -211,6 +211,7 @@ export default function reportJson(id, userId) {
'Placeholders',
'SignedUrl',
'FileAdapterId',
+ 'ExpiryDate',
],
};
// Recently sent for signatures report show on dashboard