Skip to content

Commit

Permalink
Merge pull request #1182 from bcgov/test-RQ-FOIMOD-3472
Browse files Browse the repository at this point in the history 
Production bug fixes - FOIMOD-3472, FOIMOD-3476 and FOIMOD-3350
  • Loading branch information
@richard-aot
richard-aot authored Oct 2, 2024
2 parents aeeed06 + 8f4350f commit 11f55e4
Show file tree
Hide file tree
Showing 5 changed files with 119 additions and 40 deletions.
4 changes: 4 additions & 0 deletions MCS.FOI.S3FileConversion/MCS.FOI.MSGToPDF/MSGFileProcessor.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -521,6 +521,10 @@ private string GenerateHtmlfromMsg(Storage.Message msg)
<td>" + msg.Subject + "</td></tr>");

DateTime sentDate = Convert.ToDateTime(msg.SentOn);
if(sentDate == DateTime.MinValue)
{
sentDate = Convert.ToDateTime(msg.CreationTime);
}
if (TimeZone.CurrentTimeZone.StandardName != "Pacific Standard Time")
{

Expand Down
12 changes: 10 additions & 2 deletions computingservices/DocumentServices/services/dts/redactionsummary.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,14 @@ def __packaggesummary(self, message, documentids, pageflags, programareas):
_data["pagecount"] = len(pageflag['docpageflags'])
_data["sections"] = self.__format_redaction_summary(pageflag["description"], pageflag['docpageflags'], message.category)
summarydata.append(_data)
#remove duplicate and NR for oipc review redline
def removeduplicateandnr(pageflag):
if pageflag['flagname'].lower() != 'duplicate' and pageflag['flagname'].lower() != 'not responsive':
return True
return False
if message.category == "oipcreviewredline":
print("\n removing duplicate and not responsive pages from summary")
summarydata = list(filter(removeduplicateandnr, summarydata))
except (Exception) as err:
traceback.print_exc()
print('error occured in __packaggesummary redaction dts service: ', err)
Expand Down Expand Up @@ -451,15 +459,15 @@ def __get_pages_by_flagid(self, _docpageflags, deletedpages, totalpages, flagid,

def __get_skippagenos(self, _docpageflags, category):
skippages = []
if category in ['responsepackage', 'CFD_responsepackage']:
if category in ['responsepackage', 'CFD_responsepackage', 'oipcreviewredline']:
for x in _docpageflags:
if x['flagid'] in (5,6) and x['page'] not in skippages:
skippages.append(x['page'])
return skippages

def __calcstitchedpageno(self, pageno, totalpages, category, skippages, deletedpages):
skipcount = 0
if category in ["responsepackage", 'CFD_responsepackage']:
if category in ["responsepackage", 'CFD_responsepackage', 'oipcreviewredline']:
skipcount = self.__calculateskipcount(pageno, skippages)
skipcount = self.__calculateskipcount(pageno, deletedpages, skipcount)
return (pageno+totalpages)-skipcount
Expand Down
134 changes: 97 additions & 37 deletions web/src/components/FOI/Home/CreateResponsePDF/useSaveRedlineForSignOff.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -784,7 +784,7 @@ const useSaveRedlineForSignoff = (initDocInstance, initDocViewer) => {
let documentsObjArr = [];
let divisionstitchpages = [];
let divCount = 0;
console.log("RES:",res)
// console.log("RES:",res)
for (let div of res.divdocumentList) {
divCount++;
let docCount = 0;
Expand Down Expand Up @@ -985,7 +985,7 @@ const useSaveRedlineForSignoff = (initDocInstance, initDocViewer) => {
includenrpages: includeNRPages,
};
if (stitchedDocPath) {
console.log("stitchedDocPath:",stitchedDocPath)
// console.log("stitchedDocPath:",stitchedDocPath)
const stitchedDocPathArray = stitchedDocPath?.split("/");
let fileName =
stitchedDocPathArray[stitchedDocPathArray.length - 1].split("?")[0];
Expand Down Expand Up @@ -1457,8 +1457,9 @@ const stampPageNumberRedline = async (
);
}

let string = await stitchObject.extractXFDF()
let string = await stitchObject.extractXFDF();

// for redline - formatted annots
let xmlObj = parser.parseFromString(string.xfdfString);
let annots = parser.parseFromString('<annots>' + formattedAnnotationXML + '</annots>');
let annotsObj = xmlObj.getElementsByTagName('annots')
Expand All @@ -1467,57 +1468,115 @@ const stampPageNumberRedline = async (
} else {
xmlObj.children.push(annots)
}

let xfdfString = parser.toString(xmlObj);

// for oipc review - re-apply annots after redaction - annots only no widgets/form fields
let xmlObj1 = parser.parseFromString(string.xfdfString);
xmlObj1.children = [];
xmlObj1.children.push(annots);
let xfdfString1 = parser.toString(xmlObj1);

//OIPC - Special Block (Redact S.14) : Begin
if(redlineCategory === "oipcreview") {
const rarr = [];
let annotationManager = docInstance?.Core.annotationManager;
let s14_sectionStamps = await annotationSectionsMapping(xfdfString, formattedAnnotationXML);
let rects = [];
let s14annots = [];
for (const [key, value] of Object.entries(s14_sectionStamps)) {
let s14annoation = annotationManager.getAnnotationById(key);
if ( s14annoation.Subject === "Redact") {
rects = rects.concat(
s14annoation.getQuads().map((q) => {
return {
pageno: s14_sectionStamps[key],
recto: q.toRect(),
vpageno: s14annoation.getPageNumber()
};
})
);
}


}
for (const rect of rects) {
let height = docViewer.getPageHeight(rect.vpageno);
let pageRotation = docViewer.getDocument()?.getPageRotation(rect.vpageno);
let pageWidth = docViewer.getPageWidth(rect.vpageno);
/**Fix for oipc redline displaying s.14 marked page content partially */
let adjustedRect = await getAdjustedRedactionCoordinates(pageRotation, rect.recto, PDFNet,pageWidth, height);
//rarr.push(await PDFNet.Redactor.redactionCreate(rect.pageno, (await PDFNet.Rect.init(rect.recto.x1,height-rect.recto.y1,rect.recto.x2,height-rect.recto.y2)), false, ''));
rarr.push(await PDFNet.Redactor.redactionCreate(rect.pageno, adjustedRect, false, ''));
}
if (rarr.length > 0) {
const app = {};
app.redaction_overlay = true;
app.border = false;
app.show_redacted_content_regions = false;
const doc = await stitchObject.getPDFDoc();
await PDFNet.Redactor.redact(doc, rarr, app);
s14annots.push(s14annoation);
}
}

let doc = docViewer.getDocument();
await annotationManager.applyRedactions(s14annots);

await stampPageNumberRedline(
stitchObject,
PDFNet,
redlineStitchInfo[divisionid]["stitchpages"],
isSingleRedlinePackage
);
}

/** apply redaction and save to s3 - newXfdfString is needed to display
* the freetext(section name) on downloaded file.*/
doc
.getFileData({
// export the document to arraybuffer
// xfdfString: xfdfString,
downloadType: downloadType,
flatten: true,
})
.then(async (_data) => {
const _arr = new Uint8Array(_data);
const _blob = new Blob([_arr], { type: "application/pdf" });

await docInstance?.Core.createDocument(_data, {
loadAsPDF: true,
useDownloader: false, // Added to fix BLANK page issue
}).then( async (docObj) => {

/**must apply redactions before removing pages*/
if (redlinepageMappings["pagestoremove"][divisionid].length > 0) {
await docObj.removePages(redlinepageMappings["pagestoremove"][divisionid]);
}

docObj.getFileData({
// saves the document with annotations in it
xfdfString: xfdfString1,
downloadType: downloadType,
flatten: true,
})
.then(async (__data) => {
const __arr = new Uint8Array(__data);
const __blob = new Blob([__arr], { type: "application/pdf" });

saveFilesinS3(
{ filepath: redlineStitchInfo[divisionid]["s3path"] },
__blob,
(_res) => {
// ######### call another process for zipping and generate download here ##########
toast.update(toastId.current, {
render: `Redline PDF saved to Object Storage`,
type: "success",
className: "file-upload-toast",
isLoading: false,
autoClose: 3000,
hideProgressBar: true,
closeOnClick: true,
pauseOnHover: true,
draggable: true,
closeButton: true,
});
triggerRedlineZipper(
redlineIncompatabileMappings[divisionid],
redlineStitchInfo[divisionid]["s3path"],
divisionCountForToast,
isSingleRedlinePackage
);
},
(_err) => {
console.log(_err);
toast.update(toastId.current, {
render: "Failed to save redline pdf to Object Storage",
type: "error",
className: "file-upload-toast",
isLoading: false,
autoClose: 3000,
hideProgressBar: true,
closeOnClick: true,
pauseOnHover: true,
draggable: true,
closeButton: true,
});
}
);
});
});
});
//OIPC - Special Block : End
stitchObject
} else {
stitchObject
.getFileData({
// saves the document with annotations in it
xfdfString: xfdfString,
Expand Down Expand Up @@ -1571,6 +1630,7 @@ const stampPageNumberRedline = async (
}
);
});
}
}
}
};
Expand Down
7 changes: 6 additions & 1 deletion web/src/components/FOI/Home/CreateResponsePDF/useSaveResponsePackage.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,12 @@ const useSaveResponsePackage = () => {
/**must apply redactions before removing pages*/
if (pagesToRemove.length > 0) {
await doc.removePages(pagesToRemove);
}
}
doc.setWatermark({
diagonal: {
text: ''
}
})
const { PDFNet } = _instance.Core;
PDFNet.initialize();

Expand Down
2 changes: 2 additions & 0 deletions web/src/components/FOI/Home/Redlining.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1373,6 +1373,8 @@ const Redlining = React.forwardRef(
}
},
});
docViewer?.refreshAll();
docViewer?.updateView();
}
//Cleanup Function: removes previous event listeiner to ensure handleCreateResponsePDFClick event is not called multiple times on click
return () => {
Expand Down

0 comments on commit 11f55e4

Please sign in to comment.