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

RED-1772 finalization

Browse Source
This commit is contained in:
Timo Bejan 2021-07-28 08:39:20 +03:00 committed by Timo Bejan
parent 837bb5733b
commit 5363e939d3
4 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/red-ui/src/app/components/base-screen/base-screen.component.html
View File

@ -37,7 +37,6 @@
{{ 'top-bar.navigation-items.back' | translate }} {{ 'top-bar.navigation-items.back' | translate }}
</a> </a>
<ng-container *ngIf="dossiersView"> <ng-container *ngIf="dossiersView">
<mat-icon *ngIf="!appStateService.activeDossier" class="primary" svgIcon="red:arrow-down"></mat-icon>
<mat-icon *ngIf="appStateService.activeDossier" svgIcon="red:arrow-right"></mat-icon> <mat-icon *ngIf="appStateService.activeDossier" svgIcon="red:arrow-right"></mat-icon>
<a <a
*ngIf="appStateService.activeDossier" *ngIf="appStateService.activeDossier"

31
apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-dossier-template-dialog.component.html
View File

@ -73,21 +73,22 @@
<p class="download-includes">{{ 'download-includes' | translate }}</p> <p class="download-includes">{{ 'download-includes' | translate }}</p>
<div class="d-flex"> <div class="d-flex">
<!-- only in edit mode--> <!-- only in edit mode-->
<redaction-select <!-- Temporary Disabled since backend doesn't support this -->
*ngIf="dossierTemplate?.dossierTemplateId" <!-- <redaction-select-->
[label]=" <!-- *ngIf="dossierTemplate?.dossierTemplateId"-->
'report-type.label' <!-- [label]="-->
| translate <!-- 'report-type.label'-->
: { <!-- | translate-->
length: dossierTemplateForm.controls['reportTemplateIds'].value.length <!-- : {-->
} <!-- length: dossierTemplateForm.controls['reportTemplateIds'].value.length-->
" <!-- }-->
[optionTemplate]="reportTemplateOptionTemplate" <!-- "-->
[options]="availableReportTypes" <!-- [optionTemplate]="reportTemplateOptionTemplate"-->
[valueMapper]="reportTemplateValueMapper" <!-- [options]="availableReportTypes"-->
class="mr-16" <!-- [valueMapper]="reportTemplateValueMapper"-->
formControlName="reportTemplateIds" <!-- class="mr-16"-->
></redaction-select> <!-- formControlName="reportTemplateIds"-->
<!-- ></redaction-select>-->
<redaction-select <redaction-select
[label]=" [label]="
'download-type.label' 'download-type.label'

2
apps/red-ui/src/app/modules/shared/components/select/select.component.ts
View File

@ -62,6 +62,8 @@ export class SelectComponent implements AfterViewInit, ControlValueAccessor {
this._selectChips(value); this._selectChips(value);
} else if (value) { } else if (value) {
this._value = value; this._value = value;
} else {
this._value = [];
} }
} }

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

@ -1240,7 +1240,7 @@
"top-bar": { "top-bar": {
"navigation-items": { "navigation-items": {
"back": "Back", "back": "Back",
"dossiers": "Active Dossier", "dossiers": "Active Dossiers",
"my-account": { "my-account": {
"children": { "children": {
"admin": "Settings", "admin": "Settings",