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

bug Anzeige Orgform

Browse Source
This commit is contained in:
ma0068
2024-03-14 11:02:45 +01:00
parent e32c68e0e3
commit ac508a9f19
2 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/components/stv/Status.php
+26 -19
View File
@@ -187,7 +187,7 @@ class Status extends FHC_Controller
//check if bewerberstatus exists
if($status_kurzbz == 'Aufgenommener' || $status_kurzbz == 'Wartender')
{
//TODO(manu) Wartender NICHT in Liste!? nur in diesem Code
//TODO(manu) erst später für multiactions releveant
//FAS: Aufnahme ist möglich: Beispiel prestudent_id = 129629
$result = $this->PrestudentstatusModel->checkIfExistingBewerberstatus($prestudent_id, $name);
@@ -346,24 +346,31 @@ class Status extends FHC_Controller
//Student updaten (fuer Abbrecher und Unterbrecher)
//not active yet: works only for "status ändern" in FAS
/* $result = $this->StudentModel->update(
[
'student_uid' => $student_uid
],
[
'studiengang_kz' => $studiengang_kz,
'semester' => $ausbildungssemester,
'verband' => $verband,
'gruppe' => $gruppe,
'updateamum' => date('c'),
'updatevon' => $uid
]);
if ($this->db->trans_status() === false || isError($result))
{
$this->db->trans_rollback();
$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
return $this->outputJson($result->code);
}*/
//Later for multiactions
/*
if($status_kurzbz == 'Abbrecher' || $status_kurzbz == 'Unterbrecher')
{
$result = $this->StudentModel->update(
[
'student_uid' => $student_uid
],
[
'studiengang_kz' => $studiengang_kz,
'semester' => $ausbildungssemester,
'verband' => $verband,
'gruppe' => $gruppe,
'updateamum' => date('c'),
'updatevon' => $uid
]);
if ($this->db->trans_status() === false || isError($result))
{
$this->db->trans_rollback();
$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
return $this->outputJson($result->code);
}
}
*/
}
$this->db->trans_commit();
public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
+1 -1
View File
@@ -58,7 +58,7 @@ export default{
{title: "BestätigtAm", field: "format_bestaetigtam"},
{title: "AbgeschicktAm", field: "format_bewerbung_abgeschicktamum"},
{title: "Statusgrund", field: "statusgrund_kurzbz", visible: false},
{title: "Organisationsform", field: "ps.orgform_kurzbz", visible: false},
{title: "Organisationsform", field: "orgform_kurzbz", visible: false},
{title: "PrestudentInId", field: "prestudent_id", visible: false},
{title: "StudienplanId", field: "studienplan_id", visible: false},
{title: "Anmerkung", field: "anmerkung", visible: false},