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

This commit is contained in:
Valentin Mihai 2023-10-19 17:09:22 +03:00
parent ec6cb62339
commit 5f7717e9af
4 changed files with 14 additions and 6 deletions

View File

@ -68,9 +68,12 @@
<mat-form-field>
<mat-select [(ngModel)]="dossier" [disabled]="!compare">
<mat-option [value]="selectDossier">{{ selectDossier.dossierName | translate }}</mat-option>
<mat-option *ngFor="let dossier of dossiers" [value]="dossier">
{{ dossier.dossierName }}
</mat-option>
<ng-container *ngFor="let dossier of dossiers; let index = index">
<mat-option [value]="dossier">
{{ dossier.dossierName }}
</mat-option>
<mat-divider *ngIf="index === dossiers.length - 2"></mat-divider>
</ng-container>
</mat-select>
</mat-form-field>
</div>

View File

@ -20,7 +20,7 @@ const lineChangeToDecoration = ({ originalEndLineNumber, originalStartLineNumber
glyphMarginClassName: 'arrow-left',
isWholeLine: true,
},
} as IModelDeltaDecoration);
}) as IModelDeltaDecoration;
const isPositive = (lineChange: ILineChange) => lineChange.originalEndLineNumber - lineChange.originalStartLineNumber >= 0;
const notZero = (lineChange: ILineChange) => lineChange.originalEndLineNumber !== 0 && lineChange.originalStartLineNumber !== 0;
@ -47,7 +47,10 @@ export class EditorComponent implements OnInit, OnChanges {
codeEditor: ICodeEditor;
value: string;
constructor(private readonly _loadingService: LoadingService, private readonly _editorThemeService: EditorThemeService) {
constructor(
private readonly _loadingService: LoadingService,
private readonly _editorThemeService: EditorThemeService,
) {
const textChanged$ = this._editorTextChanged$.pipe(
debounceTime(300), // prevent race condition with onPaste event
takeUntilDestroyed(),

View File

@ -49,6 +49,7 @@ import { IqserUsersModule } from '@iqser/common-ui/lib/users';
import { SmallChipComponent } from '@iqser/common-ui/lib/shared';
import { SelectComponent } from '@shared/components/select/select.component';
import { FileAttributeComponent } from '../dossier-overview/components/file-attribute/file-attribute.component';
import { MatDividerModule } from '@angular/material/divider';
const buttons = [FileDownloadBtnComponent];
@ -103,6 +104,7 @@ const deleteThisWhenAllComponentsAreStandalone = [DonutChartComponent, FileAttri
SelectComponent,
RoundCheckboxComponent,
DynamicInputComponent,
MatDividerModule,
],
exports: [...modules, ...components, ...utils, ...deleteThisWhenAllComponentsAreStandalone],
providers: [

View File

@ -48,7 +48,7 @@
"keycloak-angular": "14.1.0",
"keycloak-js": "22.0.4",
"lodash-es": "^4.17.21",
"monaco-editor": "0.44.0",
"monaco-editor": "0.43.0",
"ng2-charts": "5.0.3",
"ngx-color-picker": "15.0.0",
"ngx-logger": "^5.0.11",