mocode-software/meldestelle
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

chore: implementiere Lockscreen-Logik für Geräte- und Veranstaltungsinitialisierung, füge Zustandsprüfungen und neue UI-Komponenten hinzu

Browse Source 
Signed-off-by: StefanMoCoAt <stefan.mo.co@gmail.com>
This commit is contained in:
Stefan Mogeritsch
2026-04-20 23:37:54 +02:00
parent db58c24613
commit 5b8ef5ea2d
9 changed files with 469 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/features/veranstaltung-feature/src/jvmMain/kotlin/at/mocode/veranstaltung/feature/di/VeranstaltungModule.kt
+2
View File
@@ -1,8 +1,10 @@
package at.mocode.veranstaltung.feature.di
import at.mocode.veranstaltung.feature.presentation.VeranstaltungManagementViewModel
import at.mocode.veranstaltung.feature.presentation.VeranstaltungWizardViewModel
import org.koin.dsl.module
val veranstaltungModule = module {
factory { VeranstaltungManagementViewModel(get()) }
factory { VeranstaltungWizardViewModel(get(), get(), get()) }
}
frontend/features/veranstaltung-feature/src/jvmMain/kotlin/at/mocode/veranstaltung/feature/presentation/VeranstaltungWizardScreen.kt
+285
View File
@@ -0,0 +1,285 @@
package at.mocode.veranstaltung.feature.presentation
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.filled.Check
import androidx.compose.material.icons.filled.CloudDownload
import androidx.compose.material.icons.filled.Info
import androidx.compose.material3.*
import androidx.compose.runtime.Composable
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 at.mocode.frontend.core.designsystem.theme.Dimens
import kotlin.uuid.ExperimentalUuidApi
@OptIn(ExperimentalMaterial3Api::class, ExperimentalUuidApi::class)
@Composable
fun VeranstaltungWizardScreen(
viewModel: VeranstaltungWizardViewModel,
onBack: () -> Unit,
onFinish: () -> Unit
) {
val state = viewModel.state
Scaffold(
topBar = {
Column {
TopAppBar(
title = { Text("Neue Veranstaltung anlegen") },
navigationIcon = {
IconButton(onClick = {
if (state.currentStep == WizardStep.ZNS_CHECK) onBack()
else viewModel.previousStep()
}) {
Icon(Icons.AutoMirrored.Filled.ArrowBack, "Zurück")
}
}
)
LinearProgressIndicator(
progress = { (state.currentStep.ordinal + 1).toFloat() / WizardStep.entries.size.toFloat() },
modifier = Modifier.fillMaxWidth()
)
}
}
) { padding ->
Column(
modifier = Modifier
.fillMaxSize()
.padding(padding)
) {
// Sticky Preview Card
VorschauCard(state = state)
Box(
modifier = Modifier
.fillMaxSize()
.padding(Dimens.SpacingL)
.verticalScroll(rememberScrollState())
) {
when (state.currentStep) {
WizardStep.ZNS_CHECK -> ZnsCheckStep(viewModel)
WizardStep.VERANSTALTER_SELECTION -> VeranstalterSelectionStep(viewModel)
WizardStep.ANSPRECHPERSON_MAPPING -> AnsprechpersonMappingStep(viewModel)
WizardStep.META_DATA -> MetaDataStep(viewModel)
WizardStep.TURNIER_ANLAGE -> TurnierAnlageStep(viewModel)
WizardStep.SUMMARY -> SummaryStep(viewModel, onFinish)
}
}
}
}
}
@Composable
private fun VorschauCard(state: VeranstaltungWizardState) {
Card(
modifier = Modifier
.fillMaxWidth()
.padding(Dimens.SpacingM),
colors = CardDefaults.cardColors(
containerColor = MaterialTheme.colorScheme.primaryContainer
)
) {
Row(
modifier = Modifier.padding(Dimens.SpacingM),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(Dimens.SpacingM)
) {
// Placeholder für Logo
Box(
modifier = Modifier
.size(64.dp)
.background(MaterialTheme.colorScheme.surface, MaterialTheme.shapes.small),
contentAlignment = Alignment.Center
) {
Text("LOGO", style = MaterialTheme.typography.labelSmall)
}
Column(modifier = Modifier.weight(1f)) {
Text(
text = state.name.ifBlank { "Neue Veranstaltung" },
style = MaterialTheme.typography.titleLarge,
fontWeight = FontWeight.Bold
)
Text(
text = state.veranstalterName.ifBlank { "Kein Veranstalter gewählt" },
style = MaterialTheme.typography.bodyMedium
)
Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
Text(
text = state.ort.ifBlank { "Ort noch nicht festgelegt" },
style = MaterialTheme.typography.bodySmall
)
Text(
text = "| ${state.startDatum ?: ""} - ${state.endDatum ?: ""}",
style = MaterialTheme.typography.bodySmall
)
}
}
}
}
}
@Composable
private fun ZnsCheckStep(viewModel: VeranstaltungWizardViewModel) {
val state = viewModel.state
Column(verticalArrangement = Arrangement.spacedBy(16.dp)) {
Text("Schritt 1: Stammdaten-Verfügbarkeit prüfen", style = MaterialTheme.typography.titleLarge)
if (!state.isZnsAvailable) {
Card(colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.errorContainer)) {
Row(Modifier.padding(16.dp), verticalAlignment = Alignment.CenterVertically) {
Icon(Icons.Default.Info, null, tint = MaterialTheme.colorScheme.error)
Spacer(Modifier.width(12.dp))
Column {
Text("Stammdaten fehlen!", fontWeight = FontWeight.Bold)
Text("Bitte importieren Sie die aktuelle ZNS.zip über den ZNS-Importer.")
}
}
}
Button(onClick = { /* Navigiere zum ZNS Importer */ }) {
Icon(Icons.Default.CloudDownload, null)
Spacer(Modifier.width(8.dp))
Text("ZNS-Importer öffnen")
}
} else {
Card(colors = CardDefaults.cardColors(containerColor = Color(0xFFE8F5E9))) {
Row(Modifier.padding(16.dp), verticalAlignment = Alignment.CenterVertically) {
Icon(Icons.Default.Check, null, tint = Color(0xFF2E7D32))
Spacer(Modifier.width(12.dp))
Text("Stammdaten sind aktuell und verfügbar.", color = Color(0xFF2E7D32))
}
}
Button(onClick = { viewModel.nextStep() }) {
Text("Weiter zur Veranstalter-Wahl")
}
}
}
}
@OptIn(ExperimentalMaterial3Api::class, ExperimentalUuidApi::class)
@Composable
private fun VeranstalterSelectionStep(viewModel: VeranstaltungWizardViewModel) {
Column(verticalArrangement = Arrangement.spacedBy(16.dp)) {
Text("Schritt 2: Veranstalter auswählen", style = MaterialTheme.typography.titleLarge)
Text("Suchen Sie nach dem Verein (Name oder OEPS-Nummer).")
// Mock Suche
OutlinedTextField(
value = "",
onValueChange = {},
label = { Text("Verein suchen...") },
modifier = Modifier.fillMaxWidth()
)
Button(onClick = {
// Mock Selection
viewModel.setVeranstalter(
id = kotlin.uuid.Uuid.random(),
nummer = "6-009",
name = "Union Reit- u. Fahrverein Neumarkt/M.",
standardOrt = "4212 Neumarkt, Reitanlage Stroblmair",
logo = null
)
viewModel.nextStep()
}) {
Text("Union Reit- u. Fahrverein Neumarkt/M. (6-009) wählen")
}
}
}
@Composable
private fun AnsprechpersonMappingStep(viewModel: VeranstaltungWizardViewModel) {
Column(verticalArrangement = Arrangement.spacedBy(16.dp)) {
Text("Schritt 3: Ansprechperson festlegen", style = MaterialTheme.typography.titleLarge)
Text("Wer ist für diese Veranstaltung verantwortlich?")
Button(onClick = {
viewModel.setAnsprechperson("12345", "Ursula Stroblmair")
viewModel.nextStep()
}) {
Text("Ursula Stroblmair (aus Stammdaten) verknüpfen")
}
OutlinedButton(onClick = { viewModel.nextStep() }) {
Text("Neue Person anlegen (Offline-Profil)")
}
}
}
@Composable
private fun MetaDataStep(viewModel: VeranstaltungWizardViewModel) {
Column(verticalArrangement = Arrangement.spacedBy(16.dp)) {
Text("Schritt 4: Veranstaltungs-Parameter", style = MaterialTheme.typography.titleLarge)
OutlinedTextField(
value = viewModel.state.name,
onValueChange = { viewModel.updateMetaData(it, viewModel.state.ort, viewModel.state.startDatum, viewModel.state.endDatum, viewModel.state.logoUrl) },
label = { Text("Name der Veranstaltung") },
modifier = Modifier.fillMaxWidth()
)
OutlinedTextField(
value = viewModel.state.ort,
onValueChange = { viewModel.updateMetaData(viewModel.state.name, it, viewModel.state.startDatum, viewModel.state.endDatum, viewModel.state.logoUrl) },
label = { Text("Veranstaltungs-Ort") },
modifier = Modifier.fillMaxWidth()
)
Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) {
// Mock Date Picker
Button(onClick = { viewModel.nextStep() }) {
Text("Weiter zur Turnier-Anlage")
}
}
}
}
@Composable
private fun TurnierAnlageStep(viewModel: VeranstaltungWizardViewModel) {
Column(verticalArrangement = Arrangement.spacedBy(16.dp)) {
Text("Schritt 5: Turniere & Ausschreibung", style = MaterialTheme.typography.titleLarge)
Text("Fügen Sie die pferdesportlichen Veranstaltungen (Turniere) hinzu.")
Card(modifier = Modifier.fillMaxWidth()) {
Column(Modifier.padding(16.dp)) {
Text("Turnier #1", fontWeight = FontWeight.Bold)
Text("Turnier-Nr: (noch nicht vergeben)")
Button(onClick = {}) {
Text("Ausschreibung (PDF) hochladen")
}
}
}
Button(onClick = { viewModel.nextStep() }) {
Text("Zusammenfassung")
}
}
}
@Composable
private fun SummaryStep(viewModel: VeranstaltungWizardViewModel, onFinish: () -> Unit) {
Column(verticalArrangement = Arrangement.spacedBy(16.dp)) {
Text("Schritt 6: Zusammenfassung", style = MaterialTheme.typography.titleLarge)
Card(modifier = Modifier.fillMaxWidth()) {
Column(Modifier.padding(16.dp)) {
Text("Überprüfen Sie Ihre Angaben, bevor Sie die Veranstaltung anlegen.")
// ... Summary Details ...
}
}
Button(
onClick = onFinish,
modifier = Modifier.fillMaxWidth()
) {
Text("Veranstaltung jetzt anlegen")
}
}
}
frontend/features/veranstaltung-feature/src/jvmMain/kotlin/at/mocode/veranstaltung/feature/presentation/VeranstaltungWizardViewModel.kt
+52 -15
View File
@@ -19,22 +19,31 @@ import kotlin.uuid.ExperimentalUuidApi
import kotlin.uuid.Uuid
enum class WizardStep {
ZNS_IMPORT,
ZNS_CHECK,
VERANSTALTER_SELECTION,
ANSPRECHPERSON_MAPPING,
META_DATA,
TYPE_SELECTION
TURNIER_ANLAGE,
SUMMARY
}
@OptIn(ExperimentalUuidApi::class)
data class VeranstaltungWizardState(
val currentStep: WizardStep = WizardStep.ZNS_IMPORT,
val currentStep: WizardStep = WizardStep.ZNS_CHECK,
val veranstalterId: Uuid? = null,
val veranstalterVereinsNummer: String = "",
val veranstalterName: String = "",
val ansprechpersonSatznummer: String = "",
val ansprechpersonName: String = "",
val name: String = "",
val ort: String = "",
val startDatum: LocalDate? = null,
val endDatum: LocalDate? = null,
val logoUrl: String? = null,
val isSaving: Boolean = false,
val error: String? = null,
val createdVeranstaltungId: Uuid? = null
val createdVeranstaltungId: Uuid? = null,
val isZnsAvailable: Boolean = false
)
@OptIn(ExperimentalUuidApi::class)
@@ -47,12 +56,27 @@ class VeranstaltungWizardViewModel(
var state by mutableStateOf(VeranstaltungWizardState())
private set
init {
checkZnsAvailability()
}
fun checkZnsAvailability() {
// Hier prüfen wir, ob Stammdaten vorhanden sind (Simuliert)
viewModelScope.launch {
val hasData = true // Simulation: Stammdaten sind da
state = state.copy(isZnsAvailable = hasData)
}
}
fun nextStep() {
state = state.copy(
currentStep = when (state.currentStep) {
WizardStep.ZNS_IMPORT -> WizardStep.META_DATA
WizardStep.META_DATA -> WizardStep.TYPE_SELECTION
WizardStep.TYPE_SELECTION -> WizardStep.TYPE_SELECTION
WizardStep.ZNS_CHECK -> WizardStep.VERANSTALTER_SELECTION
WizardStep.VERANSTALTER_SELECTION -> WizardStep.ANSPRECHPERSON_MAPPING
WizardStep.ANSPRECHPERSON_MAPPING -> WizardStep.META_DATA
WizardStep.META_DATA -> WizardStep.TURNIER_ANLAGE
WizardStep.TURNIER_ANLAGE -> WizardStep.SUMMARY
WizardStep.SUMMARY -> WizardStep.SUMMARY
}
)
}
@@ -60,19 +84,32 @@ class VeranstaltungWizardViewModel(
fun previousStep() {
state = state.copy(
currentStep = when (state.currentStep) {
WizardStep.ZNS_IMPORT -> WizardStep.ZNS_IMPORT
WizardStep.META_DATA -> WizardStep.ZNS_IMPORT
WizardStep.TYPE_SELECTION -> WizardStep.META_DATA
WizardStep.ZNS_CHECK -> WizardStep.ZNS_CHECK
WizardStep.VERANSTALTER_SELECTION -> WizardStep.ZNS_CHECK
WizardStep.ANSPRECHPERSON_MAPPING -> WizardStep.VERANSTALTER_SELECTION
WizardStep.META_DATA -> WizardStep.ANSPRECHPERSON_MAPPING
WizardStep.TURNIER_ANLAGE -> WizardStep.META_DATA
WizardStep.SUMMARY -> WizardStep.TURNIER_ANLAGE
}
)
}
fun updateMetaData(name: String, ort: String, start: LocalDate?, end: LocalDate?) {
state = state.copy(name = name, ort = ort, startDatum = start, endDatum = end)
fun setVeranstalter(id: Uuid, nummer: String, name: String, standardOrt: String, logo: String?) {
state = state.copy(
veranstalterId = id,
veranstalterVereinsNummer = nummer,
veranstalterName = name,
ort = standardOrt,
logoUrl = logo
)
}
fun setVeranstalter(id: Uuid) {
state = state.copy(veranstalterId = id)
fun setAnsprechperson(satznummer: String, name: String) {
state = state.copy(ansprechpersonSatznummer = satznummer, ansprechpersonName = name)
}
fun updateMetaData(name: String, ort: String, start: LocalDate?, end: LocalDate?, logo: String?) {
state = state.copy(name = name, ort = ort, startDatum = start, endDatum = end, logoUrl = logo)
}
fun saveVeranstaltung() {
@@ -99,7 +136,7 @@ class VeranstaltungWizardViewModel(
}
if (response.status == HttpStatusCode.Created) {
// Hier müsste die ID aus dem Response gelesen werden, falls benötigt
// Hier müsste die ID aus der Response gelesen werden, falls benötigt
state = state.copy(isSaving = false)
nextStep()
} else {