mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-22 17:32:18 +00:00
Added method createAnrechnungsantrag to Anrechnungsmodel + Refactored code
Moved code from Controller to Anrechnungmodel. Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
This commit is contained in:
@@ -148,36 +148,22 @@ class CreateAnrechnung extends Auth_Controller
|
||||
$this->terminateWithJsonError($result->retval);
|
||||
}
|
||||
|
||||
// Store just inserted DMS ID
|
||||
// Hold just inserted DMS ID
|
||||
$lastInsert_dms_id = $result->retval['dms_id'];
|
||||
|
||||
// Start DB transaction
|
||||
$this->db->trans_start(false);
|
||||
// Save Anrechnung and Anrechnungstatus
|
||||
$result = $this->AnrechnungModel->createAnrechnungsantrag(
|
||||
$prestudent_id,
|
||||
$studiensemester_kurzbz,
|
||||
$lehrveranstaltung_id,
|
||||
$begruendung_id,
|
||||
$lastInsert_dms_id,
|
||||
$herkunftKenntnisse
|
||||
);
|
||||
|
||||
// Save Anrechnung
|
||||
$result = $this->AnrechnungModel->insert(array(
|
||||
'prestudent_id' => $prestudent_id,
|
||||
'lehrveranstaltung_id' => $lehrveranstaltung_id,
|
||||
'begruendung_id' => $begruendung_id,
|
||||
'dms_id' => $lastInsert_dms_id,
|
||||
'studiensemester_kurzbz' => $studiensemester_kurzbz,
|
||||
'anmerkung_student' => $herkunftKenntnisse,
|
||||
'insertvon' => $this->_uid
|
||||
));
|
||||
|
||||
// Store just inserted Anrechnung ID
|
||||
$lastInsert_anrechnung_id = $result->retval;
|
||||
|
||||
// Save Anrechnungstatus
|
||||
$this->AnrechnungModel->saveAnrechnungstatus($lastInsert_anrechnung_id, self::ANRECHNUNGSTATUS_PROGRESSED_BY_STGL);
|
||||
|
||||
// Transaction complete
|
||||
$this->db->trans_complete();
|
||||
|
||||
if ($this->db->trans_status() === false)
|
||||
if (isError($result))
|
||||
{
|
||||
$this->db->trans_rollback();
|
||||
show_error('Failed inserting Anrechnung', EXIT_ERROR);
|
||||
$this->terminateWithJsonError(getError($result));
|
||||
}
|
||||
|
||||
// Success response to AJAX
|
||||
|
||||
@@ -158,40 +158,26 @@ class requestAnrechnung extends Auth_Controller
|
||||
return $this->outputJsonError($result->retval);
|
||||
}
|
||||
|
||||
// Store just inserted DMS ID
|
||||
// Hold just inserted DMS ID
|
||||
$lastInsert_dms_id = $result->retval['dms_id'];
|
||||
|
||||
// Start DB transaction
|
||||
$this->db->trans_start(false);
|
||||
// Save Anrechnung and Anrechnungstatus
|
||||
$result = $this->AnrechnungModel->createAnrechnungsantrag(
|
||||
$prestudent_id,
|
||||
$studiensemester_kurzbz,
|
||||
$lehrveranstaltung_id,
|
||||
$begruendung_id,
|
||||
$lastInsert_dms_id,
|
||||
$anmerkung
|
||||
);
|
||||
|
||||
// Save Anrechnung
|
||||
$result = $this->AnrechnungModel->insert(array(
|
||||
'prestudent_id' => $prestudent_id,
|
||||
'lehrveranstaltung_id' => $lehrveranstaltung_id,
|
||||
'begruendung_id' => $begruendung_id,
|
||||
'dms_id' => $lastInsert_dms_id,
|
||||
'studiensemester_kurzbz' => $studiensemester_kurzbz,
|
||||
'anmerkung_student' => $anmerkung,
|
||||
'insertvon' => $this->_uid
|
||||
));
|
||||
|
||||
// Store just inserted Anrechnung ID
|
||||
$lastInsert_anrechnung_id = $result->retval;
|
||||
|
||||
// Save Anrechnungstatus
|
||||
$this->AnrechnungModel->saveAnrechnungstatus($lastInsert_anrechnung_id, self::ANRECHNUNGSTATUS_PROGRESSED_BY_STGL);
|
||||
|
||||
// Transaction complete
|
||||
$this->db->trans_complete();
|
||||
|
||||
if ($this->db->trans_status() === false)
|
||||
if (isError($result))
|
||||
{
|
||||
$this->db->trans_rollback();
|
||||
show_error('Failed inserting Anrechnung', EXIT_ERROR);
|
||||
$this->terminateWithJsonError(getError($result));
|
||||
}
|
||||
|
||||
// Output to AJAX
|
||||
return $this->outputJsonSuccess(array(
|
||||
$this->outputJsonSuccess(array(
|
||||
'antragdatum' => (new DateTime())->format('d.m.Y'),
|
||||
'dms_id' => $lastInsert_dms_id
|
||||
));
|
||||
|
||||
Reference in New Issue
Block a user