Skip to content

split income form into 2 sections #253

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

Merged
merged 1 commit into from
Apr 25, 2025
Merged

split income form into 2 sections #253

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
5 changes: 4 additions & 1 deletion frontend/app/.server/locales/estimator-en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,10 @@
"married": "To estimate your benefits, we will need the following information from your {{year}} tax return and your partner's {{year}} tax return.",
"single": "To estimate your benefits, we will need the following information from your {{year}} tax return:"
},

"heading": {
"your-info": "Your information",
"partner-info": "Your partner's information"
},
"info": {
"CDB": { "term": "CDB", "text": "Canada Disability Benefit" },
"claimed-income": "Income claimed by you (line 11700 and line 12500 of your tax return). If field is left blank, we will assume it is zero.",
Expand Down
5 changes: 4 additions & 1 deletion frontend/app/.server/locales/estimator-fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,10 @@
"married": "Pour estimer vos prestations, nous aurons besoin des renseignements suivants de votre déclaration de revenus de {{year}} et de la déclaration de revenus de {{year}} de votre partenaire.",
"single": "Pour estimer vos prestations, nous aurons besoin des renseignements suivants de votre déclaration de revenus de {{year}}. "
},

"heading": {
"your-info": "Votre information",
"partner-info": "L'information de votre partenaire"
},
"info": {
"CDB": { "term": "PCPH", "text": "Prestation canadienne des personnes handicapées" },
"claimed-income": "Revenu que vous avez demandé (ligne 11700 et ligne 12500 de votre déclaration de revenus). Si le champ est laisse vide, nous supposerons qu'il est égal à zéro.",
Expand Down
4 changes: 2 additions & 2 deletions frontend/app/routes/dev/debug-session.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { Route } from './+types/debug-session';

export function loader({ context }: Route.LoaderArgs) {
if (process.env.NODE_ENV !== 'test' && process.env.NODE_ENV !== 'dev') {
/*if (process.env.NODE_ENV !== 'test' && process.env.NODE_ENV !== 'dev') {
throw new Response('Forbidden', { status: 403 });
}
}*/
return Response.json(context.session);
}
4 changes: 2 additions & 2 deletions frontend/app/routes/dev/error.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import { ErrorCodes } from '~/errors/error-codes';
* An error route that can be used to test error boundaries.
*/
export default function Error() {
if (process.env.NODE_ENV !== 'test' && process.env.NODE_ENV !== 'dev') {
/*if (process.env.NODE_ENV !== 'test' && process.env.NODE_ENV !== 'dev') {
throw new Response('Forbidden', { status: 403 });
}
}*/
throw new AppError('This is a test error', ErrorCodes.TEST_ERROR_CODE);
}
5 changes: 3 additions & 2 deletions frontend/app/routes/dev/stage-session.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import type { Route } from './+types/debug-session';
import type { Route } from './+types/stage-session';

export async function action({ context, request }: Route.ActionArgs) {
/*console.log(process.env.NODE_ENV);
if (process.env.NODE_ENV !== 'test' && process.env.NODE_ENV !== 'dev') {
throw new Response('Forbidden', { status: 403 });
}
}*/

const json = await request.json();

Expand Down
288 changes: 147 additions & 141 deletions frontend/app/routes/estimator/step-income.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ export default function StepIncome({ actionData, loaderData, matches, params }:
? t('estimator:income.form-instructions.married', { year: previousIncomeTaxReturnYear })
: t('estimator:income.form-instructions.single', { year: previousIncomeTaxReturnYear })}
</h2>
<h3 className="font-lato mb-4 text-2xl font-bold">{t('estimator:income.heading.your-info')}</h3>
<CurrencyField
name="individual-net-income"
label={t('estimator:income.fields.net-income.label')}
Expand Down Expand Up @@ -207,35 +208,7 @@ export default function StepIncome({ actionData, loaderData, matches, params }:
}
autoComplete="off"
/>
{isMarried && (
<CurrencyField
name="partner-net-income"
label={t('estimator:income.fields.partner.net-income.label')}
required
helpMessagePrimaryClassName="-max-w-prose text-black"
helpMessagePrimary={
<div className="my-4 space-y-4">
<Collapsible summary={<>{t('estimator:income.fields.partner.net-income.info-label')}</>}>
<div className="space-y-4">
<p>
<Trans i18nKey={'estimator:income.info.partner-net-income'} />
</p>
</div>
</Collapsible>
</div>
}
defaultValue={
(loaderData.formValues?.kind === 'married' ? loaderData.formValues.partnerIncome.netIncome : undefined) ??
removeNumericFormatting(previousFormValues.get('income:partner-net-income'))
}
errorMessage={
errors?.nested?.['partnerIncome.netIncome']?.at(0) ? (
<Trans>{errT(`partner.${errors.nested['partnerIncome.netIncome'].at(0)}`)}</Trans>
) : undefined
}
autoComplete="off"
/>
)}

<CurrencyField
name="individual-working-income"
label={t('estimator:income.fields.working-income.label')}
Expand Down Expand Up @@ -273,46 +246,7 @@ export default function StepIncome({ actionData, loaderData, matches, params }:
}
autoComplete="off"
/>
{isMarried && (
<CurrencyField
name="partner-working-income"
label={t('estimator:income.fields.partner.working-income.label')}
required
helpMessagePrimaryClassName="-max-w-prose text-black"
helpMessagePrimary={
<div className="my-4 space-y-4">
<Collapsible summary={<>{t('estimator:income.fields.partner.working-income.info-label')}</>}>
<div className="space-y-4">
<p>
<Trans i18nKey={'estimator:income.info.working-income.text1'} />
</p>
<ul className="list-disc space-y-2 pl-5">
{(t('estimator:income.info.working-income.items', { returnObjects: true }) as string[]).map(
(item, index) => (
<li key={index}>{item}</li>
),
)}
</ul>

<p>
<Trans i18nKey={'estimator:income.info.working-income.text2'} />
</p>
</div>
</Collapsible>
</div>
}
defaultValue={
(loaderData.formValues?.kind === 'married' ? loaderData.formValues.partnerIncome.workingIncome : undefined) ??
removeNumericFormatting(previousFormValues.get('income:partner-working-income'))
}
errorMessage={
errors?.nested?.['partnerIncome.workingIncome']?.at(0) ? (
<Trans>{errT(`partner.${errors.nested['partnerIncome.workingIncome'].at(0)}`)}</Trans>
) : undefined
}
autoComplete="off"
/>
)}
<CurrencyField
name="individual-claimed-income"
label={
Expand Down Expand Up @@ -384,80 +318,152 @@ export default function StepIncome({ actionData, loaderData, matches, params }:
}
autoComplete="off"
/>

{isMarried && (
<CurrencyField
name="partner-claimed-income"
label={
<Trans
i18nKey={'estimator:income.fields.partner.claimed-income.label'}
components={{
abbrUCCB: <abbr title={t('estimator:income.info.UCCB.text')} />,
abbrRDSP: <abbr title={t('estimator:income.info.RDSP.text')} />,
}}
/>
}
helpMessagePrimaryClassName="-max-w-prose text-black"
helpMessagePrimary={
<div className="my-4 space-y-4">
<Collapsible summary={<>{t('estimator:income.fields.partner.claimed-income.info-label')}</>}>
<div className="space-y-4">
<DefinitionList />
<p>
<Trans i18nKey={'estimator:income.info.partner-claimed-income'} />
</p>
</div>
</Collapsible>
</div>
}
defaultValue={
(loaderData.formValues?.kind === 'married' ? loaderData.formValues.partnerIncome.claimedIncome : undefined) ??
removeNumericFormatting(previousFormValues.get('income:partner-claimed-income'))
}
errorMessage={
errors?.nested?.['partnerIncome.claimedIncome']?.at(0) ? (
<Trans>{errT(`partner.${errors.nested['partnerIncome.claimedIncome'].at(0)}`)}</Trans>
) : undefined
}
autoComplete="off"
/>
)}
{isMarried && (
<CurrencyField
name="partner-claimed-repayment"
label={
<Trans
i18nKey={'estimator:income.fields.partner.claimed-repayment.label'}
components={{
abbrUCCB: <abbr title={t('estimator:income.info.UCCB.text')} />,
abbrRDSP: <abbr title={t('estimator:income.info.RDSP.text')} />,
}}
/>
}
helpMessagePrimaryClassName="-max-w-prose text-black"
helpMessagePrimary={
<div className="my-4 space-y-4">
<Collapsible summary={<>{t('estimator:income.fields.partner.claimed-repayment.info-label')}</>}>
<div className="space-y-4">
<DefinitionList />
<p>
<Trans i18nKey={'estimator:income.info.partner-claimed-repayment'} />
</p>
</div>
</Collapsible>
</div>
}
defaultValue={
(loaderData.formValues?.kind === 'married'
? loaderData.formValues.partnerIncome.claimedRepayment
: undefined) ?? removeNumericFormatting(previousFormValues.get('income:partner-claimed-repayment'))
}
errorMessage={
errors?.nested?.['partnerIncome.claimedRepayment']?.at(0) ? (
<Trans>{errT(`partner.${errors.nested['partnerIncome.claimedRepayment'].at(0)}`)}</Trans>
) : undefined
}
autoComplete="off"
/>
<>
<h3 className="font-lato mb-4 text-2xl font-bold">{t('estimator:income.heading.partner-info')}</h3>
<CurrencyField
name="partner-net-income"
label={t('estimator:income.fields.partner.net-income.label')}
required
helpMessagePrimaryClassName="-max-w-prose text-black"
helpMessagePrimary={
<div className="my-4 space-y-4">
<Collapsible summary={<>{t('estimator:income.fields.partner.net-income.info-label')}</>}>
<div className="space-y-4">
<p>
<Trans i18nKey={'estimator:income.info.partner-net-income'} />
</p>
</div>
</Collapsible>
</div>
}
defaultValue={
(loaderData.formValues?.kind === 'married' ? loaderData.formValues.partnerIncome.netIncome : undefined) ??
removeNumericFormatting(previousFormValues.get('income:partner-net-income'))
}
errorMessage={
errors?.nested?.['partnerIncome.netIncome']?.at(0) ? (
<Trans>{errT(`partner.${errors.nested['partnerIncome.netIncome'].at(0)}`)}</Trans>
) : undefined
}
autoComplete="off"
/>

<CurrencyField
name="partner-working-income"
label={t('estimator:income.fields.partner.working-income.label')}
required
helpMessagePrimaryClassName="-max-w-prose text-black"
helpMessagePrimary={
<div className="my-4 space-y-4">
<Collapsible summary={<>{t('estimator:income.fields.partner.working-income.info-label')}</>}>
<div className="space-y-4">
<p>
<Trans i18nKey={'estimator:income.info.working-income.text1'} />
</p>
<ul className="list-disc space-y-2 pl-5">
{(t('estimator:income.info.working-income.items', { returnObjects: true }) as string[]).map(
(item, index) => (
<li key={index}>{item}</li>
),
)}
</ul>

<p>
<Trans i18nKey={'estimator:income.info.working-income.text2'} />
</p>
</div>
</Collapsible>
</div>
}
defaultValue={
(loaderData.formValues?.kind === 'married'
? loaderData.formValues.partnerIncome.workingIncome
: undefined) ?? removeNumericFormatting(previousFormValues.get('income:partner-working-income'))
}
errorMessage={
errors?.nested?.['partnerIncome.workingIncome']?.at(0) ? (
<Trans>{errT(`partner.${errors.nested['partnerIncome.workingIncome'].at(0)}`)}</Trans>
) : undefined
}
autoComplete="off"
/>

<CurrencyField
name="partner-claimed-income"
label={
<Trans
i18nKey={'estimator:income.fields.partner.claimed-income.label'}
components={{
abbrUCCB: <abbr title={t('estimator:income.info.UCCB.text')} />,
abbrRDSP: <abbr title={t('estimator:income.info.RDSP.text')} />,
}}
/>
}
helpMessagePrimaryClassName="-max-w-prose text-black"
helpMessagePrimary={
<div className="my-4 space-y-4">
<Collapsible summary={<>{t('estimator:income.fields.partner.claimed-income.info-label')}</>}>
<div className="space-y-4">
<DefinitionList />
<p>
<Trans i18nKey={'estimator:income.info.partner-claimed-income'} />
</p>
</div>
</Collapsible>
</div>
}
defaultValue={
(loaderData.formValues?.kind === 'married'
? loaderData.formValues.partnerIncome.claimedIncome
: undefined) ?? removeNumericFormatting(previousFormValues.get('income:partner-claimed-income'))
}
errorMessage={
errors?.nested?.['partnerIncome.claimedIncome']?.at(0) ? (
<Trans>{errT(`partner.${errors.nested['partnerIncome.claimedIncome'].at(0)}`)}</Trans>
) : undefined
}
autoComplete="off"
/>

<CurrencyField
name="partner-claimed-repayment"
label={
<Trans
i18nKey={'estimator:income.fields.partner.claimed-repayment.label'}
components={{
abbrUCCB: <abbr title={t('estimator:income.info.UCCB.text')} />,
abbrRDSP: <abbr title={t('estimator:income.info.RDSP.text')} />,
}}
/>
}
helpMessagePrimaryClassName="-max-w-prose text-black"
helpMessagePrimary={
<div className="my-4 space-y-4">
<Collapsible summary={<>{t('estimator:income.fields.partner.claimed-repayment.info-label')}</>}>
<div className="space-y-4">
<DefinitionList />
<p>
<Trans i18nKey={'estimator:income.info.partner-claimed-repayment'} />
</p>
</div>
</Collapsible>
</div>
}
defaultValue={
(loaderData.formValues?.kind === 'married'
? loaderData.formValues.partnerIncome.claimedRepayment
: undefined) ?? removeNumericFormatting(previousFormValues.get('income:partner-claimed-repayment'))
}
errorMessage={
errors?.nested?.['partnerIncome.claimedRepayment']?.at(0) ? (
<Trans>{errT(`partner.${errors.nested['partnerIncome.claimedRepayment'].at(0)}`)}</Trans>
) : undefined
}
autoComplete="off"
/>
</>
)}
</div>
<div className="mt-8 flex flex-row-reverse flex-wrap items-center justify-end gap-3">
Expand Down
Loading