blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-19 16:02:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature-68598/Rollup_lets_try_it_again

Browse Source
This commit is contained in:
Harald Bamberger
2025-10-23 17:08:22 +02:00
parent 1e082792bb 87ec4fd482
commit f074503266
5 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/Cis/Documents.php
+1 -1
View File
@@ -72,7 +72,7 @@ class Documents extends Auth_Controller
$stgs = [];
$stsemArray = [];
$buchungstypen = implode('\',\'', defined("CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN") ? unserialize(CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN) : []);
$buchungstypen = defined("CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN") ? unserialize(CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN) : [];
$person_ids = [];
foreach ($stati as $status) {
$person_ids[] = $status->person_id;
application/controllers/api/frontend/v1/ProfilUpdate.php
+8 -2
View File
@@ -637,7 +637,7 @@ class ProfilUpdate extends FHCAPI_Controller
//? Send email to the Studiengangsassistentinnen
$this->StudentModel->addSelect(["public.tbl_studiengang.email"]);
$this->StudentModel->addJoin("public.tbl_benutzer", "public.tbl_benutzer.uid = public.tbl_student.student_uid");
$this->StudentModel->addJoin("public.tbl_prestudent", "public.tbl_benutzer.person_id = public.tbl_prestudent.person_id");
$this->StudentModel->addJoin("public.tbl_prestudent", "public.tbl_benutzer.person_id = public.tbl_prestudent.person_id and public.tbl_student.studiengang_kz = public.tbl_prestudent.studiengang_kz");
$this->StudentModel->addJoin("public.tbl_prestudentstatus", "public.tbl_prestudentstatus.prestudent_id = public.tbl_prestudent.prestudent_id");
$this->StudentModel->addJoin("public.tbl_studiengang", "public.tbl_studiengang.studiengang_kz = public.tbl_prestudent.studiengang_kz");
$this->StudentModel->addGroupBy(["public.tbl_studiengang.email"]);
@@ -706,7 +706,13 @@ class ProfilUpdate extends FHCAPI_Controller
private function setStatusOnUpdateRequest($id, $status, $status_message)
{
return $this->ProfilUpdateModel->update([$id], ["status" => $status, "status_timestamp" => "NOW()", "status_message" => $status_message]);
return $this->ProfilUpdateModel->update([$id], [
"status" => $status,
"status_timestamp" => "NOW()",
"status_message" => $status_message,
"updateamum" => "NOW()",
"updatevon" => getAuthUID()
]);
}
private function updateRequestedChange($id, $requested_change)
application/controllers/api/frontend/v1/stv/Konto.php
+2 -2
View File
@@ -352,7 +352,7 @@ class Konto extends FHCAPI_Controller
continue;
}
$result = $this->KontoModel->insert([
'person_id' => $buchung['person_id'],
'studiengang_kz' => $buchung['studiengang_kz'],
@@ -361,7 +361,7 @@ class Konto extends FHCAPI_Controller
'buchungstyp_kurzbz' => $buchung['buchungstyp_kurzbz'],
'credit_points' => $buchung['credit_points'],
'zahlungsreferenz' => $buchung['zahlungsreferenz'],
'betrag' => $betrag,
'betrag' => number_format($betrag, 2, '.', ''),
'buchungsdatum' => $buchungsdatum,
'mahnspanne' => '0',
'buchungsnr_verweis' => $buchung['buchungsnr'],
public/js/plugins/Api.js
+7 -9
View File
@@ -10,8 +10,6 @@ export default {
if (!app.config.globalProperties.$fhcAlert)
app.use(FhcAlert);
const $fhcAlert = app.config.globalProperties.$fhcAlert;
function _send_array_or_object(errors, func) {
if (Array.isArray(errors))
errors.forEach(func);
@@ -115,7 +113,7 @@ export default {
await $p.loadCategory('ui');
const n_errors = $p.t('ui/n_errors', { n: counter });
$fhcAlert.alertDefault(
app.config.globalProperties.$fhcAlert.alertDefault(
'error',
n_errors,
'<dl>' + msgs.join('') + '</dl>',
@@ -146,7 +144,7 @@ export default {
title += ': PHP ' + error.severity;
else
title = 'PHP ' + error.severity;
$fhcAlert.alertDefault('warn', title, message, true);
app.config.globalProperties.$fhcAlert.alertDefault('warn', title, message, true);
break;
case 'Notice':
case 'User Notice':
@@ -155,13 +153,13 @@ export default {
title += ': PHP ' + error.severity;
else
title = 'PHP ' + error.severity;
$fhcAlert.alertDefault('info', title, message, true);
app.config.globalProperties.$fhcAlert.alertDefault('info', title, message, true);
break;
default:
message = 'Type: PHP ' + error.severity + '\n\n' + message;
if (title)
message = title + '\n\n' + message;
$fhcAlert.alertSystemError(message);
app.config.globalProperties.$fhcAlert.alertSystemError(message);
break;
}
});
@@ -183,7 +181,7 @@ export default {
message += '\tFunction: ' + err.function + '\n';
});
}
$fhcAlert.alertSystemError(message);
app.config.globalProperties.$fhcAlert.alertSystemError(message);
});
},
db(errors) {
@@ -206,7 +204,7 @@ export default {
if (error.line !== undefined)
message += 'Line Number: ' + error.line + '\n';
$fhcAlert.alertSystemError(message);
app.config.globalProperties.$fhcAlert.alertSystemError(message);
});
},
auth(errors) {
@@ -221,7 +219,7 @@ export default {
message += 'Method name: ' + error.method + '\n';
message += 'Required permissions: ' + error.required_permissions;
$fhcAlert.alertDefault(
app.config.globalProperties.$fhcAlert.alertDefault(
'error',
title,
message,
rdf/lehrveranstaltungszeugnis_ktu.rdf.php
+2 -2
View File
@@ -335,14 +335,14 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
$anrechnung = new anrechnung();
$anrechnung->getAnrechnungPrestudent($student->prestudent_id, null, $lehrveranstaltung_id);
$xml .= "<studienverpflichtung>";
$xml .= "<studienverpflichtung><![CDATA[";
$lehrveranstaltung_id_kompatibel = "";
if(count($anrechnung->result) === 1)
{
$lehrveranstaltung_id_kompatibel = $anrechnung->result[0]->lehrveranstaltung_id;
$xml .= $anrechnung->result[0]->lehrveranstaltung_bez;
}
$xml .= "</studienverpflichtung>";
$xml .= "]]></studienverpflichtung>";
if($lehrveranstaltung_id_kompatibel != "")
{