Adaptive learning: Remove relates relation type for competencies

docs/user/adaptive-learning/adaptive-learning-instructor.rst

@@ -36,7 +36,7 @@ Instructors can manage competencies and prerequisites of a course in the *Compet
 
 * View all competencies and prerequisites of their course
 * Create, edit or delete competencies and prerequisites
-* Manage relations between competencies (which are necessary to build learning paths)
+* :ref:`manage_relations` between competencies
 * :ref:`import_competencies` from other courses or the :ref:`standardized competency catalog<standardized_competency_catalog>`
 * :ref:`generate_competencies` using LLMs
 
@@ -59,6 +59,26 @@ Alternatively, instructors can also link competencies to an exercise or lecture
 
 |instructor-competency-link|
 
+.. _manage_relations:
+
+Manage Relations
+^^^^^^^^^^^^^^^^
+
+| An Instructor can create relations between competencies by selecting a source and target competency from the dropdown menus.
+  They can also set a relation type, which can be one of the following:
+
+* *Assumes*: The head competency assumes the knowledge of the tail competency but does not deepen it. E.g. Class diagrams assume knowledge about object-oriented programming.
+* *Extends*: The head competency builds upon the knowledge of the tail competency and deepens it. E.g. Inheritance deepens the knowledge about object-oriented programming.
+* *Matches*: The knowledge of the head and tail competency match each other.
+
+| The relations are displayed in a diagram below the form and can be deleted by clicking on them.
+
+.. note::
+
+    Relations are necessary for the learning path generation. Without them, Artemis cannot suggest a reasonable order of competencies for students.
+
+|instructor-competency-relations|
+
 .. _import_competencies:
 
 Import Competencies
@@ -149,6 +169,8 @@ Once the feature is enabled, instructors get access to each student's learning p
     :width: 1000
 .. |instructor-competency-link| image:: instructor/competency-link.png
     :width: 600
+.. |instructor-competency-relations| image:: instructor/competency-relations.png
+    :width: 1000
 .. |instructor-generate-competencies| image:: instructor/generate-competencies.png
     :width: 1000
 .. |instructor-competency-recommendation| image:: instructor/competency-recommendation.png

src/main/java/de/tum/in/www1/artemis/domain/competency/RelationType.java

@@ -1,10 +1,6 @@
 package de.tum.in.www1.artemis.domain.competency;
 
 public enum RelationType {
-    /**
-     * A generic relation between two competencies.
-     */
-    RELATES,
     /**
      * The tail competency assumes that the student already achieved the head competency.
      */

src/main/resources/config/liquibase/changelog/20240708144500_changelog.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
+    <changeSet id="20240708144500" author="stoehrj">
+        <sql>
+            UPDATE competency_relation
+            SET type = type - 1
+            WHERE type > 0;
+        </sql>
+    </changeSet>
+</databaseChangeLog>

src/main/resources/config/liquibase/master.xml

@@ -18,6 +18,7 @@
     <include file="classpath:config/liquibase/changelog/20240612123000_changelog.xml" relativeToChangelogFile="false"/>
     <include file="classpath:config/liquibase/changelog/20240614140000_changelog.xml" relativeToChangelogFile="false"/>
     <include file="classpath:config/liquibase/changelog/20240620150000_changelog.xml" relativeToChangelogFile="false"/>
+    <include file="classpath:config/liquibase/changelog/20240708144500_changelog.xml" relativeToChangelogFile="false"/>
     <!-- NOTE: please use the format "YYYYMMDDhhmmss_changelog.xml", i.e. year month day hour minutes seconds and not something else! -->
     <!-- we should also stay in a chronological order! -->
     <!-- you can use the command 'date '+%Y%m%d%H%M%S'' to get the current date and time in the correct format -->

src/main/webapp/app/course/competencies/competency-management/competency-relation-graph.component.html

@@ -39,7 +39,10 @@
                                         (change)="validate()"
                                     >
                                         @for (relationType of competencyRelationType | keyvalue: keepOrder; track relationType) {
-                                            <option [ngValue]="relationType.key">{{ 'artemisApp.competency.relation.type.' + relationType.value | artemisTranslate }}</option>
+                                            <option
+                                                [jhiTranslate]="'artemisApp.competency.relation.type.' + relationType.value"
+                                                [title]="'artemisApp.competency.relation.typeExplanation.' + relationType.value | artemisTranslate"
+                                            ></option>
                                         }
                                     </select>
                                 </div>

src/main/webapp/app/entities/competency.model.ts

@@ -20,7 +20,6 @@ export enum CompetencyTaxonomy {
 }
 
 export enum CompetencyRelationType {
-    RELATES = 'RELATES',
     ASSUMES = 'ASSUMES',
     EXTENDS = 'EXTENDS',
     MATCHES = 'MATCHES',

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

@@ -180,18 +180,22 @@
             },
             "relation": {
                 "competencyRelations": "Beziehungen zwischen Kompetenzen",
-                "tailCompetency": "Kompetenz Schluss",
+                "tailCompetency": "Schlusskompetenz",
                 "relationType": "Beziehungstyp",
-                "headCompetency": "Kompetenz Start",
+                "headCompetency": "Startkompetenz",
                 "createRelation": "Beziehung erstellen",
                 "createsCircularRelation": "Du kannst keine kreisförmigen Beziehungen zwischen Kompetenzen erstellen.",
                 "selfRelation": "Du kannst keine Beziehung zwischen einer Kompetenz und sich selbst erstellen.",
                 "relationAlreadyExists": "Diese Beziehung existiert bereits.",
                 "type": {
-                    "RELATES": "Bezieht sich auf",
                     "ASSUMES": "Setzt voraus",
                     "EXTENDS": "Erweitert",
                     "MATCHES": "Stimmt überein mit"
+                },
+                "typeExplanation": {
+                    "ASSUMES": "Die Startkompetenz setzt das Wissen aus der Schlusskompetenz voraus und bringt neues Wissen bei, das auf der Schlusskompetenz aufbaut.",
+                    "EXTENDS": "Die Startkompetenz setzt das Wissen aus der Schlusskompetenz voraus und vertieft dieses Wissen weiter.",
+                    "MATCHES": "Die Start- und Schlusskompetenz sind gleichwertig und umfassen dasselbe Wissen."
                 }
             }
         },

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

@@ -188,10 +188,14 @@
                 "selfRelation": "You can not create a relation between a competency and itself.",
                 "relationAlreadyExists": "This relation already exists.",
                 "type": {
-                    "RELATES": "Relates",
                     "ASSUMES": "Assumes",
                     "EXTENDS": "Extends",
                     "MATCHES": "Matches"
+                },
+                "typeExplanation": {
+                    "ASSUMES": "The head competency assumes that the student mastered the tail competency and teaches new knowledge that builds upon the tail competency.",
+                    "EXTENDS": "The head competency assumes that the student mastered the tail competency and deepens that knowledge further.",
+                    "MATCHES": "The head and tail competency match and cover the same knowledge."
                 }
             }
         },

src/test/java/de/tum/in/www1/artemis/competency/CompetencyIntegrationTest.java

@@ -935,7 +935,7 @@ void shouldImportCompetencies() throws Exception {
 
             Competency head = createCompetency(course3);
             Competency tail = createCompetency(course3);
-            createRelation(tail, head, RelationType.RELATES);
+            createRelation(tail, head, RelationType.ASSUMES);
 
             competencyDTOList = request.postListWithResponseBody("/api/courses/" + course.getId() + "/competencies/import-all/" + course3.getId() + "?importRelations=true", null,
                     CompetencyWithTailRelationDTO.class, HttpStatus.CREATED);
@@ -1027,7 +1027,7 @@ void shouldImportCompetencies() throws Exception {
 
             Competency head = createCompetency(course2);
             Competency tail = createCompetency(course2);
-            createRelation(tail, head, RelationType.RELATES);
+            createRelation(tail, head, RelationType.ASSUMES);
             List<CourseCompetency> competencyList = List.of(head, tail);
 
             competencyDTOList = request.postListWithResponseBody("/api/courses/" + course.getId() + "/competencies/import/bulk?importRelations=true", competencyList,

src/test/java/de/tum/in/www1/artemis/service/LearningPathServiceTest.java

@@ -252,11 +252,6 @@ void testSimpleRelation(RelationType type) {
             generateGraphAndAssert(expected);
         }
 
-        @Test
-        void testSingleRelates() {
-            testSimpleRelation(RelationType.RELATES);
-        }
-
         @Test
         void testSingleAssumes() {
             testSimpleRelation(RelationType.ASSUMES);
@@ -415,10 +410,10 @@ void testOrderOfCompetenciesByPriorUtility() {
             Competency[] priors2 = competencyUtilService.createCompetencies(course, future(111), future(113), future(115));
 
             for (var competency : priors1) {
-                competencyUtilService.addRelation(competency1, RelationType.RELATES, competency);
+                competencyUtilService.addRelation(competency1, RelationType.ASSUMES, competency);
             }
             for (var competency : priors2) {
-                competencyUtilService.addRelation(competency2, RelationType.RELATES, competency);
+                competencyUtilService.addRelation(competency2, RelationType.ASSUMES, competency);
             }
             masterCompetencies(priors1);
             masterCompetencies(priors2[0]);

src/test/javascript/spec/component/competencies/competency.service.spec.ts

@@ -294,7 +294,7 @@ describe('CompetencyService', () => {
     it('should get competency relations', fakeAsync(() => {
         const relation: CompetencyRelation = {
             id: 1,
-            type: CompetencyRelationType.RELATES,
+            type: CompetencyRelationType.ASSUMES,
         };
         const returnedFromService = [relation];
         const expected = [...returnedFromService];