Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implemented a generalized version of the Map, LineChart, and Scenario components using VVAFER approach #367

Merged
merged 150 commits into from
Jul 23, 2024
Merged
Show file tree
Hide file tree
Changes from 135 commits
Commits
Show all changes
150 commits
Select commit Hold shift + click to select a range
bb88c86
Created new branch
May 29, 2024
63cc75c
Implemented Generalized map and linechart
May 30, 2024
4ffcd3d
Connected Line Chart
May 30, 2024
57e7ccb
:hammer: Generalize Map component and LineChart component.
May 31, 2024
c0642b9
:wrench: Memoize HeatMap props and delete temporary Redux Store files.
May 31, 2024
bfcfdd6
:beetle: Fix data loading on map component.
Jun 3, 2024
bb752b8
:beetle: Fix selected items storage
Jun 4, 2024
84d5788
:beetle: Fix tooltip heatlegend
Jun 4, 2024
d4bcc19
:beetle: Fix heatlegendedit
Jun 4, 2024
894f4c6
:sparkles: Format containers
Jun 4, 2024
3aced9a
:beetle: Fix heat palette as user preference
Jun 4, 2024
8f47b76
:wrench: Remove unused components
Jun 5, 2024
92191f1
Revert ":beetle: Fix heat palette as user preference"
Jun 5, 2024
2008664
:wrench: Add previous removed files
Jun 5, 2024
c4e94ea
:hammer: Generalize Scenario components
Jun 5, 2024
6ac55d5
:sparkles: Format Translation files & add the Compliance with REUSE S…
Jun 5, 2024
f0bf4b2
:sparkles: Add the Compliance with REUSE Specification in missing files
Jun 5, 2024
a39e7c6
:wrench: Simplify code
Jun 6, 2024
fb060f6
Add localization for Map and LineChart components
Jun 6, 2024
d7afe16
Add localization and searchbar tests. Deleted old searchbar.
Jun 7, 2024
144afc0
:wrench: Modified Map components props and added HeatMap test
Jun 10, 2024
0c6d3b9
:hammer: & :memo: & :beetle: & :tada: refactor some part of the scena…
Jun 10, 2024
25e1183
Merge branch 'feature/generalize' of https://github.com/DLR-SC/ESID i…
Jun 10, 2024
82a2353
:memo: refactor some part of the scenario components add also docs an…
Jun 10, 2024
f473590
:green_heart: fix the test according to the new version in order to m…
Jun 10, 2024
508a6ca
:wrench: Add tests for new components, removed old components and ref…
Jun 11, 2024
ce1cd53
Add Compliance information in missing files
Jun 11, 2024
73d468b
:wrench: Remove debugs inside tests
Jun 11, 2024
e7089dd
:memo: Add documentation for Linechart components
Jun 12, 2024
1b2f2c2
:memo: Add documentation for MapComponents. Correct LineChart documen…
Jun 12, 2024
88fd251
:heavy_check_mark: added tests for the new scenarios components
Jun 12, 2024
3daebc2
Merge branch 'feature/generalize' of https://github.com/DLR-SC/ESID i…
Jun 12, 2024
8f204c6
Add Compliance information in missing files
Jun 12, 2024
55353b7
:sparkles: fix formatting
Jun 12, 2024
a42182e
:sparkles: fix formatting
Jun 12, 2024
3ac03e4
:sparkles: Format Linechart component
Jun 12, 2024
ac0d719
:wrench: adjusting ui responsivness across multiple browser
Jun 12, 2024
ccdf7c9
Merge branch 'feature/generalize' of https://github.com/DLR-SC/ESID i…
Jun 12, 2024
70e6645
:wrench: small ui responsive adjustment
Jun 12, 2024
81ef19b
:heavy_check_mark: add some tests for the cards
Jun 12, 2024
6a554c8
:beetle: fix the first render bug on firefox
Jun 13, 2024
5c2145c
:wrench: Simplify Scenario components
Jun 13, 2024
d757e03
Merge branch 'feature/generalize' of https://github.com/DLR-SC/ESID i…
Jun 13, 2024
d7b8495
:beetle: Fix Scenario styling
Jun 13, 2024
247f76a
:heavy_check_mark: fix the cardTitle test
Jun 13, 2024
7565616
:wrench: Add new color feature in Scenario components
Jun 13, 2024
38798d8
:wrench: Fix the filter color
Jun 13, 2024
59c3845
:hammer: Add cologne districts and change color on LineChart and Map …
Jun 13, 2024
e1b0178
:heavy_check_mark: Add CardtooltipTest
Jun 13, 2024
942096e
Merge branch 'feature/generalize' of https://github.com/DLR-SC/ESID i…
Jun 13, 2024
f68f2a2
:wrench: Refactor Searchbar interface and fix tests
Jun 13, 2024
ad7c19f
Merge branch 'feature/generalize' of https://github.com/DLR-SC/ESID i…
Jun 13, 2024
18cac9e
:wrench: Small refactoring in the scss in order to mantain the layout…
Jun 13, 2024
2da2e3a
:twisted_rightwards_arrows: Merge develop branch
Jun 13, 2024
5a24fa0
:fire: Remove unused file
Jun 13, 2024
60f7fc0
:beetle: fix bug on flipping card title
Jun 14, 2024
0d30947
Merge branch 'feature/generalize' of https://github.com/DLR-SC/ESID i…
Jun 14, 2024
c7e4678
:wrench: Refactor legend component by wrapping amchart components
Jun 17, 2024
c4cf816
Merge branch 'feature/generalize' of https://github.com/DLR-SC/ESID i…
Jun 17, 2024
c8d2124
:wrench: Changed localization inside HeatLegend
Jun 17, 2024
e1aa36c
:sparkles: Add Reuse Compliance
Jun 17, 2024
4eefa34
:wrench: Wrapped root,zoom and chart of HeatMap component
Jun 17, 2024
ea3bef7
:twisted_rightwards_arrows: merging
Jun 17, 2024
793cb05
:wrench: Add polygon hook for map refactor
Jun 17, 2024
d1c0787
:wrench: Remove stoplist in legend
Jun 18, 2024
72fa3ba
Merge branch 'feature/generalize' of https://github.com/DLR-SC/ESID i…
Jun 18, 2024
90e940e
:beetle: fixed the tooltip translation in the CompartmentsRow component
Jun 18, 2024
e1a22aa
Merge branch 'feature/generalize' of https://github.com/DLR-SC/ESID i…
Jun 18, 2024
7b0112d
:beetle: fixed the tooltip translation in the CompartmentsRow component
Jun 18, 2024
f484269
:wrench: Wrap Amchart components inside LineChart
Jun 19, 2024
9cbb8f2
Merge branch 'feature/generalize' of https://github.com/DLR-SC/ESID i…
Jun 19, 2024
53f21ef
:wrench: Small refactoring in how it's defined test component
Jun 19, 2024
a79b929
:beetle: Fixed crash on language change
Jun 19, 2024
2412752
Merge branch 'feature/generalize' of https://github.com/DLR-SC/ESID i…
Jun 19, 2024
169b82e
:beetle: Fix the updating of the map when changing languages
Jun 19, 2024
764e83b
:beetle: Fix language change problem on map
Jun 19, 2024
87f32dc
:beetle: Fix formatNumber in Map component
Jun 19, 2024
8d61afd
:beetle: Fix Reference Day on LineChart Component and Germany transla…
Jun 20, 2024
b7608ba
:beetle: Fix zoom when changing language
Jun 20, 2024
245b736
:beetle: Fix selectedDistrict when changing language
Jun 20, 2024
0ba74ed
:beetle: Fix the bug on selectedArea on the Heatmap when refreshed th…
Jun 20, 2024
90683a6
:wrench: Error handling on zoom
Jun 20, 2024
b2fd407
:wrench: Remove lazy loading
Jun 20, 2024
d18605c
:wrench: Refactor Wrapping components
Jun 21, 2024
823eba2
:wrench: Refactor heatmap
Jun 27, 2024
46479cb
:sparkles: Lint DataContext
Jun 27, 2024
611448c
:hammer: update the scenario and the other component to be completly …
Jun 27, 2024
a78a30c
:hammer: update the scenario and the other component to be completly …
Jun 27, 2024
4dc5271
:hammer: update the scenario and the other component to be completly …
Jun 27, 2024
8a4b8b7
:sparkles: adjust the formatting
Jun 27, 2024
55969f9
:hammer: Stable version of the library with the new api
Jun 28, 2024
e99389e
:hammer: Stable version of the library with the new api
Jun 28, 2024
91163d6
:sparkles: Stable version of the library with the new api
Jun 28, 2024
f96c57d
:wrench: Removed lazy loading on components
Jun 28, 2024
238cc87
:sparkles: Stable version of the library with the new api
Jun 28, 2024
d2b44f0
:wrench: Adjust the code as suggested from the code review
Jun 28, 2024
e77d279
:sparkles: Adjust the code as suggested from the code review
Jun 28, 2024
17a554d
:sparkles: Adjust linting in the code
Jun 28, 2024
a093730
:heavy_check_mark: Adjust test for the store
Jun 28, 2024
051e0ac
:wrench: Refactor Map and DataContext
Jun 28, 2024
f009c12
:wrench: Refactor Map and DataContext
Jun 28, 2024
b2e2ffa
:sparkles: Fix the comment in the scenario components to be compliant…
Jun 28, 2024
af92b04
:beetle: Fix a bug in the linechart
Jun 28, 2024
8025476
:beetle: Fix a bug in the linechart
Jun 28, 2024
d54ad0c
:wrench: adjust the code according to the changes requested in the co…
Jul 1, 2024
44b3bb9
:wrench: adjust the code according to the changes requested in the co…
Jul 1, 2024
4acbe32
:wrench: Generalize line chart series
Jul 1, 2024
c52cdbf
:hammer: Refactor linechart series and map types
Jul 2, 2024
a0ce63f
:sparkles: Add reuse compliance
Jul 2, 2024
501e112
:sparkles: Add comments in LineChart and HeatMap components
Jul 2, 2024
513fd41
:beetle: Fix the wrapped version of the Map
Jul 3, 2024
62518b2
:wrench: Adjust the type on the map
Jul 3, 2024
cc99f67
:wrench: Refactor percentiledata series in LineChart
Jul 3, 2024
6db9540
:wrench: Refactor linechart series
Jul 3, 2024
7c0d5a9
:sparkles: Format heatmap
Jul 3, 2024
d9b04b8
:wrench: Remove unused hook
Jul 3, 2024
6655926
:wrench: Fix the handling of the null values in the cards in order to…
Jul 3, 2024
a5997d7
:wrench: Fix the handle of null value in the cards
Jul 3, 2024
fad7bb6
:beetle: Fix wrapped version of the Linechart
Jul 5, 2024
b1e98fc
:wrench: Refactor LineSeries
Jul 5, 2024
d105a8b
:wrench: Reorganize LineChart and fix Heatmap selected district when …
Jul 5, 2024
a326e03
:wrench: Small adjustment
Jul 5, 2024
69052bb
:sparkle: Formatting the code
Jul 5, 2024
13736e2
:wrench: Remove gorupFilterList inside LineChart
Jul 5, 2024
41d85a9
:wrench: Remove scenarioList in LineChart component
Jul 5, 2024
feb4706
:beetle: Fix also the last problem with the heatmap with the zoom now…
Jul 5, 2024
d75b168
:sparkle: Fix also the last problem with the heatmap with the zoom no…
Jul 5, 2024
da70a6c
:sparkles: Fix also the last problem with the heatmap with the zoom n…
Jul 5, 2024
20868e8
:wrench: Map component final version bugless
Jul 8, 2024
b1f682a
:wrench: Refactor Linechart component.
Jul 8, 2024
1a72d21
:wrench: Refactor LineChart
Jul 8, 2024
81988f6
:sparkles: Modify console error
Jul 8, 2024
eb5cbab
:sparkles: Rename mapcontainer
Jul 8, 2024
65969ed
:wrench: Refactor linechart data selection
Jul 9, 2024
94e826a
:wrench: Refactor localization in Linechart and more button logic
Jul 9, 2024
5fd6d30
:wrench: Replace serie id with valueYField
Jul 9, 2024
a61a102
:wrench: Remove linechart caseData translation in linechart
Jul 9, 2024
d641786
:wrench: Refactor export data in linechart
Jul 9, 2024
d9fb678
:wrench: Refactor some small detail
Jul 10, 2024
dede1fc
:wrench: Fix some detail in the translation of the tooltip in the car…
Jul 10, 2024
a5e036d
:sparkle: Fix the formatting
Jul 10, 2024
5ab8280
:wrench: Fix Compartment values null logic in the compartments compon…
Jul 10, 2024
9cc8487
:wrench: Fix typo error in the CardTooltip test
Jul 11, 2024
eb064df
:wrench: Refactor localization in LineChart
Jul 16, 2024
8d9bca0
:wrench: Refactor translation in LineChart
Jul 16, 2024
e2004bb
:wrench: Remove unused lines
Jul 16, 2024
279a46d
:wrench: Refactor localization in Map components
Jul 16, 2024
b7aa1e6
:wrench: Adjusted the code according to the request changes in the pu…
Jul 19, 2024
8d04e4b
:wrench: Adjusted the code according to the request changes in the pu…
Jul 19, 2024
b189e63
:twisted: Merging with develop
Jul 23, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 @@ -84,4 +84,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 @@ -99,4 +99,5 @@
sanctus est Lorem ipsum dolor sit amet.',
WIP: 'This functionality is still work in progress.',
okay: 'Okay',
yAxisLabel: 'Value',
}
Loading
Loading