Merge pull request #1472 from OpenSignLabs/uncompatible_pdf

feat: add column for expiry date in in-progress and expired report
OpenSignLabs · Nov 19, 2024 · 44ef1fe · 44ef1fe
2 parents 9b472a6 + cb07e37
commit 44ef1fe
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -211,6 +211,7 @@ export default function reportJson(id, userId) {
           'Placeholders',
           'SignedUrl',
           'FileAdapterId',
+          'ExpiryDate',
         ],
       };
     //  Recently sent for signatures report show on dashboard