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

Adaptive learning: Allow editors to edit the competency link weight #9564

Merged
merged 50 commits into from
Oct 30, 2024

Conversation

JohannesStoehr
Copy link
Contributor

@JohannesStoehr JohannesStoehr commented Oct 22, 2024

🚨 Stacked on #9517 only merge after the other PR 🚨

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 (e.g. using paging).
  • I strictly followed the principle of data economy for all client-server REST calls.
  • I strictly followed the client coding and design guidelines.
  • I added multiple integration tests (Jest) related to the features (with a high test coverage), while following the test guidelines.
  • I added multiple screenshots/screencasts of my UI changes.
  • I translated all newly inserted strings into English and German.

Motivation and Context

#9446
continuation of #9517

Description

#9517 changed the database and object structure to support weights between competencies and learning objects.
This PR now adds a dropdown for all selected competencies to allow the user to choose between a 'low', 'medium' and 'high' weight of the link.

Steps for Testing

Prerequisites:

  • 1 Instructor
  • 1 Exercise or Lecture Unit
  • Competencies/Prerequisites
  1. Log in to Artemis
  2. Create/Update the learning object and select some competencies or prerequisites to link
  3. Change the weight via the dropdown
  4. Check that after saving and reentering the edit view of the learning object the competencies are linked with the weight you choose

Testserver States

Note

These badges show the state of the test servers.
Green = Currently available, Red = Currently locked
Click on the badges to get to the test servers.







Review Progress

Performance Review

  • I (as a reviewer) confirm that the client changes (in particular related to REST calls and UI responsiveness) are implemented with a very good performance even for very large courses with more than 2000 students.
  • I (as a reviewer) confirm that the server changes (in particular related to database calls) are implemented with a very good performance even for very large courses with more than 2000 students.

Code Review

  • Code Review 1
  • Code Review 2

Manual Tests

  • Test 1
  • Test 2

Performance Tests

  • Test 1
  • Test 2

Test Coverage

Client

Class/File Line Coverage Confirmation (assert/expect)
competency-selection.component.ts 95%

Screenshots

Weight dropdown only for selected competencies:
Bildschirmfoto 2024-10-22 um 21 14 48

Tooltip explaining the weight:
Bildschirmfoto 2024-10-22 um 21 14 59

…-weight

# Conflicts:
#	src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyService.java
#	src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CourseCompetencyService.java
#	src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/PrerequisiteService.java
#	src/test/javascript/spec/component/competencies/competency-management/competency-management.component.spec.ts
@JohannesStoehr JohannesStoehr added this to the 7.6.3 milestone Oct 22, 2024
@JohannesStoehr JohannesStoehr self-assigned this Oct 22, 2024
@JohannesStoehr JohannesStoehr requested a review from a team as a code owner October 22, 2024 19:23
@github-actions github-actions bot added tests client Pull requests that update TypeScript code. (Added Automatically!) labels Oct 22, 2024
@JohannesStoehr JohannesStoehr changed the title Adaptive Learning: Allow editors to edit the competency link weight Adaptive learning: Allow editors to edit the competency link weight Oct 22, 2024
dmytropolityka
dmytropolityka previously approved these changes Oct 28, 2024
Copy link
Contributor

@dmytropolityka dmytropolityka left a comment

Choose a reason for hiding this comment

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

code

JohannesStoehr and others added 4 commits October 28, 2024 12:22
…-weight

# Conflicts:
#	src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseDeletionService.java
#	src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java
#	src/main/java/de/tum/cit/aet/artemis/text/repository/TextExerciseRepository.java
…feature/adaptive-learning/competency-link-weight-edit
Copy link
Collaborator

@MaximilianAnzinger MaximilianAnzinger left a comment

Choose a reason for hiding this comment

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

Maintainer approved

JohannesStoehr and others added 3 commits October 30, 2024 11:44
…-weight

# Conflicts:
#	src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-problem.component.html
…feature/adaptive-learning/competency-link-weight-edit
Base automatically changed from feature/adaptive-learning/competency-link-weight to develop October 30, 2024 14:22
…-weight-edit

# Conflicts:
#	src/main/webapp/app/entities/competency.model.ts
#	src/main/webapp/app/shared/competency-selection/competency-selection.component.ts
#	src/test/javascript/spec/component/shared/competency-selection.component.spec.ts
Copy link

coderabbitai bot commented Oct 30, 2024

Warning

Rate limit exceeded

@JohannesStoehr has exceeded the limit for the number of commits or files that can be reviewed per hour. Please wait 25 minutes and 7 seconds before requesting another review.

⌛ How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.

Please see our FAQ for further information.

📥 Commits

Reviewing files that changed from the base of the PR and between d16872d and bf92aac.


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai or @coderabbitai title anywhere in the PR title to generate the title automatically.

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@bassner
Copy link
Member

bassner commented Oct 30, 2024

The base branch was changed so all reviews were lost. This PR had enough approvals.

@bassner bassner merged commit 5562d95 into develop Oct 30, 2024
22 of 30 checks passed
@bassner bassner deleted the feature/adaptive-learning/competency-link-weight-edit branch October 30, 2024 21:38
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 stacked-pr PR that depends on another PR tests user interface
Projects
Status: Merged
Status: Done
Development

Successfully merging this pull request may close these issues.