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

refactor addNewStatus, cleanup Multi.js

Browse Source
This commit is contained in:
ma0068
2024-06-19 15:57:36 +02:00
parent 58005d1832
commit 823579dc59
2 changed files with 88 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/frontend/v1/stv/Status.php
+78 -179
View File
@@ -306,193 +306,92 @@ class Status extends FHCAPI_Controller
$this->terminateWithSuccess($prestudent_id);
}
//TODO(Manu) documentation: here setUnterbrecher FasLogic!
if($status_kurzbz == 'Unterbrecher')
{
$ausbildungssemester = $lastStatusData->ausbildungssemester;
$studiensemester_kurzbz = $lastStatusData->studiensemester_kurzbz;
$this->load->library('PrestudentLib');
$result = $this->prestudentlib->setUnterbrecher($prestudent_id, $studiensemester_kurzbz, null, null, $ausbildungssemester);
if (isError($result))
{
return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
}
else
$this->terminateWithSuccess($prestudent_id);
}
if($status_kurzbz == 'Student')
{
$this->load->library('PrestudentLib');
$result = $this->prestudentlib->setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id, $bestaetigtam, $bestaetigtvon);
if (isError($result))
{
return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
}
else
$this->terminateWithSuccess($prestudent_id);
}
if($status_kurzbz == 'Diplomand')
{
$this->load->library('PrestudentLib');
$result = $this->prestudentlib->setDiplomand($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
if (isError($result))
{
return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
}
else
$this->terminateWithSuccess($prestudent_id);
}
if($status_kurzbz == 'Absolvent')
{
$this->load->library('PrestudentLib');
$result = $this->prestudentlib->setAbsolvent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
if (isError($result))
{
return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
}
else
$this->terminateWithSuccess($prestudent_id);
}
// Start DB transaction
$this->db->trans_begin(); // Beginnen der Transaktion
$result = $this->PrestudentstatusModel->insert(
[
'prestudent_id' => $prestudent_id,
'status_kurzbz' => $status_kurzbz,
'bewerbung_abgeschicktamum' => $bewerbung_abgeschicktamum,
'studiensemester_kurzbz' => $studiensemester_kurzbz,
'studienplan_id' => $lastStatusData->studienplan_id,
'ausbildungssemester' => $ausbildungssemester,
'anmerkung' => $anmerkung,
'statusgrund_id' => $statusgrund_id,
'insertvon' => $uid,
'insertamum' => date('c'),
'bestaetigtam' => $bestaetigtam,
'bestaetigtvon' => $bestaetigtvon,
'datum' => $datum,
'rt_stufe' => $rt_stufe
]
);
if ($this->db->trans_status() === false || isError($result))
{
$this->db->trans_rollback();
}
if($isStudent)
{
$this->load->model('crm/Student_model', 'StudentModel');
$result = $this->StudentModel->checkIfUid($prestudent_id);
if (isError($result)) {
return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
}
$student_uid = $result->retval;
//load student
$result = $this->StudentModel->loadWhere(
array(
'student_uid' => $student_uid
)
);
if (isError($result))
{
$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
}
$studentData = current(getData($result) ? : []);
$verband = $studentData->verband == '' ? '' : $studentData->verband;
$gruppe = $studentData->gruppe == '' ? '' : $studentData->gruppe;
$studiengang_kz = $studentData->studiengang_kz;
//TODO(Manu) DEPRECATED
//Handle Abbrecher and Unterbrecher
/* if($status_kurzbz == 'Abbrecher' || $status_kurzbz == 'Unterbrecher')
{
$ausbildungssemester = 0;
$gruppe = '';
$verband = $status_kurzbz == 'Abbrecher' ? 'A' : 'B';
}*/
//process studentlehrverband
$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
$result = $this->StudentlehrverbandModel->processStudentlehrverband(
$student_uid,
$studiengang_kz,
$ausbildungssemester,
$verband,
$gruppe,
$studiensemester_kurzbz
);
if ($this->db->trans_status() === false || isError($result))
{
$this->db->trans_rollback();
// return $this->terminateWithError($result->code);
return $this->terminateWithError($this->p->t('lehre','error_duringInsertUpdateLehrverband'), self::ERROR_TYPE_GENERAL);
}
//update(fuer Abbrecher und Unterbrecher)
//implemented for multiaction "status ändern"
//TODO(Manu) DEPRECATED
/* if($status_kurzbz == 'Abbrecher' || $status_kurzbz == 'Unterbrecher')
{
$result = $this->StudentModel->update(
[
'student_uid' => $student_uid
],
[
'studiengang_kz' => $studiengang_kz,
'semester' => $ausbildungssemester,
'verband' => $verband,
'gruppe' => $gruppe,
'updateamum' => date('c'),
'updatevon' => $uid
]);
if ($this->db->trans_status() === false || isError($result))
switch($status_kurzbz){
case 'Unterbrecher':
{
$this->db->trans_rollback();
return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
}
$ausbildungssemester = $lastStatusData->ausbildungssemester;
$studiensemester_kurzbz = $lastStatusData->studiensemester_kurzbz;
// detailtab: set active to false if abbrecher
if($status_kurzbz == 'Abbrecher')
{
$this->load->model('person/Benutzer_model', 'BenutzerModel');
$result = $this->BenutzerModel->update(
[
'uid' => $student_uid
],
[
'aktiv' => false,
'updateaktivam' => date('Y-m-d'),
'updateaktivvon' => $uid
]);
if ($this->db->trans_status() === false || isError($result))
$this->load->library('PrestudentLib');
$result = $this->prestudentlib->setUnterbrecher($prestudent_id, $studiensemester_kurzbz, null, null, $ausbildungssemester);
if (isError($result))
{
$this->db->trans_rollback();
return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
}
else
$this->terminateWithSuccess($prestudent_id);
}
break;
case 'Student':
{
$this->load->library('PrestudentLib');
$result = $this->prestudentlib->setStudent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id, $bestaetigtam, $bestaetigtvon);
}*/
if (isError($result))
{
return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
}
else
$this->terminateWithSuccess($prestudent_id);
}
break;
case 'Diplomand':
{
$this->load->library('PrestudentLib');
$result = $this->prestudentlib->setDiplomand($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
if (isError($result))
{
return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
}
else
$this->terminateWithSuccess($prestudent_id);
}
break;
case 'Absolvent':
{
$this->load->library('PrestudentLib');
$result = $this->prestudentlib->setAbsolvent($prestudent_id, $studiensemester_kurzbz, $ausbildungssemester);
if (isError($result))
{
return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
}
else
$this->terminateWithSuccess($prestudent_id);
}
default:
{
/* if ($isStudent) {
return $this->terminateWithError("LehrverbandData needs no handling", self::ERROR_TYPE_GENERAL);
}*/
$result = $this->PrestudentstatusModel->insert(
[
'prestudent_id' => $prestudent_id,
'status_kurzbz' => $status_kurzbz,
'bewerbung_abgeschicktamum' => $bewerbung_abgeschicktamum,
'studiensemester_kurzbz' => $studiensemester_kurzbz,
'studienplan_id' => $lastStatusData->studienplan_id,
'ausbildungssemester' => $ausbildungssemester,
'anmerkung' => $anmerkung,
'statusgrund_id' => $statusgrund_id,
'insertvon' => $uid,
'insertamum' => date('c'),
'bestaetigtam' => $bestaetigtam,
'bestaetigtvon' => $bestaetigtvon,
'datum' => $datum,
'rt_stufe' => $rt_stufe
]
);
if (isError($result)) {
return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
} else
$this->terminateWithSuccess($prestudent_id);
}
}
$this->db->trans_commit();
$this->terminateWithSuccess($prestudent_id);
}
public function loadStatus()
public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+10 -13
View File
@@ -353,7 +353,7 @@ export default{
});
},
actionConfirmDialogue(data, statusgrund, statusText){
this.hideModal('addMultiStatus');
// this.hideModal('addMultiStatus');
this.actionButton = statusgrund;
this.actionStatusText = statusText;
@@ -398,7 +398,6 @@ export default{
};
this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData }));
console.log("in changeStatus to Unterbrecher: " + this.deltaData);
this.addNewStatus(prestudentIds);
},
changeStatusToStudent(prestudentIds){
@@ -439,8 +438,8 @@ export default{
this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData}));
console.log("in changeStatusToDiplomand" + prestudentIds);
this.hideModal('addMultiStatus');
/* console.log("in changeStatusToDiplomand" + prestudentIds);
this.hideModal('addMultiStatus');*/
this.addNewStatus(prestudentIds);
},
changeStatusToAbsolvent(prestudentIds){
@@ -454,8 +453,8 @@ export default{
this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData}));
console.log("in changeStatusToAbsolvent" + prestudentIds);
this.hideModal('addMultiStatus');
/* console.log("in changeStatusToAbsolvent" + prestudentIds);
this.hideModal('addMultiStatus');*/
this.addNewStatus(prestudentIds);
},
addNewStatus(prestudentIds){
@@ -491,12 +490,10 @@ export default{
.allSettled(promises)
.then(values => {
if (this.abbruchData.length < 1) {
console.log("singleNew");
}
else{
if(this.newArray.length > 0) {
this.newStatus = this.newArray[0].status_kurzbz;
console.log(`Successful: ${countSuccess}, Errors: ${countError}`);
}
else {
this.newStatus = this.statusData.status_kurzbz;
@@ -863,7 +860,7 @@ export default{
</template>
</BsModal>
<BsModal ref="addMultiStatus" id="addMultiStatus">
<!-- <BsModal ref="addMultiStatus" id="addMultiStatus">
<template #title>Status ändern zu</template>
<template #default>
<button type="button" class="btn btn-primary d-block mb-2" data-bs-toggle="collapse" data-bs-target="#submenu1">
@@ -905,11 +902,11 @@ export default{
<button ref="Close" type="button" class="btn btn-primary" @click="changeStatusToUnterbrecher(prestudentIds)">OK</button>
</div>
</template>
</BsModal>
</BsModal>-->
<ul class="dropdown-menu" ref="addMultiStatus3" id="addMultiStatus3">
<!-- <ul class="dropdown-menu" ref="addMultiStatus3" id="addMultiStatus3">
<li class="dropdown-submenu">
<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abbrecherStgl', 'Abbrecher')">Abbrecher durch Stgl</a>
<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abbrecherStgl', 'Abbrecher')">Abbrecher durch Stgl 5</a>
</li>
<li class="dropdown-submenu">
<a class="dropdown-item" @click="actionConfirmDialogue(updateData, 'abbrecherStud','Abbrecher')">Abbrecher durch Student</a>
@@ -929,7 +926,7 @@ export default{
<li class="dropdown-submenu">
<a class="dropdown-item" @click="changeStatusToAbsolvent(prestudentIds)">Absolvent</a>
</li>
</ul>
</ul>-->
<!--Modal: askForAusbildungssemester-->
<BsModal ref="askForAusbildungssemester">