Skip to content
Snippets Groups Projects
Commit cdce491b authored by imcovangent's avatar imcovangent
Browse files

Finished update of local VISTOMS including session handling. 

Former-commit-id: 8068f4e149cab262977ed8da53d97bfbf0bd7673
parent 2716b247
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
kadmos/vistoms/templates/VISTOMS.html
+ 38
− 30
View file @ cdce491b
......@@ -150,6 +150,7 @@
$.ajax({
type: 'POST',
url: '/kadmos_remove_obsolete_files',
data: {'sessionId': sessionId},
success: function(result){},
error: function(result)
{
......@@ -453,6 +454,7 @@
var xhr = $.ajax({
type: 'POST',
url: '/kadmos_find_temp_graphs',
data: {'sessionId': sessionId},
success: function(result)
{
if (result.includes("ERROR:"))
......@@ -958,7 +960,7 @@
var files = result
files.forEach(function(file)
{
download_from_kadmos(file,"/kadmos_download/"+file)
download_from_kadmos(file,"/kadmos_download/"+file+"/"+sessionId)
})
......@@ -19062,7 +19064,7 @@
data: {
'graphID':graphID,
'variableData_str':variableData_str,
'currentOrder':nodeOrder
'currentOrder':nodeOrder, 'sessionId': sessionId
},
success: function(result)
{
......@@ -19112,7 +19114,7 @@
data: {
'graphID':graphID,
'xPath':xPath,
'currentOrder':nodeOrder
'currentOrder':nodeOrder, 'sessionId': sessionId
},
success: function(result)
{
......@@ -19631,7 +19633,7 @@
var xhr = $.ajax({
type: 'POST',
url: '/kadmos_change_node_pos',
data: {'graphID':graphID, 'nodeName':aNode.uID, 'newPos':newPos, 'currentOrder':nodeOrder},
data: {'graphID':graphID, 'nodeName':aNode.uID, 'newPos':newPos, 'currentOrder':nodeOrder, 'sessionId': sessionId},
success: function(result)
{
if (result.includes("ERROR:"))
......@@ -19685,7 +19687,7 @@
var xhr = $.ajax({
type: 'POST',
url: '/kadmos_delete_node',
data: {'graphID':graphID, 'nodeName':aNode.uID, 'currentOrder':nodeOrder},
data: {'graphID':graphID, 'nodeName':aNode.uID, 'currentOrder':nodeOrder, 'sessionId': sessionId},
success: function(result)
{
if (result.includes("ERROR:"))
......@@ -19809,7 +19811,7 @@
var xhr = $.ajax({
type: 'POST',
url: '/kadmos_add_mathematical_function',
data: {'graphID':graphID, 'currentOrder':nodeOrder, 'form_data':JSON.stringify(form_data)},
data: {'graphID':graphID, 'currentOrder':nodeOrder, 'form_data':JSON.stringify(form_data), 'sessionId': sessionId},
success: function(result)
{
if (result.includes("ERROR:"))
......@@ -20040,14 +20042,15 @@
var xhr = $.ajax(
{
type: 'POST',
data: {'fileName':currentGraph.name, 'fileType': fileType, 'graphID': graphID},
data: {'fileName':currentGraph.name, 'fileType': fileType, 'graphID': graphID,
'sessionId': sessionId},
url: '/kadmos_export_graph',
success: function(result)
{
var files = result
files.forEach(function(file)
{
download_from_kadmos(file,"/kadmos_download/"+file)
download_from_kadmos(file,"/kadmos_download/"+file+"/"+sessionId)
})
if (result.includes("ERROR:"))
......@@ -20134,7 +20137,7 @@
var xhr = $.ajax(
{
type: 'POST',
data: {'graphID': graphID, 'newGraphID': newGraphID, 'newGraphName': newGraphName, 'currentOrder':nodeOrder},
data: {'graphID': graphID, 'newGraphID': newGraphID, 'newGraphName': newGraphName, 'currentOrder':nodeOrder, 'sessionId': sessionId},
url: '/kadmos_save_vistoms_graph',
success: function(result)
{
......@@ -20213,7 +20216,7 @@
{
type: 'POST',
url: '/kadmos_delete_graph',
data: {'graphID':graphID},
data: {'graphID':graphID, 'sessionId': sessionId},
success: function(result)
{
if (result.includes("ERROR:"))
......@@ -20281,7 +20284,7 @@
{
type: 'POST',
url: '/kadmos_revert_step',
data: {'graphID':graphID},
data: {'graphID':graphID, 'sessionId': sessionId},
success: function(result)
{
if (result.includes("ERROR:"))
......@@ -20420,6 +20423,7 @@
formData.append('graphID', graphID);
formData.append('currentOrder',nodeOrder);
formData.append('function_node', $('form #function_node').val());
formData.append('sessionId', sessionId);
var bootboxContent = {title: "Add design competence", message: '<p>Please be patient...</p>'};
var xhr = $.ajax({
......@@ -20702,7 +20706,7 @@
{
type: 'POST',
url: '/kadmos_add_DC_metadata',
data: {'graphID':graphID, 'currentOrder':nodeOrder, 'nodeName':metadata.uID, 'metadata_str':metadata_str},
data: {'graphID':graphID, 'currentOrder':nodeOrder, 'nodeName':metadata.uID, 'metadata_str':metadata_str, 'sessionId': sessionId},
success: function(result)
{
if (result.includes("ERROR:"))
......@@ -20890,7 +20894,7 @@
var bootboxContent = {title: "Update contact information", message: '<p>Please be patient...</p>'};
var xhr = $.ajax({
type: 'POST',
data: {'graphID': graphID, 'currentOrder': nodeOrder, 'organization': JSON.stringify(currentGraph.organization)},
data: {'graphID': graphID, 'currentOrder': nodeOrder, 'organization': JSON.stringify(currentGraph.organization), 'sessionId': sessionId},
url: '/kadmos_edit_contact_infos',
success: function(result)
{
......@@ -21312,7 +21316,8 @@
'attr_include':JSON.stringify(attr_include),
'attr_exclude':JSON.stringify(attr_exclude),
'xPath_include':xPath_include,
'xPath_exclude':xPath_exclude,},
'xPath_exclude':xPath_exclude,
'sessionId': sessionId,},
success: function(result)
{
if (result.includes("ERROR:"))
......@@ -21485,7 +21490,7 @@
var bootboxContent = {title: "L1 check: graph", message: '<p>Please be patient...</p>'};
var xhr = $.ajax({
type: 'POST',
data: {'graphID': graphID},
data: {'graphID': graphID, 'sessionId': sessionId},
url: '/kadmos_L1_check',
success: function(result)
{
......@@ -21517,7 +21522,7 @@
var bootboxContent = {title: "L2 check: problem formulation", message: '<p>Please be patient...</p>'};
var xhr = $.ajax({
type: 'POST',
data: {'graphID': graphID},
data: {'graphID': graphID, 'sessionId': sessionId},
url: '/kadmos_L2_check',
success: function(result)
{
......@@ -21549,7 +21554,7 @@
var bootboxContent = {title: "L3 check: graph & problem formulation", message: '<p>Please be patient...</p>'};
var xhr = $.ajax({
type: 'POST',
data: {'graphID': graphID},
data: {'graphID': graphID, 'sessionId': sessionId},
url: '/kadmos_L3_check',
success: function(result)
{
......@@ -21617,7 +21622,7 @@
var xhr = $.ajax({
type: 'POST',
url: '/kadmos_start_defining_MDO_problem',
data: {'graphID':graphID, 'currentOrder': nodeOrder, 'newGraphName':newGraphName, 'newGraphID':newGraphID},
data: {'graphID':graphID, 'currentOrder': nodeOrder, 'newGraphName':newGraphName, 'newGraphID':newGraphID, 'sessionId': sessionId},
success: function(result)
{
if (result.includes("ERROR:"))
......@@ -21693,7 +21698,7 @@
var xhr = $.ajax({
type: 'POST',
url: '/kadmos_exclude_DCs',
data: {'graphID':graphID, 'nodeList':nodeStr, 'currentOrder':nodeOrder},
data: {'graphID':graphID, 'nodeList':nodeStr, 'currentOrder':nodeOrder, 'sessionId': sessionId},
success: function(result)
{
if (result.includes("ERROR:"))
......@@ -21767,7 +21772,7 @@
var xhr = $.ajax({
type: 'POST',
url: '/kadmos_merge_seq_DCs',
data: {'graphID':graphID, 'nodeList':nodeStr, 'currentOrder':nodeOrder},
data: {'graphID':graphID, 'nodeList':nodeStr, 'currentOrder':nodeOrder, 'sessionId': sessionId},
success: function(result)
{
if (result.includes("ERROR:"))
......@@ -21842,7 +21847,7 @@
var xhr = $.ajax({
type: 'POST',
url: '/kadmos_merge_parallel_DCs',
data: {'graphID':graphID, 'nodeList':nodeStr, 'currentOrder':nodeOrder},
data: {'graphID':graphID, 'nodeList':nodeStr, 'currentOrder':nodeOrder, 'sessionId': sessionId},
success: function(result)
{
if (result.includes("ERROR:"))
......@@ -21917,7 +21922,7 @@
var xhr = $.ajax({
type: 'POST',
url: '/kadmos_merge_func_mod_DCs',
data: {'graphID':graphID, 'nodeList':nodeStr, 'currentOrder':nodeOrder},
data: {'graphID':graphID, 'nodeList':nodeStr, 'currentOrder':nodeOrder, 'sessionId': sessionId},
success: function(result)
{
if (result.includes("ERROR:"))
......@@ -21992,7 +21997,7 @@
var xhr = $.ajax({
type: 'POST',
url: '/kadmos_remove_collision',
data: {'graphID':graphID, 'nodeList':nodeStr, 'currentOrder':nodeOrder},
data: {'graphID':graphID, 'nodeList':nodeStr, 'currentOrder':nodeOrder, 'sessionId': sessionId},
success: function(result)
{
if (result.includes("ERROR:"))
......@@ -22051,7 +22056,7 @@
var xhr = $.ajax({
type: 'POST',
url: '/kadmos_make_all_variables_valid',
data: {'graphID':graphID, 'currentOrder':nodeOrder},
data: {'graphID':graphID, 'currentOrder':nodeOrder, 'sessionId': sessionId},
success: function(result)
{
if (result.includes("ERROR:"))
......@@ -22105,7 +22110,7 @@
var xhr = $.ajax({
type: 'POST',
url: '/kadmos_add_function_problem_roles',
data: {'graphID':graphID, 'currentOrder':nodeOrder},
data: {'graphID':graphID, 'currentOrder':nodeOrder, 'sessionId': sessionId},
success: function(result)
{
if (result.includes("ERROR:"))
......@@ -22213,7 +22218,7 @@
var xhr = $.ajax({
type: 'POST',
url: '/kadmos_get_possible_function_order',
data: {'graphID':graphID, 'sortingMethod':method, 'currentOrder':nodeOrder},
data: {'graphID':graphID, 'sortingMethod':method, 'currentOrder':nodeOrder, 'sessionId': sessionId},
success: function(result)
{
if (result.includes("ERROR:"))
......@@ -22276,7 +22281,8 @@
var xhr = $.ajax({
type: 'POST',
url: '/kadmos_remove_unused_outputs',
data: {'graphID':graphID, 'currentOrder':nodeOrder, 'cleanUp':selection},
data: {'graphID':graphID, 'currentOrder':nodeOrder, 'cleanUp':selection,
'sessionId': sessionId},
success: function(result)
{
if (result.includes("ERROR:"))
......@@ -22361,7 +22367,7 @@
var xhr = $.ajax({
type: 'POST',
url: '/kadmos_start_defining_MDAO_architecture',
data: {'graphID':graphID, 'currentOrder': nodeOrder, 'newGraphName':newGraphName, 'newGraphID':newGraphID},
data: {'graphID':graphID, 'currentOrder': nodeOrder, 'newGraphName':newGraphName, 'newGraphID':newGraphID, 'sessionId': sessionId},
success: function(result)
{
if (result.includes("ERROR:"))
......@@ -22490,7 +22496,8 @@
'mdao_architecture':MDAO_architecture,
'doe_method':DOE_method,
'coupling_decomposition':coupling_decomposition,
'allow_unconverged_couplings':allow_unconverged_couplings},
'allow_unconverged_couplings':allow_unconverged_couplings,
'sessionId':sessionId},
success: function(result)
{
if (result.includes("ERROR:"))
......@@ -22589,6 +22596,7 @@
event.preventDefault();
var formData = new FormData($('#scriptForm')[0]);
formData.append('graphID', graphID);
formData.append('sessionId', sessionId);
if (typeof currentGraph.xdsm.workflow !== 'undefined' && currentGraph.xdsm.workflow.length > 0)
{
......@@ -23156,7 +23164,7 @@
var xhr = $.ajax({
type: 'POST',
url: '/kadmos_delete_edge',
data: {graphID: graphID, nodeName: anEdge.from_uID, edgeName: formData[0].value, 'currentOrder':nodeOrder},
data: {graphID: graphID, nodeName: anEdge.from_uID, edgeName: formData[0].value, 'currentOrder':nodeOrder, 'sessionId': sessionId},
success: function(result)
{
if (result.includes("ERROR:"))
kadmos/vistoms/vistoms.py
+ 309
− 172
View file @ cdce491b
This diff is collapsed.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment