Merge remote-tracking branch 'origin/OpenOLAT_12.5' into OpenOLAT_13.2 (cfc457b4) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit cfc457b4 authored 6 years ago by srosse

Browse files

Merge remote-tracking branch 'origin/OpenOLAT_12.5' into OpenOLAT_13.2

parents 09105568 6e7e28ca

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/ims/qti21/ui/components/FlowComponent.java 9 additions, 4 deletions

.../java/org/olat/ims/qti21/ui/components/FlowComponent.java
src/main/java/org/olat/ims/qti21/ui/components/FlowComponentRenderer.java 7 additions, 0 deletions

...g/olat/ims/qti21/ui/components/FlowComponentRenderer.java
src/main/java/org/olat/ims/qti21/ui/components/ItemBodyResultComponentRenderer.java 7 additions, 0 deletions

.../qti21/ui/components/ItemBodyResultComponentRenderer.java
src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_fr.properties 2 additions, 2 deletions

...olat/ims/qti21/ui/editor/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/ims/qti21/ui/statistics/QTI21AssessmentItemStatisticsController.java 12 additions, 11 deletions

...i/statistics/QTI21AssessmentItemStatisticsController.java
src/main/java/org/olat/ims/qti21/ui/statistics/QTI21ItemBodyController.java 4 additions, 0 deletions

...olat/ims/qti21/ui/statistics/QTI21ItemBodyController.java
src/main/java/org/olat/ims/qti21/ui/statistics/QTI21StatisticResourceResult.java 3 additions, 1 deletion

...ims/qti21/ui/statistics/QTI21StatisticResourceResult.java
src/main/java/org/olat/ims/qti21/ui/statistics/interactions/ChoiceInteractionStatisticsController.java 14 additions, 10 deletions

...s/interactions/ChoiceInteractionStatisticsController.java
src/main/java/org/olat/ims/qti21/ui/statistics/interactions/HotspotInteractionStatisticsController.java 3 additions, 5 deletions

.../interactions/HotspotInteractionStatisticsController.java
src/main/java/org/olat/ims/qti21/ui/statistics/interactions/HottextInteractionStatisticsController.java 15 additions, 12 deletions

.../interactions/HottextInteractionStatisticsController.java
src/main/java/org/olat/ims/qti21/ui/statistics/interactions/KPrimStatisticsController.java 15 additions, 12 deletions

...ui/statistics/interactions/KPrimStatisticsController.java
src/main/java/org/olat/ims/qti21/ui/statistics/interactions/MatchStatisticsController.java 13 additions, 7 deletions

...ui/statistics/interactions/MatchStatisticsController.java
src/main/java/org/olat/ims/qti21/ui/statistics/interactions/ResponseInfos.java 122 additions, 0 deletions

...t/ims/qti21/ui/statistics/interactions/ResponseInfos.java
src/main/java/org/olat/ims/qti21/ui/statistics/interactions/Series.java 96 additions, 0 deletions

...org/olat/ims/qti21/ui/statistics/interactions/Series.java
src/main/java/org/olat/ims/qti21/ui/statistics/interactions/SimpleChoiceInteractionStatisticsController.java 14 additions, 8 deletions

...ractions/SimpleChoiceInteractionStatisticsController.java
src/main/java/org/olat/ims/qti21/ui/statistics/interactions/TextEntryInteractionsStatisticsController.java 1 addition, 3 deletions

...teractions/TextEntryInteractionsStatisticsController.java
src/main/java/org/olat/ims/qti21/ui/statistics/interactions/_content/fib_interaction.html 2 additions, 2 deletions

.../ui/statistics/interactions/_content/fib_interaction.html
src/main/java/org/olat/ims/qti21/ui/statistics/interactions/_content/kprim_interaction.html 8 additions, 2 deletions

...i/statistics/interactions/_content/kprim_interaction.html
src/main/java/org/olat/ims/qti21/ui/statistics/interactions/_content/match_interaction.html 2 additions, 2 deletions

...i/statistics/interactions/_content/match_interaction.html
src/main/java/org/olat/ims/qti21/ui/statistics/interactions/_content/statistics_interaction.html 14 additions, 3 deletions

...tistics/interactions/_content/statistics_interaction.html

with 363 additions and 84 deletions

Please register or to comment