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

akzeptierte dokumente anzeigen, auch wenn kein dokument vorhanden ist

Browse Source
This commit is contained in:
ma0048
2026-04-13 13:04:46 +02:00
parent b2538075ee
commit 21d80905a2
1 changed files with 13 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/frontend/v1/stv/Dokumente.php
+13 -33
View File
@@ -78,52 +78,32 @@ class Dokumente extends FHCAPI_Controller
$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Studiengang_kz']), self::ERROR_TYPE_GENERAL); $this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Studiengang_kz']), self::ERROR_TYPE_GENERAL);
$resultPreDoc = $this->_getPrestudentDokumente($prestudent_id); $resultPreDoc = $this->_getPrestudentDokumente($prestudent_id);
$arrayAccepted = [];
$person_id = $this->_getPersonId($prestudent_id); $person_id = $this->_getPersonId($prestudent_id);
$docNames = array_map(function ($item) { $mergedArray = [];
return $item->dokument_kurzbz;
}, $resultPreDoc);
foreach($docNames as $doc) foreach ($resultPreDoc as $pre)
{ {
$result = $this->AkteModel->getAktenFAS($person_id, $doc, $studiengang_kz, $prestudent_id, true); $result = $this->AkteModel->getAktenFAS($person_id, $pre->dokument_kurzbz, $studiengang_kz, $prestudent_id, true);
if (isError($result)) if (isError($result))
{
return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL); return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
}
if (hasData($result)) if (hasData($result))
{ {
$data = getData($result); foreach (getData($result) as $doc)
foreach ($data as $value)
{ {
array_push($arrayAccepted, $value); $merged = clone $doc;
$merged->docdatum = $pre->docdatum;
$merged->insertvonma = $pre->insertvonma;
$merged->bezeichnung = $pre->bezeichnung;
$mergedArray[] = $merged;
} }
} }
} else
{
//Mapping with document_kurzbz $mergedArray[] = $pre;
$preDocMap = [];
foreach ($resultPreDoc as $pre) {
$preDocMap[$pre->dokument_kurzbz] = $pre;
}
$mergedArray = [];
foreach ($arrayAccepted as $doc) {
$merged = clone $doc;
if (isset($preDocMap[$doc->dokument_kurzbz])) {
$merged->docdatum = $preDocMap[$doc->dokument_kurzbz]->docdatum;
$merged->insertvonma = $preDocMap[$doc->dokument_kurzbz]->insertvonma;
$merged->bezeichnung = $preDocMap[$doc->dokument_kurzbz]->bezeichnung;
} else {
$merged->akzeptiertdatum = null;
$merged->akzeptiertvon = null;
} }
$mergedArray[] = $merged;
} }
$this->terminateWithSuccess($mergedArray); $this->terminateWithSuccess($mergedArray);