arbetsformedlingen/mina-sidor-fa-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of ssh://bitbucket.arbetsformedlingen.se:7999/tea/mina-sidor-fa-web into develop

Browse Source
This commit is contained in:
Erik Tiekstra
2021-11-12 10:51:38 +01:00
parent 7d18a696c4 a08cf6ff42
commit d46bb24ee7
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/slutredovisning-form-step1/slutredovisning-form-step1.component.ts
View File

@@ -40,7 +40,7 @@ export class SlutredovisningFormStep1Component implements OnInit {
new FormGroup({ new FormGroup({
name: new FormControl(activity.name), name: new FormControl(activity.name),
id: new FormControl(activity.id), id: new FormControl(activity.id),
whatHasBeenDone: new FormControl('temp', RequiredValidator('Beskrivning är obligatorisk')), whatHasBeenDone: new FormControl(null, RequiredValidator('Beskrivning är obligatorisk')),
}) })
); );
this.changeDetectionRef.detectChanges(); this.changeDetectionRef.detectChanges();

2
libs/ui/src/radiobutton-group/radiobutton-group.component.ts
View File

@@ -9,7 +9,7 @@ import {
OnChanges, OnChanges,
Output, Output,
} from '@angular/core'; } from '@angular/core';
import { ControlValueAccessor, NgControl, NG_VALUE_ACCESSOR } from '@angular/forms'; import { ControlValueAccessor, NG_VALUE_ACCESSOR, NgControl } from '@angular/forms';
import { uuid } from '@utils/uuid.util'; import { uuid } from '@utils/uuid.util';
import { RadiobuttonGroupDirection } from './radiobutton-group-direction.enum'; import { RadiobuttonGroupDirection } from './radiobutton-group-direction.enum';
import { Radiobutton } from './radiobutton.model'; import { Radiobutton } from './radiobutton.model';