Skip to main content
Homepage
Explore
Search or go to…
/
Register
Sign in
Explore
Primary navigation
Project
L
leximpact-socio-fiscal-ui
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Collapse sidebar
Snippets
Groups
Projects
Show more breadcrumbs
leximpact
Simulateur socio-fiscal
leximpact-socio-fiscal-ui
Commits
d382f893
Commit
d382f893
authored
4 months ago
by
cgl
Committed by
clallemand
4 months ago
Browse files
Options
Downloads
Patches
Plain Diff
corrige l'affichage de la retraite brute dans le résumé du cas type
parent
4d45a61c
No related branches found
No related tags found
No related merge requests found
Pipeline
#22015
passed
4 months ago
Status:
Stage: build
Changes
1
Pipelines
2
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/lib/components/impacts_view/test_cases_view/test_case_selected/TestCaseSummary.svelte
+53
-17
53 additions, 17 deletions
...test_cases_view/test_case_selected/TestCaseSummary.svelte
with
53 additions
and
17 deletions
src/lib/components/impacts_view/test_cases_view/test_case_selected/TestCaseSummary.svelte
+
53
−
17
View file @
d382f893
...
...
@@ -21,7 +21,7 @@
import
{
entityByKey
,
personEntityKey
}
from
"
$lib/entities
"
import
{
getParameter
,
rootParameter
}
from
"
$lib/parameters
"
import
publicConfig
from
"
$lib/public_config
"
import
{
billName
}
from
"
$lib/shared.svelte
"
import
{
billName
,
billActive
}
from
"
$lib/shared.svelte
"
import
{
getCalculatedVariableValueByCalculationName
,
getSituationVariableValue
,
...
...
@@ -757,11 +757,9 @@
"
primes_salaires
"
,
populationId
,
)
}
{
@
const
retraite_brute
=
getVariableValue
(
situation
,
"
retraite_brute
"
,
populationId
,
)
}
{
@
const
retraite_brute
=
billActive
?
getVariableValue
(
situation
,
"
retraite_de_base_n_1
"
,
populationId
)
:
getVariableValue
(
situation
,
"
retraite_de_base
"
,
populationId
)
}
{
@
const
salarie_regime_alsace_moselle
=
getVariableValue
(
situation
,
"
salarie_regime_alsace_moselle
"
,
...
...
@@ -951,14 +949,36 @@
{
:else
if
retraite_brute
}
<span>
{
euroAmountFormatter
(
getVariableNumberValue
(
billActive
?
(
getVariableNumberValue
(
situation
,
"
retraite_
brute
"
,
"
retraite_
de_base_n_1
"
,
populationId
,
)
??
0
,
)
??
0
)
+
(
getVariableNumberValue
(
situation
,
"
retraite_complementaire
"
,
populationId
,
)
??
0
)
:
(
getVariableNumberValue
(
situation
,
"
retraite_de_base
"
,
populationId
,
)
??
0
)
+
(
getVariableNumberValue
(
situation
,
"
retraite_complementaire
"
,
populationId
,
)
??
0
),
)
}
</span>
<span
class=
"text-xs"
>
de retraite brute/an
</span>
<span
class=
"text-xs"
>
{
#if
billActive
}
de retraite brute de l'année passée/an
{
:
else
}
de retraite brute/an
{
/if
}
</span>
<span
class=
"text-nowrap rounded-full px-2 py-0.5 text-base font-bold text-black"
class:text-sm=
{
mode
===
"
select
"
}
...
...
@@ -967,11 +987,27 @@
>
{
parseFloat
(
(
(
billActive
?
(
getVariableNumberValue
(
situation
,
"
retraite_de_base_n_1
"
,
populationId
,
)
??
0
)
+
(
getVariableNumberValue
(
situation
,
"
retraite_
brut
e
"
,
"
retraite_
complementair
e
"
,
populationId
,
)
??
0
)
/
)
??
0
)
:
(
getVariableNumberValue
(
situation
,
"
retraite_de_base
"
,
populationId
,
)
??
0
)
+
(
getVariableNumberValue
(
situation
,
"
retraite_complementaire
"
,
populationId
,
)
??
0
))
/
(
smicValue
.
value
*
12
)
).
toFixed
(
2
),
)
}
...
...
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment