Integrate Nennungen and Masterdata features: expand ApiRoutes, add repositories and ViewModels for Nennungen and Masterdata. Update navigation and UI components to include Meisterschaften and Cups tabs.
This commit is contained in:
parent
edfbbb805f
commit
15b3f17d1d
13
CHANGELOG.md
13
CHANGELOG.md
|
|
@ -16,7 +16,18 @@ Versionierung folgt [Semantic Versioning](https://semver.org/lang/de/).
|
||||||
### [Unreleased]
|
### [Unreleased]
|
||||||
|
|
||||||
### Hinzugefügt
|
### Hinzugefügt
|
||||||
- **Zeitplan-Optimierung (Phase 9):**
|
- **Phase 10 (Series-Context) Vorbereitung:**
|
||||||
|
- **Frontend:** Neuer `SeriesScreen.kt` für die Verwaltung von Cups und Meisterschaften (konfigurierbare Reglements).
|
||||||
|
- **Frontend:** Erweiterung des `AdminUebersichtScreen` (Cockpit) um KPI-Kacheln mit Direkt-Links zu Cups und Meisterschaften.
|
||||||
|
- **Frontend:** Integration der Series-Navigation in die Breadcrumbs und das globale Routing (`Meisterschaften`, `Cups`).
|
||||||
|
- **Turnier-Feature Hardening:**
|
||||||
|
- **Frontend:** `STARTLISTEN` und `ERGEBNISLISTEN` Tabs vollständig an das `BewerbViewModel` angebunden (Bewerbs-Auswahl mit echten Daten).
|
||||||
|
- **Frontend:** Implementierung der Starter-Anzeige in der Startliste (LazyColumn).
|
||||||
|
|
||||||
|
### Geändert
|
||||||
|
- **Turnier-Feature:** Sichtbarkeit von `BewerbViewModel.generateStartliste()` auf `public` geändert, um den Aufruf aus dem Tab zu ermöglichen.
|
||||||
|
|
||||||
|
### [Phase 9] - 11.04.2026
|
||||||
- **Frontend:** Interaktiver Drag & Drop Zeitplan mit automatischem 5-Minuten-Snapping und Konflikt-Visualisierung.
|
- **Frontend:** Interaktiver Drag & Drop Zeitplan mit automatischem 5-Minuten-Snapping und Konflikt-Visualisierung.
|
||||||
- **Frontend:** "B-Satz Export (ZNS)" Toolbar-Aktion mit integriertem Vorschau-Dialog.
|
- **Frontend:** "B-Satz Export (ZNS)" Toolbar-Aktion mit integriertem Vorschau-Dialog.
|
||||||
- **Frontend:** "Änderungs-Historie" (Audit-Log) Sektion zur Nachverfolgung von Zeitplan-Anpassungen.
|
- **Frontend:** "Änderungs-Historie" (Audit-Log) Sektion zur Nachverfolgung von Zeitplan-Anpassungen.
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,43 @@
|
||||||
|
# Curator Log: Stammdaten-Integration & Nennungs-Feature
|
||||||
|
|
||||||
|
**Datum:** 11. April 2026
|
||||||
|
**Agent:** 🧹 [Curator]
|
||||||
|
**Status:** ✅ STAMMDATEN-INFRASTRUKTUR IMPLEMENTIERT
|
||||||
|
|
||||||
|
## Zusammenfassung
|
||||||
|
In dieser Session wurde die Grundlage für die Nutzung von Stammdaten (Reiter, Pferde, Funktionäre, Vereine) im Turnier-Kontext geschaffen. Der Fokus lag auf der Implementierung der Nennungs-Logik und der Anbindung an die Masterdata-Backend-Services.
|
||||||
|
|
||||||
|
## Durchgeführte Arbeiten
|
||||||
|
|
||||||
|
### 1. Daten-Infrastruktur (turnier-feature)
|
||||||
|
- **Domänenmodelle:** Lokale Definition von `Reiter`, `Pferd`, `Funktionaer` und `Verein` im `turnier-feature`, um die Entkopplung während der Modul-Entwicklung zu gewährleisten.
|
||||||
|
- **DTOs:** Erstellung von `NennungDto` (Summary/Detail/Request) für die Kommunikation mit dem `entries-service`.
|
||||||
|
- **Repositories:**
|
||||||
|
- `NennungRepository`: Verwaltung von Turniernennungen (List, Create, Status-Update).
|
||||||
|
- `MasterdataRepository`: Zentrale Suche für Reiter, Pferde und Funktionäre sowie Vereins-Abruf.
|
||||||
|
- **DI:** Registrierung der neuen Services im `turnierFeatureModule` (Koin).
|
||||||
|
|
||||||
|
### 2. ViewModel & Logik
|
||||||
|
- **NennungViewModel:** Zentrale Steuerung des Nennungs-Tabs. Implementiert reaktive Suche für Reiter/Pferde und das Einreichen von Nennungen.
|
||||||
|
- **API-Routing:** Erweiterung der `ApiRoutes` um Masterdata-Endpunkte (`/api/masterdata/...`).
|
||||||
|
|
||||||
|
### 3. UI-Integration (Desktop)
|
||||||
|
- **Nennungen-Tab:**
|
||||||
|
- Umstellung von statischen Mocks auf das `NennungViewModel`.
|
||||||
|
- Live-Suche für Reiter und Pferde integriert.
|
||||||
|
- Anzeige echter Nennungen mit Status-Badges und ID-Kürzeln.
|
||||||
|
- **Organisation-Tab:** Anbindung an das ViewModel vorbereitet (Funktionärs-Kontext).
|
||||||
|
- **Stammdaten-Tab:** Vorbereitung für die Vereins-Suche/Zuordnung.
|
||||||
|
- **Previews:** Aktualisierung der `ScreenPreviews.kt` mit Mocks für die neuen Repositories, um die UI-Entwickelbarkeit zu erhalten.
|
||||||
|
|
||||||
|
## Technische Details
|
||||||
|
- **Build:** Erfolgreiche Kompilation des Moduls `:frontend:shells:meldestelle-desktop`.
|
||||||
|
- **Modul-Strategie:** Vermeidung von direkten Abhängigkeiten zu unfertigen UI-Features durch lokale Domänen-Repräsentationen im Feature-Context.
|
||||||
|
|
||||||
|
## Nächste Schritte
|
||||||
|
- Implementierung der detaillierten Nennungs-Dialoge (Kombination Reiter + Pferd + Bewerb).
|
||||||
|
- Persistenz der Funktionärs-Zuordnung im Backend.
|
||||||
|
- Verknüpfung der Vereins-Stammdaten mit der Turnier-Organisation.
|
||||||
|
|
||||||
|
---
|
||||||
|
*Gez. Curator*
|
||||||
34
docs/04_Agents/Logs/2026-04-11_Start_Phase_10_Curator_Log.md
Normal file
34
docs/04_Agents/Logs/2026-04-11_Start_Phase_10_Curator_Log.md
Normal file
|
|
@ -0,0 +1,34 @@
|
||||||
|
# Curator Log: Start Phase 10 & Turnier-Hardening
|
||||||
|
|
||||||
|
**Datum:** 11. April 2026
|
||||||
|
**Agent:** 🧹 [Curator]
|
||||||
|
**Status:** 🔵 PHASE 10 GESTARTET
|
||||||
|
|
||||||
|
## Zusammenfassung
|
||||||
|
Diese Session markiert den Übergang von Phase 9 (Zeitplan) zu Phase 10 (Series-Context). Der Fokus lag auf dem "Hardening" der bestehenden Turnier-Tabs und der Grundsteinlegung für Cups und Meisterschaften im Frontend.
|
||||||
|
|
||||||
|
## Durchgeführte Arbeiten
|
||||||
|
|
||||||
|
### 1. Tab-Funktionalisierung (Start- & Ergebnislisten)
|
||||||
|
- **Daten-Anbindung:** Die Tabs `STARTLISTEN` und `ERGEBNISLISTEN` wurden vollständig an das `BewerbViewModel` angebunden.
|
||||||
|
- **Bewerbs-Auswahl:** Die Tabs nutzen nun die echten Bewerbe des Turniers (inkl. Name und Tag) anstelle von Platzhaltern.
|
||||||
|
- **Startlisten-UI:** Erste Implementierung der Starter-Liste (LazyColumn) zur Visualisierung generierter Startlisten.
|
||||||
|
- **ViewModel-Fix:** `generateStartliste()` wurde public gemacht, um die interaktive Generierung aus der UI zu ermöglichen.
|
||||||
|
|
||||||
|
### 2. Series-Context Vorbereitung (Phase 10)
|
||||||
|
- **Neuer Screen:** `SeriesScreen.kt` implementiert (Placeholder-UI für Cups/Meisterschaften).
|
||||||
|
- **Navigation:** Globale Breadcrumb-Navigation und Routing für `AppScreen.Meisterschaften` und `AppScreen.Cups` hinzugefügt.
|
||||||
|
- **Cockpit-Integration:** Der `AdminUebersichtScreen` (Zentrale) wurde um KPI-Kacheln erweitert, die als Direkt-Links zu den neuen Series-Bereichen dienen.
|
||||||
|
|
||||||
|
### 3. Stabilität & Qualität
|
||||||
|
- **Build-Check:** Erfolgreiche Kompilation des Moduls `:frontend:shells:meldestelle-desktop`.
|
||||||
|
- **Changelog:** Dokumentation der Änderungen im globalen Changelog.
|
||||||
|
|
||||||
|
## Nächste Schritte
|
||||||
|
Der Fokus verbleibt in **Phase 10: Series-Context**.
|
||||||
|
- Analyse und Implementierung der Reglement-Strukturen (Punktetabellen, Wertungsmodi).
|
||||||
|
- Integration des `series-context` in das Backend.
|
||||||
|
- Verknüpfung von Bewerb-Ergebnissen mit Cup-Punkteständen.
|
||||||
|
|
||||||
|
---
|
||||||
|
*Gez. Curator*
|
||||||
|
|
@ -17,5 +17,13 @@ object ApiRoutes {
|
||||||
|
|
||||||
object Bewerbe {
|
object Bewerbe {
|
||||||
fun abteilungen(bewerbId: Long): String = "$API_PREFIX/bewerbe/$bewerbId/abteilungen"
|
fun abteilungen(bewerbId: Long): String = "$API_PREFIX/bewerbe/$bewerbId/abteilungen"
|
||||||
|
fun nennungen(bewerbId: Long): String = "$API_PREFIX/bewerbe/$bewerbId/nennungen"
|
||||||
|
}
|
||||||
|
|
||||||
|
object Masterdata {
|
||||||
|
const val REITER = "/api/masterdata/reiter"
|
||||||
|
const val PFERDE = "/api/masterdata/horse"
|
||||||
|
const val FUNKTIONAERE = "/api/masterdata/funktionaer"
|
||||||
|
const val VEREINE = "/api/masterdata/verein"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,50 @@
|
||||||
|
package at.mocode.turnier.feature.data.remote.dto
|
||||||
|
|
||||||
|
import kotlinx.serialization.Serializable
|
||||||
|
import kotlin.uuid.ExperimentalUuidApi
|
||||||
|
import kotlin.uuid.Uuid
|
||||||
|
|
||||||
|
@OptIn(ExperimentalUuidApi::class)
|
||||||
|
@Serializable
|
||||||
|
data class NennungSummaryDto(
|
||||||
|
val nennungId: String,
|
||||||
|
val turnierId: String,
|
||||||
|
val bewerbId: String,
|
||||||
|
val abteilungId: String,
|
||||||
|
val reiterId: String,
|
||||||
|
val pferdId: String,
|
||||||
|
val status: String,
|
||||||
|
val istNachnennung: Boolean,
|
||||||
|
val createdAt: String
|
||||||
|
)
|
||||||
|
|
||||||
|
@OptIn(ExperimentalUuidApi::class)
|
||||||
|
@Serializable
|
||||||
|
data class NennungDetailDto(
|
||||||
|
val nennungId: String,
|
||||||
|
val abteilungId: String,
|
||||||
|
val bewerbId: String,
|
||||||
|
val turnierId: String,
|
||||||
|
val reiterId: String,
|
||||||
|
val pferdId: String,
|
||||||
|
val zahlerId: String? = null,
|
||||||
|
val status: String,
|
||||||
|
val startwunsch: String,
|
||||||
|
val istNachnennung: Boolean,
|
||||||
|
val bemerkungen: String? = null,
|
||||||
|
val createdAt: String,
|
||||||
|
val updatedAt: String
|
||||||
|
)
|
||||||
|
|
||||||
|
@Serializable
|
||||||
|
data class NennungEinreichenRequest(
|
||||||
|
val abteilungId: String,
|
||||||
|
val bewerbId: String,
|
||||||
|
val turnierId: String,
|
||||||
|
val reiterId: String,
|
||||||
|
val pferdId: String,
|
||||||
|
val zahlerId: String? = null,
|
||||||
|
val startwunsch: String = "KEIN_WUNSCH",
|
||||||
|
val istNachnennung: Boolean = false,
|
||||||
|
val bemerkungen: String? = null
|
||||||
|
)
|
||||||
|
|
@ -0,0 +1,44 @@
|
||||||
|
package at.mocode.turnier.feature.domain
|
||||||
|
|
||||||
|
data class Reiter(
|
||||||
|
val id: String,
|
||||||
|
val vorname: String,
|
||||||
|
val nachname: String,
|
||||||
|
val satznummer: String? = null,
|
||||||
|
val verein: String? = null,
|
||||||
|
val feiId: String? = null,
|
||||||
|
val oepsNummer: String? = null
|
||||||
|
) {
|
||||||
|
val name: String get() = "$vorname $nachname"
|
||||||
|
}
|
||||||
|
|
||||||
|
data class Pferd(
|
||||||
|
val id: String,
|
||||||
|
val name: String,
|
||||||
|
val lebensnummer: String,
|
||||||
|
val geburtsjahr: Int? = null,
|
||||||
|
val oepsNummer: String? = null
|
||||||
|
)
|
||||||
|
|
||||||
|
data class Funktionaer(
|
||||||
|
val id: String,
|
||||||
|
val name: String,
|
||||||
|
val qualifikationen: List<String>,
|
||||||
|
val istAktiv: Boolean
|
||||||
|
)
|
||||||
|
|
||||||
|
data class Verein(
|
||||||
|
val id: String,
|
||||||
|
val name: String,
|
||||||
|
val vereinsNummer: String,
|
||||||
|
val ort: String?,
|
||||||
|
val istVeranstalter: Boolean
|
||||||
|
)
|
||||||
|
|
||||||
|
interface MasterdataRepository {
|
||||||
|
suspend fun searchReiter(query: String): Result<List<Reiter>>
|
||||||
|
suspend fun searchPferde(query: String): Result<List<Pferd>>
|
||||||
|
suspend fun searchFunktionaere(query: String): Result<List<Funktionaer>>
|
||||||
|
suspend fun listVereine(): Result<List<Verein>>
|
||||||
|
suspend fun getVereinById(id: String): Result<Verein>
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,25 @@
|
||||||
|
package at.mocode.turnier.feature.domain
|
||||||
|
|
||||||
|
data class Nennung(
|
||||||
|
val id: String,
|
||||||
|
val turnierId: String,
|
||||||
|
val bewerbId: String,
|
||||||
|
val abteilungId: String,
|
||||||
|
val reiterId: String,
|
||||||
|
val pferdId: String,
|
||||||
|
val status: String,
|
||||||
|
val istNachnennung: Boolean,
|
||||||
|
val createdAt: String,
|
||||||
|
// Erweiterte Infos für UI
|
||||||
|
val reiterName: String? = null,
|
||||||
|
val pferdeName: String? = null,
|
||||||
|
val bewerbName: String? = null
|
||||||
|
)
|
||||||
|
|
||||||
|
interface NennungRepository {
|
||||||
|
suspend fun list(turnierId: Long): Result<List<Nennung>>
|
||||||
|
suspend fun listByBewerb(bewerbId: Long): Result<List<Nennung>>
|
||||||
|
suspend fun einreichen(request: at.mocode.turnier.feature.data.remote.dto.NennungEinreichenRequest): Result<Nennung>
|
||||||
|
suspend fun updateStatus(id: String, status: String): Result<Nennung>
|
||||||
|
suspend fun delete(id: String): Result<Unit>
|
||||||
|
}
|
||||||
|
|
@ -230,7 +230,7 @@ class BewerbViewModel(
|
||||||
// Für dieses MVP zeigen wir einfach an, dass wir scannen.
|
// Für dieses MVP zeigen wir einfach an, dass wir scannen.
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun generateStartliste() {
|
fun generateStartliste() {
|
||||||
val selectedId = _state.value.selectedId ?: return
|
val selectedId = _state.value.selectedId ?: return
|
||||||
reduce { it.copy(isLoading = true) }
|
reduce { it.copy(isLoading = true) }
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,80 @@
|
||||||
|
package at.mocode.turnier.feature.presentation
|
||||||
|
|
||||||
|
import at.mocode.turnier.feature.data.remote.dto.NennungEinreichenRequest
|
||||||
|
import at.mocode.turnier.feature.domain.*
|
||||||
|
import kotlinx.coroutines.CoroutineScope
|
||||||
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import kotlinx.coroutines.SupervisorJob
|
||||||
|
import kotlinx.coroutines.flow.MutableStateFlow
|
||||||
|
import kotlinx.coroutines.flow.StateFlow
|
||||||
|
import kotlinx.coroutines.launch
|
||||||
|
|
||||||
|
data class NennungenState(
|
||||||
|
val isLoading: Boolean = false,
|
||||||
|
val nennungen: List<Nennung> = emptyList(),
|
||||||
|
val searchResultsReiter: List<Reiter> = emptyList(),
|
||||||
|
val searchResultsPferde: List<Pferd> = emptyList(),
|
||||||
|
val errorMessage: String? = null
|
||||||
|
)
|
||||||
|
|
||||||
|
class NennungViewModel(
|
||||||
|
private val nennungRepo: NennungRepository,
|
||||||
|
private val masterdataRepo: MasterdataRepository,
|
||||||
|
private val turnierId: Long
|
||||||
|
) {
|
||||||
|
private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
|
||||||
|
|
||||||
|
private val _state = MutableStateFlow(NennungenState())
|
||||||
|
val state: StateFlow<NennungenState> = _state
|
||||||
|
|
||||||
|
init {
|
||||||
|
loadNennungen()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun loadNennungen() {
|
||||||
|
_state.value = _state.value.copy(isLoading = true)
|
||||||
|
scope.launch {
|
||||||
|
nennungRepo.list(turnierId).onSuccess { list ->
|
||||||
|
_state.value = _state.value.copy(nennungen = list, isLoading = false)
|
||||||
|
}.onFailure {
|
||||||
|
_state.value = _state.value.copy(errorMessage = "Fehler beim Laden: ${it.message}", isLoading = false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun searchReiter(query: String) {
|
||||||
|
if (query.length < 2) return
|
||||||
|
scope.launch {
|
||||||
|
masterdataRepo.searchReiter(query).onSuccess { list ->
|
||||||
|
_state.value = _state.value.copy(searchResultsReiter = list)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun searchPferde(query: String) {
|
||||||
|
if (query.length < 2) return
|
||||||
|
scope.launch {
|
||||||
|
masterdataRepo.searchPferde(query).onSuccess { list ->
|
||||||
|
_state.value = _state.value.copy(searchResultsPferde = list)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun einreichen(bewerbId: String, abteilungId: String, reiterId: String, pferdId: String) {
|
||||||
|
_state.value = _state.value.copy(isLoading = true)
|
||||||
|
scope.launch {
|
||||||
|
val request = NennungEinreichenRequest(
|
||||||
|
abteilungId = abteilungId,
|
||||||
|
bewerbId = bewerbId,
|
||||||
|
turnierId = turnierId.toString(),
|
||||||
|
reiterId = reiterId,
|
||||||
|
pferdId = pferdId
|
||||||
|
)
|
||||||
|
nennungRepo.einreichen(request).onSuccess {
|
||||||
|
loadNennungen()
|
||||||
|
}.onFailure {
|
||||||
|
_state.value = _state.value.copy(errorMessage = "Fehler beim Einreichen: ${it.message}", isLoading = false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,118 @@
|
||||||
|
package at.mocode.turnier.feature.data.remote
|
||||||
|
|
||||||
|
import at.mocode.frontend.core.network.ApiRoutes
|
||||||
|
import at.mocode.turnier.feature.domain.*
|
||||||
|
import io.ktor.client.*
|
||||||
|
import io.ktor.client.call.*
|
||||||
|
import io.ktor.client.request.*
|
||||||
|
import io.ktor.http.*
|
||||||
|
import kotlinx.serialization.Serializable
|
||||||
|
|
||||||
|
class DefaultMasterdataRepository(
|
||||||
|
private val client: HttpClient
|
||||||
|
) : MasterdataRepository {
|
||||||
|
|
||||||
|
override suspend fun searchReiter(query: String): Result<List<Reiter>> = runCatching {
|
||||||
|
val response = client.get("${ApiRoutes.Masterdata.REITER}/search") {
|
||||||
|
parameter("q", query)
|
||||||
|
}
|
||||||
|
if (response.status.isSuccess()) {
|
||||||
|
// Wir mappen hier manuell, da die Features aktuell keine DTOs exportieren
|
||||||
|
response.body<List<ReiterApiDto>>().map { it.toDomain() }
|
||||||
|
} else emptyList()
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun searchPferde(query: String): Result<List<Pferd>> = runCatching {
|
||||||
|
val response = client.get("${ApiRoutes.Masterdata.PFERDE}/search") {
|
||||||
|
parameter("q", query)
|
||||||
|
}
|
||||||
|
if (response.status.isSuccess()) {
|
||||||
|
response.body<List<HorseApiDto>>().map { it.toDomain() }
|
||||||
|
} else emptyList()
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun searchFunktionaere(query: String): Result<List<Funktionaer>> = runCatching {
|
||||||
|
val response = client.get("${ApiRoutes.Masterdata.FUNKTIONAERE}/search") {
|
||||||
|
parameter("q", query)
|
||||||
|
}
|
||||||
|
if (response.status.isSuccess()) {
|
||||||
|
response.body<List<FunktionaerApiDto>>().map {
|
||||||
|
Funktionaer(it.funktionaerId, it.name ?: "Unbekannt", it.qualifikationen, it.istAktiv)
|
||||||
|
}
|
||||||
|
} else emptyList()
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun listVereine(): Result<List<Verein>> = runCatching {
|
||||||
|
val response = client.get(ApiRoutes.Masterdata.VEREINE)
|
||||||
|
if (response.status.isSuccess()) {
|
||||||
|
response.body<List<VereinApiDto>>().map {
|
||||||
|
Verein(it.vereinId, it.name, it.vereinsNummer, it.ort, it.istVeranstalter)
|
||||||
|
}
|
||||||
|
} else emptyList()
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun getVereinById(id: String): Result<Verein> = runCatching {
|
||||||
|
val response = client.get("${ApiRoutes.Masterdata.VEREINE}/$id")
|
||||||
|
if (response.status.isSuccess()) {
|
||||||
|
val it = response.body<VereinApiDto>()
|
||||||
|
Verein(it.vereinId, it.name, it.vereinsNummer, it.ort, it.istVeranstalter)
|
||||||
|
} else throw Exception("Verein nicht gefunden")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Interne Hilfs-DTOs für das Mapping der Masterdata-API
|
||||||
|
@Serializable
|
||||||
|
private data class ReiterApiDto(
|
||||||
|
val reiterId: String,
|
||||||
|
val vorname: String,
|
||||||
|
val nachname: String,
|
||||||
|
val satznummer: String? = null,
|
||||||
|
val vereinsName: String? = null,
|
||||||
|
val feiId: String? = null,
|
||||||
|
val reiterLizenz: String? = null
|
||||||
|
) {
|
||||||
|
fun toDomain() = Reiter(
|
||||||
|
id = reiterId,
|
||||||
|
vorname = vorname,
|
||||||
|
nachname = nachname,
|
||||||
|
satznummer = satznummer,
|
||||||
|
verein = vereinsName,
|
||||||
|
feiId = feiId,
|
||||||
|
oepsNummer = satznummer
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Serializable
|
||||||
|
private data class HorseApiDto(
|
||||||
|
val pferdId: String,
|
||||||
|
val pferdeName: String,
|
||||||
|
val lebensnummer: String? = null,
|
||||||
|
val geschlecht: String,
|
||||||
|
val geburtsjahr: Int? = null,
|
||||||
|
val satznummer: String? = null
|
||||||
|
) {
|
||||||
|
fun toDomain() = Pferd(
|
||||||
|
id = pferdId,
|
||||||
|
name = pferdeName,
|
||||||
|
lebensnummer = lebensnummer ?: "",
|
||||||
|
geburtsjahr = geburtsjahr,
|
||||||
|
oepsNummer = satznummer
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Serializable
|
||||||
|
private data class FunktionaerApiDto(
|
||||||
|
val funktionaerId: String,
|
||||||
|
val name: String? = null,
|
||||||
|
val qualifikationen: List<String> = emptyList(),
|
||||||
|
val istAktiv: Boolean
|
||||||
|
)
|
||||||
|
|
||||||
|
@Serializable
|
||||||
|
private data class VereinApiDto(
|
||||||
|
val vereinId: String,
|
||||||
|
val vereinsNummer: String,
|
||||||
|
val name: String,
|
||||||
|
val ort: String? = null,
|
||||||
|
val istVeranstalter: Boolean
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,88 @@
|
||||||
|
package at.mocode.turnier.feature.data.remote
|
||||||
|
|
||||||
|
import at.mocode.frontend.core.network.*
|
||||||
|
import at.mocode.turnier.feature.data.remote.dto.*
|
||||||
|
import at.mocode.turnier.feature.domain.Nennung
|
||||||
|
import at.mocode.turnier.feature.domain.NennungRepository
|
||||||
|
import io.ktor.client.*
|
||||||
|
import io.ktor.client.call.*
|
||||||
|
import io.ktor.client.request.*
|
||||||
|
import io.ktor.http.*
|
||||||
|
|
||||||
|
class DefaultNennungRepository(
|
||||||
|
private val client: HttpClient
|
||||||
|
) : NennungRepository {
|
||||||
|
|
||||||
|
override suspend fun list(turnierId: Long): Result<List<Nennung>> = runCatching {
|
||||||
|
val response = client.get("${ApiRoutes.Turniere.ROOT}/$turnierId/nennungen")
|
||||||
|
if (response.status.isSuccess()) {
|
||||||
|
response.body<List<NennungSummaryDto>>().map { it.toDomain() }
|
||||||
|
} else {
|
||||||
|
throw HttpError(response.status.value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun listByBewerb(bewerbId: Long): Result<List<Nennung>> = runCatching {
|
||||||
|
val response = client.get(ApiRoutes.Bewerbe.nennungen(bewerbId))
|
||||||
|
if (response.status.isSuccess()) {
|
||||||
|
response.body<List<NennungSummaryDto>>().map { it.toDomain() }
|
||||||
|
} else {
|
||||||
|
throw HttpError(response.status.value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun einreichen(request: NennungEinreichenRequest): Result<Nennung> = runCatching {
|
||||||
|
val response = client.post(ApiRoutes.Bewerbe.nennungen(request.bewerbId.toLong())) {
|
||||||
|
contentType(ContentType.Application.Json)
|
||||||
|
setBody(request)
|
||||||
|
}
|
||||||
|
if (response.status.isSuccess()) {
|
||||||
|
response.body<NennungDetailDto>().toDomain()
|
||||||
|
} else {
|
||||||
|
throw HttpError(response.status.value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun updateStatus(id: String, status: String): Result<Nennung> = runCatching {
|
||||||
|
val response = client.patch("${ApiRoutes.API_PREFIX}/nennungen/$id/status") {
|
||||||
|
contentType(ContentType.Application.Json)
|
||||||
|
setBody(mapOf("status" to status))
|
||||||
|
}
|
||||||
|
if (response.status.isSuccess()) {
|
||||||
|
response.body<NennungDetailDto>().toDomain()
|
||||||
|
} else {
|
||||||
|
throw HttpError(response.status.value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun delete(id: String): Result<Unit> = runCatching {
|
||||||
|
val response = client.delete("${ApiRoutes.API_PREFIX}/nennungen/$id")
|
||||||
|
if (!response.status.isSuccess()) {
|
||||||
|
throw HttpError(response.status.value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun NennungSummaryDto.toDomain() = Nennung(
|
||||||
|
id = nennungId,
|
||||||
|
turnierId = turnierId,
|
||||||
|
bewerbId = bewerbId,
|
||||||
|
abteilungId = abteilungId,
|
||||||
|
reiterId = reiterId,
|
||||||
|
pferdId = pferdId,
|
||||||
|
status = status,
|
||||||
|
istNachnennung = istNachnennung,
|
||||||
|
createdAt = createdAt
|
||||||
|
)
|
||||||
|
|
||||||
|
private fun NennungDetailDto.toDomain() = Nennung(
|
||||||
|
id = nennungId,
|
||||||
|
turnierId = turnierId,
|
||||||
|
bewerbId = bewerbId,
|
||||||
|
abteilungId = abteilungId,
|
||||||
|
reiterId = reiterId,
|
||||||
|
pferdId = pferdId,
|
||||||
|
status = status,
|
||||||
|
istNachnennung = istNachnennung,
|
||||||
|
createdAt = createdAt
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
@ -1,18 +1,12 @@
|
||||||
package at.mocode.turnier.feature.di
|
package at.mocode.turnier.feature.di
|
||||||
|
|
||||||
import at.mocode.frontend.core.network.sync.SyncManager
|
import at.mocode.frontend.core.network.sync.SyncManager
|
||||||
import at.mocode.turnier.feature.data.remote.DefaultAbteilungRepository
|
import at.mocode.turnier.feature.data.remote.*
|
||||||
import at.mocode.turnier.feature.data.remote.DefaultBewerbRepository
|
|
||||||
import at.mocode.turnier.feature.data.remote.DefaultStartlistenRepository
|
|
||||||
import at.mocode.turnier.feature.data.remote.DefaultTurnierRepository
|
|
||||||
import at.mocode.turnier.feature.domain.AbteilungRepository
|
import at.mocode.turnier.feature.domain.AbteilungRepository
|
||||||
import at.mocode.turnier.feature.domain.BewerbRepository
|
import at.mocode.turnier.feature.domain.BewerbRepository
|
||||||
import at.mocode.turnier.feature.domain.StartlistenRepository
|
import at.mocode.turnier.feature.domain.StartlistenRepository
|
||||||
import at.mocode.turnier.feature.domain.TurnierRepository
|
import at.mocode.turnier.feature.domain.TurnierRepository
|
||||||
import at.mocode.turnier.feature.presentation.AbteilungViewModel
|
import at.mocode.turnier.feature.presentation.*
|
||||||
import at.mocode.turnier.feature.presentation.BewerbAnlegenViewModel
|
|
||||||
import at.mocode.turnier.feature.presentation.BewerbViewModel
|
|
||||||
import at.mocode.turnier.feature.presentation.TurnierViewModel
|
|
||||||
import org.koin.core.qualifier.named
|
import org.koin.core.qualifier.named
|
||||||
import org.koin.dsl.module
|
import org.koin.dsl.module
|
||||||
|
|
||||||
|
|
@ -22,6 +16,8 @@ val turnierFeatureModule = module {
|
||||||
single<BewerbRepository> { DefaultBewerbRepository(client = get(qualifier = named("apiClient"))) }
|
single<BewerbRepository> { DefaultBewerbRepository(client = get(qualifier = named("apiClient"))) }
|
||||||
single<AbteilungRepository> { DefaultAbteilungRepository(client = get(qualifier = named("apiClient"))) }
|
single<AbteilungRepository> { DefaultAbteilungRepository(client = get(qualifier = named("apiClient"))) }
|
||||||
single<StartlistenRepository> { DefaultStartlistenRepository(client = get(qualifier = named("apiClient"))) }
|
single<StartlistenRepository> { DefaultStartlistenRepository(client = get(qualifier = named("apiClient"))) }
|
||||||
|
single<at.mocode.turnier.feature.domain.NennungRepository> { DefaultNennungRepository(client = get(qualifier = named("apiClient"))) }
|
||||||
|
single<at.mocode.turnier.feature.domain.MasterdataRepository> { DefaultMasterdataRepository(client = get(qualifier = named("apiClient"))) }
|
||||||
|
|
||||||
// ViewModels
|
// ViewModels
|
||||||
factory { TurnierViewModel(repo = get()) }
|
factory { TurnierViewModel(repo = get()) }
|
||||||
|
|
@ -40,4 +36,12 @@ val turnierFeatureModule = module {
|
||||||
factory { (bewerbId: Long, abteilungsNr: Int) ->
|
factory { (bewerbId: Long, abteilungsNr: Int) ->
|
||||||
AbteilungViewModel(repo = get(), bewerbId = bewerbId, abteilungsNr = abteilungsNr)
|
AbteilungViewModel(repo = get(), bewerbId = bewerbId, abteilungsNr = abteilungsNr)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
factory { (turnierId: Long) ->
|
||||||
|
NennungViewModel(
|
||||||
|
nennungRepo = get(),
|
||||||
|
masterdataRepo = get(),
|
||||||
|
turnierId = turnierId
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,66 @@
|
||||||
|
package at.mocode.turnier.feature.presentation
|
||||||
|
|
||||||
|
import androidx.compose.foundation.background
|
||||||
|
import androidx.compose.foundation.layout.*
|
||||||
|
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
|
||||||
|
|
||||||
|
private val SeriesBlue = Color(0xFF1E3A8A)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* SERIES-Screen gemäß Vision_03 & Phase 10.
|
||||||
|
*
|
||||||
|
* Zeigt Cups, Serien und Meisterschaften mit konfigurierbaren Reglements.
|
||||||
|
*/
|
||||||
|
@Composable
|
||||||
|
fun SeriesScreen(
|
||||||
|
title: String,
|
||||||
|
onBack: () -> Unit
|
||||||
|
) {
|
||||||
|
Column(modifier = Modifier.fillMaxSize()) {
|
||||||
|
// Toolbar
|
||||||
|
Row(
|
||||||
|
modifier = Modifier.fillMaxWidth().padding(16.dp),
|
||||||
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
|
horizontalArrangement = Arrangement.SpaceBetween
|
||||||
|
) {
|
||||||
|
Column {
|
||||||
|
Text(title, style = MaterialTheme.typography.headlineSmall, fontWeight = FontWeight.Bold)
|
||||||
|
Text("Konfiguration & Auswertung (Phase 10)", fontSize = 13.sp, color = Color.Gray)
|
||||||
|
}
|
||||||
|
Button(
|
||||||
|
onClick = { /* Neu anlegen Dialog */ },
|
||||||
|
colors = ButtonDefaults.buttonColors(containerColor = SeriesBlue)
|
||||||
|
) {
|
||||||
|
Text("Neue Serie anlegen")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
HorizontalDivider()
|
||||||
|
|
||||||
|
// Leere Liste (Placeholder)
|
||||||
|
Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
|
||||||
|
Column(horizontalAlignment = Alignment.CenterHorizontally) {
|
||||||
|
Text("Keine $title konfiguriert", fontSize = 16.sp, fontWeight = FontWeight.Medium)
|
||||||
|
Spacer(Modifier.height(8.dp))
|
||||||
|
Text(
|
||||||
|
"Verknüpfe Bewerbe zu einer Serie, um Punktestände automatisch zu berechnen.",
|
||||||
|
fontSize = 13.sp,
|
||||||
|
color = Color.Gray,
|
||||||
|
modifier = Modifier.padding(horizontal = 32.dp),
|
||||||
|
textAlign = androidx.compose.ui.text.style.TextAlign.Center
|
||||||
|
)
|
||||||
|
Spacer(Modifier.height(24.dp))
|
||||||
|
OutlinedButton(onClick = onBack) {
|
||||||
|
Text("Zurück zur Verwaltung")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -11,6 +11,7 @@ import androidx.compose.ui.text.font.FontWeight
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import androidx.compose.ui.unit.sp
|
import androidx.compose.ui.unit.sp
|
||||||
import org.koin.compose.koinInject
|
import org.koin.compose.koinInject
|
||||||
|
import org.koin.compose.viewmodel.koinViewModel
|
||||||
import org.koin.core.parameter.parametersOf
|
import org.koin.core.parameter.parametersOf
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -102,11 +103,20 @@ fun TurnierDetailScreen(
|
||||||
veranstalterBundesland = veranstalterBundesland,
|
veranstalterBundesland = veranstalterBundesland,
|
||||||
veranstalterLogoUrl = veranstalterLogoUrl,
|
veranstalterLogoUrl = veranstalterLogoUrl,
|
||||||
)
|
)
|
||||||
1 -> OrganisationTabContent()
|
1 -> {
|
||||||
|
val nennungViewModel = koinInject<NennungViewModel>(parameters = { parametersOf(turnierId) })
|
||||||
|
OrganisationTabContent(viewModel = nennungViewModel)
|
||||||
|
}
|
||||||
2 -> BewerbeTabContent(viewModel = bewerbViewModel, turnierId = turnierId)
|
2 -> BewerbeTabContent(viewModel = bewerbViewModel, turnierId = turnierId)
|
||||||
3 -> ArtikelTabContent()
|
3 -> ArtikelTabContent()
|
||||||
4 -> AbrechnungTabContent(veranstaltungId = veranstaltungId)
|
4 -> AbrechnungTabContent(veranstaltungId = veranstaltungId)
|
||||||
5 -> NennungenTabContent(onAbrechnungClick = { selectedTab = 4 })
|
5 -> {
|
||||||
|
val nennungViewModel = koinInject<NennungViewModel>(parameters = { parametersOf(turnierId) })
|
||||||
|
NennungenTabContent(
|
||||||
|
viewModel = nennungViewModel,
|
||||||
|
onAbrechnungClick = { selectedTab = 4 }
|
||||||
|
)
|
||||||
|
}
|
||||||
6 -> ZeitplanTabContent(turnierId = turnierId, viewModel = bewerbViewModel)
|
6 -> ZeitplanTabContent(turnierId = turnierId, viewModel = bewerbViewModel)
|
||||||
7 -> StartlistenTabContent()
|
7 -> StartlistenTabContent()
|
||||||
8 -> ErgebnislistenTabContent()
|
8 -> ErgebnislistenTabContent()
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,8 @@ import androidx.compose.ui.graphics.Color
|
||||||
import androidx.compose.ui.text.font.FontWeight
|
import androidx.compose.ui.text.font.FontWeight
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import androidx.compose.ui.unit.sp
|
import androidx.compose.ui.unit.sp
|
||||||
|
import at.mocode.turnier.feature.domain.Bewerb
|
||||||
|
import org.koin.compose.koinInject
|
||||||
|
|
||||||
private val ElBlue = Color(0xFF1E3A8A)
|
private val ElBlue = Color(0xFF1E3A8A)
|
||||||
private val ElHeaderBg = Color(0xFFF1F5F9)
|
private val ElHeaderBg = Color(0xFFF1F5F9)
|
||||||
|
|
@ -22,11 +24,19 @@ private val ElHeaderBg = Color(0xFFF1F5F9)
|
||||||
* - Rechts (280dp): Platzierung & Geldpreis-Panel
|
* - Rechts (280dp): Platzierung & Geldpreis-Panel
|
||||||
*/
|
*/
|
||||||
@Composable
|
@Composable
|
||||||
fun ErgebnislistenTabContent() {
|
fun ErgebnislistenTabContent(
|
||||||
|
viewModel: BewerbViewModel = koinInject()
|
||||||
|
) {
|
||||||
|
val state by viewModel.state.collectAsState()
|
||||||
|
|
||||||
Row(modifier = Modifier.fillMaxSize()) {
|
Row(modifier = Modifier.fillMaxSize()) {
|
||||||
// ── Linke Spalte: Bewerbs-Tabs + Tabelle ─────────────────────────────
|
// ── Linke Spalte: Bewerbs-Tabs + Tabelle ─────────────────────────────
|
||||||
Column(modifier = Modifier.weight(1f).fillMaxHeight()) {
|
Column(modifier = Modifier.weight(1f).fillMaxHeight()) {
|
||||||
ErgebnislistenBewerbsTabs()
|
ErgebnislistenBewerbsTabs(
|
||||||
|
bewerbe = state.list,
|
||||||
|
selectedId = state.selectedId,
|
||||||
|
onSelect = { viewModel.send(BewerbIntent.Select(it)) }
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
VerticalDivider()
|
VerticalDivider()
|
||||||
|
|
@ -37,28 +47,31 @@ fun ErgebnislistenTabContent() {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
private fun ErgebnislistenBewerbsTabs() {
|
private fun ErgebnislistenBewerbsTabs(
|
||||||
val bewerbe = remember {
|
bewerbe: List<Bewerb>,
|
||||||
listOf("Bewerb 1", "Bewerb 2", "Bewerb 3", "Bewerb 4", "Bewerb 5")
|
selectedId: Long?,
|
||||||
}
|
onSelect: (Long?) -> Unit
|
||||||
var selectedBewerb by remember { mutableIntStateOf(0) }
|
) {
|
||||||
|
val selectedIndex = bewerbe.indexOfFirst { it.id == selectedId }.coerceAtLeast(0)
|
||||||
|
|
||||||
PrimaryScrollableTabRow(
|
PrimaryScrollableTabRow(
|
||||||
selectedTabIndex = selectedBewerb,
|
selectedTabIndex = selectedIndex,
|
||||||
containerColor = MaterialTheme.colorScheme.surface,
|
containerColor = MaterialTheme.colorScheme.surface,
|
||||||
contentColor = ElBlue,
|
contentColor = ElBlue,
|
||||||
edgePadding = 0.dp,
|
edgePadding = 0.dp,
|
||||||
) {
|
) {
|
||||||
bewerbe.forEachIndexed { index, title ->
|
bewerbe.forEachIndexed { index, bewerb ->
|
||||||
Tab(
|
Tab(
|
||||||
selected = selectedBewerb == index,
|
selected = selectedId == bewerb.id,
|
||||||
onClick = { selectedBewerb = index },
|
onClick = { onSelect(bewerb.id) },
|
||||||
text = { Text(title, fontSize = 12.sp) },
|
text = { Text(bewerb.tag, fontSize = 12.sp) },
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
HorizontalDivider()
|
HorizontalDivider()
|
||||||
|
|
||||||
|
val selectedBewerb = bewerbe.getOrNull(selectedIndex)
|
||||||
|
|
||||||
// Toolbar
|
// Toolbar
|
||||||
Row(
|
Row(
|
||||||
modifier = Modifier.fillMaxWidth().padding(horizontal = 12.dp, vertical = 8.dp),
|
modifier = Modifier.fillMaxWidth().padding(horizontal = 12.dp, vertical = 8.dp),
|
||||||
|
|
@ -66,7 +79,7 @@ private fun ErgebnislistenBewerbsTabs() {
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
) {
|
) {
|
||||||
Text(
|
Text(
|
||||||
text = "Bewerb ${selectedBewerb + 1} – Ergebnisliste",
|
text = selectedBewerb?.let { "${it.tag} – ${it.name}" } ?: "Kein Bewerb ausgewählt",
|
||||||
fontWeight = FontWeight.SemiBold,
|
fontWeight = FontWeight.SemiBold,
|
||||||
fontSize = 13.sp,
|
fontSize = 13.sp,
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -30,13 +30,18 @@ private val NennSelectedBg = Color(0xFFEFF6FF)
|
||||||
* - Rechts (360dp): Verkauf/Buchungen + Bewerbsübersicht
|
* - Rechts (360dp): Verkauf/Buchungen + Bewerbsübersicht
|
||||||
*/
|
*/
|
||||||
@Composable
|
@Composable
|
||||||
fun NennungenTabContent(onAbrechnungClick: () -> Unit = {}) {
|
fun NennungenTabContent(
|
||||||
|
viewModel: NennungViewModel,
|
||||||
|
onAbrechnungClick: () -> Unit = {}
|
||||||
|
) {
|
||||||
|
val state by viewModel.state.collectAsState()
|
||||||
|
|
||||||
Row(modifier = Modifier.fillMaxSize()) {
|
Row(modifier = Modifier.fillMaxSize()) {
|
||||||
// ── Linke Spalte: Suche + Tabelle ─────────────────────────────────────
|
// ── Linke Spalte: Suche + Tabelle ─────────────────────────────────────
|
||||||
Column(modifier = Modifier.weight(1f).fillMaxHeight()) {
|
Column(modifier = Modifier.weight(1f).fillMaxHeight()) {
|
||||||
NennungenSuchePanel()
|
NennungenSuchePanel(viewModel, state)
|
||||||
HorizontalDivider()
|
HorizontalDivider()
|
||||||
NennungenTabelle()
|
NennungenTabelle(viewModel, state)
|
||||||
}
|
}
|
||||||
|
|
||||||
VerticalDivider()
|
VerticalDivider()
|
||||||
|
|
@ -56,40 +61,48 @@ fun NennungenTabContent(onAbrechnungClick: () -> Unit = {}) {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
private fun NennungenSuchePanel() {
|
private fun NennungenSuchePanel(viewModel: NennungViewModel, state: NennungenState) {
|
||||||
|
var pferdQuery by remember { mutableStateOf("") }
|
||||||
|
var reiterQuery by remember { mutableStateOf("") }
|
||||||
|
|
||||||
Column(modifier = Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
|
Column(modifier = Modifier.padding(12.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||||
Text("Pferd & Reiter suchen", fontWeight = FontWeight.SemiBold, fontSize = 13.sp)
|
Text("Pferd & Reiter suchen", fontWeight = FontWeight.SemiBold, fontSize = 13.sp)
|
||||||
Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
|
Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||||
OutlinedTextField(
|
OutlinedTextField(
|
||||||
value = "",
|
value = pferdQuery,
|
||||||
onValueChange = {},
|
onValueChange = {
|
||||||
|
pferdQuery = it
|
||||||
|
viewModel.searchPferde(it)
|
||||||
|
},
|
||||||
placeholder = { Text("Pferd suchen (Name, OEPS-Nr.)…", fontSize = 12.sp) },
|
placeholder = { Text("Pferd suchen (Name, OEPS-Nr.)…", fontSize = 12.sp) },
|
||||||
leadingIcon = { Icon(Icons.Default.Search, contentDescription = null, modifier = Modifier.size(16.dp)) },
|
leadingIcon = { Icon(Icons.Default.Search, contentDescription = null, modifier = Modifier.size(16.dp)) },
|
||||||
modifier = Modifier.weight(1f).height(44.dp),
|
modifier = Modifier.weight(1f).height(44.dp),
|
||||||
singleLine = true,
|
singleLine = true,
|
||||||
)
|
)
|
||||||
OutlinedTextField(
|
OutlinedTextField(
|
||||||
value = "",
|
value = reiterQuery,
|
||||||
onValueChange = {},
|
onValueChange = {
|
||||||
|
reiterQuery = it
|
||||||
|
viewModel.searchReiter(it)
|
||||||
|
},
|
||||||
placeholder = { Text("Reiter suchen (Name, OEPS-Nr.)…", fontSize = 12.sp) },
|
placeholder = { Text("Reiter suchen (Name, OEPS-Nr.)…", fontSize = 12.sp) },
|
||||||
leadingIcon = { Icon(Icons.Default.Search, contentDescription = null, modifier = Modifier.size(16.dp)) },
|
leadingIcon = { Icon(Icons.Default.Search, contentDescription = null, modifier = Modifier.size(16.dp)) },
|
||||||
modifier = Modifier.weight(1f).height(44.dp),
|
modifier = Modifier.weight(1f).height(44.dp),
|
||||||
singleLine = true,
|
singleLine = true,
|
||||||
)
|
)
|
||||||
Button(
|
Button(
|
||||||
onClick = {},
|
onClick = { /* In einem echten Dialog würde hier die Auswahl kombiniert */ },
|
||||||
colors = ButtonDefaults.buttonColors(containerColor = NennBlue),
|
colors = ButtonDefaults.buttonColors(containerColor = NennBlue),
|
||||||
modifier = Modifier.height(44.dp),
|
modifier = Modifier.height(44.dp),
|
||||||
) {
|
) {
|
||||||
Text("Suchen", fontSize = 12.sp)
|
Text("Nennen", fontSize = 12.sp)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
private fun NennungenTabelle() {
|
private fun NennungenTabelle(viewModel: NennungViewModel, state: NennungenState) {
|
||||||
val nennungen = remember { sampleNennungen() }
|
|
||||||
var selectedIndex by remember { mutableIntStateOf(-1) }
|
var selectedIndex by remember { mutableIntStateOf(-1) }
|
||||||
|
|
||||||
Column(modifier = Modifier.fillMaxSize()) {
|
Column(modifier = Modifier.fillMaxSize()) {
|
||||||
|
|
@ -100,15 +113,18 @@ private fun NennungenTabelle() {
|
||||||
.background(NennHeaderBg)
|
.background(NennHeaderBg)
|
||||||
.padding(horizontal = 12.dp, vertical = 6.dp),
|
.padding(horizontal = 12.dp, vertical = 6.dp),
|
||||||
) {
|
) {
|
||||||
Text("Startnr.", fontSize = 11.sp, fontWeight = FontWeight.SemiBold, modifier = Modifier.width(60.dp))
|
Text("ID", fontSize = 11.sp, fontWeight = FontWeight.SemiBold, modifier = Modifier.width(60.dp))
|
||||||
Text("Pferd", fontSize = 11.sp, fontWeight = FontWeight.SemiBold, modifier = Modifier.weight(1f))
|
Text("Pferd", fontSize = 11.sp, fontWeight = FontWeight.SemiBold, modifier = Modifier.weight(1f))
|
||||||
Text("Reiter", fontSize = 11.sp, fontWeight = FontWeight.SemiBold, modifier = Modifier.weight(1f))
|
Text("Reiter", fontSize = 11.sp, fontWeight = FontWeight.SemiBold, modifier = Modifier.weight(1f))
|
||||||
Text("Bewerb", fontSize = 11.sp, fontWeight = FontWeight.SemiBold, modifier = Modifier.weight(1f))
|
|
||||||
Text("Status", fontSize = 11.sp, fontWeight = FontWeight.SemiBold, modifier = Modifier.width(80.dp))
|
Text("Status", fontSize = 11.sp, fontWeight = FontWeight.SemiBold, modifier = Modifier.width(80.dp))
|
||||||
}
|
}
|
||||||
HorizontalDivider()
|
HorizontalDivider()
|
||||||
|
|
||||||
if (nennungen.isEmpty()) {
|
if (state.isLoading) {
|
||||||
|
LinearProgressIndicator(modifier = Modifier.fillMaxWidth())
|
||||||
|
}
|
||||||
|
|
||||||
|
if (state.nennungen.isEmpty() && !state.isLoading) {
|
||||||
Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
|
Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
|
||||||
Column(horizontalAlignment = Alignment.CenterHorizontally) {
|
Column(horizontalAlignment = Alignment.CenterHorizontally) {
|
||||||
Text("Keine Nennungen vorhanden", fontSize = 14.sp, color = Color(0xFF6B7280))
|
Text("Keine Nennungen vorhanden", fontSize = 14.sp, color = Color(0xFF6B7280))
|
||||||
|
|
@ -122,7 +138,7 @@ private fun NennungenTabelle() {
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
LazyColumn(modifier = Modifier.fillMaxSize()) {
|
LazyColumn(modifier = Modifier.fillMaxSize()) {
|
||||||
itemsIndexed(nennungen) { index, nennung ->
|
itemsIndexed(state.nennungen) { index, nennung ->
|
||||||
Row(
|
Row(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
|
|
@ -132,15 +148,14 @@ private fun NennungenTabelle() {
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
) {
|
) {
|
||||||
Text(
|
Text(
|
||||||
"${nennung.startnr}",
|
nennung.id.takeLast(6),
|
||||||
fontSize = 12.sp,
|
fontSize = 12.sp,
|
||||||
modifier = Modifier.width(60.dp),
|
modifier = Modifier.width(60.dp),
|
||||||
color = NennBlue,
|
color = NennBlue,
|
||||||
fontWeight = FontWeight.Bold
|
fontWeight = FontWeight.Bold
|
||||||
)
|
)
|
||||||
Text(nennung.pferd, fontSize = 12.sp, modifier = Modifier.weight(1f))
|
Text(nennung.pferdId.takeLast(8), fontSize = 12.sp, modifier = Modifier.weight(1f))
|
||||||
Text(nennung.reiter, fontSize = 12.sp, modifier = Modifier.weight(1f))
|
Text(nennung.reiterId.takeLast(8), fontSize = 12.sp, modifier = Modifier.weight(1f))
|
||||||
Text(nennung.bewerb, fontSize = 12.sp, modifier = Modifier.weight(1f))
|
|
||||||
NennungStatusBadge(nennung.status)
|
NennungStatusBadge(nennung.status)
|
||||||
}
|
}
|
||||||
HorizontalDivider(color = Color(0xFFE5E7EB))
|
HorizontalDivider(color = Color(0xFFE5E7EB))
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,9 @@ private val DeleteRed = Color(0xFFDC2626)
|
||||||
* - Austragungsplätze: dynamische Liste (Sparte, Größe, Bezeichnung, Löschen)
|
* - Austragungsplätze: dynamische Liste (Sparte, Größe, Bezeichnung, Löschen)
|
||||||
*/
|
*/
|
||||||
@Composable
|
@Composable
|
||||||
fun OrganisationTabContent() {
|
fun OrganisationTabContent(viewModel: NennungViewModel) {
|
||||||
|
val state by viewModel.state.collectAsState()
|
||||||
|
|
||||||
var turnierleiter by remember { mutableStateOf("") }
|
var turnierleiter by remember { mutableStateOf("") }
|
||||||
var turnierbeauftragter by remember { mutableStateOf("") }
|
var turnierbeauftragter by remember { mutableStateOf("") }
|
||||||
var technischerDelegierter by remember { mutableStateOf("") }
|
var technischerDelegierter by remember { mutableStateOf("") }
|
||||||
|
|
@ -66,7 +68,10 @@ fun OrganisationTabContent() {
|
||||||
// ── Funktionäre & Offizielle ─────────────────────────────────────────
|
// ── Funktionäre & Offizielle ─────────────────────────────────────────
|
||||||
OrgSectionCard(title = "Funktionäre & Offizielle (C-Satz)") {
|
OrgSectionCard(title = "Funktionäre & Offizielle (C-Satz)") {
|
||||||
OrgSubSection("Turnier-Organisation") {
|
OrgSubSection("Turnier-Organisation") {
|
||||||
OrgSearchField("Turnierleiter:", turnierleiter) { turnierleiter = it }
|
OrgSearchField("Turnierleiter:", turnierleiter) {
|
||||||
|
turnierleiter = it
|
||||||
|
// In einem echten Szenario würde hier die Masterdata-Suche getriggert
|
||||||
|
}
|
||||||
OrgSearchField("Turnierbeauftragter:", turnierbeauftragter) { turnierbeauftragter = it }
|
OrgSearchField("Turnierbeauftragter:", turnierbeauftragter) { turnierbeauftragter = it }
|
||||||
OrgSearchField("Technischer Delegierter:", technischerDelegierter) { technischerDelegierter = it }
|
OrgSearchField("Technischer Delegierter:", technischerDelegierter) { technischerDelegierter = it }
|
||||||
OrgSearchField("Parcourschef:", parcourschef) { parcourschef = it }
|
OrgSearchField("Parcourschef:", parcourschef) { parcourschef = it }
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,8 @@ import androidx.compose.ui.graphics.Color
|
||||||
import androidx.compose.ui.text.font.FontWeight
|
import androidx.compose.ui.text.font.FontWeight
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import androidx.compose.ui.unit.sp
|
import androidx.compose.ui.unit.sp
|
||||||
|
import at.mocode.turnier.feature.domain.Bewerb
|
||||||
|
import org.koin.compose.koinInject
|
||||||
|
|
||||||
private val SlBlue = Color(0xFF1E3A8A)
|
private val SlBlue = Color(0xFF1E3A8A)
|
||||||
private val SlHeaderBg = Color(0xFFF1F5F9)
|
private val SlHeaderBg = Color(0xFFF1F5F9)
|
||||||
|
|
@ -22,11 +24,22 @@ private val SlHeaderBg = Color(0xFFF1F5F9)
|
||||||
* - Rechts (280dp): Sortierung & Zeit-Panel
|
* - Rechts (280dp): Sortierung & Zeit-Panel
|
||||||
*/
|
*/
|
||||||
@Composable
|
@Composable
|
||||||
fun StartlistenTabContent() {
|
fun StartlistenTabContent(
|
||||||
|
viewModel: BewerbViewModel = koinInject()
|
||||||
|
) {
|
||||||
|
val state by viewModel.state.collectAsState()
|
||||||
|
val selectedBewerb = state.list.find { it.id == state.selectedId }
|
||||||
|
|
||||||
Row(modifier = Modifier.fillMaxSize()) {
|
Row(modifier = Modifier.fillMaxSize()) {
|
||||||
// ── Linke Spalte: Bewerbs-Tabs + Tabelle ─────────────────────────────
|
// ── Linke Spalte: Bewerbs-Tabs + Tabelle ─────────────────────────────
|
||||||
Column(modifier = Modifier.weight(1f).fillMaxHeight()) {
|
Column(modifier = Modifier.weight(1f).fillMaxHeight()) {
|
||||||
StartlistenBewerbsTabs()
|
StartlistenBewerbsTabs(
|
||||||
|
bewerbe = state.list,
|
||||||
|
selectedId = state.selectedId,
|
||||||
|
onSelect = { viewModel.send(BewerbIntent.Select(it)) },
|
||||||
|
currentStartliste = state.currentStartliste,
|
||||||
|
onGenerate = { viewModel.generateStartliste() }
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
VerticalDivider()
|
VerticalDivider()
|
||||||
|
|
@ -37,28 +50,33 @@ fun StartlistenTabContent() {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
private fun StartlistenBewerbsTabs() {
|
private fun StartlistenBewerbsTabs(
|
||||||
val bewerbe = remember {
|
bewerbe: List<Bewerb>,
|
||||||
listOf("Bewerb 1", "Bewerb 2", "Bewerb 3", "Bewerb 4", "Bewerb 5")
|
selectedId: Long?,
|
||||||
}
|
onSelect: (Long?) -> Unit,
|
||||||
var selectedBewerb by remember { mutableIntStateOf(0) }
|
currentStartliste: List<StartlistenZeile>,
|
||||||
|
onGenerate: () -> Unit
|
||||||
|
) {
|
||||||
|
val selectedIndex = bewerbe.indexOfFirst { it.id == selectedId }.coerceAtLeast(0)
|
||||||
|
|
||||||
PrimaryScrollableTabRow(
|
PrimaryScrollableTabRow(
|
||||||
selectedTabIndex = selectedBewerb,
|
selectedTabIndex = selectedIndex,
|
||||||
containerColor = MaterialTheme.colorScheme.surface,
|
containerColor = MaterialTheme.colorScheme.surface,
|
||||||
contentColor = SlBlue,
|
contentColor = SlBlue,
|
||||||
edgePadding = 0.dp,
|
edgePadding = 0.dp,
|
||||||
) {
|
) {
|
||||||
bewerbe.forEachIndexed { index, title ->
|
bewerbe.forEachIndexed { index, bewerb ->
|
||||||
Tab(
|
Tab(
|
||||||
selected = selectedBewerb == index,
|
selected = selectedId == bewerb.id,
|
||||||
onClick = { selectedBewerb = index },
|
onClick = { onSelect(bewerb.id) },
|
||||||
text = { Text(title, fontSize = 12.sp) },
|
text = { Text(bewerb.tag, fontSize = 12.sp) },
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
HorizontalDivider()
|
HorizontalDivider()
|
||||||
|
|
||||||
|
val selectedBewerb = bewerbe.getOrNull(selectedIndex)
|
||||||
|
|
||||||
// Toolbar
|
// Toolbar
|
||||||
Row(
|
Row(
|
||||||
modifier = Modifier.fillMaxWidth().padding(horizontal = 12.dp, vertical = 8.dp),
|
modifier = Modifier.fillMaxWidth().padding(horizontal = 12.dp, vertical = 8.dp),
|
||||||
|
|
@ -66,7 +84,7 @@ private fun StartlistenBewerbsTabs() {
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
) {
|
) {
|
||||||
Text(
|
Text(
|
||||||
text = "Bewerb ${selectedBewerb + 1} – Startliste",
|
text = selectedBewerb?.let { "${it.tag} – ${it.name}" } ?: "Kein Bewerb ausgewählt",
|
||||||
fontWeight = FontWeight.SemiBold,
|
fontWeight = FontWeight.SemiBold,
|
||||||
fontSize = 13.sp,
|
fontSize = 13.sp,
|
||||||
)
|
)
|
||||||
|
|
@ -99,6 +117,7 @@ private fun StartlistenBewerbsTabs() {
|
||||||
}
|
}
|
||||||
HorizontalDivider()
|
HorizontalDivider()
|
||||||
|
|
||||||
|
if (currentStartliste.isEmpty()) {
|
||||||
// Leere Liste
|
// Leere Liste
|
||||||
Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
|
Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
|
||||||
Column(horizontalAlignment = Alignment.CenterHorizontally) {
|
Column(horizontalAlignment = Alignment.CenterHorizontally) {
|
||||||
|
|
@ -107,13 +126,32 @@ private fun StartlistenBewerbsTabs() {
|
||||||
Text("Startliste wird nach Nennungsschluss generiert.", fontSize = 12.sp, color = Color(0xFF9CA3AF))
|
Text("Startliste wird nach Nennungsschluss generiert.", fontSize = 12.sp, color = Color(0xFF9CA3AF))
|
||||||
Spacer(Modifier.height(16.dp))
|
Spacer(Modifier.height(16.dp))
|
||||||
Button(
|
Button(
|
||||||
onClick = {},
|
onClick = onGenerate,
|
||||||
colors = ButtonDefaults.buttonColors(containerColor = SlBlue),
|
colors = ButtonDefaults.buttonColors(containerColor = SlBlue),
|
||||||
) {
|
) {
|
||||||
Text("Startliste generieren", fontSize = 13.sp)
|
Text("Startliste generieren", fontSize = 13.sp)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
// Liste anzeigen
|
||||||
|
androidx.compose.foundation.lazy.LazyColumn(modifier = Modifier.fillMaxSize()) {
|
||||||
|
items(currentStartliste.size) { index ->
|
||||||
|
val zeile = currentStartliste[index]
|
||||||
|
Row(
|
||||||
|
modifier = Modifier.fillMaxWidth().padding(horizontal = 12.dp, vertical = 8.dp),
|
||||||
|
verticalAlignment = Alignment.CenterVertically
|
||||||
|
) {
|
||||||
|
Text(zeile.nr.toString(), fontSize = 12.sp, modifier = Modifier.width(70.dp))
|
||||||
|
Text(zeile.pferd, fontSize = 12.sp, modifier = Modifier.weight(1f))
|
||||||
|
Text(zeile.reiter, fontSize = 12.sp, modifier = Modifier.weight(1f))
|
||||||
|
Text("-", fontSize = 12.sp, modifier = Modifier.width(80.dp))
|
||||||
|
Text(zeile.zeit, fontSize = 12.sp, modifier = Modifier.width(70.dp))
|
||||||
|
}
|
||||||
|
HorizontalDivider(color = Color(0xFFE5E7EB))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
|
|
|
||||||
|
|
@ -41,6 +41,8 @@ fun AdminUebersichtScreen(
|
||||||
onVeranstaltungOeffnen: (Long) -> Unit,
|
onVeranstaltungOeffnen: (Long) -> Unit,
|
||||||
onPingService: () -> Unit = {},
|
onPingService: () -> Unit = {},
|
||||||
onVereineOeffnen: () -> Unit = {},
|
onVereineOeffnen: () -> Unit = {},
|
||||||
|
onMeisterschaftenOeffnen: () -> Unit = {},
|
||||||
|
onCupsOeffnen: () -> Unit = {},
|
||||||
) {
|
) {
|
||||||
// Placeholder-Daten für die UI-Struktur (sichtbar als Cards)
|
// Placeholder-Daten für die UI-Struktur (sichtbar als Cards)
|
||||||
val sample = listOf(
|
val sample = listOf(
|
||||||
|
|
@ -68,7 +70,9 @@ fun AdminUebersichtScreen(
|
||||||
inVorbereitung = 0,
|
inVorbereitung = 0,
|
||||||
gesamt = 0,
|
gesamt = 0,
|
||||||
archiv = 0,
|
archiv = 0,
|
||||||
onVereineClick = onVereineOeffnen
|
onVereineClick = onVereineOeffnen,
|
||||||
|
onMeisterschaftenClick = onMeisterschaftenOeffnen,
|
||||||
|
onCupsClick = onCupsOeffnen
|
||||||
)
|
)
|
||||||
|
|
||||||
// Toolbar
|
// Toolbar
|
||||||
|
|
@ -159,6 +163,8 @@ private fun KpiKachelRow(
|
||||||
gesamt: Int,
|
gesamt: Int,
|
||||||
archiv: Int,
|
archiv: Int,
|
||||||
onVereineClick: () -> Unit = {},
|
onVereineClick: () -> Unit = {},
|
||||||
|
onMeisterschaftenClick: () -> Unit = {},
|
||||||
|
onCupsClick: () -> Unit = {},
|
||||||
) {
|
) {
|
||||||
Row(
|
Row(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
|
|
@ -178,18 +184,24 @@ private fun KpiKachelRow(
|
||||||
akzentFarbe = Color(0xFF3B82F6),
|
akzentFarbe = Color(0xFF3B82F6),
|
||||||
modifier = Modifier.weight(1f),
|
modifier = Modifier.weight(1f),
|
||||||
)
|
)
|
||||||
|
KpiKachel(
|
||||||
|
label = "MEISTERSCHAFTEN",
|
||||||
|
wert = "-",
|
||||||
|
akzentFarbe = Color(0xFF1E3A8A),
|
||||||
|
modifier = Modifier.weight(1f).clickable { onMeisterschaftenClick() },
|
||||||
|
)
|
||||||
|
KpiKachel(
|
||||||
|
label = "CUPS",
|
||||||
|
wert = "-",
|
||||||
|
akzentFarbe = Color(0xFF1E3A8A),
|
||||||
|
modifier = Modifier.weight(1f).clickable { onCupsClick() },
|
||||||
|
)
|
||||||
KpiKachel(
|
KpiKachel(
|
||||||
label = "VEREINE",
|
label = "VEREINE",
|
||||||
wert = "4", // Mock
|
wert = "4", // Mock
|
||||||
akzentFarbe = Color(0xFF6B7280),
|
akzentFarbe = Color(0xFF6B7280),
|
||||||
modifier = Modifier.weight(1f).clickable { onVereineClick() },
|
modifier = Modifier.weight(1f).clickable { onVereineClick() },
|
||||||
)
|
)
|
||||||
KpiKachel(
|
|
||||||
label = "ARCHIV",
|
|
||||||
wert = archiv.toString(),
|
|
||||||
akzentFarbe = Color(0xFF9CA3AF),
|
|
||||||
modifier = Modifier.weight(1f),
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -33,6 +33,7 @@ import at.mocode.frontend.features.verein.presentation.VereinScreen
|
||||||
import at.mocode.frontend.features.verein.presentation.VereinViewModel
|
import at.mocode.frontend.features.verein.presentation.VereinViewModel
|
||||||
import at.mocode.ping.feature.presentation.PingScreen
|
import at.mocode.ping.feature.presentation.PingScreen
|
||||||
import at.mocode.ping.feature.presentation.PingViewModel
|
import at.mocode.ping.feature.presentation.PingViewModel
|
||||||
|
import at.mocode.turnier.feature.presentation.SeriesScreen
|
||||||
import at.mocode.turnier.feature.presentation.TurnierDetailScreen
|
import at.mocode.turnier.feature.presentation.TurnierDetailScreen
|
||||||
import at.mocode.veranstaltung.feature.presentation.AdminUebersichtScreen
|
import at.mocode.veranstaltung.feature.presentation.AdminUebersichtScreen
|
||||||
import at.mocode.veranstaltung.feature.presentation.VeranstaltungDetailScreen
|
import at.mocode.veranstaltung.feature.presentation.VeranstaltungDetailScreen
|
||||||
|
|
@ -302,6 +303,24 @@ private fun DesktopTopBar(
|
||||||
fontWeight = FontWeight.SemiBold,
|
fontWeight = FontWeight.SemiBold,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
is AppScreen.Meisterschaften -> {
|
||||||
|
BreadcrumbSeparator()
|
||||||
|
Text(
|
||||||
|
text = "Meisterschaften",
|
||||||
|
color = TopBarTextColor,
|
||||||
|
fontSize = 14.sp,
|
||||||
|
fontWeight = FontWeight.SemiBold,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
is AppScreen.Cups -> {
|
||||||
|
BreadcrumbSeparator()
|
||||||
|
Text(
|
||||||
|
text = "Cups",
|
||||||
|
color = TopBarTextColor,
|
||||||
|
fontSize = 14.sp,
|
||||||
|
fontWeight = FontWeight.SemiBold,
|
||||||
|
)
|
||||||
|
}
|
||||||
else -> {}
|
else -> {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -686,6 +705,14 @@ private fun DesktopContentArea(
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
is AppScreen.Meisterschaften -> {
|
||||||
|
SeriesScreen(title = "Meisterschaften", onBack = onBack)
|
||||||
|
}
|
||||||
|
|
||||||
|
is AppScreen.Cups -> {
|
||||||
|
SeriesScreen(title = "Cups", onBack = onBack)
|
||||||
|
}
|
||||||
|
|
||||||
is AppScreen.Nennung -> {
|
is AppScreen.Nennung -> {
|
||||||
val nennungViewModel: NennungViewModel = koinViewModel()
|
val nennungViewModel: NennungViewModel = koinViewModel()
|
||||||
NennungsMaske(
|
NennungsMaske(
|
||||||
|
|
@ -698,6 +725,8 @@ private fun DesktopContentArea(
|
||||||
else -> AdminUebersichtScreen(
|
else -> AdminUebersichtScreen(
|
||||||
onVeranstalterAuswahl = { onNavigate(AppScreen.VeranstalterAuswahl) },
|
onVeranstalterAuswahl = { onNavigate(AppScreen.VeranstalterAuswahl) },
|
||||||
onVeranstaltungOeffnen = { id -> onNavigate(AppScreen.VeranstaltungDetail(id)) },
|
onVeranstaltungOeffnen = { id -> onNavigate(AppScreen.VeranstaltungDetail(id)) },
|
||||||
|
onMeisterschaftenOeffnen = { onNavigate(AppScreen.Meisterschaften) },
|
||||||
|
onCupsOeffnen = { onNavigate(AppScreen.Cups) }
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,10 +2,9 @@ package at.mocode.desktop.screens.preview
|
||||||
|
|
||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import at.mocode.turnier.feature.domain.Bewerb
|
import at.mocode.turnier.feature.domain.*
|
||||||
import at.mocode.turnier.feature.domain.BewerbRepository
|
|
||||||
import at.mocode.turnier.feature.domain.StartlistenRepository
|
|
||||||
import at.mocode.turnier.feature.presentation.*
|
import at.mocode.turnier.feature.presentation.*
|
||||||
|
import at.mocode.turnier.feature.data.remote.dto.NennungEinreichenRequest
|
||||||
import at.mocode.zns.parser.ZnsBewerb
|
import at.mocode.zns.parser.ZnsBewerb
|
||||||
import at.mocode.frontend.features.veranstalter.presentation.VeranstalterAuswahlScreen
|
import at.mocode.frontend.features.veranstalter.presentation.VeranstalterAuswahlScreen
|
||||||
import at.mocode.frontend.features.veranstalter.presentation.VeranstalterDetailScreen
|
import at.mocode.frontend.features.veranstalter.presentation.VeranstalterDetailScreen
|
||||||
|
|
@ -108,8 +107,23 @@ fun PreviewTurnierStammdatenTab() {
|
||||||
@ComponentPreview
|
@ComponentPreview
|
||||||
@Composable
|
@Composable
|
||||||
fun PreviewTurnierOrganisationTab() {
|
fun PreviewTurnierOrganisationTab() {
|
||||||
|
val mockNennungRepo = object : NennungRepository {
|
||||||
|
override suspend fun list(turnierId: Long): Result<List<Nennung>> = Result.success(emptyList())
|
||||||
|
override suspend fun listByBewerb(bewerbId: Long): Result<List<Nennung>> = Result.success(emptyList())
|
||||||
|
override suspend fun einreichen(request: NennungEinreichenRequest): Result<Nennung> = Result.failure(NotImplementedError())
|
||||||
|
override suspend fun updateStatus(id: String, status: String): Result<Nennung> = Result.failure(NotImplementedError())
|
||||||
|
override suspend fun delete(id: String): Result<Unit> = Result.success(Unit)
|
||||||
|
}
|
||||||
|
val mockMasterdataRepo = object : MasterdataRepository {
|
||||||
|
override suspend fun searchReiter(query: String): Result<List<Reiter>> = Result.success(emptyList())
|
||||||
|
override suspend fun searchPferde(query: String): Result<List<Pferd>> = Result.success(emptyList())
|
||||||
|
override suspend fun searchFunktionaere(query: String): Result<List<Funktionaer>> = Result.success(emptyList())
|
||||||
|
override suspend fun listVereine(): Result<List<Verein>> = Result.success(emptyList())
|
||||||
|
override suspend fun getVereinById(id: String): Result<Verein> = Result.failure(NotImplementedError())
|
||||||
|
}
|
||||||
|
val vm = NennungViewModel(mockNennungRepo, mockMasterdataRepo, 1L)
|
||||||
MaterialTheme {
|
MaterialTheme {
|
||||||
OrganisationTabContent()
|
OrganisationTabContent(viewModel = vm)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -161,8 +175,23 @@ fun PreviewTurnierAbrechnungTab() {
|
||||||
@ComponentPreview
|
@ComponentPreview
|
||||||
@Composable
|
@Composable
|
||||||
fun PreviewTurnierNennungenTab() {
|
fun PreviewTurnierNennungenTab() {
|
||||||
|
val mockNennungRepo = object : NennungRepository {
|
||||||
|
override suspend fun list(turnierId: Long): Result<List<Nennung>> = Result.success(emptyList())
|
||||||
|
override suspend fun listByBewerb(bewerbId: Long): Result<List<Nennung>> = Result.success(emptyList())
|
||||||
|
override suspend fun einreichen(request: NennungEinreichenRequest): Result<Nennung> = Result.failure(NotImplementedError())
|
||||||
|
override suspend fun updateStatus(id: String, status: String): Result<Nennung> = Result.failure(NotImplementedError())
|
||||||
|
override suspend fun delete(id: String): Result<Unit> = Result.success(Unit)
|
||||||
|
}
|
||||||
|
val mockMasterdataRepo = object : MasterdataRepository {
|
||||||
|
override suspend fun searchReiter(query: String): Result<List<Reiter>> = Result.success(emptyList())
|
||||||
|
override suspend fun searchPferde(query: String): Result<List<Pferd>> = Result.success(emptyList())
|
||||||
|
override suspend fun searchFunktionaere(query: String): Result<List<Funktionaer>> = Result.success(emptyList())
|
||||||
|
override suspend fun listVereine(): Result<List<Verein>> = Result.success(emptyList())
|
||||||
|
override suspend fun getVereinById(id: String): Result<Verein> = Result.failure(NotImplementedError())
|
||||||
|
}
|
||||||
|
val vm = NennungViewModel(mockNennungRepo, mockMasterdataRepo, 1L)
|
||||||
MaterialTheme {
|
MaterialTheme {
|
||||||
NennungenTabContent()
|
NennungenTabContent(viewModel = vm)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user