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

Feature/dcmfoss 59 - Capacity Group Details View #21

Merged
merged 62 commits into from
Oct 4, 2023
Merged

Feature/dcmfoss 59 - Capacity Group Details View #21

merged 62 commits into from
Oct 4, 2023

Conversation

Ruskyy
Copy link
Contributor

@Ruskyy Ruskyy commented Sep 15, 2023

Description

This inclued a bugfix, aswell as the capacity group front end, and a lot of CSS and UI funcionalities.

Pre-review checks

Bailonis and others added 30 commits September 8, 2023 15:28
@Bailonis
add: capacity demand group chronogram
c929709
@Bailonis
feat: Added weeks by moths on chronogram
d6c3efe
@Bailonis
feat: added brush and some mock data to the grafic
c42a93d
@Bailonis
fix: retrieved mocked data
4a57f5f
@Bailonis
fix: clean some unused code
73ed378
@Bailonis
feat: link frontend with backend
8261285
@Bailonis
fix: null to date on creating capacity group
9648d68
@Bailonis
fix: correct connection of capacitygroups front with back end
2c5d933
@Bailonis
fix: capacitygroup not showing 2 collumns
a385e65
@Bailonis
feat: front and back end connected on the chronogram
2421658
@Bailonis
fix: doing the request automatically, not when push the save button
5acd6ac
@Ruskyy
Draf of data Load
d608dcf
@Ruskyy
ISO Bugfix
c0a42ad
@Ruskyy
Material Demands Details view
d0c1831
@Ruskyy
UI cleanup
fd680a5
@Ruskyy
Edit and Save Functionality working
600fb70 
TODO fix the ISO bug again
@Ruskyy
Update WeeklyView.tsx
8d1fc4e
@Ruskyy
Update WeeklyView.tsx
fca8a1a
@Ruskyy
Update WeeklyView.tsx
137fbf5
@Ruskyy
Demand Management View dates and Revert Changes
fe8a24e
@Ruskyy
more Demands and Edit CSS Edit
0e35797
@Ruskyy
DCMFOSS-79 Bugfix
7756a46
@Ruskyy
CSS Cleanup
634f5d0
@OSousa117 @Ruskyy
commitings the funfings
919c089 
commit the damn fix.
@Ruskyy
Fixed
67930d4
@Ruskyy
Capacity Group Sum View
d73baf3
@Bailonis
fix: typo in maximumcapacity
e3889eb
@Bailonis
fix: typo in capacityGroup ID
474b28c
@Ruskyy
CSS and Overview Sum table
88092f2
@Ruskyy
WIP
a569601
@Ruskyy Ruskyy requested review from SebastianBezold, Bailonis and carslen and removed request for SebastianBezold September 15, 2023 14:19
Bailonis
Bailonis approved these changes Sep 19, 2023
View reviewed changes
Copy link
Contributor

@Bailonis Bailonis left a comment

Choose a reason for hiding this comment

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

Was talking with @Ruskyy and everything seems ok!
Notive that a new dependencie on frontend had been added, but, @Ruskyy updated the DEPENDENCIES_FRONTEND

@carslen
Copy link
Contributor

carslen commented Sep 25, 2023

@Bailonis please resolve merge conflicts

@Bailonis
Copy link
Contributor

@carslen resolved

@carslen
Copy link
Contributor

carslen commented Sep 26, 2023

Again conflicting file FavoriteServiceImpl.java, please resolve merge conflict.

@carslen
Copy link
Contributor

carslen commented Sep 27, 2023

Please resolve merge conflict after merging #19.
We're going to have this issue again and again, until all PRs with the same code snipped changed have been merged one by one.

@Bailonis
Copy link
Contributor

@carslen Resolved on this branch, I will check the others

@Ruskyy Ruskyy changed the title Feature/dcmfoss 59 Feature/dcmfoss 59 - Capacity Group Details View Sep 28, 2023
@carslen carslen merged commit cbeb04f into eclipse-tractusx:main Oct 4, 2023
4 checks passed
@carslen carslen deleted the feature/DCMFOSS-59 branch October 4, 2023 11:18
SebastianBezold pushed a commit that referenced this pull request Jan 31, 2024
@Ruskyy
Merge pull request #21 from catenax-ng/bugfix/DCMFOSS-117
7c60a98 
Table data fixed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Bailonis Bailonis Bailonis approved these changes

@carslen carslen Awaiting requested review from carslen

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
@Ruskyy @carslen @Bailonis @OSousa117