bes-r/teach
1
0
Fork 0
Code Issues Pull requests 5 Projects Releases Packages Wiki Activity Actions

Verbeter grafische kwaliteit van kleurplaten (v0.4.67-beta) #5

Open
bes-r wants to merge 208 commits from bes-r/coloring-quality-v0.4.67 into main AGit
pull from: bes-r/coloring-quality-v0.4.67
merge into: bes-r:main
Conversation 0 Commits 208 Files changed 212 +7
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit a922caaa56 - Show all commits

5
public/js/learning-progressions.js
View file

@ -81,6 +81,11 @@ function languageWordsForYear(words,yearGroup,level){
if(!introduced.length&&hasExplicitYears)return[]; if(!introduced.length&&hasExplicitYears)return[];
const available=introduced.length?introduced:words; const available=introduced.length?introduced:words;
const caps=[0,5,7,9,12,15,18,22,99],cap=caps[year]+(learningLevel(level)-2)*2; const caps=[0,5,7,9,12,15,18,22,99],cap=caps[year]+(learningLevel(level)-2)*2;
if(year===1){
const anchors=available.filter(item=>Array.isArray(item)&&Number(item[2])===1);
const custom=available.filter(item=>!Array.isArray(item)||item[2]==null).filter(item=>languageWordComplexity(Array.isArray(item)?item[0]:item)<=cap);
return anchors.concat(custom)
}
const filtered=available.filter(item=>languageWordComplexity(Array.isArray(item)?item[0]:item)<=cap); const filtered=available.filter(item=>languageWordComplexity(Array.isArray(item)?item[0]:item)<=cap);
if(filtered.length>=Math.min(4,available.length))return filtered; if(filtered.length>=Math.min(4,available.length))return filtered;
return [...available].sort((a,b)=>languageWordComplexity(a[0])-languageWordComplexity(b[0])).slice(0,Math.min(4,available.length)) return [...available].sort((a,b)=>languageWordComplexity(a[0])-languageWordComplexity(b[0])).slice(0,Math.min(4,available.length))

2
test/learning-progressions.test.js
View file

@ -69,6 +69,8 @@ test('taalprofiel selecteert eenvoudiger woorden in de onderbouw en bouwt taakst
assert.equal(c.__languageTaskRules(3,2).literacyMode,'words'); assert.equal(c.__languageTaskRules(3,2).literacyMode,'words');
const letters=JSON.parse(JSON.stringify(c.__languageWidgetWords(words,1,2,'flits'))); const letters=JSON.parse(JSON.stringify(c.__languageWidgetWords(words,1,2,'flits')));
assert.ok(letters.every(([letter,,,anchor])=>letter.length===1&&anchor.startsWith(letter))); assert.ok(letters.every(([letter,,,anchor])=>letter.length===1&&anchor.startsWith(letter)));
const anchors=JSON.parse(JSON.stringify(c.__languageWordsForYear([['brandweerauto','x',1],['eigenmoeilijkwoord','x',null]],1,2)));
assert.deepEqual(anchors,[['brandweerauto','x',1]]);
}); });
test('rekenprofiel vergroot getalgebied, tafels en breuken per leerjaar',async()=>{ test('rekenprofiel vergroot getalgebied, tafels en breuken per leerjaar',async()=>{