blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 20:29:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

new workflow Terminate of Studierendenantrag

Browse Source 
- DB Update for new studierendenantrag_statustyp with studierendenantrag_statustyp_kurzbz = 'Storniert'
- new permission student/studierendenantrag
- possibility to set status to Terminated in case of new permission
This commit is contained in:
ma0068
2026-06-01 14:10:14 +02:00
parent cb7a0f7669
commit 7858d90d12
11 changed files with 234 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/frontend/v1/studstatus/Leitung.php
+35 -1
View File
@@ -45,7 +45,8 @@ class Leitung extends FHCAPI_Controller
'unpauseAntrag' => ['student/antragfreigabe:w', 'student/studierendenantrag:w'],
'objectAntrag' => ['student/antragfreigabe:w', 'student/studierendenantrag:w'],
'approveObjection' => ['student/antragfreigabe:w', 'student/studierendenantrag:w'],
'denyObjection' => ['student/antragfreigabe:w', 'student/studierendenantrag:w']
'denyObjection' => ['student/antragfreigabe:w', 'student/studierendenantrag:w'],
'terminateAntrag' => ['student/antragstornieren:w']
]);
// Libraries
@@ -426,4 +427,37 @@ class Leitung extends FHCAPI_Controller
return $this->terminateWithSuccess($studierendenantrag_id);
}
public function terminateAntrag()
{
$this->load->library('form_validation');
$this->form_validation->set_rules(
'studierendenantrag_id',
'Studierenden Antrag',
[
'required',
['isEntitledToTerminateAntrag', [$this->antraglib, 'isEntitledToTerminateAntrag']],
['antragCanBeTerminated', [$this->antraglib, 'antragCanBeTerminated']]
],
[
'isEntitledToUnpauseAntrag' => $this->p->t('studierendenantrag', 'error_no_right'),
'antragCanBeTerminated' => $this->p->t(
'studierendenantrag',
'error_not_terminated',
['id' => $this->input->post('studierendenantrag_id')]
)
]
);
if (!$this->form_validation->run())
$this->terminateWithValidationErrors($this->form_validation->error_array());
$studierendenantrag_id = $this->input->post('studierendenantrag_id');
$result = $this->antraglib->terminateAntrag($studierendenantrag_id, getAuthUID());
$this->getDataOrTerminateWithError($result);
return $this->terminateWithSuccess($studierendenantrag_id);
}
}
application/controllers/lehre/Studierendenantrag.php
+4 -1
View File
@@ -86,9 +86,12 @@ class Studierendenantrag extends FHC_Controller
$stgA = $this->permissionlib->getSTG_isEntitledFor('student/studierendenantrag') ?: [];
$permissionTerminateAntrag = $this->permissionlib->isBerechtigt('student/antragstornieren');
$this->load->view('lehre/Antrag/Leitung/List', [
'stgA' => $stgA,
'stgL' => $stgL
'stgL' => $stgL,
'permissionTerminateAntrag' => $permissionTerminateAntrag
]);
}
application/libraries/AntragLib.php
+47
View File
@@ -1948,6 +1948,22 @@ class AntragLib
return $result;
}
/**
* @param integer $antrag_id
* @param string $insertvon
*
* @return stdClass
*/
public function terminateAntrag($antrag_id, $insertvon)
{
$result = $this->_ci->StudierendenantragstatusModel->insert([
'studierendenantrag_id' => $antrag_id,
'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_TERMINATED,
'insertvon' => $insertvon
]);
return $result;
}
/**
* @param integer $studierendenantrag_id
@@ -2119,6 +2135,16 @@ class AntragLib
return $this->hasAccessToAntrag($antrag_id, 'student/antragfreigabe');
}
/**
* @param integer $antrag_id
*
* @return boolean
*/
public function isEntitledToTerminateAntrag($antrag_id)
{
return ($this->hasAccessToAntrag($antrag_id, 'student/antragstornieren'));
}
/**
* @param integer $antrag_id
*
@@ -2149,6 +2175,27 @@ class AntragLib
return $this->_ci->StudierendenantragModel->isManuallyPaused($antrag_id);
}
/**
* @param integer $antrag_id
*
* @return boolean
*/
public function antragCanBeTerminated($antrag_id)
{
$this->_ci->StudierendenantragModel->db->where_not_in('campus.get_status_studierendenantrag(studierendenantrag_id)', [
Studierendenantragstatus_model::STATUS_DEREGISTERED,
Studierendenantragstatus_model::STATUS_APPROVED,
Studierendenantragstatus_model::STATUS_TERMINATED
]);
$result = $this->_ci->StudierendenantragModel->loadWhere([
'studierendenantrag_id' => $antrag_id,
'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG
]);
return hasData($result);
}
/**
* @param integer $antrag_id
* @param string|array $status
application/models/education/Studierendenantragstatus_model.php
+1
View File
@@ -16,6 +16,7 @@ class Studierendenantragstatus_model extends DB_Model
const STATUS_OBJECTION_DENIED = 'EinspruchAbgelehnt';
const STATUS_DEREGISTERED = 'Abgemeldet';
const STATUS_PAUSE = 'Pause';
const STATUS_TERMINATED = 'Storniert';
const INSERTVON_ABMELDUNGSTGL = "AbmeldungStgl";
const INSERTVON_DEREGISTERED = "Studienabbruch";
application/views/lehre/Antrag/Leitung/List.php
+1
View File
@@ -44,6 +44,7 @@ $this->load->view(
<studierendenantrag-leitung
:stg-a="<?= htmlspecialchars(json_encode(array_values($stgA))); ?>"
:stg-l="<?= htmlspecialchars(json_encode(array_values($stgL))); ?>"
:permission-terminate-antrag="<?= json_encode($permissionTerminateAntrag); ?>"
>
</studierendenantrag-leitung>
public/js/api/factory/studstatus/leitung.js
+8 -1
View File
@@ -96,5 +96,12 @@ export default {
url: '/api/frontend/v1/studstatus/leitung/denyObjection',
params: antrag
};
}
},
terminate(antrag) {
return {
method: 'post',
url: '/api/frontend/v1/studstatus/leitung/terminateAntrag',
params: antrag
};
},
};
public/js/components/Studierendenantrag/Leitung.js
+15 -2
View File
@@ -18,7 +18,11 @@ export default {
},
props: {
stgL: Array,
stgA: Array
stgA: Array,
permissionTerminateAntrag: {
type: Boolean,
default: false
},
},
data() {
return {
@@ -223,6 +227,13 @@ export default {
.then(this.showResults);
}
},
actionTerminate(evt){
var antraege = evt || this.selectedData;
this.$refs.loader.show();
this
._singleOrMultiApiCall(antraege, ApiStudstatusLeitung.terminate)
.then(this.showResults);
},
showResults(results) {
let fulfilled = results.filter(res => res.status == 'fulfilled');
this.$refs.loader.hide();
@@ -270,6 +281,7 @@ export default {
:stg-a="stgkzA"
:stg-l="stgkzL"
:filter="filter"
:permission-terminate-antrag="permissionTerminateAntrag"
v-model:columnData="columns"
v-model:selectedData="selectedData"
@action:approve="actionApprove"
@@ -280,7 +292,8 @@ export default {
@action:objectionApprove="actionObjectionApprove"
@action:cancel="actionCancel"
@action:pause="actionPause"
@action:unpause="actionUnpause"
@action:unpause="actionUnpause"
@action:terminate="actionTerminate"
@reload="reload"
>
</leitung-table>
public/js/components/Studierendenantrag/Leitung/Table.js
+47 -2
View File
@@ -16,7 +16,11 @@ export default {
columnData: Array,
stgL: Array,
stgA: Array,
filter: String
filter: String,
permissionTerminateAntrag: {
type: Boolean,
default: false
},
},
emits: [
'update:columnData',
@@ -29,7 +33,8 @@ export default {
'action:objectionApprove',
'action:cancel',
'action:pause',
'action:unpause'
'action:unpause',
'action:terminate'
],
data() {
return {
@@ -308,6 +313,26 @@ export default {
button.className = "btn btn-outline-secondary";
button.addEventListener('click', () => this.$emit('action:pause', [cell.getData()]));
container.append(button);
// Terminate
if(this.permissionTerminateAntrag){
button = document.createElement('button');
icon = document.createElement('i');
span = document.createElement('span');
icon.className = "fa-solid fa-xmark";
icon.setAttribute('aria-hidden', true);
icon.setAttribute('title', this.$p.t('studierendenantrag', 'btn_terminate'));
span.className = "fa-sr-only";
span.append(this.$p.t('studierendenantrag', 'btn_terminate'));
button.append(icon);
button.append(span);
button.className = "btn btn-outline-danger";
button.addEventListener('click', () => this.$emit('action:terminate', [cell.getData()]));
container.append(button);
}
}
let canUnpause = data.status == 'Pause' && !['AbmeldungStgl', 'Studienabbruch'].includes(data.status_insertvon);
@@ -337,6 +362,26 @@ export default {
button.className = "btn btn-outline-secondary";
button.addEventListener('click', () => this.$emit('action:unpause', [cell.getData()]));
container.append(button);
// Terminate: show buttion
if(this.permissionTerminateAntrag){
button = document.createElement('button');
icon = document.createElement('i');
span = document.createElement('span');
icon.className = "fa-solid fa-xmark";
icon.setAttribute('aria-hidden', true);
icon.setAttribute('title', this.$p.t('studierendenantrag', 'btn_terminate'));
span.className = "fa-sr-only";
span.append(this.$p.t('studierendenantrag', 'btn_terminate'));
button.append(icon);
button.append(span);
button.className = "btn btn-outline-danger";
button.addEventListener('click', () => this.$emit('action:terminate', [cell.getData()]));
container.append(button);
}
}
if (data.typ == 'AbmeldungStgl' && data.status == 'Genehmigt') {
system/dbupdate_3.4.php
+1
View File
@@ -94,6 +94,7 @@ require_once('dbupdate_3.4/71399_dashboard_update_widget_paths.php');
require_once('dbupdate_3.4/71645_studvw_messagetab_ladezeit.php');
require_once('dbupdate_3.4/71566_studienordnungsdokument_neuer_organisationseinheitstyp_programm.php');
require_once('dbupdate_3.4/70376_lohnguide.php');
require_once('dbupdate_3.4/77000_studstatus_stornierte_wiederholende.php');
// *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
echo '<H2>Pruefe Tabellen und Attribute!</H2>';
system/dbupdate_3.4/77000_studstatus_stornierte_wiederholende.php
+15
View File
@@ -0,0 +1,15 @@
<?php
// neuen studierendenantrag_statustyp mit studierendenantrag_statustyp_kurzbz = 'Storniert' als Zeile hinzufügen
if($result = @$db->db_query("SELECT 1 FROM campus.tbl_studierendenantrag_statustyp WHERE studierendenantrag_statustyp_kurzbz= 'Storniert';"))
{
if($db->db_num_rows($result) == 0)
{
$qry = "INSERT INTO campus.tbl_studierendenantrag_statustyp(studierendenantrag_statustyp_kurzbz, bezeichnung) VALUES ('Storniert', '{\"Storniert\", \"Terminated\"}');";
if(!$db->db_query($qry))
echo '<strong>campus.tbl_studierendenantrag_statustyp: '.$db->db_last_error().'</strong><br>';
else
echo '<br>campus.tbl_studierendenantrag_statustyp: Zeile Storniert hinzugefuegt!<br>';
}
}
system/phrasesupdate.php
+60
View File
@@ -58177,6 +58177,66 @@ I have been informed that I am under no obligation to consent to the transmissio
)
),
// ### Phrases Dashboard Admin END
array(
'app' => 'core',
'category' => 'studierendenantrag',
'phrase' => 'status_terminated',
'insertvon' => 'system',
'phrases' => array(
array(
'sprache' => 'German',
'text' => 'Storniert',
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'English',
'text' => 'Terminated',
'description' => '',
'insertvon' => 'system'
)
)
),
array(
'app' => 'core',
'category' => 'studierendenantrag',
'phrase' => 'btn_terminate',
'insertvon' => 'system',
'phrases' => array(
array(
'sprache' => 'German',
'text' => 'Stornieren',
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'English',
'text' => 'Terminate',
'description' => '',
'insertvon' => 'system'
)
)
),
array(
'app' => 'core',
'category' => 'studierendenantrag',
'phrase' => 'error_not_terminated',
'insertvon' => 'system',
'phrases' => array(
array(
'sprache' => 'German',
'text' => 'Id {id} ist bereits storniert',
'description' => '',
'insertvon' => 'system'
),
array(
'sprache' => 'English',
'text' => 'Id {id} is already terminated',
'description' => '',
'insertvon' => 'system'
)
)
),
);