diff --git a/apps/red-ui/src/app/icons/icons.module.ts b/apps/red-ui/src/app/icons/icons.module.ts index b90b85c98..90e9f3010 100644 --- a/apps/red-ui/src/app/icons/icons.module.ts +++ b/apps/red-ui/src/app/icons/icons.module.ts @@ -123,6 +123,20 @@ export class IconsModule { '/assets/icons/general/check_icon.svg' ) ); + iconRegistry.addSvgIconInNamespace( + 'red', + 'idea', + sanitizer.bypassSecurityTrustResourceUrl( + '/assets/icons/general/idea.svg' + ) + ); + iconRegistry.addSvgIconInNamespace( + 'red', + 'secret', + sanitizer.bypassSecurityTrustResourceUrl( + '/assets/icons/general/secret.svg' + ) + ); } diff --git a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html index f36c63db8..8272cc69d 100644 --- a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html +++ b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html @@ -45,13 +45,13 @@ >
Page {{ item.pageNumber }}
-
- - {{item.redactions}} +
+ + {{item.redactions}} Redactions
-
- - {{item.hints}} +
+ + {{item.hints}} Hints
@@ -69,7 +69,7 @@ class="annotation" [id]="'ann-' + annotation.Id" (click)="selectAnnotation(annotation)" [ngClass]="{ active: selectedAnnotation === annotation }"> -
{{annotation.Id}}
+
{{annotation.Id}}
Page {{annotation.getPageNumber()}}
{{annotation.getContents()}}
{{annotation.getStatus()}}
diff --git a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts index 6ca4de11a..a47da0ef4 100644 --- a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts +++ b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts @@ -63,6 +63,8 @@ export class FilePreviewScreenComponent implements OnInit { } public ngOnInit(): void { + // PDFTRON cache fix + localStorage.clear(); this._viewerSyncService.activateViewer('ANNOTATED'); } @@ -99,7 +101,7 @@ export class FilePreviewScreenComponent implements OnInit { public handleAnnotationsAdded(annotations: Annotations.Annotation[]) { this._changeDetectorRef.detectChanges(); for (const annotation of annotations) { - if (annotation.Id.indexOf(':') >= 0) { + if (annotation.Id.startsWith('hint:') || annotation.Id.startsWith('redaction:')) { this.annotations.push(annotation); const pageNumber = annotation.getPageNumber(); let el = this.quickNavigation.find((page) => page.pageNumber === pageNumber); diff --git a/apps/red-ui/src/app/screens/file/pdf-viewer/pdf-viewer.component.html b/apps/red-ui/src/app/screens/file/pdf-viewer/pdf-viewer.component.html index 1ea295a43..d9f531bb5 100644 --- a/apps/red-ui/src/app/screens/file/pdf-viewer/pdf-viewer.component.html +++ b/apps/red-ui/src/app/screens/file/pdf-viewer/pdf-viewer.component.html @@ -1,3 +1,3 @@
-
+
diff --git a/apps/red-ui/src/app/screens/file/pdf-viewer/pdf-viewer.component.ts b/apps/red-ui/src/app/screens/file/pdf-viewer/pdf-viewer.component.ts index 008f4a7d5..eaad7ac1f 100644 --- a/apps/red-ui/src/app/screens/file/pdf-viewer/pdf-viewer.component.ts +++ b/apps/red-ui/src/app/screens/file/pdf-viewer/pdf-viewer.component.ts @@ -151,9 +151,9 @@ export class PdfViewerComponent implements OnInit, AfterViewInit, OnDestroy { const selectedQuads = this.wvInstance.docViewer.getSelectedTextQuads(); const text = this.wvInstance.docViewer.getSelectedText(); const entry: ManualRedactionEntry = {positions: []}; - for (let key of Object.keys(selectedQuads)) { - for (let quad of selectedQuads[key]) { - entry.positions.push(this.toPosition(parseInt(key), quad)); + for (const key of Object.keys(selectedQuads)) { + for (const quad of selectedQuads[key]) { + entry.positions.push(this.toPosition(parseInt(key,10), quad)); } } entry.value = text; diff --git a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html index 76d3649af..ab60e85b9 100644 --- a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html +++ b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html @@ -1,132 +1,139 @@ -
+
-
-
- -
-
-
-
-
- - +
+
+ +
+
+
+
+ + +
-
-
-
+
+
+
- {{'project-overview.table-header.title.label'| translate:{ length: appStateService.activeProject?.files.length || 0 } }} + {{'project-overview.table-header.title.label'| translate:{length: appStateService.activeProject?.files.length || 0} }} -
-
-
-
-
- -
-
-
-
-
-
-
- -
-
- {{ fileStatus.filename }} -
- -
- {{ fileStatus.added | date:'d MMM. yyyy, hh:mm a' }} -
- -
- Timo Bejan -
- -
- -
- -
-
- -
-
- -
-
-
d
-
s
-
v
-
-
+
+
+
-
-
-
- -
-
- -
-
- -
+
+
+
+
+
+
+
+ +
+
+ {{ fileStatus.filename }}
-
-
- {{ appStateService.activeProject.files.length }} -
-
9
-
- {{ appStateService.activeProject.project.date | date:'d MMM. yyyy' }} -
+
+ {{ fileStatus.added | date:'d MMM. yyyy, hh:mm a' }}
-
- {{ appStateService.activeProject.project.projectName }} +
+ Timo Bejan
-
- +
-
- {{ appStateService.activeProject.project.description }} +
+
+ +
-
-
-
-
- -
-
-
+2
-
-
-
+
-
+
+
+ +
+ +
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ {{ appStateService.activeProject.files.length }} +
+
9
+
+ {{ appStateService.activeProject.project.date | date:'d MMM. yyyy' }} +
+
+ +
+ {{ appStateService.activeProject.project.projectName }} +
+ +
+ +
+ +
+ {{ appStateService.activeProject.project.description }} +
+ +
+
+
+
+ +
+
+
+2
+
+
+
+
+
+
+
+
+
diff --git a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts index d608202ad..69462bff6 100644 --- a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts +++ b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts @@ -18,6 +18,7 @@ import {FileUploadModel} from "../../upload/model/file-upload.model"; import {FileUploadService} from "../../upload/file-upload.service"; import {UploadStatusOverlayService} from "../../upload/upload-status-dialog/service/upload-status-overlay.service"; import {AddEditProjectDialogComponent} from "../project-listing-screen/add-edit-project-dialog/add-edit-project-dialog.component"; +import {UserService} from "../../user/user.service"; @Component({ @@ -61,9 +62,10 @@ export class ProjectOverviewScreenComponent implements OnInit, OnDestroy { private readonly _notificationService: NotificationService, private readonly _dialog: MatDialog, private readonly _fileUploadService: FileUploadService, - private _uploadStatusOverlayService: UploadStatusOverlayService, + private readonly _uploadStatusOverlayService: UploadStatusOverlayService, private readonly _reanalysisControllerService: ReanalysisControllerService, private readonly _router: Router, + private readonly _userService: UserService, private readonly _fileDropOverlayService: FileDropOverlayService, private readonly _fileUploadControllerService: FileUploadControllerService, private readonly _projectControllerService: ProjectControllerService) { @@ -73,6 +75,10 @@ export class ProjectOverviewScreenComponent implements OnInit, OnDestroy { }); } + get user() { + return this._userService.user; + } + ngOnInit(): void { this._fileDropOverlayService.initFileDropHandling(); this._fileStatusInterval = setInterval(() => { diff --git a/apps/red-ui/src/assets/icons/general/idea.svg b/apps/red-ui/src/assets/icons/general/idea.svg new file mode 100644 index 000000000..4cdd9debd --- /dev/null +++ b/apps/red-ui/src/assets/icons/general/idea.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/apps/red-ui/src/assets/icons/general/secret.svg b/apps/red-ui/src/assets/icons/general/secret.svg new file mode 100644 index 000000000..9f577bcfc --- /dev/null +++ b/apps/red-ui/src/assets/icons/general/secret.svg @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +