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

fix byte av leverantör

Browse Source
This commit is contained in:
Daniel Appelgren
2021-11-12 14:14:50 +01:00
parent dbb879f47d
commit 71e145f082
7 changed files with 62 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/models/slutredovisning-form-data.model.ts
View File

@@ -52,10 +52,15 @@ export interface SlutredovisningFormDataMainOccupationStillUnemployed {
stillUnemployed: SlutredovisningFormDataMainOccupationStillUnemployedDetails; stillUnemployed: SlutredovisningFormDataMainOccupationStillUnemployedDetails;
} }
export interface SlutredovisningFormDataMainOccupationChangeVendor {
type: MainOccupation.ByteTillNyLeverantorIRustaOchMatcha;
}
export type SlutredovisningFormDataMainOccupationDetails = export type SlutredovisningFormDataMainOccupationDetails =
| SlutredovisningFormDataMainOccupationWork | SlutredovisningFormDataMainOccupationWork
| SlutredovisningFormDataMainOccupationEducation | SlutredovisningFormDataMainOccupationEducation
| SlutredovisningFormDataMainOccupationOther | SlutredovisningFormDataMainOccupationOther
| SlutredovisningFormDataMainOccupationChangeVendor
| SlutredovisningFormDataMainOccupationStillUnemployed; | SlutredovisningFormDataMainOccupationStillUnemployed;
export interface SlutredovisningFormData { export interface SlutredovisningFormData {

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

@@ -37,16 +37,4 @@
</footer> </footer>
</ng-template> </ng-template>
</div> </div>
<!--<ui-loader *ngIf="submitIsLoading$ | async" uiType="absolute"></ui-loader>--> <pre>{{slutredovisning$|async|json}}</pre>
<!--<msfa-report-description-list [avrop]="avrop">-->
<!-- <dt>Orsak till slutredovisning:</dt>-->
<!-- <dd>bbbb</dd>-->
<!--</msfa-report-description-list>-->
<!--<digi-notification-alert-->
<!-- *ngIf="submitError$ | async as error"-->
<!-- af-variation="danger"-->
<!-- af-heading="Någonting gick fel"-->
<!--&gt;-->
<!-- <p>Kunde inte spara slutredovisning. Ladda om sidan och försök igen.</p>-->
<!-- <p *ngIf="error.message" class="msfa__small-text">{{error.message}}</p>-->
<!--</digi-notification-alert>-->

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

@@ -24,10 +24,10 @@ export class SlutredovisningFormStep3Component {
submittedDate$ = new BehaviorSubject<Date | null>(null); submittedDate$ = new BehaviorSubject<Date | null>(null);
slutredovisning$ = this.slutredovisningFormService.yrkeToTextMap$.pipe( slutredovisning$ = this.slutredovisningFormService.yrkeToTextMap$.pipe(
map(yrkeToText => this._appendYrkeNames(this.slutredovisningFormData, yrkeToText)) map(yrkeToText => this._formDataToSlutredovisning(this.slutredovisningFormData, yrkeToText))
); );
private _appendYrkeNames( private _formDataToSlutredovisning(
slutredovisningFormData: SlutredovisningFormData, slutredovisningFormData: SlutredovisningFormData,
yrkeToText: { [key: string]: string } yrkeToText: { [key: string]: string }
): Slutredovisning { ): Slutredovisning {

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

@@ -51,40 +51,43 @@
</ng-template> </ng-template>
</div> </div>
<!-- <h2>Step 0 valueChanges:</h2>--> <h2>Step 0 valueChanges:</h2>
<!-- <pre>--> <pre>
<!-- {{ step0FormGroup.valueChanges | async | json}}--> {{ step0FormGroup.valueChanges | async | json}}
<!-- </pre>--> </pre
<!-- <h2>Step 1 valueChanges:</h2>--> >
<!-- <pre>--> <h2>Step 1 valueChanges:</h2>
<!-- {{ step1FormGroup.valueChanges | async | json}}--> <pre>
<!-- </pre>--> {{ step1FormGroup.valueChanges | async | json}}
<!-- <h2>Step 2 valueChanges:</h2>--> </pre
<!-- <pre>--> >
<!-- {{ step2FormGroup.valueChanges | async | json}}--> <h2>Step 2 valueChanges:</h2>
<!-- </pre>--> <pre>
{{ step2FormGroup.valueChanges | async | json}}
</pre
>
<!-- <h2>Step 0 data:</h2>--> <h2>Step 0 data:</h2>
<!-- <pre>--> <pre>
<!-- {{step0FormData$ | async | json}}--> {{step0FormData$ | async | json}}
<!-- </pre--> </pre
<!-- >--> >
<!-- <h2>Step 1 data:</h2>--> <h2>Step 1 data:</h2>
<!-- <pre>--> <pre>
<!-- {{step1FormData$ | async | json}}--> {{step1FormData$ | async | json}}
<!-- </pre--> </pre
<!-- >--> >
<!-- <h2>Step 2 data:</h2>--> <h2>Step 2 data:</h2>
<!-- <pre>--> <pre>
<!-- {{step2FormData$ | async | json}}--> {{step2FormData$ | async | json}}
<!-- </pre--> </pre
<!-- >--> >
<!-- <h2>requestData$ data:</h2>--> <h2>slutredovisningFormData$ data:</h2>
<!-- <pre>--> <pre>
<!-- {{slutredovisning$ | async | json}}--> {{slutredovisningFormData$ | async | json}}
<!-- </pre--> </pre
<!-- >--> >
</msfa-report-layout> </msfa-report-layout>
</msfa-layout> </msfa-layout>
<ng-template #skeletonRef> <ng-template #skeletonRef>

16
apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/report-forms/slutredovisning-form/utils/form-data-to-slutredovisning.util.ts
View File

@@ -1,14 +1,14 @@
import { import { SlutredovisningRequest } from '@msfa-models/api/slutredovisning.request.model';
SlutredovisningRequest,
SlutredovisningRequestMainOccupationDetails,
} from '@msfa-models/api/slutredovisning.request.model';
import { import {
Anstallningsform, Anstallningsform,
MainOccupation, MainOccupation,
Omfattning, Omfattning,
StillUnemployedReason, StillUnemployedReason,
} from '@msfa-models/slutredovisning.model'; } from '@msfa-models/slutredovisning.model';
import { SlutredovisningFormData } from '../models/slutredovisning-form-data.model'; import {
SlutredovisningFormData,
SlutredovisningFormDataMainOccupationDetails,
} from '../models/slutredovisning-form-data.model';
import { SlutredovisningStep0FormData } from '../slutredovisning-form-step0/slutredovisning-form-step0.component'; import { SlutredovisningStep0FormData } from '../slutredovisning-form-step0/slutredovisning-form-step0.component';
import { SlutredovisningStep1FormData } from '../slutredovisning-form-step1/slutredovisning-form-step1.component'; import { SlutredovisningStep1FormData } from '../slutredovisning-form-step1/slutredovisning-form-step1.component';
import { SlutredovisningStep2FormData } from '../slutredovisning-form-step2/slutredovisning-form-step2.component'; import { SlutredovisningStep2FormData } from '../slutredovisning-form-step2/slutredovisning-form-step2.component';
@@ -23,7 +23,7 @@ export function formsToSlutredovisningFormData(
return; return;
} }
let mainOccupation: SlutredovisningRequestMainOccupationDetails; let mainOccupation: SlutredovisningFormDataMainOccupationDetails;
if (step0FormData.mainOccupation === MainOccupation.Other) { if (step0FormData.mainOccupation === MainOccupation.Other) {
mainOccupation = { mainOccupation = {
type: MainOccupation.Other, type: MainOccupation.Other,
@@ -73,6 +73,10 @@ export function formsToSlutredovisningFormData(
}; };
} }
if (step0FormData.mainOccupation === MainOccupation.ByteTillNyLeverantorIRustaOchMatcha) {
mainOccupation = { type: MainOccupation.ByteTillNyLeverantorIRustaOchMatcha };
}
return { return {
genomforandereferens: genomforandereferens, genomforandereferens: genomforandereferens,
mainOccupation: mainOccupation, mainOccupation: mainOccupation,

6
apps/mina-sidor-fa/src/app/shared/models/api/slutredovisning.request.model.ts
View File

@@ -51,12 +51,16 @@ export interface SlutredovisningRequestMainOccupationStillUnemployed {
type: MainOccupation.StillUnemployed; type: MainOccupation.StillUnemployed;
stillUnemployed: SlutredovisningRequestMainOccupationStillUnemployedDetails; stillUnemployed: SlutredovisningRequestMainOccupationStillUnemployedDetails;
} }
export interface SlutredovisningRequestMainOccupationChangeVendor {
type: MainOccupation.ByteTillNyLeverantorIRustaOchMatcha;
}
export type SlutredovisningRequestMainOccupationDetails = export type SlutredovisningRequestMainOccupationDetails =
| SlutredovisningRequestMainOccupationWork | SlutredovisningRequestMainOccupationWork
| SlutredovisningRequestMainOccupationEducation | SlutredovisningRequestMainOccupationEducation
| SlutredovisningRequestMainOccupationOther | SlutredovisningRequestMainOccupationOther
| SlutredovisningRequestMainOccupationStillUnemployed; | SlutredovisningRequestMainOccupationStillUnemployed
| SlutredovisningRequestMainOccupationChangeVendor;
export interface SlutredovisningRequest { export interface SlutredovisningRequest {
genomforandereferens: number; genomforandereferens: number;

4
apps/mina-sidor-fa/src/app/shared/models/api/slutredovisning.response.model.ts
View File

@@ -53,11 +53,15 @@ export interface SlutredovisningResponseMainOccupationStillUnemployed {
type: MainOccupation.StillUnemployed; type: MainOccupation.StillUnemployed;
stillUnemployed: SlutredovisningResponseMainOccupationStillUnemployedDetails; stillUnemployed: SlutredovisningResponseMainOccupationStillUnemployedDetails;
} }
export interface SlutredovisningResponseMainOccupationChangeVendor {
type: MainOccupation.ByteTillNyLeverantorIRustaOchMatcha;
}
export type SlutredovisningResponseMainOccupationDetails = export type SlutredovisningResponseMainOccupationDetails =
| SlutredovisningResponseMainOccupationWork | SlutredovisningResponseMainOccupationWork
| SlutredovisningResponseMainOccupationEducation | SlutredovisningResponseMainOccupationEducation
| SlutredovisningResponseMainOccupationOther | SlutredovisningResponseMainOccupationOther
| SlutredovisningResponseMainOccupationChangeVendor
| SlutredovisningResponseMainOccupationStillUnemployed; | SlutredovisningResponseMainOccupationStillUnemployed;
export interface SlutredovisningResponse { export interface SlutredovisningResponse {