From 5570710da5eaf2884aef2cd13e670d3972df21bd Mon Sep 17 00:00:00 2001
From: oxidiert <daniel.ocks@gmx.de>
Date: Fri, 10 Oct 2025 12:21:59 +0200
Subject: [PATCH] client code laod fix

---
 app/src/main/java/com/dano/test1/HandlerLastPage.kt   | 11 ++++++++---
 .../main/java/com/dano/test1/HandlerOpeningScreen.kt  |  5 ++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/dano/test1/HandlerLastPage.kt b/app/src/main/java/com/dano/test1/HandlerLastPage.kt
index 6c465be..55c28d9 100644
--- a/app/src/main/java/com/dano/test1/HandlerLastPage.kt
+++ b/app/src/main/java/com/dano/test1/HandlerLastPage.kt
@@ -76,21 +76,26 @@ class HandlerLastPage(
                 // Punkte summieren
                 GlobalValues.INTEGRATION_INDEX = sumPoints()
 
-                // Client-Code merken
+                // Client-Code merken (für Auto-Laden im Opening Screen)
                 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
                 if (elapsedTime < minLoadingTimeMs) delay(minLoadingTimeMs - elapsedTime)
 
                 withContext(Dispatchers.Main) {
                     showLoading(false)
                     val activity = layout.context as? MainActivity
+                    // Zurück zum Opening Screen – der lädt dann automatisch (siehe Änderung 2)
                     activity?.finishQuestionnaire() ?: goToNextQuestion()
                 }
             }
         }
+
     }
 
     override fun validate(): Boolean = true
diff --git a/app/src/main/java/com/dano/test1/HandlerOpeningScreen.kt b/app/src/main/java/com/dano/test1/HandlerOpeningScreen.kt
index e332129..2d6fbec 100644
--- a/app/src/main/java/com/dano/test1/HandlerOpeningScreen.kt
+++ b/app/src/main/java/com/dano/test1/HandlerOpeningScreen.kt
@@ -255,18 +255,21 @@ class HandlerOpeningScreen(private val activity: MainActivity) {
     }
 
     private fun restorePreviousClientCode() {
+        // Coach-Code (Username) setzen und Feld sperren – aber NICHT mehr zurückkehren
         val username = TokenStore.getUsername(activity)
         if (!username.isNullOrBlank()) {
             coachEditText.setText(username)
             lockCoachCodeField()
-            return
         }
+
+        // Hier den zuletzt verwendeten Client-Code einsetzen
         GlobalValues.LAST_CLIENT_CODE?.let {
             editText.setText(it)
             GlobalValues.LOADED_CLIENT_CODE = it
         }
     }
 
+
     private fun setupLanguageSpinner() {
         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 {