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
fe595114
Commit
fe595114
authored
7 months ago
by
Dorine Lambinet
Committed by
David Smadja
7 months ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix alignement variables lead
parent
7ad6d704
No related branches found
No related tags found
1 merge request
!272
Reflexions feuille de paie
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/lib/components/WaterfallView.svelte
+13
-16
13 additions, 16 deletions
src/lib/components/WaterfallView.svelte
src/lib/components/WaterfallViewFocusDispositif.svelte
+13
-20
13 additions, 20 deletions
src/lib/components/WaterfallViewFocusDispositif.svelte
with
26 additions
and
36 deletions
src/lib/components/WaterfallView.svelte
+
13
−
16
View file @
fe595114
...
...
@@ -412,19 +412,17 @@
</div>
<!--Affichage zoom dispositif si variable sélectionnée-->
{
#if
decomposition.name === displayMode.parametersVariableName
}
<div
class=
"flex grow"
>
<WaterfallViewFocusDispositif
{
displayMode
}
{
situationIndex
}
/>
</div>
{
/if
}
</div>
{
:else
if
visibleChildren === undefined
}
<!--Si c'est une variable Non-trunk, leaf-variable : La variable n'a pas de variables enfants et elle n'est pas une variable tronc -->
<div
class=
"flex h-full w-full flex-col"
>
<div
class=
"flex h-full items-
stretch
"
class=
"flex h-full items-
center
"
class:whitespace-nowrap=
{
decomposition.name !==
displayMode.parametersVariableName
}
>
...
...
@@ -506,13 +504,12 @@
</div>
{
/each
}
<div
class=
"flex grow"
>
<WaterfallViewFocusDispositif
{
displayMode
}
{
situationIndex
}
/>
</div>
</div>
{
/if
}
</div>
{
:else
}
...
...
@@ -520,7 +517,7 @@
<div
class=
"flex h-full w-full flex-col"
>
<div
class=
"flex h-full items-
stretch
justify-start"
class=
"flex h-full items-
center
justify-start"
class:whitespace-nowrap=
{
decomposition.name !==
displayMode.parametersVariableName
}
>
...
...
@@ -589,7 +586,7 @@
</div>
{
/each
}
<div
class=
"
flex grow
border-dashed border-gray-400 pr-2"
class=
"
w-full
border-dashed border-gray-400 pr-2"
class:border-l-0=
{
!decomposition.open
}
class:border-l-2=
{
decomposition.open
}
class:pl-0.5=
{
!decomposition.open
}
...
...
@@ -695,7 +692,7 @@
{
#if
decomposition.open && !trunk
}
<span
class=
"pl-2 opacity-20"
>
<iconify-icon
class=
"align-[-0.25rem] text-lg
hover:text-le-gris-dispositif
"
class=
"align-[-0.25rem] text-lg"
icon=
"ri-sort-desc"
></iconify-icon></span
>
...
...
This diff is collapsed.
Click to expand it.
src/lib/components/WaterfallViewFocusDispositif.svelte
+
13
−
20
View file @
fe595114
...
...
@@ -25,10 +25,10 @@
</script>
<div
class=
"m
b
-2 flex w-full grow flex-col
border-gray-400
"
class=
"m
y
-2 flex w-full grow flex-col
lg:flex-row
"
id=
"situation_{situationIndex}_totalimpact"
>
<div
class=
"w-full py-3 pl-5"
>
<div
class=
"
flex
w-full py-3 pl-5"
>
<!--MONTANT DISPOSITIF SELECTIONNE-->
{
#if
displayMode
.
parametersVariableName
!==
undefined
}
<!-- Note: A reform variable is always more complete than a variable before reform. -->
...
...
@@ -39,16 +39,14 @@
displayMode
.
parametersVariableName
]
}
{
#if
variableSummary
!==
undefined
}
<div
class=
"w-full flex-col"
>
<div
class=
"flex w-full flex-wrap items-start
gap-2
text-3xl font-semibold 2xl:text-4xl"
class=
"flex w-full flex-wrap items-start text-3xl font-semibold 2xl:text-4xl"
>
<VariableValueChange
{
evaluationByName
}
legend
name=
{
displayMode
.
parametersVariableName
}
/>
<span
class=
"pt-3 text-base"
>
/an
</span>
</div>
/>
<span
class=
"pl-1 pt-3 text-base"
>
/an
</span>
</div>
{
/if
}
{
/if
}
...
...
@@ -75,9 +73,8 @@
!
variableSummary
.
linked_output_variables
?.
includes
(
variableName
),
),
].
filter
((
value
)
=>
value
!==
undefined
&&
value
.
length
>
0
)
}
{
@
const
allowColumnWrap
=
linkedVariablesList
.
length
===
1
}
{
#each
linkedVariablesList
as
linkedVariables
}
<div
class=
"flex
-shrink bg-gray-100
p-
2
"
>
<div
class=
"flex
w-full grow
p-
5
"
>
{
#if
linkedVariables
!==
undefined
&&
linkedVariables
.
length
>
0
}
{
@
const
linkedVariablesValueByCalculationName
=
linkedVariables
.
map
(
(
name
)
=>
...
...
@@ -89,11 +86,7 @@
),
)
}
{
#if
shared
.
showNulls
||
!
linkedVariablesValueByCalculationName
.
every
(
isNullVariableValueByCalculationName
)
}
<ul
class=
"list-inside list-disc text-gray-800"
class:lg:max-h-[200px]=
{
allowColumnWrap
}
class:lg:flex-wrap=
{
allowColumnWrap
}
>
<ul
class=
"list-inside list-disc text-gray-800"
>
{
#each
linkedVariables
as
linkedVariableName
,
index
}
{
@
const
linkedVariableValueByCalculationName
=
linkedVariablesValueByCalculationName
[
index
]
}
...
...
@@ -104,7 +97,7 @@
:
variableSummaryByNameByReformName
[
billName
][
linkedVariableName
]
}
<li
class=
"text-base"
>
<li
class=
"
flex
text-base"
>
<a
class=
"2xl:text-md cursor-pointer text-base hover:underline"
href=
{
newSimulationUrl
(
{
...
...
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