+
+
+ {{ fileStatus.primaryAttribute }}
+
+
+
+
+ {{ fileStatus.ocrTime ? (fileStatus.ocrTime | date: 'mediumDate') : ('project-overview.no-ocr' | translate) }}
+
+
diff --git a/apps/red-ui/src/app/modules/projects/screens/project-overview-screen/project-overview-screen.component.scss b/apps/red-ui/src/app/modules/projects/screens/project-overview-screen/project-overview-screen.component.scss
index dd6c59430..a1719e9b1 100644
--- a/apps/red-ui/src/app/modules/projects/screens/project-overview-screen/project-overview-screen.component.scss
+++ b/apps/red-ui/src/app/modules/projects/screens/project-overview-screen/project-overview-screen.component.scss
@@ -121,3 +121,7 @@ cdk-virtual-scroll-viewport {
color: initial;
}
}
+
+.primary-attribute {
+ padding-top: 6px;
+}
diff --git a/apps/red-ui/src/app/modules/projects/screens/project-overview-screen/project-overview-screen.component.ts b/apps/red-ui/src/app/modules/projects/screens/project-overview-screen/project-overview-screen.component.ts
index 165fb0164..aa59ddc6f 100644
--- a/apps/red-ui/src/app/modules/projects/screens/project-overview-screen/project-overview-screen.component.ts
+++ b/apps/red-ui/src/app/modules/projects/screens/project-overview-screen/project-overview-screen.component.ts
@@ -34,7 +34,7 @@ import { OnAttach, OnDetach } from '../../../../utils/custom-route-reuse.strateg
styleUrls: ['./project-overview-screen.component.scss']
})
export class ProjectOverviewScreenComponent extends BaseListingComponent implements OnInit, OnDestroy, OnDetach, OnAttach {
- protected readonly _searchKey = 'filename';
+ protected readonly _searchKey = 'searchField';
protected readonly _selectionKey = 'fileId';
protected readonly _sortKey = 'project-overview';
@@ -42,7 +42,6 @@ export class ProjectOverviewScreenComponent extends BaseListingComponent p.projectId)).toPromise();
+
for (const projectId of Object.keys(fileData)) {
- this._processFiles(
- mappedProjects.find((p) => p.projectId === projectId),
- fileData[projectId],
- emitEvents
- );
+ const project = mappedProjects.find((p) => p.projectId === projectId);
+ const fileAttributesConfig = await this._fileAttributesService
+ .getFileAttributesConfiguration(project.ruleSetId)
+ .pipe(catchError(() => of({})))
+ .toPromise();
+
+ console.log(fileAttributesConfig);
+
+ this._processFiles(project, fileData[projectId], emitEvents, fileAttributesConfig);
}
this._appState.projects = mappedProjects;
@@ -266,7 +272,11 @@ export class AppStateService {
const oldProcessedDate = this.activeFile.lastProcessed;
const activeFile = await this._statusControllerService.getFileStatus(this.activeProjectId, this.activeFileId).toPromise();
- const activeFileWrapper = new FileStatusWrapper(activeFile, this._userService.getNameForId(activeFile.currentReviewer));
+ const activeFileWrapper = new FileStatusWrapper(
+ activeFile,
+ this._userService.getNameForId(activeFile.currentReviewer),
+ this._appState.activeFileAttributesConfig
+ );
this.activeProject.files = this.activeProject.files.map((file) => (file.fileId === activeFileWrapper.fileId ? activeFileWrapper : file));
await this.updateDictionaryVersion();
@@ -282,12 +292,17 @@ export class AppStateService {
if (!project) {
project = this.activeProject;
}
- const files = await this._statusControllerService.getProjectStatus(project.project.projectId).toPromise();
+ const files = await this._statusControllerService.getProjectStatus(project.projectId).toPromise();
- return this._processFiles(project, files, emitEvents);
+ const fileAttributesConfig = await this._fileAttributesService
+ .getFileAttributesConfiguration(project.ruleSetId)
+ .pipe(catchError(() => of({})))
+ .toPromise();
+
+ return this._processFiles(project, files, emitEvents, fileAttributesConfig);
}
- private _processFiles(project: ProjectWrapper, files: FileStatus[], emitEvents: boolean = true) {
+ private _processFiles(project: ProjectWrapper, files: FileStatus[], emitEvents: boolean = true, fileAttributesConfig: FileAttributesConfig) {
const oldFiles = [...project.files];
const fileStatusChangedEvent = [];
@@ -298,7 +313,11 @@ export class AppStateService {
for (const oldFile of oldFiles) {
if (oldFile.fileId === file.fileId) {
// emit when analysis count changed
- const fileStatusWrapper = new FileStatusWrapper(file, this._userService.getNameForId(file.currentReviewer));
+ const fileStatusWrapper = new FileStatusWrapper(
+ file,
+ this._userService.getNameForId(file.currentReviewer),
+ fileAttributesConfig?.fileAttributeConfigs
+ );
if (JSON.stringify(oldFile) !== JSON.stringify(fileStatusWrapper)) {
fileStatusChangedEvent.push(fileStatusWrapper);
}
@@ -311,12 +330,14 @@ export class AppStateService {
}
// emit for new file
if (!found) {
- const fsw = new FileStatusWrapper(file, this._userService.getNameForId(file.currentReviewer));
+ const fsw = new FileStatusWrapper(file, this._userService.getNameForId(file.currentReviewer), fileAttributesConfig?.fileAttributeConfigs);
fileStatusChangedEvent.push(fsw);
}
}
- project.files = files.map((f) => new FileStatusWrapper(f, this._userService.getNameForId(f.currentReviewer)));
+ project.files = files.map(
+ (f) => new FileStatusWrapper(f, this._userService.getNameForId(f.currentReviewer), fileAttributesConfig?.fileAttributeConfigs)
+ );
this._computeStats();
if (emitEvents) {
@@ -343,12 +364,6 @@ export class AppStateService {
this._router.navigate(['/main/projects']);
return;
}
- this._fileAttributesService
- .getFileAttributesConfiguration(this.getProjectById(projectId).ruleSetId)
- .toPromise()
- .then((data) => {
- this._appState.activeFileAttributesConfig = data.fileAttributeConfigs;
- });
}
activateFile(projectId: string, fileId: string) {
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index be4efa650..78d5e9526 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -192,6 +192,7 @@
"collapse": "Hide Details"
},
"project-overview": {
+ "no-ocr": "No OCR",
"no-data": {
"title": "There are no documents yet.",
"action": "Upload Document"
diff --git a/libs/red-ui-http/src/lib/model/fileStatus.ts b/libs/red-ui-http/src/lib/model/fileStatus.ts
index 6b8569577..9e9b88431 100644
--- a/libs/red-ui-http/src/lib/model/fileStatus.ts
+++ b/libs/red-ui-http/src/lib/model/fileStatus.ts
@@ -48,6 +48,10 @@ export interface FileStatus {
* The file's name.
*/
filename?: string;
+ /**
+ * Shows if this file has comments on annotations.
+ */
+ hasAnnotationComments?: boolean;
/**
* Shows if any hints were found during the analysis.
*/
@@ -68,6 +72,10 @@ export interface FileStatus {
* Shows if there is any change between the previous and current analysis.
*/
hasUpdates?: boolean;
+ /**
+ * Shows if this file has been OCRed by us. Last Time of OCR.
+ */
+ lastOCRTime?: string;
/**
* Shows the last date of a successful analysis.
*/
@@ -109,31 +117,30 @@ export interface FileStatus {
*/
uploader?: string;
}
-
export namespace FileStatus {
export type StatusEnum =
| 'UNPROCESSED'
| 'REPROCESS'
- | 'FULLREPROCESS'
| 'PROCESSING'
- | 'OCR_PROCESSING'
| 'ERROR'
| 'UNASSIGNED'
| 'UNDER_REVIEW'
- | 'EXCLUDED'
| 'UNDER_APPROVAL'
- | 'APPROVED';
+ | 'APPROVED'
+ | 'FULLREPROCESS'
+ | 'OCR_PROCESSING'
+ | 'EXCLUDED';
export const StatusEnum = {
UNPROCESSED: 'UNPROCESSED' as StatusEnum,
- FULLREPROCESS: 'FULLREPROCESS' as StatusEnum,
REPROCESS: 'REPROCESS' as StatusEnum,
PROCESSING: 'PROCESSING' as StatusEnum,
- OCR_PROCESSING: 'OCR_PROCESSING' as StatusEnum,
ERROR: 'ERROR' as StatusEnum,
UNASSIGNED: 'UNASSIGNED' as StatusEnum,
UNDERREVIEW: 'UNDER_REVIEW' as StatusEnum,
UNDERAPPROVAL: 'UNDER_APPROVAL' as StatusEnum,
APPROVED: 'APPROVED' as StatusEnum,
+ FULLREPROCESS: 'FULLREPROCESS' as StatusEnum,
+ OCR_PROCESSING: 'OCR_PROCESSING' as StatusEnum,
EXCLUDED: 'EXCLUDED' as StatusEnum
};
}