@@ -9,7 +9,7 @@ function mountNumberline(root, initState){
-
+
@@ -20,7 +20,7 @@ function mountNumberline(root, initState){
`;
const q=s=>root.querySelector(s), minEl=q('.nlw-min'), maxEl=q('.nlw-max'), stepEl=q('.nlw-step'),
- line=q('.nlw-line'), valueEl=q('.nlw-value'), task=q('.nlw-task'), feedback=q('.nlw-feedback');
+ line=q('.nlw-line'), valueEl=q('.nlw-value'), task=q('.nlw-task'), feedback=q('.nlw-feedback'),score=q('.nlw-score');
minEl.value=S.min; maxEl.value=S.max; stepEl.value=S.step;
function normalize(){
let min=Math.max(-100,Math.min(99,+minEl.value||0)); let max=Math.max(-99,Math.min(200,+maxEl.value||20));
@@ -37,13 +37,16 @@ function mountNumberline(root, initState){
const b=document.createElement('button'); b.type='button'; b.className='nlw-tick'; b.dataset.v=v;
const mark=document.createElement('i'), label=document.createElement('span'); label.textContent=v;
b.append(mark,label); b.classList.toggle('selected',v===S.value);
- b.addEventListener('click',()=>{S.value=v; feedback.textContent=""; render();}); line.appendChild(b);
+ b.addEventListener('click',()=>{S.value=v;if(!S.solved)feedback.textContent="";render();}); line.appendChild(b);
}
valueEl.textContent=S.value; task.textContent=T('numberlineTask').replace('{number}',S.target);
+ score.textContent=T('numberlineScore').replace('{score}',S.score).replace('{streak}',S.streak);
}
function newTarget(){
- const count=Math.floor((S.max-S.min)/S.step); S.target=S.min+Math.floor(Math.random()*(count+1))*S.step;
- feedback.textContent=""; render();
+ const count=Math.floor((S.max-S.min)/S.step);let target=S.target;
+ for(let tries=0;tries<8&&target===S.target;tries++)target=S.min+Math.floor(Math.random()*(count+1))*S.step;
+ S.target=target;S.solved=false;
+ feedback.textContent="";feedback.className='nlw-feedback';render();
}
[minEl,maxEl,stepEl].forEach(el=>el.addEventListener('change',normalize));
q('.nlw-minus').addEventListener('click',()=>{S.value=Math.max(S.min,S.value-S.step);render();});
@@ -51,7 +54,8 @@ function mountNumberline(root, initState){
q('.nlw-new').addEventListener('click',newTarget);
q('.nlw-check').addEventListener('click',()=>{
const ok=S.value===S.target; feedback.textContent=T(ok?'numberlineGood':'numberlineTry');
- feedback.className='nlw-feedback '+(ok?'ok':'bad'); if(ok){sndGood();confetti(root);}else sndBad();
+ feedback.className='nlw-feedback '+(ok?'ok':'bad');
+ if(ok){if(!S.solved){S.score++;S.streak++;S.solved=true;}sndGood();confetti(root);}else{S.streak=0;S.solved=false;sndBad();}render();
});
function labels(){
q('.nlw-from-label').textContent=T('numberlineFrom'); q('.nlw-to-label').textContent=T('numberlineTo');
diff --git a/public/js/widgets/sentence.js b/public/js/widgets/sentence.js
index af163ca..79107f1 100644
--- a/public/js/widgets/sentence.js
+++ b/public/js/widgets/sentence.js
@@ -4,7 +4,7 @@ function mountSentence(root, initState){
who:['De hond','Mijn vriend','De juf','Sara'], does:['lees','speelt','maakt','ziet'],
what:['een boek','op het plein','een mooie tekening','de rode bal'],
} : {
- who:['The dog','My friend','The teacher','Sarah'], does:['read','plays','makes','sees'],
+ who:['The dog','My friend','The teacher','Sarah'], does:['reads','plays','makes','sees'],
what:['a book','in the playground','a beautiful drawing','the red ball'],
};
const S={banks:JSON.parse(JSON.stringify(initState?.banks||defaults)),sentence:[...(initState?.sentence||[])]};
@@ -17,10 +17,10 @@ function mountSentence(root, initState){
-