mock annotationLastModified on dossier && moved date column in shared
This commit is contained in:
parent
c48772503f
commit
8fff79fe22
@ -17,7 +17,6 @@ import { WorkflowItemComponent } from './components/workflow-item/workflow-item.
|
|||||||
import { ScreenHeaderComponent } from './components/screen-header/screen-header.component';
|
import { ScreenHeaderComponent } from './components/screen-header/screen-header.component';
|
||||||
import { ViewModeSelectionComponent } from './components/view-mode-selection/view-mode-selection.component';
|
import { ViewModeSelectionComponent } from './components/view-mode-selection/view-mode-selection.component';
|
||||||
import { FileNameColumnComponent } from './components/table-item/file-name-column/file-name-column.component';
|
import { FileNameColumnComponent } from './components/table-item/file-name-column/file-name-column.component';
|
||||||
import { DateColumnComponent } from './components/table-item/date-column/date-column.component';
|
|
||||||
import { BulkActionsService } from './services/bulk-actions.service';
|
import { BulkActionsService } from './services/bulk-actions.service';
|
||||||
|
|
||||||
const routes: Routes = [
|
const routes: Routes = [
|
||||||
@ -44,7 +43,6 @@ const routes: Routes = [
|
|||||||
ScreenHeaderComponent,
|
ScreenHeaderComponent,
|
||||||
ViewModeSelectionComponent,
|
ViewModeSelectionComponent,
|
||||||
FileNameColumnComponent,
|
FileNameColumnComponent,
|
||||||
DateColumnComponent,
|
|
||||||
],
|
],
|
||||||
providers: [ConfigService, BulkActionsService],
|
providers: [ConfigService, BulkActionsService],
|
||||||
imports: [RouterModule.forChild(routes), CommonModule, SharedModule, SharedDossiersModule, IqserIconsModule, TranslateModule],
|
imports: [RouterModule.forChild(routes), CommonModule, SharedModule, SharedDossiersModule, IqserIconsModule, TranslateModule],
|
||||||
|
|||||||
@ -3,6 +3,10 @@
|
|||||||
<redaction-dossiers-listing-dossier-name [dossierStats]="stats" [dossier]="dossier"></redaction-dossiers-listing-dossier-name>
|
<redaction-dossiers-listing-dossier-name [dossierStats]="stats" [dossier]="dossier"></redaction-dossiers-listing-dossier-name>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="cell">
|
||||||
|
<redaction-date-column [date]="stats.annotationLastModified"></redaction-date-column>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="cell">
|
<div class="cell">
|
||||||
<redaction-dossier-workload-column [dossierStats]="stats" [dossier]="dossier"></redaction-dossier-workload-column>
|
<redaction-dossier-workload-column [dossierStats]="stats" [dossier]="dossier"></redaction-dossier-workload-column>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -26,6 +26,7 @@ export class ConfigService {
|
|||||||
get tableConfig(): TableColumnConfig<Dossier>[] {
|
get tableConfig(): TableColumnConfig<Dossier>[] {
|
||||||
return [
|
return [
|
||||||
{ label: _('dossier-listing.table-col-names.name'), sortByKey: 'searchKey', width: '2fr' },
|
{ 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.needs-work') },
|
{ label: _('dossier-listing.table-col-names.needs-work') },
|
||||||
{ label: _('dossier-listing.table-col-names.owner'), class: 'user-column' },
|
{ label: _('dossier-listing.table-col-names.owner'), class: 'user-column' },
|
||||||
{ label: _('dossier-listing.table-col-names.documents-status'), class: 'flex-end', width: 'auto' },
|
{ label: _('dossier-listing.table-col-names.documents-status'), class: 'flex-end', width: 'auto' },
|
||||||
|
|||||||
@ -1,3 +1,3 @@
|
|||||||
<div [class.error]="isError" class="small-label">
|
<div [class.error]="isError" class="small-label">
|
||||||
{{ date | date: 'd MMM. yyyy, hh:mm a' }}
|
{{ date | date: 'd MMM. yyyy' }}
|
||||||
</div>
|
</div>
|
||||||
@ -1,12 +1,12 @@
|
|||||||
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
|
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'redaction-date-column',
|
selector: 'redaction-date-column [date]',
|
||||||
templateUrl: './date-column.component.html',
|
templateUrl: './date-column.component.html',
|
||||||
styleUrls: ['./date-column.component.scss'],
|
styleUrls: ['./date-column.component.scss'],
|
||||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
})
|
})
|
||||||
export class DateColumnComponent {
|
export class DateColumnComponent {
|
||||||
@Input() isError: boolean;
|
@Input() isError = false;
|
||||||
@Input() date: string;
|
@Input() date: string;
|
||||||
}
|
}
|
||||||
@ -5,8 +5,9 @@ import { FileActionsComponent } from './components/file-actions/file-actions.com
|
|||||||
import { IqserIconsModule } from '@iqser/common-ui';
|
import { IqserIconsModule } from '@iqser/common-ui';
|
||||||
import { SharedModule } from '@shared/shared.module';
|
import { SharedModule } from '@shared/shared.module';
|
||||||
import { RedactionImportService } from './services/redaction-import.service';
|
import { RedactionImportService } from './services/redaction-import.service';
|
||||||
|
import { DateColumnComponent } from './components/date-column/date-column.component';
|
||||||
|
|
||||||
const components = [FileActionsComponent];
|
const components = [FileActionsComponent, DateColumnComponent];
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
declarations: [...components],
|
declarations: [...components],
|
||||||
|
|||||||
@ -733,6 +733,7 @@
|
|||||||
"documents-status": "",
|
"documents-status": "",
|
||||||
"dossier-status": "",
|
"dossier-status": "",
|
||||||
"name": "Name",
|
"name": "Name",
|
||||||
|
"last-modified": "",
|
||||||
"needs-work": "Arbeitsvorrat",
|
"needs-work": "Arbeitsvorrat",
|
||||||
"owner": "Besitzer"
|
"owner": "Besitzer"
|
||||||
},
|
},
|
||||||
|
|||||||
@ -733,6 +733,7 @@
|
|||||||
"documents-status": "Documents Status",
|
"documents-status": "Documents Status",
|
||||||
"dossier-status": "Dossier Status",
|
"dossier-status": "Dossier Status",
|
||||||
"name": "Name",
|
"name": "Name",
|
||||||
|
"last-modified": "Last modified",
|
||||||
"needs-work": "Workload",
|
"needs-work": "Workload",
|
||||||
"owner": "Owner"
|
"owner": "Owner"
|
||||||
},
|
},
|
||||||
|
|||||||
@ -42,6 +42,7 @@ export class DossierStats implements IDossierStats {
|
|||||||
readonly numberOfFiles: number;
|
readonly numberOfFiles: number;
|
||||||
readonly numberOfProcessingFiles: number;
|
readonly numberOfProcessingFiles: number;
|
||||||
readonly processingStats: ProcessingStats;
|
readonly processingStats: ProcessingStats;
|
||||||
|
readonly annotationLastModified: string;
|
||||||
|
|
||||||
readonly hasFiles: boolean;
|
readonly hasFiles: boolean;
|
||||||
|
|
||||||
@ -54,6 +55,7 @@ export class DossierStats implements IDossierStats {
|
|||||||
this.hasRedactionsFilePresent = stats.hasRedactionsFilePresent;
|
this.hasRedactionsFilePresent = stats.hasRedactionsFilePresent;
|
||||||
this.hasSuggestionsFilePresent = stats.hasSuggestionsFilePresent;
|
this.hasSuggestionsFilePresent = stats.hasSuggestionsFilePresent;
|
||||||
this.hasUpdatesFilePresent = stats.hasUpdatesFilePresent;
|
this.hasUpdatesFilePresent = stats.hasUpdatesFilePresent;
|
||||||
|
this.annotationLastModified = /*stats.annotationLastModified;*/ new Date().toDateString();
|
||||||
this.numberOfPages = stats.numberOfPages;
|
this.numberOfPages = stats.numberOfPages;
|
||||||
this.numberOfFiles = stats.numberOfFiles;
|
this.numberOfFiles = stats.numberOfFiles;
|
||||||
this.numberOfProcessingFiles = Object.entries<number>(this.fileCountPerProcessingStatus)
|
this.numberOfProcessingFiles = Object.entries<number>(this.fileCountPerProcessingStatus)
|
||||||
|
|||||||
@ -11,4 +11,5 @@ export interface IDossierStats {
|
|||||||
hasUpdatesFilePresent: boolean;
|
hasUpdatesFilePresent: boolean;
|
||||||
numberOfPages: number;
|
numberOfPages: number;
|
||||||
numberOfFiles: number;
|
numberOfFiles: number;
|
||||||
|
annotationLastModified: string;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user