o3webapp merge requestshttps://git.scc.kit.edu/m-team/o3as/o3webapp/-/merge_requests2022-02-06T16:09:44+01:00https://git.scc.kit.edu/m-team/o3as/o3webapp/-/merge_requests/50Fix Delete Spinner #1032022-02-06T16:09:44+01:00ufjxpFix Delete Spinner #103Replaced Thommy's Spinner with an MUI Spinner
![image](/uploads/57eb875ff5b290398ac804e73d99ee7c/image.png)Replaced Thommy's Spinner with an MUI Spinner
![image](/uploads/57eb875ff5b290398ac804e73d99ee7c/image.png)ufjxpufjxphttps://git.scc.kit.edu/m-team/o3as/o3webapp/-/merge_requests/49Feat style download button #1222022-02-06T16:05:24+01:00uxkkpFeat style download button #122Styled download button and updated screenshotsStyled download button and updated screenshotsuxkkpuxkkphttps://git.scc.kit.edu/m-team/o3as/o3webapp/-/merge_requests/48fixed issue with add model group modal2022-02-06T16:03:26+01:00uxkkpfixed issue with add model group modal- fixed search in add model group modal
- moved searchbar to components
- on props.modelGroupId provided, gets groupname and default models on the right from store -> can be used as edit model group members modal
- improved performance o...- fixed search in add model group modal
- moved searchbar to components
- on props.modelGroupId provided, gets groupname and default models on the right from store -> can be used as edit model group members modal
- improved performance of search bar (only searches on enter and onblur)
- updated tests
-> 50% testing coverage in addmodelgroupmodal
-> 100% test coverage in searchbaruxkkpuxkkphttps://git.scc.kit.edu/m-team/o3as/o3webapp/-/merge_requests/47Feature Horizontal Line #1212022-02-06T13:18:59+01:00ufjxpFeature Horizontal Line #121Added the horizontal line at the reference year.
![image](/uploads/8f976756d509e4e020c33914b988f96d/image.png)
![image](/uploads/3e6c8c83c2fe4a90b96da880e4cdb2cc/image.png)Added the horizontal line at the reference year.
![image](/uploads/8f976756d509e4e020c33914b988f96d/image.png)
![image](/uploads/3e6c8c83c2fe4a90b96da880e4cdb2cc/image.png)ufjxpufjxphttps://git.scc.kit.edu/m-team/o3as/o3webapp/-/merge_requests/46Turning on the lights2022-02-06T11:06:57+01:00uqgieTurning on the lights## What I have done
- Centralize default values in redux store (i.e. plotSlice, referenceSlice)
- Make TimeCheckboxGroup, ReferenceYearField (only valid data), ReferenceModelSelector, LatitudeBandSelector fetch new data from api onChange...## What I have done
- Centralize default values in redux store (i.e. plotSlice, referenceSlice)
- Make TimeCheckboxGroup, ReferenceYearField (only valid data), ReferenceModelSelector, LatitudeBandSelector fetch new data from api onChange(). \
Thus you can now see changes in the graph when you change something in the input components :Duqgieuqgiehttps://git.scc.kit.edu/m-team/o3as/o3webapp/-/merge_requests/45Feature Calculate SV #1092022-02-04T20:36:26+01:00ufjxpFeature Calculate SV #109Imlemented the optionsFormatter which properly formats and calculates the SV data for the chart.
Additionally it configures the correct options based on the settings in the redux store.
![image](/uploads/b5dc4f26380c3538e4ab103b76fecb2a...Imlemented the optionsFormatter which properly formats and calculates the SV data for the chart.
Additionally it configures the correct options based on the settings in the redux store.
![image](/uploads/b5dc4f26380c3538e4ab103b76fecb2a/image.png)
![image](/uploads/7ba3131f91c6986cb3f189d60aebbaa1/image.png)uctwiufjxpuctwihttps://git.scc.kit.edu/m-team/o3as/o3webapp/-/merge_requests/44Feat restruct plot slice#107 b2022-02-03T18:35:37+01:00uctwiFeat restruct plot slice#107 bModified plotSlice internal structure to have shared (general settings) and some plot specific settings (title, zooming).
Additionally I removed the test123 section from the tco3_return plot and removed the test selectors from the filte...Modified plotSlice internal structure to have shared (general settings) and some plot specific settings (title, zooming).
Additionally I removed the test123 section from the tco3_return plot and removed the test selectors from the filter data section. The correct selection of the regions for the x-axis of the tco3_return is now possible (graph doesn't respond however).
![image](/uploads/7ca71b705041340dd781af9606e78c7a/image.png)uctwiuctwihttps://git.scc.kit.edu/m-team/o3as/o3webapp/-/merge_requests/43Sliders to Textfields #1002022-02-02T12:42:40+01:00uqgieSliders to Textfields #100## What I have done
I changed the XAxisSlider, YAxisSlider and ReferenceYearSlider to an XAxisField, YAxisField and ReferenceYearField. \
The TextFields should only accept numbers and also show a warning when an out of range value is ins...## What I have done
I changed the XAxisSlider, YAxisSlider and ReferenceYearSlider to an XAxisField, YAxisField and ReferenceYearField. \
The TextFields should only accept numbers and also show a warning when an out of range value is inserted.
## Screenshots
![Capture2](/uploads/d8caa022dd53cabe315830a343b5dd30/Capture2.PNG) \
![Capture](/uploads/eed96fff14c578c586f32b0f863649b8/Capture.PNG)uqgieuqgiehttps://git.scc.kit.edu/m-team/o3as/o3webapp/-/merge_requests/42fixed graph re-rendering, and optimized it2022-02-02T10:31:03+01:00uctwifixed graph re-rendering, and optimized it
Fixed this bug:
![image](/uploads/be0d4edf6bca0c9848c7c5d5aa21b2fe/image.png)
Steps to reproduce:
Checkout develop
Start App
Click "Add Model Group"
Move all 105 models to the right
Add Group
=> Plot should update
Switch to tco3_return...
Fixed this bug:
![image](/uploads/be0d4edf6bca0c9848c7c5d5aa21b2fe/image.png)
Steps to reproduce:
Checkout develop
Start App
Click "Add Model Group"
Move all 105 models to the right
Add Group
=> Plot should update
Switch to tco3_return
Switch back to tco3_zm
=> voilĂ
Additionally prevented the graph component from re-rendering if the sidebar is opened or closed.uctwiuctwihttps://git.scc.kit.edu/m-team/o3as/o3webapp/-/merge_requests/41Clicking the Button in AddModelGroup really adds the models on the right to t...2022-01-31T17:08:31+01:00uctwiClicking the Button in AddModelGroup really adds the models on the right to the groupClicking the Button in AddModelGroup really adds the models on the right to the group which makes them show up in the graph.
Verify this by clicking the add model group button.
- select one of the 2-10. Model listed.
- move it to the ri...Clicking the Button in AddModelGroup really adds the models on the right to the group which makes them show up in the graph.
Verify this by clicking the add model group button.
- select one of the 2-10. Model listed.
- move it to the right
- click add
- the graph should now include the models
(hiding the model group with the eye symbol should still work
![image](/uploads/1ede6b5b848b257c731328d96a1ec4c8/image.png)
Additionally, I adjusted the modelsSlice because I was working with it in this task and I corrected the tests that relied on the "old" structure of keeping a separate list of models and groups.https://git.scc.kit.edu/m-team/o3as/o3webapp/-/merge_requests/40Issue unique key #852022-01-31T16:59:09+01:00uxkkpIssue unique key #85Fixed all warnings and errors when testing expect for one.
Also fixed most warnings in the console, when starting webapp.Fixed all warnings and errors when testing expect for one.
Also fixed most warnings in the console, when starting webapp.uxkkpuxkkphttps://git.scc.kit.edu/m-team/o3as/o3webapp/-/merge_requests/39Draft: Feat update model group card #1012022-02-02T13:00:57+01:00uxkkpDraft: Feat update model group card #101I changed the ModelGroupCard to have two buttons. One for opening the editmodelgroupmodal and one for opening the addmodelgroupmodal, which will be used to edit the model group members.
![grafik](/uploads/11079b82f83ba0ec06d305b251592101...I changed the ModelGroupCard to have two buttons. One for opening the editmodelgroupmodal and one for opening the addmodelgroupmodal, which will be used to edit the model group members.
![grafik](/uploads/11079b82f83ba0ec06d305b251592101/grafik.png)
I updated all snapshots accordingly, but I did not manage to test that the modals open properly (-> added test.todo)uxkkpuxkkphttps://git.scc.kit.edu/m-team/o3as/o3webapp/-/merge_requests/38Added the EditModelGroupModal #332022-01-31T15:46:54+01:00ufjxpAdded the EditModelGroupModal #33Added the Edit Model Group Modal with functionality.
!!! PLEASE DONT MERGE THE LANDING PAGE. ALL CHANGES TO THIS COMPONENT WERE ONLY MADE FOR TESTING PURPOSES !!!
![image](/uploads/398c5056bcfc2b48104712082962088c/image.png)
![image](/...Added the Edit Model Group Modal with functionality.
!!! PLEASE DONT MERGE THE LANDING PAGE. ALL CHANGES TO THIS COMPONENT WERE ONLY MADE FOR TESTING PURPOSES !!!
![image](/uploads/398c5056bcfc2b48104712082962088c/image.png)
![image](/uploads/8d6e79c97158b2ed1f97a97e27e78310/image.png)ufjxpufjxphttps://git.scc.kit.edu/m-team/o3as/o3webapp/-/merge_requests/37Feat connect model group configurator to redux #912022-01-31T08:48:51+01:00uxkkpFeat connect model group configurator to redux #91I connected both the modelgroupconfigurator as well as the modelgroupcard to redux.
Test Coverage:
87.5% for /ModelGroupConfigurator
90.9% for ModelGroupCardI connected both the modelgroupconfigurator as well as the modelgroupcard to redux.
Test Coverage:
87.5% for /ModelGroupConfigurator
90.9% for ModelGroupCarduxkkpuxkkphttps://git.scc.kit.edu/m-team/o3as/o3webapp/-/merge_requests/36Feat quick fixed#952022-01-27T21:52:20+01:00uctwiFeat quick fixed#95What I did:
- fixed test for plotSlice
- fixed test for plotTypeSelector
- removed an unnecessary field from plot slice and removed the corresponding selector
- edited jsdoc in modelsliceWhat I did:
- fixed test for plotSlice
- fixed test for plotTypeSelector
- removed an unnecessary field from plot slice and removed the corresponding selector
- edited jsdoc in modelsliceuctwiuctwihttps://git.scc.kit.edu/m-team/o3as/o3webapp/-/merge_requests/35Feat connect graph#73 b2022-01-27T21:47:00+01:00uctwiFeat connect graph#73 b## Major stuff:
Displays the tco3_zm plot with fetched data:
![image](/uploads/88ce17ec7827c5ae814ccb4ea0035852/image.png)
Updates to the tco3_return plot with fetched data if the plot type is changed:
![image](/uploads/d97dfabd842dba4...## Major stuff:
Displays the tco3_zm plot with fetched data:
![image](/uploads/88ce17ec7827c5ae814ccb4ea0035852/image.png)
Updates to the tco3_return plot with fetched data if the plot type is changed:
![image](/uploads/d97dfabd842dba449318013af79f0889/image.png)
## Fine tuning:
The graph doesn't rerender if the sidebar is opened or closed.
The graph changes the title to the one entered in the plot name selector. This is currently very slow, we should introduce a "rename plot" button later.
The graph responds to the visibility settings of all added groups. currently there is only one dummy group with one single model, that's why there is just one model showing up in the plots above.
The graph displays an error message if fetching the data failed:
![image](/uploads/25670ab1487383f85532f1d4fb114d05/image.png)
## Spinner:
Introduced a Spinner component that indicates the data fetching
![image](/uploads/6ea95253af8498c7339197163f57738e/image.png)
## Testing:
wrote tests for:
math
spinner
optionsFormatter (the coverage is not that great yet, however a few things will change definitely later, so writing tests for all of this functions seemed a bit of a waste to me...)
graph
## Testing for theuctwiuctwihttps://git.scc.kit.edu/m-team/o3as/o3webapp/-/merge_requests/34Fixed Logo logging errors when testing2022-01-31T08:41:43+01:00uxkkpFixed Logo logging errors when testingfixed an console.error that logo logged when tested, because display was no object but a string.
Changed props.display to also accept strings to make interface more general.fixed an console.error that logo logged when tested, because display was no object but a string.
Changed props.display to also accept strings to make interface more general.uxkkpuxkkphttps://git.scc.kit.edu/m-team/o3as/o3webapp/-/merge_requests/33Connect LatitudeBandSelector to Redux2022-02-02T17:54:31+01:00uqgieConnect LatitudeBandSelector to Redux## What I have done
- I connected LatitudeBandSelector (LBS) to Redux.
- I fixed issues #77 and #79 (@see Trello).
## Expected Result
The issues should be resolved and LBS should still work as before.
## Important Notes
- SOLVED (My fi...## What I have done
- I connected LatitudeBandSelector (LBS) to Redux.
- I fixed issues #77 and #79 (@see Trello).
## Expected Result
The issues should be resolved and LBS should still work as before.
## Important Notes
- SOLVED (My final solution to connecting LBS to Redux is not optimal. The latitudeBand state is still there and can't be removed without any changes.)
- The XAxisSlider/YAxisSlider case sensititvity bug is backuqgieuqgiehttps://git.scc.kit.edu/m-team/o3as/o3webapp/-/merge_requests/32Restructured ModelSlice2022-01-27T17:46:54+01:00uctwiRestructured ModelSliceRestructured the modelslice to our current understanding that the models should stay the same when switching between tco3_zm and tco3_return plot.
Additonally provided new actions (interface) for Add- and EditModelGroupModal.
Removed ...Restructured the modelslice to our current understanding that the models should stay the same when switching between tco3_zm and tco3_return plot.
Additonally provided new actions (interface) for Add- and EditModelGroupModal.
Removed obsolete actions / reducers, rewrote tests to cover new reducers and selectors.
Testing:
![image](/uploads/1f5a46701e5d8442ef654113d90314e1/image.png)uctwiuctwihttps://git.scc.kit.edu/m-team/o3as/o3webapp/-/merge_requests/31Feat update model slice structure#882022-01-27T09:25:23+01:00uctwiFeat update model slice structure#88Updated modelSlice structure to our new understanding that the selected models should stay the same for the tco3_zm and the tco3_return plot.
Added additional actions to provide a convenient interface for AddModelGroup / EditModelGroup ...Updated modelSlice structure to our new understanding that the selected models should stay the same for the tco3_zm and the tco3_return plot.
Added additional actions to provide a convenient interface for AddModelGroup / EditModelGroup Modals. Removed obsolete reducers and corresponding actions.
Adjusted tests:
![image](/uploads/7cc0fad7b51067f7cc9d36a6684ab93b/image.png)uctwiuctwi