Merge pull request #362 from TextDB/jimmy-fixed-join

[Issue #246] [GUI] Added dynamic sub-connectors and multiple links on output
Texera · Jan 23, 2017 · d752cff · d752cff
2 parents 414d4d9 + fbd811b
commit d752cff
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/textdb/textdb-gui/js/onstart.js b/textdb/textdb-gui/js/onstart.js
@@ -11,7 +11,8 @@ var setup = function(){
 
 	// Apply the plugin on a standard, empty div...
 	$('#the-flowchart').flowchart({
-		data: data
+		data: data,
+		multipleLinksOnOutput: true
 	});
 
 	var operatorI = 0;
@@ -381,12 +382,12 @@ var setup = function(){
 				title: (operatorName),
 				inputs: {
 					input_1: {
-						label: 'Input 1',
+						label: 'Input (:i)',
 					}
 				},
 				outputs: {
 					output_1: {
-						label: 'Output 1',
+						label: 'Output (:i)',
 					}
 				},
 				attributes: {
@@ -402,6 +403,10 @@ var setup = function(){
 		operatorData.properties.attributes['attributes'] = userAttributes;
 		operatorData.properties.attributes['limit'] = userLimit;
 		operatorData.properties.attributes['offset'] = userOffset;
+
+		if(operatorName == "Join"){
+			operatorData.properties.inputs['input_2'] = {label: 'Input 2'};
+		}
 
 		operatorI++;
 
@@ -444,12 +449,12 @@ var setup = function(){
 				title: (operatorName),
 				inputs: {
 					input_1: {
-						label: 'Input 1',
+						label: 'Input (:i)',
 					}
 				},
 				outputs: {
 					output_1: {
-						label: 'Output 1',
+						label: 'Output (:i)',
 					}
 				},
 				attributes: {
@@ -466,10 +471,10 @@ var setup = function(){
 				result = DEFAULT_DICT;
 			}
 			operatorData.properties.attributes[attr] = result;
-		}
-      
-		$('#the-flowchart').flowchart('deleteSelected');
-		$('#the-flowchart').flowchart('createOperator', operatorId, operatorData);
+		}	
+		
+		$('#the-flowchart').flowchart('setOperatorData', operatorId, operatorData);
+
 		$('#the-flowchart').flowchart('selectOperator', operatorId);
 		selectedOperator = $('#the-flowchart').flowchart('getSelectedOperatorId');