Skip to content

Commit

Permalink
feat(income-plan): add year (#15847)
Browse files Browse the repository at this point in the history 
* set up payment plan template

* change application name to income plan

* add instructions page

* implement conclusion screen

* Change some texts after review

* feat(tr): income plan table (#15340)

* fix:add scopes

* fix: use type

* chore: add to codeowners

* fix: codewners

* WIP table

* feat: update client

* fix: handle 404

* fix: write applciation

* Seeder file for adding scopes to @island.is/clients/api

* chore: nx format:write update dirty files

* use application and active field for options in table repeater, populate categories and types in income plan with info from TR, add readonly for fields in table repeater

* get currencies from TR and populate dropdown, format input fields that display something regarding income, call withholding tax api from TR and implement some rules when adding income to the income plan

* WIP call withholdind income plan api from TR

* validation when adding income, wip tooltip on fields in table repeater, format number showed in income table

* mock withholding tax and populate table, add readonly to table fields, change tooltip for checkbox and format

* add review screen

---------

Co-authored-by: Þorkell Máni Þorkelsson <mani@hugsmidjan.is>
Co-authored-by: Þorkell Máni Þorkelsson <wowthorkell@gmail.com>
Co-authored-by: ori.jonab <Jon.Arnar.Briem@origo.is>
Co-authored-by: andes-it <builders@andes.is>

* remove fake form steppers and call latest income plan

* foreign income + populate table with latest income plan

* format

* add history logs and corresponding messages

* feat(income-plan): text changes (#15636)

* text changes

* format

* eligible and update after withholding tax and latest income plan outputs was changed

* [TS-839] Calculate income per year (#15682)

* update read me and add flow chart (#15669)

* feat(income-plan): make more application card texts editable  (#15754)

* text changes

* format

* make open application button texts editable

* format

* chore: nx format:write update dirty files

---------

Co-authored-by: andes-it <builders@andes.is>

* [TS-848] Jafnar tekjur á mánuði (#15733)

* [TS-849] uneven income (#15701)

* feat(income-plan): send income plan (#15777)

* WIP send income plan to TR

* send income plan

* remove

* update eligible

* default IKR

* ts-853 change bottom button link

* clean up

* feat(income-plan): Add unit tests (#15778)

* add unit tests for state transitions

* add unit tests for utils

* format

* chore: nx format:write update dirty files

---------

Co-authored-by: andes-it <builders@andes.is>

* [TS-847] start application at the first page when table has been filled (#15793)

* add review and complete state to income plan + feature flag

* validation was triggered

* remove mock data

* clean

* feat(income-plan): Temporary calculation table (#15642)

* set up temporary calculation page and data

* add print screen custom component and messages

* fix input and add to temporary calculation screen

* [TS-823] temporary calculation plan page

* Add validation to incomePlanTable - nonempty

* Fixed query input

* Added AlertMessage when no payments

* Update temporary calculation query input

* chore: nx format:write update dirty files

---------

Co-authored-by: ylfahfa <yhafsteinsdottir@deloitte.is>
Co-authored-by: karenbjorg <khalldorsdottir@deloitte.is>
Co-authored-by: andes-it <builders@andes.is>

* [TS-889] fix validation for currency (#15803)

* if selected employment income and register uneven income, changing to other type of income then months still showed

* foreign income per year where not validated

* chore: nx format:write update dirty files

* Update libs/application/templates/social-insurance-administration/income-plan/README.md

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update libs/application/templates/social-insurance-administration/income-plan/README.md

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update libs/application/templates/social-insurance-administration/income-plan/README.md

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update libs/application/templates/social-insurance-administration/income-plan/README.md

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Fixed typo in dataProviders externalDataId

* Memoize the rows array to improve performance

* Improve useEffect dependency array for better performance.

* Update libs/application/templates/social-insurance-administration/income-plan/README.md

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update libs/application/templates/social-insurance-administration/income-plan/README.md

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update libs/application/templates/social-insurance-administration/income-plan/README.md

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update libs/application/templates/social-insurance-administration/income-plan/README.md

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update libs/application/templates/social-insurance-administration/income-plan/README.md

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update libs/application/templates/social-insurance-administration/income-plan/README.md

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update libs/application/templates/social-insurance-administration/income-plan/README.md

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* use Int instead of Number for number decorator

* remove commented out code and nullable (#15812)

* feat(income-plan): income plan conditions (#15820)

* call income plan conditions api

* Add incomePlanConditions to getApplicationExternalData

* Add AlertMessage when no available prerequisites for temporary calculation

* change income year

* Update dataSchema

* Update sendApplication and temporary calculation query input

* Update unsetIncomePlan template action and added unit test

---------

Co-authored-by: karenbjorg <khalldorsdottir@deloitte.is>

* fix(table-repeater): move Item component and remove FC (#15830)

* move Item component and remove FC

* remove

* move Item component

* add variables to useEffect dependency array

* add the year for which TR is currently accepting income plans

* different description if applicant has accepted income plan

* simplify

---------

Co-authored-by: ylfahfa <yhafsteinsdottir@deloitte.is>
Co-authored-by: Þorkell Máni Þorkelsson <mani@hugsmidjan.is>
Co-authored-by: Þorkell Máni Þorkelsson <wowthorkell@gmail.com>
Co-authored-by: ori.jonab <Jon.Arnar.Briem@origo.is>
Co-authored-by: andes-it <builders@andes.is>
Co-authored-by: Ylfa <55542991+ylfahfa@users.noreply.github.com>
Co-authored-by: veronikasif <54938148+veronikasif@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: Veronika Sif <veronikasif@hotmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
  • Loading branch information
@karenbjorg @ylfahfa
@thorkellmani @jonarnarbriem @andes-it @veronikasif @coderabbitai @kodiakhq
11 people authored Sep 2, 2024
1 parent f7dc690 commit 47779ce
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 3 deletions.
24 changes: 22 additions & 2 deletions ...ication/templates/social-insurance-administration/income-plan/src/forms/IncomePlanForm.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,12 @@ import {
import Logo from '@island.is/application/templates/social-insurance-administration-core/assets/Logo'
import { socialInsuranceAdministrationMessage } from '@island.is/application/templates/social-insurance-administration-core/lib/messages'
import { getCurrencies } from '@island.is/application/templates/social-insurance-administration-core/lib/socialInsuranceAdministrationUtils'
import { DefaultEvents, Form, FormModes } from '@island.is/application/types'
import {
Application,
DefaultEvents,
Form,
FormModes,
} from '@island.is/application/types'
import { formatCurrencyWithoutSuffix } from '@island.is/application/ui-components'
import { buildFormConclusionSection } from '@island.is/application/ui-forms'
import isEmpty from 'lodash/isEmpty'
Expand Down Expand Up @@ -59,7 +64,22 @@ export const IncomePlanForm: Form = buildForm({
buildTableRepeaterField({
id: 'incomePlanTable',
title: incomePlanFormMessage.info.section,
description: incomePlanFormMessage.incomePlan.description,
description: (application: Application) => {
const { incomePlanConditions, latestIncomePlan } =
getApplicationExternalData(application.externalData)
const hasLatestIncomePlan = !isEmpty(latestIncomePlan)
const baseMessage = hasLatestIncomePlan
? incomePlanFormMessage.incomePlan
.currentIncomePlanDescription
: incomePlanFormMessage.incomePlan.description

return {
...baseMessage,
values: {
incomePlanYear: incomePlanConditions.incomePlanYear,
},
}
},
formTitle: incomePlanFormMessage.incomePlan.registerIncome,
addItemButtonText: incomePlanFormMessage.incomePlan.addIncome,
saveItemButtonText: incomePlanFormMessage.incomePlan.saveIncome,
Expand Down
8 changes: 7 additions & 1 deletion libs/application/templates/social-insurance-administration/income-plan/src/lib/messages.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,13 @@ export const incomePlanFormMessage: MessageDir = {
description: {
id: 'ip.application:income.plan.description',
defaultMessage:
'Hér er tillaga að tekjuáætlun. Upplýsingar um launatekjur eru fengnar úr staðgreiðsluskrá og fjármagnstekjur eru sóttar í nýjasta skattframtal. Þú getur breytt upphæðum, fjarlægt tekjur og/eða bætt við tekjum sem ekki er búið að setja inn. Tekjur á ári eru sýndar í þeim gjaldmiðli sem þær voru greiddar í.',
'Hér er tillaga að tekjuáætlun fyrir árið {incomePlanYear}. Upplýsingar um launatekjur eru fengnar úr staðgreiðsluskrá og fjármagnstekjur eru sóttar í nýjasta skattframtal. Þú getur breytt upphæðum, fjarlægt tekjur og/eða bætt við tekjum sem ekki er búið að setja inn. Tekjur á ári eru sýndar í þeim gjaldmiðli sem þær voru greiddar í.',
description: 'english translation',
},
currentIncomePlanDescription: {
id: 'ip.application:income.plan.current.income.plandescription',
defaultMessage:
'Hér fyrir neðan er sú tekjuáætlun sem nú er í gildi fyrir árið {incomePlanYear}. Hér getur þú breytt upphæðum, fjarlægt tekjur og/eða bætt við tekjum sem ekki er búið að setja inn.',
description: 'english translation',
},
registerIncome: {
Expand Down

0 comments on commit 47779ce

Please sign in to comment.