Adaptive learning: Fix learner profile settings

src/main/java/de/tum/cit/aet/artemis/atlas/repository/CourseLearnerProfileRepository.java

@@ -48,6 +48,7 @@ public interface CourseLearnerProfileRepository extends ArtemisJpaRepository<Cou
     @Query("""
                 SELECT clp
                 FROM CourseLearnerProfile clp
+                LEFT JOIN FETCH clp.course
                 WHERE clp.learnerProfile.user.login = :login AND clp.course = :course
             """)
     Optional<CourseLearnerProfile> findByLoginAndCourse(@Param("login") String login, @Param("course") Course course);

src/main/java/de/tum/cit/aet/artemis/atlas/service/profile/CourseLearnerProfileService.java

@@ -1,5 +1,6 @@
 package de.tum.cit.aet.artemis.atlas.service.profile;
 
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -35,13 +36,20 @@ public CourseLearnerProfileService(CourseLearnerProfileRepository courseLearnerP
 
     /**
      * Create a course learner profile for a user and saves it in the database
+     * If a profile already exists for this user and course, it returns the existing profile.
      *
      * @param course the course for which the profile is created
      * @param user   the user for which the profile is created
      * @return Saved CourseLearnerProfile
      */
     public CourseLearnerProfile createCourseLearnerProfile(Course course, User user) {
 
+        // Check if a profile already exists for this user and course
+        Optional<CourseLearnerProfile> existingProfile = courseLearnerProfileRepository.findByLoginAndCourse(user.getLogin(), course);
+        if (existingProfile.isPresent()) {
+            return existingProfile.get();
+        }
+
         // Ensure that the user has a learner profile (lazy creation)
         if (user.getLearnerProfile() == null) {
             learnerProfileService.createProfile(user);

src/main/webapp/app/core/user/settings/learner-profile/feedback-learner-profile/feedback-learner-profile.component.html

@@ -15,17 +15,17 @@ <h2 jhiTranslate="artemisApp.learnerProfile.feedbackLearnerProfile.title"></h2>
     <!-- Profile settings section -->
     <button class="btn btn-outline-secondary mt-3" (click)="openOnboardingModal()" jhiTranslate="artemisApp.learnerProfile.feedbackLearnerProfile.replayOnboardingButton"></button>
     <div [ngClass]="{ 'd-none': disabled }">
-        <div class="row row-cols-1 row-cols-xl-2 gx-5 align-items-end">
+        <div class="row row-cols-1 row-cols-xl-2 gx-5">
             <!-- Brief vs. Detailed setting -->
-            <div class="col">
+            <div class="col d-flex flex-column">
                 <div class="title" jhiTranslate="artemisApp.learnerProfile.feedbackLearnerProfile.feedbackDetail.label"></div>
                 <div class="description" jhiTranslate="artemisApp.learnerProfile.feedbackLearnerProfile.feedbackDetail.description"></div>
-                <jhi-segmented-toggle [options]="feedbackDetailOptions" [(selected)]="feedbackDetail" (selectedChange)="onToggleChange()" />
+                <jhi-segmented-toggle class="mt-auto" [options]="feedbackDetailOptions" [(selected)]="feedbackDetail" (selectedChange)="onToggleChange()" />
             </div>
-            <div class="col">
+            <div class="col d-flex flex-column">
                 <div class="title" jhiTranslate="artemisApp.learnerProfile.feedbackLearnerProfile.feedbackFormality.label"></div>
                 <div class="description" jhiTranslate="artemisApp.learnerProfile.feedbackLearnerProfile.feedbackFormality.description"></div>
-                <jhi-segmented-toggle [options]="feedbackFormalityOptions" [(selected)]="feedbackFormality" (selectedChange)="onToggleChange()" />
+                <jhi-segmented-toggle class="mt-auto" [options]="feedbackFormalityOptions" [(selected)]="feedbackFormality" (selectedChange)="onToggleChange()" />
             </div>
         </div>
     </div>

src/main/webapp/app/shared/segmented-toggle/segmented-toggle.component.html

@@ -1,8 +1,8 @@
 <div class="segmented-toggle-container">
     <div class="btn-group w-100">
-        @for (option of options; track option.value) {
-            <button type="button" class="btn" [ngClass]="selected === option.value ? 'btn-primary' : 'btn-outline-secondary'" (click)="select(option.value)">
-                {{ option.label }}
+        @for (option of options(); track option.value) {
+            <button type="button" class="btn" [ngClass]="selected() === option.value ? 'btn-primary' : 'btn-outline-secondary'" (click)="select(option.value)">
+                <span class="label" [attr.title]="option.label">{{ option.label }}</span>
             </button>
         }
     </div>

src/main/webapp/app/shared/segmented-toggle/segmented-toggle.component.scss

@@ -5,4 +5,26 @@
 .btn-group {
     display: flex;
     width: 100%;
+    align-items: stretch;
+}
+
+.btn-group .btn {
+    flex: 1;
+    min-width: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    text-align: center;
+    padding-top: 0.625rem; /* 10px */
+    padding-bottom: 0.625rem; /* 10px */
+}
+
+.btn-group .btn .label {
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: normal; /* allow wrap */
+    line-height: 1.2;
+    -webkit-line-clamp: 2; /* default clamp to 2 lines */
 }

src/main/webapp/app/shared/segmented-toggle/segmented-toggle.component.spec.ts

@@ -22,33 +22,29 @@ describe('SegmentedToggleComponent', () => {
 
         fixture = TestBed.createComponent(SegmentedToggleComponent<number>);
         component = fixture.componentInstance;
-        component.options = mockOptions;
+        fixture.componentRef.setInput('options', mockOptions);
         fixture.detectChanges();
     });
 
     it('should create', () => {
         expect(component).toBeTruthy();
-        expect(component.options).toEqual(mockOptions);
+        expect(component.options()).toEqual(mockOptions);
     });
 
     it('should bind selected value correctly', () => {
-        component.selected = 2;
+        component.selected.set(2);
         fixture.detectChanges();
-        expect(component.selected).toBe(2);
+        expect(component.selected()).toBe(2);
     });
 
     it('should emit selectedChange event when an option is selected', () => {
         const selectedValue = 1;
-        const spy = jest.spyOn(component.selectedChange, 'emit');
-
         component.select(selectedValue);
-
-        expect(spy).toHaveBeenCalledWith(selectedValue);
-        expect(component.selected).toBe(selectedValue);
+        expect(component.selected()).toBe(selectedValue);
     });
 
     it('should handle empty options array', () => {
-        component.options = [];
+        fixture.componentRef.setInput('options', []);
         fixture.detectChanges();
 
         const compiled = fixture.nativeElement;
@@ -57,7 +53,7 @@ describe('SegmentedToggleComponent', () => {
     });
 
     it('should render all options correctly', () => {
-        component.options = mockOptions;
+        fixture.componentRef.setInput('options', mockOptions);
         fixture.detectChanges();
 
         const compiled = fixture.nativeElement;
@@ -70,8 +66,8 @@ describe('SegmentedToggleComponent', () => {
     });
 
     it('should apply selected class to the active option', () => {
-        component.options = mockOptions;
-        component.selected = 2;
+        fixture.componentRef.setInput('options', mockOptions);
+        component.selected.set(2);
         fixture.detectChanges();
 
         const compiled = fixture.nativeElement;

src/main/webapp/app/shared/segmented-toggle/segmented-toggle.component.ts

@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { Component, input, model } from '@angular/core';
 import { NgClass } from '@angular/common';
 
 @Component({
@@ -9,12 +9,11 @@ import { NgClass } from '@angular/common';
     styleUrls: ['./segmented-toggle.component.scss'],
 })
 export class SegmentedToggleComponent<T> {
-    @Input() options: { label: string; value: T }[] = [];
-    @Input() selected: T;
-    @Output() selectedChange = new EventEmitter<T>();
+    options = input<{ label: string; value: T }[]>([]);
+    selected = model<T>();
+    maxLines = input(2);
 
     select(value: T) {
-        this.selected = value;
-        this.selectedChange.emit(value);
+        this.selected.set(value);
     }
 }

src/main/webapp/i18n/de/learnerProfile.json

@@ -47,7 +47,7 @@
                     "friendly": "Freundlich"
                 },
                 "profileSaved": "Feedback-Lernprofil gespeichert",
-                "invalidRange": "Werte müssen true oder false sein",
+                "invalidRange": "Werte müssen zwischen 1 und 3 liegen",
                 "error": "Feedback-Lernprofil konnte nicht gespeichert werden",
                 "setPreferencesButton": "Feedback-Präferenzen festlegen",
                 "replayOnboardingButton": "Onboarding wiederholen"

src/main/webapp/i18n/en/learnerProfile.json

@@ -47,7 +47,7 @@
                     "friendly": "Friendly"
                 },
                 "profileSaved": "Feedback learner profile saved",
-                "invalidRange": "Values must be true or false",
+                "invalidRange": "Values must be between 1 and 3",
                 "error": "Feedback learner profile could not be saved",
                 "setPreferencesButton": "Set your feedback preferences",
                 "replayOnboardingButton": "Replay onboarding"