fix: export of subquestions

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

@@ -227,7 +227,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) {
@@ -831,7 +831,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) {
@@ -847,7 +846,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
@@ -875,7 +873,6 @@ private function evaluateBranchConditions(string $triggerType, array $triggerAns
 					}
 				}
 				return false;
-
 			case Constants::ANSWER_TYPE_LINEARSCALE:
 				$numValue = (float)($triggerAnswer[0] ?? 0);
 				foreach ($conditions as $condition) {
@@ -893,7 +890,6 @@ private function evaluateBranchConditions(string $triggerType, array $triggerAns
 					}
 				}
 				return false;
-
 			case Constants::ANSWER_TYPE_COLOR:
 				$colorValue = $triggerAnswer[0] ?? '';
 				foreach ($conditions as $condition) {
@@ -902,7 +898,6 @@ private function evaluateBranchConditions(string $triggerType, array $triggerAns
 					}
 				}
 				return false;
-
 			case Constants::ANSWER_TYPE_FILE:
 				$hasFile = !empty($triggerAnswer);
 				foreach ($conditions as $condition) {
@@ -911,7 +906,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:
@@ -942,7 +936,6 @@ private function evaluateBranchConditions(string $triggerType, array $triggerAns
 					}
 				}
 				return false;
-
 			default:
 				return false;
 		}