Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/evt2024.r1 #192

Merged
merged 6 commits into from
Jul 30, 2024
Merged

Feature/evt2024.r1 #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
337e25b
2024.R1 ember apps
schefbi Jun 25, 2024
c5c3a39
2024.R1 Raumreservation
schefbi Jun 25, 2024
3fb570d
2024.R1 Stellvertretung
schefbi Jun 25, 2024
4625df8
2014.R1 Noteneingabe
schefbi Jun 25, 2024
3b85ec3
slh rest api bug not fixed EVO-12498
schefbi Jun 25, 2024
55ec922
Merge branch 'main' into feature/evt2024.R1
schefbi Jul 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion public/apps/EmberApps/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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: {
Expand Down
2 changes: 1 addition & 1 deletion public/apps/EmberApps/config.prod.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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: {
Expand Down
8 changes: 7 additions & 1 deletion public/apps/Noteneingabe/App/Controllers/statisticController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
},

Expand Down
30 changes: 16 additions & 14 deletions public/apps/Noteneingabe/App/HtmlTemplates/grading.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
2 changes: 1 addition & 1 deletion public/apps/Noteneingabe/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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: {
Expand Down
8 changes: 4 additions & 4 deletions public/apps/Raumreservation/index.html.new
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>
8 changes: 4 additions & 4 deletions public/apps/Raumreservation/infoscreen.html.new
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>
1 change: 0 additions & 1 deletion public/apps/Stellvertretung/main.js.map
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion public/apps/Stellvertretung/polyfills.js.map
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion public/apps/Stellvertretung/runtime.js.map
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion public/apps/Stellvertretung/scripts.js.map
View file
Open in desktop

This file was deleted.

22 changes: 22 additions & 0 deletions public/apps/Stellvertretung/settings.js.new
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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: '.',
};
1 change: 0 additions & 1 deletion public/apps/Stellvertretung/src_app_substitutions_substitutions_module_ts.js.map
View file
Open in desktop

This file was deleted.

Loading