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

show last redaction modification date

Browse Source
This commit is contained in:
Dan Percic 2022-03-05 20:51:36 +02:00
parent 8fff79fe22
commit c321209c32
8 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/table-item.component.html
View File

@ -7,7 +7,7 @@
</div>
<div class="cell">
<redaction-date-column [date]="file.annotationModificationDate" [isError]="file.isError"></redaction-date-column>
<redaction-date-column [date]="file.redactionModificationDate" [isError]="file.isError"></redaction-date-column>
</div>
<div *ngFor="let config of displayedAttributes" class="cell">

7
apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/table-item/table-item.component.html
View File

@ -3,9 +3,10 @@
<redaction-dossiers-listing-dossier-name [dossierStats]="stats" [dossier]="dossier"></redaction-dossiers-listing-dossier-name>
</div>
<div class="cell">
<redaction-date-column [date]="stats.annotationLastModified"></redaction-date-column>
</div>
<!--TODO: when dossier-stats api is updated show dossier's last modification date-->
<!-- <div class="cell">-->
<!-- <redaction-date-column [date]="stats.redactionModificationDate"></redaction-date-column>-->
<!-- </div>-->
<div class="cell">
<redaction-dossier-workload-column [dossierStats]="stats" [dossier]="dossier"></redaction-dossier-workload-column>

2
apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts
View File

@ -26,7 +26,7 @@ export class ConfigService {
get tableConfig(): TableColumnConfig<Dossier>[] {
return [
{ label: _('dossier-listing.table-col-names.name'), sortByKey: 'searchKey', width: '2fr' },
{ label: _('dossier-listing.table-col-names.last-modified') },
// { label: _('dossier-listing.table-col-names.last-modified') },
{ label: _('dossier-listing.table-col-names.needs-work') },
{ label: _('dossier-listing.table-col-names.owner'), class: 'user-column' },
{ label: _('dossier-listing.table-col-names.documents-status'), class: 'flex-end', width: 'auto' },

2
apps/red-ui/src/assets/i18n/en.json
View File

@ -827,7 +827,7 @@
"table-col-names": {
"added-on": "Added",
"assigned-to": "Assigned to",
"last-modified": "Last modified on",
"last-modified": "Last modified",
"name": "Name",
"needs-work": "Workload",
"pages": "Pages",

6
libs/red-domain/src/lib/dossier-stats/dossier-stats.model.ts
View File

@ -42,7 +42,6 @@ export class DossierStats implements IDossierStats {
readonly numberOfFiles: number;
readonly numberOfProcessingFiles: number;
readonly processingStats: ProcessingStats;
readonly annotationLastModified: string;
readonly hasFiles: boolean;
@ -55,12 +54,11 @@ export class DossierStats implements IDossierStats {
this.hasRedactionsFilePresent = stats.hasRedactionsFilePresent;
this.hasSuggestionsFilePresent = stats.hasSuggestionsFilePresent;
this.hasUpdatesFilePresent = stats.hasUpdatesFilePresent;
this.annotationLastModified = /*stats.annotationLastModified;*/ new Date().toDateString();
this.numberOfPages = stats.numberOfPages;
this.numberOfFiles = stats.numberOfFiles;
this.numberOfProcessingFiles = Object.entries<number>(this.fileCountPerProcessingStatus)
.filter(([key, _]) => isProcessingStatuses.includes(key as ProcessingFileStatus))
.reduce((count, [_, value]) => count + value, 0);
.filter(([key]) => isProcessingStatuses.includes(key as ProcessingFileStatus))
.reduce((count, [, value]) => count + value, 0);
this.processingStats = this.#processingStats;
this.hasFiles = this.numberOfFiles > 0;
}

1
libs/red-domain/src/lib/dossier-stats/dossier-stats.ts
View File

@ -11,5 +11,4 @@ export interface IDossierStats {
hasUpdatesFilePresent: boolean;
numberOfPages: number;
numberOfFiles: number;
annotationLastModified: string;
}

6
libs/red-domain/src/lib/files/file.model.ts
View File

@ -9,7 +9,6 @@ export class File extends Entity<IFile> implements IFile {
readonly allManualRedactionsApplied: boolean;
readonly analysisDuration?: number;
readonly analysisRequired: boolean;
readonly annotationModificationDate?: string;
readonly approvalDate?: string;
readonly assignee?: string;
readonly dictionaryVersion?: number;
@ -41,6 +40,7 @@ export class File extends Entity<IFile> implements IFile {
readonly processingStatus: ProcessingFileStatus;
readonly workflowStatus: WorkflowFileStatus;
readonly fileManipulationDate: string;
readonly redactionModificationDate: string;
readonly statusSort: number;
readonly cacheIdentifier?: string;
@ -65,7 +65,6 @@ export class File extends Entity<IFile> implements IFile {
this.allManualRedactionsApplied = !!file.allManualRedactionsApplied;
this.analysisDuration = file.analysisDuration;
this.analysisRequired = !!file.analysisRequired && !file.excluded;
this.annotationModificationDate = file.annotationModificationDate;
this.approvalDate = file.approvalDate;
this.assignee = file.assignee;
this.dictionaryVersion = file.dictionaryVersion;
@ -98,7 +97,8 @@ export class File extends Entity<IFile> implements IFile {
this.uploader = file.uploader;
this.excludedPages = file.excludedPages || [];
this.hasSuggestions = !!file.hasSuggestions;
this.fileManipulationDate = file.fileManipulationDate;
this.fileManipulationDate = file.fileManipulationDate ?? '';
this.redactionModificationDate = file.redactionModificationDate ?? '';
this.statusSort = StatusSorter[this.workflowStatus];
this.cacheIdentifier = btoa(this.fileManipulationDate ?? '');

4
libs/red-domain/src/lib/files/file.ts
View File

@ -32,7 +32,6 @@ export interface IFile {
/**
* Shows which dictionary versions was used during the analysis.
*/
readonly annotationModificationDate?: string;
readonly dictionaryVersion?: number;
/**
* Shows which dossier dictionary versions was used during the analysis.
@ -151,5 +150,6 @@ export interface IFile {
/**
* Last time the actual file was touched
*/
readonly fileManipulationDate: string;
readonly fileManipulationDate: string | null;
readonly redactionModificationDate: string | null;
}