From 871826464b4903b1784d89114fc63914d0bed116 Mon Sep 17 00:00:00 2001
From: agrt56 <andreas.gaertner@mni.thm.de>
Date: Mon, 27 Jul 2015 20:40:33 +0200
Subject: [PATCH] Add lecture question image retrieval functions to
QuestionService.
---
.../LecturerQuestionController.java | 13 ++++++++++
.../arsnova/services/IQuestionService.java | 4 ++++
.../thm/arsnova/services/QuestionService.java | 24 +++++++++++++++++++
3 files changed, 41 insertions(+)
diff --git a/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java b/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
index 53b47302..fb6a306b 100644
--- a/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
+++ b/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
@@ -89,6 +89,19 @@ public class LecturerQuestionController extends PaginationController {
}
}
+ @RequestMapping(value = "/{questionId}/questionimage", method = RequestMethod.GET)
+ public String getQuestionImage(
+ @PathVariable final String questionId,
+ @RequestParam(value = "fcImage", defaultValue = "false", required = false) final boolean fcImage
+ ) {
+
+ if (fcImage) {
+ return questionService.getQuestionFcImage(questionId);
+ } else {
+ return questionService.getQuestionImage(questionId);
+ }
+ }
+
@RequestMapping(value = "/{questionId}/startnewpiround", method = RequestMethod.POST)
public void startPiRound(
@PathVariable final String questionId,
diff --git a/src/main/java/de/thm/arsnova/services/IQuestionService.java b/src/main/java/de/thm/arsnova/services/IQuestionService.java
index f1b74157..92df798c 100644
--- a/src/main/java/de/thm/arsnova/services/IQuestionService.java
+++ b/src/main/java/de/thm/arsnova/services/IQuestionService.java
@@ -167,4 +167,8 @@ public interface IQuestionService {
void setVotingAdmissionForAllQuestions(String sessionkey, boolean disableVoting);
+ String getQuestionImage(String questionId);
+
+ String getQuestionFcImage(String questionId);
+
}
diff --git a/src/main/java/de/thm/arsnova/services/QuestionService.java b/src/main/java/de/thm/arsnova/services/QuestionService.java
index d11db191..2ec056ef 100644
--- a/src/main/java/de/thm/arsnova/services/QuestionService.java
+++ b/src/main/java/de/thm/arsnova/services/QuestionService.java
@@ -1059,6 +1059,30 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
return answer.getAnswerImage();
}
+ @Override
+ public String getQuestionImage(String questionId) {
+ Question question = databaseDao.getQuestion(questionId);
+ String imageData = question.getImage();
+
+ if (imageData == null) {
+ imageData = "";
+ }
+
+ return imageData;
+ }
+
+ @Override
+ public String getQuestionFcImage(String questionId) {
+ Question question = databaseDao.getQuestion(questionId);
+ String imageData = question.getFcImage();
+
+ if (imageData == null) {
+ imageData = "";
+ }
+
+ return imageData;
+ }
+
@Override
public String getSubjectSortType(String sessionkey, String isPreparation) {
Session session = databaseDao.getSessionFromKeyword(sessionkey);
--
GitLab