fix: show conditional answers in detail view

fix: export of subquestions
Signed-off-by: TimedIn <git@timedin.net>

Author: timedin-de

lib/Db/QuestionMapper.php

@@ -28,18 +28,21 @@ public function __construct(
 	 * @throws DoesNotExistException if not found
 	 * @return Question[]
 	 */
-	public function findByForm(int $formId, bool $loadDeleted = false): array {
+	public function findByForm(int $formId, bool $loadDeleted = false, bool $loadSubquestions = false): array {
 		$qb = $this->db->getQueryBuilder();
 
 		$qb->select('*')
 			->from($this->getTableName())
 			->where(
 				$qb->expr()->eq('form_id', $qb->createNamedParameter($formId, IQueryBuilder::PARAM_INT))
-			)
+			);
+
+		if (!$loadSubquestions) {
 			// Only load top-level questions (not subquestions of conditional questions)
-			->andWhere(
+			$qb->andWhere(
 				$qb->expr()->isNull('parent_question_id')
 			);
+		}
 
 		if (!$loadDeleted) {
 			// Don't load questions, that are marked as deleted (marked by order==0).

lib/Service/SubmissionService.php

@@ -228,7 +228,7 @@ public function getSubmissionsData(Form $form, string $fileFormat, ?File $file =
 		// Oldest first
 		$submissionEntities = array_reverse($submissionEntities);
 
-		$questions = $this->questionMapper->findByForm($form->getId());
+		$questions = $this->questionMapper->findByForm($form->getId(), false, true);
 		$defaultTimeZone = $this->config->getSystemValueString('default_timezone', 'UTC');
 
 		if (!$this->currentUser) {
@@ -848,7 +848,6 @@ private function evaluateBranchConditions(string $triggerType, array $triggerAns
 					}
 				}
 				return false;
-
 			case Constants::ANSWER_TYPE_MULTIPLE:
 				// Multi-select: all condition option IDs must be selected
 				foreach ($conditions as $condition) {
@@ -864,7 +863,6 @@ private function evaluateBranchConditions(string $triggerType, array $triggerAns
 					return true;
 				}
 				return false;
-
 			case Constants::ANSWER_TYPE_SHORT:
 			case Constants::ANSWER_TYPE_LONG:
 				// Text-based: evaluate regex/string conditions
@@ -892,7 +890,6 @@ private function evaluateBranchConditions(string $triggerType, array $triggerAns
 					}
 				}
 				return false;
-
 			case Constants::ANSWER_TYPE_LINEARSCALE:
 				$numValue = (float)($triggerAnswer[0] ?? 0);
 				foreach ($conditions as $condition) {
@@ -910,7 +907,6 @@ private function evaluateBranchConditions(string $triggerType, array $triggerAns
 					}
 				}
 				return false;
-
 			case Constants::ANSWER_TYPE_COLOR:
 				$colorValue = $triggerAnswer[0] ?? '';
 				foreach ($conditions as $condition) {
@@ -919,7 +915,6 @@ private function evaluateBranchConditions(string $triggerType, array $triggerAns
 					}
 				}
 				return false;
-
 			case Constants::ANSWER_TYPE_FILE:
 				$hasFile = !empty($triggerAnswer);
 				foreach ($conditions as $condition) {
@@ -928,7 +923,6 @@ private function evaluateBranchConditions(string $triggerType, array $triggerAns
 					}
 				}
 				return false;
-
 			case Constants::ANSWER_TYPE_DATE:
 			case Constants::ANSWER_TYPE_DATETIME:
 			case Constants::ANSWER_TYPE_TIME:
@@ -959,7 +953,6 @@ private function evaluateBranchConditions(string $triggerType, array $triggerAns
 					}
 				}
 				return false;
-
 			default:
 				return false;
 		}

src/components/Results/Answer.vue

@@ -74,6 +74,28 @@
 		<p v-else class="answer__text" dir="auto">
 			<NcHighlight :text="answerText" :search="highlight" />
 		</p>
+		<template v-if="question.conditional && question.answers">
+			<div
+				v-for="(branchAnswers, branchAnswersKey) in question.answers"
+				:key="branchAnswersKey"
+				class="branch__subquestions">
+				<div class="answer__subquestion">
+					<Answer
+						v-for="subquestion in branchAnswers"
+						:key="subquestion.id"
+						:question="subquestion"
+						:highlight="highlight"
+						:answerText="subquestion.squashedAnswers"
+						:answers="subquestion.answer"
+						:questionText="subquestion.text"
+						:gridCellType="subquestion.gridCellType"
+						:gridColumns="subquestion.gridColumns"
+						:gridRows="subquestion.gridRows"
+						:gridValue="subquestion.gridValue"
+						:questionType="subquestion.type" />
+				</div>
+			</div>
+		</template>
 	</div>
 </template>
 
@@ -93,6 +115,11 @@ export default {
 	},
 
 	props: {
+		question: {
+			type: Object,
+			required: true,
+		},
+
 		answers: {
 			type: Array,
 			required: false,
@@ -215,5 +242,11 @@ export default {
 			left: 0;
 		}
 	}
+
+	&__subquestion {
+		margin-top: 16px;
+		padding-left: 16px;
+		border-left: 3px solid var(--color-primary-element);
+	}
 }
 </style>

src/components/Results/Submission.vue

@@ -36,6 +36,7 @@
 		<Answer
 			v-for="question in answeredQuestions"
 			:key="question.id"
+			:question="question"
 			:highlight="highlight"
 			:answerText="question.squashedAnswers"
 			:answers="question.answers"
@@ -126,9 +127,15 @@ export default {
 		 * @return {Array}
 		 */
 		answeredQuestions() {
+			return this.parseQuestions(this.questions)
+		},
+	},
+
+	methods: {
+		parseQuestions(questions) {
 			const answeredQuestionsArray = []
 
-			this.questions.forEach((question) => {
+			questions.forEach((question) => {
 				const answers = this.submission.answers.filter(
 					(answer) => answer.questionId === question.id,
 				)
@@ -220,6 +227,28 @@ export default {
 							(option) => option.optionType === OptionType.Column,
 						),
 					})
+				} else if (question.type === 'conditional') {
+					const branches = question.extraSettings?.branches ?? []
+					if (branches.length === 0) return
+					const subQuestions = branches.map((branch) =>
+						branch.subQuestions
+							.map((sub) => ({
+								...sub,
+								answer: this.submission.answers.find(
+									(answer) => answer.questionId === sub.id,
+								),
+							}))
+							.filter((sub) => sub.answer),
+					)
+					answeredQuestionsArray.push({
+						id: question.id,
+						text: question.text,
+						type: question.extraSettings.triggerType,
+						conditional: true,
+						extraSettings: question.extraSettings,
+						squashedAnswers: answers[0].text,
+						answers: subQuestions.map((sub) => this.parseQuestions(sub)),
+					})
 				} else if (['date', 'time'].includes(question.type)) {
 					const squashedAnswers = answers
 						.map((answer) => answer.text)
@@ -269,9 +298,7 @@ export default {
 			})
 			return answeredQuestionsArray
 		},
-	},
 
-	methods: {
 		onDelete() {
 			this.$emit('delete')
 		},