Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace ORKOrderedTaskView with new ResearchKit one #23

Merged
merged 5 commits into from
Feb 24, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Reuse new views
Supereg committed Feb 24, 2024
commit 25d4e48cd76bf170fb42b1afc9744a45d4c4991e
7 changes: 4 additions & 3 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -22,8 +22,8 @@ let package = Package(
dependencies: [
.package(url: "https://github.com/StanfordSpezi/Spezi", from: "1.0.0"),
.package(url: "https://github.com/apple/FHIRModels", .upToNextMinor(from: "0.5.0")),
.package(url: "https://github.com/StanfordBDHG/ResearchKit", from: "2.2.21"),
.package(url: "https://github.com/StanfordBDHG/ResearchKitOnFHIR", from: "1.0.0")
.package(url: "https://github.com/StanfordBDHG/ResearchKit", branch: "feature/swiftui-support"),
.package(url: "https://github.com/StanfordBDHG/ResearchKitOnFHIR", branch: "fix/bump-version")
],
targets: [
.target(
@@ -33,7 +33,8 @@ let package = Package(
.product(name: "ModelsR4", package: "FHIRModels"),
.product(name: "ResearchKitOnFHIR", package: "ResearchKitOnFHIR"),
.product(name: "FHIRQuestionnaires", package: "ResearchKitOnFHIR"),
.product(name: "ResearchKit", package: "ResearchKit")
.product(name: "ResearchKit", package: "ResearchKit"),
.product(name: "ResearchKitSwiftUI", package: "ResearchKit")
]
),
.testTarget(
89 changes: 0 additions & 89 deletions Sources/SpeziQuestionnaire/ORKOrderedTaskView.swift

This file was deleted.

26 changes: 20 additions & 6 deletions Sources/SpeziQuestionnaire/QuestionnaireView.swift
Original file line number Diff line number Diff line change
@@ -11,6 +11,7 @@ import ModelsR4
import OSLog
import ResearchKit
import ResearchKitOnFHIR
import ResearchKitSwiftUI
import SwiftUI


@@ -45,11 +46,7 @@ public struct QuestionnaireView: View {

public var body: some View {
if let task = createTask(questionnaire: questionnaire) {
ORKOrderedTaskView(
tasks: task,
result: questionnaireResult,
tintColor: .accentColor
)
ORKOrderedTaskView(tasks: task, tintColor: .accentColor, result: handleResult)
.ignoresSafeArea(.container, edges: .bottom)
.ignoresSafeArea(.keyboard, edges: .bottom)
.interactiveDismissDisabled()
@@ -72,7 +69,24 @@ public struct QuestionnaireView: View {
self.completionStepMessage = completionStepMessage
self.questionnaireResult = questionnaireResult
}


private func handleResult(_ result: TaskResult) async {
let questionnaireResult: QuestionnaireResult
switch result {
case let .completed(result):
let fhirResponse = result.fhirResponse
fhirResponse.subject = Reference(reference: FHIRPrimitive(FHIRString("My Patient")))
Supereg marked this conversation as resolved.
Show resolved Hide resolved

questionnaireResult = .completed(result.fhirResponse)
case .cancelled:
questionnaireResult = .cancelled
case .failed:
questionnaireResult = .failed
}

await self.questionnaireResult(questionnaireResult)
}


/// Creates a ResearchKit navigable task from a questionnaire
/// - Parameter questionnaire: a questionnaire