WEBDIENSTE/OpenSign
1
0
Fork 0
mirror of https://github.com/OpenSignLabs/OpenSign.git synced 2026-08-29 11:19:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging' into text-input

Browse Source
This commit is contained in:
Raktima
2024-01-03 12:44:55 +05:30
committed by GitHub
parent cf88eb2124 3226e4fd85
commit e286390aec
29 changed files with 1139 additions and 953 deletions
Download Patch File Download Diff File Expand all files Collapse all files
microfrontends/SignDocuments/src/Component/component/EditTemplate.js
+1 -1
View File
@@ -43,7 +43,7 @@ const EditTemplate = ({ template, onSuccess }) => {
fontWeight: "700"
}}
>
file selected : {template.URL?.split("/")[3]?.split("_")[1]}
{template.URL?.split("/")[3]?.split("_")[1]}
</div>
</div>
<div className="form-section">
microfrontends/SignDocuments/src/Component/component/LinkUserModal.js
+3 -3
View File
@@ -10,12 +10,12 @@ const LinkUserModal = (props) => {
details={props.handleAddUser}
closePopup={props.closePopup}
/>
<div style={{ display: "flex", alignItems: "center", gap: 5, margin:"0px 25px" }}>
<div style={{ display: "flex", alignItems: "center", gap: 5, margin:"0 30%", color:"#808080" }}>
<span
style={{
height: 1,
width: "100%",
backgroundColor: "grey"
backgroundColor: "#ccc"
}}
></span>
<span>or</span>
@@ -23,7 +23,7 @@ const LinkUserModal = (props) => {
style={{
height: 1,
width: "100%",
backgroundColor: "grey"
backgroundColor: "#ccc"
}}
></span>
</div>
microfrontends/SignDocuments/src/Component/component/fieldsComponent.js
+77 -27
View File
@@ -83,22 +83,56 @@ function FieldsComponent({
justifyContent: "center"
}}
onClick={() => {
if (signersdata?.length) {
handleModal();
}
// if (signersdata?.length) {
handleModal();
// }
}}
>
<span style={{ fontSize: "13px", fontWeight: "700" }}>
<span
style={{
fontSize: "13px",
fontWeight: "700",
textAlign: "center"
}}
>
Recipient
</span>
<span style={{ fontSize: "13px", fontWeight: "700" }}>
<span
style={{
fontSize: "13px",
fontWeight: "700",
display: "flex",
alignItems: "center"
}}
>
{signersdata[isSelectListId]?.Role && (
<div>
{signersdata[isSelectListId]?.Name
? ` : ${signersdata[isSelectListId]?.Name}`
: ` : ${signersdata[isSelectListId]?.Role}`}
{signersdata[isSelectListId]?.Name ? (
<>
:{" "}
{signersdata[isSelectListId]?.Name?.length > 12
? `${signersdata[isSelectListId].Name.slice(
0,
12
)}...`
: signersdata[isSelectListId]?.Name}
</>
) : (
<>
:{" "}
{signersdata[isSelectListId]?.Role?.length > 12
? `${signersdata[isSelectListId].Role.slice(
0,
12
)}...`
: signersdata[isSelectListId]?.Role}
</>
)}
</div>
)}
<div style={{ marginLeft: 6, fontSize: 16 }}>
<i className="fa-solid fa-angle-down"></i>
</div>
</span>
</div>
)}
@@ -333,25 +367,41 @@ function FieldsComponent({
</div>
</div>
)}
<ModalUi
title={"Recipients"}
isOpen={isSignersModal}
handleClose={handleModal}
>
<RecipientList
signerPos={signerPos}
signersdata={signersdata}
isSelectListId={isSelectListId}
setSignerObjId={setSignerObjId}
setIsSelectId={setIsSelectId}
setContractName={setContractName}
setUniqueId={setUniqueId}
setRoleName={setRoleName}
handleDeleteUser={handleDeleteUser}
handleRoleChange={handleRoleChange}
handleOnBlur={handleOnBlur}
/>
</ModalUi>
{isSignersModal && (
<ModalUi
title={"Recipients"}
isOpen={isSignersModal}
handleClose={handleModal}
>
{signersdata.length > 0 ? (
<RecipientList
signerPos={signerPos}
signersdata={signersdata}
isSelectListId={isSelectListId}
setSignerObjId={setSignerObjId}
setIsSelectId={setIsSelectId}
setContractName={setContractName}
setUniqueId={setUniqueId}
setRoleName={setRoleName}
handleDeleteUser={handleDeleteUser}
handleRoleChange={handleRoleChange}
handleOnBlur={handleOnBlur}
handleModal={handleModal}
/>
) : (
<div
style={{
padding: 20,
fontSize: 15,
fontWeight: "500",
textAlign: "center"
}}
>
Please add Recipient
</div>
)}
</ModalUi>
)}
</>
);
}
microfrontends/SignDocuments/src/Component/component/renderPdf.js
+7 -8
View File
@@ -381,14 +381,12 @@ function RenderPdf({
};
const handleUserName = (signerId, Role) => {
if (signerId) {
const checkSign = signersdata.filter(
(sign) => sign.objectId === signerId
);
if (checkSign.length > 0) {
const checkSign = signersdata.find((sign) => sign.objectId === signerId);
if (checkSign?.Name) {
return (
<>
<div style={{ color: "black", fontSize: 11 }}>
{checkSign[0].Name}
{checkSign?.Name}
</div>
<div style={{ color: "black", fontSize: 11 }}> {`(${Role})`} </div>
</>
@@ -479,7 +477,7 @@ function RenderPdf({
onClick={() => {
setIsSignPad(true);
setSignKey(pos.key);
setIsStamp(false);
setIsStamp(pos?.isStamp ? pos.isStamp : false);
}}
>
<BorderResize />
@@ -647,6 +645,7 @@ function RenderPdf({
}}
>
<i
data-tut="reactourLinkUser"
className="fa-regular fa-user signUserIcon"
onTouchEnd={(e) => {
e.stopPropagation();
@@ -788,7 +787,6 @@ function RenderPdf({
xyPostion,
index,
setXyPostion
);
}}
>
@@ -1008,7 +1006,7 @@ function RenderPdf({
onClick={() => {
setIsSignPad(true);
setSignKey(pos.key);
setIsStamp(false);
setIsStamp(pos?.isStamp ? pos.isStamp : false);
}}
>
<div style={{ pointerEvents: "none" }}>
@@ -1173,6 +1171,7 @@ function RenderPdf({
/>
<div>
<i
data-tut="reactourLinkUser"
className="fa-regular fa-user signUserIcon"
onClick={(e) => {
e.stopPropagation();