diff --git a/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java b/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java index 53b47302b8b34f06af8d4a5306c27a9e1ccdb4ee..fb6a306bde5f6455ce922063355c56e7af3ee106 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 f1b74157e4a16d47d7a97d44368c761719166421..92df798cab5f1f4b7f1fe7d362a8ff649e814e2c 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 d11db191076d38d3344d50d48f703b6d881e5228..2ec056efd8145bf21b75d99a01638d4d690fc6b4 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);