Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Ecolyo
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

f2965975

Commit f2965975 authored 3 years ago by Guilhem CARRON

Downloads
- Plain Diff

Merge branch 'fix/analysis-issues' into 'dev'

Fix/analysis issues

See merge request web-et-numerique/llle_project/ecolyo!483

parents ed887467 6916544c

No related branches found

No related tags found

2 merge requests!4941.5.1,!483Fix/analysis issues

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/components/Analysis/MaxConsumptionCard.tsx 43 additions, 36 deletions

src/components/Analysis/MaxConsumptionCard.tsx
src/components/Analysis/TotalAnalysisChart.tsx 1 addition, 1 deletion

src/components/Analysis/TotalAnalysisChart.tsx
src/components/Analysis/maxConsumptionCard.scss 6 additions, 0 deletions

src/components/Analysis/maxConsumptionCard.scss
src/components/Analysis/totalAnalysisChart.scss 5 additions, 3 deletions

src/components/Analysis/totalAnalysisChart.scss
src/locales/fr.json 2 additions, 1 deletion

src/locales/fr.json

with 57 additions and 41 deletions

Loading

Guilhem CARRON @gcarron
mentioned in commit 6da8b835
· 3 years ago

mentioned in commit 6da8b835

mentioned in commit 6da8b835dc1a1c9cc1cd6219cc02b95e734ddd80

Toggle commit list

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment