From d36e6cc5ca14c68f149cb7bf80c0175fb78945c4 Mon Sep 17 00:00:00 2001 From: Maya Gans Date: Sun, 15 Nov 2020 07:48:23 -0800 Subject: [PATCH 1/3] data blocks have connection' git push --- blocks/blocks.js | 3 +-- blocks/combine.js | 26 ++++++++++++++++++++++++++ blocks/data.js | 14 +++++++------- 3 files changed, 34 insertions(+), 9 deletions(-) diff --git a/blocks/blocks.js b/blocks/blocks.js index df16b32de..70093b6c2 100644 --- a/blocks/blocks.js +++ b/blocks/blocks.js @@ -209,8 +209,7 @@ const THEME = Blockly.Theme.defineTheme('tidyblocks', { data_block: { colourPrimary: DATA_COLOR, colourSecondary: '#64C7FF', - colourTertiary: '#9B732F', - hat: 'cap' + colourTertiary: '#9B732F' }, op_block: { colourPrimary: OP_COLOR, diff --git a/blocks/combine.js b/blocks/combine.js index d094def4d..4b3d305b1 100644 --- a/blocks/combine.js +++ b/blocks/combine.js @@ -143,6 +143,7 @@ const setup = (language) => { extensions: ['validate_LEFT_TABLE', 'validate_RIGHT_TABLE', 'validate_COLUMN'] }, // Join + /* { type: 'combine_join', message0: msg.get('join.message0'), @@ -180,6 +181,31 @@ const setup = (language) => { tooltip: msg.get('join.tooltip'), helpUrl: './guide/#join', extensions: ['validate_LEFT_TABLE', 'validate_LEFT_COLUMN', 'validate_RIGHT_TABLE', 'validate_RIGHT_COLUMN'] + }, + */ + { + type: 'combine_join', + message0: 'DATA 1 %1 DATA 2%2', + args0: [ + { + type: 'input_statement', + name: 'RIGHT_TABLE', + // do we want to check that it's a block of type data here? + check: '', + }, + { + type: 'input_statement', + name: 'LEFT_TABLE', + // do we want to check that it's a block of type data here? + check: '' + + } + ], + inputsInline: true, + nextStatement: null, + style: 'combine_block', + tooltip: msg.get('join.tooltip'), + helpUrl: './guide/#join' } ]) diff --git a/blocks/data.js b/blocks/data.js index b543b89af..960991857 100644 --- a/blocks/data.js +++ b/blocks/data.js @@ -161,19 +161,19 @@ const setup = (language) => { { type: 'data_colors', message0: msg.get('colors.message0'), + previousStatement: null, nextStatement: null, style: 'data_block', - hat: 'cap', tooltip: msg.get('colors.tooltip'), - helpUrl: './guide/#colors' + helpUrl: './guide/#colors', }, // Earthquakes { type: 'data_earthquakes', message0: msg.get('earthquakes.message0'), + previousStatement: null, nextStatement: null, style: 'data_block', - hat: 'cap', tooltip: msg.get('earthquakes.tooltip'), helpUrl: './guide/#earthquakes' }, @@ -181,9 +181,9 @@ const setup = (language) => { { type: 'data_penguins', message0: msg.get('penguins.message0'), + previousStatement: null, nextStatement: null, style: 'data_block', - hat: 'cap', tooltip: msg.get('penguins.tooltip'), helpUrl: './guide/#penguins' }, @@ -191,9 +191,9 @@ const setup = (language) => { { type: 'data_phish', message0: msg.get('phish.message0'), + previousStatement: null, nextStatement: null, style: 'data_block', - hat: 'cap', tooltip: msg.get('phish.tooltip'), helpUrl: './guide/#phish' }, @@ -214,8 +214,8 @@ const setup = (language) => { } ], nextStatement: null, + previousStatement: null, style: 'data_block', - hat: 'cap', tooltip: msg.get('sequence.tooltip'), helpUrl: './guide/#sequence' }, @@ -231,8 +231,8 @@ const setup = (language) => { } ], nextStatement: null, + previousStatement: null, style: 'data_block', - hat: 'cap', tooltip: msg.get('data_user.tooltip'), helpUrl: './guide/#user' } From a3c01d2e5e9c033ff816a94cf93e310e9897b9ad Mon Sep 17 00:00:00 2001 From: Maya Gans Date: Sun, 15 Nov 2020 07:51:23 -0800 Subject: [PATCH 2/3] remove check --- blocks/combine.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/blocks/combine.js b/blocks/combine.js index 4b3d305b1..6f05d0eb5 100644 --- a/blocks/combine.js +++ b/blocks/combine.js @@ -190,15 +190,10 @@ const setup = (language) => { { type: 'input_statement', name: 'RIGHT_TABLE', - // do we want to check that it's a block of type data here? - check: '', }, { type: 'input_statement', name: 'LEFT_TABLE', - // do we want to check that it's a block of type data here? - check: '' - } ], inputsInline: true, From 7fbad06a8165e7493c15ac8bc459c4231f1c62d4 Mon Sep 17 00:00:00 2001 From: Maya Gans Date: Sun, 15 Nov 2020 08:04:42 -0800 Subject: [PATCH 3/3] adding which column to join by --- blocks/combine.js | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/blocks/combine.js b/blocks/combine.js index 6f05d0eb5..bf2beba0c 100644 --- a/blocks/combine.js +++ b/blocks/combine.js @@ -185,7 +185,7 @@ const setup = (language) => { */ { type: 'combine_join', - message0: 'DATA 1 %1 DATA 2%2', + message0: 'Right Table 1 %1 Left Table 1 2%2 Join Using: %3 %4', args0: [ { type: 'input_statement', @@ -194,13 +194,24 @@ const setup = (language) => { { type: 'input_statement', name: 'LEFT_TABLE', - } + }, + { + type: 'field_input', + name: 'RIGHT_COLUMN', + text: 'right_column' + }, + { + type: 'field_input', + name: 'LEFT_COLUMN', + text: 'left_column' + }, ], inputsInline: true, nextStatement: null, style: 'combine_block', tooltip: msg.get('join.tooltip'), - helpUrl: './guide/#join' + helpUrl: './guide/#join', + //extensions: ['validate_LEFT_TABLE', 'validate_LEFT_COLUMN', 'validate_RIGHT_TABLE', 'validate_RIGHT_COLUMN'] } ])