Merge branch 'develop' into feature/competencies/redesign-relations-c…

…reation
ls1intum · Oct 16, 2024 · b3f14d7 · b3f14d7
2 parents f1136c2 + 6431b46
commit b3f14d7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyJolService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyJolService.java
@@ -86,9 +86,7 @@ public void setJudgementOfLearning(long competencyId, long userId, short jolValu
         irisCourseChatSessionService.ifPresent(service -> {
             // Inform Iris so it can send a message to the user
             try {
-                if (userId % 3 > 0) { // HD3-GROUPS: Iris groups are 1 & 2
-                    service.onJudgementOfLearningSet(jol);
-                }
+                service.onJudgementOfLearningSet(jol);
             }
             catch (Exception e) {
                 log.warn("Something went wrong while sending the judgement of learning to Iris", e);

diff --git a/src/main/webapp/app/overview/course-dashboard/course-dashboard.component.ts b/src/main/webapp/app/overview/course-dashboard/course-dashboard.component.ts
@@ -67,16 +67,13 @@ export class CourseDashboardComponent implements OnInit, OnDestroy {
         this.paramSubscription = this.route.parent?.parent?.params.subscribe((params) => {
             this.courseId = parseInt(params['courseId'], 10);
 
-            // HD3-GROUPS: Experiment groups for IRIS are 1 & 2. Disable for group 0
-            if (this.accountService.userIdentity && this.accountService.userIdentity!.id! % 3 > 0) {
-                this.profileService.getProfileInfo().subscribe((profileInfo) => {
-                    if (profileInfo?.activeProfiles.includes(PROFILE_IRIS)) {
-                        this.irisSettingsService.getCombinedCourseSettings(this.courseId).subscribe((settings) => {
-                            this.irisEnabled = !!settings?.irisChatSettings?.enabled;
-                        });
-                    }
-                });
-            }
+            this.profileService.getProfileInfo().subscribe((profileInfo) => {
+                if (profileInfo?.activeProfiles.includes(PROFILE_IRIS)) {
+                    this.irisSettingsService.getCombinedCourseSettings(this.courseId).subscribe((settings) => {
+                        this.irisEnabled = !!settings?.irisChatSettings?.enabled;
+                    });
+                }
+            });
         });
         this.setCourse(this.courseStorageService.getCourse(this.courseId));