Skip to content
This repository was archived by the owner on Aug 17, 2024. It is now read-only.

combine_join block #428

Open
MayaGans wants to merge 3 commits into
base: master
Choose a base branch
from
Open

combine_join block #428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d36e6cc
data blocks have connection'
MayaGans Nov 15, 2020
a3c01d2
remove check
MayaGans Nov 15, 2020
7fbad06
adding which column to join by
MayaGans Nov 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions blocks/blocks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
32 changes: 32 additions & 0 deletions blocks/combine.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down Expand Up @@ -180,6 +181,37 @@ 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: 'Right Table 1 %1 Left Table 1 2%2 Join Using: %3 %4',
args0: [
{
type: 'input_statement',
name: 'RIGHT_TABLE',
},
{
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',
//extensions: ['validate_LEFT_TABLE', 'validate_LEFT_COLUMN', 'validate_RIGHT_TABLE', 'validate_RIGHT_COLUMN']
}
])

Expand Down
14 changes: 7 additions & 7 deletions blocks/data.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,39 +161,39 @@ 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'
},
// Penguins
{
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'
},
// Phish
{
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'
},
Expand All @@ -214,8 +214,8 @@ const setup = (language) => {
}
],
nextStatement: null,
previousStatement: null,
style: 'data_block',
hat: 'cap',
tooltip: msg.get('sequence.tooltip'),
helpUrl: './guide/#sequence'
},
Expand All @@ -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'
}
Expand Down