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

Merge suggestions #1968

Merged
merged 14 commits into from
Jan 22, 2024
Merged

Merge suggestions #1968

merged 14 commits into from
Jan 22, 2024

Conversation

olewoy
Copy link
Collaborator

@olewoy olewoy commented Jun 26, 2023

closes #1780

@janno42 any tipps/ideas to improve the frontend?

Backend in Python is planned to be replaced by using the database.

@janno42
Copy link
Member

janno42 commented Jul 3, 2023

I pushed a suggestion for the UI design into your branch. If you want a detailed explanation about my thoughts, let's talk at a meeting :)

richardebeling
richardebeling reviewed Jul 22, 2023
View reviewed changes
Copy link
Member

@richardebeling richardebeling left a comment

Choose a reason for hiding this comment

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

Not sure if / how much you wanted to have feedback for this PR already. To dismiss my notification in good conscience, I quickly went through the code. Feel free to ignore stuff you already knew, fixed, or that is outdated.

evap/staff/views.py Outdated Show resolved Hide resolved
evap/development/fixtures/test_data.json Outdated Show resolved Hide resolved
evap/development/fixtures/test_data.json Outdated Show resolved Hide resolved
evap/staff/views.py Outdated Show resolved Hide resolved
@janno42
Copy link
Member

janno42 commented Dec 4, 2023

Hey @olewoy, this is a very nice PR and it would be great if you would continue to work on it. Any chance you'll be able to get to it soon?

@olewoy
Copy link
Collaborator Author

olewoy commented Dec 5, 2023

Yes, I will be there at 18.12. and finish it.

@olewoy olewoy marked this pull request as ready for review December 18, 2023 19:50
richardebeling
richardebeling reviewed Dec 20, 2023
View reviewed changes
Copy link
Member

@richardebeling richardebeling left a comment

Choose a reason for hiding this comment

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

Looking mostly good from my side, thank you.

We might incorporate small final changes ourselves to get this merged before the next release. Would this be fine with you?

evap/staff/templates/staff_user_merge_selection.html Outdated Show resolved Hide resolved
evap/staff/templates/staff_user_merge_selection.html Outdated Show resolved Hide resolved
evap/staff/views.py Outdated Show resolved Hide resolved
richardebeling
richardebeling approved these changes Jan 22, 2024
View reviewed changes
Copy link
Member

@richardebeling richardebeling left a comment

Choose a reason for hiding this comment

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

Code is fine with me. We should probably add a test, but we can make a new issue for that.

niklasmohrin
niklasmohrin approved these changes Jan 22, 2024
View reviewed changes
Copy link
Member

@niklasmohrin niklasmohrin left a comment

Choose a reason for hiding this comment

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

Go team!

@richardebeling richardebeling merged commit 439fb3e into e-valuation:main Jan 22, 2024
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@niklasmohrin niklasmohrin niklasmohrin approved these changes

@richardebeling richardebeling richardebeling approved these changes

@janno42 janno42 janno42 approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

User profile merge suggestions
4 participants
@olewoy @janno42 @richardebeling @niklasmohrin