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

refactor Accepting and Unaccepting Documents, new Error Message if more than one document per type, refactor List Accepted Documents

Browse Source
This commit is contained in:
ma0068
2025-06-16 15:38:56 +02:00
parent 7b5b6992c7
commit 5140d9de31
4 changed files with 81 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/frontend/v1/stv/Dokumente.php
+17 -18
View File
@@ -94,33 +94,29 @@ class Dokumente extends FHCAPI_Controller
if (hasData($result))
{
$data = getData($result);
array_push($arrayAccepted, current($data));
foreach ($data as $value)
{
array_push($arrayAccepted, $value);
}
}
}
//Merge with Data of Akte
//Array for total list of accepted documents
$newDataMap = [];
//helper, lookupArray
foreach ($arrayAccepted as $item) {
$newDataMap[$item->dokument_kurzbz] = $item;
$newDataMap[] = (array)$item;
}
//add Data of Akte to PrestudentData
foreach ($resultPreDoc as $obj) {
if (isset($newDataMap[$obj->dokument_kurzbz])) {
$obj->akte_id = $newDataMap[$obj->dokument_kurzbz]->akte_id;
$obj->hochgeladenamum = $newDataMap[$obj->dokument_kurzbz]->hochgeladenamum;
$obj->titel_intern = $newDataMap[$obj->dokument_kurzbz]->titel_intern;
$obj->nachgereicht = $newDataMap[$obj->dokument_kurzbz]->nachgereicht;
$obj->akzeptiertamum = $newDataMap[$obj->dokument_kurzbz]->akzeptiertamum;
$obj->dms_id = $newDataMap[$obj->dokument_kurzbz]->dms_id;
$obj->infotext = $newDataMap[$obj->dokument_kurzbz]->infotext;
$obj->anmerkung_intern = $newDataMap[$obj->dokument_kurzbz]->anmerkung_intern;
$obj->nachgereicht_am = $newDataMap[$obj->dokument_kurzbz]->nachgereicht_am;
$obj->vorhanden = $newDataMap[$obj->dokument_kurzbz]->vorhanden;
$listExistingKurzbz = array_column($newDataMap, 'dokument_kurzbz');
foreach ($resultPreDoc as $item)
{
if (!in_array($item->dokument_kurzbz, $listExistingKurzbz))
{
$newDataMap[] = (array)$item;
}
}
$this->terminateWithSuccess($resultPreDoc);
$this->terminateWithSuccess($newDataMap);
}
public function deleteZuordnung($prestudent_id, $dokument_kurzbz)
@@ -215,6 +211,9 @@ class Dokumente extends FHCAPI_Controller
$uid = getAuthUid();
//check if more than 1 dokumentkurzbz
//if()
$result = $this->DokumentprestudentModel->insert(
[
'prestudent_id' => $prestudent_id,