Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lisätään esiopetuksen tuen päätökselle vastuuvapauslauseke #6206

Merged
merged 1 commit into from
Jan 7, 2025
Merged

Lisätään esiopetuksen tuen päätökselle vastuuvapauslauseke #6206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ...ts/child-information/assistance-need/decision/AssistanceNeedPreschoolDecisionEditPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -833,7 +833,11 @@ const DecisionEditor = React.memo(function DecisionEditor({
</P>
)}
<H3 noMargin>{t.jurisdiction}</H3>
<P noMargin>{t.jurisdictionText}</P>
{typeof t.jurisdictionText === 'string' ? (
<P noMargin>{t.jurisdictionText}</P>
) : (
t.jurisdictionText
)}
</SectionSpacer>

<SectionSpacer>
Expand Down
15 changes: 13 additions & 2 deletions ...d/src/lib-components/assistance-need-decision/AssistanceNeedPreschoolDecisionReadOnly.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,8 @@ interface ViewTranslations {
legalInstructionsText: string
legalInstructionsTextExtendedCompulsoryEducation: string
jurisdiction: string
jurisdictionText: string
jurisdictionText: string | React.ReactNode
disclaimer: string | null
appealInstructionsTitle: string
appealInstructions: React.JSX.Element
}
Expand Down Expand Up @@ -346,7 +347,11 @@ export default React.memo(function DecisionFormReadView({
</P>
)}
<H3 noMargin>{t.jurisdiction}</H3>
<P noMargin>{t.jurisdictionText}</P>
{typeof t.jurisdictionText === 'string' ? (
<P noMargin>{t.jurisdictionText}</P>
) : (
t.jurisdictionText
)}
</SectionSpacer>

<SectionSpacer>
Expand Down Expand Up @@ -381,6 +386,12 @@ export default React.memo(function DecisionFormReadView({
</span>
</LabeledValue>
</SectionSpacer>

{t.disclaimer !== null && (
<SectionSpacer>
<P noMargin>{t.disclaimer}</P>
</SectionSpacer>
)}
</FixedSpaceColumn>
</ContentArea>

Expand Down
5 changes: 4 additions & 1 deletion frontend/src/lib-customizations/defaults/citizen/i18n/fi.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1676,7 +1676,10 @@ export default {
'Oppivelvollisuulaki 2 §',
jurisdiction: 'Toimivalta',
jurisdictionText:
'Delegointipäätös suomenkielisen varhaiskasvatuksen sekä kasvun ja oppimisen toimialan esikunnan viranhaltijoiden ratkaisuvallasta A osa 3 § 1 kohta',
'Delegointipäätös suomenkielisen varhaiskasvatuksen sekä kasvun ja oppimisen toimialan esikunnan viranhaltijoiden ratkaisuvallasta A osa 3 § 1 kohta' as
| string
| React.ReactNode,
disclaimer: null as string | null,
appealInstructionsTitle: 'Oikaisuvaatimusohje',
appealInstructions: (
<>
Expand Down
1 change: 1 addition & 0 deletions frontend/src/lib-customizations/defaults/citizen/i18n/sv.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1676,6 +1676,7 @@ const sv: Translations = {
jurisdiction: 'Befogenhet',
jurisdictionText:
'Delegointipäätös suomenkielisen varhaiskasvatuksen sekä kasvun ja oppimisen toimialan esikunnan viranhaltijoiden ratkaisuvallasta A osa 3 § 1 kohta',
disclaimer: null,
appealInstructionsTitle: 'Anvisning om begäran om omprövning',
appealInstructions: (
<>
Expand Down
5 changes: 4 additions & 1 deletion frontend/src/lib-customizations/defaults/employee/i18n/fi.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1000,7 +1000,10 @@ export const fi = {
'Oppivelvollisuulaki 2 §',
jurisdiction: 'Toimivalta',
jurisdictionText:
'Delegointipäätös suomenkielisen varhaiskasvatuksen sekä kasvun ja oppimisen toimialan esikunnan viranhaltijoiden ratkaisuvallasta A osa 3 § 1 kohta',
'Delegointipäätös suomenkielisen varhaiskasvatuksen sekä kasvun ja oppimisen toimialan esikunnan viranhaltijoiden ratkaisuvallasta A osa 3 § 1 kohta' as
| string
| React.ReactNode,
disclaimer: null as string | null,
appealInstructionsTitle: 'Oikaisuvaatimusohje',
appealInstructions: (
<>
Expand Down
Loading