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
43220671
Commit
43220671
authored
9 months ago
by
Dorine Lambinet
Browse files
Options
Downloads
Plain Diff
Merge branch '316-bug-dans-la-liste-des-dispositifs-budgetaires' into 'master'
Resolve "Bug dans la liste des dispositifs budgétaires" Closes
#316
See merge request
!294
parents
ecc3fa89
b630c2d1
No related branches found
No related tags found
1 merge request
!294
Resolve "Bug dans la liste des dispositifs budgétaires"
Pipeline
#19358
passed
9 months ago
Status:
Stage: build
Changes
2
Pipelines
4
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/lib/components/budget/WithoutBudgetCard.svelte
+24
-22
24 additions, 22 deletions
src/lib/components/budget/WithoutBudgetCard.svelte
src/lib/components/variables/VariableDetail.svelte
+3
-12
3 additions, 12 deletions
src/lib/components/variables/VariableDetail.svelte
with
27 additions
and
34 deletions
src/lib/components/budget/WithoutBudgetCard.svelte
+
24
−
22
View file @
43220671
...
@@ -6,9 +6,10 @@
...
@@ -6,9 +6,10 @@
interface
Props
{
interface
Props
{
displayMode
:
DisplayMode
displayMode
:
DisplayMode
variable
:
Decomposition
variable
:
Decomposition
testCaseOption
?:
boolean
}
}
let
{
displayMode
,
variable
}:
Props
=
$props
()
let
{
displayMode
,
variable
,
testCaseOption
=
true
}:
Props
=
$props
()
</script>
</script>
<div
class=
"rounded-lg border border-gray-200 bg-white p-2 shadow-md"
>
<div
class=
"rounded-lg border border-gray-200 bg-white p-2 shadow-md"
>
...
@@ -259,7 +260,7 @@
...
@@ -259,7 +260,7 @@
Voir les dispositifs avec impacts budgétaires
Voir les dispositifs avec impacts budgétaires
</a>
</a>
{
/if
}
{
/if
}
{
#if
testCaseOption
}
<div
class=
"mb-3 mt-4 flex w-full gap-9"
>
<div
class=
"mb-3 mt-4 flex w-full gap-9"
>
<hr
class=
"mt-5 flex-1 border-dashed border-black"
/>
<hr
class=
"mt-5 flex-1 border-dashed border-black"
/>
<span
class=
"text-lg font-light xl:text-2xl 2xl:text-3xl"
>
ou
</span>
<span
class=
"text-lg font-light xl:text-2xl 2xl:text-3xl"
>
ou
</span>
...
@@ -280,5 +281,6 @@
...
@@ -280,5 +281,6 @@
<!-- />-->
<!-- />-->
Voir les impacts sur cas types
Voir les impacts sur cas types
</a>
</a>
{
/if
}
</div>
</div>
</div>
</div>
This diff is collapsed.
Click to expand it.
src/lib/components/variables/VariableDetail.svelte
+
3
−
12
View file @
43220671
...
@@ -15,6 +15,7 @@
...
@@ -15,6 +15,7 @@
import
TestCasePictos
from
"
$lib/components/test_cases/TestCasePictos.svelte
"
import
TestCasePictos
from
"
$lib/components/test_cases/TestCasePictos.svelte
"
import
VariableDetailBudget
from
"
$lib/components/variables/VariableDetailBudget.svelte
"
import
VariableDetailBudget
from
"
$lib/components/variables/VariableDetailBudget.svelte
"
import
VariableValueChange
from
"
$lib/components/variables/VariableValueChange.svelte
"
import
VariableValueChange
from
"
$lib/components/variables/VariableValueChange.svelte
"
import
WithoutBudgetCard
from
"
$lib/components/budget/WithoutBudgetCard.svelte
"
import
{
import
{
decompositionCoreByName
,
decompositionCoreByName
,
decompositionCoreByNameByReformName
,
decompositionCoreByNameByReformName
,
...
@@ -336,18 +337,8 @@
...
@@ -336,18 +337,8 @@
></iconify-icon>
></iconify-icon>
</a>
</a>
{
:
else
}
{
:
else
}
<span
class=
"text-base italic xl:text-lg"
>
<!--Panneau indicateur que d'autres dispositifs sont disponibles en budgétaire-->
Le calcul des impacts budgétaires du dispositif «
{
shortLabel
}
»
<WithoutBudgetCard
{
displayMode
}
{
variable
}
testCaseOption=
{
false
}
/>
n'est pas encore disponible.
<span
class=
"font-normal"
>
Ce sujet vous intéresse ? Écrivez-nous à
<a
class=
"lx-link-text"
href=
"mailto:leximpact@assemblee-nationale.fr"
>
leximpact@assemblee-nationale.fr
</a
></span
>
</span>
{
/if
}
{
/if
}
</AccordionItem>
</AccordionItem>
<AccordionItem
open=
{
true
}
title=
"Impacts cas types"
>
<AccordionItem
open=
{
true
}
title=
"Impacts cas types"
>
...
...
...
...
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