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

Tab Status: change statusgrund_kurzbz to bezeichnung_mehrsprachig

Browse Source
This commit is contained in:
ma0068
2024-06-14 15:58:11 +02:00
parent 521423a343
commit 1036c97be7
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/frontend/v1/stv/Status.php
+8 -1
View File
@@ -32,9 +32,16 @@ class Status extends FHCAPI_Controller
public function getHistoryPrestudent($prestudent_id)
{
$this->load->model('system/Sprache_model', 'SpracheModel');
$this->SpracheModel->addSelect('index');
$result = $this->SpracheModel->loadWhere(array('sprache' => getUserLanguage()));
// Return language index
$lang = hasData($result) ? getData($result)[0]->index : 1;
$this->load->model('crm/Prestudent_model', 'PrestudentModel');
$result = $this->PrestudentModel->getHistoryPrestudent($prestudent_id);
$result = $this->PrestudentModel->getHistoryPrestudent($prestudent_id, $lang);
if (isError($result))
{
$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
application/models/crm/Prestudent_model.php
+5 -3
View File
@@ -718,6 +718,7 @@ class Prestudent_model extends DB_Model
ORDER BY prestudent_id, datum desc, insertamum desc
) ps USING(prestudent_id)
JOIN public.tbl_status USING(status_kurzbz)
LEFT JOIN public.tbl_status_grund g USING (statusgrund_id)
JOIN public.tbl_studiengang sg USING(studiengang_kz)
LEFT JOIN lehre.tbl_studienplan sp USING (studienplan_id)
LEFT JOIN public.tbl_student s USING (prestudent_id)
@@ -732,7 +733,7 @@ class Prestudent_model extends DB_Model
* @param int $prestudent_id
* @return object
*/
public function getHistoryPrestudent($prestudent_id)
public function getHistoryPrestudent($prestudent_id, $index_lang)
{
$query = "
SELECT
@@ -761,7 +762,8 @@ class Prestudent_model extends DB_Model
ps.insertvon,
ps.updateamum,
TO_CHAR(ps.updateamum::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS format_updateamum,
ps.updatevon
ps.updatevon,
stg.beschreibung[?] as statusgrund_beschreibung
FROM
public.tbl_prestudentstatus ps
LEFT JOIN
@@ -781,6 +783,6 @@ class Prestudent_model extends DB_Model
ORDER BY datum DESC
";
return $this->execQuery($query, array($prestudent_id));
return $this->execQuery($query, array($index_lang, $prestudent_id));
}
}
public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+1 -2
View File
@@ -125,8 +125,7 @@ export default{
{title: "Studienplan", field: "bezeichnung"},
{title: "BestätigtAm", field: "format_bestaetigtam"},
{title: "AbgeschicktAm", field: "format_bewerbung_abgeschicktamum", visible:false},
{title: "Statusgrund", field: "statusgrund_kurzbz"},
{title: "Bezeichnung", field: "bezeichnung_mehrsprachig[0]"},
{title: "Statusgrund", field: "statusgrund_beschreibung"},
{title: "Organisationsform", field: "orgform_kurzbz", visible: false},
{title: "PrestudentInId", field: "prestudent_id", visible: false},
{title: "StudienplanId", field: "studienplan_id", visible: false},