Implement online registration (Nennung) workflow: add API integration, ViewModel logic, UI updates, backend endpoint, and roadmap adjustments.
This commit is contained in:
@@ -44,6 +44,10 @@ kotlin {
|
||||
implementation(projects.frontend.core.network)
|
||||
implementation(libs.kotlinx.datetime)
|
||||
|
||||
// Network & Serialization
|
||||
implementation(libs.bundles.ktor.client.common)
|
||||
implementation(libs.kotlinx.serialization.json)
|
||||
|
||||
implementation(compose.foundation)
|
||||
implementation(compose.runtime)
|
||||
implementation(compose.material3)
|
||||
|
||||
+79
@@ -0,0 +1,79 @@
|
||||
package at.mocode.frontend.features.nennung.presentation.web
|
||||
|
||||
import androidx.lifecycle.ViewModel
|
||||
import androidx.lifecycle.viewModelScope
|
||||
import io.ktor.client.*
|
||||
import io.ktor.client.request.*
|
||||
import io.ktor.http.*
|
||||
import kotlinx.coroutines.flow.MutableStateFlow
|
||||
import kotlinx.coroutines.flow.StateFlow
|
||||
import kotlinx.coroutines.flow.asStateFlow
|
||||
import kotlinx.coroutines.flow.update
|
||||
import kotlinx.coroutines.launch
|
||||
import kotlinx.serialization.Serializable
|
||||
|
||||
@Serializable
|
||||
data class NennungDto(
|
||||
val id: String? = null,
|
||||
val turnierNr: String,
|
||||
val status: String = "NEU",
|
||||
val vorname: String,
|
||||
val nachname: String,
|
||||
val lizenz: String,
|
||||
val pferdName: String,
|
||||
val pferdAlter: String,
|
||||
val email: String,
|
||||
val telefon: String?,
|
||||
val bewerbe: String, // Als JSON-String oder Komma-separiert
|
||||
val bemerkungen: String?
|
||||
)
|
||||
|
||||
data class OnlineNennungUiState(
|
||||
val isLoading: Boolean = false,
|
||||
val error: String? = null,
|
||||
val isSuccess: Boolean = false
|
||||
)
|
||||
|
||||
class OnlineNennungViewModel(
|
||||
private val httpClient: HttpClient
|
||||
) : ViewModel() {
|
||||
|
||||
private val _uiState = MutableStateFlow(OnlineNennungUiState())
|
||||
val uiState: StateFlow<OnlineNennungUiState> = _uiState.asStateFlow()
|
||||
|
||||
fun sendeNennung(turnierNr: String, payload: NennungPayload) {
|
||||
viewModelScope.launch {
|
||||
_uiState.update { it.copy(isLoading = true, error = null) }
|
||||
try {
|
||||
val dto = NennungDto(
|
||||
turnierNr = turnierNr,
|
||||
vorname = payload.vorname,
|
||||
nachname = payload.nachname,
|
||||
lizenz = payload.lizenz,
|
||||
pferdName = payload.pferdName,
|
||||
pferdAlter = payload.pferdAlter,
|
||||
email = payload.email,
|
||||
telefon = payload.telefon,
|
||||
bewerbe = payload.bewerbe.joinToString(",") { it.nr.toString() },
|
||||
bemerkungen = payload.bemerkungen
|
||||
)
|
||||
|
||||
// Wir nutzen den httpClient, der via Koin injiziert wird.
|
||||
// Da im Web-Frontend evtl. kein API-Gateway davor ist (oder ein anderes),
|
||||
// konfigurieren wir den Pfad hier explizit.
|
||||
httpClient.post("/api/mail/nennungen") {
|
||||
contentType(ContentType.Application.Json)
|
||||
setBody(dto)
|
||||
}
|
||||
|
||||
_uiState.update { it.copy(isLoading = false, isSuccess = true) }
|
||||
} catch (e: Exception) {
|
||||
_uiState.update { it.copy(isLoading = false, error = "Fehler beim Senden: ${e.message}") }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun resetState() {
|
||||
_uiState.update { OnlineNennungUiState() }
|
||||
}
|
||||
}
|
||||
+5
-3
@@ -57,6 +57,7 @@ fun TurnierDetailScreen(
|
||||
"ARTIKEL",
|
||||
"ABRECHNUNG",
|
||||
"NENNUNGEN",
|
||||
"ONLINE-EINGANG",
|
||||
"ZEITPLAN",
|
||||
"STARTLISTEN",
|
||||
"ERGEBNISLISTEN",
|
||||
@@ -116,9 +117,10 @@ fun TurnierDetailScreen(
|
||||
onAbrechnungClick = { selectedTab = 4 }
|
||||
)
|
||||
}
|
||||
6 -> ZeitplanTabContent(turnierId = turnierId, viewModel = bewerbViewModel)
|
||||
7 -> StartlistenTabContent()
|
||||
8 -> ErgebnislistenTabContent()
|
||||
6 -> OnlineNennungEingangTabContent(turnierNr = turnierId.toString())
|
||||
7 -> ZeitplanTabContent(turnierId = turnierId, viewModel = bewerbViewModel)
|
||||
8 -> StartlistenTabContent()
|
||||
9 -> ErgebnislistenTabContent()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+119
@@ -0,0 +1,119 @@
|
||||
package at.mocode.turnier.feature.presentation
|
||||
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.*
|
||||
import androidx.compose.foundation.lazy.LazyColumn
|
||||
import androidx.compose.foundation.lazy.items
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.filled.Check
|
||||
import androidx.compose.material.icons.filled.Refresh
|
||||
import androidx.compose.material3.*
|
||||
import androidx.compose.runtime.*
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
|
||||
@Composable
|
||||
fun OnlineNennungEingangTabContent(turnierNr: String) {
|
||||
var isLoading by remember { mutableStateOf(false) }
|
||||
|
||||
// In einer echten Implementierung kämen diese Daten vom mail-service via Repository/ViewModel
|
||||
val mockNennungen = remember {
|
||||
listOf(
|
||||
OnlineNennung(1, "Max", "Mustermann", "R1", "Sandro Boy", "2012", "neu@test.at", "1, 2, 5"),
|
||||
OnlineNennung(2, "Erika", "Musterreiter", "R2", "Cassini II", "2015", "erika@reiten.at", "3, 10")
|
||||
)
|
||||
}
|
||||
|
||||
Column(modifier = Modifier.fillMaxSize().padding(16.dp)) {
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth().padding(bottom = 16.dp),
|
||||
horizontalArrangement = Arrangement.SpaceBetween,
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
Column {
|
||||
Text("Eingegangene Online-Nennungen", style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold)
|
||||
Text("Turnier: $turnierNr", style = MaterialTheme.typography.bodyMedium, color = Color.Gray)
|
||||
}
|
||||
|
||||
Button(onClick = { /* Refresh */ }, colors = ButtonDefaults.buttonColors(containerColor = Color(0xFF1E3A8A))) {
|
||||
Icon(Icons.Default.Refresh, contentDescription = null)
|
||||
Spacer(Modifier.width(8.dp))
|
||||
Text("Aktualisieren")
|
||||
}
|
||||
}
|
||||
|
||||
if (mockNennungen.isEmpty()) {
|
||||
Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
|
||||
Text("Keine neuen Nennungen vorhanden.", color = Color.Gray)
|
||||
}
|
||||
} else {
|
||||
LazyColumn(verticalArrangement = Arrangement.spacedBy(12.dp)) {
|
||||
items(mockNennungen) { nennung ->
|
||||
NennungEingangCard(nennung)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun NennungEingangCard(nennung: OnlineNennung) {
|
||||
Card(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
shape = RoundedCornerShape(12.dp),
|
||||
colors = CardDefaults.cardColors(containerColor = Color.White),
|
||||
elevation = CardDefaults.cardElevation(defaultElevation = 2.dp)
|
||||
) {
|
||||
Row(
|
||||
modifier = Modifier.padding(16.dp).fillMaxWidth(),
|
||||
horizontalArrangement = Arrangement.SpaceBetween,
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
Column(modifier = Modifier.weight(1f)) {
|
||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||
Text("${nennung.vorname} ${nennung.nachname}", fontWeight = FontWeight.Bold, fontSize = 16.sp)
|
||||
Spacer(Modifier.width(8.dp))
|
||||
Badge(containerColor = Color(0xFFE3F2FD)) { Text(nennung.lizenz, color = Color(0xFF1976D2)) }
|
||||
}
|
||||
Spacer(Modifier.height(4.dp))
|
||||
Text("Pferd: ${nennung.pferdName} (*${nennung.pferdAlter})", style = MaterialTheme.typography.bodyMedium)
|
||||
Text("Bewerbe: ${nennung.bewerbe}", style = MaterialTheme.typography.bodySmall, color = Color(0xFF2E7D32), fontWeight = FontWeight.Bold)
|
||||
}
|
||||
|
||||
Column(horizontalAlignment = Alignment.End) {
|
||||
Text(nennung.email, style = MaterialTheme.typography.labelSmall, color = Color.Gray)
|
||||
Spacer(Modifier.height(8.dp))
|
||||
Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||
OutlinedButton(onClick = { /* Details */ }, shape = RoundedCornerShape(8.dp)) {
|
||||
Text("Details")
|
||||
}
|
||||
Button(
|
||||
onClick = { /* Übernehmen */ },
|
||||
shape = RoundedCornerShape(8.dp),
|
||||
colors = ButtonDefaults.buttonColors(containerColor = Color(0xFF2E7D32))
|
||||
) {
|
||||
Icon(Icons.Default.Check, contentDescription = null, modifier = Modifier.size(18.dp))
|
||||
Spacer(Modifier.width(4.dp))
|
||||
Text("Übernehmen")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
data class OnlineNennung(
|
||||
val id: Int,
|
||||
val vorname: String,
|
||||
val nachname: String,
|
||||
val lizenz: String,
|
||||
val pferdName: String,
|
||||
val pferdAlter: String,
|
||||
val email: String,
|
||||
val bewerbe: String
|
||||
)
|
||||
Reference in New Issue
Block a user