GitHub/ResearchKit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,032 Commits 5 Branches 28 Tags
e9059ee42cfaf8a609da2bcd7b3464dcbb457de4
Commit Graph
107 Commits
Author SHA1 Message Date
Ricardo Sanchez-Saez d43c1168e5 Merge branch 'master' of github.com:ResearchKit/ResearchKit into ninoguba/weight_answer_format 
# Conflicts:
#	ResearchKit.xcodeproj/project.pbxproj
 2017-12-06 01:01:30 -08:00
Shannon Young 80720c1281 Fixes to classes introduces since last March that fail unit tests. 2017-12-04 12:36:46 -08:00
Shannon Young e10bb71e03 Merge branch 'master' into pr/split-ORKResult 
# Conflicts:
#	ResearchKit/Common/ORKResult.h
#	ResearchKit/Common/ORKResult.m
 2017-12-01 15:37:19 -08:00
Ricardo Sanchez-Saez f10573e71b Merge branch 'master' of github.com:ResearchKit/ResearchKit into ninoguba/weight_answer_format 2017-11-20 21:32:00 -08:00
Ricardo Sanchez-Saez 86beb05399 [ORKNumericAnswerFormat] Rename ‘scale’ to ‘maximumFractionDigits’ and fix serialization tests 2017-11-15 23:47:52 -08:00
Nino Guba 9a635b7227 Added ORKWeightAnswerFormat 2017-09-05 14:50:24 -07:00
Shannon Young 75d8e0d167 Merge branch 'master' into pr/split-ORKResult 
# Conflicts:
#	ResearchKit.xcodeproj/project.pbxproj
#	ResearchKit/Common/ORKResult.h
#	ResearchKit/Common/ORKResult.m
 2017-09-05 10:08:37 -07:00
AkshayandAkshay e52e22e8f5 Convergence 2017-07-06 15:48:38 -07:00
Akshay e6e4698306 Convergence 2017-06-07 10:10:19 -07:00
Ricardo Sanchez-Saez 3697e01b6f [ORKTest] Fix serialization tests 2017-04-06 02:15:26 -07:00
Shannon Young 2058936108 Fix equality for ORKLocation 2017-03-31 17:00:16 -07:00
Shannon Young 5be15107b3 Merge branch 'master' into pr/split-ORKResult 
# Conflicts:
#	ResearchKit.xcodeproj/project.pbxproj
#	ResearchKit/Common/ORKResult.h
#	ResearchKit/Common/ORKResult.m
#	ResearchKit/Common/ORKResult_Private.h
 2017-03-31 12:41:29 -07:00
Shannon Young e9e165e10d Remove unused private ORKDataResult subclass. 2017-03-21 13:34:50 -07:00
Ricardo Sanchez-Saez 8e3aaa4246 [ORKJSONSerializationTests] Simplify property initialization by generalizing usage of the orktest_init helper 2017-03-19 18:30:21 -07:00
Ricardo Sanchez-Saez f03084534d [ORKESerialization] Fix ORKTextAnswerFormat tests 
Adds NSRegularExpression serialization/deserialization. Note that the tests are ignoring the 'validationRegularExpression' for the hash test becuase it's purposefully not included there.

Also, slight fix to the CLCircularRegion serialization (a nil CLCircularRegion must be serialized into an empty dict, not into a nil object). Otherwise it'll crash if you try to add nil to the parent serialization dictionary.
 2017-03-19 17:56:30 -07:00
Ricardo Sanchez-Saez 945d5e9f25 Merge branch 'master' of github.com:ResearchKit/ResearchKit into nsregularexpression-options 
# Conflicts:
#	ResearchKit/Common/ORKAnswerFormat.m
#	Testing/ORKTest/ORKTestTests/ORKJSONSerializationTests.m
 2017-03-19 15:15:17 -07:00
Umer KhanandGitHub d3dd1934c6 Merge pull request #901 from Sage-Bionetworks/pr/open-navigation-rule 
Allow interhitance of navigation rules outside ResearchKit
 2017-03-14 13:53:22 -07:00
Umer KhanandGitHub 161001357d Merge pull request #902 from Sage-Bionetworks/pr/add-result-to-stepViewController 
Add method to ORKStepViewController to allow adding a result
 2017-03-14 12:04:13 -07:00
Shannon Young 0a8165ca35 Fix tests for ORKVideoCaptureStep 2017-03-03 00:54:22 -08:00
Shannon Young a2a6fef6aa Added test for checking the hash to equality tests. 2017-01-30 14:04:39 -08:00
Shannon Young 2986d85f58 Added equality testing for primitive double, int and bool properties 
This adds equality checking for primitive types for the double, int and bool properties.

Note: this *only* checks equality and does not test these properties for encoding, though I have also fixed the encoding for those classes that failed the equality tests.
 2017-01-30 13:10:16 -08:00
Shannon Young a70323b73a Add method to ORKStepViewController to allow adding a result 
Add a result to the step view controller's `ORKStepResult`. By default, the property for the step view controller's result will instantiate a copy of the result each time it is called. Therefore, the result cannot be mutated by adding a result to it's result array.

This method can be called by a delegate to add a result to a given step in a way that will be retained by the step, but will allow both the step and the ORKResult to be immutable when passed to the task view controller.

We have been finding that many of the researchers and developers we work with assume that this is possible and then become frustrated and confused when it doesn’t work.
 2017-01-27 16:05:55 -08:00
Shannon Young 3d5dfec624 Allow interhitance of navigation rules outside ResearchKit 
This will still throw an exception if the developer attempts to initialize an instance of the base class without inheriting it but allows developers to create navigation rules that inherit directly from the base class.
 2017-01-26 11:40:59 -08:00
Umer KhanandGitHub c024cbd503 Merge pull request #758 from Sage-Bionetworks/pr/ui-add-ORKPageStepViewController 
Add ORKPageStep and ORKPageStepViewController
 2017-01-24 13:49:10 -08:00
Shannon Young 4ad73b30e4 Fix serialization tests 2016-12-14 14:54:13 -08:00
Shannon Young f885de099b Merge branch 'master' into pr/ui-add-ORKPageStepViewController 
# Conflicts:
#	Testing/ORKTest/ORKTest/MainViewController.m
 2016-12-14 14:46:40 -08:00
Shannon Young f50bfc7ff6 Fix serialization tests 2016-12-14 14:28:59 -08:00
Shannon Young 449b4c056f Merge branch 'master' into pr/ui-step-header-image 2016-12-14 11:06:59 -08:00
Shannon Young 2508623efa Added property to instruction set to allow setting icon image on header view. 
This allows an instruction step to display an icon image *above* the title and text for the image.
 2016-12-08 14:58:24 -08:00
Ricardo Sanchez-Saez cb4e06a4c9 [ORKESerialization] Fix CLCircularRegion unit tests 2016-11-08 00:53:22 -08:00
Shannon Young b08a2a8627 Merge branch 'master' into pr/ui-add-ORKPageStepViewController 
# Conflicts:
#	Testing/ORKTest/ORKTestTests/ORKJSONSerializationTests.m
 2016-09-28 13:21:13 -07:00
Yuan Zhu ead0650dfb Convergence 2016-09-26 22:23:17 -07:00
Shannon Young 1e3b3f24fa Merge remote-tracking branch 'origin/master' into pr/ui-add-ORKPageStepViewController 
# Conflicts:
#	Testing/ORKTest/ORKTest/MainViewController.m
 2016-08-26 11:25:40 -07:00
Shannon Young 396b9c8e13 Clean up and clearly differentiate between ORKPageStep and ORKNavigablePageStep 2016-08-18 22:37:44 -07:00
Shannon Young 937e615377 Hide the implementation detail of using a pageTask from the base class of ORKPageStep 2016-08-18 18:58:50 -07:00
Shannon Young f86668e8cb Merge branch 'master' into pr/add-module-hand-tremor 2016-08-16 12:46:10 -07:00
Ricardo Sánchez-Sáez b9bcd6713c Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-CodeHomogenization2 
# Conflicts:
#	ResearchKit.xcodeproj/project.pbxproj
#	ResearchKit/ActiveTasks/ORKCountdownStep.h
#	ResearchKit/Charts/ORKDiscreteGraphChartView.m
#	ResearchKit/Charts/ORKGraphChartView.m
#	ResearchKit/Charts/ORKGraphChartView_Internal.h
#	ResearchKit/Charts/ORKLineGraphChartView.m
#	ResearchKit/Charts/ORKPieChartLegendView.m
#	ResearchKit/Charts/ORKPieChartView.m
#	ResearchKit/Charts/ORKRangedPoint.h
#	ResearchKit/Charts/ORKRangedPoint.m
#	ResearchKit/Common/ORKAnswerFormat.h
#	ResearchKit/Common/ORKAnswerFormat_Internal.h
#	ResearchKit/Common/ORKAnswerTextView.m
#	ResearchKit/Common/ORKCompletionStep.h
#	ResearchKit/Common/ORKFormStep.m
#	ResearchKit/Common/ORKHeightPicker.h
#	ResearchKit/Common/ORKInstructionStep.h
#	ResearchKit/Common/ORKNavigableOrderedTask.m
#	ResearchKit/Common/ORKOrderedTask.m
#	ResearchKit/Common/ORKPasscodeStepViewController.m
#	ResearchKit/Common/ORKSignatureStepViewController.h
#	ResearchKit/Common/ORKSignatureStepViewController.m
#	ResearchKit/Common/ORKStepViewController.h
#	ResearchKit/Common/ORKTextButton.h
#	ResearchKit/Common/ORKTextFieldView.m
#	ResearchKit/Common/ORKTypes.h
#	ResearchKit/Consent/ORKConsentReviewStepViewController.m
#	ResearchKit/ResearchKit.h
#	ResearchKit/ResearchKit_Private.h
#	ResearchKitTests/ORKAnswerFormatTests.m
#	Testing/ORKTest/ORKTest/Charts/Charts.storyboard
#	Testing/ORKTest/ORKTest/DragonPokerStep.m
 2016-07-25 21:52:13 +01:00
Shannon Young 3f2cb32b23 Merge branch 'master' into pr/add-module-hand-tremor 
# Conflicts:
#	ResearchKit/Common/ORKOrderedTask.m
#	ResearchKit/Common/ORKSkin.m
 2016-07-11 14:56:27 -07:00
Ricardo Sánchez-Sáez 3bd27d6ebe Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-CodeHomogenization 
# Conflicts:
#	ResearchKit/Common/ORKAnswerFormat.m
#	ResearchKit/Common/ORKAnswerFormat_Internal.h
#	ResearchKit/Common/ORKDefines.h
#	ResearchKit/Common/ORKHealthAnswerFormat.m
#	ResearchKit/Common/ORKHelpers.h
#	ResearchKit/Common/ORKQuestionStepViewController.m
 2016-07-09 19:42:16 +02:00
Ricardo Sánchez-Sáez cfe04441ad Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-CodeHomogenization 
# Conflicts:
#	ResearchKit.xcodeproj/project.pbxproj
#	ResearchKit/ActiveTasks/ORKHealthQuantityTypeRecorder.m
#	ResearchKit/Charts/ORKGraphChartView.m
#	ResearchKit/Charts/ORKRangedPoint.m
#	ResearchKit/Common/ORKHealthAnswerFormat.m
#	ResearchKit/Common/ORKNavigableOrderedTask.m
#	ResearchKit/Common/ORKOrderedTask.m
#	ResearchKit/Common/ORKPasscodeStepViewController.m
#	ResearchKit/Common/ORKSurveyAnswerCellForText.m
#	ResearchKit/Common/ORKTextButton.h
#	ResearchKit/Common/ORKTextFieldView.m
#	Testing/ORKTest/ORKTestTests/ORKJSONSerializationTests.m
 2016-07-08 15:05:24 +02:00
Ricardo Sánchez-Sáez f659531d77 Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-ORKHeightAnswerFormat 
# Conflicts:
#	ResearchKit/Common/ORKHealthAnswerFormat.m
#	ResearchKit/Localized/en.lproj/ResearchKit.strings
 2016-07-07 17:50:54 +02:00
Shannon Young 9fb7562ce5 Add an auxillary image to the instruction view. 
This is used in the tremor module to show a second image.
 2016-07-06 16:46:01 -07:00
Shannon Young a5b58c4c8e Add signaturePath to list of knownNotSerializedProperties 2016-07-06 16:23:31 -07:00
Shannon Young f7345070a9 Add public ORKSignatureStep 
Change the consent signature view controller to a step view controller that is instantiated using an ORKSignatureStep and outputs an ORKSignatureResult. This will allow for customization of the consent process and use of the signature gathering step in other task work flows.
 2016-07-05 17:36:42 -07:00
Ricardo Sánchez-Sáez 6ad71820d8 Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-ORKHealthKitCharacteristicTypeAnswerFormat 
# Conflicts:
#	Testing/ORKTest/ORKTestTests/ORKJSONSerializationTests.m
 2016-06-29 20:22:23 +01:00
Ricardo Sánchez-Sáez 275cc3ae17 [ORKJSONSerializationTests] Remove unneeded whitespace 2016-06-29 20:18:57 +01:00
Ricardo Sánchez-Sáez 42c12ca73f [ORKHeightAnswerFormat] Replace 'BOOL useMetricSystem' by 'ORKMeasurementSystem measurementSystem' 
Valid values are:
- ORKMeasurementSystemLocal
- ORKMeasurementSystemMetric
- ORKMeasurementSystemUSC
 2016-03-30 00:56:12 +01:00
Ricardo Sánchez-Sáez f7d1591c19 [Misc] Change all framework #imports to @import 
Also:
- Change some #imports to directly refer headers instead of going though the framework header because it enables it be included as a module through Cocoapods.
- Improve unit test encapsulation by making some classes (recorders) and methods available in the private header
 2016-03-28 20:06:58 +01:00
Ricardo Sánchez-Sáez ea0fb64319 [ORKHealthKitCharacteristicTypeAnswerFormat] Expose 'defaultDate', 'minimumDate', 'maximumDate' and 'calendar' 
Used to customize the presented date picker, only applicable to the 'HKCharacteristicTypeIdentifierDateOfBirth' characteristic type.
 2016-03-21 18:50:27 +00:00
Ricardo Sánchez-Sáez cdaa4d4c91 [Misc] Make sure +(instancetype)new is NS_UNAVAILABLE when init is so. 
Also, throw exception on unavailable methods where appropriate. Make sure ORKTest unit tests continue to pass.
 2016-03-16 15:55:09 +00:00