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

Delete Prestudent

Browse Source
This commit is contained in:
ma0068
2024-02-29 10:58:45 +01:00
parent 88df5057fb
commit 77e31f2da6
6 changed files with 90 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/crm/Prestudent_model.php
+2 -2
View File
@@ -743,7 +743,7 @@ class Prestudent_model extends DB_Model
{
return getData($result);
}
if($result->retval != "0")
if($result->retval == "0") //wenn kein studentlehrband eingetragen
{
$query = "
SELECT
@@ -782,7 +782,7 @@ class Prestudent_model extends DB_Model
{
$query = "
SELECT
ps.status_kurzbz2,
ps.status_kurzbz,
ps.studiensemester_kurzbz,
ps.ausbildungssemester,
CASE WHEN ps.status_kurzbz IN ('Student', 'Diplomand') THEN CONCAT(lv.semester, lv.verband, lv.gruppe) END AS lehrverband,
application/models/crm/Prestudentstatus_model.php
+10 -4
View File
@@ -504,13 +504,19 @@ class Prestudentstatus_model extends DB_Model
$new_status_semesterstart = $studiensemester->start;
//get all prestudentstati
//TODO(manu) errorlogic
$resultPs = $this->getAllPrestudentstatiWithStudiensemester($prestudent_id);
if (isError($resultPs))
{
$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
return $this->outputJson(getError($resultPs));
$resultArr = [];
}
$resultArr = $resultPs->retval;
if(!hasData($resultPs))
{
$resultArr = [];
}
else
$resultArr = $resultPs->retval;
$statusArr = array();
$newStatusInserted = false;
@@ -625,7 +631,7 @@ class Prestudentstatus_model extends DB_Model
return error($result);
}
if (!hasData($result)) {
return error('No Statusdata vorhanden');
return success("0",'No Statusdata vorhanden');
}
return $result;
application/models/crm/Student_model.php
+1 -1
View File
@@ -82,7 +82,7 @@ class Student_model extends DB_Model
if(isError($result))
{
return error("0", "Error while checking student_uid");
return error( "Error while checking student_uid");
}
if (!hasData($result))