Skip to content
GitLab
Commit b15716c8 authored by Konstantin Schulz's avatar Konstantin Schulz
Browse files

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

parents a7a70388 99926e85
Hide whitespace changes
Inline Side-by-side
src/app/test/test.page.html
View file @ b15716c8
......@@ -42,51 +42,43 @@
</ion-col>
</ion-row>
<ion-row>
<ion-col>
<h4>Phase</h4>
</ion-col>
<ion-col>
<h4>Dauer</h4>
</ion-col>
</ion-row>
<ion-row>
<ion-col><b>Diagnose:</b><br>
Wie gut kann ich mit meinem (Latein-)Wortschatz umgehen?
<ion-col><b>{{ 'UNIT_DIAGNOSIS_TITLE' | translate }}</b><br>
{{ 'UNIT_DIAGNOSIS_TEXT' | translate }}
</ion-col>
<ion-col>
<br>5 min
</ion-col>
</ion-row>
<ion-row>
<ion-col><b>Anwendung:</b><br>
Wie genau lese ich einen zweisprachigen Text? Wie viel verstehe ich schon im Lateinischen?
<ion-col><b>{{ 'UNIT_APPLICATION_TITLE' | translate }}</b><br>
{{ 'UNIT_APPLICATION_TEXT' | translate}}
</ion-col>
<ion-col>
<br>10 min
</ion-col>
</ion-row>
<ion-row>
<ion-col><b>Üben:</b><br>
Wie werde ich kompetent im Umgang mit Wörtern?
<ion-col><b>{{ 'UNIT_EXERCISE_TITLE' | translate }}</b><br>
{{ 'UNIT_EXERCISE_TEXT' | translate }}
</ion-col>
<ion-col>
<br>15 min
</ion-col>
</ion-row>
<ion-row>
<ion-col><b>Testen:</b><br>
Was kann ich aus meiner Sicht inzwischen schon ganz gut?
<ion-col><b>{{ 'UNIT_TEST_TITLE' | translate }}</b><br>
{{ 'UNIT_TEST_TEXT' | translate }}
</ion-col>
<ion-col>
<br>5 min
</ion-col>
</ion-row>
<ion-row>
<ion-col><b>Auswertung:</b><br>
Wie viel habe ich bei dieser Lerneinheit (dazu) gelernt?
<ion-col><b>{{ 'UNIT_EVALUATION_TITLE' | translate }}</b><br>
{{ 'UNIT_EVALUATION_TEXT' | translate }}
</ion-col>
<ion-col>
<br>individuell
<br>??? min
</ion-col>
</ion-row>
<ion-row>
......@@ -117,32 +109,37 @@
<ion-card>
<ion-item>
<ion-icon name="stats" slot="start"></ion-icon>
<ion-label>Ergebnis Diagnosetest:</ion-label>
{{results[0][0]}} von {{results[0][1]}} Aufgaben wurden richtig
bearbeitet.
<ion-label position="stacked"><h2>{{ 'RESULT' | translate }} {{ 'UNIT_DIAGNOSIS_TITLE' | translate}}</h2></ion-label>
<br>
{{results[0][0]}} {{ 'OF' | translate}} {{results[0][1]}}
{{ 'UNIT_EVALUATION_TASKS' | translate}}
</ion-item>
<ion-item>
<ion-icon name="book" slot="start"></ion-icon>
<ion-label>Ergebnis Anwendung:</ion-label>
{{results[1][0]}} von {{results[1][1]}} Fragen wurden richtig beantwortet.
<ion-label position="stacked"><h2>{{ 'RESULT' | translate }} {{ 'UNIT_APPLICATION_TITLE' | translate}}</h2></ion-label>
{{results[1][0]}} {{ 'OF' | translate}} {{results[1][1]}}
{{ 'UNIT_EVALUATION_TASKS' | translate}}
</ion-item>
<ion-item>
<ion-icon name="walk" slot="start"></ion-icon>
<ion-label>Ergebnis Üben:</ion-label>
<ion-label position="stacked"><h2>{{ 'RESULT' | translate }} {{ 'UNIT_EXERCISE_TITLE' | translate}}</h2></ion-label>
<div *ngIf="testType == TestType.cloze; else list">
{{results[2][0]}} von {{results[2][1]}} Lücken wurden richtig ergänzt.
{{results[2][0]}} {{ 'OF' | translate}} {{results[2][1]}}
{{ 'UNIT_EVALUATION_GAPS' | translate }}
</div>
<ng-template #list>
{{results[2][0]}} von {{results[2][1]}} Wörtern wurden gelernt. Davon
wurden {{knownCount[0]}} Wörter als "Kann ich" markiert.
{{results[2][0]}} {{ 'OF' | translate}} {{results[2][1]}}
{{ 'UNIT_EVALUATION_WORDS' |translate }}
{{knownCount[0]}}
</ng-template>
</ion-item>
<ion-item>
<ion-icon name="pulse" slot="start"></ion-icon>
<ion-label>Ergebnis Wortschatztest:</ion-label>
{{results[3][0]}} von {{results[3][1]}} Aufgaben wurden richtig bearbeitet.<br>
Veränderung gegenüber dem 1.
Diagnosetest: {{ ((results[0][0] - results[3][0]) / (results[0][0] > 0 ? results[0][0] : 1)) * -100 }}
<ion-label position="stacked"><h2>{{ 'RESULT' | translate }} {{ 'UNIT_TEST_TITLE' | translate}}</h2></ion-label>
{{results[3][0]}} {{ 'OF' | translate}} {{results[3][1]}}
{{ 'UNIT_EVALUATION_TASKS' | translate}}<br>
{{ 'UNIT_EVALUATION_CHANGE' | translate}}
{{ ((results[0][0] - results[3][0]) / (results[0][0] > 0 ? results[0][0] : 1)) * -100 }}
%
</ion-item>
</ion-card>
......
src/app/test/test.page.ts
View file @ b15716c8
......@@ -38,7 +38,10 @@ export class TestPage implements OnDestroy, OnInit {
durationSeconds: 0,
exercises: ["nonH5P_1"]
}), new ExercisePart({
startIndex: 0, durationSeconds: 300, exercises: ["fill_blanks_1", "multi_choice_1", "multi_choice_2",
// TODO: FILL BLANKS 7 JSON FILE IS NOT CORRECT (EN/DE)
startIndex: 0,
durationSeconds: 300,
exercises: ["fill_blanks_1", "multi_choice_1", "multi_choice_2",
"multi_choice_3", "multi_choice_4", "multi_choice_5", "multi_choice_6",
"multi_choice_7", "multi_choice_8", "fill_blanks_2", "fill_blanks_3",
"fill_blanks_4", "fill_blanks_5", "multi_choice_9", "fill_blanks_6",
......@@ -50,14 +53,16 @@ export class TestPage implements OnDestroy, OnInit {
durationSeconds: 600,
exercises: ["multi_choice_19", "multi_choice_20", "multi_choice_21", "multi_choice_22", "multi_choice_23"]
}), new ExercisePart({
startIndex: 0, durationSeconds: 900, exercises: ["drag_text_1", "drag_text_2", "drag_text_3",
startIndex: 0,
durationSeconds: 900,
exercises: ["drag_text_1", "drag_text_2", "drag_text_3",
"drag_text_4", "drag_text_5"]
}), new ExercisePart({
startIndex: 0,
durationSeconds: 900,
exercises: ["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_11", "voc_list_12", "voc_list_13", "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",
......@@ -70,6 +75,7 @@ export class TestPage implements OnDestroy, OnInit {
"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"]
// voc_list_14 = voc_list_7 (et) --> 14 deleted
}), new ExercisePart({
startIndex: 0, durationSeconds: 300, exercises: ["fill_blanks_1", "multi_choice_1", "multi_choice_2",
"multi_choice_3", "multi_choice_4", "multi_choice_5", "multi_choice_6",
......
src/assets/h5p/multi_choice/content/10_de.json
View file @ b15716c8
......@@ -29,7 +29,7 @@
}
],
"UI": {
"showSolutionButton": "Show solution",
"showSolutionButton": "Lösung zeigen",
"tryAgainButton": "Retry",
"checkAnswerButton": "Weiter",
"tipsLabel": "Show tip",
......
src/assets/h5p/multi_choice/content/10_en.json
View file @ b15716c8
......@@ -31,7 +31,7 @@
"UI": {
"showSolutionButton": "Show solution",
"tryAgainButton": "Retry",
"checkAnswerButton": "Check",
"checkAnswerButton": "Continue",
"tipsLabel": "Show tip",
"scoreBarLabel": "You got :num out of :total points",
"tipAvailable": "Tip available",
......
src/assets/h5p/multi_choice/content/11_de.json
View file @ b15716c8
......@@ -29,7 +29,7 @@
}
],
"UI": {
"showSolutionButton": "Show solution",
"showSolutionButton": "Lösung zeigen",
"tryAgainButton": "Retry",
"checkAnswerButton": "Weiter",
"tipsLabel": "Show tip",
......
src/assets/h5p/multi_choice/content/11_en.json
View file @ b15716c8
......@@ -31,7 +31,7 @@
"UI": {
"showSolutionButton": "Show solution",
"tryAgainButton": "Retry",
"checkAnswerButton": "Check",
"checkAnswerButton": "Continue",
"tipsLabel": "Show tip",
"scoreBarLabel": "You got :num out of :total points",
"tipAvailable": "Tip available",
......
src/assets/h5p/multi_choice/content/12_de.json
View file @ b15716c8
......@@ -29,7 +29,7 @@
}
],
"UI": {
"showSolutionButton": "Show solution",
"showSolutionButton": "Lösung zeigen",
"tryAgainButton": "Retry",
"checkAnswerButton": "Weiter",
"tipsLabel": "Show tip",
......
src/assets/h5p/multi_choice/content/12_en.json
View file @ b15716c8
......@@ -31,7 +31,7 @@
"UI": {
"showSolutionButton": "Show solution",
"tryAgainButton": "Retry",
"checkAnswerButton": "Check",
"checkAnswerButton": "Continue",
"tipsLabel": "Show tip",
"scoreBarLabel": "You got :num out of :total points",
"tipAvailable": "Tip available",
......
src/assets/h5p/multi_choice/content/13_de.json
View file @ b15716c8
......@@ -29,7 +29,7 @@
}
],
"UI": {
"showSolutionButton": "Show solution",
"showSolutionButton": "Lösung zeigen",
"tryAgainButton": "Retry",
"checkAnswerButton": "Weiter",
"tipsLabel": "Show tip",
......
src/assets/h5p/multi_choice/content/13_en.json
View file @ b15716c8
......@@ -31,7 +31,7 @@
"UI": {
"showSolutionButton": "Show solution",
"tryAgainButton": "Retry",
"checkAnswerButton": "Check",
"checkAnswerButton": "Continue",
"tipsLabel": "Show tip",
"scoreBarLabel": "You got :num out of :total points",
"tipAvailable": "Tip available",
......
src/assets/h5p/multi_choice/content/14_de.json
View file @ b15716c8
......@@ -29,7 +29,7 @@
}
],
"UI": {
"showSolutionButton": "Show solution",
"showSolutionButton": "Lösung zeigen",
"tryAgainButton": "Retry",
"checkAnswerButton": "Weiter",
"tipsLabel": "Show tip",
......
src/assets/h5p/multi_choice/content/14_en.json
View file @ b15716c8
......@@ -31,7 +31,7 @@
"UI": {
"showSolutionButton": "Show solution",
"tryAgainButton": "Retry",
"checkAnswerButton": "Check",
"checkAnswerButton": "Continue",
"tipsLabel": "Show tip",
"scoreBarLabel": "You got :num out of :total points",
"tipAvailable": "Tip available",
......
src/assets/h5p/multi_choice/content/15_de.json
View file @ b15716c8
......@@ -29,7 +29,7 @@
}
],
"UI": {
"showSolutionButton": "Show solution",
"showSolutionButton": "Lösung zeigen",
"tryAgainButton": "Retry",
"checkAnswerButton": "Weiter",
"tipsLabel": "Show tip",
......
src/assets/h5p/multi_choice/content/15_en.json
View file @ b15716c8
......@@ -31,7 +31,7 @@
"UI": {
"showSolutionButton": "Show solution",
"tryAgainButton": "Retry",
"checkAnswerButton": "Check",
"checkAnswerButton": "Continue",
"tipsLabel": "Show tip",
"scoreBarLabel": "You got :num out of :total points",
"tipAvailable": "Tip available",
......
src/assets/h5p/multi_choice/content/16_de.json
View file @ b15716c8
......@@ -29,7 +29,7 @@
}
],
"UI": {
"showSolutionButton": "Show solution",
"showSolutionButton": "Lösung zeigen",
"tryAgainButton": "Retry",
"checkAnswerButton": "Weiter",
"tipsLabel": "Show tip",
......
src/assets/h5p/multi_choice/content/16_en.json
View file @ b15716c8
......@@ -30,7 +30,7 @@
],
"UI": {
"showSolutionButton": "Show solution",
"tryAgainButton": "Retry",
"tryAgainButton": "Continue",
"checkAnswerButton": "Check",
"tipsLabel": "Show tip",
"scoreBarLabel": "You got :num out of :total points",
......
src/assets/h5p/multi_choice/content/17_de.json
View file @ b15716c8
......@@ -29,7 +29,7 @@
}
],
"UI": {
"showSolutionButton": "Show solution",
"showSolutionButton": "Lösung zeigen",
"tryAgainButton": "Retry",
"checkAnswerButton": "Weiter",
"tipsLabel": "Show tip",
......
src/assets/h5p/multi_choice/content/17_en.json
View file @ b15716c8
......@@ -31,7 +31,7 @@
"UI": {
"showSolutionButton": "Show solution",
"tryAgainButton": "Retry",
"checkAnswerButton": "Check",
"checkAnswerButton": "Continue",
"tipsLabel": "Show tip",
"scoreBarLabel": "You got :num out of :total points",
"tipAvailable": "Tip available",
......
src/assets/h5p/multi_choice/content/18_de.json
View file @ b15716c8
......@@ -75,7 +75,7 @@
],
"UI": {
"showSolutionButton": "Show solution",
"showSolutionButton": "Lösungen zeigen",
"tryAgainButton": "Retry",
"checkAnswerButton": "Fertig",
"tipsLabel": "Show tip",
......
src/assets/h5p/multi_choice/content/18_en.json
View file @ b15716c8
......@@ -76,7 +76,7 @@
"UI": {
"showSolutionButton": "Show solution",
"tryAgainButton": "Retry",
"checkAnswerButton": "Check",
"checkAnswerButton": "Ready",
"tipsLabel": "Show tip",
"scoreBarLabel": "You got :num out of :total points",
"tipAvailable": "Tip available",
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Impressum | Datenschutzerklärung