Skip to content

Commit

Permalink
Implemented a generalized version of the Map, LineChart, and Scenario…
Browse files Browse the repository at this point in the history
… components using VVAFER approach (#367)

* Created new branch

* Implemented Generalized map and linechart

* Connected Line Chart

* 🔨 Generalize Map component and LineChart component.

* 🔧 Memoize HeatMap props and delete temporary Redux Store files.

* 🪲 Fix data loading on map component.

* 🪲 Fix selected items storage

* 🪲 Fix tooltip heatlegend

* 🪲 Fix heatlegendedit

* ✨ Format containers

* 🪲 Fix heat palette as user preference

* 🔧 Remove unused components

* Revert "🪲 Fix heat palette as user preference"

This reverts commit 3aced9a.

* 🔧 Add previous removed files

* 🔨 Generalize Scenario components

* ✨ Format Translation files & add the Compliance with REUSE Specification in missing files

* ✨ Add the Compliance with REUSE Specification in missing files

* 🔧 Simplify code

* Add localization for Map and LineChart components

* Add localization and searchbar tests. Deleted old searchbar.

* 🔧 Modified Map components props and added HeatMap test

* 🔨 & 📝 & 🪲 & 🎉 refactor some part of the scenario components add also docs and fix major bug and also add the possibility to decide how many lines to show in the card when are folded and when are expanded

* 📝 refactor some part of the scenario components add also docs and fix major bug and also add the possibility to decide how many lines to show in the card when are folded and when are expanded

* 💚 fix the test according to the new version in order to make the CI build

* 🔧 Add tests for new components, removed old components and refactored new components props

* Add Compliance information in missing files

* 🔧 Remove debugs inside tests

* 📝 Add documentation for Linechart components

* ✔️ added tests for the new scenarios components

* Add Compliance information in missing files

* ✨ fix formatting

* ✨ fix formatting

* ✨ Format Linechart component

* 🔧 adjusting ui responsivness across multiple browser

* 🔧 small ui responsive adjustment

* ✔️ add some tests for the cards

* 🪲 fix the first render bug on firefox

* 🔧 Simplify Scenario components

* 🪲 Fix Scenario styling

* ✔️ fix the cardTitle test

* 🔧 Add new color feature in Scenario components

* 🔧 Fix the filter color

* 🔨 Add cologne districts and change color on LineChart and Map components. Refactor map components and container to move data handling in the Data Socket

* ✔️ Add CardtooltipTest

* 🔧 Refactor Searchbar interface and fix tests

* 🔧 Small refactoring in the scss in order to mantain the layout across browser

* 🔥 Remove unused file

* 🪲 fix bug on flipping card title

* 🔧 Refactor legend component by wrapping amchart components

* 🔧 Changed localization inside HeatLegend

* ✨ Add Reuse Compliance

* 🔧 Wrapped root,zoom and chart of HeatMap component

* 🔀 merging

* 🔧 Remove stoplist in legend

* 🪲 fixed the tooltip translation in the CompartmentsRow component

* 🪲 fixed the tooltip translation in the CompartmentsRow component

* 🔧 Wrap Amchart components inside LineChart

* 🔧 Small refactoring in how it's defined test component

* 🪲 Fixed crash on language change

* 🪲 Fix the updating of the map when changing languages

* 🪲 Fix language change problem on map

* 🪲 Fix Reference Day on LineChart Component and Germany translation when changing language on Map Component

* 🪲 Fix zoom when changing language

* 🪲 Fix selectedDistrict when changing language

* 🪲 Fix the bug on selectedArea on the Heatmap when refreshed the page

* 🔧 Error handling on zoom

* 🔧 Refactor Wrapping components

* 🔧 Refactor heatmap

* ✨ Lint DataContext

* 🔨 update the scenario and the other component to be completly compliant with the new api

* 🔨 update the scenario and the other component to be completly compliant with the new api

* ✨ adjust the formatting

* 🔨 Stable version of the library with the new api

* 🔨 Stable version of the library with the new api

* ✨ Stable version of the library with the new api

* 🔧 Removed lazy loading on components

* ✨ Stable version of the library with the new api

* 🔧 Adjust the code as suggested from the code review

* ✨ Adjust the code as suggested from the code review

* ✨ Adjust linting in the code

* ✔️ Adjust test for the store

* 🔧 Refactor Map and DataContext

* ✨ Fix the comment in the scenario components to be compliant with the codestyle & 🪲 fixed a bug in the linechart

* 🪲 Fix a bug in the linechart

* 🔧 adjust the code according to the changes requested in the code review

* 🔧 adjust the code according to the changes requested in the code review

* 🔧 Generalize line chart series

* ✨ Add reuse compliance

* ✨ Add comments in LineChart and HeatMap components

* 🪲 Fix the wrapped version of the Map

* 🔧 Refactor percentiledata series in LineChart

* ✨ Format heatmap

* 🔧 Remove unused hook

* 🔧 Fix the handling of the null values in the cards in order to be equal to the deployed version

* 🪲 Fix wrapped version of the Linechart

* 🔧 Refactor LineSeries

* 🔧 Small adjustment

* 🔧 Remove gorupFilterList inside LineChart

* 🔧 Remove scenarioList in LineChart component

* ❇️ Fix also the last problem with the heatmap with the zoom now the amchart component should be bugless :)

* ✨ Fix also the last problem with the heatmap with the zoom now the amchart component should be bugless :)

* 🔧 Map component final version bugless

* 🔧 Refactor Linechart component.

* ✨ Modify console error

* ✨ Rename mapcontainer

* 🔧 Refactor linechart data selection

* 🔧 Refactor localization in Linechart and more button logic

* 🔧 Replace serie id with valueYField

* 🔧 Remove linechart caseData translation in linechart

* 🔧 Refactor export data in linechart

* 🔧 Refactor some small detail

* ❇️ Fix the formatting

* 🔧 Fix Compartment values null logic in the compartments components

* 🔧 Fix typo error in the CardTooltip test

* 🔧 Refactor localization in LineChart

* 🔧 Remove unused lines

* 🔧 Refactor localization in Map components

* 🔧 Adjusted the code according to the request changes in the pull request

* 🔧 Adjusted the code according to the request changes in the pull request

---------

Co-authored-by: Violini <giacomo.violini@dlr.de>
Co-authored-by: Serloni <lorenzo.serloni@dlr.de>
  • Loading branch information
3 people authored Jul 23, 2024
1 parent a1aabde commit d51f9b4
Show file tree
Hide file tree
Showing 105 changed files with 8,621 additions and 4,061 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion frontend/assets/third-party-attributions.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion frontend/locales/de-backend.json5
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@
},
},
'scenario-names': {
'Baseline Scenario': 'Basisszenario',
caseData: 'Geschätzte Fälle',
baseline: 'Basisszenario',
closed_schools: 'Geschlossene Schulen',
remote_work: 'Homeoffice',
Expand Down
1 change: 1 addition & 0 deletions frontend/locales/de-global.json5
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,5 @@
'no-data': 'Keine Daten',
'loki-logo': 'LOKI-Logo',
okay: 'Okay',
yAxisLabel: 'Wert',
}
2 changes: 1 addition & 1 deletion frontend/locales/en-backend.json5
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@
},
},
'scenario-names': {
'Baseline Scenario': 'Baseline Scenario',
caseData: 'Estimated Cases',
baseline: 'Baseline Scenario',
closed_schools: 'Schools Closed',
remote_work: 'Home Office',
Expand Down
1 change: 1 addition & 0 deletions frontend/locales/en-global.json5
Original file line number Diff line number Diff line change
Expand Up @@ -101,4 +101,5 @@
sanctus est Lorem ipsum dolor sit amet.',
WIP: 'This functionality is still work in progress.',
okay: 'Okay',
yAxisLabel: 'Value',
}
Loading

0 comments on commit d51f9b4

Please sign in to comment.