Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
leximpact-client
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 dotations aux communes
leximpact-client
Commits
916daf33
Commit
916daf33
authored
Sep 30, 2020
by
Loïc Poullain
Browse files
Options
Downloads
Patches
Plain Diff
Use DF results
parent
51133804
No related branches found
No related tags found
1 merge request
!87
Intégrer la DF
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
components/dotations/results/commune-type/CommuneType.tsx
+1
-1
1 addition, 1 deletion
components/dotations/results/commune-type/CommuneType.tsx
redux/actions/simulations/simulate-dotations.ts
+16
-26
16 additions, 26 deletions
redux/actions/simulations/simulate-dotations.ts
with
17 additions
and
27 deletions
components/dotations/results/commune-type/CommuneType.tsx
+
1
−
1
View file @
916daf33
...
...
@@ -112,7 +112,7 @@ class CommuneType extends PureComponent<Props> {
})
}
>
<
DotationParHab
dotation
=
"df"
index
=
{
index
}
/>
<
div
>
<
HelpButton
warning
name
=
"df-montant"
/>
{
/*
<HelpButton warning name="df-montant" />
*/
}
</
div
>
</
div
>
</
div
>
...
...
This diff is collapsed.
Click to expand it.
redux/actions/simulations/simulate-dotations.ts
+
16
−
26
View file @
916daf33
...
...
@@ -319,47 +319,37 @@ export const simulateDotations = () => (dispatch, getState) => {
payload
.
amendement
.
communes
[
dotation
].
strates
.
forEach
((
strate
)
=>
{
// eslint-disable-next-line no-param-reassign
strate
.
partDotationTotale
*=
100
;
// eslint-disable-next-line
if
(
strate
.
hasOwnProperty
(
"
partEligibles
"
))
{
// eslint-disable-next-line no-param-reassign
strate
.
partEligibles
*=
100
;
}
});
if
(
payload
.
plf
)
{
payload
.
plf
.
communes
[
dotation
].
strates
.
forEach
((
strate
)
=>
{
// eslint-disable-next-line no-param-reassign
strate
.
partDotationTotale
*=
100
;
// eslint-disable-next-line
if
(
strate
.
hasOwnProperty
(
"
partEligibles
"
))
{
// eslint-disable-next-line no-param-reassign
strate
.
partEligibles
*=
100
;
}
});
}
payload
.
base
.
communes
[
dotation
].
strates
.
forEach
((
strate
)
=>
{
// eslint-disable-next-line no-param-reassign
strate
.
partDotationTotale
*=
100
;
// eslint-disable-next-line
if
(
strate
.
hasOwnProperty
(
"
partEligibles
"
))
{
// eslint-disable-next-line no-param-reassign
strate
.
partEligibles
*=
100
;
}
});
}
parsePayload
(
"
dsr
"
);
parsePayload
(
"
dsu
"
);
/* User DSR for DF values. */
// eslint-disable-next-line no-param-reassign
payload
.
amendement
.
communes
.
df
=
{
communes
:
payload
.
amendement
.
communes
.
dsr
.
communes
.
map
(
({
code
})
=>
({
code
,
dotationParHab
:
0
}),
),
strates
:
payload
.
amendement
.
communes
.
dsr
.
strates
.
map
(
()
=>
({
dotationMoyenneParHab
:
0
,
partDotationTotale
:
0
}),
),
};
// eslint-disable-next-line no-param-reassign
payload
.
base
.
communes
.
df
=
{
communes
:
payload
.
base
.
communes
.
dsr
.
communes
.
map
(
({
code
})
=>
({
code
,
dotationParHab
:
0
}),
),
strates
:
payload
.
base
.
communes
.
dsr
.
strates
.
map
(
()
=>
({
dotationMoyenneParHab
:
0
,
partDotationTotale
:
0
}),
),
};
parsePayload
(
"
df
"
);
dispatch
(
simulateDotationsSuccess
(
payload
));
})
...
...
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