diff --git a/public/apps/EmberApps/config.js b/public/apps/EmberApps/config.js index e069244b..02f1df43 100644 --- a/public/apps/EmberApps/config.js +++ b/public/apps/EmberApps/config.js @@ -1,6 +1,6 @@ define({ // add the version here to force cache to reload files - urlArgs: 'bust=EVT2023.R2.20231215030708', + urlArgs: 'bust=EVT2024.R1.20240614111507', //baseUrl: '../JSModules', app_name: 'CLX.Evento Modules', shim: { diff --git a/public/apps/EmberApps/config.prod.js b/public/apps/EmberApps/config.prod.js index 90ec0f3d..2e3c07e2 100644 --- a/public/apps/EmberApps/config.prod.js +++ b/public/apps/EmberApps/config.prod.js @@ -1,6 +1,6 @@ define({ // add the version here to force cache to reload files - urlArgs: 'bust=EVT2023.R2.20231215030708', + urlArgs: 'bust=EVT2024.R1.20240614111507', //baseUrl: '../JSModules', app_name: 'CLX.Evento Modules', shim: { diff --git a/public/apps/Noteneingabe/App/Controllers/statisticController.js b/public/apps/Noteneingabe/App/Controllers/statisticController.js index bf318a27..6775ea00 100644 --- a/public/apps/Noteneingabe/App/Controllers/statisticController.js +++ b/public/apps/Noteneingabe/App/Controllers/statisticController.js @@ -119,7 +119,13 @@ switch((statusProcesses || []).length) { case 0: return null; case 1: return statusProcesses[0].IdStatus; - default: return statusProcesses.sort(function (l, r) { return l.IdStatus - r.IdStatus;})[0].IdStatus; + default: { + var filtered = statusProcesses.filter(function (sp) { return sp.StatusCodes.includes(20); }); + if (filtered) + return filtered[0].IdStatus; + else + return statusProcesses.sort(function (l, r) { return l.IdStatus - r.IdStatus; })[0].IdStatus; + } } }, diff --git a/public/apps/Noteneingabe/App/HtmlTemplates/grading.html b/public/apps/Noteneingabe/App/HtmlTemplates/grading.html index 8be67d8e..6d8f12eb 100644 --- a/public/apps/Noteneingabe/App/HtmlTemplates/grading.html +++ b/public/apps/Noteneingabe/App/HtmlTemplates/grading.html @@ -37,23 +37,25 @@