Merge pull request ninoguba#34 from dwu95415/master

Additional Active Tasks

Author: ninoguba

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;
 }