Skip to content

Commit c6fa6c7

Browse files
fix: auto sign issue , change template report and sopen sign drive tour field name
1 parent 2e921e3 commit c6fa6c7

File tree

4 files changed

+28
-28
lines changed

4 files changed

+28
-28
lines changed

apps/OpenSign/src/constant/Utils.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1153,10 +1153,10 @@ export const multiSignEmbed = async (
11531153
const newUrl = await convertPNGtoJPEG(signUrl);
11541154
signUrl = newUrl;
11551155
}
1156-
const checkUrl = urlValidator(signUrl);
1157-
if (checkUrl) {
1158-
signUrl = signUrl + "?get";
1159-
}
1156+
// const checkUrl = urlValidator(signUrl);
1157+
// if (checkUrl) {
1158+
// signUrl = signUrl + "?get";
1159+
// }
11601160
const res = await fetch(signUrl);
11611161
return res.arrayBuffer();
11621162
}

apps/OpenSign/src/pages/Opensigndrive.js

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -480,16 +480,16 @@ function Opensigndrive() {
480480
let updatedTourStatus = [];
481481
if (tourStatusArr.length > 0) {
482482
updatedTourStatus = [...tourStatusArr];
483-
const opensignTourIndex = tourStatusArr.findIndex(
484-
(obj) => obj["opensignTour"] === false || obj["opensignTour"] === true
483+
const driveTourIndex = tourStatusArr.findIndex(
484+
(obj) => obj["driveTour"] === false || obj["driveTour"] === true
485485
);
486-
if (opensignTourIndex !== -1) {
487-
updatedTourStatus[opensignTourIndex] = { opensignTour: true };
486+
if (driveTourIndex !== -1) {
487+
updatedTourStatus[driveTourIndex] = { driveTour: true };
488488
} else {
489-
updatedTourStatus.push({ opensignTour: true });
489+
updatedTourStatus.push({ driveTour: true });
490490
}
491491
} else {
492-
updatedTourStatus = [{ opensignTour: true }];
492+
updatedTourStatus = [{ driveTour: true }];
493493
}
494494
await axios.put(
495495
serverUrl + "classes/" + extUserClass + "/" + extUserId,
@@ -514,13 +514,11 @@ function Opensigndrive() {
514514
if (res.data && res.data.TourStatus && res.data.TourStatus.length > 0) {
515515
const tourStatus = res.data.TourStatus;
516516
setTourStatusArr(tourStatus);
517-
const filteredtourStatus = tourStatus.filter(
518-
(obj) => obj["opensignTour"]
519-
);
517+
const filteredtourStatus = tourStatus.filter((obj) => obj["driveTour"]);
520518
if (filteredtourStatus.length > 0) {
521-
const opensignTour = filteredtourStatus[0]["opensignTour"];
519+
const driveTour = filteredtourStatus[0]["driveTour"];
522520
// console.log("loginTour", loginTour);
523-
if (opensignTour) {
521+
if (driveTour) {
524522
setIsTour(false);
525523
} else {
526524
setIsTour(true);

apps/OpenSign/src/pages/TemplatePlaceholder.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -311,10 +311,10 @@ const TemplatePlaceholder = () => {
311311
if (tourstatus && tourstatus.length > 0) {
312312
setTourStatus(tourstatus);
313313
const checkTourRecipients = tourstatus.filter(
314-
(data) => data.templatetour
314+
(data) => data.templateTour
315315
);
316316
if (checkTourRecipients && checkTourRecipients.length > 0) {
317-
setCheckTourStatus(checkTourRecipients[0].templatetour);
317+
setCheckTourStatus(checkTourRecipients[0].templateTour);
318318
}
319319
}
320320
const loadObj = {
@@ -805,15 +805,15 @@ const TemplatePlaceholder = () => {
805805
if (tourStatus.length > 0) {
806806
updatedTourStatus = [...tourStatus];
807807
const templatetourIndex = tourStatus.findIndex(
808-
(obj) => obj["templatetour"] === false || obj["templatetour"] === true
808+
(obj) => obj["templateTour"] === false || obj["templateTour"] === true
809809
);
810810
if (templatetourIndex !== -1) {
811-
updatedTourStatus[templatetourIndex] = { templatetour: true };
811+
updatedTourStatus[templatetourIndex] = { templateTour: true };
812812
} else {
813-
updatedTourStatus.push({ templatetour: true });
813+
updatedTourStatus.push({ templateTour: true });
814814
}
815815
} else {
816-
updatedTourStatus = [{ templatetour: true }];
816+
updatedTourStatus = [{ templateTour: true }];
817817
}
818818
await axios
819819
.put(

apps/OpenSign/src/primitives/GetReportDisplay.js

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -263,12 +263,12 @@ const ReportTable = ({
263263
// console.log("res ", res.data.TourStatus);
264264
setTourStatusArr(tourStatus);
265265
const filteredtourStatus = tourStatus.filter(
266-
(obj) => obj["templateTour"]
266+
(obj) => obj["templateReportTour"]
267267
);
268268
if (filteredtourStatus.length > 0) {
269-
const templateTour = filteredtourStatus[0]["templateTour"];
269+
const templateReportTour = filteredtourStatus[0]["templateReportTour"];
270270

271-
if (templateTour) {
271+
if (templateReportTour) {
272272
setIsTour(false);
273273
} else {
274274
setIsTour(true);
@@ -296,15 +296,17 @@ const ReportTable = ({
296296
if (tourStatusArr.length > 0) {
297297
updatedTourStatus = [...tourStatusArr];
298298
const templateTourIndex = tourStatusArr.findIndex(
299-
(obj) => obj["templateTour"] === false || obj["templateTour"] === true
299+
(obj) =>
300+
obj["templateReportTour"] === false ||
301+
obj["templateReportTour"] === true
300302
);
301303
if (templateTourIndex !== -1) {
302-
updatedTourStatus[templateTourIndex] = { templateTour: true };
304+
updatedTourStatus[templateTourIndex] = { templateReportTour: true };
303305
} else {
304-
updatedTourStatus.push({ templateTour: true });
306+
updatedTourStatus.push({ templateReportTour: true });
305307
}
306308
} else {
307-
updatedTourStatus = [{ templateTour: true }];
309+
updatedTourStatus = [{ templateReportTour: true }];
308310
}
309311

310312
await axios.put(

0 commit comments

Comments
 (0)