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

fix dossier template dictionary compare & editor line click

Browse Source
This commit is contained in:
Dan Percic 2021-10-05 11:23:57 +03:00
parent 5828597e71
commit dd3b0915e6
5 changed files with 42 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,17 +31,17 @@
</mat-checkbox>
</div>
<div *ngIf="filterByDossierTemplate" class="iqser-input-group w-200 mt-0 mr-8">
<mat-select [(ngModel)]="dossier" [disabled]="!compare">
<mat-option [value]="selectDossier">{{ selectDossier.dossierName | translate }}</mat-option>
<mat-option *ngFor="let dossier of dossiersService.all$ | async" [value]="dossier">
{{ dossier.dossierName }}
<mat-select [(ngModel)]="dossierTemplate" [disabled]="!compare">
<mat-option [value]="selectDossierTemplate">{{ selectDossierTemplate.name | translate }}</mat-option>
<mat-option *ngFor="let dossierTemplate of dossierTemplatesService.all$ | async" [value]="dossierTemplate">
{{ dossierTemplate.name }}
</mat-option>
</mat-select>
</div>
<div class="iqser-input-group w-200 mt-0">
<mat-select [(ngModel)]="dossier" [disabled]="!compare">
<mat-select [(ngModel)]="dossier" [disabled]="!compare || dossierTemplateIsNotSelected">
<mat-option [value]="selectDossier">{{ selectDossier.dossierName | translate }}</mat-option>
<mat-option *ngFor="let dossier of dossiersService.all$ | async" [value]="dossier">
<mat-option *ngFor="let dossier of dossiers" [value]="dossier">
{{ dossier.dossierName }}
</mat-option>
</mat-select>

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

@ -6,6 +6,8 @@ import { Dossier } from '@state/model/dossier';
import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
import { DictionaryService } from '@shared/services/dictionary.service';
import { DossiersService } from '../../../dossier/services/dossiers.service';
import { DossierTemplatesService } from '../../../dossier/services/dossier-templates.service';
import { DossierTemplate } from '@models/file/dossier-template';
import ICodeEditor = monaco.editor.ICodeEditor;
import IDiffEditor = monaco.editor.IDiffEditor;
import IModelDeltaDecoration = monaco.editor.IModelDeltaDecoration;
@ -38,14 +40,32 @@ export class DictionaryManagerComponent implements OnChanges, OnInit {
searchText = '';
selectDossier = { dossierName: _('dictionary-overview.compare.select-dossier') };
selectDossierTemplate = { name: _('dictionary-overview.compare.select-dossier-template') };
compare: false;
dossiers: List<Dossier> = this._dossiers;
private _codeEditor: ICodeEditor;
private _diffEditor: IDiffEditor;
private _decorations: string[] = [];
private _searchDecorations: string[] = [];
constructor(private readonly _dictionaryService: DictionaryService, readonly dossiersService: DossiersService) {}
constructor(
private readonly _dictionaryService: DictionaryService,
readonly dossiersService: DossiersService,
readonly dossierTemplatesService: DossierTemplatesService
) {}
private _dossierTemplate: DossierTemplate = this.selectDossierTemplate as DossierTemplate;
get dossierTemplate() {
return this._dossierTemplate;
}
set dossierTemplate(value) {
this._dossierTemplate = value;
this.dossier = this.selectDossier as Dossier;
this.dossiers = this._dossiers;
}
private _dossier: Dossier = this.selectDossier as Dossier;
@ -86,6 +106,17 @@ export class DictionaryManagerComponent implements OnChanges, OnInit {
return this.currentEntries.toString() !== this.initialEntries.toString();
}
get _dossiers() {
if (this.filterByDossierTemplate) {
return this.dossiersService.all.filter(dossier => dossier.dossierTemplateId === this.dossierTemplate.dossierTemplateId);
}
return this.dossiersService.all;
}
get dossierTemplateIsNotSelected() {
return this.filterByDossierTemplate && this._dossierTemplate.name === this.selectDossierTemplate.name;
}
ngOnInit(): void {
this.currentEntries = [...this.initialEntries];

3
apps/red-ui/src/assets/i18n/de.json
View File

@ -434,7 +434,8 @@
},
"compare": {
"compare": "Vergleichen Sie",
"select-dossier": "Wählen Sie Dossiervorlage"
"select-dossier": "Wählen Sie Dossiervorlage",
"select-dossier-template": ""
},
"dictionary-details": {
"description": "Beschreibung"

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

@ -474,7 +474,8 @@
},
"compare": {
"compare": "Compare",
"select-dossier": "Select Dossier"
"select-dossier": "Select Dossier",
"select-dossier-template": "Select Dossier Template"
},
"dictionary-details": {
"description": "Description"

3
apps/red-ui/src/assets/styles/red-editor.scss
View File

@ -2,17 +2,14 @@
.changed-row-marker {
background: rgba(variables.$primary, 0.1);
z-index: 20;
}
.too-short-marker {
background: rgba(variables.$primary, 0.5);
z-index: 30;
}
.search-marker {
background: rgba(variables.$blue-5, 0.3);
z-index: 40;
}
.editor-container {