Don't set baseline distribution if not logged in; missing argumetn bu…

…gfix; return created when making patavi task
chinook25 · Mar 3, 2017 · e452456 · e452456
1 parent ddde985
commit e452456
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 21 deletions.
diff --git a/app/js/controllers/modelController.js b/app/js/controllers/modelController.js
@@ -226,11 +226,11 @@ define(['lodash', 'clipboard'], function(_, Clipboard) {
       if (!$scope.baselineDistribution) {
         return;
       }
-      var problem = ModelService.buildScalesProblem($scope.analysis, $scope.baselineDistribution, $scope.result);
+      var problem = ModelService.buildScalesProblem($scope.analysis, $scope.problem, $scope.baselineDistribution, $scope.result);
       $http.post('/patavi', problem)
         .then(function(result) {
           var uri = result.data.uri;
-          if (result.status === 200 && uri) {
+          if (result.status === 201 && uri) {
             return uri;
           }
         }, function(error) {

diff --git a/app/js/models/modelService.js b/app/js/models/modelService.js
@@ -264,7 +264,7 @@ define(['angular', 'lodash'], function(angular, _) {
       return result;
     }
 
-    function buildScalesProblem(analysis, baselineDistribution, result) {
+    function buildScalesProblem(analysis, problem, baselineDistribution, result) {
       var criteria = {};
       criteria[analysis.outcome.name] = {
         scale: baselineDistribution.scale === 'mean' ? null : [0, 1],
@@ -273,7 +273,7 @@ define(['angular', 'lodash'], function(angular, _) {
         unitOfMeasurement: baselineDistribution.scale === 'mean' ? null : 'proportion'
       };
       var baselineId;
-      var alternatives = _.fromPairs(_.map(analysis.problem.treatments, function(treatment) {
+      var alternatives = _.fromPairs(_.map(problem.treatments, function(treatment) {
         if (baselineDistribution.name === treatment.name) {
           baselineId = treatment.id;
         }
@@ -284,7 +284,7 @@ define(['angular', 'lodash'], function(angular, _) {
       }));
 
       var performanceTable = _.map(criteria, function(criterion, criterionName) {
-        var mu = _.fromPairs(_.map(analysis.problem.treatments, function(treatment) {
+        var mu = _.fromPairs(_.map(problem.treatments, function(treatment) {
           var value;
           if (treatment.id === baselineId) {
             value = 0.0;
@@ -294,7 +294,7 @@ define(['angular', 'lodash'], function(angular, _) {
           return [treatment.name, value];
         }));
 
-        var treatmentsSorted = _.sortBy(analysis.problem.treatments, function(treatment) {
+        var treatmentsSorted = _.sortBy(problem.treatments, function(treatment) {
           return treatment.id === baselineId ? -1 : 1;
         });
         var names = _.map(treatmentsSorted, function(alternative) {

diff --git a/app/js/models/modelServiceSpec.js b/app/js/models/modelServiceSpec.js
@@ -627,21 +627,22 @@ define(['angular', 'angular-mocks', 'services'], function() {
         var analysis = {
           outcome: {
             name: 'HAM-D Responders'
-          },
-          problem: {
-            treatments: [{
-              id: 260,
-              name: 'Paroxetine'
-            }, {
-              id: 259,
-              name: 'Fluoxetine'
-            }, {
-              id: 258,
-              name: 'Sertraline'
-            }]
           }
         };
 
+        var problem = {
+          treatments: [{
+            id: 260,
+            name: 'Paroxetine'
+          }, {
+            id: 259,
+            name: 'Fluoxetine'
+          }, {
+            id: 258,
+            name: 'Sertraline'
+          }]
+        };
+
         var baselineDistribution = {
           scale: 'log odds',
           mu: 0.5,
@@ -769,7 +770,7 @@ define(['angular', 'angular-mocks', 'services'], function() {
             }
           }]
         };
-        var result = modelService.buildScalesProblem(analysis, baselineDistribution, pataviResult);
+        var result = modelService.buildScalesProblem(analysis, problem, baselineDistribution, pataviResult);
         expect(result).toEqual(expectedResult);
 
       });

diff --git a/app/views/results-section.html b/app/views/results-section.html
@@ -70,7 +70,7 @@ <h3 id="model-results-results-header" class="main-category-header">Results</h3>
         <Strong>Absolute treatment effects</Strong>
       </p>
       <p ng-if="!baselineDistribution">
-        <em>Set baseline distribution to calculate absolute effects.</em>
+        <em>No baseline distribution set.</em>
       </p>
     </div>
   </div>
@@ -104,7 +104,7 @@ <h3 id="model-results-results-header" class="main-category-header">Results</h3>
   </div>
   <div class="row">
     <div class="columns large-12">
-      <button ng-click="openBaselineDistributionModal()">Set Baseline Distribution</button>
+      <button ng-if="!editMode.disableEditing" ng-click="openBaselineDistributionModal()">Set Baseline Distribution</button>
     </div>
   </div>
 </div>

diff --git a/standalone-app/pataviHandlers.js b/standalone-app/pataviHandlers.js
@@ -41,6 +41,7 @@ function getPataviTask(request, response) {
         modelRepository.setTaskUrl(modelCache.id, createdUrl, callback);
       },
       function() {
+        response.sendStatus(httpStatus.CREATED);
         response.json({
           uri: createdUrlCache
         });