Skip to content

Commit 7e6a643

Browse files
schefbischefbi
committed
Merge branch 'bug/722-excel-status-tests' of https://github.com/bkd-mba-fbi/evento-portal into bug/722-excel-status-tests
2 parents 8594d1f + d34f15f commit 7e6a643

16 files changed

+56
-34
lines changed

‎public/apps/EmberApps/config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
define({
22
// add the version here to force cache to reload files
3-
urlArgs: 'bust=EVT2023.R2.20231215030708',
3+
urlArgs: 'bust=EVT2024.R1.20240614111507',
44
//baseUrl: '../JSModules',
55
app_name: 'CLX.Evento Modules',
66
shim: {

‎public/apps/EmberApps/config.prod.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
define({
22
// add the version here to force cache to reload files
3-
urlArgs: 'bust=EVT2023.R2.20231215030708',
3+
urlArgs: 'bust=EVT2024.R1.20240614111507',
44
//baseUrl: '../JSModules',
55
app_name: 'CLX.Evento Modules',
66
shim: {

‎public/apps/Noteneingabe/App/Controllers/statisticController.js

+7-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,13 @@
119119
switch((statusProcesses || []).length) {
120120
case 0: return null;
121121
case 1: return statusProcesses[0].IdStatus;
122-
default: return statusProcesses.sort(function (l, r) { return l.IdStatus - r.IdStatus;})[0].IdStatus;
122+
default: {
123+
var filtered = statusProcesses.filter(function (sp) { return sp.StatusCodes.includes(20); });
124+
if (filtered)
125+
return filtered[0].IdStatus;
126+
else
127+
return statusProcesses.sort(function (l, r) { return l.IdStatus - r.IdStatus; })[0].IdStatus;
128+
}
123129
}
124130
},
125131

‎public/apps/Noteneingabe/App/HtmlTemplates/grading.html

+16-14
Original file line numberDiff line numberDiff line change
@@ -37,23 +37,25 @@ <h3 style="color: #721c24">{{msg.header}}</h3>
3737
{{#if model.Event.Scale.Designation}}
3838
<div class="gradingText">{{translate 'grade_scale'}} {{model.Event.Scale.Designation}}</div>
3939
{{/if}}
40-
<div class="not-mobile gradesActionButtons">
41-
<button class="btn-action btn-clearGrades" {{action 'triggerModalDialogPrompt' 'clearGrades'}}>{{translate 'deleteAllGrades'}}</button>
42-
<button class="btn-action btn-applyGrade" {{action 'triggerModalDialogPrompt' 'applyGrade'}}>{{translate 'setAsDefault'}}</button>
43-
{{#if model.IsUnregisteredStudentsEnabled}}
40+
{{#if model.Event.GradingScaleId}}
41+
<div class="not-mobile gradesActionButtons">
42+
<button class="btn-action btn-clearGrades" {{action 'triggerModalDialogPrompt' 'clearGrades'}}>{{translate 'deleteAllGrades'}}</button>
43+
<button class="btn-action btn-applyGrade" {{action 'triggerModalDialogPrompt' 'applyGrade'}}>{{translate 'setAsDefault'}}</button>
44+
{{#if model.IsUnregisteredStudentsEnabled}}
4445
<button class="btn-action btn-addUnregisteredStudent" {{action 'addUnregisteredStudent'}}>{{translate 'addUnregisteredStudent'}}</button>
45-
{{/if}}
46-
{{#if showExcelButton}}
46+
{{/if}}
47+
{{#if showExcelButton}}
4748
{{#context-menu-button id='btnExcelGradingList' icon='excel' forceClose='forceCloseExcel' right=true}}
48-
<a href="{{excelUrl}}" target="_blank">{{translate 'downloadExcelGradingList'}}</a>
49-
<div>
50-
{{translate 'uploadExcelGradingList'}}<br />
51-
{{input id='fluExcelGradingList' type="file"}}
52-
<button id="btnUploadExcelGradingList" type="button" {{action 'uploadExcel'}}>{{icon 'continue'}}</button>
53-
</div>
49+
<a href="{{excelUrl}}" target="_blank">{{translate 'downloadExcelGradingList'}}</a>
50+
<div>
51+
{{translate 'uploadExcelGradingList'}}<br />
52+
{{input id='fluExcelGradingList' type="file"}}
53+
<button id="btnUploadExcelGradingList" type="button" {{action 'uploadExcel'}}>{{icon 'continue'}}</button>
54+
</div>
5455
{{/context-menu-button}}
55-
{{/if}}
56-
</div>
56+
{{/if}}
57+
</div>
58+
{{/if}}
5759
</div>
5860

5961
{{#if model.hasNothingToShow}}

‎public/apps/Noteneingabe/config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
define({
22
// add the version here to force cache to reload files
3-
urlArgs: 'bust=EVT2023.R2.20231215030709',
3+
urlArgs: 'bust=EVT2024.R1.20240614111509',
44
//baseUrl: '../JSModules',
55
app_name: 'CLX.Evento Modules',
66
shim: {

‎public/apps/Raumreservation/index.html.new

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
<base href="/">
1010

1111
<!-- CLX -->
12-
<link rel="stylesheet" href="./assets/css/bootstrap-clx.min.css?bust=23.2.20231215030941">
12+
<link rel="stylesheet" href="./assets/css/bootstrap-clx.min.css?bust=24.1.20240614111957">
1313

14-
<link href="./assets/icons/open-iconic/css/open-iconic-bootstrap.min.css?bust=23.2.20231215030941" rel="stylesheet">
14+
<link href="./assets/icons/open-iconic/css/open-iconic-bootstrap.min.css?bust=24.1.20240614111957" rel="stylesheet">
1515
<link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet">
1616
<title>Raumreservation</title>
1717

1818
<meta name="viewport" content="width=device-width, initial-scale=1">
1919
<link rel="icon" type="image/x-icon" href="./favicon.ico">
2020
<link rel="icon" sizes="64x64" href="./assets/icons/appicon.png">
21-
<link rel="stylesheet" href="styles.css?bust=23.2.20231215030941"></head>
21+
<link rel="stylesheet" href="styles.css?bust=24.1.20240614111957"></head>
2222

2323
<body>
2424

@@ -29,6 +29,6 @@
2929
</div>
3030
</app-root>
3131

32-
<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>
32+
<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>
3333

3434
</html>

‎public/apps/Raumreservation/infoscreen.html.new

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
<base href="/">
1010

1111
<!-- CLX -->
12-
<link rel="stylesheet" href="./assets/css/bootstrap-clx.min.css?bust=23.2.20231215030941">
12+
<link rel="stylesheet" href="./assets/css/bootstrap-clx.min.css?bust=24.1.20240614111957">
1313

14-
<link href="./assets/icons/open-iconic/css/open-iconic-bootstrap.min.css?bust=23.2.20231215030941" rel="stylesheet">
14+
<link href="./assets/icons/open-iconic/css/open-iconic-bootstrap.min.css?bust=24.1.20240614111957" rel="stylesheet">
1515
<link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet">
1616
<title>Raumreservation</title>
1717

1818
<meta name="viewport" content="width=device-width, initial-scale=1">
1919
<link rel="icon" type="image/x-icon" href="./favicon.ico">
2020
<link rel="icon" sizes="64x64" href="./assets/icons/appicon.png">
21-
<link rel="stylesheet" href="styles.css?bust=23.2.20231215030941"></head>
21+
<link rel="stylesheet" href="styles.css?bust=24.1.20240614111957"></head>
2222

2323
<body>
2424

@@ -29,6 +29,6 @@
2929
</div>
3030
</app-root>
3131

32-
<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>
32+
<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>
3333

3434
</html>

‎public/apps/Stellvertretung/main.js.map

-1
This file was deleted.

‎public/apps/Stellvertretung/polyfills.js.map

-1
This file was deleted.

‎public/apps/Stellvertretung/runtime.js.map

-1
This file was deleted.

‎public/apps/Stellvertretung/scripts.js.map

-1
This file was deleted.

‎public/apps/Stellvertretung/settings.js.new

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// Rename this file to settings.js and adjust the settings
2+
3+
window.stellvertretung = window.stellvertretung || {};
4+
5+
window.stellvertretung.settings = {
6+
/**
7+
* General settings
8+
*/
9+
// API base URL (without trailing slash)
10+
apiUrl: 'http://localhost/CLX.Evento/api',
11+
oAuthUrl: 'http://localhost/CLX.Evento',
12+
oAuthRedirectUrl: 'http://localhost:4200',
13+
webModuleRedirectUrlAdHoc: 'http://localhost:4200/#substitutions/execute',
14+
clientId: 'CLX.Evento-Public',
15+
appScope: 'Tutoring',
16+
instanceId: '111',
17+
18+
// Path (without trailing slash, relative to the index.html) to the
19+
// JavaScript bundles and the assets directory containing image and
20+
// locale files
21+
scriptsAndAssetsPath: '.',
22+
};

‎public/apps/Stellvertretung/src_app_substitutions_substitutions_module_ts.js.map

-1
This file was deleted.

0 commit comments

Comments
 (0)