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 +11 -3
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 205ba74eff - Show all commits

2
VERSION
View file

@ -1 +1 @@
0.3.97-beta 0.3.98-beta

8
public/js/admin.js
View file

@ -259,6 +259,7 @@
}); });
async function reload(){ async function reload(){
let reloadError = null;
try{ try{
if(currentUser.role==="super"){ if(currentUser.role==="super"){
SCHOOLS = await api("/schools"); SCHOOLS = await api("/schools");
@ -287,8 +288,13 @@
const lq = currentUser.role==="super" ? "?school="+selSchool : ""; const lq = currentUser.role==="super" ? "?school="+selSchool : "";
LINK_REQUESTS = ((await api("/admin/link-requests"+lq).catch(()=>({}))).requests) || []; LINK_REQUESTS = ((await api("/admin/link-requests"+lq).catch(()=>({}))).requests) || [];
} }
}catch(e){ USERS = []; CLASSES = []; ASSIGNMENTS = {}; LINK_REQUESTS = []; } }catch(e){ USERS = []; CLASSES = []; ASSIGNMENTS = {}; LINK_REQUESTS = []; reloadError = e; }
render(); render();
/* render() bouwt de modal (incl. .am-msg) helemaal opnieuw op, dus de
melding pas ná render() zetten - anders wordt hij meteen weer gewist.
Zonder dit bleef het paneel bij een fout stilletjes helemaal leeg staan
zonder enige aanwijzing waarom. */
if(reloadError) msg(T("amLoadError") + ": " + reloadError.message);
} }
function classSel(current){ function classSel(current){

4
public/js/core.js
View file

@ -2,7 +2,7 @@
"use strict"; "use strict";
/* version — shown until /api/version resolves (or if the fetch fails, e.g. offline). /* version — shown until /api/version resolves (or if the fetch fails, e.g. offline).
Kept in sync by hand with the VERSION file at the repo root on every release. */ Kept in sync by hand with the VERSION file at the repo root on every release. */
const VERSION = "0.3.97-beta"; const VERSION = "0.3.98-beta";
(function(){ (function(){
const tag = document.getElementById("verTag"); const tag = document.getElementById("verTag");
tag.textContent = "v"+VERSION; tag.textContent = "v"+VERSION;
@ -282,6 +282,7 @@ const I18N = {
amNoSchool:"— geen school —", amNoSchoolGroup:"Zonder school", amShowMore:"meer tonen", amNoSchool:"— geen school —", amNoSchoolGroup:"Zonder school", amShowMore:"meer tonen",
amMoveToSchool:"— verplaats naar school… —", amFieldMoveSchool:"Verplaats naar", amPickSchoolFirst:"Kies hierboven eerst een school om de klassen te zien of aan te maken.", amMoveToSchool:"— verplaats naar school… —", amFieldMoveSchool:"Verplaats naar", amPickSchoolFirst:"Kies hierboven eerst een school om de klassen te zien of aan te maken.",
amNoClassesHere:"Deze school heeft nog geen klassen. Bestaande klassen kunnen bij een andere school horen — kies die school hierboven, of maak hieronder een nieuwe klas.", amNoClassesHere:"Deze school heeft nog geen klassen. Bestaande klassen kunnen bij een andere school horen — kies die school hierboven, of maak hieronder een nieuwe klas.",
amLoadError:"Laden mislukt",
amDetailEmpty:"Selecteer links een gebruiker om te bewerken, of maak een nieuwe aan.", amDetailEmpty:"Selecteer links een gebruiker om te bewerken, of maak een nieuwe aan.",
amNewUser:"Nieuwe gebruiker", amRequestOne:"Aanmelding", amReqNew:"nieuw", amNewUser:"Nieuwe gebruiker", amRequestOne:"Aanmelding", amReqNew:"nieuw",
amParents:"Ouders", amParents:"Ouders",
@ -579,6 +580,7 @@ const I18N = {
amNoSchool:"— no school —", amNoSchoolGroup:"No school", amShowMore:"show more", amNoSchool:"— no school —", amNoSchoolGroup:"No school", amShowMore:"show more",
amMoveToSchool:"— move to school… —", amFieldMoveSchool:"Move to", amPickSchoolFirst:"First pick a school above to see or create its classes.", amMoveToSchool:"— move to school… —", amFieldMoveSchool:"Move to", amPickSchoolFirst:"First pick a school above to see or create its classes.",
amNoClassesHere:"This school has no classes yet. Existing classes may belong to another school — pick that school above, or create a new class below.", amNoClassesHere:"This school has no classes yet. Existing classes may belong to another school — pick that school above, or create a new class below.",
amLoadError:"Failed to load",
amDetailEmpty:"Select a user on the left to edit, or create a new one.", amDetailEmpty:"Select a user on the left to edit, or create a new one.",
amNewUser:"New user", amRequestOne:"Enrolment", amReqNew:"new", amNewUser:"New user", amRequestOne:"Enrolment", amReqNew:"new",
amParents:"Parents", amParents:"Parents",