From 7a3f8de8166f5eb6f9ece3f853c830db0b8d9919 Mon Sep 17 00:00:00 2001
From: Jan Tymel <410388@mail.muni.cz>
Date: Fri, 5 Feb 2021 08:21:34 +0100
Subject: [PATCH] Set questionnaire type when retrieving a questionnaire phase
Related to #3
---
.../example/demo/facade/TrainingPhaseFacade.java | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/main/java/com/example/demo/facade/TrainingPhaseFacade.java b/src/main/java/com/example/demo/facade/TrainingPhaseFacade.java
index 8f5464d7..d01ee5a4 100644
--- a/src/main/java/com/example/demo/facade/TrainingPhaseFacade.java
+++ b/src/main/java/com/example/demo/facade/TrainingPhaseFacade.java
@@ -9,6 +9,7 @@ import com.example.demo.dto.QuestionnaireUpdateDto;
import com.example.demo.dto.TrainingPhaseDto;
import com.example.demo.dto.TrainingPhaseUpdateDto;
import com.example.demo.enums.PhaseType;
+import com.example.demo.enums.QuestionnaireType;
import com.example.demo.service.InfoPhaseService;
import com.example.demo.service.PhaseService;
import com.example.demo.service.QuestionnairePhaseService;
@@ -61,7 +62,18 @@ public class TrainingPhaseFacade {
}
public AbstractPhaseDto getPhase(Long definitionId, Long phaseId) {
- return phaseService.getPhase(definitionId, phaseId);
+ AbstractPhaseDto phase = phaseService.getPhase(definitionId, phaseId);
+
+ if (phase instanceof QuestionnairePhaseDto) {
+ QuestionnairePhaseDto questionnairePhaseDto = (QuestionnairePhaseDto) phase;
+ if (QuestionnaireType.ADAPTIVE.equals(questionnairePhaseDto.getQuestionnaireType())) {
+ phase.setPhaseType(PhaseType.QUESTIONNAIRE_ADAPTIVE);
+ } else {
+ phase.setPhaseType(PhaseType.QUESTIONNAIRE_GENERAL);
+ }
+ }
+
+ return phase;
}
public List<AbstractPhaseDto> getPhases(Long definitionId) {
--
GitLab