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.

Sign up for GitHub

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

Jump to bottom

Implementation of #107 #135

Merged
merged 36 commits into from
Jul 5, 2021
Merged

Implementation of #107 #135

merged 36 commits into from
Jul 5, 2021

Conversation

Waldleufer
Copy link
Collaborator

@Waldleufer Waldleufer marked this pull request as draft June 23, 2021 12:49
SaiVarunVaranasi and others added 2 commits June 29, 2021 17:39
@SaiVarunVaranasi
Merge pull request #138 from amosproj/dev-#82
72ffeff 
distributing code from branch Dev #82
@SaiVarunVaranasi
Implemented category seperation
0b1beb2 
The products are seperated based on the Categories:
Generation and Transmission

Need to work on why the products are not
being published as per categories
@Waldleufer Waldleufer changed the base branch from dev to main June 30, 2021 12:38
@Waldleufer Waldleufer changed the base branch from main to dev June 30, 2021 12:42
Waldleufer and others added 2 commits June 30, 2021 14:48
@Waldleufer
Merge pull request #144 from amosproj/dev
271f2e9 
Distribution of current state
@SaiVarunVaranasi @manifau
Sort data recieved from API category/Secnario
808e2b9 
Issue #107.
Sort the projects based on categories and Scenarios.
Created a project Scernario map which can e further used for processing.

Co-authored-by: Mani Anand <mani.anand@fau.de>
Waldleufer
Waldleufer commented Jul 1, 2021
View reviewed changes
Copy link
Collaborator Author

@Waldleufer Waldleufer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm! 🙂

ScoutAtlas and others added 21 commits July 1, 2021 10:29
@ScoutAtlas @Waldleufer
Added getDummyProducts function
2a18194 
Co-authored-by: Martin Wagner <martin.wagner@fau.de>
@ScoutAtlas @Waldleufer
Reworked getSimaProducts
6266048 
Checks if useDummyData is true and depending on that getSimaProducts or getDummyProducts.

Co-authored-by: Martin Wagner <martin.wagner@fau.de>
@ScoutAtlas @Waldleufer
Included custom image to getSimaProducts()
2a33e57 
Co-authored-by: Martin Wagner <martin.wagner@fau.de>
@Waldleufer @ScoutAtlas
Updated Dummy Data
cfaa65b 
Co-authored-by: Julian Oelhaf <julian.oelhaf@posteo.de>
@Waldleufer
Merge branch 'dev-#107' of https://github.com/amosproj/amos-ss2021-ca…
b0bf9c1 
…rbon-footprint into dev-#107
@Waldleufer @ScoutAtlas
Adapting Dummy Data
83c9e25 
Co-authored-by: Julian Oelhaf <julian.oelhaf@posteo.de>
@Waldleufer @ScoutAtlas
Cleanup
914bea1 
Co-authored-by: Julian Oelhaf <julian.oelhaf@posteo.de>
@Waldleufer @ScoutAtlas
@SaiVarunVaranasi @MartinDuersch
Creating three Slices for the Categories
da018f5 
Co-authored-by: Julian Oelhaf <julian.oelhaf@posteo.de>
Co-authored-by: Sai Varun Varanasi <varun.sai.varanasi@fau.de>
Co-authored-by: Martin Dürsch <martin.duersch@t-online.de>
@SaiVarunVaranasi @MartinDuersch
@ScoutAtlas @Waldleufer
added services,solution and scenarios to dummy data
80239c7 
Co-authored-by: Martin Dürsch <martin.duersch@t-online.de>
Co-authored-by: Julian Oelhaf <julian.oelhaf@posteo.de>
Co-authored-by: Martin Wagner <martin.wagner@fau.de>
@ScoutAtlas @Waldleufer
@MartinDuersch @SaiVarunVaranasi
Added selectedType as parameter to functions
95866ee 
Co-authored-by: Martin Wagner <martin.wagner@fau.de>
Co-authored-by: Martin Dürsch <martin.duersch@t-online.de>
Co-authored-by: Sai Varun Varanasi <varun.sai.varanasi@fau.de>
@Waldleufer
Adding PropType to ProductSolutionsServices Component
a34a6d2
@SaiVarunVaranasi @MartinDuersch
@ScoutAtlas @Waldleufer
moved dummy data to another file
2510c24 
Co-authored-by: Martin Dürsch <martin.duersch@t-online.de>
Co-authored-by: Julian Oelhaf <julian.oelhaf@posteo.de>
Co-authored-by: Martin Wagner <martin.wagner@fau.de>
@Waldleufer
Resolved Eslint Error
5438ee0
@Waldleufer
Merge branch 'dev-#107' of https://github.com/amosproj/amos-ss2021-ca…
af99bd6 
…rbon-footprint into dev-#107
Fixes
1f6e71b
changed slices
6e422cf
@SaiVarunVaranasi @Waldleufer
fill data via type and category
dd5f78b 
Co-authored-by: Sai Varun Varanasi <varun.sai.varanasi@fau.de>
Co-authored-by: Martin Wagner <martin.wagner@fau.de>
@Waldleufer @MartinDuersch
Put data in corresponding slices
b9f259c 
"Slice'n dice"

Co-authored-by: Martin Dürsch <martin.duersch@t-online.de>
@Waldleufer @MartinDuersch
Only get projects once (after login)
162157c 
Co-authored-by: Martin Dürsch <martin.duersch@t-online.de>
@Waldleufer @MartinDuersch
Displaying only the Products of the corresponding Category
f7a2294 
Co-authored-by: Martin Dürsch <martin.duersch@t-online.de>
Added optional chaining in switch case
f899d53
Waldleufer
Waldleufer commented Jul 1, 2021
View reviewed changes
Copy link
Collaborator Author

@Waldleufer Waldleufer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

finally!

frontend/src/components/productGrid/ProductGridComponent.js Show resolved Hide resolved
Waldleufer added 9 commits July 2, 2021 10:53
@Waldleufer
Adding some more demo data
9e3ca04
@Waldleufer
Uniforming names of categories and types
5fc85e8 
by creation of global constants
@Waldleufer
Merge branch 'dev-#107' of https://github.com/amosproj/amos-ss2021-ca…
6c36eca 
…rbon-footprint into dev-#107
@Waldleufer
Added more dummy data
0b93a0c 
to test the newly implemented functionality
@Waldleufer
Added a missing break;
2230274
@Waldleufer
Added a function that handles scenarios in the (sorted) ProjectList
99853e7
@Waldleufer
sorted the Projects alphabetically
11ab92d 
and put basline scenarios first
to streamline scenario handling
@Waldleufer
Renaming and Documentation
3b24898
@Waldleufer
Added a class for productObject
7650c31 
the data Structure how the projects are currently stored.
... might not be used in the end, I won't be sad if it gets removed.
@MartinDuersch MartinDuersch marked this pull request as ready for review July 2, 2021 12:21
ScoutAtlas
ScoutAtlas reviewed Jul 2, 2021
View reviewed changes
Copy link
Collaborator

@ScoutAtlas ScoutAtlas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very smart and elegant solution.

frontend/src/interface/processBackendData.js Outdated Show resolved Hide resolved
frontend/src/resources/globalConstants/SimaProProductCategories.js Show resolved Hide resolved
MartinDuersch
MartinDuersch approved these changes Jul 2, 2021
View reviewed changes
Copy link
Collaborator

@MartinDuersch MartinDuersch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Greatly improved data management

frontend/src/components/login/LoginComponent.js Show resolved Hide resolved
frontend/src/components/productGrid/ProductGridComponent.js Show resolved Hide resolved
frontend/src/interface/simaProInterface.js Show resolved Hide resolved
frontend/src/interface/simaProInterface.js Show resolved Hide resolved
frontend/src/resources/globalConstants/SimaProProductCategories.js Show resolved Hide resolved
frontend/src/assets/dummyData/dummyData.js Outdated Show resolved Hide resolved
frontend/src/store/actions/productAction.js Show resolved Hide resolved
@Waldleufer
Updating Documentation
a97bfe5 
and implementing tweaks as suggested by Reviewers
@Waldleufer Waldleufer merged commit ec244b0 into dev Jul 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ScoutAtlas ScoutAtlas ScoutAtlas left review comments

@MartinDuersch MartinDuersch MartinDuersch approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Waldleufer @MartinDuersch @ScoutAtlas @SaiVarunVaranasi