Merge branch 'dev_vistoms_Benedikt' into dev_vistoms_Benedikt_new_data_structure

Former-commit-id: 5d89822a0aaa74416f167c406c4d868908ff1f42

kadmos/vistoms/templates/VISTOMS.html

@@ -459,10 +459,12 @@
                         .style("min-width","200px")
                         .style("margin-left","10px")
                     addButtonPanel.append("div").attr("class","panel-heading text-center align-top")
+                        .style("background-color","#555555")
                         .append("h3")
                         .attr("class","panel-title")
                         .style("font-family","Arial")
                         .style("font-size","14pt")
+                        .style("color","white")
                         .style("display","inline-block")
                         .text("Add graph")
                     var panelBody = addButtonPanel.append("div").attr("class","panel-body")
@@ -613,10 +615,12 @@
                             .style("min-width","200px")
                             .style("margin-left","10px")
                         saveButtonPanel.append("div").attr("class","panel-heading text-center align-top")
+                            .style("background-color","#555555")
                             .append("h3")
                             .attr("class","panel-title")
                             .style("font-family","Arial")
                             .style("font-size","14pt")
+                            .style("color","white")
                             .style("display","inline-block")
                             .text("Save all graphs")
                         var savepanelBody = saveButtonPanel.append("div").attr("class","panel-body")
@@ -18767,7 +18771,7 @@
               
                 
 				var saveButton = revertDiv.append("button")
-                    .attr("class","btn btn-primary button")
+                    .attr("class","btn btn-primary")
                     .attr("data-toggle","tooltip")
                     .attr("data-placement","top")
                     .attr("title","Save graph")
@@ -18876,7 +18880,7 @@
                 
                 
                 var deleteButton = revertDiv.append("button")
-                    .attr("class","btn btn-danger button")
+                    .attr("class","btn btn-danger")
                     .attr("data-toggle","tooltip")
                     .attr("data-placement","top")
                     .attr("title","Delete graph")
@@ -18942,7 +18946,7 @@
                 
                 
                 var backButton = revertDiv.append("button")
-                    .attr("class","btn btn-warning button")
+                    .attr("class","btn btn-warning")
                     .attr("data-toggle","tooltip")
                     .attr("data-placement","top")
                     .attr("title","Revert graph manipulation step")
@@ -19006,7 +19010,7 @@
                 })
                     
                  var fwdButton = revertDiv.append("button")
-                    .attr("class","btn btn-warning button")
+                    .attr("class","btn btn-warning")
                     .attr("data-toggle","tooltip")
                     .attr("data-placement","top")
                     .attr("title","Restore graph manipulation step")

kadmos/vistoms/vistoms.py

@@ -707,7 +707,8 @@ def kadmosChangeNodePos():
             function_order.insert(newPos, nodeName)
             if isinstance(graph, FundamentalProblemGraph):
                 graph.graph['problem_formulation']['function_order'] = function_order
-                graph.add_function_problem_roles()
+                if 'problem_role' in graph.nodes[function_order[0]]:
+                    graph.add_function_problem_roles()
 
             # Add the graph with the updated function order to VISTOMS
             newVistomsData = graph.vistoms_add_json(function_order=function_order, graph_id=graphID, mpg=mpg)
@@ -1091,7 +1092,8 @@ def kadmosGetPossibleFunctionOrder():
             function_order = fpg.get_possible_function_order(method)
             fpg.assert_or_add_nested_attribute(['problem_formulation', 'mdao_architecture'], 'undefined')
             fpg.graph['problem_formulation']['function_order'] = function_order
-            fpg.add_function_problem_roles()
+            if 'problem_role' in fpg.nodes[function_order[0]]:
+                fpg.add_function_problem_roles()
 
             # Save the graph in temp/tmp.kdms
             fpg.save(os.path.join(UPLOAD_FOLDER, TEMP_FILE + '_' + graphID + '.kdms'),