Merge pull request #192 from bkd-mba-fbi/feature/evt2024.R1

Feature/evt2024.r1
bkd-mba-fbi · Jul 30, 2024 · abd067f · abd067f
2 parents 663b8eb + 55ec922
commit abd067f
Show file tree

Hide file tree

Showing 16 changed files with 56 additions and 34 deletions.
diff --git 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
@@ -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
@@ -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
@@ -37,23 +37,25 @@ <h3 style="color: #721c24">{{msg.header}}</h3>
                 {{#if model.Event.Scale.Designation}}
                     <div class="gradingText">{{translate 'grade_scale'}} {{model.Event.Scale.Designation}}</div>
                 {{/if}}
-                <div class="not-mobile gradesActionButtons">
-                    <button class="btn-action btn-clearGrades" {{action 'triggerModalDialogPrompt' 'clearGrades'}}>{{translate 'deleteAllGrades'}}</button>
-                    <button class="btn-action btn-applyGrade" {{action 'triggerModalDialogPrompt' 'applyGrade'}}>{{translate 'setAsDefault'}}</button>
-                    {{#if model.IsUnregisteredStudentsEnabled}}
+                {{#if model.Event.GradingScaleId}}
+                    <div class="not-mobile gradesActionButtons">
+                        <button class="btn-action btn-clearGrades" {{action 'triggerModalDialogPrompt' 'clearGrades'}}>{{translate 'deleteAllGrades'}}</button>
+                        <button class="btn-action btn-applyGrade" {{action 'triggerModalDialogPrompt' 'applyGrade'}}>{{translate 'setAsDefault'}}</button>
+                        {{#if model.IsUnregisteredStudentsEnabled}}
                         <button class="btn-action btn-addUnregisteredStudent" {{action 'addUnregisteredStudent'}}>{{translate 'addUnregisteredStudent'}}</button>
-                    {{/if}}
-                    {{#if showExcelButton}}
+                        {{/if}}
+                        {{#if showExcelButton}}
                         {{#context-menu-button id='btnExcelGradingList' icon='excel' forceClose='forceCloseExcel' right=true}}
-                            <a href="{{excelUrl}}" target="_blank">{{translate 'downloadExcelGradingList'}}</a>
-                            <div>
-                                {{translate 'uploadExcelGradingList'}}<br />
-                                {{input id='fluExcelGradingList' type="file"}}
-                                <button id="btnUploadExcelGradingList" type="button" {{action 'uploadExcel'}}>{{icon 'continue'}}</button>
-                            </div>
+                        <a href="{{excelUrl}}" target="_blank">{{translate 'downloadExcelGradingList'}}</a>
+                        <div>
+                            {{translate 'uploadExcelGradingList'}}<br />
+                            {{input id='fluExcelGradingList' type="file"}}
+                            <button id="btnUploadExcelGradingList" type="button" {{action 'uploadExcel'}}>{{icon 'continue'}}</button>
+                        </div>
                         {{/context-menu-button}}
-                    {{/if}}
-                </div>
+                        {{/if}}
+                    </div>
+                {{/if}}
             </div>
 
             {{#if model.hasNothingToShow}}

diff --git a/public/apps/Noteneingabe/config.js b/public/apps/Noteneingabe/config.js
@@ -1,6 +1,6 @@
 define({
     // add the version here to force cache to reload files
-    urlArgs: 'bust=EVT2023.R2.20231215030709',
+    urlArgs: 'bust=EVT2024.R1.20240614111509',
     //baseUrl: '../JSModules',
     app_name: 'CLX.Evento Modules',
     shim: {

diff --git a/public/apps/Raumreservation/index.html.new b/public/apps/Raumreservation/index.html.new
@@ -9,16 +9,16 @@
   <base href="/">
 
   <!-- CLX -->
-  <link rel="stylesheet" href="./assets/css/bootstrap-clx.min.css?bust=23.2.20231215030941">
+  <link rel="stylesheet" href="./assets/css/bootstrap-clx.min.css?bust=24.1.20240614111957">
 
-  <link href="./assets/icons/open-iconic/css/open-iconic-bootstrap.min.css?bust=23.2.20231215030941" rel="stylesheet">
+  <link href="./assets/icons/open-iconic/css/open-iconic-bootstrap.min.css?bust=24.1.20240614111957" rel="stylesheet">
   <link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet">
   <title>Raumreservation</title>
 
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="./favicon.ico">
   <link rel="icon" sizes="64x64" href="./assets/icons/appicon.png">
-<link rel="stylesheet" href="styles.css?bust=23.2.20231215030941"></head>
+<link rel="stylesheet" href="styles.css?bust=24.1.20240614111957"></head>
 
 <body>
 
@@ -29,6 +29,6 @@
     </div>
   </app-root>
 
-<script type="text/javascript" src="runtime.js?bust=23.2.20231215030941"></script><script type="text/javascript" src="polyfills.js?bust=23.2.20231215030941"></script><script type="text/javascript" src="main.js?bust=23.2.20231215030941"></script></body>
+<script type="text/javascript" src="runtime.js?bust=24.1.20240614111957"></script><script type="text/javascript" src="polyfills.js?bust=24.1.20240614111957"></script><script type="text/javascript" src="main.js?bust=24.1.20240614111957"></script></body>
 
 </html>
diff --git a/public/apps/Raumreservation/infoscreen.html.new b/public/apps/Raumreservation/infoscreen.html.new
@@ -9,16 +9,16 @@
   <base href="/">
 
   <!-- CLX -->
-  <link rel="stylesheet" href="./assets/css/bootstrap-clx.min.css?bust=23.2.20231215030941">
+  <link rel="stylesheet" href="./assets/css/bootstrap-clx.min.css?bust=24.1.20240614111957">
 
-  <link href="./assets/icons/open-iconic/css/open-iconic-bootstrap.min.css?bust=23.2.20231215030941" rel="stylesheet">
+  <link href="./assets/icons/open-iconic/css/open-iconic-bootstrap.min.css?bust=24.1.20240614111957" rel="stylesheet">
   <link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet">
   <title>Raumreservation</title>
 
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="./favicon.ico">
   <link rel="icon" sizes="64x64" href="./assets/icons/appicon.png">
-<link rel="stylesheet" href="styles.css?bust=23.2.20231215030941"></head>
+<link rel="stylesheet" href="styles.css?bust=24.1.20240614111957"></head>
 
 <body>
 
@@ -29,6 +29,6 @@
     </div>
   </app-root>
 
-<script type="text/javascript" src="runtime.js?bust=23.2.20231215030941"></script><script type="text/javascript" src="polyfills.js?bust=23.2.20231215030941"></script><script type="text/javascript" src="main.js?bust=23.2.20231215030941"></script></body>
+<script type="text/javascript" src="runtime.js?bust=24.1.20240614111957"></script><script type="text/javascript" src="polyfills.js?bust=24.1.20240614111957"></script><script type="text/javascript" src="main.js?bust=24.1.20240614111957"></script></body>
 
 </html>
diff --git a/public/apps/Stellvertretung/main.js.map b/public/apps/Stellvertretung/main.js.map
diff --git a/public/apps/Stellvertretung/polyfills.js.map b/public/apps/Stellvertretung/polyfills.js.map
diff --git a/public/apps/Stellvertretung/runtime.js.map b/public/apps/Stellvertretung/runtime.js.map
diff --git a/public/apps/Stellvertretung/scripts.js.map b/public/apps/Stellvertretung/scripts.js.map
diff --git a/public/apps/Stellvertretung/settings.js.new b/public/apps/Stellvertretung/settings.js.new
@@ -0,0 +1,22 @@
+// Rename this file to settings.js and adjust the settings
+
+window.stellvertretung = window.stellvertretung || {};
+
+window.stellvertretung.settings = {
+  /**
+   * General settings
+   */
+  // API base URL (without trailing slash)
+  apiUrl: 'http://localhost/CLX.Evento/api',
+  oAuthUrl: 'http://localhost/CLX.Evento',
+  oAuthRedirectUrl: 'http://localhost:4200',
+  webModuleRedirectUrlAdHoc: 'http://localhost:4200/#substitutions/execute',
+  clientId: 'CLX.Evento-Public',
+  appScope: 'Tutoring',
+  instanceId: '111',
+
+  // Path (without trailing slash, relative to the index.html) to the
+  // JavaScript bundles and the assets directory containing image and
+  // locale files
+  scriptsAndAssetsPath: '.',
+};
diff --git a/public/apps/Stellvertretung/src_app_substitutions_substitutions_module_ts.js.map b/public/apps/Stellvertretung/src_app_substitutions_substitutions_module_ts.js.map