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

General: Enhance exercise buttons with exercise type icons #7216

Merged
merged 5 commits into from
Sep 22, 2023

Conversation

milljoniaer
Copy link
Contributor

@milljoniaer milljoniaer commented Sep 18, 2023

Checklist

General

Client

  • Important: I implemented the changes with a very good performance, prevented too many (unnecessary) REST calls and made sure the UI is responsive, even with large data.
  • I followed the coding and design guidelines.
  • Following the theming guidelines, I specified colors only in the theming variable files and checked that the changes look consistent in both the light and the dark theme.
  • I added multiple integration tests (Jest) related to the features (with a high test coverage), while following the test guidelines.
  • I added authorities to all new routes and checked the course groups for displaying navigation elements (links, buttons).
  • I documented the TypeScript code using JSDoc style.
  • I added multiple screenshots/screencasts of my UI changes.
  • I translated all newly inserted strings into English and German.

Motivation and Context

Stephan suggested adding exercise-type icons for the Create/Import Exercise buttons in the exercise group management view to improve UX.

Description

These icons are already displayed on mobile, when the button label is not displayed anymore. This PR displays them also on desktop after the label.

Edit: Same goes for the course exercise create/import buttons and the order of create and import buttons is unified to first the "Create" Button and then the "Import" Button.

Steps for Testing

Prerequisites:

  • 1 Instructor
  • 1 Exam with 1 Exercise Group
  • View the control section there on mobile and desktop
  • Verify that the exercise-type icons are displayed on both

Review Progress

Code Review

  • Code Review 1
  • Code Review 2

Manual Tests

  • Test 1
  • Test 2

Test Coverage

Screenshots

Desktop:
image

Mobile:
image

course exercises:
image

@milljoniaer milljoniaer requested a review from a team as a code owner September 18, 2023 10:14
@github-actions github-actions bot added the client Pull requests that update TypeScript code. (Added Automatically!) label Sep 18, 2023
@milljoniaer milljoniaer added small client Pull requests that update TypeScript code. (Added Automatically!) and removed client Pull requests that update TypeScript code. (Added Automatically!) labels Sep 18, 2023
lennart-keller
lennart-keller previously approved these changes Sep 18, 2023
Copy link
Contributor

@lennart-keller lennart-keller left a comment

Choose a reason for hiding this comment

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

Code changes lgtm. Have you considered putting the icons in the front instead? Personally, I am a bit unsure what looks better:
icons

DominikRemo
DominikRemo previously approved these changes Sep 18, 2023
Copy link
Contributor

@DominikRemo DominikRemo left a comment

Choose a reason for hiding this comment

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

Code LGTM
Tested on ts2 and works as expected

Copy link
Contributor

@JohannesStoehr JohannesStoehr left a comment

Choose a reason for hiding this comment

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

Looks good over all and I personally like the icons behind the text better as you already did.
Can you also add these icons to the course exercise page? Additionally I noticed that the import and create option in the exam page is the other way round compared to the course page. You could unify that order as well (I'd suggest creation above/before import)

@milljoniaer milljoniaer changed the title General: enhance exercise-group controls with exercise type icons on desktop General: enhance create/import exercise button with exercise type icons on desktop Sep 18, 2023
@milljoniaer
Copy link
Contributor Author

Thank you for your feedback, I sticked to the exercise icon at the end, added the icon also in the course exercise views and unified the order of create/import buttons. Please have another look at the PR.

JohannesStoehr
JohannesStoehr previously approved these changes Sep 18, 2023
Copy link
Contributor

@JohannesStoehr JohannesStoehr left a comment

Choose a reason for hiding this comment

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

Thanks for unifying the two occurrences.
Code looks good to me

DominikRemo
DominikRemo previously approved these changes Sep 18, 2023
@terlan98 terlan98 temporarily deployed to artemis-test5.artemis.cit.tum.de September 18, 2023 17:25 — with GitHub Actions Inactive
terlan98
terlan98 previously approved these changes Sep 18, 2023
Copy link
Contributor

@terlan98 terlan98 left a comment

Choose a reason for hiding this comment

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

Tested on TS5. The icons are visible for exam exercise groups and course exercises 👍

@krusche krusche changed the title General: enhance create/import exercise button with exercise type icons on desktop General: Enhance exercise buttons with exercise type icons Sep 18, 2023
JohannesStoehr
JohannesStoehr previously approved these changes Sep 19, 2023
Copy link
Contributor

@JohannesStoehr JohannesStoehr left a comment

Choose a reason for hiding this comment

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

Reapprove after unification

Copy link
Contributor

@DominikRemo DominikRemo left a comment

Choose a reason for hiding this comment

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

Tested on ts1. Works as expected

Copy link
Contributor

@terlan98 terlan98 left a comment

Choose a reason for hiding this comment

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

Re-tested on TS5 and reapproved

Copy link
Contributor

@laadvo laadvo left a comment

Choose a reason for hiding this comment

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

tested on ts1, icons are displayed as expected

Copy link
Contributor

@lennart-keller lennart-keller left a comment

Choose a reason for hiding this comment

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

Recent code changes lgtm

@krusche krusche merged commit d1e14ab into develop Sep 22, 2023
@krusche krusche deleted the feat/exercise-groups-desktop-icons branch September 22, 2023 14:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
client Pull requests that update TypeScript code. (Added Automatically!) ready to merge small tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants