Feature/drag and drop question (ls1intum#55)

* Set up the creation of drag and drop questions for instructors and teaching assistants * Implemented file upload functionality * Updated Datamodel: save correct mappings in DragAndDropQuestion, not as correctLocation in DragItem * Changed all occurences of "arTeMiSApp" to "artemisApp" in front-end code (was inconsistent) * Check questions for validity (title not empty, at least one correct answer option / mapping) and show reasons why a quiz is invalid in tooltip * Refactored markdown parsing to markdown.service.js (accessed as ArtemisMarkdown)
AWS-BugBust-32 · Jan 18, 2018 · 8810787 · 8810787
1 parent f0bc207
commit 8810787
Show file tree

Hide file tree

Showing 199 changed files with 3,758 additions and 1,307 deletions.
diff --git a/.gitignore b/.gitignore
@@ -154,3 +154,4 @@ out
 /.idea/artifacts
 /.idea/libraries
 /.idea/workspace.xml
+uploads
diff --git a/.jhipster/DragAndDropAssignment.json → .jhipster/DragAndDropMapping.json b/.jhipster/DragAndDropAssignment.json → .jhipster/DragAndDropMapping.json
@@ -3,13 +3,13 @@
     "relationships": [
         {
             "relationshipType": "many-to-one",
-            "relationshipName": "item",
+            "relationshipName": "dragItem",
             "otherEntityName": "dragItem",
             "otherEntityField": "id"
         },
         {
             "relationshipType": "many-to-one",
-            "relationshipName": "location",
+            "relationshipName": "dropLocation",
             "otherEntityName": "dropLocation",
             "otherEntityField": "id"
         },
@@ -18,12 +18,27 @@
             "relationshipName": "submittedAnswer",
             "otherEntityName": "dragAndDropSubmittedAnswer",
             "otherEntityField": "id"
+        },
+        {
+            "relationshipType": "many-to-one",
+            "relationshipName": "question",
+            "otherEntityName": "dragAndDropQuestion",
+            "otherEntityField": "id"
+        }
+    ],
+    "fields": [
+        {
+            "fieldName": "dragItemIndex",
+            "fieldType": "Integer"
+        },
+        {
+            "fieldName": "dropLocationIndex",
+            "fieldType": "Integer"
         }
     ],
-    "fields": [],
-    "changelogDate": "20170831094203",
-    "entityTableName": "drag_and_drop_assignment",
+    "changelogDate": "20180116141221",
+    "entityTableName": "drag_and_drop_mapping",
     "dto": "no",
     "pagination": "no",
     "service": "no"
-}
+}
diff --git a/.jhipster/DragAndDropQuestion.json b/.jhipster/DragAndDropQuestion.json
@@ -12,6 +12,12 @@
             "relationshipName": "dragItems",
             "otherEntityName": "dragItem",
             "otherEntityRelationshipName": "question"
+        },
+        {
+            "relationshipType": "one-to-many",
+            "relationshipName": "correctMappings",
+            "otherEntityName": "dragAndDropMapping",
+            "otherEntityRelationshipName": "question"
         }
     ],
     "fields": [
@@ -25,4 +31,4 @@
     "dto": "no",
     "pagination": "no",
     "service": "no"
-}
+}
diff --git a/.jhipster/DragAndDropSubmittedAnswer.json b/.jhipster/DragAndDropSubmittedAnswer.json
@@ -3,8 +3,8 @@
     "relationships": [
         {
             "relationshipType": "one-to-many",
-            "relationshipName": "assignments",
-            "otherEntityName": "dragAndDropAssignment",
+            "relationshipName": "mappings",
+            "otherEntityName": "dragAndDropMapping",
             "otherEntityRelationshipName": "submittedAnswer"
         }
     ],
@@ -14,4 +14,4 @@
     "dto": "no",
     "pagination": "no",
     "service": "no"
-}
+}
diff --git a/.jhipster/DragItem.json b/.jhipster/DragItem.json
@@ -1,14 +1,6 @@
 {
     "fluentMethods": true,
     "relationships": [
-        {
-            "relationshipType": "one-to-one",
-            "relationshipName": "correctLocation",
-            "otherEntityName": "dropLocation",
-            "otherEntityField": "id",
-            "ownerSide": true,
-            "otherEntityRelationshipName": "dragItem"
-        },
         {
             "relationshipType": "many-to-one",
             "relationshipName": "question",
@@ -24,14 +16,6 @@
         {
             "fieldName": "text",
             "fieldType": "String"
-        },
-        {
-            "fieldName": "correctScore",
-            "fieldType": "Integer"
-        },
-        {
-            "fieldName": "incorrectScore",
-            "fieldType": "Integer"
         }
     ],
     "changelogDate": "20170831094155",

diff --git a/bower.json b/bower.json
@@ -43,7 +43,8 @@
     "angular-resizable": "https://github.com/Reklino/angular-resizable.git#bd77750c910f0cc85a774fba4f6df433a97fc53d",
     "showdown": "^1.7.6",
     "chart.js": "^2.7.0",
-    "angular-chart.js": "^1.1.1"
+    "angular-chart.js": "^1.1.1",
+    "angular-native-dragdrop": "^1.2.2"
   },
   "devDependencies": {
     "angular-mocks": "1.5.8"

diff --git a/exerciseapp.jh b/exerciseapp.jh
@@ -126,8 +126,6 @@ entity DropLocation {
 entity DragItem {
 	pictureFilePath String
     text String
-    correctScore Integer
-    incorrectScore Integer
 }
 
 entity Participation (participation) {
@@ -192,8 +190,9 @@ entity DragAndDropSubmittedAnswer {      //extends SubmittedAnswer
 
 }
 
-entity DragAndDropAssignment {
-
+entity DragAndDropMapping {
+	dragItemIndex Integer
+    dropLocationIndex Integer
 }
 
 relationship OneToMany {
@@ -209,7 +208,8 @@ relationship OneToMany {
   DragAndDropQuestion{dropLocations} to DropLocation{question},
   DragAndDropQuestion{dragItems} to DragItem{question},
   QuizSubmission{submittedAnswers} to SubmittedAnswer{submission},
-  DragAndDropSubmittedAnswer{assignments} to DragAndDropAssignment{submittedAnswer}
+  DragAndDropSubmittedAnswer{mappings} to DragAndDropMapping{submittedAnswer},
+  DragAndDropQuestion{correctMappings} to DragAndDropMapping{question}
 }
 
 relationship OneToOne {
@@ -218,7 +218,6 @@ relationship OneToOne {
     AnswerCounter{answer} to AnswerOption,
     DropLocationCounter{dropLocation} to DropLocation,
     Result{submission} to Submission,
-    DragItem{correctLocation} to DropLocation,
     LtiUserId{user} to User
 }
 
@@ -227,8 +226,8 @@ relationship ManyToOne {
   LtiOutcomeUrl{user} to User,
   LtiOutcomeUrl{exercise} to Exercise,
   SubmittedAnswer{question} to Question
-  DragAndDropAssignment{item} to DragItem,
-  DragAndDropAssignment{location} to DropLocation
+  DragAndDropMapping{dragItem} to DragItem,
+  DragAndDropMapping{dropLocation} to DropLocation
 }
 
 relationship ManyToMany {

diff --git a/src/main/java/de/tum/in/www1/exerciseapp/config/CacheConfiguration.java b/src/main/java/de/tum/in/www1/exerciseapp/config/CacheConfiguration.java
@@ -73,8 +73,6 @@ public JCacheManagerCustomizer cacheManagerCustomizer() {
             cm.createCache(de.tum.in.www1.exerciseapp.domain.QuizSubmission.class.getName(), jcacheConfiguration);
             cm.createCache(de.tum.in.www1.exerciseapp.domain.QuizSubmission.class.getName() + ".submittedAnswers", jcacheConfiguration);
             cm.createCache(de.tum.in.www1.exerciseapp.domain.DragAndDropSubmittedAnswer.class.getName(), jcacheConfiguration);
-            cm.createCache(de.tum.in.www1.exerciseapp.domain.DragAndDropSubmittedAnswer.class.getName() + ".assignments", jcacheConfiguration);
-            cm.createCache(de.tum.in.www1.exerciseapp.domain.DragAndDropAssignment.class.getName(), jcacheConfiguration);
             cm.createCache(de.tum.in.www1.exerciseapp.domain.Question.class.getName() + ".quizExercises", jcacheConfiguration);
             cm.createCache(de.tum.in.www1.exerciseapp.domain.Result.class.getName() + ".feedbacks", jcacheConfiguration);
             cm.createCache(de.tum.in.www1.exerciseapp.domain.Feedback.class.getName(), jcacheConfiguration);
@@ -96,6 +94,11 @@ public JCacheManagerCustomizer cacheManagerCustomizer() {
             cm.createCache(de.tum.in.www1.exerciseapp.domain.QuizPointStatistic.class.getName() + ".pointCounters", jcacheConfiguration);
             cm.createCache(de.tum.in.www1.exerciseapp.domain.MultipleChoiceQuestionStatistic.class.getName() + ".answerCounters", jcacheConfiguration);
             cm.createCache(de.tum.in.www1.exerciseapp.domain.DragAndDropQuestionStatistic.class.getName() + ".dropLocationCounters", jcacheConfiguration);
+            cm.createCache(de.tum.in.www1.exerciseapp.domain.DragItem.class.getName() + ".mappings", jcacheConfiguration);
+            cm.createCache(de.tum.in.www1.exerciseapp.domain.DropLocation.class.getName() + ".mappings", jcacheConfiguration);
+            cm.createCache(de.tum.in.www1.exerciseapp.domain.DragAndDropQuestion.class.getName() + ".correctMappings", jcacheConfiguration);
+            cm.createCache(de.tum.in.www1.exerciseapp.domain.DragAndDropSubmittedAnswer.class.getName() + ".mappings", jcacheConfiguration);
+            cm.createCache(de.tum.in.www1.exerciseapp.domain.DragAndDropMapping.class.getName(), jcacheConfiguration);
             // jhipster-needle-ehcache-add-entry
         };
     }

diff --git a/src/main/java/de/tum/in/www1/exerciseapp/config/Constants.java b/src/main/java/de/tum/in/www1/exerciseapp/config/Constants.java
@@ -15,6 +15,11 @@ public final class Constants {
     public static final int QUIZ_AUTOMATIC_SUBMISSION_DELAY_IN_SECONDS = 3;
     public static final int QUIZ_GRACE_PERIOD_IN_SECONDS = 2;
 
+    public static final String TEMP_FILEPATH = "uploads/images/temp/";
+    public static final String DRAG_AND_DROP_BACKGROUND_FILEPATH = "uploads/images/drag-and-drop/backgrounds/";
+    public static final String DRAG_ITEM_FILEPATH = "uploads/images/drag-and-drop/drag-items/";
+    public static final String FILEPATH_ID_PLACHEOLDER = "PLACEHOLDER_FOR_ID";
+
     private Constants() {
     }
 }
diff --git a/src/main/java/de/tum/in/www1/exerciseapp/domain/DragAndDropAssignment.java b/src/main/java/de/tum/in/www1/exerciseapp/domain/DragAndDropAssignment.java