Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

updated service calls

Browse Source
This commit is contained in:
Timo 2021-01-28 10:08:04 +02:00
parent 6bc890696b
commit 8b343f7069
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/red-ui/src/app/screens/file/service/annotation-draw.service.ts
View File

@ -27,9 +27,11 @@ export class AnnotationDrawService {
annotationManager.drawAnnotationsFromList(annotations);
if (this._userPreferenceService.areDevFeaturesEnabled) {
this._redactionLogControllerService.getSectionGrid(this._appStateService.activeFileId).subscribe((sectionGrid) => {
this.drawSections(activeViewer, sectionGrid);
});
this._redactionLogControllerService
.getSectionGrid(this._appStateService.activeProjectId, this._appStateService.activeFileId)
.subscribe((sectionGrid) => {
this.drawSections(activeViewer, sectionGrid);
});
}
}
@ -52,7 +54,12 @@ export class AnnotationDrawService {
public computeSection(activeViewer: WebViewerInstance, pageNumber: number, sectionRectangle: SectionRectangle) {
const rectangleAnnot = new activeViewer.Annotations.RectangleAnnotation();
const pageHeight = activeViewer.docViewer.getPageHeight(pageNumber);
const rectangle = { topLeft: sectionRectangle.topLeft, page: pageNumber, height: sectionRectangle.height, width: sectionRectangle.width };
const rectangle = {
topLeft: sectionRectangle.topLeft,
page: pageNumber,
height: sectionRectangle.height,
width: sectionRectangle.width
};
rectangleAnnot.PageNumber = pageNumber;
rectangleAnnot.X = rectangle.topLeft.x - 1;
rectangleAnnot.Y = pageHeight - (rectangle.topLeft.y + rectangle.height) - 1;

2
apps/red-ui/src/app/screens/file/service/single-file-download.service.ts
View File

@ -32,7 +32,7 @@ export class SingleFileDownloadService {
loadActiveFileData(): Observable<FileDataModel> {
const fileObs = this.loadFile('ORIGINAL', this._appStateService.activeFile);
const reactionLogObs = this._redactionLogControllerService.getRedactionLog(this._appStateService.activeFileId);
const reactionLogObs = this._redactionLogControllerService.getRedactionLog(this._appStateService.activeProjectId, this._appStateService.activeFileId);
const manualRedactionsObs = this._manualRedactionControllerService.getManualRedaction(
this._appStateService.activeProjectId,
this._appStateService.activeFileId