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
0c08de0a
Unverified
Commit
0c08de0a
authored
Apr 9, 2024
by
Dorine Lambinet
Browse files
Options
Downloads
Patches
Plain Diff
ajoute la variable UC et ajuste le design
parent
c91549e2
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!211
Petites modifications UI simulateur
Pipeline
#13520
passed
Apr 9, 2024
Stage: build
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/lib/components/WaterfallView.svelte
+27
-4
27 additions, 4 deletions
src/lib/components/WaterfallView.svelte
src/lib/components/test_cases/TestCaseView.svelte
+1
-0
1 addition, 0 deletions
src/lib/components/test_cases/TestCaseView.svelte
src/lib/variables.ts
+1
-0
1 addition, 0 deletions
src/lib/variables.ts
with
29 additions
and
4 deletions
src/lib/components/WaterfallView.svelte
+
27
−
4
View file @
0c08de0a
...
@@ -1139,7 +1139,9 @@
...
@@ -1139,7 +1139,9 @@
</div>
</div>
</div>
</div>
</div>
</div>
coucou
<!--AJout de la variable niveau de vie-->
{
#each
Object
.
keys
(
householdSituation
).
sort
(
(
populationId1
,
populationId2
)
=>
populationId1
.
localeCompare
(
populationId2
),
)
as
populationId
}
{
#each
Object
.
keys
(
householdSituation
).
sort
(
(
populationId1
,
populationId2
)
=>
populationId1
.
localeCompare
(
populationId2
),
)
as
populationId
}
{
@
const
niveau_de_vie
=
{
@
const
niveau_de_vie
=
getCalculatedVariableNumberValue
(
getCalculatedVariableNumberValue
(
...
@@ -1148,12 +1150,33 @@
...
@@ -1148,12 +1150,33 @@
"
niveau_de_vie
"
,
"
niveau_de_vie
"
,
populationId
,
populationId
,
)
??
0
}
)
??
0
}
{
@
const
unites_consommation
=
getCalculatedVariableNumberValue
(
situation
,
valuesByCalculationNameByVariableName
,
"
unites_consommation
"
,
populationId
,
)
??
0
}
{
#if
unites_consommation
!==
0
}
<div
class=
"border-t flex items-center justify-between text-gray-500"
>
<p
class=
"border-t border-gray-400 ml-4"
>
Unités de consommation du ménage
</p>
<p
class=
"text-sm mr-4"
>
÷
{
unites_consommation
}
</p>
</div>
{
/if
}
{
#if
niveau_de_vie
!==
0
}
{
#if
niveau_de_vie
!==
0
}
<span
class=
"text-xs"
>
<div
class=
"border-t flex items-center justify-between text-gray-500"
>
{
euroAmountFormatter
(
niveau_de_vie
)
}
<p
class=
"border-t border-gray-400 ml-4"
>
Niveau de vie
</p>
</span>
<p
class=
"text-sm mr-4 border-t border-gray-400 p-0.5"
>
=
{
euroAmountFormatter
(
niveau_de_vie
)
}
</p>
</div>
{
/if
}
{
/if
}
{
/each
}
{
/each
}
<!-- Choix d'affichage des montant nuls -->
<!-- Choix d'affichage des montant nuls -->
<div
<div
class=
"mx-6 mt-3 flex"
class=
"mx-6 mt-3 flex"
...
...
This diff is collapsed.
Click to expand it.
src/lib/components/test_cases/TestCaseView.svelte
+
1
−
0
View file @
0c08de0a
...
@@ -377,6 +377,7 @@
...
@@ -377,6 +377,7 @@
{
situation
}
{
situation
}
{
situationIndex
}
{
situationIndex
}
{
variableSummaryByName
}
{
variableSummaryByName
}
{
valuesByCalculationNameByVariableName
}
{
year
}
{
year
}
/
>
/
>
<
/div
>
<
/div
>
...
...
This diff is collapsed.
Click to expand it.
src/lib/variables.ts
+
1
−
0
View file @
0c08de0a
...
@@ -224,6 +224,7 @@ export const summaryCalculatedVariablesName = [
...
@@ -224,6 +224,7 @@ export const summaryCalculatedVariablesName = [
"
plus_values_base_large
"
,
"
plus_values_base_large
"
,
"
rente_viagere_titre_onereux_net
"
,
"
rente_viagere_titre_onereux_net
"
,
"
rsa
"
,
"
rsa
"
,
"
unites_consommation
"
,
].
concat
(
].
concat
(
oilTypes
.
reduce
((
names
:
string
[],
name
:
string
)
=>
{
oilTypes
.
reduce
((
names
:
string
[],
name
:
string
)
=>
{
names
.
push
(
names
.
push
(
...
...
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