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

Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci

Browse Source
This commit is contained in:
Stefan Puraner
2016-05-24 13:28:19 +02:00
parent eb845241d1 4f8826dc3f
commit 1026447281
8 changed files with 113 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/v1/crm/Prestudentstatus.php
+26 -27
View File
@@ -55,36 +55,35 @@ class Prestudentstatus extends APIv1_Controller
*/
public function postPrestudentstatus()
{
$prestudentstatus = $this->_parseData($this->post());
if ($this->_validate($prestudentstatus))
{
if (isset($prestudentstatus['ausbildungssemester']) && isset($prestudentstatus['studiensemester_kurzbz']) &&
isset($prestudentstatus['status_kurzbz']) && isset($prestudentstatus['prestudent_id']))
{
$pksArray = array($prestudentstatus['ausbildungssemester'],
$prestudentstatus['studiensemester_kurzbz'],
$prestudentstatus['status_kurzbz'],
$prestudentstatus['prestudent_id']
);
$prestudentstatus = $this->_parseData($this->post());
if ($this->_validate($prestudentstatus))
{
if(isset($prestudentstatus['new']) && $prestudentstatus['new'] == true)
{
$result = $this->PrestudentstatusModel->insert($prestudentstatus);
}
else
{
$pksArray = array($prestudentstatus['ausbildungssemester'],
$prestudentstatus['studiensemester_kurzbz'],
$prestudentstatus['status_kurzbz'],
$prestudentstatus['prestudent_id']
);
$result = $this->PrestudentstatusModel->update($pksArray, $prestudentstatus);
}
else
{
$result = $this->PrestudentstatusModel->insert($prestudentstatus);
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
$result = $this->PrestudentstatusModel->update($pksArray, $prestudentstatus);
}
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
private function _validate($prestudentstatus = NULL)
private function _validate($prestudentstatus = null)
{
return true;
}
}
}
application/controllers/api/v1/organisation/Studienplan.php
+16
View File
@@ -28,6 +28,22 @@ class Studienplan extends APIv1_Controller
$this->StudienplanModel->setUID($this->_getUID());
}
public function getStudienplan()
{
$studienplan_id = $this->get('studienplan_id');
if (isset($studienplan_id))
{
$result = $this->StudienplanModel->load($studienplan_id);
$this->response($result, REST_Controller::HTTP_OK);
}
else
{
$this->response();
}
}
public function getStudienplaene()
{
$studiengang_kz = $this->get('studiengang_kz');