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

bugfix redraw only if table, refactor generate_personenkennzeichen

Browse Source
This commit is contained in:
ma0068
2024-07-16 07:47:18 +02:00
parent b8601bac51
commit 8860969649
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/frontend/v1/stv/Status.php
+12 -5
View File
@@ -2,6 +2,7 @@
if (! defined('BASEPATH')) exit('No direct script access allowed');
use CI3_Events as Events;
use \DateTime as DateTime;
class Status extends FHCAPI_Controller
@@ -879,12 +880,18 @@ class Status extends FHCAPI_Controller
$semesterAufgenommen = current(getData($result));
//generate Personenkennzeichen(matrikelnr)
$resultMat = $this->StudentModel->generateMatrikelnummer2($stg, $semesterAufgenommen->studiensemester_kurzbz, $typ);
if (isError($resultMat)) {
return $this->terminateWithError($resultMat, self::ERROR_TYPE_GENERAL);
$matrikelnr = false;
Events::trigger('generate_personenkennzeichen', $stg, $semesterAufgenommen, $typ, function ($value) use ($matrikelnr) {
$matrikelnr = $value;
});
if ($matrikelnr === false) {
$resultMat = $this->StudentModel->generateMatrikelnummer2($stg, $semesterAufgenommen->studiensemester_kurzbz, $typ);
if (isError($resultMat)) {
return $this->terminateWithError($resultMat, self::ERROR_TYPE_GENERAL);
}
$matrikelnr = getData($resultMat);
}
$matrikelnr = getData($resultMat);
$jahr = mb_substr($matrikelnr, 0, 2);
$jahr = mb_substr($semesterAufgenommen, 4, 2);
//generate UID
$resultUid = $this->StudentModel->generateUID($stgkzl, $jahr, $typ, $matrikelnr);
public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+2 -3
View File
@@ -781,9 +781,8 @@ export default{
.get('api/frontend/v1/stv/status/getLastBismeldestichtag/')
.then(result => {
this.dataMeldestichtag = result.data[0].meldestichtag;
//TODO(Manu) wirft plötzlich fehler bei multiselect status
// if (this.$refs.table.tableBuilt)
// this.$refs.table.tabulator.redraw(true);
if (this.$refs.table && this.$refs.table.tableBuilt)
this.$refs.table.tabulator.redraw(true);
})
.catch(this.$fhcAlert.handleSystemError);
},