fix little glitches

sync2
Raz 1 year ago
parent 5ec65c88d5
commit eca125ef73
  1. 8
      PadelClub/Views/Tournament/Screen/TableStructureView.swift
  2. 3
      PadelClub/Views/Tournament/Shared/TournamentCellView.swift

@ -109,16 +109,16 @@ struct TableStructureView: View {
if structurePreset == .manual { if structurePreset == .manual {
LabeledContent { LabeledContent {
StepperView(count: $qualifiedPerGroupStage, minimum: 1, maximum: (teamsPerGroupStage-1)) StepperView(count: $qualifiedPerGroupStage, minimum: 0, maximum: (teamsPerGroupStage-1))
} label: { } label: {
Text("Qualifiés par poule") Text("Qualifié\(qualifiedPerGroupStage.pluralSuffix) par poule")
} }
if qualifiedPerGroupStage < teamsPerGroupStage - 1 { if qualifiedPerGroupStage < teamsPerGroupStage - 1 {
LabeledContent { LabeledContent {
StepperView(count: $groupStageAdditionalQualified, minimum: 0, maximum: maxMoreQualified) StepperView(count: $groupStageAdditionalQualified, minimum: 1, maximum: maxMoreQualified)
} label: { } label: {
Text("Qualifiés supplémentaires") Text("Qualifié\(groupStageAdditionalQualified.pluralSuffix) supplémentaires")
Text(moreQualifiedLabel) Text(moreQualifiedLabel)
} }
.onChange(of: groupStageAdditionalQualified) { .onChange(of: groupStageAdditionalQualified) {

@ -11,7 +11,6 @@ import LeStorage
struct TournamentCellView: View { struct TournamentCellView: View {
@EnvironmentObject var dataStore: DataStore @EnvironmentObject var dataStore: DataStore
@Environment(NavigationViewModel.self) private var navigation @Environment(NavigationViewModel.self) private var navigation
@Environment(FederalDataViewModel.self) var federalDataViewModel: FederalDataViewModel
let tournament: FederalTournamentHolder let tournament: FederalTournamentHolder
// let color: Color = .black // let color: Color = .black
@ -25,7 +24,7 @@ struct TournamentCellView: View {
var body: some View { var body: some View {
ForEach(tournament.tournaments, id: \.id) { build in ForEach(tournament.tournaments, id: \.id) { build in
if let federalTournament = tournament as? FederalTournament { if let federalTournament = tournament as? FederalTournament {
if federalDataViewModel.isFederalTournamentValidForFilters(federalTournament, build: build) { if FederalDataViewModel.shared.isFederalTournamentValidForFilters(federalTournament, build: build) {
if navigation.agendaDestination == .around { if navigation.agendaDestination == .around {
NavigationLink { NavigationLink {
TournamentSubscriptionView(federalTournament: federalTournament, build: build, user: dataStore.user) TournamentSubscriptionView(federalTournament: federalTournament, build: build, user: dataStore.user)

Loading…
Cancel
Save