Merge branch 'develop' of https://scm.cms.hu-berlin.de/callidus/mc_frontend into develop

src/app/test/test.page.html

@@ -146,11 +146,11 @@
                             ... von ... Aufgaben wurden richtig bearbeitet.<br>
                             Veränderung gegenüber dem 1. Diagnosetest: ...%
                         </ion-item>
-                        <ion-item>
+                        <!--<ion-item>
                             <ion-icon name="medal" slot="start"></ion-icon>
                             <ion-label>Rang im Highscore:</ion-label>
                             Platz ... von ... Teilnehmern
-                        </ion-item>
+                        </ion-item>-->
                     </ion-card>
                 </ion-col>
             </ion-row>

src/app/test/test.page.ts

@@ -37,7 +37,22 @@ export class TestPage implements OnDestroy, OnInit {
         "multi_choice_14", "multi_choice_15", "multi_choice_16", "multi_choice_17",
         "fill_blanks_7", "fill_blanks_8", "fill_blanks_9", "fill_blanks_10",
         "multi_choice_18", "multi_choice_19", "multi_choice_20", "multi_choice_21",
-        "multi_choice_22", "multi_choice_23", "drag_text_1-3", "voc_list_1-86", "nonH5P_2"];
+        "multi_choice_22", "multi_choice_23", "drag_text_1", "drag_text_2", "drag_text_3",
+        "drag_text_4", "drag_text_5", "voc_list_1", "voc_list_2", "voc_list_3", "voc_list_4",
+        "voc_list_5", "voc_list_6", "voc_list_7", "voc_list_8", "voc_list_9", "voc_list_10",
+        "voc_list_11", "voc_list_12", "voc_list_13", "voc_list_14", "voc_list_15", "voc_list_16",
+        "voc_list_17", "voc_list_18", "voc_list_19", "voc_list_20", "voc_list_21", "voc_list_22",
+        "voc_list_23", "voc_list_24", "voc_list_25", "voc_list_26", "voc_list_27", "voc_list_28",
+        "voc_list_29", "voc_list_30", "voc_list_31", "voc_list_32", "voc_list_33", "voc_list_34",
+        "voc_list_35", "voc_list_36", "voc_list_37", "voc_list_38", "voc_list_39", "voc_list_40",
+        "voc_list_41", "voc_list_42", "voc_list_43", "voc_list_44", "voc_list_45", "voc_list_46",
+        "voc_list_47", "voc_list_48", "voc_list_49", "voc_list_50", "voc_list_51", "voc_list_52",
+        "voc_list_53", "voc_list_54", "voc_list_55", "voc_list_56", "voc_list_57", "voc_list_58",
+        "voc_list_59", "voc_list_60", "voc_list_61", "voc_list_62", "voc_list_63", "voc_list_64",
+        "voc_list_65", "voc_list_66", "voc_list_67", "voc_list_68", "voc_list_69", "voc_list_70",
+        "voc_list_71", "voc_list_72", "voc_list_73", "voc_list_74", "voc_list_75", "voc_list_76",
+        "voc_list_77", "voc_list_78", "voc_list_79", "voc_list_80", "voc_list_81", "voc_list_82",
+        "voc_list_83", "voc_list_84", "voc_list_85", "voc_list_86", "nonH5P_2"];
     public secondPartStartIndex: number = 29;
     public testType: TestType;
     public thirdPartStartIndex: number = 34;

src/assets/h5p/drag_text/content/1_de.json

 {
-    "taskDescription": "<p>Ergänze per Drag & Drop die Lücken sinnvoll mit den Wörtern aus dem Pool.<\/p>\n",
+    "taskDescription": "<p><b>Aufgabe:<\/b>Ordne die Wörter aus dem Pool sinnvoll zu, indem Du Kontext und Tipps beachtest. <small>Es folgen vier weitere Lückentexte.<\/small><\/p>\n",
     "checkAnswer": "Weiter",
     "tryAgain": "Erneut versuchen",
     "showSolution": "Lösung zeigen",
@@ -9,11 +9,11 @@
         "instantFeedback": false,
         "enableCheckButton": true
     },
-    "textField": "Atque haec nunc non, ut facias, sed ut te *facere: Gegenwart* et *fecisse: Vergangenheit* gaudeas, scribo; praeclarum *est* enim summo cum *imperio* *fuisse* in Asia triennium sic ut nullum te *signum*, nulla pictura, nullum vas, nulla vestis, nullum mancipium, nulla forma cuiusquam, nulla condicio *pecuniae*, quibus rebus abundat *ista* provincia, ab summa integritate continentiaque deduxerit.\n",
+    "textField": "* atque * haec nunc non, ut facias, sed ut te *facere: Gegenwart* et *fecisse: Vergangenheit* gaudeas, scribo;\n",
     "overallFeedback": [
         {
             "from": 0,
-            "to": 8,
+            "to": 3,
             "feedback": "Score: @score of @total."
         }
     ],

src/assets/h5p/drag_text/content/1_en.json

@@ -9,11 +9,11 @@
         "instantFeedback": false,
         "enableCheckButton": true
     },
-    "textField": "Atque haec nunc non, ut facias, sed ut te *facere: present* et *fecisse: past* gaudeas, scribo; praeclarum *est* enim summo cum *imperio* *fuisse* in Asia triennium sic ut nullum te *signum*, nulla pictura, nullum vas, nulla vestis, nullum mancipium, nulla forma cuiusquam, nulla condicio *pecuniae*, quibus rebus abundat *ista* provincia, ab summa integritate continentiaque deduxerit.\n",
+    "textField": "* atque * haec nunc non, ut facias, sed ut te *facere: present* et *fecisse: past* gaudeas, scribo;\n",
     "overallFeedback": [
         {
             "from": 0,
-            "to": 100,
+            "to": 3,
             "feedback": "Score: @score of @total."
         }
     ],

src/assets/h5p/drag_text/content/2_de.json

 {
-    "taskDescription": "<p>Ergänze per Drag & Drop die Lücken sinnvoll mit den Wörtern aus dem Pool.<\/p>\n",
+    "taskDescription": "<p><b>Aufgabe:<\/b>Ordne die Wörter aus dem Pool sinnvoll zu, indem Du den Kontext beachtest.<small>Es folgen drei weitere Lückentexte.<\/small><\/p>\n",
     "checkAnswer": "Weiter",
     "tryAgain": "Erneut versuchen",
     "showSolution": "Lösung zeigen",
@@ -9,11 +9,11 @@
         "instantFeedback": false,
         "enableCheckButton": true
     },
-    "textField": "quid autem reperiri tam eximium aut tam expetendum potest quam istam *virtutem*, moderationem animi, temperantiam non latere in *tenebris* neque esse abditam, sed in luce Asiae, in *oculis* clarissimae provinciae atque in auribus *omnium* gentium ac nationum esse positam? non itineribus *tuis* perterreri *homines*, non sumptu exhauriri, non adventu commoveri? esse quocumque veneris et publice et privatim maximam laetitiam, cum urbs *custodem* non tyrannum, *domus* *hospitem* non expilatorem recepisse videatur?\n",
+    "textField": "praeclarum *est* enim summo cum *imperio* *fuisse* in Asia triennium sic ut nullum te *signum*, nulla pictura, nullum vas, nulla vestis, nullum mancipium, nulla forma cuiusquam, nulla condicio *pecuniae*, quibus rebus abundat *ista* provincia, ab summa integritate continentiaque deduxerit.\n",
     "overallFeedback": [
         {
             "from": 0,
-            "to": 9,
+            "to": 6,
             "feedback": "Score: @score of @total."
         }
     ],

src/assets/h5p/drag_text/content/2_en.json

@@ -9,11 +9,11 @@
         "instantFeedback": false,
         "enableCheckButton": true
     },
-    "textField": "quid autem reperiri tam eximium aut tam expetendum potest quam istam *virtutem*, moderationem animi, temperantiam non latere in *tenebris* neque esse abditam, sed in luce Asiae, in *oculis* clarissimae provinciae atque in auribus *omnium* gentium ac nationum esse positam? non itineribus *tuis* perterreri *homines*, non sumptu exhauriri, non adventu commoveri? esse quocumque veneris et publice et privatim maximam laetitiam, cum urbs *custodem* non tyrannum, *domus* *hospitem* non expilatorem recepisse videatur?\n",
+    "textField": "praeclarum *est* enim summo cum *imperio* *fuisse* in Asia triennium sic ut nullum te *signum*, nulla pictura, nullum vas, nulla vestis, nullum mancipium, nulla forma cuiusquam, nulla condicio *pecuniae*, quibus rebus abundat *ista* provincia, ab summa integritate continentiaque deduxerit.\n",
     "overallFeedback": [
         {
             "from": 0,
-            "to": 100,
+            "to": 6,
             "feedback": "Score: @score of @total."
         }
     ],

src/assets/h5p/drag_text/content/3_de.json

 {
-    "taskDescription": "<p>Ergänze per Drag & Drop die Lücken sinnvoll mit den Wörtern aus dem Pool.<\/p>\n",
-    "checkAnswer": "Fertig",
+    "taskDescription": "<p><b>Aufgabe:<\/b>Ordne die Wörter aus dem Pool sinnvoll zu, indem Du den Kontext beachtest.<small>Es folgen zwei weitere Lückentexte.<\/small><\/p>\n",
+    "checkAnswer": "Weiter",
     "tryAgain": "Erneut versuchen",
     "showSolution": "Lösung zeigen",
     "behaviour": {
@@ -9,11 +9,11 @@
         "instantFeedback": false,
         "enableCheckButton": true
     },
-    "textField": "his autem in *rebus* iam te usus *ipse* profecto erudivit nequaquam satis esse *ipsum* has te habere virtutes, sed esse circumspiciendum diligenter ut in hac custodia provinciae non te unum sed omnis ministros imperi tui *sociis: Nicht-Römer* et *civibus: Römer* et *rei* publicae *praestare* videare. \n",
+    "textField": "quid * autem * reperiri tam eximium aut tam expetendum potest quam istam *virtutem*, moderationem animi, temperantiam non latere in *tenebris* neque esse abditam, sed in luce Asiae, in *oculis* clarissimae provinciae atque in auribus *omnium* gentium ac nationum esse positam?\n",
     "overallFeedback": [
         {
             "from": 0,
-            "to": 7,
+            "to": 5,
             "feedback": "Score: @score of @total."
         }
     ],

src/assets/h5p/drag_text/content/3_en.json

 {
     "taskDescription": "<p>Use Drag & Drop to fill in the gaps with the words from the pool.<\/p>\n",
-    "checkAnswer": "Ready",
+    "checkAnswer": "Continue",
     "tryAgain": "Retry",
     "showSolution": "Show Solution",
     "behaviour": {
@@ -9,11 +9,11 @@
         "instantFeedback": false,
         "enableCheckButton": true
     },
-    "textField": "his autem in *rebus* iam te usus *ipse* profecto erudivit nequaquam satis esse *ipsum* has te habere virtutes, sed esse circumspiciendum diligenter ut in hac custodia provinciae non te unum sed omnis ministros imperi tui *sociis: not a roman* et *civibus: a roman* et *rei* publicae *praestare* videare. \n",
+    "textField": "quid * autem * reperiri tam eximium aut tam expetendum potest quam istam *virtutem*, moderationem animi, temperantiam non latere in *tenebris* neque esse abditam, sed in luce Asiae, in *oculis* clarissimae provinciae atque in auribus *omnium* gentium ac nationum esse positam?\n",
     "overallFeedback": [
         {
             "from": 0,
-            "to": 100,
+            "to": 5,
             "feedback": "Score: @score of @total."
         }
     ],

src/assets/h5p/drag_text/content/4_de.json

+{
+    "taskDescription": "<p><b>Aufgabe:<\/b>Ordne die Wörter aus dem Pool sinnvoll zu, indem Du den Kontext beachtest.<small>Es folgt ein weiterer Lückentext.<\/small><\/p>\n",
+    "checkAnswer": "Weiter",
+    "tryAgain": "Erneut versuchen",
+    "showSolution": "Lösung zeigen",
+    "behaviour": {
+        "enableRetry": true,
+        "enableSolutionsButton": true,
+        "instantFeedback": false,
+        "enableCheckButton": true
+    },
+    "textField": "non itineribus *tuis* perterreri *homines*, non sumptu exhauriri, non adventu commoveri? esse quocumque veneris et publice et privatim maximam laetitiam, cum urbs *custodem* non tyrannum, *domus* *hospitem* non expilatorem recepisse videatur?\n",
+    "overallFeedback": [
+        {
+            "from": 0,
+            "to": 5,
+            "feedback": "Score: @score of @total."
+        }
+    ],
+    "dropZoneIndex": "Drop Zone @index.",
+    "empty": "Drop Zone @index is empty.",
+    "contains": "Drop Zone @index contains draggable @draggable.",
+    "draggableIndex": "Draggable @text. @index of @count draggables.",
+    "tipLabel": "Tipp!",
+    "correctText": "Richtig!",
+    "incorrectText": "Leider falsch!",
+    "resetDropTitle": "Reset drop",
+    "resetDropDescription": "Are you sure you want to reset this drop zone?",
+    "grabbed": "Draggable is grabbed.",
+    "cancelledDragging": "Cancelled dragging.",
+    "correctAnswer": "Richtige Antwort:",
+    "feedbackHeader": "Feedback",
+    "scoreBarLabel": "Du hast :num von :total Punkten."
+}
\ No newline at end of file

src/assets/h5p/drag_text/content/4_en.json

+{
+    "taskDescription": "<p>Use Drag & Drop to fill in the gaps with the words from the pool.<\/p>\n",
+    "checkAnswer": "Continue",
+    "tryAgain": "Retry",
+    "showSolution": "Show Solution",
+    "behaviour": {
+        "enableRetry": true,
+        "enableSolutionsButton": true,
+        "instantFeedback": false,
+        "enableCheckButton": true
+    },
+    "textField": "non itineribus *tuis* perterreri *homines*, non sumptu exhauriri, non adventu commoveri? esse quocumque veneris et publice et privatim maximam laetitiam, cum urbs *custodem* non tyrannum, *domus* *hospitem* non expilatorem recepisse videatur?\n",
+    "overallFeedback": [
+        {
+            "from": 0,
+            "to": 5,
+            "feedback": "Score: @score of @total."
+        }
+    ],
+    "dropZoneIndex": "Drop Zone @index.",
+    "empty": "Drop Zone @index is empty.",
+    "contains": "Drop Zone @index contains draggable @draggable.",
+    "draggableIndex": "Draggable @text. @index of @count draggables.",
+    "tipLabel": "Show tip",
+    "correctText": "Correct!",
+    "incorrectText": "Incorrect!",
+    "resetDropTitle": "Reset drop",
+    "resetDropDescription": "Are you sure you want to reset this drop zone?",
+    "grabbed": "Draggable is grabbed.",
+    "cancelledDragging": "Cancelled dragging.",
+    "correctAnswer": "Correct answer:",
+    "feedbackHeader": "Feedback",
+    "scoreBarLabel": "You got :num out of :total points"
+}
\ No newline at end of file

src/assets/h5p/drag_text/content/5_de.json

+{
+    "taskDescription": "<p><b>Aufgabe:<\/b>Ordne die Wörter aus dem Pool sinnvoll zu, indem Du den Kontext beachtest.<\/p>\n",
+    "checkAnswer": "Fertig",
+    "tryAgain": "Erneut versuchen",
+    "showSolution": "Lösung zeigen",
+    "behaviour": {
+        "enableRetry": true,
+        "enableSolutionsButton": true,
+        "instantFeedback": false,
+        "enableCheckButton": true
+    },
+    "textField": "his autem in *rebus* iam te usus *ipse* profecto erudivit nequaquam satis esse *ipsum* has te habere virtutes, sed esse circumspiciendum diligenter ut in hac custodia provinciae non te unum sed omnis ministros imperi tui *sociis: Nicht-Römer* et *civibus: Römer* et *rei* publicae *praestare* videare.\n",
+    "overallFeedback": [
+        {
+            "from": 0,
+            "to": 7,
+            "feedback": "Score: @score of @total."
+        }
+    ],
+    "dropZoneIndex": "Drop Zone @index.",
+    "empty": "Drop Zone @index is empty.",
+    "contains": "Drop Zone @index contains draggable @draggable.",
+    "draggableIndex": "Draggable @text. @index of @count draggables.",
+    "tipLabel": "Tipp!",
+    "correctText": "Richtig!",
+    "incorrectText": "Leider falsch!",
+    "resetDropTitle": "Reset drop",
+    "resetDropDescription": "Are you sure you want to reset this drop zone?",
+    "grabbed": "Draggable is grabbed.",
+    "cancelledDragging": "Cancelled dragging.",
+    "correctAnswer": "Richtige Antwort:",
+    "feedbackHeader": "Feedback",
+    "scoreBarLabel": "Du hast :num von :total Punkten."
+}
\ No newline at end of file

src/assets/h5p/drag_text/content/5_en.json

+{
+    "taskDescription": "<p>Use Drag & Drop to fill in the gaps with the words from the pool.<\/p>\n",
+    "checkAnswer": "Ready",
+    "tryAgain": "Retry",
+    "showSolution": "Show Solution",
+    "behaviour": {
+        "enableRetry": true,
+        "enableSolutionsButton": true,
+        "instantFeedback": false,
+        "enableCheckButton": true
+    },
+    "textField": "his autem in *rebus* iam te usus *ipse* profecto erudivit nequaquam satis esse *ipsum* has te habere virtutes, sed esse circumspiciendum diligenter ut in hac custodia provinciae non te unum sed omnis ministros imperi tui *sociis: not a roman* et *civibus: a roman* et *rei* publicae *praestare* videare.\n",
+    "overallFeedback": [
+        {
+            "from": 0,
+            "to": 7,
+            "feedback": "Score: @score of @total."
+        }
+    ],
+    "dropZoneIndex": "Drop Zone @index.",
+    "empty": "Drop Zone @index is empty.",
+    "contains": "Drop Zone @index contains draggable @draggable.",
+    "draggableIndex": "Draggable @text. @index of @count draggables.",
+    "tipLabel": "Show tip",
+    "correctText": "Correct!",
+    "incorrectText": "Incorrect!",
+    "resetDropTitle": "Reset drop",
+    "resetDropDescription": "Are you sure you want to reset this drop zone?",
+    "grabbed": "Draggable is grabbed.",
+    "cancelledDragging": "Cancelled dragging.",
+    "correctAnswer": "Correct answer:",
+    "feedbackHeader": "Feedback",
+    "scoreBarLabel": "You got :num out of :total points"
+}
\ No newline at end of file

src/assets/h5p/fill_blanks/content/1_de.json

@@ -7,7 +7,7 @@
   ],
   "showSolutions": "Lösungen zeigen",
   "tryAgain": "Erneut versuchen",
-  "text": "<p><b>Aufgabe:<\/b><small>Beantworte so viele Fragen zum Wortschatzwissen, wie Du in 5 min schaffst.<\/small><br>Gib die Grundform an.</p>\n",
+  "text": "<p><b>Aufgabe:<\/b><small> Beantworte so viele Fragen zum Wortschatzwissen, wie Du in 5 min schaffst.<\/small><\/p><br><p>Gib die Grundform an.</p>\n",
   "checkAnswer": "Weiter",
   "notFilledOut": "Bitte alle Lücken füllen",
   "behaviour": {

src/index.html

@@ -11,7 +11,7 @@
   <meta name="format-detection" content="telephone=no" />
   <meta name="msapplication-tap-highlight" content="no" />
 
-  <link rel="icon" type="image/png" href="assets/icon/favicon.png" />
+  <link rel="icon" type="image/png" href="assets/icon/favicon.jpg" />
 
   <!-- add to homescreen for ios -->
   <meta name="apple-mobile-web-app-capable" content="yes" />