From c22ad701bdaf0a80d8bbc1d760587d69c9a793b4 Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <daniel.gerhardt@mni.thm.de>
Date: Tue, 29 Jul 2014 22:57:09 +0200
Subject: [PATCH] Add configuration option to enable/disable learning progress
 feature

---
 .../de/thm/arsnova/controller/ConfigurationController.java    | 4 ++++
 src/main/webapp/arsnova.properties.example                    | 1 +
 src/test/resources/arsnova.properties.example                 | 1 +
 3 files changed, 6 insertions(+)

diff --git a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
index 7905ad6a..9d4d96c7 100644
--- a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
+++ b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
@@ -74,6 +74,9 @@ public class ConfigurationController extends AbstractController {
 	@Value("${features.markdown.enabled:false}")
 	private String markdownEnabled;
 
+	@Value("${features.learning-progress.enabled:false}")
+	private String learningProgressEnabled;
+
 	@Value("${features.question-format.flashcard.enabled:false}")
 	private String flashcardEnabled;
 
@@ -128,6 +131,7 @@ public class ConfigurationController extends AbstractController {
 
 		features.put("mathJax", "true".equals(mathJaxEnabled));
 		features.put("markdown", "true".equals(markdownEnabled));
+		features.put("learningProgress", "true".equals(learningProgressEnabled));
 		features.put("flashcard", "true".equals(flashcardEnabled));
 		features.put("gridSquare", "true".equals(gridSquareEnabled));
 
diff --git a/src/main/webapp/arsnova.properties.example b/src/main/webapp/arsnova.properties.example
index 8297b9e0..9280bdd8 100644
--- a/src/main/webapp/arsnova.properties.example
+++ b/src/main/webapp/arsnova.properties.example
@@ -158,6 +158,7 @@ features.mathjax.enabled=true
 # behavior will change in future releases.
 #
 features.markdown.enabled=false
+features.learning-progress.enabled=false
 features.question-format.flashcard.enabled=false
 features.question-format.grid-square.enabled=false
 
diff --git a/src/test/resources/arsnova.properties.example b/src/test/resources/arsnova.properties.example
index 8297b9e0..9280bdd8 100644
--- a/src/test/resources/arsnova.properties.example
+++ b/src/test/resources/arsnova.properties.example
@@ -158,6 +158,7 @@ features.mathjax.enabled=true
 # behavior will change in future releases.
 #
 features.markdown.enabled=false
+features.learning-progress.enabled=false
 features.question-format.flashcard.enabled=false
 features.question-format.grid-square.enabled=false
 
-- 
GitLab