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.

Sign up for GitHub

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

Jump to bottom

Add 'both' in random order to RangeOfMotion tasks #1403

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

Add 'both' in random order to RangeOfMotion tasks #1403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
3becf7b
Merge pull request #8 from ResearchKit/master
davwillev Mar 18, 2020
06c9124
Merge pull request #13 from ResearchKit/master
davwillev Aug 13, 2020
fd37608
Add both limb (random) functionality to knee RoM task
davwillev Aug 13, 2020
dc571f7
Update to reflect RoM option for both limbs
davwillev Aug 13, 2020
ddc60ed
Add ORKPredefinedTaskLimbOptionBoth to valid parameters
davwillev Aug 13, 2020
b6ff2b8
Change RoM settings to 'both'
davwillev Aug 13, 2020
c53e962
Make RoM strings consistent with Tapping task
davwillev Aug 13, 2020
4055b25
Add instructions for knee first and second
davwillev Aug 14, 2020
2cb3f48
Add instructions for knee first and second
davwillev Aug 14, 2020
e3504e4
Update first and second RoM instructions
davwillev Aug 14, 2020
54eba1d
Update shoulder RoM with first & second instructions
davwillev Aug 14, 2020
2b2122a
Update RoM wording
davwillev Aug 14, 2020
de598ac
Final updated knee RoM task
davwillev Aug 14, 2020
3341fc4
Update shoulder RoM instructions
davwillev Aug 14, 2020
10fb8af
Add updated shoulder RoM factory
davwillev Aug 14, 2020
d41c368
Update shoulder RoM instructions
davwillev Aug 14, 2020
ed9a8b8
Remove unnecessary constants
davwillev Aug 14, 2020
3a8e9d8
Add whitespace
davwillev Aug 14, 2020
bedc83d
Move curly braces
davwillev Aug 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ResearchKit/ActiveTasks/ORKRangeOfMotionStep.m
View file
Open in desktop
Expand Up @@ -57,7 +57,7 @@ - (instancetype)initWithIdentifier:(NSString *)identifier limbOption:(ORKPredefi
- (void)validateParameters {
[super validateParameters];

if (self.limbOption != ORKPredefinedTaskLimbOptionLeft && self.limbOption != ORKPredefinedTaskLimbOptionRight) {
if (self.limbOption != ORKPredefinedTaskLimbOptionLeft && self.limbOption != ORKPredefinedTaskLimbOptionRight && self.limbOption != ORKPredefinedTaskLimbOptionBoth) {
@throw [NSException exceptionWithName:NSInvalidArgumentException
reason:ORKLocalizedString(@"LIMB_OPTION_LEFT_OR_RIGHT_ERROR", nil)
userInfo:nil];
Expand Down
4 changes: 2 additions & 2 deletions ResearchKit/Common/ORKOrderedTask+ORKPredefinedActiveTask.h
View file
Open in desktop
Expand Up @@ -193,7 +193,7 @@ NS_ASSUME_NONNULL_BEGIN


/**
The knee range of motion task returns a task that measures the range of motion for either a left or right knee.
The knee range of motion task returns a task that measures the range of motion for either a left or right knee, or both.

@param identifier The task identifier to use for this task, appropriate to the study.
@param limbOption Which knee is being measured.
Expand All @@ -207,7 +207,7 @@ NS_ASSUME_NONNULL_BEGIN


/**
The shoulder range of motion task returns a task that measures the range of motion for either a left or right shoulder.
The shoulder range of motion task returns a task that measures the range of motion for either a left or right shoulder, or both.

@param identifier The task identifier to use for this task, appropriate to the study.
@param limbOption Which shoulder is being measured.
Expand Down