Merge branch 'main'

#Conflicts:
#	PadelClub/Views/Tournament/Screen/InscriptionManagerView.swift
paca_championship
Raz 11 months ago
commit 83e61f375a
  1. 8
      PadelClub.xcodeproj/project.pbxproj
  2. 9
      PadelClub/Views/Navigation/Toolbox/ToolboxView.swift
  3. 39
      PadelClub/Views/Tournament/Screen/InscriptionManagerView.swift

@ -3278,7 +3278,7 @@
CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements; CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3; CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\"";
@ -3302,7 +3302,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.0.33; MARKETING_VERSION = 1.0.34;
PRODUCT_BUNDLE_IDENTIFIER = app.padelclub; PRODUCT_BUNDLE_IDENTIFIER = app.padelclub;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
@ -3323,7 +3323,7 @@
CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements; CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3; CURRENT_PROJECT_VERSION = 1;
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\"";
DEVELOPMENT_TEAM = BQ3Y44M3Q6; DEVELOPMENT_TEAM = BQ3Y44M3Q6;
@ -3346,7 +3346,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.0.33; MARKETING_VERSION = 1.0.34;
PRODUCT_BUNDLE_IDENTIFIER = app.padelclub; PRODUCT_BUNDLE_IDENTIFIER = app.padelclub;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";

@ -196,10 +196,17 @@ struct ToolboxView: View {
Text("Contrat d'utilisation") Text("Contrat d'utilisation")
} }
} }
Section {
RowButtonView("Effacer les logs", role: .destructive) {
StoreCenter.main.resetLoggingCollections()
didResetApiCalls = true
}
}
} }
.overlay(alignment: .bottom) { .overlay(alignment: .bottom) {
if didResetApiCalls { if didResetApiCalls {
Label("failed api calls deleted", systemImage: "checkmark") Label("logs effacés", systemImage: "checkmark")
.toastFormatted() .toastFormatted()
.deferredRendering(for: .seconds(3)) .deferredRendering(for: .seconds(3))
.onAppear { .onAppear {

@ -354,31 +354,28 @@ struct InscriptionManagerView: View {
.symbolVariant(filterMode == .all ? .none : .fill) .symbolVariant(filterMode == .all ? .none : .fill)
} }
Menu { Menu {
NavigationLink { if tournament.inscriptionClosed() == false {
RegisrationSetupView(tournament: tournament) Menu {
} label: { _sortingTypePickerView()
Text("Inscription en ligne") } label: {
Text("Méthode de sélection")
Text(tournament.teamSorting.localizedLabel())
}
Divider()
rankingDateSourcePickerView(showDateInLabel: true)
Divider()
Button {
tournament.lockRegistration()
_save()
} label: {
Label("Clôturer", systemImage: "lock")
}
} }
if tournament.isAnimation() == false { if tournament.isAnimation() == false {
if tournament.inscriptionClosed() == false { if tournament.inscriptionClosed() == false {
Menu {
_sortingTypePickerView()
} label: {
Text("Méthode de sélection")
Text(tournament.teamSorting.localizedLabel())
}
Divider()
rankingDateSourcePickerView(showDateInLabel: true)
Divider()
Button {
tournament.lockRegistration()
_save()
} label: {
Label("Clôturer", systemImage: "lock")
}
Divider() Divider()
Section { Section {

Loading…
Cancel
Save