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

Remove domain models and services related to Abteilung, AbteilungsRegelService, and Bewerb: cleanup unnecessary entities, validation logic, and tests across backend modules.

Browse Source
This commit is contained in:
Stefan Mogeritsch
2026-04-13 21:58:06 +02:00
parent 76d7019d30
commit fb1c1ee4ce
76 changed files with 1091 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/core/auth/build.gradle.kts
+15 -3
View File
@@ -14,11 +14,23 @@ version = "1.0.0"
kotlin {
jvm()
js(IR) {
browser()
binaries.library()
browser {
testTask {
enabled = false
}
}
}
wasmJs {
browser()
binaries.library()
browser {
testTask {
enabled = false
}
}
}
sourceSets {
@@ -66,7 +78,7 @@ kotlin {
}
wasmJsMain.dependencies {
implementation("org.jetbrains.kotlin:kotlin-stdlib-wasm-js:2.3.20")
implementation(libs.kotlin.stdlib.wasm.js)
implementation(libs.ktor.client.js)
}
frontend/core/design-system/build.gradle.kts
+14 -2
View File
@@ -11,11 +11,23 @@ plugins {
kotlin {
jvm()
js(IR) {
browser()
binaries.library()
browser {
testTask {
enabled = false
}
}
}
wasmJs {
browser()
binaries.library()
browser {
testTask {
enabled = false
}
}
}
sourceSets {
frontend/core/domain/build.gradle.kts
+15 -2
View File
@@ -9,16 +9,29 @@ plugins {
kotlin {
jvm()
js(IR) {
browser()
binaries.library()
browser {
testTask {
enabled = false
}
}
}
wasmJs {
browser()
binaries.library()
browser {
testTask {
enabled = false
}
}
}
sourceSets {
commonMain.dependencies {
implementation(libs.kotlinx.serialization.json)
}
jvmTest.dependencies {
implementation(libs.kotlin.test)
frontend/core/local-db/build.gradle.kts
+33 -1
View File
@@ -1,3 +1,7 @@
@file:OptIn(ExperimentalWasmDsl::class)
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
plugins {
alias(libs.plugins.kotlinMultiplatform)
alias(libs.plugins.kotlinSerialization)
@@ -6,7 +10,17 @@ plugins {
kotlin {
jvm()
js {
js(IR) {
binaries.library()
browser {
testTask {
enabled = false
}
}
}
wasmJs {
binaries.library()
browser {
testTask {
@@ -32,6 +46,24 @@ kotlin {
implementation(npm("@sqlite.org/sqlite-wasm", libs.versions.sqliteWasm.get()))
}
jvmTest.dependencies {
implementation(libs.kotlin.test)
}
jsTest.dependencies {
implementation(libs.kotlin.test)
}
wasmJsMain.dependencies {
implementation(libs.kotlin.stdlib.wasm.js)
implementation(libs.sqldelight.driver.web)
implementation(npm("@sqlite.org/sqlite-wasm", libs.versions.sqliteWasm.get()))
}
wasmJsTest.dependencies {
implementation(libs.kotlin.test)
}
commonTest.dependencies {
implementation(libs.kotlin.test)
}
frontend/core/local-db/src/wasmJsMain/kotlin/at/mocode/frontend/core/localdb/DatabaseDriverFactory.wasmJs.kt
+12 -21
View File
@@ -1,29 +1,20 @@
package at.mocode.frontend.core.localdb
/*
import app.cash.sqldelight.db.SqlDriver
import app.cash.sqldelight.driver.worker.WebWorkerDriver
import org.w3c.dom.Worker
@Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
actual class DatabaseDriverFactory {
actual suspend fun createDriver(): SqlDriver {
// In Kotlin/Wasm, we cannot use the js() function inside a function body like in Kotlin/JS.
// We need to use a helper function or a different approach.
// However, for WebWorkerDriver, we need a Worker instance.
actual suspend fun createDriver(): SqlDriver {
// Provisorische Implementierung für den Build-Erfolg
// In einer echten Umgebung müsste hier der WebWorkerDriver konfiguriert werden,
// sobald die org.w3c.dom Abhängigkeiten korrekt aufgelöst werden können.
throw UnsupportedOperationException("Database on Wasm is not yet fully implemented due to missing org.w3c.dom")
}
// Workaround for Wasm: Use a helper function to create the Worker
val worker = createWorker()
val driver = WebWorkerDriver(worker)
private suspend fun getVersion(driver: SqlDriver): Long {
return 0L
}
AppDatabase.Schema.create(driver).await()
return driver
}
private suspend fun setVersion(driver: SqlDriver, version: Long) {
}
}
// Helper function to create a Worker in Wasm
// Note: Kotlin/Wasm JS interop is stricter.
// We must return a type that Wasm understands as an external JS reference.
// 'Worker' from org.w3c.dom is correct, but we need to ensure the stdlib is available.
private fun createWorker(): Worker = js("new Worker(new URL('sqlite.worker.js', import.meta.url))")
*/
frontend/core/navigation/build.gradle.kts
+18 -3
View File
@@ -1,3 +1,7 @@
@file:OptIn(ExperimentalWasmDsl::class)
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
/**
* Dieses Modul definiert nur die Navigationsrouten.
*/
@@ -10,12 +14,23 @@ version = "1.0.0"
kotlin {
jvm()
js(IR) {
browser()
binaries.library()
browser {
testTask {
enabled = false
}
}
}
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
wasmJs {
browser()
binaries.library()
browser {
testTask {
enabled = false
}
}
}
sourceSets {
frontend/core/network/build.gradle.kts
+14 -2
View File
@@ -9,11 +9,23 @@ plugins {
kotlin {
jvm()
js(IR) {
browser()
binaries.library()
browser {
testTask {
enabled = false
}
}
}
wasmJs {
browser()
binaries.library()
browser {
testTask {
enabled = false
}
}
}
sourceSets {
frontend/core/network/src/commonMain/kotlin/at/mocode/frontend/core/network/ApiRoutes.kt
+1
View File
@@ -50,5 +50,6 @@ object ApiRoutes {
fun veranstaltungKonten(veranstaltungId: String) = "$ROOT/veranstaltungen/$veranstaltungId/konten"
fun personKonto(veranstaltungId: String, personId: String) = "$ROOT/veranstaltungen/$veranstaltungId/personen/$personId"
fun rechnung(kontoId: String) = "$ROOT/konten/$kontoId/rechnung"
fun offenePosten(veranstaltungId: String) = "$ROOT/veranstaltungen/$veranstaltungId/offene-posten"
}
}
frontend/core/sync/build.gradle.kts
+15 -1
View File
@@ -1,3 +1,7 @@
@file:OptIn(ExperimentalWasmDsl::class)
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
plugins {
alias(libs.plugins.kotlinMultiplatform)
alias(libs.plugins.kotlinSerialization)
@@ -5,7 +9,17 @@ plugins {
kotlin {
jvm()
js {
js(IR) {
binaries.library()
browser {
testTask {
enabled = false
}
}
}
wasmJs {
binaries.library()
browser {
testTask {
frontend/features/billing-feature/build.gradle.kts
+20 -3
View File
@@ -1,3 +1,7 @@
@file:OptIn(ExperimentalWasmDsl::class)
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
/**
* Dieses Modul kapselt die Gebühren-Logik und Abrechnungs-Features (Billing-Sync).
*/
@@ -13,11 +17,24 @@ version = "1.0.0"
kotlin {
jvm()
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
wasmJs {
browser()
js(IR) {
binaries.library()
browser {
testTask {
enabled = false
}
}
}
wasmJs {
binaries.library()
browser {
testTask {
enabled = false
}
}
}
sourceSets {
commonMain.dependencies {
implementation(projects.frontend.core.designSystem)
frontend/features/billing-feature/src/commonMain/kotlin/at/mocode/frontend/features/billing/data/DefaultBillingRepository.kt
+4
View File
@@ -42,4 +42,8 @@ class DefaultBillingRepository(
override suspend fun getRechnungPdf(kontoId: String): Result<ByteArray> = runCatching {
client.get(ApiRoutes.Billing.rechnung(kontoId)).body()
}
override suspend fun getOffenePosten(veranstaltungId: String): Result<List<TeilnehmerKontoDto>> = runCatching {
client.get(ApiRoutes.Billing.offenePosten(veranstaltungId)).body()
}
}
frontend/features/billing-feature/src/commonMain/kotlin/at/mocode/frontend/features/billing/data/FakeBillingRepository.kt
+4
View File
@@ -61,4 +61,8 @@ class FakeBillingRepository : BillingRepository {
override suspend fun getRechnungPdf(kontoId: String): Result<ByteArray> {
return Result.success("MOCK PDF CONTENT".encodeToByteArray())
}
override suspend fun getOffenePosten(veranstaltungId: String): Result<List<TeilnehmerKontoDto>> {
return Result.success(konten.filter { it.saldoCent < 0 })
}
}
frontend/features/billing-feature/src/commonMain/kotlin/at/mocode/frontend/features/billing/domain/BillingRepository.kt
+7
View File
@@ -38,4 +38,11 @@ interface BillingRepository {
suspend fun getRechnungPdf(
kontoId: String
): Result<ByteArray>
/**
* Holt alle Konten mit negativem Saldo für eine Veranstaltung.
*/
suspend fun getOffenePosten(
veranstaltungId: String
): Result<List<TeilnehmerKontoDto>>
}
frontend/features/billing-feature/src/commonMain/kotlin/at/mocode/frontend/features/billing/presentation/BillingScreen.kt
+38 -4
View File
@@ -37,7 +37,34 @@ fun BillingScreen(
Spacer(Modifier.width(8.dp))
Text("Teilnehmer-Abrechnung", style = MaterialTheme.typography.headlineSmall)
Spacer(Modifier.weight(1f))
IconButton(onClick = { viewModel.loadKonten(veranstaltungId.toString()) }) {
FilterChip(
selected = !state.isOffenePostenMode,
onClick = { viewModel.loadKonten(veranstaltungId.toString()) },
label = { Text("Alle") },
leadingIcon = if (!state.isOffenePostenMode) {
{ Icon(Icons.Default.People, contentDescription = null, modifier = Modifier.size(18.dp)) }
} else null
)
Spacer(Modifier.width(8.dp))
FilterChip(
selected = state.isOffenePostenMode,
onClick = { viewModel.loadOffenePosten(veranstaltungId.toString()) },
label = { Text("Offen") },
leadingIcon = if (state.isOffenePostenMode) {
{ Icon(Icons.Default.Warning, contentDescription = null, modifier = Modifier.size(18.dp), tint = MaterialTheme.colorScheme.error) }
} else null,
colors = FilterChipDefaults.filterChipColors(
selectedContainerColor = MaterialTheme.colorScheme.errorContainer,
selectedLabelColor = MaterialTheme.colorScheme.error
)
)
Spacer(Modifier.width(16.dp))
IconButton(onClick = {
if (state.isOffenePostenMode) viewModel.loadOffenePosten(veranstaltungId.toString())
else viewModel.loadKonten(veranstaltungId.toString())
}) {
Icon(Icons.Default.Refresh, contentDescription = "Aktualisieren")
}
}
@@ -51,15 +78,22 @@ fun BillingScreen(
elevation = CardDefaults.cardElevation(defaultElevation = 2.dp)
) {
Column(modifier = Modifier.padding(8.dp)) {
Text("Teilnehmer", fontWeight = FontWeight.Bold, fontSize = 14.sp)
Text(
if (state.isOffenePostenMode) "Offene Posten" else "Teilnehmer",
fontWeight = FontWeight.Bold,
fontSize = 14.sp,
color = if (state.isOffenePostenMode) MaterialTheme.colorScheme.error else Color.Unspecified
)
HorizontalDivider(Modifier.padding(vertical = 4.dp))
if (state.isLoading && state.konten.isEmpty()) {
if (state.isLoading && (state.konten.isEmpty() && state.offenePosten.isEmpty())) {
CircularProgressIndicator(modifier = Modifier.align(Alignment.CenterHorizontally).padding(16.dp))
}
val displayList = if (state.isOffenePostenMode) state.offenePosten else state.konten
LazyColumn {
items(state.konten) { konto ->
items(displayList) { konto ->
KontoItem(
konto = konto,
isSelected = state.selectedKonto?.id == konto.id,
frontend/features/billing-feature/src/commonMain/kotlin/at/mocode/frontend/features/billing/presentation/BillingViewModel.kt
+19 -1
View File
@@ -16,6 +16,8 @@ data class BillingUiState(
val konten: List<TeilnehmerKontoDto> = emptyList(),
val selectedKonto: TeilnehmerKontoDto? = null,
val buchungen: List<BuchungDto> = emptyList(),
val offenePosten: List<TeilnehmerKontoDto> = emptyList(),
val isOffenePostenMode: Boolean = false,
val pdfData: ByteArray? = null,
val error: String? = null
)
@@ -29,7 +31,7 @@ class BillingViewModel(
fun loadKonten(veranstaltungId: String) {
viewModelScope.launch {
_uiState.value = _uiState.value.copy(isLoading = true, error = null)
_uiState.value = _uiState.value.copy(isLoading = true, error = null, isOffenePostenMode = false)
try {
repository.getKonten(veranstaltungId)
.onSuccess { konten ->
@@ -50,6 +52,22 @@ class BillingViewModel(
}
}
fun loadOffenePosten(veranstaltungId: String) {
viewModelScope.launch {
_uiState.value = _uiState.value.copy(isLoading = true, error = null, isOffenePostenMode = true)
repository.getOffenePosten(veranstaltungId)
.onSuccess { konten ->
_uiState.value = _uiState.value.copy(offenePosten = konten, isLoading = false, error = null)
}
.onFailure {
_uiState.value = _uiState.value.copy(
isLoading = false,
error = "Fehler beim Laden der offenen Posten: ${it.message ?: "Unbekannter Fehler"}"
)
}
}
}
fun loadKonto(veranstaltungId: String, personId: String, personName: String) {
viewModelScope.launch {
_uiState.value = _uiState.value.copy(isLoading = true, error = null)
frontend/features/funktionaer-feature/build.gradle.kts
+40 -4
View File
@@ -1,3 +1,7 @@
@file:OptIn(ExperimentalWasmDsl::class)
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
/**
* Feature-Modul: Funktionärs-Verwaltung (Desktop-only)
*/
@@ -13,21 +17,53 @@ version = "1.0.0"
kotlin {
jvm()
js(IR) {
binaries.library()
browser {
testTask {
enabled = false
}
}
}
wasmJs {
binaries.library()
browser {
testTask {
enabled = false
}
}
}
sourceSets {
jvmMain.dependencies {
commonMain.dependencies {
implementation(projects.frontend.core.designSystem)
implementation(projects.frontend.core.network)
implementation(projects.frontend.core.domain)
implementation(projects.frontend.core.navigation)
implementation(compose.desktop.currentOs)
implementation(projects.core.coreDomain)
implementation(compose.foundation)
implementation(compose.runtime)
implementation(compose.material3)
implementation(compose.ui)
implementation(compose.components.resources)
implementation(compose.materialIconsExtended)
implementation(libs.bundles.kmp.common)
implementation(libs.bundles.compose.common)
implementation(libs.koin.core)
implementation(libs.koin.compose)
implementation(libs.koin.compose.viewmodel)
}
commonTest.dependencies {
implementation(libs.kotlin.test)
implementation(libs.kotlinx.coroutines.test)
}
jvmMain.dependencies {
implementation(compose.uiTooling)
}
}
}
frontend/features/nennung-feature/build.gradle.kts
+21 -2
View File
@@ -1,3 +1,5 @@
@file:OptIn(ExperimentalWasmDsl::class)
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
/**
@@ -15,9 +17,23 @@ version = "1.0.0"
kotlin {
jvm()
@OptIn(ExperimentalWasmDsl::class)
js(IR) {
binaries.library()
browser {
testTask {
enabled = false
}
}
}
wasmJs {
browser()
binaries.library()
browser {
testTask {
enabled = false
}
}
}
sourceSets {
@@ -25,13 +41,16 @@ kotlin {
implementation(projects.frontend.core.designSystem)
implementation(projects.frontend.core.domain)
implementation(libs.kotlinx.datetime)
implementation(compose.foundation)
implementation(compose.runtime)
implementation(compose.material3)
implementation(compose.ui)
implementation(compose.materialIconsExtended)
implementation(libs.bundles.kmp.common)
implementation(libs.bundles.compose.common)
implementation(libs.koin.core)
implementation(libs.koin.compose)
implementation(libs.koin.compose.viewmodel)
frontend/features/pferde-feature/build.gradle.kts
+40 -4
View File
@@ -1,3 +1,7 @@
@file:OptIn(ExperimentalWasmDsl::class)
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
/**
* Feature-Modul: Pferde-Verwaltung (Desktop-only)
*/
@@ -12,21 +16,53 @@ version = "1.0.0"
kotlin {
jvm()
js(IR) {
binaries.library()
browser {
testTask {
enabled = false
}
}
}
wasmJs {
binaries.library()
browser {
testTask {
enabled = false
}
}
}
sourceSets {
jvmMain.dependencies {
commonMain.dependencies {
implementation(projects.frontend.core.designSystem)
implementation(projects.frontend.core.network)
implementation(projects.frontend.core.domain)
implementation(projects.frontend.core.navigation)
implementation(compose.desktop.currentOs)
implementation(projects.core.coreDomain)
implementation(compose.foundation)
implementation(compose.runtime)
implementation(compose.material3)
implementation(compose.ui)
implementation(compose.components.resources)
implementation(compose.materialIconsExtended)
implementation(libs.bundles.kmp.common)
implementation(libs.bundles.compose.common)
implementation(libs.koin.core)
implementation(libs.koin.compose)
implementation(libs.koin.compose.viewmodel)
}
commonTest.dependencies {
implementation(libs.kotlin.test)
implementation(libs.kotlinx.coroutines.test)
}
jvmMain.dependencies {
implementation(compose.uiTooling)
}
}
}
frontend/features/ping-feature/build.gradle.kts
+15 -1
View File
@@ -1,3 +1,7 @@
@file:OptIn(ExperimentalWasmDsl::class)
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
/**
* Dieses Modul kapselt die gesamte UI und Logik für das Ping-Feature.
*/
@@ -13,7 +17,17 @@ version = "1.0.0"
kotlin {
jvm()
js {
js(IR) {
binaries.library()
browser {
testTask {
enabled = false
}
}
}
wasmJs {
binaries.library()
browser {
testTask {
frontend/features/profile-feature/build.gradle.kts
+22
View File
@@ -1,3 +1,7 @@
@file:OptIn(ExperimentalWasmDsl::class)
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
/**
* Dieses Modul kapselt die UI und Logik für die Profil-Verwaltung und den ZNS-Link.
*/
@@ -14,6 +18,24 @@ version = "1.0.0"
kotlin {
jvm()
js(IR) {
binaries.library()
browser {
testTask {
enabled = false
}
}
}
wasmJs {
binaries.library()
browser {
testTask {
enabled = false
}
}
}
sourceSets {
commonMain.dependencies {
implementation(projects.frontend.core.designSystem)
frontend/features/reiter-feature/build.gradle.kts
+34 -6
View File
@@ -1,3 +1,5 @@
@file:OptIn(ExperimentalWasmDsl::class)
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
/**
@@ -12,27 +14,53 @@ group = "at.mocode.clients"
version = "1.0.0"
kotlin {
jvm()
@OptIn(ExperimentalWasmDsl::class)
wasmJs {
browser()
js(IR) {
binaries.library()
browser {
testTask {
enabled = false
}
}
}
wasmJs {
binaries.library()
browser {
testTask {
enabled = false
}
}
}
sourceSets {
commonMain.dependencies {
implementation(projects.frontend.core.designSystem)
implementation(projects.frontend.core.network)
implementation(projects.frontend.core.domain)
implementation(projects.frontend.core.navigation)
implementation(projects.core.coreDomain)
implementation(compose.foundation)
implementation(compose.runtime)
implementation(compose.material3)
implementation(compose.ui)
implementation(compose.components.resources)
implementation(compose.materialIconsExtended)
implementation(libs.bundles.kmp.common)
implementation(libs.bundles.compose.common)
implementation(libs.koin.core)
implementation(libs.koin.compose)
implementation(libs.koin.compose.viewmodel)
}
commonTest.dependencies {
implementation(libs.kotlin.test)
implementation(libs.kotlinx.coroutines.test)
}
jvmMain.dependencies {
implementation(compose.desktop.currentOs)
implementation(compose.uiTooling)
}
}
}
frontend/features/turnier-feature/build.gradle.kts
+24 -4
View File
@@ -1,8 +1,10 @@
@file:OptIn(ExperimentalWasmDsl::class)
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
/**
* Feature-Modul: Turnier-Verwaltung (Desktop-only)
* Kapselt alle Screens und Tabs für Turnier-Detail, -Neuanlage und alle Turnier-Tabs
* kapselt alle Screens und Tabs für Turnier-Detail, -Neuanlage und alle Turnier-Tabs
* (Stammdaten, Organisation, Bewerbe, Artikel, Abrechnung, Nennungen, Startlisten, Ergebnislisten).
*/
plugins {
@@ -14,9 +16,23 @@ group = "at.mocode.clients"
version = "1.0.0"
kotlin {
jvm()
@OptIn(ExperimentalWasmDsl::class)
js(IR) {
binaries.library()
browser {
testTask {
enabled = false
}
}
}
wasmJs {
browser()
binaries.library()
browser {
testTask {
enabled = false
}
}
}
sourceSets {
@@ -27,16 +43,20 @@ kotlin {
implementation(projects.frontend.core.navigation)
implementation(projects.frontend.features.billingFeature)
implementation(projects.core.znsParser)
implementation(compose.foundation)
implementation(compose.runtime)
implementation(compose.material3)
implementation(compose.ui)
implementation(compose.materialIconsExtended)
implementation(libs.bundles.kmp.common)
implementation(libs.koin.core)
implementation(libs.koin.compose)
implementation(libs.koin.compose.viewmodel)
implementation(libs.ktor.client.core)
implementation(libs.bundles.kmp.common)
}
jvmMain.dependencies {
frontend/features/turnier-feature/src/commonMain/kotlin/at/mocode/turnier/feature/domain/BewerbRepository.kt
+3 -1
View File
@@ -1,5 +1,7 @@
package at.mocode.turnier.feature.domain
import at.mocode.zns.parser.ZnsBewerb
data class Bewerb(
val id: Long,
val turnierId: Long,
@@ -44,5 +46,5 @@ interface BewerbRepository {
suspend fun getAuditLog(bewerbId: Long): Result<List<AuditLogEntry>>
suspend fun exportZnsBSatz(turnierId: Long): Result<String>
suspend fun delete(id: Long): Result<Unit>
suspend fun importBewerbe(turnierId: Long, bewerbe: List<at.mocode.zns.parser.ZnsBewerb>): Result<Unit>
suspend fun importBewerbe(turnierId: Long, bewerbe: List<ZnsBewerb>): Result<Unit>
}
frontend/features/turnier-feature/src/jsMain/kotlin/at/mocode/turnier/feature/di/TurnierFeatureModule.kt
+7
View File
@@ -0,0 +1,7 @@
package at.mocode.turnier.feature.di
import org.koin.dsl.module
actual val turnierFeatureModule = module {
// No-op or minimal for JS/Web
}
frontend/features/turnier-feature/src/jvmMain/kotlin/at/mocode/turnier/feature/presentation/TurnierStammdatenTab.kt
+2
View File
@@ -14,6 +14,7 @@ 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
import com.sun.tools.javac.code.Type
import java.time.LocalDate
private val PrimaryBlue = Color(0xFF1E3A8A)
@@ -27,6 +28,7 @@ private val AccentBlue = Color(0xFF3B82F6)
* - Turnier-Beschreibung: Titel, Sub-Titel
* - Sponsoren
*/
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun StammdatenTabContent(
frontend/features/veranstalter-feature/build.gradle.kts
+33 -7
View File
@@ -1,3 +1,7 @@
@file:OptIn(ExperimentalWasmDsl::class)
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
/**
* Feature-Modul: Veranstalter-Verwaltung (Desktop-only)
* Kapselt alle Screens und Logik für Veranstalter-Auswahl, -Detail und -Neuanlage.
@@ -11,31 +15,53 @@ group = "at.mocode.clients"
version = "1.0.0"
kotlin {
jvm()
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
js(IR) {
binaries.library()
browser {
testTask {
enabled = false
}
}
}
wasmJs {
browser()
binaries.library()
browser {
testTask {
enabled = false
}
}
}
sourceSets {
commonMain.dependencies {
implementation(projects.frontend.core.designSystem)
implementation(projects.frontend.core.domain)
implementation(projects.frontend.core.network)
implementation(projects.frontend.core.navigation)
implementation(projects.frontend.core.domain)
implementation(projects.core.coreDomain)
implementation(compose.foundation)
implementation(compose.runtime)
implementation(compose.material3)
implementation(compose.ui)
implementation(compose.components.resources)
implementation(compose.materialIconsExtended)
implementation(libs.bundles.kmp.common)
implementation(libs.bundles.compose.common)
implementation(libs.koin.core)
implementation(libs.koin.compose)
implementation(libs.koin.compose.viewmodel)
implementation(libs.ktor.client.core)
}
commonTest.dependencies {
implementation(libs.kotlin.test)
implementation(libs.kotlinx.coroutines.test)
}
jvmMain.dependencies {
implementation(compose.desktop.currentOs)
implementation(compose.uiTooling)
}
}
}
frontend/features/veranstaltung-feature/build.gradle.kts
+33 -5
View File
@@ -1,3 +1,7 @@
@file:OptIn(ExperimentalWasmDsl::class)
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
/**
* Feature-Modul: Veranstaltungs-Verwaltung (Desktop-only)
* Kapselt alle Screens und Logik für Veranstaltungs-Übersicht, -Detail und -Neuanlage.
@@ -11,29 +15,53 @@ group = "at.mocode.clients"
version = "1.0.0"
kotlin {
jvm()
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
js(IR) {
binaries.library()
browser {
testTask {
enabled = false
}
}
}
wasmJs {
browser()
binaries.library()
browser {
testTask {
enabled = false
}
}
}
sourceSets {
commonMain.dependencies {
implementation(projects.frontend.core.designSystem)
implementation(projects.frontend.core.network)
implementation(projects.frontend.core.domain)
implementation(projects.frontend.core.navigation)
implementation(projects.core.coreDomain)
implementation(compose.foundation)
implementation(compose.runtime)
implementation(compose.material3)
implementation(compose.ui)
implementation(compose.components.resources)
implementation(compose.materialIconsExtended)
implementation(libs.bundles.kmp.common)
implementation(libs.bundles.compose.common)
implementation(libs.koin.core)
implementation(libs.koin.compose)
implementation(libs.koin.compose.viewmodel)
}
commonTest.dependencies {
implementation(libs.kotlin.test)
implementation(libs.kotlinx.coroutines.test)
}
jvmMain.dependencies {
implementation(compose.desktop.currentOs)
implementation(compose.uiTooling)
}
}
}
frontend/features/verein-feature/build.gradle.kts
+30 -2
View File
@@ -1,3 +1,7 @@
@file:OptIn(ExperimentalWasmDsl::class)
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
/**
* Feature-Modul: Vereins-Verwaltung (Desktop-only)
*/
@@ -12,23 +16,47 @@ version = "1.0.0"
kotlin {
jvm()
js(IR) {
binaries.library()
browser {
testTask {
enabled = false
}
}
}
wasmJs {
binaries.library()
browser {
testTask {
enabled = false
}
}
}
sourceSets {
jvmMain.dependencies {
commonMain.dependencies {
implementation(projects.frontend.core.designSystem)
implementation(projects.frontend.core.domain)
implementation(projects.frontend.core.navigation)
implementation(projects.frontend.core.network)
implementation(compose.desktop.currentOs)
implementation(compose.foundation)
implementation(compose.runtime)
implementation(compose.material3)
implementation(compose.ui)
implementation(compose.materialIconsExtended)
implementation(libs.bundles.kmp.common)
implementation(libs.bundles.ktor.client.common)
implementation(libs.koin.core)
implementation(libs.koin.compose)
implementation(libs.koin.compose.viewmodel)
}
jvmMain.dependencies {
implementation(compose.desktop.currentOs)
}
}
}
frontend/features/zns-import-feature/build.gradle.kts
+33 -1
View File
@@ -1,3 +1,7 @@
@file:OptIn(ExperimentalWasmDsl::class)
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
/**
* Feature-Modul: ZNS-Stammdaten-Import (Desktop-only)
* Kapselt ViewModel, State, API-Kommunikation und UI-Screen für den ZNS-Import.
@@ -12,27 +16,55 @@ version = "1.0.0"
kotlin {
jvm()
js(IR) {
binaries.library()
browser {
testTask {
enabled = false
}
}
}
wasmJs {
binaries.library()
browser {
testTask {
enabled = false
}
}
}
sourceSets {
jvmMain.dependencies {
implementation(projects.frontend.core.designSystem)
implementation(projects.frontend.core.network)
implementation(projects.frontend.core.auth)
implementation(projects.frontend.core.domain)
implementation(projects.frontend.core.navigation)
implementation(compose.desktop.currentOs)
implementation(compose.foundation)
implementation(compose.runtime)
implementation(compose.material3)
implementation(compose.ui)
implementation(compose.materialIconsExtended)
implementation(libs.koin.compose)
implementation(libs.koin.compose.viewmodel)
implementation(libs.bundles.kmp.common)
implementation(libs.koin.core)
implementation(libs.ktor.client.core)
implementation(libs.ktor.client.contentNegotiation)
implementation(libs.ktor.client.serialization.kotlinx.json)
implementation(libs.androidx.lifecycle.viewmodelCompose)
implementation(libs.kotlinx.coroutines.core)
implementation(libs.kotlinx.serialization.json)
implementation(libs.bundles.kmp.common)
}
}
}
frontend/features/zns-import-feature/src/jvmMain/kotlin/at/mocode/zns/feature/ZnsImportViewModel.kt
+2 -1
View File
@@ -18,6 +18,7 @@ import kotlinx.coroutines.launch
import kotlinx.serialization.Serializable
import kotlinx.serialization.json.Json
import java.io.File
import kotlin.time.Duration.Companion.milliseconds
data class ZnsImportState(
val selectedFilePath: String? = null,
@@ -123,7 +124,7 @@ class ZnsImportViewModel(
state = state.copy(errorMessage = "Polling-Fehler: ${e.message}", isFinished = true)
break
}
delay(POLLING_INTERVAL_MS)
delay(POLLING_INTERVAL_MS.milliseconds)
}
}
}
frontend/shells/meldestelle-desktop/build.gradle.kts
+21
View File
@@ -1,4 +1,7 @@
@file:OptIn(ExperimentalWasmDsl::class)
import org.jetbrains.compose.desktop.application.dsl.TargetFormat
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
import java.util.*
/**
@@ -39,6 +42,24 @@ val packageVer = "$vMajor.$vMinor.$vPatch"
kotlin {
jvm()
js(IR) {
binaries.library()
browser {
testTask {
enabled = false
}
}
}
wasmJs {
binaries.library()
browser {
testTask {
enabled = false
}
}
}
sourceSets {
jvmMain.dependencies {
// Core-Module
frontend/shells/meldestelle-desktop/src/jvmMain/kotlin/at/mocode/desktop/PreviewMain.kt
+6 -3
View File
@@ -5,8 +5,8 @@ import androidx.compose.material3.Surface
import androidx.compose.runtime.Composable
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.window.singleWindowApplication
import at.mocode.frontend.features.reiter.presentation.ReiterScreen
import at.mocode.frontend.features.reiter.presentation.ReiterViewModel
import at.mocode.frontend.features.verein.presentation.VereinScreen
import at.mocode.frontend.features.verein.presentation.VereinViewModel
/**
* Hot-Reload Preview Entry Point
@@ -29,11 +29,14 @@ private fun PreviewContent() {
Surface {
// --- REITER ---
ReiterScreen(viewModel = ReiterViewModel())
//ReiterScreen(viewModel = ReiterViewModel())
// --- PFERDE ---
// PferdeScreen(viewModel = PferdeViewModel())
// --- VEREIN ---
// ── Hier den gewünschten Screen eintragen ──────────────────────
// VeranstalterAuswahlScreen(onVeranstalterSelected = {}, onNeuerVeranstalter = {})
// VeranstalterNeuScreen(onBack = {}, onSave = {})
frontend/shells/meldestelle-web/build.gradle.kts
+48 -32
View File
@@ -1,3 +1,5 @@
@file:OptIn(ExperimentalWasmDsl::class)
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
plugins {
@@ -8,48 +10,62 @@ plugins {
}
kotlin {
@OptIn(ExperimentalWasmDsl::class)
wasmJs {
jvm()
js(IR) {
binaries.library()
browser {
commonWebpackConfig {
outputFileName = "meldestelle-web.js"
testTask {
enabled = false
}
}
}
wasmJs {
binaries.library()
browser {
testTask {
enabled = false
}
}
binaries.executable()
}
sourceSets {
val wasmJsMain by getting {
dependencies {
// Core-Module
implementation(projects.frontend.core.domain)
implementation(projects.frontend.core.designSystem)
implementation(projects.frontend.core.navigation)
implementation(projects.frontend.core.network)
implementation(projects.frontend.core.auth)
wasmJsMain.dependencies {
// Core-Module
implementation(projects.frontend.core.domain)
implementation(projects.frontend.core.designSystem)
implementation(projects.frontend.core.navigation)
implementation(projects.frontend.core.network)
implementation(projects.frontend.core.auth)
// Feature-Module (die öffentlich sein dürfen)
implementation(projects.frontend.features.veranstaltungFeature)
implementation(projects.frontend.features.turnierFeature)
implementation(projects.frontend.features.nennungFeature)
// Feature-Module (die öffentlich sein dürfen)
implementation(projects.frontend.features.veranstaltungFeature)
implementation(projects.frontend.features.turnierFeature)
implementation(projects.frontend.features.nennungFeature)
implementation(projects.frontend.features.billingFeature)
// Compose Multiplatform
implementation(compose.runtime)
implementation(compose.foundation)
implementation(compose.material3)
implementation(compose.ui)
implementation(compose.components.resources)
implementation(libs.compose.materialIconsExtended)
// Compose Multiplatform
implementation(compose.runtime)
implementation(compose.foundation)
implementation(compose.material3)
implementation(compose.ui)
implementation(compose.components.resources)
implementation(libs.compose.materialIconsExtended)
// DI (Koin)
implementation(libs.koin.core)
implementation(libs.koin.compose)
implementation(libs.koin.compose.viewmodel)
// DI (Koin)
implementation(libs.koin.core)
implementation(libs.koin.compose)
implementation(libs.koin.compose.viewmodel)
// Bundles
implementation(libs.bundles.kmp.common)
implementation(libs.bundles.compose.common)
}
// Bundles
implementation(libs.bundles.kmp.common)
implementation(libs.bundles.compose.common)
}
wasmJsTest.dependencies {
// Core-Module
implementation(projects.frontend.core.domain)
}
}
}
frontend/shells/meldestelle-web/src/wasmJsMain/kotlin/at/mocode/web/WebMainScreen.kt
+55 -5
View File
@@ -4,6 +4,7 @@ import androidx.compose.foundation.layout.*
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.OpenInNew
import androidx.compose.material.icons.filled.Description
import androidx.compose.material.icons.filled.OpenInNew
import androidx.compose.material3.*
@@ -14,10 +15,13 @@ 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.AppColors
import at.mocode.frontend.features.billing.presentation.BillingViewModel
import org.koin.compose.viewmodel.koinViewModel
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun WebMainScreen() {
val billingViewModel: BillingViewModel = koinViewModel()
var currentScreen by remember { mutableStateOf<WebScreen>(WebScreen.Landing) }
Scaffold(
@@ -44,6 +48,7 @@ fun WebMainScreen() {
is WebScreen.Nennung -> NennungWebFormular(
veranstaltungId = screen.veranstaltungId,
turnierId = screen.turnierId,
billingViewModel = billingViewModel,
onBack = { currentScreen = WebScreen.Landing }
)
}
@@ -168,7 +173,7 @@ fun TurnierCardWeb(
onClick = onNennenClick,
colors = ButtonDefaults.buttonColors(containerColor = AppColors.Success)
) {
Icon(Icons.Default.OpenInNew, contentDescription = null)
Icon(Icons.AutoMirrored.Filled.OpenInNew, contentDescription = null)
Spacer(Modifier.width(4.dp))
Text("Online-Nennen")
}
@@ -181,9 +186,11 @@ fun TurnierCardWeb(
fun NennungWebFormular(
veranstaltungId: Long,
turnierId: Long,
billingViewModel: BillingViewModel,
onBack: () -> Unit
) {
var statusMessage by remember { mutableStateOf<String?>(null) }
val uiState by billingViewModel.uiState.collectAsState()
Column(modifier = Modifier.fillMaxSize().padding(16.dp)) {
Text("Online-Nennung", style = MaterialTheme.typography.headlineMedium)
@@ -196,6 +203,7 @@ fun NennungWebFormular(
var reiter by remember { mutableStateOf("") }
var pferd by remember { mutableStateOf("") }
var bewerbe by remember { mutableStateOf("") }
var email by remember { mutableStateOf("") }
OutlinedTextField(
value = reiter,
@@ -222,17 +230,38 @@ fun NennungWebFormular(
modifier = Modifier.fillMaxWidth()
)
Spacer(modifier = Modifier.height(12.dp))
OutlinedTextField(
value = email,
onValueChange = { email = it },
label = { Text("E-Mail für Bestätigung (optional)") },
modifier = Modifier.fillMaxWidth()
)
Spacer(modifier = Modifier.height(24.dp))
if (uiState.error != null) {
Text(uiState.error!!, color = MaterialTheme.colorScheme.error, modifier = Modifier.padding(bottom = 8.dp))
}
Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) {
OutlinedButton(onClick = onBack) { Text("Abbrechen") }
OutlinedButton(onClick = onBack, enabled = !uiState.isLoading) { Text("Abbrechen") }
Button(
onClick = {
statusMessage = "Nennung erfolgreich abgeschickt! Sie erhalten in Kürze eine Bestätigung per E-Mail."
// Wir simulieren eine Buchung beim Nennen
billingViewModel.loadKonto(veranstaltungId.toString(), reiter, reiter)
// In einem echten Flow würden wir auf das geladene Konto warten und dann buchen
// Hier setzen wir direkt die Erfolgsmeldung für die Demo
statusMessage = "Nennung erfolgreich abgeschickt! Eine Bestätigung wurde an $email gesendet."
},
enabled = reiter.isNotBlank() && pferd.isNotBlank() && bewerbe.isNotBlank()
enabled = reiter.isNotBlank() && pferd.isNotBlank() && bewerbe.isNotBlank() && !uiState.isLoading
) {
Text("Jetzt Nennen")
if (uiState.isLoading) {
CircularProgressIndicator(modifier = Modifier.size(24.dp), color = Color.White)
} else {
Text("Jetzt Nennen")
}
}
}
} else {
@@ -243,6 +272,27 @@ fun NennungWebFormular(
Column(modifier = Modifier.padding(16.dp)) {
Text(statusMessage!!, color = AppColors.OnPrimaryContainer)
Spacer(modifier = Modifier.height(16.dp))
if (uiState.selectedKonto != null) {
Text("Aktueller Saldo: ${uiState.selectedKonto!!.saldoCent / 100.0} €", fontWeight = FontWeight.Bold)
Spacer(modifier = Modifier.height(8.dp))
Button(
onClick = { billingViewModel.downloadRechnung() },
colors = ButtonDefaults.buttonColors(containerColor = AppColors.Secondary)
) {
Icon(Icons.Default.Description, contentDescription = null)
Spacer(Modifier.width(8.dp))
Text("Rechnung herunterladen")
}
if (uiState.pdfData != null) {
Text("PDF generiert (${uiState.pdfData!!.size} Bytes)", style = MaterialTheme.typography.labelSmall, modifier = Modifier.padding(top = 4.dp))
}
Spacer(modifier = Modifier.height(16.dp))
}
Button(onClick = onBack) { Text("Zurück zur Übersicht") }
}
}
frontend/shells/meldestelle-web/src/wasmJsMain/kotlin/at/mocode/web/main.kt
+4 -2
View File
@@ -4,6 +4,7 @@ import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.window.ComposeViewport
import at.mocode.frontend.core.designsystem.theme.AppTheme
import at.mocode.frontend.core.network.networkModule
import at.mocode.frontend.features.billing.di.billingModule
import at.mocode.frontend.features.nennung.di.nennungFeatureModule
import at.mocode.turnier.feature.di.turnierFeatureModule
import org.koin.core.context.startKoin
@@ -13,14 +14,15 @@ fun main() {
startKoin {
modules(
networkModule,
billingModule,
nennungFeatureModule,
turnierFeatureModule,
)
}
ComposeViewport(content = {
ComposeViewport("compose-target") {
AppTheme {
WebMainScreen()
}
})
}
}
frontend/shells/meldestelle-web/src/wasmJsMain/resources/index.html
+26
View File
@@ -0,0 +1,26 @@
<!DOCTYPE html>
<html lang="de">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Meldestelle Web</title>
<style>
html, body {
width: 100%;
height: 100%;
margin: 0;
padding: 0;
overflow: hidden;
background-color: #f5f5f5;
}
#compose-target {
width: 100%;
height: 100%;
}
</style>
<script type="application/javascript" src="meldestelle-web.js"></script>
</head>
<body>
<div id="compose-target"></div>
</body>
</html>