Merge pull request #1 from ninoguba/master

update my branch

Author: mimustafa

README.md

@@ -1,6 +1,26 @@
 # What is ionicResearchKit?
 
-An open source library equivalent of Apple's [ResearchKit Framework](https://github.com/ResearchKit/ResearchKit) built on [Ionic](https://github.com/driftyco/ionic) which makes it easy to create cross-platform hybrid native apps for medical research or for other research projects.
+An open source library equivalent of Apple's [ResearchKit Framework](https://github.com/ResearchKit/ResearchKit) built on [Ionic](https://github.com/driftyco/ionic) which makes it easy to create cross-platform hybrid native apps for medical or non-medical research and for other survey-type projects.
+
+# App Showcase
+
+- MIT Voice Up - allows users to track various aspects of their mental health through a series of survey questions and speech prompts.
+
+[Get it on iTunes](https://itunes.apple.com/us/app/mit-voice-up/id1160735265?ls=1&mt=8)
+
+[Get it on Google Play](https://play.google.com/store/apps/details?id=edu.mit.voiceup)
+
+- Civique.org - the platform helps cities and organizations to create challenges on topics that matter to citizens and communities which also helps them document their cause, make sense of their data, and engage with people.
+
+[Get it on iTunes](https://itunes.apple.com/ch/app/civique.org/id1119089346?mt=8)
+
+[Get it on Google Play](https://play.google.com/store/apps/details?id=org.civique)
+
+- Bites'n'Bits - a research project of the Ecole Polytechnique Fédérale de Lausanne which aims to understand the modes of consumption and the perception of food and beverages consumed in everyday life.
+
+[Get it on iTunes](https://itunes.apple.com/us/app/bitesnbits/id1132530860?mt=8)
+
+[Get it on Google Play](https://play.google.com/store/apps/details?id=org.civique.nrc&hl=en)
 
 # Demo
 
@@ -26,13 +46,6 @@ An open source library equivalent of Apple's [ResearchKit Framework](https://git
 3. Add `ionicResearchKit` to your angular app module dependencies list.<br />
 `angular.module('myApp', ['ionicResearchKit']);`
 
-# Dependencies
-
-- checklist-model [https://github.com/vitalets/checklist-model](https://github.com/vitalets/checklist-model)
-- signature_pad [https://github.com/szimek/signature_pad](https://github.com/szimek/signature_pad)
-- angular-svg-round-progressbar [https://github.com/crisbeto/angular-svg-round-progressbar](https://github.com/crisbeto/angular-svg-round-progressbar)
-- pdfmake [https://github.com/bpampuch/pdfmake](https://github.com/bpampuch/pdfmake)
-
 # Usage
 
 1. Add a modal view to your app using [$ionicModal](http://ionicframework.com/docs/api/service/$ionicModal/)
@@ -300,68 +313,6 @@ The consent document PDF is automatically generated as a base64-encoded string a
 
 `<irk-audio-task>` is the equivalent of the `ORKPredefinedActiveTask` class that is for audio capture and supports the `text`, `duration`, `auto-record`, `auto-complete`, and `optional` attributes.
 
-# Roadmap
-
-- [x] Task View 
-  - [ ] Navigable Tasks 
-- [x] Survey directives
-  - [x] Instruction Step
-    - [x] Support optional image
-    - [ ] Support video
-  - [x] Scale Question Step
-    - [ ] Support step bars
-    - [ ] Support vertical orientation
-  - [x] Boolean Question Step
-  - [x] Text Question Step
-    - [x] Multi lines
-    - [x] Single line
-  - [x] Text Choice Question Step
-    - [x] Single choice
-    - [x] Multiple choice
-  - [x] Numeric Question Step
-  - [x] Date Question Step
-  - [x] Time Question Step
-    - [ ] Time Interval Question Step
-  - [x] Value Picker Question Step
-  - [x] Image Choice Question Step
-    - [x] Support icons
-    - [x] Support images
-  - [x] Form Step directive
-    - [ ] Support more answer formats
-  - [ ] Location Step
-  - [ ] Validated Answer Step
-- [x] Consent directives
-  - [x] Visual Consent
-    - [x] In Document Only Type
-    - [x] Support custom image
-  - [x] Consent Sharing
-  - [x] Consent Review
-    - [x] Name Capture
-    - [x] Signature Capture
-  - [x] PDF Generation
-- [ ] Active Tasks directives
-  - [x] Countdown Step
-  - [x] Completion Step
-  - [x] Tapping Speed Task
-  - [x] Audio Task
-  - [ ] Image Capture Task
-  - [ ] Video Capture Task
-  - [ ] Fitness Task
-  - [ ] Gait and Balance Task
-  - [ ] Spacial Memory Task
-- [ ] Charts
-- [ ] Accounts
-  - [ ] Login Step
-  - [ ] Registration Step
-  - [ ] Wait Step
-  - [ ] Passcode Step
-- [x] Results
-  - [x] Output results in JSON
-  - [ ] Collect results into LocalStorage (save/resume)
-- [ ] Integrations
-  - [ ] HealthKit
-  - [ ] Google Fit
-  - [ ] Samsung S Health
 
 License
 =======

package.json

@@ -4,7 +4,7 @@
   "description": "ionicRK: ResearchKit for Hybrid Apps",
   "dependencies": {
     "gulp": "^3.5.6",
-    "gulp-sass": "^1.3.3",
+    "gulp-sass": "^2.0.4",
     "gulp-concat": "^2.2.0",
     "gulp-minify-css": "^0.3.0",
     "gulp-rename": "^1.2.0"
@@ -20,6 +20,12 @@
     "cordova-plugin-whitelist",
     "cordova-plugin-file",
     "cordova-plugin-inappbrowser",
+    "cordova-plugin-camera",
+    "cordova-plugin-geolocation",
+    "cordova-plugin-media-capture",
+    "cordova-plugin-pedometer",
+    "cordova-plugin-tts",
+    "cordova-plugin-device-motion",
     "ionic-plugin-keyboard",
     "cordova-plugin-compat",
     {

www/js/controllers.js

@@ -74,6 +74,58 @@ angular.module('starter.controllers', [])
     });
   };
 
+  $scope.openModalImageActiveTask = function() {
+    $ionicModal.fromTemplateUrl('templates/modal-activetasks-image.html', {
+      scope: $scope,
+      animation: 'slide-in-up'
+    }).then(function(modal) {
+      $scope.modal = modal;
+      $scope.modal.show();
+    });
+  };
+
+   $scope.openModalVideoActiveTask = function() {
+    $ionicModal.fromTemplateUrl('templates/modal-activetasks-video.html', {
+      scope: $scope,
+      animation: 'slide-in-up'
+    }).then(function(modal) {
+      $scope.modal = modal;
+      $scope.modal.show();
+    });
+  };
+
+  $scope.openModalSpatialActiveTask = function() {
+    $ionicModal.fromTemplateUrl('templates/modal-activetasks-spatial.html', {
+      scope: $scope,
+      animation: 'slide-in-up'
+    }).then(function(modal) {
+      $scope.modal = modal;
+      $scope.modal.show();
+    });
+  };
+
+  $scope.openModalGaitBalanceActiveTask = function() {
+    $ionicModal.fromTemplateUrl('templates/modal-activetasks-gait-balance.html', {
+      scope: $scope,
+      animation: 'slide-in-up'
+    }).then(function(modal) {
+      $scope.modal = modal;
+      $scope.modal.show();
+    });
+  };
+
+  $scope.openModalFitnessTask = function() {
+    $ionicModal.fromTemplateUrl('templates/modal-activetasks-fitness.html', {
+      scope: $scope,
+      animation: 'slide-in-up'
+    }).then(function(modal) {
+      $scope.modal = modal;
+      $scope.modal.show();
+    });
+  };
+
+
+
   $scope.closeModal = function() {
     $scope.modal.remove();
   };

www/lib/ionic-researchkit/ionic-researchkit.css

@@ -314,4 +314,54 @@ button.irk-image:before {
 .irk-spinner-audio-task svg {
   width: 100px;
   height: 100px;
+}
+
+.irk-image-button-container {
+  position: absolute; 
+  bottom: 150px; 
+  width: 100%;
+}
+
+.irk-image-button {
+  border-radius: 50%;
+  height: 100px;
+  width: 100px;
+}
+
+.irk-spatial-tile-quiescent{
+  height: 100px;
+  width: 100px;
+}
+
+.irk-spatial-tile-correct{
+  background-color: #008CBA;
+  height: 100px;
+  width: 100px;
+}
+
+.irk-spatial-tile-incorrect{
+  background-color: #f44336;
+  height: 100px;
+  width: 100px;
+}
+
+.irk-spatial-score-container{
+  float:bottom;
+}
+
+.irk-small-button{
+  width: 20%;
+}
+
+.irk-fitness-meters{
+  font-size: 30px;
+  margin-top:20px;
+  margin-bottom:20px;
+  vertical-align: middle;
+}
+
+.irk-fitness-meters{
+  font-size: 30px;
+  vertical-align: bottom;
+  margin-bottom:30px;
 }