From 9f254dff5c84fb06980a0470deddfd383ba6dc26 Mon Sep 17 00:00:00 2001 From: Daniel Ocks Date: Mon, 28 Jul 2025 08:34:38 +0200 Subject: [PATCH] =?UTF-8?q?Reihienfolge=20Abh=C3=A4nging=20von=20Antwort?= =?UTF-8?q?=20implementiert.=20Ist=20die=20Antwort=20gelb,=20wird=20der=20?= =?UTF-8?q?n=C3=A4chste=20Fragebogen=20angezeigt.=20Ist=20sie=20nicht=20ge?= =?UTF-8?q?lb=20wird=20der=20Fragebogen=20geskippt.=20Framework=20musste?= =?UTF-8?q?=20daf=C3=BCr=20angepasst=20bzw.=20erweitert=20werden.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/dano/test1/HandlerOpeningScreen.kt | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/app/src/main/java/com/dano/test1/HandlerOpeningScreen.kt b/app/src/main/java/com/dano/test1/HandlerOpeningScreen.kt index 133fc1b..b68f4b2 100644 --- a/app/src/main/java/com/dano/test1/HandlerOpeningScreen.kt +++ b/app/src/main/java/com/dano/test1/HandlerOpeningScreen.kt @@ -218,8 +218,6 @@ class HandlerOpeningScreen(private val activity: MainActivity) { updateButtonTexts() - val rhsPoints = buttonPoints.entries.firstOrNull { it.key.contains("questionnaire_2_rhs", ignoreCase = true) }?.value - var nextIndex = (completedIndexes.lastOrNull() ?: -1) + 1 while (nextIndex < questionnaireEntries.size) { @@ -227,15 +225,13 @@ class HandlerOpeningScreen(private val activity: MainActivity) { val condition = entry.condition if (condition != null) { - val answers = MyApp.database.answerDao() - .getAnswersForClientAndQuestionnaire(clientCode, condition.questionnaire) + val answers = MyApp.database.answerDao().getAnswersForClientAndQuestionnaire(clientCode, condition.questionnaire) val relevantAnswer = answers.find { it.questionId.endsWith(condition.questionId) } val answerValue = relevantAnswer?.answerValue ?: "" - val conditionMet = when (condition.operator) { "!=" -> answerValue != condition.value "==" -> answerValue == condition.value @@ -259,8 +255,6 @@ class HandlerOpeningScreen(private val activity: MainActivity) { val nextButton = questionnaireFiles.entries.firstOrNull { it.value == nextFileName }?.key setButtonsEnabled(listOfNotNull(nextButton)) } - - }