Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
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
?
Snippets
Groups
Projects
Show more breadcrumbs
leximpact
Simulateur socio-fiscal
leximpact-socio-fiscal-ui
Commits
f00e2bf2
Commit
f00e2bf2
authored
May 19, 2022
by
Dorine Lambinet
Browse files
Options
Downloads
Patches
Plain Diff
Place le RSA à côté des pictos visages qui constituent la famille
parent
1fe5392f
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!87
Resolve "Faire apparaître les revenus du capital et de rente et RSA dans les étiquettes cas types"
Pipeline
#3897
passed
May 19, 2022
Stage: build
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/lib/components/test_cases/TestCaseSummary.svelte
+28
-28
28 additions, 28 deletions
src/lib/components/test_cases/TestCaseSummary.svelte
with
28 additions
and
28 deletions
src/lib/components/test_cases/TestCaseSummary.svelte
+
28
−
28
View file @
f00e2bf2
...
...
@@ -275,8 +275,8 @@
{
/if
}
</div>
<div
class=
"flex items-start justify-between space-x-6"
>
<!--
<h1 class="font-bold text-gray-600 truncate">{situation.title}</h1>
-->
<div
class=
"flex items-en
d
"
>
<!--
État des lieux de la famille
-->
<div
class=
"flex items-
c
en
ter
"
>
<!-- Territoire -->
<!-- <div class="flex">
<PictoArbreMetropole />
...
...
@@ -337,6 +337,26 @@
</div>
{
/if
}
{
/each
}
<!-- Tag liés à la famille -->
<div>
<!--Affiche le RSA-->
{
#each
Object
.
keys
(
familySituation
).
sort
(
(
populationId1
,
populationId2
)
=>
populationId1
.
localeCompare
(
populationId2
),
)
as
populationId
}
{
@
const
rsa
=
getCalculatedVariableNumberValue
(
situation
,
valuesByCalculationNameByVariableName
,
"
rsa
"
,
populationId
,
)
??
0
}
{
#if
rsa
!==
0
}
<abbr
class=
"m-1 rounded-2xl bg-violet-200 py-1 px-2 text-sm text-gray-800 shadow-sm"
title=
"Ce cas type touche le revenu de solidarité active"
>
RSA
</abbr
>
{
/if
}
{
/each
}
</div>
</div>
{
#if
mode
===
"
view
"
}
...
...
@@ -421,13 +441,12 @@
</div>
{
/if
}
<div
class=
"flex gap-2"
>
<div
class=
"text-lg font-bold"
>
{
generateActivityLabel
(
situation
,
populationId
)
}
</div>
<div
class=
""
>
<span
class=
"mr-1 text-lg font-bold"
>
{
generateActivityLabel
(
situation
,
populationId
)
}
</span
>
<!-- Tags -->
<
div
>
<
span
>
{
#if
contrat_de_travail_type
===
"
cdd
"
}
<abbr
class=
"my-1 rounded-2xl bg-blue-200 py-1 px-2 text-xs text-gray-800 shadow-sm"
...
...
@@ -457,7 +476,7 @@
>
Apprenti
</span
>
{
/if
}
</
div
>
</
span
>
</div>
{
/if
}
<!--Salaire de base-->
...
...
@@ -542,25 +561,6 @@
</div>
{
/each
}
<!-- Familles -->
{
#each
Object
.
keys
(
familySituation
).
sort
(
(
populationId1
,
populationId2
)
=>
populationId1
.
localeCompare
(
populationId2
),
)
as
populationId
}
{
@
const
rsa
=
getCalculatedVariableNumberValue
(
situation
,
valuesByCalculationNameByVariableName
,
"
rsa
"
,
populationId
,
)
??
0
}
<div
class=
"my-2"
>
{
#if
rsa
!==
0
}
<abbr
class=
"my-1 rounded-2xl bg-blue-200 py-1 px-2 text-xs text-gray-800 shadow-sm"
title=
"Revenu de solidarité active"
>
RSA
</abbr
>
{
/if
}
</div>
{
/each
}
<!-- Foyers fiscaux -->
{
#each
Object
.
keys
(
taxableHouseholdSituation
).
sort
(
(
populationId1
,
populationId2
)
=>
populationId1
.
localeCompare
(
populationId2
),
)
as
populationId
}
{
@
const
assiette_csg_revenus_capital
=
...
...
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