Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Main to DEV - Fixes in watermark task #1161

Merged
merged 7 commits into from
Sep 19, 2024
Merged

Main to DEV - Fixes in watermark task #1161

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
83af7ea
Merge pull request #1156 from bcgov/dev
abin-aot Sep 19, 2024
dd2fb1c
fix failing watermark for pages without flags
nkan-aot2 Sep 19, 2024
ba793dd
Merge pull request #1157 from bcgov/main-NK-FOIMOD-3466-hotfix
nkan-aot2 Sep 19, 2024
06261f6
fix 2 for failing watermarks
nkan-aot2 Sep 19, 2024
fbf1203
Merge pull request #1158 from bcgov/main-NK-FOIMOD-3466-hotfix-1
nkan-aot2 Sep 19, 2024
52a7cff
fix 3 for watermark issue when no page flag
nkan-aot2 Sep 19, 2024
4c0523f
Merge pull request #1159 from bcgov/main-NK-FOIMOD-3466-hotfix-2
nkan-aot2 Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions web/src/components/FOI/Home/Redlining.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1339,16 +1339,16 @@ const Redlining = React.forwardRef(
if (docInstance && documentList.length > 0) {
const document = docInstance?.UI.iframeWindow.document;
document.getElementById("create_response_pdf").addEventListener("click", handleCreateResponsePDFClick);
docViewer.setWatermark({
docViewer?.setWatermark({
// Draw custom watermark in middle of the document
custom: (ctx, pageNumber, pageWidth, pageHeight) => {
// ctx is an instance of CanvasRenderingContext2D
// https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D
// Hence being able to leverage those properties
let originalPage = pageMappedDocs['stitchedPageLookup'][pageNumber]
let doc = pageFlags.find(d => d.documentid === originalPage.docid);
let pageFlag = doc.pageflag.find(f => f.page === originalPage.page);
if (pageFlag.flagid === pageFlagTypes["Duplicate"]) {
let pageFlag = doc?.pageflag?.find(f => f.page === originalPage.page);
if (pageFlag?.flagid === pageFlagTypes["Duplicate"]) {
ctx.fillStyle = "#ff0000";
ctx.font = "20pt Arial";
ctx.globalAlpha = 0.4;
Expand All @@ -1360,7 +1360,7 @@ const Redlining = React.forwardRef(
ctx.restore();
}

if (pageFlag.flagid === pageFlagTypes["Not Responsive"]) {
if (pageFlag?.flagid === pageFlagTypes["Not Responsive"]) {
ctx.fillStyle = "#ff0000";
ctx.font = "20pt Arial";
ctx.globalAlpha = 0.4;
Expand Down
Loading