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

Bugfix/bugfix 47 #19

Merged
merged 10 commits into from
Sep 27, 2023
Merged

Conversation

Diogo12246
Copy link
Contributor

fixed the calendar bug by refactoring some code and implementing moment js

@Ruskyy Ruskyy requested review from Ruskyy and carslen September 15, 2023 13:22
Copy link
Contributor

@Ruskyy Ruskyy left a comment

Choose a reason for hiding this comment

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

Please fix the following issues

@@ -26,73 +26,95 @@ import { DemandCategoryContext } from '../contexts/DemandCategoryProvider';
import { Demand, DemandCategory, DemandProp, DemandSeriesValue, MaterialDemandSery } from '../interfaces/demand_interfaces';
import { Button, ButtonGroup, ToggleButton, OverlayTrigger, Tooltip } from 'react-bootstrap';
import { DemandContext } from '../contexts/DemandContextProvider';
import moment from 'moment';
Copy link
Contributor

Choose a reason for hiding this comment

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

Missing updated Dependencies File

@Bailonis
Copy link
Contributor

@Ruskyy I think it is all good now

@Ruskyy
Copy link
Contributor

Ruskyy commented Sep 19, 2023

Yes, its OK now!

@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

There is still, or after merging #18 again a merge conflict. This is a good example, to not fix the same problem in different branches. @Bailonis please rebase again and resolve.

Copy link
Contributor

@carslen carslen left a comment

Choose a reason for hiding this comment

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

LGTM

@carslen carslen merged commit 861f313 into eclipse-tractusx:main Sep 27, 2023
3 checks passed
@Bailonis Bailonis deleted the bugfix/bugfix_47 branch December 15, 2023 15:50
SebastianBezold pushed a commit that referenced this pull request Jan 31, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants