From f1540d1e556f3d26ec3ba47411680cc1055015b7 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Fri, 6 Nov 2020 11:21:56 +0200 Subject: [PATCH] solved some issues --- .../components/sorting/sorting.component.ts | 8 ++++++- .../app/screens/file/model/file-data.model.ts | 2 +- .../screens/file/model/file-status.wrapper.ts | 2 +- .../project-listing-screen.component.html | 22 ++++++++++++++++--- .../project-listing-screen.component.ts | 4 ++++ .../project-details.component.html | 4 ++-- .../project-details.component.ts | 4 ++++ .../project-overview-screen.component.html | 10 ++++++--- .../project-overview-screen.component.ts | 2 -- .../red-ui/src/app/state/app-state.service.ts | 4 ++++ .../upload-status-overlay.component.scss | 2 +- .../upload-status-overlay.component.ts | 22 ++++++++++++++++++- apps/red-ui/src/assets/i18n/en.json | 7 ++++-- apps/red-ui/src/assets/styles/red-tables.scss | 10 ++++----- 14 files changed, 81 insertions(+), 22 deletions(-) diff --git a/apps/red-ui/src/app/components/sorting/sorting.component.ts b/apps/red-ui/src/app/components/sorting/sorting.component.ts index 6bf21e1a3..e7a5526b0 100644 --- a/apps/red-ui/src/app/components/sorting/sorting.component.ts +++ b/apps/red-ui/src/app/components/sorting/sorting.component.ts @@ -25,6 +25,8 @@ const SORTING_OPTIONS: { [key: string]: SortingOption[] } = { styleUrls: ['./sorting.component.scss'] }) export class SortingComponent implements OnInit { + @Input() initialOption: SortingOption; + @Input() private type: 'project-overview' | 'project-listing'; @@ -36,7 +38,11 @@ export class SortingComponent implements OnInit { constructor() {} - public ngOnInit(): void {} + public ngOnInit(): void { + if (this.initialOption) { + this.setOption(this.initialOption); + } + } private _addCustomOption(option: Partial) { const customOption = { diff --git a/apps/red-ui/src/app/screens/file/model/file-data.model.ts b/apps/red-ui/src/app/screens/file/model/file-data.model.ts index fbd6afdfe..c46c6b456 100644 --- a/apps/red-ui/src/app/screens/file/model/file-data.model.ts +++ b/apps/red-ui/src/app/screens/file/model/file-data.model.ts @@ -21,7 +21,7 @@ export class FileDataModel { (e) => e.status !== 'DECLINED' && !this.redactionLog.redactionLogEntry.find((r) => r.id === e.id) && - new Date(e.processedDate).getTime() > + new Date(e.processedDate).getTime() < new Date(this.fileStatus.lastProcessed).getTime() ); } diff --git a/apps/red-ui/src/app/screens/file/model/file-status.wrapper.ts b/apps/red-ui/src/app/screens/file/model/file-status.wrapper.ts index 1995a80b9..0149d7a7e 100644 --- a/apps/red-ui/src/app/screens/file/model/file-status.wrapper.ts +++ b/apps/red-ui/src/app/screens/file/model/file-status.wrapper.ts @@ -64,7 +64,7 @@ export class FileStatusWrapper { } get status() { - return this.fileStatus.status; + return this.fileStatus.status === 'REPROCESS' ? 'PROCESSING' : this.fileStatus.status; } get numberOfPages() { diff --git a/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.html b/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.html index eaff2adb0..905660c4d 100644 --- a/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.html +++ b/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.html @@ -106,7 +106,7 @@
+ + +
-
+
-
+
-
+
+
+
+
-
+
@@ -151,7 +155,7 @@
0; + } } @Injectable({ diff --git a/apps/red-ui/src/app/upload/upload-status-dialog/upload-status-overlay.component.scss b/apps/red-ui/src/app/upload/upload-status-dialog/upload-status-overlay.component.scss index 50e8d134f..9544fd35f 100644 --- a/apps/red-ui/src/app/upload/upload-status-dialog/upload-status-overlay.component.scss +++ b/apps/red-ui/src/app/upload/upload-status-dialog/upload-status-overlay.component.scss @@ -34,7 +34,7 @@ section { padding-left: 8px; mat-icon { - width: 16px; + width: 10px; } } diff --git a/apps/red-ui/src/app/upload/upload-status-dialog/upload-status-overlay.component.ts b/apps/red-ui/src/app/upload/upload-status-dialog/upload-status-overlay.component.ts index 57756b506..a33e48257 100644 --- a/apps/red-ui/src/app/upload/upload-status-dialog/upload-status-overlay.component.ts +++ b/apps/red-ui/src/app/upload/upload-status-dialog/upload-status-overlay.component.ts @@ -11,12 +11,28 @@ import { OverlayRef } from '@angular/cdk/overlay'; export class UploadStatusOverlay implements OnInit { collapsed = false; + uploadStatusInterval: number; + constructor( public readonly uploadService: FileUploadService, private readonly _overlayRef: OverlayRef ) {} - ngOnInit() {} + ngOnInit() { + this.uploadStatusInterval = setInterval(() => { + if (this.uploadService.files.length > 0) { + const result = this.uploadService.files.reduce( + (a, file) => a && file.completed && !file.error, + true + ); + if (result) { + setTimeout(() => { + this.closeDialog(); + }, 3000); + } + } + }, 1000); + } cancelItem(item: FileUploadModel) {} @@ -26,6 +42,10 @@ export class UploadStatusOverlay implements OnInit { } closeDialog() { + if (this.uploadStatusInterval) { + clearInterval(this.uploadStatusInterval); + this.uploadStatusInterval = null; + } this.uploadService.stopAllUploads(); this._overlayRef.detach(); } diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index bc891c6a0..9de6959d2 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -83,7 +83,7 @@ } }, "filters": { - "filter-by": "Filter by:", + "filter-by": "Filter:", "status": "Status", "people": "People", "due-date": "Due Date", @@ -141,7 +141,8 @@ "delete-failed": "Failed to delete project: {{projectName}}" }, "add-new": "New Project", - "no-projects": "You currently have no projects. You can start your work by creating a new one!" + "no-projects": "You currently have no projects. You can start your work by creating a new one!", + "no-projects-match": "No Projects match your current filters" }, "file-details": { "dialog": { @@ -168,6 +169,8 @@ "approve": "Approve", "under-review": "Under Review", "no-files": "This Project contains no files yet. You can start your work by uploading some files!", + "no-files-match": "No File match your current filters", + "upload-files": "Drop files anywhere for upload!", "new-rule": { "label": "Outdated", "toast": { diff --git a/apps/red-ui/src/assets/styles/red-tables.scss b/apps/red-ui/src/assets/styles/red-tables.scss index eb0848ec2..53981256c 100644 --- a/apps/red-ui/src/assets/styles/red-tables.scss +++ b/apps/red-ui/src/assets/styles/red-tables.scss @@ -16,15 +16,15 @@ } } +.no-data { + grid-column: 1/-1; + padding: 12px; +} + .grid-container { display: grid; position: relative; - .no-data { - grid-column: 1/-1; - padding: 12px; - } - .select-oval-placeholder { border-bottom: 1px solid $separator; }