Fixed a small bug with the ng-include for the experiment body

QutEcoacoustics · Mar 11, 2013 · a91b484 · a91b484
1 parent 1f4c529
commit a91b484
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -46,3 +46,4 @@ doc/
 /media/original/*
 /media/cachedimages/*
 /media/cachedaudio/*
+/media/experiments/*
diff --git a/app/assets/javascripts/angular/controllers/experiments.js b/app/assets/javascripts/angular/controllers/experiments.js
@@ -7,7 +7,7 @@
     app.controller('ExperimentsCtrl', ['$scope', '$resource', '$routeParams', '$route', '$http', 'Media', 'AudioEvent', 'Tag',
 
         /**
-         * The listen controller.
+         * The Experiments controller.
          * @param $scope
          * @param $resource
          * @param $routeParams
@@ -45,6 +45,10 @@
                 success(function (data, status, headers, config) {
                     $scope.spec = data;
                     $scope.results.experiment = $scope.spec.experiment;
+
+                    if ($routeParams.cheat) {
+                        $scope.stage = $routeParams.cheat;
+                    }
                 }).error(function (data, status, headers, config) {
                     alert("downloading test specification failed");
                 });
@@ -88,6 +92,13 @@
 
             };
 
+            $scope.getPath = function () {
+                if ($scope.spec && $scope.spec.experimentSteps && $scope.spec.experimentSteps[$scope.step]) {
+
+                    return $scope.spec.experimentSteps[$scope.step].template
+                }
+            };
+
             $scope.$watch(function () {
                 return $scope.step;
             }, function (newValue, oldValue) {

diff --git a/app/assets/templates/experiment_base.html b/app/assets/templates/experiment_base.html
@@ -96,9 +96,9 @@ <h3>Instructions</h3>
     <div id="experimentBody" ng-show="stage == EXPERIMENT_STAGE">
         <h2>Main experiment</h2>
         <div>
-            Progress: {{step}}/{{spec.experimentSteps.length}}  <progress value="{{step}}" max="{{spec.experimentSteps.length}}"></progress>
+            Progress: {{step}}/{{spec.experimentSteps.length}}  <meter value="{{step}}" max="{{spec.experimentSteps.length}}"></meter>
         </div>
-        <div ng-include src="step.template"></div>
+        <div ng-include src="getPath()"></div>
 
         <button ng-click="step = step + 1">Next</button>
     </div>

diff --git a/app/controllers/experiments_controller.rb b/app/controllers/experiments_controller.rb
@@ -34,7 +34,7 @@ def create
 
     if success.nil?
       FileUtils.makedirs EXPERIMENTS_SAVE_DIRECTORY
-      File.open( (EXPERIMENTS_SAVE_DIRECTORY + '/' + Time.now.to_i.to_s + '.json'), 'w' ){ |file|
+      File.open( (EXPERIMENTS_SAVE_DIRECTORY + '/' + Time.now.to_f.to_s + '.json'), 'w' ){ |file|
           file.write post_data
       }