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

Merge branch 'VM/RED-7023' into 'master'

Browse Source 
RED-7023 - Option to compare (effective) dossier dictionary with template dictionary

Closes RED-7023

See merge request redactmanager/red-ui!166
This commit is contained in:
Dan Percic 2023-10-27 12:33:33 +02:00
commit 092b8c2b28
4 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html
View File

@ -84,6 +84,7 @@
[selectedDictionaryType]="selectedDictionary.type"
[activeEntryType]="activeEntryType"
[hint]="selectedDictionary.hint"
[currentDossierId]="dossier.dossierId"
></redaction-dictionary-manager>
</div>
</div>

5
apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html
View File

@ -72,7 +72,10 @@
[placeholder]="selectedDossier.dossierId ? selectedDossier.dossierName : (selectDictionary.label | translate)"
>
<ng-container *ngFor="let dossier of dossiers; let index = index">
<mat-option *ngIf="dossier.dossierId !== selectedDossier.dossierId" [value]="dossier">
<mat-option
*ngIf="dossier.dossierId !== selectedDossier.dossierId && dossier.dossierId !== currentDossierId"
[value]="dossier"
>
{{ dossier.dossierName }}
</mat-option>
<mat-divider

6
apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.scss
View File

@ -46,6 +46,12 @@ form {
> .compare {
display: flex;
align-items: center;
mat-select:not(.mat-mdc-select-disabled) {
::ng-deep .mat-mdc-select-placeholder {
color: black;
}
}
}
.w-450 {

1
apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.ts
View File

@ -39,6 +39,7 @@ export class DictionaryManagerComponent implements OnChanges {
readonly #currentTab = window.location.href.split('/').pop();
@Input() type: DictionaryType = 'dictionary';
@Input() entityType?: string;
@Input() currentDossierId: string;
@Input() withFloatingActions = true;
@Input() filterByDossierTemplate = false;
@Input() initialEntries: List;