GitHub/ResearchKit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,368 Commits 5 Branches 28 Tags
bc2801bb9ec00c1d07807e5eae5e46ab332ce9ca
Commit Graph
66 Commits
Author SHA1 Message Date
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 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 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
Ricardo Sánchez-Sáez 57cbebae64 [ORKNavigableOrderedTask] Implement skip navigation rules 
Introduce the ORKSkipStepNavigationRule and ORKPredicateSkipStepNavigationRule classes, and the appropriate 'ORKNavigableOrderedTask' methods to insert, view and remove them.
Implement ORKTest example code within the Navigable Loop Task Items.
Implement unit tests for the new functionality, and makes sure all serialization tests continue to pass.
 2016-03-11 18:41:32 +00:00
Ricardo Sánchez-Sáez 8d0fd95ad0 [ORKTestTests] Fix failing tests (mainly due ORKReviewStep) 2016-01-16 21:36:55 +00:00
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