Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
L
leximpact-budget-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
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
leximpact
leximpact-budget-ui
Commits
0e96362b
Commit
0e96362b
authored
Dec 3, 2021
by
sandcha
Browse files
Options
Downloads
Patches
Plain Diff
Extract impact content into dedicated component
parent
af018975
Branches
Branches containing commit
No related tags found
1 merge request
!2
Ajoute la CSG retraite
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/lib/components/budget/ImpactPane.svelte
+68
-0
68 additions, 0 deletions
src/lib/components/budget/ImpactPane.svelte
src/routes/index.svelte
+3
-60
3 additions, 60 deletions
src/routes/index.svelte
with
71 additions
and
60 deletions
src/lib/components/budget/ImpactPane.svelte
0 → 100644
+
68
−
0
View file @
0e96362b
<script
lang=
"ts"
>
import
type
{
ApiResponse
}
from
"
$lib/components/budget/api-budget
"
import
HistogramPane
from
"
$lib/components/budget/HistogramPane.svelte
"
const
CSG_ACTIVITE_TITLE
=
"
Recettes de CSG des revenus d'activité du secteur privé/public
"
const
CSG_RETRAITE_TITLE
=
"
Recettes de CSG des pensions de retraite du secteur privé/public
"
const
CSG_DESCRIPTION
=
"
Montants estimés pour l'année 2022
"
const
CSG_GRAPH_TITLE
=
"
Périmètre actuel du simulateur par rapport à la CSG totale
"
const
HISTOGRAM_VARIABLES_TO_SUM_CSG_ACTIVITE
=
[
"
csg_imposable_salaire
"
,
"
csg_deductible_salaire
"
,
]
export
let
csgResponseJson
:
ApiResponse
|
undefined
=
undefined
export
let
updateImpact
:
boolean
=
false
</script>
<section
class=
"grid grid-cols-1 lg:grid-cols-2 2xl:grid-cols-4 gap-10"
>
<HistogramPane
title=
{
CSG_ACTIVITE_TITLE
}
description=
{
CSG_DESCRIPTION
}
dataJson=
{
csgResponseJson
}
variablesToDraw=
{
HISTOGRAM_VARIABLES_TO_SUM_CSG_ACTIVITE
}
updatingHistogram=
{
updateImpact
}
/>
<!-- image CSG -->
<div
class=
"text-gray-700 flex-col shadow-md rounded bg-white col-span-2 border-8 border-le-bleu-light"
>
<div
class=
"bg-le-bleu-light pb-4 pt-1 px-2"
>
<div>
<p
class=
"font-bold text-lg"
>
{
CSG_GRAPH_TITLE
}
</p>
<p
class=
"text-sm "
>
Source :
<a
class=
"underline hover:text-le-bleu"
href=
"https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/CCSS/2021/RAPPORT%20CCSS%20JUIN%202021.pdf#page=47"
>
Les comptes de la Sécurité sociale : Résultats 2020 et prévisions
2021 (juin 2021) - p.47
</a>
</p>
</div>
</div>
<img
class=
"flex sm:hidden lg:flex 2xl:hidden 3xl:flex object-contain"
src=
"/budget-csg-2020.svg"
alt=
{
CSG_GRAPH_TITLE
}
/>
<img
class=
"hidden sm:flex lg:hidden 2xl:flex 3xl:hidden object-contain"
src=
"/budget-csg-2020-vertical.svg"
alt=
{
CSG_GRAPH_TITLE
}
/>
</div>
<HistogramPane
title=
{
CSG_RETRAITE_TITLE
}
description=
{
CSG_DESCRIPTION
}
dataJson=
{
csgResponseJson
}
variablesToDraw=
{
HISTOGRAM_VARIABLES_TO_SUM_CSG_ACTIVITE
}
{
updateImpact
}
/>
</section>
This diff is collapsed.
Click to expand it.
src/routes/index.svelte
+
3
−
60
View file @
0e96362b
...
...
@@ -8,11 +8,12 @@
import
{
calculateBudget
}
from
"
$lib/components/budget/api-budget
"
import
type
{
ApiResponse
}
from
"
$lib/components/budget/api-budget
"
import
ConnectionPane
from
"
$lib/components/budget/ConnectionPane.svelte
"
import
HistogramPane
from
"
$lib/components/budget/HistogramPane.svelte
"
import
LawEdit
from
"
$lib/components/budget/LawEdit.svelte
"
import
ResetButton
from
"
$lib/components/transverse_pages/ResetButton.svelte
"
import
type
{
Reform
}
from
"
$lib/reforms
"
import
ImpactPane
from
"
$lib/components/budget/ImpactPane.svelte
"
// Budget Web API configuration from .env
...
...
@@ -31,14 +32,6 @@
const
IMPACT_SECTION_TITLE
=
"
Impacts d'une réforme CSG activité
"
const
IMPACT_SECTION_SUBTITLE
=
"
sur le budget de la Sécurité sociale
"
const
CSG_ACTIVITE_TITLE
=
"
Recettes de CSG des revenus d'activité du secteur privé/public
"
const
CSG_RETRAITE_TITLE
=
"
Recettes de CSG des pensions de retraite du secteur privé/public
"
const
CSG_DESCRIPTION
=
"
Montants estimés pour l'année 2022
"
const
CSG_GRAPH_TITLE
=
"
Périmètre actuel du simulateur par rapport à la CSG totale
"
// Reform listening and calculation requests for authorized user
$
:
user
=
$session
.
user
...
...
@@ -46,10 +39,6 @@
const
reform
=
getContext
(
"
reform
"
)
as
Writable
<
Reform
>
$
:
console
.
log
(
"
🔶 Réforme définie :
"
,
$reform
)
const
HISTOGRAM_VARIABLES_TO_SUM_CSG_ACTIVITE
=
[
"
csg_imposable_salaire
"
,
"
csg_deductible_salaire
"
,
]
const
API_OUTPUT_VARIABLES
:
string
[]
=
[
"
assiette_csg_abattue
"
,
"
assiette_csg_non_abattue
"
,
...
...
@@ -161,53 +150,7 @@
<!-- section d'impact -->
<div
class=
"h-[calc(100vh-16rem)] overflow-y-auto pl-10 pr-6 lg:px-10"
>
<section
class=
"grid grid-cols-1 lg:grid-cols-2 2xl:grid-cols-4 gap-10"
>
<HistogramPane
title=
{
CSG_ACTIVITE_TITLE
}
description=
{
CSG_DESCRIPTION
}
dataJson=
{
csgResponseJson
}
variablesToDraw=
{
HISTOGRAM_VARIABLES_TO_SUM_CSG_ACTIVITE
}
{
updatingHistogram
}
/>
<!-- image CSG -->
<div
class=
"text-gray-700 flex-col shadow-md rounded bg-white col-span-2 border-8 border-le-bleu-light"
>
<div
class=
"bg-le-bleu-light pb-4 pt-1 px-2"
>
<div>
<p
class=
"font-bold text-lg"
>
{
CSG_GRAPH_TITLE
}
</p>
<p
class=
"text-sm "
>
Source :
<a
class=
"underline hover:text-le-bleu"
href=
"https://www.securite-sociale.fr/files/live/sites/SSFR/files/medias/CCSS/2021/RAPPORT%20CCSS%20JUIN%202021.pdf#page=47"
>
Les comptes de la Sécurité sociale : Résultats 2020 et
prévisions 2021 (juin 2021) - p.47
</a>
</p>
</div>
</div>
<img
class=
"flex sm:hidden lg:flex 2xl:hidden 3xl:flex object-contain"
src=
"/budget-csg-2020.svg"
alt=
{
CSG_GRAPH_TITLE
}
/>
<img
class=
"hidden sm:flex lg:hidden 2xl:flex 3xl:hidden object-contain"
src=
"/budget-csg-2020-vertical.svg"
alt=
{
CSG_GRAPH_TITLE
}
/>
</div>
<HistogramPane
title=
{
CSG_RETRAITE_TITLE
}
description=
{
CSG_DESCRIPTION
}
dataJson=
{
csgResponseJson
}
variablesToDraw=
{
HISTOGRAM_VARIABLES_TO_SUM_CSG_ACTIVITE
}
{
updatingHistogram
}
/>
</section>
<ImpactPane
{
csgResponseJson
}
updateImpact=
{
updatingHistogram
}
/>
</div>
</div>
{
/if
}
...
...
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