oxidiert/Questionnaire-App
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

client code laod fix

Browse Source
This commit is contained in:
oxidiert
2025-10-10 12:21:59 +02:00
parent 8d54315fe7
commit 5570710da5
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/dano/test1/HandlerLastPage.kt
View File

@ -76,21 +76,26 @@ class HandlerLastPage(
// Punkte summieren // Punkte summieren
GlobalValues.INTEGRATION_INDEX = sumPoints() GlobalValues.INTEGRATION_INDEX = sumPoints()
// Client-Code merken // Client-Code merken (für Auto-Laden im Opening Screen)
val clientCode = answers["client_code"] as? String val clientCode = answers["client_code"] as? String
if (clientCode != null) GlobalValues.LAST_CLIENT_CODE = clientCode if (clientCode != null) {
GlobalValues.LAST_CLIENT_CODE = clientCode
GlobalValues.LOADED_CLIENT_CODE = clientCode // <— zusätzlich setzen
}
// min. Ladezeit einhalten // min. Ladezeit einhalten (ruhiges UX)
val elapsedTime = System.currentTimeMillis() - startTime val elapsedTime = System.currentTimeMillis() - startTime
if (elapsedTime < minLoadingTimeMs) delay(minLoadingTimeMs - elapsedTime) if (elapsedTime < minLoadingTimeMs) delay(minLoadingTimeMs - elapsedTime)
withContext(Dispatchers.Main) { withContext(Dispatchers.Main) {
showLoading(false) showLoading(false)
val activity = layout.context as? MainActivity val activity = layout.context as? MainActivity
// Zurück zum Opening Screen – der lädt dann automatisch (siehe Änderung 2)
activity?.finishQuestionnaire() ?: goToNextQuestion() activity?.finishQuestionnaire() ?: goToNextQuestion()
} }
} }
} }
} }
override fun validate(): Boolean = true override fun validate(): Boolean = true

5
app/src/main/java/com/dano/test1/HandlerOpeningScreen.kt
View File

@ -255,18 +255,21 @@ class HandlerOpeningScreen(private val activity: MainActivity) {
} }
private fun restorePreviousClientCode() { private fun restorePreviousClientCode() {
// Coach-Code (Username) setzen und Feld sperren – aber NICHT mehr zurückkehren
val username = TokenStore.getUsername(activity) val username = TokenStore.getUsername(activity)
if (!username.isNullOrBlank()) { if (!username.isNullOrBlank()) {
coachEditText.setText(username) coachEditText.setText(username)
lockCoachCodeField() lockCoachCodeField()
return
} }
// Hier den zuletzt verwendeten Client-Code einsetzen
GlobalValues.LAST_CLIENT_CODE?.let { GlobalValues.LAST_CLIENT_CODE?.let {
editText.setText(it) editText.setText(it)
GlobalValues.LOADED_CLIENT_CODE = it GlobalValues.LOADED_CLIENT_CODE = it
} }
} }
private fun setupLanguageSpinner() { private fun setupLanguageSpinner() {
val languages = listOf("GERMAN", "ENGLISH", "FRENCH", "ROMANIAN", "ARABIC", "POLISH", "TURKISH", "UKRAINIAN", "RUSSIAN", "SPANISH") val languages = listOf("GERMAN", "ENGLISH", "FRENCH", "ROMANIAN", "ARABIC", "POLISH", "TURKISH", "UKRAINIAN", "RUSSIAN", "SPANISH")
val adapter = ArrayAdapter(activity, android.R.layout.simple_spinner_item, languages).apply { val adapter = ArrayAdapter(activity, android.R.layout.simple_spinner_item, languages).apply {