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

feature(Slutredovisning): Övrig information är nu frivillig (TV-952)

Browse Source 
Merge in TEA/mina-sidor-fa-web from feature/TV-952-Gör-att-Fritextrutan-Lägg-till-övrig-information-i-Slutredovisning-valfri-att-fylla-i- to develop

Squashed commit of the following:

commit 03fd1ec373be4f18f8f64bccd75eac72acda2f85
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Mon Dec 6 10:51:46 2021 +0100

    Övrig information är nu frivilligt. Gjorde också Rapport-korvarna lika långa. Ser bättre ut
This commit is contained in:
Daniel Appelgren
2021-12-07 09:14:04 +01:00
parent 4a0421a2ca
commit e940d5dbf5
5 changed files with 44 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/deltagare-tab-reports.component.html
View File

@@ -4,37 +4,67 @@
<ul class="deltagare-tab-reports__button-list">
<li>
<ui-link-button uiRouterLink="gemensam-planering" [uiType]="UiLinkButtonType.ROUNDED_PRIMARY" uiSize="s">
<ui-link-button
[uiFullWidth]="true"
uiRouterLink="gemensam-planering"
[uiType]="UiLinkButtonType.ROUNDED_PRIMARY"
uiSize="s"
>
Gemensam planering
</ui-link-button>
</li>
<li>
<ui-link-button uiRouterLink="franvarorapport" [uiType]="UiLinkButtonType.ROUNDED_PRIMARY" uiSize="s">
<ui-link-button
[uiFullWidth]="true"
uiRouterLink="franvarorapport"
[uiType]="UiLinkButtonType.ROUNDED_PRIMARY"
uiSize="s"
>
Avvikelserapport (frånvaro)
</ui-link-button>
</li>
<li>
<ui-link-button uiRouterLink="avvikelserapport" [uiType]="UiLinkButtonType.ROUNDED_PRIMARY" uiSize="s">
<ui-link-button
[uiFullWidth]="true"
uiRouterLink="avvikelserapport"
[uiType]="UiLinkButtonType.ROUNDED_PRIMARY"
uiSize="s"
>
Avvikelserapport (avvikelse)
</ui-link-button>
</li>
<li *ngIf="periodiskRedovisningButtonVisible">
<ui-link-button uiRouterLink="periodisk-redovisning" [uiType]="UiLinkButtonType.ROUNDED_PRIMARY" uiSize="s">
<ui-link-button
[uiFullWidth]="true"
uiRouterLink="periodisk-redovisning"
[uiType]="UiLinkButtonType.ROUNDED_PRIMARY"
uiSize="s"
>
Periodisk redovisning
</ui-link-button>
</li>
<li *ngIf="signalButtonVisible">
<ui-link-button uiRouterLink="signal" [uiType]="UiLinkButtonType.ROUNDED_PRIMARY" uiSize="s">
<ui-link-button [uiFullWidth]="true" uiRouterLink="signal" [uiType]="UiLinkButtonType.ROUNDED_PRIMARY" uiSize="s">
Signal om arbete eller studier
</ui-link-button>
</li>
<li *ngIf="informativRapportButtonVisible">
<ui-link-button uiRouterLink="informativ-rapport" [uiType]="UiLinkButtonType.ROUNDED_PRIMARY" uiSize="s">
<ui-link-button
[uiFullWidth]="true"
uiRouterLink="informativ-rapport"
[uiType]="UiLinkButtonType.ROUNDED_PRIMARY"
uiSize="s"
>
Informativ rapport
</ui-link-button>
</li>
<li *ngIf="slutredovisningButtonVisible">
<ui-link-button uiRouterLink="slutredovisning" [uiType]="UiLinkButtonType.ROUNDED_PRIMARY" uiSize="s">
<ui-link-button
[uiFullWidth]="true"
uiRouterLink="slutredovisning"
[uiType]="UiLinkButtonType.ROUNDED_PRIMARY"
uiSize="s"
>
Slutredovisning
</ui-link-button>
</li>

1
apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/deltagare-tab-reports.component.scss
View File

@@ -13,6 +13,7 @@
&__button-list {
@include msfa__reset-list;
width: 17rem;
display: flex;
flex-direction: column;
gap: var(--digi--layout--gutter);

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

@@ -34,7 +34,7 @@
[uiAnnounceIfOptional]="true"
[uiMaxLength]="2000"
[uiMinLength]="1"
[uiRequired]="true"
[uiRequired]="false"
[uiValidationMessage]="ovrigtFormControl.errors?.required"
[uiInvalid]="ovrigtFormControl?.touched && !!ovrigtFormControl?.errors?.required"
></ui-textarea>

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

@@ -56,7 +56,7 @@ export class SlutredovisningFormStep2Component implements OnInit {
if (!this.framstegFormControl) {
this.formGroup.addControl(this.framstegFormName, new FormControl(null, RequiredValidator()));
this.formGroup.addControl(this.nastaStegFormName, new FormControl(null, RequiredValidator()));
this.formGroup.addControl(this.ovrigtFormName, new FormControl(null, RequiredValidator()));
this.formGroup.addControl(this.ovrigtFormName, new FormControl(''));
}
}