124 Commits

Author SHA1 Message Date
srinathtm-apple b50b759c7e RK 2.1 updates (#1384) 2020-06-24 14:20:11 -07:00
Erik Hornberger 2dc3cfb109 ResearchKit 2.1 Update 2019-11-22 16:40:08 -08:00
Akshay Yadav 7b6dae062c ResearchKit 2.1 Beta 2019-06-04 13:45:18 -07:00
srinathtm-apple 01cc7ed79d Project updates (#1264)
* overall updates to ResearchKit, new textChoiceOtherAnswerFormat, unit tests and more..
2019-04-15 14:42:02 -07:00
srinathtm-apple dbb525a469 Merge pull request #1188 from CareEvolution/field-content-types
Add support for textContentType from UITextInputTraits to ORKAnswerFormat
2018-11-08 13:32:51 -08:00
Brian Ganninger a3b6732406 Remove spurious initializer change; silence surfaced serialization failure properly (PR feedback) 2018-10-16 23:35:58 -07:00
Eric DeLabar d2fade561b Add support for textContentType from UITextInputTraits
* Add support for passwordFormat to support automatic secure passwords
2018-10-16 09:45:43 -04:00
Brian Ganninger ab6600eaf2 Pre-PR cleanup 2018-10-13 18:12:31 -07:00
Brian Ganninger 815f5bf60a Ignore shoulder range of motion step for now as it fails deserialization (issue #1151) 2018-10-13 13:43:28 -07:00
Brian Ganninger 340c5abdc0 Minor cleanup 2018-10-09 02:49:16 -07:00
Brian Ganninger 0c121f283b Properly init test data for clinical recorder configuration (issue #1151) 2018-10-08 20:53:50 -07:00
Brian Ganninger b6028a9eef Update known exceptions for serialization checking (issue #1151) 2018-10-08 18:09:32 -07:00
Brian Ganninger fcad24f94b Update known exceptions for serialization checking (issue #1151) 2018-10-07 23:31:05 -07:00
Brian Ganninger 211aa5a118 Fix serialization equality test failures (issue #1151) 2018-10-07 22:43:19 -07:00
Brian Ganninger 53842c3231 Fix addResult test failures (issue #1151) 2018-10-07 18:38:05 -07:00
Brian Ganninger b6ab7414fd Fix comment misspelling 2018-10-07 12:53:42 -07:00
Brian Ganninger e56ac6b2e9 Fix test failure by marking phone number related properties not serialized (issue #1151) 2018-10-07 12:52:08 -07:00
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
Akshay 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 Khan 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 Khan 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 Khan 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