warnings disabled

Program-AR · Sep 5, 2023 · ae600fa · ae600fa
1 parent d29858d
commit ae600fa
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 12 deletions.
diff --git a/app/components/challenge-workspace-buttons.js b/app/components/challenge-workspace-buttons.js
@@ -11,7 +11,6 @@ export default Component.extend({
   xml: null,
   store: service(),
   deleteDialogIsOpen: false,
-  warningsDisabled: true,
   platform: service(),
   intl: service(),
 
@@ -85,14 +84,22 @@ export default Component.extend({
     input.value = null;
   },
 
+  changeWarningVisibility(visible) {
+    changeWarningVisibility(visible)
+    this.set('warningsVisible', visible)
+  },
+
   actions: {
     abrirSolucion() {
       this.fileInput().click();
     },
+
+    enableWarnings() {
+      this.changeWarningVisibility(true)
+    },
 
-    changeWarningVisibility() {
-      changeWarningVisibility(!this.get('warningsDisabled'))
-      this.set('warningsDisabled', !this.get('warningsDisabled'))
+    disableWarnings() {
+      this.changeWarningVisibility(false)
     },
 
     guardarSolucion() {

diff --git a/app/components/pilas-blockly.js b/app/components/pilas-blockly.js
@@ -21,6 +21,7 @@ export default Component.extend({
   codigoJavascript: "", // Se carga como parametro
   codigo: null,
   challenge: null,
+  warningsVisible: true,
 
   highlighter: service(),
   availableBlocksValidator: service(),
@@ -436,7 +437,7 @@ export default Component.extend({
       .filter(condition)
       .forEach(({ declaration, description }, i) => {
         getBlocks(declaration)
-          .forEach(block => addFeedback(block, description.asSuggestion, -i))
+          .forEach(block => addFeedback(block, description.asSuggestion, -i, this.get('warningsVisible')))
       })
   },
 

diff --git a/app/templates/components/challenge-workspace-buttons.hbs b/app/templates/components/challenge-workspace-buttons.hbs
@@ -2,7 +2,7 @@
     <span class="flex"></span>
     <input type='file' id="cargarActividadInput" accept=".spbq" class="hidden" />
     <a id="placeholder" class="hidden">..</a>
-    <Button @tooltip={{if this.warningsDisabled (t "components.challengeWorkspaceButtons.warnings.disable") (t "components.challengeWorkspaceButtons.warnings.enable") }} @isMini={{true}} @isFab={{true}} @isRaised={{true}} @onClick={{action "changeWarningVisibility"}}>{{paper-icon (if this.warningsDisabled "speaker_notes_off" "speaker_notes")}}</Button>
+    <Button @tooltip={{if this.warningsVisible (t "components.challengeWorkspaceButtons.warnings.disable") (t "components.challengeWorkspaceButtons.warnings.enable")}} @isMini={{true}} @isFab={{true}} @isRaised={{true}} @onClick={{action (if this.warningsVisible "disableWarnings" "enableWarnings")}}>{{paper-icon (if this.warningsVisible "speaker_notes_off" "speaker_notes")}}</Button>
     <Button @tooltip={{t "components.challengeWorkspaceButtons.open" }} @isMini={{true}} @isFab={{true}} @isRaised={{true}} @onClick={{action "abrirSolucion"}}>{{paper-icon "folder"}}</Button>
     <Button @tooltip={{t "components.challengeWorkspaceButtons.save"}} @isMini={{true}} @isFab={{true}} @isRaised={{true}} @onClick={{action "guardarSolucion"}}>{{paper-icon "save"}}</Button>
     <Button @tooltip={{t "components.challengeWorkspaceButtons.delete"}} @isMini={{true}} @isFab={{true}} @isRaised={{true}} @onClick={{action (mut this.deleteDialogIsOpen) true}}>{{paper-icon "delete"}}</Button>

diff --git a/app/templates/components/pilas-blockly.hbs b/app/templates/components/pilas-blockly.hbs
@@ -22,6 +22,7 @@
       <ChallengeWorkspaceButtons 
         @actividad={{this.challenge}} 
         @shouldUseFloatingMode={{this.shouldUseFloatingMode}} 
+        @warningsVisible={{this.warningsVisible}}
         @changeScreenMode={{this.changeScreenMode}} 
         @xml={{this.codigoActualEnFormatoXML}}
         @setWorkspace={{action "setWorkspace"}}

diff --git a/app/utils/blocks.js b/app/utils/blocks.js
@@ -175,19 +175,20 @@ const setWarningBubbleColour = (block, colour) => {
   block.warning.setVisible = (visible) => { boundedSetVisible(visible); if (visible) block.warning.bubble_.setColour(colour) }
 }
 
-const addWarningToBlock = (block, itemChar, message, index, bubbleColour) => {
+const addWarningToBlock = (block, itemChar, message, index, bubbleColour, visible = true) => {
   const text = `${itemChar} ${lineWrap(message)}`
   block.setWarningText(text, index)
   setWarningBubbleColour(block, bubbleColour)
-  block.warning.setVisible(true)
+  block.warning.setVisible(visible)
 }
 
-export function addWarning(block, message, index) {
-  addWarningToBlock(block, '☆', message, index, 'yellow')
+export function addWarning(block, message, index, visible) {
+  addWarningToBlock(block, '☆', message, index, 'yellow', visible)
 }
 
-export function addError(block, message, index) {
-  addWarningToBlock(block, '★', message, index, 'red')
+export function addError(block, message, index, visible) {
+  console.log(visible)
+  addWarningToBlock(block, '★', message, index, 'red', visible)
 }
 
 export function changeWarningVisibility(visible) {