Skip to content

Commit 0dc40af

Browse files
author
Antonino Tramontana
committed
added routine for animal verse and instrument packages management
1 parent 6119ef2 commit 0dc40af

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

src/components/Activity.vue

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@ function readTextFile(file, callback) {
258258
rawFile.send(null);
259259
}
260260
var instrumentlist = [];//["pianoooo","pianoo"], ["chitarra","guiitar"], ["flauto","fluute"]];
261+
var animalist = [];//["pianoooo","pianoo"], ["chitarra","guiitar"], ["flauto","fluute"]];
261262
//usage:
262263
var data = readTextFile( "./static/music_package.json" , function(text){
263264
var datas = JSON.parse(text);
@@ -266,9 +267,14 @@ var data = readTextFile( "./static/music_package.json" , function(text){
266267
Object.keys(datas['packages']).forEach(function(key) {
267268
console.table('Key : ' + key + ', Value : ' + datas['packages'][key])
268269
console.table('Key : name_IT, Value : ' + datas['packages'][key]['name_IT'])
269-
270270
var names = [datas['packages'][key]['name_IT'], key];
271-
instrumentlist[instrumentlist.length] = names;
271+
272+
if (datas['packages'][key]['category'] == 'instrument'){
273+
instrumentlist[instrumentlist.length] = names;
274+
}
275+
else if (datas['packages'][key]['category'] == 'animal'){
276+
animalist[animalist.length] = names;
277+
}
272278
})
273279
return datas;
274280
});
@@ -1723,7 +1729,7 @@ export default {
17231729
this.appendDummyInput()
17241730
.appendField(new Blockly.FieldImage("/static/images/blocks/animal.png", 30, 30, { alt: "*", flipRtl: "FALSE" }))
17251731
.appendField("Verso del")
1726-
.appendField(new Blockly.FieldDropdown([["Gatto","cat"], ["Cane","dog"]]), "Verso del");
1732+
.appendField(new Blockly.FieldDropdown(animalist), "Verso del");
17271733
this.setInputsInline(true);
17281734
this.setPreviousStatement(true, null);
17291735
this.setNextStatement(true, null);
@@ -1801,7 +1807,7 @@ export default {
18011807
.appendField(new Blockly.FieldDropdown([["DO ","C2"], ["RE ","D2"], ["MI ","E2"], ["FA ","F2"], ["FA # ","F#2"], ["SOL ","G2"], ["LA ","A2"], ["SI b ","Bb2"], ["SI ","B2"], ["DO+ ","C3"], ["RE+ ","D3"] ]), "note");
18021808
this.appendDummyInput()
18031809
.appendField("animale")
1804-
.appendField(new Blockly.FieldDropdown([["Gatto","cat"], ["Cane","dog"], ["Dinosaur","dinosaur"]]), "instrument");
1810+
.appendField(new Blockly.FieldDropdown(animalist), "instrument");
18051811
this.appendValueInput("duration")
18061812
.setCheck("Number")
18071813
.setAlign(Blockly.ALIGN_CENTRE)
@@ -1907,7 +1913,7 @@ export default {
19071913
Blockly.Blocks['coderbot_music_instrument_adv'] = {
19081914
init: function() {
19091915
this.appendDummyInput()
1910-
.appendField(new Blockly.FieldDropdown([["guitar","guitar"], ["piano","piano"], ["flauto","flute"]]), "instrument");
1916+
.appendField(new Blockly.FieldDropdown(instrumentlist), "instrument");
19111917
this.setInputsInline(true);
19121918
this.setOutput(true, 'String');
19131919
this.setColour(345);
@@ -1925,7 +1931,7 @@ export default {
19251931
Blockly.Blocks['coderbot_music_animal_adv'] = {
19261932
init: function() {
19271933
this.appendDummyInput()
1928-
.appendField(new Blockly.FieldDropdown([["cane","dog"], ["gatto","cat"]]), "instrument");
1934+
.appendField(new Blockly.FieldDropdown(animalist), "instrument");
19291935
this.setInputsInline(true);
19301936
this.setOutput(true, 'String');
19311937
this.setColour(345);

0 commit comments

Comments
 (0)