1.0.1 (6)
This commit is contained in:
@@ -592,9 +592,41 @@ struct EditAttemptView: View {
|
||||
@State private var notes: String
|
||||
@State private var duration: Int
|
||||
@State private var restTime: Int
|
||||
@State private var showingCreateProblem = false
|
||||
|
||||
// New problem creation state
|
||||
@State private var newProblemName = ""
|
||||
@State private var newProblemGrade = ""
|
||||
@State private var selectedClimbType: ClimbType = .boulder
|
||||
@State private var selectedDifficultySystem: DifficultySystem = .vScale
|
||||
|
||||
private var availableProblems: [Problem] {
|
||||
dataManager.problems.filter { $0.isActive }
|
||||
guard let session = dataManager.session(withId: attempt.sessionId) else {
|
||||
return []
|
||||
}
|
||||
return dataManager.problems.filter { $0.isActive && $0.gymId == session.gymId }
|
||||
}
|
||||
|
||||
private var gym: Gym? {
|
||||
guard let session = dataManager.session(withId: attempt.sessionId) else {
|
||||
return nil
|
||||
}
|
||||
return dataManager.gym(withId: session.gymId)
|
||||
}
|
||||
|
||||
private var availableClimbTypes: [ClimbType] {
|
||||
gym?.supportedClimbTypes ?? []
|
||||
}
|
||||
|
||||
private var availableDifficultySystems: [DifficultySystem] {
|
||||
guard let gym = gym else { return [] }
|
||||
return DifficultySystem.systemsForClimbType(selectedClimbType).filter { system in
|
||||
gym.difficultySystems.contains(system)
|
||||
}
|
||||
}
|
||||
|
||||
private var availableGrades: [String] {
|
||||
selectedDifficultySystem.availableGrades
|
||||
}
|
||||
|
||||
init(attempt: Attempt) {
|
||||
@@ -609,82 +641,13 @@ struct EditAttemptView: View {
|
||||
var body: some View {
|
||||
NavigationView {
|
||||
Form {
|
||||
Section("Select Problem") {
|
||||
if availableProblems.isEmpty {
|
||||
Text("No problems available")
|
||||
.foregroundColor(.secondary)
|
||||
} else {
|
||||
LazyVGrid(
|
||||
columns: Array(repeating: GridItem(.flexible(), spacing: 8), count: 2),
|
||||
spacing: 8
|
||||
) {
|
||||
ForEach(availableProblems, id: \.id) { problem in
|
||||
ProblemSelectionCard(
|
||||
problem: problem,
|
||||
isSelected: selectedProblem?.id == problem.id
|
||||
) {
|
||||
selectedProblem = problem
|
||||
}
|
||||
}
|
||||
}
|
||||
.padding(.vertical, 8)
|
||||
}
|
||||
if !showingCreateProblem {
|
||||
ProblemSelectionSection()
|
||||
} else {
|
||||
CreateProblemSection()
|
||||
}
|
||||
|
||||
Section("Result") {
|
||||
ForEach(AttemptResult.allCases, id: \.self) { result in
|
||||
HStack {
|
||||
Text(result.displayName)
|
||||
Spacer()
|
||||
if selectedResult == result {
|
||||
Image(systemName: "checkmark.circle.fill")
|
||||
.foregroundColor(.blue)
|
||||
} else {
|
||||
Image(systemName: "circle")
|
||||
.foregroundColor(.gray)
|
||||
}
|
||||
}
|
||||
.contentShape(Rectangle())
|
||||
.onTapGesture {
|
||||
selectedResult = result
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Section("Details") {
|
||||
TextField("Highest Hold (Optional)", text: $highestHold)
|
||||
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
Text("Notes (Optional)")
|
||||
.font(.headline)
|
||||
|
||||
TextEditor(text: $notes)
|
||||
.frame(minHeight: 80)
|
||||
.padding(8)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: 8)
|
||||
.fill(.quaternary)
|
||||
)
|
||||
}
|
||||
|
||||
HStack {
|
||||
Text("Duration (seconds)")
|
||||
Spacer()
|
||||
TextField("0", value: $duration, format: .number)
|
||||
.keyboardType(.numberPad)
|
||||
.textFieldStyle(.roundedBorder)
|
||||
.frame(width: 80)
|
||||
}
|
||||
|
||||
HStack {
|
||||
Text("Rest Time (seconds)")
|
||||
Spacer()
|
||||
TextField("0", value: $restTime, format: .number)
|
||||
.keyboardType(.numberPad)
|
||||
.textFieldStyle(.roundedBorder)
|
||||
.frame(width: 80)
|
||||
}
|
||||
}
|
||||
AttemptDetailsSection()
|
||||
}
|
||||
.navigationTitle("Edit Attempt")
|
||||
.navigationBarTitleDisplayMode(.inline)
|
||||
@@ -699,28 +662,293 @@ struct EditAttemptView: View {
|
||||
Button("Update") {
|
||||
updateAttempt()
|
||||
}
|
||||
.disabled(selectedProblem == nil)
|
||||
.disabled(!canSave)
|
||||
}
|
||||
}
|
||||
}
|
||||
.onAppear {
|
||||
selectedProblem = dataManager.problem(withId: attempt.problemId)
|
||||
setupInitialValues()
|
||||
}
|
||||
.onChange(of: selectedClimbType) {
|
||||
updateDifficultySystem()
|
||||
}
|
||||
.onChange(of: selectedDifficultySystem) {
|
||||
resetGradeIfNeeded()
|
||||
}
|
||||
}
|
||||
|
||||
@ViewBuilder
|
||||
private func ProblemSelectionSection() -> some View {
|
||||
Section("Select Problem") {
|
||||
if availableProblems.isEmpty {
|
||||
VStack(alignment: .leading, spacing: 12) {
|
||||
Text("No active problems in this gym")
|
||||
.foregroundColor(.secondary)
|
||||
|
||||
Button("Create New Problem") {
|
||||
showingCreateProblem = true
|
||||
}
|
||||
.buttonStyle(.borderedProminent)
|
||||
}
|
||||
.padding(.vertical, 8)
|
||||
} else {
|
||||
LazyVGrid(
|
||||
columns: Array(repeating: GridItem(.flexible(), spacing: 8), count: 2),
|
||||
spacing: 8
|
||||
) {
|
||||
ForEach(availableProblems, id: \.id) { problem in
|
||||
ProblemSelectionCard(
|
||||
problem: problem,
|
||||
isSelected: selectedProblem?.id == problem.id
|
||||
) {
|
||||
selectedProblem = problem
|
||||
}
|
||||
}
|
||||
}
|
||||
.padding(.vertical, 8)
|
||||
|
||||
Button("Create New Problem") {
|
||||
showingCreateProblem = true
|
||||
}
|
||||
.foregroundColor(.blue)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ViewBuilder
|
||||
private func CreateProblemSection() -> some View {
|
||||
Section {
|
||||
HStack {
|
||||
Text("Create New Problem")
|
||||
.font(.headline)
|
||||
|
||||
Spacer()
|
||||
|
||||
Button("Back") {
|
||||
showingCreateProblem = false
|
||||
}
|
||||
.foregroundColor(.blue)
|
||||
}
|
||||
}
|
||||
|
||||
Section("Problem Details") {
|
||||
TextField("Problem Name", text: $newProblemName)
|
||||
}
|
||||
|
||||
Section("Climb Type") {
|
||||
ForEach(availableClimbTypes, id: \.self) { climbType in
|
||||
HStack {
|
||||
Text(climbType.displayName)
|
||||
Spacer()
|
||||
if selectedClimbType == climbType {
|
||||
Image(systemName: "checkmark.circle.fill")
|
||||
.foregroundColor(.blue)
|
||||
} else {
|
||||
Image(systemName: "circle")
|
||||
.foregroundColor(.gray)
|
||||
}
|
||||
}
|
||||
.contentShape(Rectangle())
|
||||
.onTapGesture {
|
||||
selectedClimbType = climbType
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Section("Difficulty") {
|
||||
VStack(alignment: .leading, spacing: 12) {
|
||||
Text("Difficulty System")
|
||||
.font(.subheadline)
|
||||
.fontWeight(.medium)
|
||||
|
||||
ForEach(availableDifficultySystems, id: \.self) { system in
|
||||
HStack {
|
||||
Text(system.displayName)
|
||||
Spacer()
|
||||
if selectedDifficultySystem == system {
|
||||
Image(systemName: "checkmark.circle.fill")
|
||||
.foregroundColor(.blue)
|
||||
} else {
|
||||
Image(systemName: "circle")
|
||||
.foregroundColor(.gray)
|
||||
}
|
||||
}
|
||||
.contentShape(Rectangle())
|
||||
.onTapGesture {
|
||||
selectedDifficultySystem = system
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if selectedDifficultySystem == .custom {
|
||||
TextField("Grade (Required - numbers only)", text: $newProblemGrade)
|
||||
.keyboardType(.numberPad)
|
||||
.onChange(of: newProblemGrade) {
|
||||
// Filter out non-numeric characters
|
||||
newProblemGrade = newProblemGrade.filter { $0.isNumber }
|
||||
}
|
||||
} else {
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
Text("Grade (Required)")
|
||||
.font(.subheadline)
|
||||
.fontWeight(.medium)
|
||||
|
||||
ScrollView(.horizontal, showsIndicators: false) {
|
||||
LazyHStack(spacing: 8) {
|
||||
ForEach(availableGrades, id: \.self) { grade in
|
||||
Button(grade) {
|
||||
newProblemGrade = grade
|
||||
}
|
||||
.buttonStyle(.bordered)
|
||||
.controlSize(.small)
|
||||
.tint(newProblemGrade == grade ? .blue : .gray)
|
||||
}
|
||||
}
|
||||
.padding(.horizontal, 1)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ViewBuilder
|
||||
private func AttemptDetailsSection() -> some View {
|
||||
Section("Attempt Result") {
|
||||
ForEach(AttemptResult.allCases, id: \.self) { result in
|
||||
HStack {
|
||||
Text(result.displayName)
|
||||
Spacer()
|
||||
if selectedResult == result {
|
||||
Image(systemName: "checkmark.circle.fill")
|
||||
.foregroundColor(.blue)
|
||||
} else {
|
||||
Image(systemName: "circle")
|
||||
.foregroundColor(.gray)
|
||||
}
|
||||
}
|
||||
.contentShape(Rectangle())
|
||||
.onTapGesture {
|
||||
selectedResult = result
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Section("Additional Details") {
|
||||
TextField("Highest Hold (Optional)", text: $highestHold)
|
||||
|
||||
VStack(alignment: .leading, spacing: 8) {
|
||||
Text("Notes (Optional)")
|
||||
.font(.headline)
|
||||
|
||||
TextEditor(text: $notes)
|
||||
.frame(minHeight: 80)
|
||||
.padding(8)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: 8)
|
||||
.fill(.quaternary)
|
||||
)
|
||||
}
|
||||
|
||||
HStack {
|
||||
Text("Duration (seconds)")
|
||||
Spacer()
|
||||
TextField("0", value: $duration, format: .number)
|
||||
.keyboardType(.numberPad)
|
||||
.textFieldStyle(.roundedBorder)
|
||||
.frame(width: 80)
|
||||
}
|
||||
|
||||
HStack {
|
||||
Text("Rest Time (seconds)")
|
||||
Spacer()
|
||||
TextField("0", value: $restTime, format: .number)
|
||||
.keyboardType(.numberPad)
|
||||
.textFieldStyle(.roundedBorder)
|
||||
.frame(width: 80)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private var canSave: Bool {
|
||||
if showingCreateProblem {
|
||||
return !newProblemGrade.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
|
||||
} else {
|
||||
return selectedProblem != nil
|
||||
}
|
||||
}
|
||||
|
||||
private func setupInitialValues() {
|
||||
guard let gym = gym else { return }
|
||||
|
||||
// Auto-select climb type if there's only one available
|
||||
if gym.supportedClimbTypes.count == 1 {
|
||||
selectedClimbType = gym.supportedClimbTypes.first!
|
||||
}
|
||||
|
||||
updateDifficultySystem()
|
||||
}
|
||||
|
||||
private func updateDifficultySystem() {
|
||||
let available = availableDifficultySystems
|
||||
|
||||
if !available.contains(selectedDifficultySystem) {
|
||||
selectedDifficultySystem = available.first ?? .custom
|
||||
}
|
||||
|
||||
if available.count == 1 {
|
||||
selectedDifficultySystem = available.first!
|
||||
}
|
||||
}
|
||||
|
||||
private func resetGradeIfNeeded() {
|
||||
let availableGrades = selectedDifficultySystem.availableGrades
|
||||
if !availableGrades.isEmpty && !availableGrades.contains(newProblemGrade) {
|
||||
newProblemGrade = ""
|
||||
}
|
||||
}
|
||||
|
||||
private func updateAttempt() {
|
||||
guard selectedProblem != nil else { return }
|
||||
if showingCreateProblem {
|
||||
guard let gym = gym else { return }
|
||||
|
||||
let updatedAttempt = attempt.updated(
|
||||
problemId: selectedProblem?.id,
|
||||
result: selectedResult,
|
||||
highestHold: highestHold.isEmpty ? nil : highestHold,
|
||||
notes: notes.isEmpty ? nil : notes,
|
||||
duration: duration > 0 ? duration : nil,
|
||||
restTime: restTime > 0 ? restTime : nil
|
||||
)
|
||||
let difficulty = DifficultyGrade(
|
||||
system: selectedDifficultySystem, grade: newProblemGrade)
|
||||
|
||||
let newProblem = Problem(
|
||||
gymId: gym.id,
|
||||
name: newProblemName.isEmpty ? nil : newProblemName,
|
||||
climbType: selectedClimbType,
|
||||
difficulty: difficulty
|
||||
)
|
||||
|
||||
dataManager.addProblem(newProblem)
|
||||
|
||||
let updatedAttempt = attempt.updated(
|
||||
problemId: newProblem.id,
|
||||
result: selectedResult,
|
||||
highestHold: highestHold.isEmpty ? nil : highestHold,
|
||||
notes: notes.isEmpty ? nil : notes,
|
||||
duration: duration > 0 ? duration : nil,
|
||||
restTime: restTime > 0 ? restTime : nil
|
||||
)
|
||||
|
||||
dataManager.updateAttempt(updatedAttempt)
|
||||
} else {
|
||||
guard selectedProblem != nil else { return }
|
||||
|
||||
let updatedAttempt = attempt.updated(
|
||||
problemId: selectedProblem?.id,
|
||||
result: selectedResult,
|
||||
highestHold: highestHold.isEmpty ? nil : highestHold,
|
||||
notes: notes.isEmpty ? nil : notes,
|
||||
duration: duration > 0 ? duration : nil,
|
||||
restTime: restTime > 0 ? restTime : nil
|
||||
)
|
||||
|
||||
dataManager.updateAttempt(updatedAttempt)
|
||||
}
|
||||
|
||||
dataManager.updateAttempt(updatedAttempt)
|
||||
dismiss()
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user