Merge branch 'develop' of https://github.com/parklab/refinery-platform …

…into develop
refinery-platform · Jun 30, 2015 · 909da82 · 909da82
2 parents a78681d + 57eb38c
commit 909da82
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 8 deletions.
diff --git a/refinery/analysis_manager/views.py b/refinery/analysis_manager/views.py
@@ -380,6 +380,7 @@ def run(request):
         study_uuid = analysis_config['studyUuid']
         node_set_uuid = analysis_config['nodeSetUuid']
         node_relationship_uuid = analysis_config['nodeRelationshipUuid']
+        custom_name = analysis_config['name']
     except KeyError:
         return HttpResponseBadRequest()  # 400
     # must provide workflow and study UUIDs,
@@ -417,7 +418,12 @@ def run(request):
 
         ######### ANALYSIS MODEL ########
         # How to create a simple analysis object
-        temp_name = curr_workflow.name + " " + datetime.now().strftime("%Y-%m-%d @ %H:%M:%S")
+
+        if not custom_name:
+            temp_name = curr_workflow.name + " " + datetime.now().strftime("%Y-%m-%d @ %H:%M:%S")
+        else:
+            temp_name = custom_name
+
         summary_name = "None provided."
 
         analysis = Analysis(summary=summary_name,

diff --git a/refinery/static/source/styles/less/refinery-style.less b/refinery/static/source/styles/less/refinery-style.less
@@ -87,6 +87,10 @@ ul#externalToolListPopover li{
   margin: 0;
 }
 
+.bootboxAnalysisWidth form input{
+  width: 96%;
+}
+
 @media (max-width: 760px) {
    #textToolStatus{
     width: 100%;

diff --git a/refinery/ui/src/js/analysis.js b/refinery/ui/src/js/analysis.js
@@ -2,14 +2,16 @@ angular.module('refineryAnalysis', [])
 
 .controller('AnalysisCtrl', function(
     $scope, $rootScope, $http, $window, $log, $timeout, workflow) {
+    var vm = this;
 
   'use strict';
 
   $scope.analysisConfig = {
     studyUuid: $window.externalStudyUuid,
     workflowUuid: null,
     nodeSetUuid: null,
-    nodeRelationshipUuid: null
+    nodeRelationshipUuid: null,
+    name: null,
   };
 
   $scope.$onRootScope('nodeSetChangedEvent', function(event, currentNodeSet) {
@@ -31,22 +33,52 @@ angular.module('refineryAnalysis', [])
     $scope.analysisConfig.nodeSetUuid = null;
   });
 
-  $scope.launchAnalysis = function() {
-    $scope.analysisConfig.workflowUuid = workflow.getUuid();
+  $scope.setAnalysisName = function(){
+    var timeStamp = vm.getTimeStamp();
+    var workflowUuid = workflow.getName();
+    var tempName = workflowUuid + " " + timeStamp;
+    bootbox.prompt("Enter an Analysis Name:", "Cancel Analysis", "Confirm" +
+      " Name", function(name) {
+      if (name == null) {
+        bootbox.alert("Analysis was canceled.");
+      }else {
+        vm.launchAnalysis(name);
+      }
+    }, tempName).addClass("bootboxAnalysisWidth");
+  };
 
+  vm.launchAnalysis = function(analysisName) {
+    $scope.analysisConfig.name = analysisName;
+    $scope.analysisConfig.workflowUuid = workflow.getUuid();
     $http({
       method: 'POST',
       url: '/analysis_manager/run/',
       headers: {'X-Requested-With': 'XMLHttpRequest'},
       data: $scope.analysisConfig,
-    }).success(function(response) {
+    }).success(function (response) {
       $log.debug("Launching analysis with config:");
       $log.debug("Workflow: " + $scope.analysisConfig.workflowUuid);
       $log.debug("NodeSET: " + $scope.analysisConfig.nodeSetUuid);
       $log.debug("NodeREL: " + $scope.analysisConfig.nodeRelationshipUuid);
       $window.location.assign(response);
-    }).error(function(response, status) {
+    }).error(function (response, status) {
       $log.debug("Request failed: error " + status);
     });
   };
+
+  vm.getTimeStamp = function(){
+    var currentDate = new Date();
+    var month = currentDate.getMonth() + 1;
+    var day = currentDate.getDate();
+    var year = currentDate.getFullYear();
+    var hour = currentDate.getHours();
+    var mins= currentDate.getMinutes();
+    var sec = currentDate.getSeconds();
+
+    var dateStr = month + "-" + day + "-" + year;
+    var timeStr = "@" + hour + ":" + mins + ":" + sec;
+
+    return (dateStr + timeStr);
+
+  }
 });
diff --git a/refinery/ui/src/partials/data_set_ui_mode_analyze.html b/refinery/ui/src/partials/data_set_ui_mode_analyze.html
@@ -44,7 +44,8 @@ <h4>Inputs ({{currentWorkflow.getCategory()}})</h4>
       -->
 
       <!-- no external tool status monitoring -->
-        <button class="btn btn-warning" ng-click="launchAnalysis()" ng-disabled="!(currentNodeSet && currentNodeSet.node_count > 0)" style="width: 100%">Launch Analysis</button>
+        <button class="btn btn-warning" ng-click="setAnalysisName()"
+                ng-disabled="!(currentNodeSet && currentNodeSet.node_count > 0)" style="width: 100%">Launch Analysis</button>
 
       </div>
     </div>
@@ -69,7 +70,7 @@ <h4>Inputs ({{currentWorkflow.getCategory()}})</h4>
         </div>
       -->
       <!-- no external tool status monitoring -->
-        <button class="btn btn-warning" ng-click="launchAnalysis()" ng-disabled="!(currentNodeRelationship && currentNodeRelationship.node_pairs.length > 0 )" style="width: 100%">Launch Analysis</button>
+        <button class="btn btn-warning" ng-click="setAnalysisName()" ng-disabled="!(currentNodeRelationship && currentNodeRelationship.node_pairs.length > 0 )" style="width: 100%">Launch Analysis</button>
       </div>
     </div>
   </div>