Differential D4790 Diff 11820 src/activities/letter-in-word/letter-in-word.js

Changeset View

Standalone View

View Options

src/activities/letter-in-word/letter-in-word.js

Context not available.
224} 224​}
225 225​
226function checkAnswer() { 226​function checkAnswer() {
227 var hasWordNotFound = false; 227​ var allcorrectselected = false
dmadaanUnsubmitted
Not Done

Rename the variable to "allCorrectSelected" or "allWordsSelected"

dmadaan: Rename the variable to "allCorrectSelected" or "allWordsSelected"
228 var modelEntry; 228​ var modelEntry;
229 for(var i = 0; i < words.length; i++) { 229​ for(var i = 0; i < words.length; i++) {
230 modelEntry = items.wordsModel.get(i); 230​ modelEntry = items.wordsModel.get(i);
231​ if(modelEntry.spelling.indexOf(currentLetter) != -1 && modelEntry.selected == true) {
232​ allcorrectselected = true;
233​ }
231 if(modelEntry.spelling.indexOf(currentLetter) != -1 && modelEntry.selected == false) { 234​ if(modelEntry.spelling.indexOf(currentLetter) != -1 && modelEntry.selected == false) {
232 hasWordNotFound = true; 235​ allcorrectselected = false;
236​ break;
237​ }
238​ if(modelEntry.spelling.indexOf(currentLetter) == -1 && modelEntry.selected == true) {
239​ allcorrectselected = false;
233 break; 240​ break;
234 } 241​ }
235 } 242​ }
236 if(hasWordNotFound == false) { 243​ if(allcorrectselected == true) {
237 items.bonus.good("flower"); 244​ items.bonus.good("flower");
238 } 245​ }
246​ else {
247​ items.bonus.bad("flower");
248​ }
239} 249​}
240 250​
241function checkWord(index) { 251​function checkWord(index) {
242 var modelEntry = items.wordsModel.get(index); 252​ var modelEntry = items.wordsModel.get(index);
243 if(modelEntry.spelling.indexOf(currentLetter) != -1) { 253​ items.wordsModel.setProperty(index, "selected", true);
244 items.wordsModel.setProperty(index, "selected", true); 254​ return true;
245 checkAnswer(); ​
246 return true; ​
247 } ​
248 else { ​
249 items.audioVoices.append(GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/misc/check_answer.$CA")) ​
250 return false; ​
251 } ​
252} 255​}
253 256​
254function incorrectSelection() { 257​function incorrectSelection() {
255 incorrectFlag = true; 258​ incorrectFlag = true;
256 var quesLen = questions.length; 259​ var quesLen = questions.length;
260​ var modelEntry;
261​ for(var i = 0; i < words.length; i++) {
262​ modelEntry = items.wordsModel.get(i);
263​ modelEntry.selected = false;
264​ }
265​ questions = questions.slice(0, currentSubLevel) + questions.charAt(currentSubLevel) + questions.slice(currentSubLevel+1, quesLen);
dmadaanUnsubmitted
Not Done
  1. If I select a wrong word and press "OK" the letter changes.
  2. The correct words having the letter turn the letter green in that word (tells that the word is correct). There may be a better way to show the selected words without making the letter green and use the "Ok" button validation for check?
dmadaan: 1. If I select a wrong word and press "OK" the letter changes. 2. The correct words having the…
souradeepbaruaAuthorUnsubmitted
Not Done
  1. Actually, when a wrong word is chosen and pressed "OK", all the selected words are then deselected and the same letter appears again. This could push the child to take time and observe each word again, instead of trying all possibilities. Any thoughts on this?
  1. We could just play the voice when the child selects a word. When the child presses "OK", we could highlight the current letter in correct words.
souradeepbarua: 1. Actually, when a wrong word is chosen and pressed "OK", all the selected words are then…
257 currentSubLevel--; 266​ currentSubLevel--;
258 nextSubLevel(); 267​ nextSubLevel();
259} 268​}
Context not available.