ch/HealthImport
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Create goal type

Browse Source
This commit is contained in:
Christoph Hagen 2024-01-31 11:03:10 +01:00
parent ac96e6d4a5
commit 5daf92c5bb
5 changed files with 54 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HealthImport.xcodeproj/project.pbxproj
View File

@ -41,6 +41,7 @@
E201EC7B2B6275CA005B83D3 /* Metadata.swift in Sources */ = {isa = PBXBuildFile; fileRef = E201EC7A2B6275CA005B83D3 /* Metadata.swift */; };
E201EC7D2B62930E005B83D3 /* Sample+SQLite.swift in Sources */ = {isa = PBXBuildFile; fileRef = E201EC7C2B62930E005B83D3 /* Sample+SQLite.swift */; };
E201EC7F2B629B4C005B83D3 /* SampleListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E201EC7E2B629B4C005B83D3 /* SampleListView.swift */; };
E201EC812B631708005B83D3 /* Goal.swift in Sources */ = {isa = PBXBuildFile; fileRef = E201EC802B631708005B83D3 /* Goal.swift */; };
E27BC67A2B5D99AC003A8873 /* LocationSample.swift in Sources */ = {isa = PBXBuildFile; fileRef = E27BC6792B5D99AC003A8873 /* LocationSample.swift */; };
E27BC67E2B5E6CE3003A8873 /* Sequence+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = E27BC67D2B5E6CE3003A8873 /* Sequence+Extensions.swift */; };
E27BC6802B5E74D7003A8873 /* LocationSampleListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E27BC67F2B5E74D7003A8873 /* LocationSampleListView.swift */; };
@ -90,6 +91,7 @@
E201EC7A2B6275CA005B83D3 /* Metadata.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Metadata.swift; sourceTree = "<group>"; };
E201EC7C2B62930E005B83D3 /* Sample+SQLite.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Sample+SQLite.swift"; sourceTree = "<group>"; };
E201EC7E2B629B4C005B83D3 /* SampleListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SampleListView.swift; sourceTree = "<group>"; };
E201EC802B631708005B83D3 /* Goal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Goal.swift; sourceTree = "<group>"; };
E27BC6792B5D99AC003A8873 /* LocationSample.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationSample.swift; sourceTree = "<group>"; };
E27BC67D2B5E6CE3003A8873 /* Sequence+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Sequence+Extensions.swift"; sourceTree = "<group>"; };
E27BC67F2B5E74D7003A8873 /* LocationSampleListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationSampleListView.swift; sourceTree = "<group>"; };
@ -194,6 +196,7 @@
885002812B5C37B700E7D4DB /* Model */ = {
isa = PBXGroup;
children = (
E201EC802B631708005B83D3 /* Goal.swift */,
E27BC6792B5D99AC003A8873 /* LocationSample.swift */,
E201EC7A2B6275CA005B83D3 /* Metadata.swift */,
E201EC762B626FC1005B83D3 /* MetadataKey.swift */,

46
HealthImport/Model/Goal.swift Normal file
View File

@ -0,0 +1,46 @@
import Foundation
enum Goal {
case time(TimeInterval)
init?(goalType: Int?, goal: Double?) {
switch goalType {
case .none:
return nil
case 0:
return nil
case 2:
guard let goal else {
print("Time goal, but no goal value set")
return nil
}
self = .time(goal)
default:
return nil
}
}
var gaol: Double {
switch self {
case .time(let timeInterval):
return timeInterval
}
}
var goalType: Int {
switch self {
case .time: return 2
}
}
}
extension Goal: CustomStringConvertible {
var description: String {
switch self {
case .time(let seconds):
return seconds.durationString
}
}
}

5
HealthImport/Model/Workout+SQLite.swift
View File

@ -64,9 +64,8 @@ extension Workout {
private static func insert(_ element: Workout, in database: Database) throws {
let rowid = try database.run(table.insert(
columnTotalDistance <- element.totalDistance,
columnGoalType <- element.goalType,
columnGoalType <- element.goalType,
columnGoal <- element.goal,
columnGoalType <- element.goal?.goalType,
columnGoal <- element.goal?.gaol,
columnCondenserVersion <- element.condenserVersion,
columnCondenserDate <- element.condenserDate?.timeIntervalSinceReferenceDate)
)

9
HealthImport/Model/Workout.swift
View File

@ -16,10 +16,8 @@ struct Workout {
/// The distance in km (?)
let totalDistance: Double?
let goalType: Int?
let goal: Double?
let goal: Goal?
let condenserVersion: Int?
let condenserDate: Date?
@ -56,8 +54,7 @@ struct Workout {
init(id: Int, totalDistance: Double? = nil, goalType: Int? = nil, goal: Double? = nil, condenserVersion: Int? = nil, condenserDate: Date? = nil, events: [WorkoutEvent] = [], activities: [WorkoutActivity] = [], metadata: [Metadata.Key : Metadata.Value] = [:]) {
self.id = id
self.totalDistance = totalDistance
self.goalType = goalType
self.goal = goal
self.goal = .init(goalType: goalType, goal: goal)
self.condenserVersion = condenserVersion
self.condenserDate = condenserDate
self.events = events

1
HealthImport/WorkoutDetailView.swift
View File

@ -13,7 +13,6 @@ struct WorkoutDetailView: View {
Section("Info") {
DetailRow("ID", value: workout.id)
DetailRow("Total Distance", kilometer: workout.totalDistance)
DetailRow("Goal Type", value: workout.goalType)
DetailRow("Goal", value: workout.goal)
DetailRow("Condenser Version", value: workout.condenserVersion)
DetailRow("Condenser Date", date: workout.condenserDate)