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

134 conflict warning #173

Merged
merged 5 commits into from
Jan 26, 2024
Merged

134 conflict warning #173

merged 5 commits into from
Jan 26, 2024

Conversation

Wallen-Ribeiro
Copy link
Contributor

WHATS NEW?

  • When a schedule option has conflicts with already selected options, a visible warning is shown in it.
  • The warnings are red exclamations, representing conflicts between option class and selected TP Classes.
    Screenshot from 2024-01-13 22-09-11

@Wallen-Ribeiro Wallen-Ribeiro linked an issue Jan 13, 2024 that may be closed by this pull request
Warning in the dropdown when conflicts arise #134
Closed
@diogotvf7
Copy link
Contributor

I merged the main branch into this branch because it was really outdated. However, this is not yet ready for merge as there seem too be some problems with the function that checks collisions:
2024-01-26-18:06:28
In this example there is a collision that isn't being captured in the ScheduleListbox.
Can you check it please?

@diogotvf7
Copy link
Contributor

Fixed, good job!

@diogotvf7 diogotvf7 force-pushed the 134-conflict-warning branch from 5e47bb3 to a774531 Compare January 26, 2024 20:33
diogotvf7
diogotvf7 approved these changes Jan 26, 2024
View reviewed changes
Copy link
Contributor

@diogotvf7 diogotvf7 left a comment

Choose a reason for hiding this comment

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

LGTM!! 🚀

@diogotvf7 diogotvf7 merged commit b9ed23f into develop Jan 26, 2024
@diogotvf7 diogotvf7 deleted the 134-conflict-warning branch January 26, 2024 20:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@diogotvf7 diogotvf7 diogotvf7 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.

Warning in the dropdown when conflicts arise
2 participants
@Wallen-Ribeiro @diogotvf7