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

Merge pull request #590 from OpenSignLabs/tour_message

Browse Source 
fix: auto sign issue, change template report and open sign drive tour field name
This commit is contained in:
prafull-opensignlabs
2024-04-12 15:12:03 +05:30
committed by GitHub
parent 2e921e30b6 37e03c1026
commit 6390706d8d
5 changed files with 31 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/OpenSign/src/constant/Utils.js
+4 -4
View File
@@ -1153,10 +1153,10 @@ export const multiSignEmbed = async (
const newUrl = await convertPNGtoJPEG(signUrl);
signUrl = newUrl;
}
const checkUrl = urlValidator(signUrl);
if (checkUrl) {
signUrl = signUrl + "?get";
}
// const checkUrl = urlValidator(signUrl);
// if (checkUrl) {
// signUrl = signUrl + "?get";
// }
const res = await fetch(signUrl);
return res.arrayBuffer();
}
apps/OpenSign/src/pages/Opensigndrive.js
+9 -11
View File
@@ -480,16 +480,16 @@ function Opensigndrive() {
let updatedTourStatus = [];
if (tourStatusArr.length > 0) {
updatedTourStatus = [...tourStatusArr];
const opensignTourIndex = tourStatusArr.findIndex(
(obj) => obj["opensignTour"] === false || obj["opensignTour"] === true
const driveTourIndex = tourStatusArr.findIndex(
(obj) => obj["driveTour"] === false || obj["driveTour"] === true
);
if (opensignTourIndex !== -1) {
updatedTourStatus[opensignTourIndex] = { opensignTour: true };
if (driveTourIndex !== -1) {
updatedTourStatus[driveTourIndex] = { driveTour: true };
} else {
updatedTourStatus.push({ opensignTour: true });
updatedTourStatus.push({ driveTour: true });
}
} else {
updatedTourStatus = [{ opensignTour: true }];
updatedTourStatus = [{ driveTour: true }];
}
await axios.put(
serverUrl + "classes/" + extUserClass + "/" + extUserId,
@@ -514,13 +514,11 @@ function Opensigndrive() {
if (res.data && res.data.TourStatus && res.data.TourStatus.length > 0) {
const tourStatus = res.data.TourStatus;
setTourStatusArr(tourStatus);
const filteredtourStatus = tourStatus.filter(
(obj) => obj["opensignTour"]
);
const filteredtourStatus = tourStatus.filter((obj) => obj["driveTour"]);
if (filteredtourStatus.length > 0) {
const opensignTour = filteredtourStatus[0]["opensignTour"];
const driveTour = filteredtourStatus[0]["driveTour"];
// console.log("loginTour", loginTour);
if (opensignTour) {
if (driveTour) {
setIsTour(false);
} else {
setIsTour(true);
apps/OpenSign/src/pages/TemplatePlaceholder.js
+6 -6
View File
@@ -311,10 +311,10 @@ const TemplatePlaceholder = () => {
if (tourstatus && tourstatus.length > 0) {
setTourStatus(tourstatus);
const checkTourRecipients = tourstatus.filter(
(data) => data.templatetour
(data) => data.templateTour
);
if (checkTourRecipients && checkTourRecipients.length > 0) {
setCheckTourStatus(checkTourRecipients[0].templatetour);
setCheckTourStatus(checkTourRecipients[0].templateTour);
}
}
const loadObj = {
@@ -805,15 +805,15 @@ const TemplatePlaceholder = () => {
if (tourStatus.length > 0) {
updatedTourStatus = [...tourStatus];
const templatetourIndex = tourStatus.findIndex(
(obj) => obj["templatetour"] === false || obj["templatetour"] === true
(obj) => obj["templateTour"] === false || obj["templateTour"] === true
);
if (templatetourIndex !== -1) {
updatedTourStatus[templatetourIndex] = { templatetour: true };
updatedTourStatus[templatetourIndex] = { templateTour: true };
} else {
updatedTourStatus.push({ templatetour: true });
updatedTourStatus.push({ templateTour: true });
}
} else {
updatedTourStatus = [{ templatetour: true }];
updatedTourStatus = [{ templateTour: true }];
}
await axios
.put(
apps/OpenSign/src/primitives/GetReportDisplay.js
+9 -7
View File
@@ -263,12 +263,12 @@ const ReportTable = ({
// console.log("res ", res.data.TourStatus);
setTourStatusArr(tourStatus);
const filteredtourStatus = tourStatus.filter(
(obj) => obj["templateTour"]
(obj) => obj["templateReportTour"]
);
if (filteredtourStatus.length > 0) {
const templateTour = filteredtourStatus[0]["templateTour"];
const templateReportTour = filteredtourStatus[0]["templateReportTour"];
if (templateTour) {
if (templateReportTour) {
setIsTour(false);
} else {
setIsTour(true);
@@ -296,15 +296,17 @@ const ReportTable = ({
if (tourStatusArr.length > 0) {
updatedTourStatus = [...tourStatusArr];
const templateTourIndex = tourStatusArr.findIndex(
(obj) => obj["templateTour"] === false || obj["templateTour"] === true
(obj) =>
obj["templateReportTour"] === false ||
obj["templateReportTour"] === true
);
if (templateTourIndex !== -1) {
updatedTourStatus[templateTourIndex] = { templateTour: true };
updatedTourStatus[templateTourIndex] = { templateReportTour: true };
} else {
updatedTourStatus.push({ templateTour: true });
updatedTourStatus.push({ templateReportTour: true });
}
} else {
updatedTourStatus = [{ templateTour: true }];
updatedTourStatus = [{ templateReportTour: true }];
}
await axios.put(
apps/OpenSignServer/cloud/parsefunction/getSubscriptions.js
+3 -7
View File
@@ -2,8 +2,6 @@ import axios from 'axios';
const serverUrl = process.env.SERVER_URL;
const appId = process.env.APP_ID;
export default async function getSubscription(request) {
const limit = request.params.limit || 100;
const skip = request.params.skip || 0;
const extUserId = request.params.extUserId;
try {
const userRes = await axios.get(serverUrl + '/users/me', {
@@ -17,14 +15,12 @@ export default async function getSubscription(request) {
const subscriptionCls = new Parse.Query('contracts_Subscriptions');
subscriptionCls.equalTo('ExtUserPtr', {
__type: 'Pointer',
className: 'contracts_User',
className: 'contracts_Users',
objectId: extUserId,
});
subscriptionCls.limit(limit);
subscriptionCls.skip(skip);
subscriptionCls.descending('createdAt');
const subcripitions = await subscriptionCls.find({ useMasterKey: true });
if (subcripitions?.length > 0) {
const subcripitions = await subscriptionCls.first({ useMasterKey: true });
if (subcripitions) {
const _subcripitions = JSON.parse(JSON.stringify(subcripitions));
return { status: 'success', result: _subcripitions };
} else {