GitHub/ResearchKit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,900 Commits 5 Branches 28 Tags
5bdd973315fb75e2d3b6f74bfbb5f0133db164ff
Commit Graph
54 Commits
Author SHA1 Message Date
Yuan Zhu 5bdd973315 Fix unit tests. 2015-12-16 10:30:09 -08:00
Yuan Zhu ca11a8def0 Merge branch 'master' of github.com:ResearchKit/ResearchKit into master_location_question_enhancement 
Conflicts:
	ResearchKit.xcodeproj/project.pbxproj
 2015-11-02 17:42:22 -08:00
Yuan Zhu f738f18570 Update to PR to improve UI experience. 2015-10-30 12:43:31 -07:00
Yuan Zhu 4ca0197532 Switch ORKLocationResult's answer from ORKPlacemark to ORKLocation 
Create location questions task in ORKTest
 2015-10-27 13:07:24 -07:00
Umer Khan 99bdc3cbbc Merging upstream/master 2015-10-26 15:38:23 -07:00
Brandon McQuilkin 1f26d5c5a1 Merge branch 'master' of https://github.com/ResearchKit/ResearchKit into LocationQuestion 
Conflicts:
	ResearchKit/Common/ORKResult.m
 2015-10-22 12:16:54 -04:00
Ricardo Sánchez-Sáez 96e94155d7 ORKTest: fix serialization tests 2015-10-19 01:49:15 +01:00
Ricardo Sánchez-Sáez 0471bf61d4 Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-NavigableOrderedTask 
# Conflicts:
#	Testing/ORKTest/ORKTest/MainViewController.m
 2015-10-18 20:24:10 +01:00
Umer Khan 696758bdc2 Added more validation checks. 2015-10-16 18:26:05 -07:00
Umer Khan f47f9d824c Updates 2015-10-16 16:23:13 -07:00
Umer Khan 17b7d7d4f9 Merge remote-tracking branch 'upstream/master' into account 2015-10-16 10:47:20 -07:00
Umer Khan 9347ef6573 Updated serialization. 2015-10-15 18:03:49 -07:00
Brandon McQuilkin f9924ddbc0 Removed debug log from tests. 2015-10-15 08:44:24 -04:00
Yuan Zhu b8d2c6bf86 Address review feedback 2015-10-14 17:33:42 -07:00
Brandon McQuilkin 06eecb054c Updated serialization and unit tests of ORKPlacemark. 
- Added ORKPlacemark to public header.
- Added NSSecureCoding, NSCopying, isEqual: to ORKPlacemark
- Finished replacing MKPlacemark to ORKPlacemark
- Updated ORKTestTests
 2015-10-14 14:53:50 -04:00
Ricardo Sánchez-Sáez f8a94a0f66 ORKTest: update unit tests 2015-10-10 16:47:48 +01:00
Brandon McQuilkin cf917dc208 Added serialization tests for location step and result. 2015-10-08 11:12:13 -04:00
Yuan Zhu 63b8bea246 Enhance the test for ORKESerialization to catch unregistered classes. 
Also add the missing class registrations.
 2015-09-29 18:01:23 -07:00
Ricardo Sánchez-Sáez 5445b67b41 Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-constraints 
# Conflicts:
#	ResearchKit/Common/ORKScaleSlider.m
#	ResearchKit/Common/ORKScaleSliderView.m
 2015-09-06 22:28:08 +01:00
Ricardo Sánchez-Sáez 2a76ff2a2e Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-constraints 
# Conflicts:
#	ResearchKit/ActiveTasks/ORKTappingContentView.m
#	ResearchKit/ActiveTasks/ORKToneAudiometryContentView.m
#	ResearchKit/ActiveTasks/ORKTowerOfHanoiTowerView.m
#	ResearchKit/Common/ORKFormItemCell.m
#	ResearchKit/Common/ORKHelpers.m
#	ResearchKit/Common/ORKScaleSliderView.m
#	ResearchKit/Common/ORKSkin.h
#	ResearchKit/Common/ORKSkin.m
#	ResearchKit/Common/ORKVerticalContainerView.m
#	ResearchKit/Consent/ORKConsentReviewController.m
#	ResearchKit/Consent/ORKConsentSignatureController.m
#	ResearchKit/Consent/ORKSignatureView.m
#	Testing/ORKTest/ORKTest/MainViewController.m
 2015-09-04 18:38:40 +01:00
Umer Khan 3b3ec14acd Merge master 2015-09-03 23:35:26 -07:00
Yuan Zhu dc6bb27f57 Merge pull request #416 from rsanchezsaez/rsanchezsaez-FormPredicates 
Result predicates: add support for form item results and nil results
 2015-09-02 17:12:43 -07:00
Yuan Zhu 2338e097c4 Use dot access 2015-09-02 10:57:48 -07:00
Ricardo SaÃÅnchez-SaÃÅezandRicardo Sánchez-Sáez 074a00e2ae ORKResultPredicate: refactor 'ORKResultIdentifier' class by renaming it to 'ORKResultSelector' 
Also:
- Improve documentation.
- Update ORKTest example and unit tests.
 2015-09-01 22:34:21 +01:00
Ricardo SaÃÅnchez-SaÃÅezandRicardo Sánchez-Sáez ceec6adf1a ORKResultPredicate: greatly simplified API by introducing the 'ORKResultIdentifier' wrapper class 
Also:
- Update tests.
- Update 'Navigable ordered task' example.
 2015-09-01 00:56:22 +01:00
Ricardo Sánchez-Sáez 25612dc872 Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-constraints 
# Conflicts:
#	ResearchKit/ActiveTasks/ORKFitnessContentView.m
#	ResearchKit/ActiveTasks/ORKTappingContentView.m
#	ResearchKit/ActiveTasks/ORKToneAudiometryContentView.m
#	ResearchKit/ActiveTasks/ORKTowerOfHanoiTowerView.m
#	ResearchKit/ActiveTasks/ORKWalkingTaskStepViewController.m
#	ResearchKit/Common/ORKContinueButton.m
#	ResearchKit/Common/ORKFormItemCell.m
#	ResearchKit/Common/ORKFormStepViewController.m
#	ResearchKit/Common/ORKHeadlineLabel.m
#	ResearchKit/Common/ORKImageCaptureStepViewController.m
#	ResearchKit/Common/ORKImageCaptureView.m
#	ResearchKit/Common/ORKInstructionStepView.m
#	ResearchKit/Common/ORKQuestionStepViewController.m
#	ResearchKit/Common/ORKResult.m
#	ResearchKit/Common/ORKSkin.m
#	ResearchKit/Common/ORKStepHeaderView.m
#	ResearchKit/Common/ORKSubheadlineLabel.m
#	ResearchKit/Common/ORKVerticalContainerView.m
#	ResearchKit/Common/ORKVerticalContainerView_Internal.h
#	ResearchKit/Consent/ORKConsentSignatureController.m
#	ResearchKit/Consent/ORKVisualConsentStepViewController.m
#	Testing/ORKTest/ORKTest/DynamicTask.m
 2015-08-26 00:41:48 +01:00
Umer Khan 407a3da80e Added serialization and secure coding tests, with some minor fixes. 2015-08-24 11:57:54 -07:00
Ricardo Sánchez-Sáez 43e4ae11b2 Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-constraints 
# Conflicts:
#	ResearchKit/ActiveTasks/ORKWalkingTaskStepViewController.m
#	ResearchKit/Common/ORKScaleSliderView.m
#	Testing/ORKTest/ORKTest/CustomRecorder.m
 2015-08-18 22:34:31 +01:00
Yuan Zhu 6064dc8253 Merge branch 'master' into ios9 
Conflicts:
	samples/ORKCatalog/ORKCatalog/ResultTableViewProviders.swift
 2015-08-14 13:35:09 -07:00
Umer Khan 5dd9e4ae24 Updated serialization and secure coding code. 2015-08-05 14:16:37 -07:00
Ricardo Sánchez-Sáez 27c084707e Refactor 'length' method syntax to property syntax 2015-08-04 14:03:50 +02:00
John Earl 6ee6c36483 Support for iOS 9, Xcode 7, and Swift 2. 2015-06-08 18:11:07 -07:00
jwe-apple 955f1bede9 Merge pull request #205 from brucehappy/issue_186 
Exclusive Text Choices - Issue #186
 2015-06-03 18:31:54 -07:00
John Earl fbe97c7c53 Fix tests and rename Device Motion Reaction Time to Reaction Time 
Makes all tests pass in both ORKTest and ResearchKit.
Fixes test failures introduced in #252.

Also fixes #257, renaming to ORKReactionTime...
 2015-06-02 18:57:46 -07:00
Bruce Duncan 6c4aafb174 Added copyright to ORKAnswerFormat. Removed convenience initializer for ORKTextChoice and changed the one instance of code using it, per @jwe-apple request. 2015-05-21 18:03:32 -04:00
John Earl 5cd1562f6f UI review changeset 
- Add comments to remind developers to be careful what images they use for image capture steps.
- Update wording for both active tasks
- Add an extra step before countdown for the audiometry active task and be more explicit about headphones
- Adjust color, size, and alignment of supplementary scale labels
- Turn off audio tone generation when inactive
 2015-05-21 10:10:27 -07:00
John Earl 17679ff56e Merge branch 'issue_1' of https://github.com/brucehappy/ResearchKit 2015-05-20 13:20:44 -07:00
Ricardo Sánchez-Sáez 853103ef1c Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-navigationrules 
# Conflicts:
#	ResearchKit.xcodeproj/project.pbxproj
#	Testing/ORKTest/ORKTest/MainViewController.m
 2015-05-19 09:28:18 +01:00
John Earl 52f3d906a4 Fix ORKTest unit tests 2015-05-19 00:19:23 -07:00
Ricardo Sánchez-Sáez 14743d1868 Merge branch 'master' of github.com:ResearchKit/ResearchKit into rsanchezsaez-navigationrules 
# Conflicts:
#	ResearchKit.xcodeproj/project.pbxproj
#	Testing/ORKTest/ORKTest/MainViewController.m
#	Testing/ORKTest/ORKTest/ORKESerialization.m
 2015-05-16 11:35:48 +01:00
John Earl e0ca725a42 Merge branch 'ORKScaleSliderView' of https://github.com/CareEvolution/ResearchKit into CareEvolution-ORKScaleSliderView 2015-05-14 17:13:38 -07:00
Scott Guelich 3d91a933b9 Add percent support to continuous scales 
Also adds a readonly numberFormat property to ORKScaleAnswerFormat and ORKContinuousScaleAnswerFormat that can be overridden by subclasses for currency, etc.
 2015-05-13 09:23:35 -07:00
Bruce Duncan 9659fbb530 Moved requestedPermissions up into ORKStep from ORKActiveStep. Added a camera permission. Requested the permission from the image capture step. Added missing reference to the image capture step template image in the JSON serialization test. 2015-05-13 04:28:29 -04:00
Eric DeLabar fc81624880 Added JSON serialization to ORKScaleAnswerFormats and added examples with min and max value labels to the ORKTest project 2015-05-08 14:21:18 -04:00
Eric DeLabar a622726b1b Fixed ORKTest build for changes in PR#162 
- Fixed testORKSerialization to exclude the minimum and maximum value description on ORKScaleAnswerFormat.
 2015-05-08 13:46:35 -04:00
Ricardo Sánchez-Sáez 0d45511b15 ORKStepNavigationRule and ORKNavigableOrderedTask: implement NSSecureCoding and NSCopying protocols 
TODO: Implement NSPredicate JSON serialization.
 2015-05-03 18:24:22 +01:00
Ricardo Sánchez-Sáez e3cca38a69 Homogeneous else braces 2015-04-27 19:49:03 +01:00
Ricardo Sánchez-Sáez 9b4f0a404d Homogenize whitespace (ORKTests) 
Also: some naming conventions renames.
 2015-04-27 19:16:48 +01:00
Ricardo Sánchez-Sáez 77bb256cfa Move some stray opening braces 2015-04-27 00:31:57 +01:00
John Earl cfe35edfef Merge branch 'rsanchezsaez-verticalscale' of https://github.com/rsanchezsaez/ResearchKit into rsanchezsaez-rsanchezsaez-verticalscale 
Conflicts:
	ResearchKit/Common/ORKScaleSlider.m
 2015-04-21 12:44:32 -07:00