feature(Slutredovisning): Övrig information är nu frivillig (TV-952)
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:
@@ -4,37 +4,67 @@
|
|||||||
|
|
||||||
<ul class="deltagare-tab-reports__button-list">
|
<ul class="deltagare-tab-reports__button-list">
|
||||||
<li>
|
<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
|
Gemensam planering
|
||||||
</ui-link-button>
|
</ui-link-button>
|
||||||
</li>
|
</li>
|
||||||
<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)
|
Avvikelserapport (frånvaro)
|
||||||
</ui-link-button>
|
</ui-link-button>
|
||||||
</li>
|
</li>
|
||||||
<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)
|
Avvikelserapport (avvikelse)
|
||||||
</ui-link-button>
|
</ui-link-button>
|
||||||
</li>
|
</li>
|
||||||
<li *ngIf="periodiskRedovisningButtonVisible">
|
<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
|
Periodisk redovisning
|
||||||
</ui-link-button>
|
</ui-link-button>
|
||||||
</li>
|
</li>
|
||||||
<li *ngIf="signalButtonVisible">
|
<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
|
Signal om arbete eller studier
|
||||||
</ui-link-button>
|
</ui-link-button>
|
||||||
</li>
|
</li>
|
||||||
<li *ngIf="informativRapportButtonVisible">
|
<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
|
Informativ rapport
|
||||||
</ui-link-button>
|
</ui-link-button>
|
||||||
</li>
|
</li>
|
||||||
<li *ngIf="slutredovisningButtonVisible">
|
<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
|
Slutredovisning
|
||||||
</ui-link-button>
|
</ui-link-button>
|
||||||
</li>
|
</li>
|
||||||
|
|||||||
@@ -13,6 +13,7 @@
|
|||||||
|
|
||||||
&__button-list {
|
&__button-list {
|
||||||
@include msfa__reset-list;
|
@include msfa__reset-list;
|
||||||
|
width: 17rem;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
gap: var(--digi--layout--gutter);
|
gap: var(--digi--layout--gutter);
|
||||||
|
|||||||
@@ -34,7 +34,7 @@
|
|||||||
[uiAnnounceIfOptional]="true"
|
[uiAnnounceIfOptional]="true"
|
||||||
[uiMaxLength]="2000"
|
[uiMaxLength]="2000"
|
||||||
[uiMinLength]="1"
|
[uiMinLength]="1"
|
||||||
[uiRequired]="true"
|
[uiRequired]="false"
|
||||||
[uiValidationMessage]="ovrigtFormControl.errors?.required"
|
[uiValidationMessage]="ovrigtFormControl.errors?.required"
|
||||||
[uiInvalid]="ovrigtFormControl?.touched && !!ovrigtFormControl?.errors?.required"
|
[uiInvalid]="ovrigtFormControl?.touched && !!ovrigtFormControl?.errors?.required"
|
||||||
></ui-textarea>
|
></ui-textarea>
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ export class SlutredovisningFormStep2Component implements OnInit {
|
|||||||
if (!this.framstegFormControl) {
|
if (!this.framstegFormControl) {
|
||||||
this.formGroup.addControl(this.framstegFormName, new FormControl(null, RequiredValidator()));
|
this.formGroup.addControl(this.framstegFormName, new FormControl(null, RequiredValidator()));
|
||||||
this.formGroup.addControl(this.nastaStegFormName, 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(''));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,8 @@
|
|||||||
|
|
||||||
&--full-width {
|
&--full-width {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.ui-link-rounded-button {
|
.ui-link-rounded-button {
|
||||||
@@ -12,5 +14,7 @@
|
|||||||
|
|
||||||
&--full-width {
|
&--full-width {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user