Skip to content

Commit 4fb27f4

Browse files
refactor: add date format in label for expiry date
1 parent 1a45541 commit 4fb27f4

8 files changed

Lines changed: 39 additions & 24 deletions

File tree

apps/OpenSign/public/locales/en/translation.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -706,6 +706,7 @@
706706
"p1": "The document creator will receive an email notification whenever a signer signs the document.",
707707
"note": "Note: Notification email will not be sent for the last signer, as the document creator will receive a completion email instead."
708708
},
709+
"expiry-date": "Expiry Date",
709710
"expiry-date-updated": "The expiry date has been successfully extended to {{newexpirydate}}",
710711
"expiry-date-error": "Please provide a new expiry date that is later than the current one"
711712
}

apps/OpenSign/public/locales/es/translation.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -706,6 +706,7 @@
706706
"p1": "El creador del documento recibirá una notificación por correo electrónico cada vez que un firmante firme el documento.",
707707
"note": "Nota: No se enviará un correo electrónico de notificación al último firmante, ya que el creador del documento recibirá un correo electrónico de finalización."
708708
},
709+
"expiry-date": "Date d'expiration",
709710
"expiry-date-updated": "La fecha de vencimiento se ha extendido con éxito hasta el {{newexpirydate}}",
710711
"expiry-date-error": "Proporcione una nueva fecha de vencimiento que sea posterior a la actual"
711712
}

apps/OpenSign/public/locales/fr/translation.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -705,6 +705,7 @@
705705
"p1": "Le créateur du document recevra une notification par e-mail chaque fois qu'un signataire signera le document.",
706706
"note": "Remarque : L'e-mail de notification ne sera pas envoyé pour le dernier signataire, car le créateur du document recevra à la place un e-mail de fin."
707707
},
708+
"expiry-date": "Fecha de caducidad",
708709
"expiry-date-updated": "La fecha de vencimiento se ha extendido con éxito hasta el {{newexpirydate}}",
709710
"expiry-date-error": "Veuillez fournir une nouvelle date d'expiration postérieure à la date actuelle"
710711
}

apps/OpenSign/src/primitives/GetReportDisplay.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1848,7 +1848,9 @@ const ReportTable = (props) => {
18481848
className="px-4 py-2 flex flex-col"
18491849
onSubmit={(e) => handleUpdateExpiry(e, item)}
18501850
>
1851-
<label className="mr-2">Expiry date</label>
1851+
<label className="mr-2">
1852+
{t("expiry-date")} {"(dd-mm-yyyy)"}
1853+
</label>
18521854
<input
18531855
type="date"
18541856
className="rounded-full mb-2 bg-base-300 w-full px-4 py-2 text-black border-2 hover:border-spacing-2"

apps/OpenSign/src/primitives/PdfDeclineModal.js

Lines changed: 30 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -35,27 +35,31 @@ function CustomModal(props) {
3535
<h3 className="text-base-content font-bold text-lg pt-[15px] px-[20px]">
3636
{props?.headMsg && props?.headMsg}
3737
</h3>
38-
<div className="p-[10px] px-[20px]">
39-
<p className="text-[15px]">{props.bodyMssg && props.bodyMssg}</p>
40-
</div>
41-
<div className="flex flex-row items-center">
42-
{isCreator && (
43-
<button
44-
className="op-btn op-btn-primary px-6 ml-[20px] mb-3 mt-1"
45-
onClick={() => handleExtendBtn()}
46-
>
47-
Extend
48-
</button>
49-
)}
50-
{props.isDownloadBtn && (
51-
<button
52-
className="op-btn op-btn-primary ml-[10px] mb-3 mt-1"
53-
onClick={() => props.handleDownloadBtn()}
54-
>
55-
Download
56-
</button>
57-
)}
58-
</div>
38+
{!isExtendExpiry && (
39+
<div className="p-[10px] px-[20px]">
40+
<p className="text-[15px]">{props.bodyMssg && props.bodyMssg}</p>
41+
</div>
42+
)}
43+
{!isExtendExpiry && (
44+
<div className="flex flex-row items-center">
45+
{isCreator && (
46+
<button
47+
className="op-btn op-btn-primary px-6 ml-[20px] mb-3 mt-1"
48+
onClick={() => handleExtendBtn()}
49+
>
50+
Extend
51+
</button>
52+
)}
53+
{props.isDownloadBtn && (
54+
<button
55+
className="op-btn op-btn-primary ml-[10px] mb-3 mt-1"
56+
onClick={() => props.handleDownloadBtn()}
57+
>
58+
Download
59+
</button>
60+
)}
61+
</div>
62+
)}
5963
{props.footerMessage && (
6064
<>
6165
<div className="mx-3">
@@ -93,10 +97,13 @@ function CustomModal(props) {
9397
)}
9498
{isExtendExpiry && (
9599
<form className="mx-3 mb-3" onSubmit={handleUpdateExpiry}>
100+
<label className="ml-2 mt-2">
101+
{t("expiry-date")} {"(dd-mm-yyyy)"}
102+
</label>
96103
<input
97104
type="date"
98105
className="rounded-full bg-base-300 w-full px-4 py-2 text-black border-2 hover:border-spacing-2"
99-
defaultValue={props?.doc?.ExpiryDate?.iso?.split("T")[0]}
106+
defaultValue={props?.doc?.ExpiryDate?.iso?.split("T")?.[0]}
100107
onChange={(e) => setExpiryDate(e.target.value)}
101108
/>
102109
<div className="flex flex-row items-center mt-2">
@@ -111,7 +118,7 @@ function CustomModal(props) {
111118
setIsExtendExpiry(false);
112119
}}
113120
>
114-
{t("close")}
121+
{t("cancel")}
115122
</button>
116123
</div>
117124
</form>

apps/OpenSign/src/script/locales/en/translation.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -706,6 +706,7 @@
706706
"p1": "The document creator will receive an email notification whenever a signer signs the document.",
707707
"note": "Note: Notification email will not be sent for the last signer, as the document creator will receive a completion email instead."
708708
},
709+
"expiry-date":"Expiry date",
709710
"expiry-date-updated": "The expiry date has been successfully extended to {{newexpirydate}}",
710711
"expiry-date-error": "Please provide a new expiry date that is later than the current one"
711712
}

apps/OpenSign/src/script/locales/es/translation.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -706,6 +706,7 @@
706706
"p1": "El creador del documento recibirá una notificación por correo electrónico cada vez que un firmante firme el documento.",
707707
"note": "Nota: No se enviará un correo electrónico de notificación al último firmante, ya que el creador del documento recibirá un correo electrónico de finalización."
708708
},
709+
"expiry-date": "Date d'expiration",
709710
"expiry-date-updated": "La fecha de vencimiento se ha extendido con éxito hasta el {{newexpirydate}}",
710711
"expiry-date-error": "Proporcione una nueva fecha de vencimiento que sea posterior a la actual"
711712
}

apps/OpenSign/src/script/locales/fr/translation.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -705,6 +705,7 @@
705705
"p1": "Le créateur du document recevra une notification par e-mail chaque fois qu'un signataire signera le document.",
706706
"note": "Remarque : L'e-mail de notification ne sera pas envoyé pour le dernier signataire, car le créateur du document recevra à la place un e-mail de fin."
707707
},
708+
"expiry-date": "Fecha de caducidad",
708709
"expiry-date-updated": "La date d'expiration a été prolongée avec succès jusqu'au {{newexpirydate}}",
709710
"expiry-date-error": "Veuillez fournir une nouvelle date d'expiration postérieure à la date actuelle"
710711
}

0 commit comments

Comments
 (0)