Merge branch 'music_ext_sprint_1' of https://github.com/MicheleCarbonera/vue-app into music_ext_sprint_1

The basic version of the Coderbot music interface has been completely implemented

Author: Antonino Tramontana

src/assets/toolbox_adv.xml

@@ -345,4 +345,10 @@
 		<block type="coderbot_audio_listen"></block>
 		<!--<block type="coderbot_conv_get_action"></block>-->
 	</category>
-</xml>
+	<category name="Music" colour="345">
+		<block type="coderbot_music_note_adv"></block>
+		<block type="coderbot_music_instrument_adv"></block>
+		<block type="coderbot_music_animal_adv"></block>
+		<block type="coderbot_music_pause_adv"></block>
+	</category>
+</xml>

src/components/Activity.vue

@@ -1763,6 +1763,120 @@ export default {
 				var code = sbsPrefix + 'get_bot().get_sonar_distance(' + sonar + ')';
 				return [code, Blockly.Python.ORDER_ATOMIC];
 			};
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+			Blockly.Blocks['coderbot_music_note_adv'] = {
+				init: function() {
+				this.appendDummyInput()
+					.appendField("nota")
+					.appendField(new Blockly.FieldDropdown([["DO","C2"], ["RE","D2"], ["MI","E2"], ["FA","F2"], ["SOL","G2"], ["LA","A2"], ["SI","B2"], ["DO+","C3"], ["RE+","D3"]]), "note")
+					.appendField(new Blockly.FieldDropdown([["nessuna alterazione","none"], ["b","bmolle"], ["#","diesis"]]), "alteration");
+				this.appendValueInput("instrument")
+					.setCheck("String")
+					.appendField("strumento");
+				this.appendValueInput("duration")
+					.setCheck("Number")
+					.setAlign(Blockly.ALIGN_CENTRE)
+					.appendField("durata");
+				this.appendDummyInput()
+					.appendField("secondi");
+				this.setInputsInline(true);
+				this.setPreviousStatement(true, null);
+				this.setNextStatement(true, null);
+				this.setColour(345);
+				this.setTooltip("");
+				this.setHelpUrl("");
+				}
+			};
+
+			Blockly.Python['coderbot_music_note_adv'] = function(block) {
+				var dropdown_note = block.getFieldValue('note');
+				var dropdown_alteration = block.getFieldValue('alteration');
+				var value_instrument = Blockly.Python.valueToCode(block, 'instrument', Blockly.Python.ORDER_ATOMIC);
+				
+				var value_duration = Blockly.Python.valueToCode(block, 'duration', Blockly.Python.ORDER_ATOMIC);
+
+				
+
+				var code = 'get_music().play_note(note="'+dropdown_note+'", alteration="'+dropdown_alteration+'" ,instrument='+value_instrument+' ,duration='+value_duration+')\n';
+				return code;
+			};
+
+			Blockly.Blocks['coderbot_music_instrument_adv'] = {
+				init: function() {
+					this.appendDummyInput()
+						.appendField(new Blockly.FieldDropdown([["guitar","guitar"], ["piano","piano"], ["flauto","flute"]]), "instrument");
+					this.setInputsInline(true);
+					this.setOutput(true, 'String');
+					this.setColour(345);
+				this.setTooltip("");
+				this.setHelpUrl("");
+				}
+			};
+
+			Blockly.Python['coderbot_music_instrument_adv'] = function(block) {
+				var dropdown_instrument = block.getFieldValue('instrument');
+				var code = '"'+dropdown_instrument+'"';
+				return [code, Blockly.Python.ORDER_ATOMIC];
+			};
+
+			Blockly.Blocks['coderbot_music_animal_adv'] = {
+				init: function() {
+					this.appendDummyInput()
+						.appendField(new Blockly.FieldDropdown([["cane","dog"], ["gatto","cat"]]), "instrument");
+					this.setInputsInline(true);
+					this.setOutput(true, 'String');
+					this.setColour(345);
+				this.setTooltip("");
+				this.setHelpUrl("");
+				}
+			};
+
+			Blockly.Python['coderbot_music_animal_adv'] = function(block) {
+				var dropdown_instrument = block.getFieldValue('instrument');
+				var code = '"'+dropdown_instrument+'"';
+				return [code, Blockly.Python.ORDER_ATOMIC];
+			};
+
+            Blockly.Blocks['coderbot_music_pause_adv'] = {
+                init: function() {
+                    this.appendDummyInput()
+                        .appendField("pausa");
+                    this.appendValueInput("duration")
+                        .setCheck("Number")
+                        .setAlign(Blockly.ALIGN_CENTRE)
+                        .appendField("durata");
+                    this.appendDummyInput()
+                        .appendField("secondi");
+                    this.setInputsInline(true);
+                    this.setPreviousStatement(true, null);
+                    this.setNextStatement(true, null);
+                    this.setColour(345);
+                    this.setTooltip("");
+                    this.setHelpUrl("");
+                 }
+            };
+     
+           Blockly.Python['coderbot_music_pause_adv'] = function(block) {
+               var value_duration = Blockly.Python.valueToCode(block, 'duration', Blockly.Python.ORDER_ATOMIC);
+               var code = 'get_music().play_pause('+value_duration+')\n';
+               return code;
+           };
+
+
+
 		},
 
 		toggleSidebar() {