update system db update for Storniert

- 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

application/controllers/api/frontend/v1/studstatus/Leitung.php

@@ -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

@@ -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

@@ -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/Pruefung_model.php

@@ -286,24 +286,60 @@ class Pruefung_model extends DB_Model
 
 		$this->db->where_in("get_rolle_prestudent(ps.prestudent_id, null)", $this->config->item('antrag_prestudentstatus_whitelist'));
 
-		if (is_array($status)) {
-			if (in_array(null, $status)) {
-				$status = array_filter($status);
-				if (count($status)) {
-					$this->db->group_start();
-					$this->db->where_in('campus.get_status_studierendenantrag(a.studierendenantrag_id)', $status);
-					$this->db->or_where('campus.get_status_studierendenantrag(a.studierendenantrag_id)', null);
-					$this->db->group_end();
-				} else {
-					$this->db->where('campus.get_status_studierendenantrag(a.studierendenantrag_id)', null);
+		if (is_array($status))
+		{
+			if (in_array(null, $status))
+			{
+				//$status = array_filter($status);
+				//just filter out null
+				$status = array_filter($status, static function ($value)
+				{
+					return $value !== null;
+				});
+
+				$this->db->group_start();
+				// kein Antrag vorhanden ODER nur stornierte Anträge vorhanden
+				$this->db->or_where("
+                NOT EXISTS (
+                    SELECT 1
+                    FROM campus.tbl_studierendenantrag a2
+                    WHERE a2.prestudent_id = ps.prestudent_id
+                      AND a2.typ = " . $this->db->escape(Studierendenantrag_model::TYP_WIEDERHOLUNG) . "
+                      AND COALESCE(
+                            campus.get_status_studierendenantrag(a2.studierendenantrag_id),
+                            ''
+                          ) <> 'Storniert')", null, false);
+
+				if (!empty($status))
+				{
+					$this->db->or_where_in('campus.get_status_studierendenantrag(a.studierendenantrag_id)',	$status);
 				}
-			} else {
+				$this->db->group_end();
+			}
+			else
+			{
 				$this->db->where_in('campus.get_status_studierendenantrag(a.studierendenantrag_id)', $status);
 			}
-		} else {
+		}
+		// kein Antrag vorhanden ODER nur stornierte Anträge vorhanden
+		elseif ($status === null)
+		{
+			$this->db->where("
+            NOT EXISTS (
+                SELECT 1
+                FROM campus.tbl_studierendenantrag a2
+                WHERE a2.prestudent_id = ps.prestudent_id
+                  AND a2.typ = " . $this->db->escape(Studierendenantrag_model::TYP_WIEDERHOLUNG) . "
+                  AND COALESCE(
+                        campus.get_status_studierendenantrag(a2.studierendenantrag_id),
+                        ''
+                      ) <> 'Storniert'
+            )", null, false);
+		}
+		else
+		{
 			$this->db->where('campus.get_status_studierendenantrag(a.studierendenantrag_id)', $status);
 		}
-
 		return $this->loadWhereCommitteeExamsFailed();
 	}
 }

application/models/education/Studierendenantrag_model.php

@@ -98,7 +98,8 @@ class Studierendenantrag_model extends DB_Model
 			Studierendenantragstatus_model::STATUS_OBJECTION_DENIED,
 			Studierendenantragstatus_model::STATUS_DEREGISTERED,
 			Studierendenantragstatus_model::STATUS_PAUSE,
-			Studierendenantragstatus_model::STATUS_REMINDERSENT
+			Studierendenantragstatus_model::STATUS_REMINDERSENT,
+			Studierendenantragstatus_model::STATUS_TERMINATED
 		]);
 		$this->db->or_group_start();
 		$this->db->where('s.studierendenantrag_statustyp_kurzbz', Studierendenantragstatus_model::STATUS_APPROVED);

application/models/education/Studierendenantragstatus_model.php

@@ -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

@@ -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>
 

application/views/lehre/Antrag/Student/List.php

@@ -71,147 +71,157 @@ if(defined('CIS4')){
 						</thead>
 						<tbody>
 							<?php foreach($array['antraege'] as $antrag){ ?>
-							<tr>
-								<td><?= $antrag->studierendenantrag_id; ?></td>
-								<td><?= $this->p->t('studierendenantrag', 'antrag_typ_' . $antrag->typ); ?></td>
-								<td>
-									<?=
-										(
-											$antrag->status == Studierendenantragstatus_model::STATUS_PAUSE
-											&& $antrag->status_insertvon == Studierendenantragstatus_model::INSERTVON_DEREGISTERED
-										)
-										? $this->p->t('studierendenantrag', 'status_stop')
-										: $antrag->status_bezeichnung;
-									?>
-								</td>
-								<td><?= $antrag->studiensemester_kurzbz; ?></td>
-								<td><?= (new DateTime($antrag->datum))->format('d.m.Y'); ?></td>
-								<td><?= $antrag->datum_wiedereinstieg ? (new DateTime($antrag->datum_wiedereinstieg))->format('d.m.Y') : ''; ?></td>
-								<td><!-- Button trigger modal -->
-									<?php if($antrag->grund){ ?>
-									<a href="#modalgrund<?= $antrag->studierendenantrag_id; ?>" data-bs-toggle="modal">
-										<?= $this->p->t('studierendenantrag', 'antrag_grund'); ?>
-									</a>
 
-									<!-- Modal -->
-									<div
-										class="modal fade"
-										id="modalgrund<?= $antrag->studierendenantrag_id; ?>"
-										tabindex="-1"
-										aria-labelledby="modalgrundLabel<?= $antrag->studierendenantrag_id; ?>"
-										aria-hidden="true"
-										>
-										<div class="modal-dialog modal-dialog modal-lg">
-											<div class="modal-content">
-												<div class="modal-header">
-													<h5
-														class="modal-title"
-														id="modalgrundLabel<?= $antrag->studierendenantrag_id; ?>"
-														>
-														<?= $this->p->t('studierendenantrag', 'antrag_grund'); ?>
-													</h5>
-													<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-												</div>
-												<div class="modal-body">
-													<textarea
-														class="form-control"
-														style="width: 100%; height: 250px;"
-														readonly
-														>
-														<?= $antrag->grund; ?>
-													</textarea>
+								<?php if (
+										!(
+												$antrag->typ == Studierendenantrag_model::TYP_WIEDERHOLUNG
+												&& $antrag->status == Studierendenantragstatus_model::STATUS_TERMINATED
+										)
+								) { ?>
+
+									<tr>
+										<td><?= $antrag->studierendenantrag_id; ?></td>
+										<td><?= $this->p->t('studierendenantrag', 'antrag_typ_' . $antrag->typ); ?></td>
+										<td>
+											<?=
+												(
+													$antrag->status == Studierendenantragstatus_model::STATUS_PAUSE
+													&& $antrag->status_insertvon == Studierendenantragstatus_model::INSERTVON_DEREGISTERED
+												)
+												? $this->p->t('studierendenantrag', 'status_stop')
+												: $antrag->status_bezeichnung;
+											?>
+										</td>
+										<td><?= $antrag->studiensemester_kurzbz; ?></td>
+										<td><?= (new DateTime($antrag->datum))->format('d.m.Y'); ?></td>
+										<td><?= $antrag->datum_wiedereinstieg ? (new DateTime($antrag->datum_wiedereinstieg))->format('d.m.Y') : ''; ?></td>
+										<td><!-- Button trigger modal -->
+											<?php if($antrag->grund){ ?>
+											<a href="#modalgrund<?= $antrag->studierendenantrag_id; ?>" data-bs-toggle="modal">
+												<?= $this->p->t('studierendenantrag', 'antrag_grund'); ?>
+											</a>
+
+											<!-- Modal -->
+											<div
+												class="modal fade"
+												id="modalgrund<?= $antrag->studierendenantrag_id; ?>"
+												tabindex="-1"
+												aria-labelledby="modalgrundLabel<?= $antrag->studierendenantrag_id; ?>"
+												aria-hidden="true"
+												>
+												<div class="modal-dialog modal-dialog modal-lg">
+													<div class="modal-content">
+														<div class="modal-header">
+															<h5
+																class="modal-title"
+																id="modalgrundLabel<?= $antrag->studierendenantrag_id; ?>"
+																>
+																<?= $this->p->t('studierendenantrag', 'antrag_grund'); ?>
+															</h5>
+															<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+														</div>
+														<div class="modal-body">
+															<textarea
+																class="form-control"
+																style="width: 100%; height: 250px;"
+																readonly
+																>
+																<?= $antrag->grund; ?>
+															</textarea>
+														</div>
+													</div>
 												</div>
 											</div>
-										</div>
-									</div>
-									<?php } ?>
-								</td>
-								<td>
-									<?php if($antrag->dms_id) {?>
-									<a
-										class="text-decoration-none"
-										href="<?= site_url('lehre/Antrag/Attachment/show/' . $antrag->dms_id) ?>"
-										target="_blank">
-										<i class="fa fa-paperclip" aria-hidden="true"></i> <?= $this->p->t('studierendenantrag', 'antrag_anhang'); ?>
-									</a>
-									<?php } ?>
-								</td>
-								<td>
-									<a
-										href="<?= site_url('lehre/Studierendenantrag/' .
-											strtolower($antrag->typ) .
-											'/' .
-											$antrag->prestudent_id .
-											'/' .
-											$antrag->studierendenantrag_id); ?>"
-										>
-										<i class="fa-solid fa-pen" title="<?= $this->p->t('studierendenantrag', 'btn_edit'); ?>"></i>
-									</a>
-									<?php
-									$allowed = [];
-									switch ($antrag->typ) {
-										case Studierendenantrag_model::TYP_ABMELDUNG:
-											$allowed = [
-												Studierendenantragstatus_model::STATUS_APPROVED
-											];
-											break;
-										case Studierendenantrag_model::TYP_ABMELDUNG_STGL:
-											$allowed = [
-												Studierendenantragstatus_model::STATUS_OBJECTION_DENIED,
-												Studierendenantragstatus_model::STATUS_DEREGISTERED
-											];
-											break;
-										case Studierendenantrag_model::TYP_UNTERBRECHUNG:
-											$allowed = [
-												Studierendenantragstatus_model::STATUS_APPROVED,
-												Studierendenantragstatus_model::STATUS_REMINDERSENT
-											];
-											break;
-										case Studierendenantrag_model::TYP_WIEDERHOLUNG:
-											$allowed = [
-												Studierendenantragstatus_model::STATUS_DEREGISTERED
-											];
-											break;
-									}
-									if (in_array($antrag->status, $allowed)) { ?>
-										<a
-											class="ms-2"
-											target="_blank"
-											href="<?= base_url('cis/private/pdfExport.php?xml=Antrag' .
-											$antrag->typ .
-											'.xml.php&xsl=Antrag' .
-											$antrag->typ .
-											'&id=' .
-											$antrag->studierendenantrag_id .
-											'&uid=' .
-											getAuthUID()); ?>"
-											>
-											<i
-												class="fa-solid fa-download"
-												title="<?= $this->p->t('studierendenantrag', 'btn_download_antrag'); ?>"
+											<?php } ?>
+										</td>
+										<td>
+											<?php if($antrag->dms_id) {?>
+											<a
+												class="text-decoration-none"
+												href="<?= site_url('lehre/Antrag/Attachment/show/' . $antrag->dms_id) ?>"
+												target="_blank">
+												<i class="fa fa-paperclip" aria-hidden="true"></i> <?= $this->p->t('studierendenantrag', 'antrag_anhang'); ?>
+											</a>
+											<?php } ?>
+										</td>
+										<td>
+											<a
+												href="<?= site_url('lehre/Studierendenantrag/' .
+													strtolower($antrag->typ) .
+													'/' .
+													$antrag->prestudent_id .
+													'/' .
+													$antrag->studierendenantrag_id); ?>"
 												>
-											</i>
-										</a>
-									<?php } ?>
-									<?php if ($antrag->typ == Studierendenantrag_model::TYP_WIEDERHOLUNG
-										&& $antrag->status == Studierendenantragstatus_model::STATUS_APPROVED
-									) { ?>
-										<a
-											class="ms-2"
-											href="#modallv<?= $antrag->studierendenantrag_id; ?>"
-											data-bs-toggle="modal"
-											>
-											<?= $this->p->t('studierendenantrag', 'btn_show_lvs'); ?>
-										</a>
-										<lv-popup
-											id="modallv<?= $antrag->studierendenantrag_id; ?>"
-											antrag-id = "<?= $antrag->studierendenantrag_id; ?>"
-											>
-											<?= $this->p->t('studierendenantrag', 'my_lvs'); ?>
-										</lv-popup>
-									<?php } ?>
-								</td>
-							</tr>
+												<i class="fa-solid fa-pen" title="<?= $this->p->t('studierendenantrag', 'btn_edit'); ?>"></i>
+											</a>
+											<?php
+											$allowed = [];
+											switch ($antrag->typ) {
+												case Studierendenantrag_model::TYP_ABMELDUNG:
+													$allowed = [
+														Studierendenantragstatus_model::STATUS_APPROVED
+													];
+													break;
+												case Studierendenantrag_model::TYP_ABMELDUNG_STGL:
+													$allowed = [
+														Studierendenantragstatus_model::STATUS_OBJECTION_DENIED,
+														Studierendenantragstatus_model::STATUS_DEREGISTERED
+													];
+													break;
+												case Studierendenantrag_model::TYP_UNTERBRECHUNG:
+													$allowed = [
+														Studierendenantragstatus_model::STATUS_APPROVED,
+														Studierendenantragstatus_model::STATUS_REMINDERSENT
+													];
+													break;
+												case Studierendenantrag_model::TYP_WIEDERHOLUNG:
+													$allowed = [
+														Studierendenantragstatus_model::STATUS_DEREGISTERED
+													];
+													break;
+											}
+											if (in_array($antrag->status, $allowed)) { ?>
+												<a
+													class="ms-2"
+													target="_blank"
+													href="<?= base_url('cis/private/pdfExport.php?xml=Antrag' .
+													$antrag->typ .
+													'.xml.php&xsl=Antrag' .
+													$antrag->typ .
+													'&id=' .
+													$antrag->studierendenantrag_id .
+													'&uid=' .
+													getAuthUID()); ?>"
+													>
+													<i
+														class="fa-solid fa-download"
+														title="<?= $this->p->t('studierendenantrag', 'btn_download_antrag'); ?>"
+														>
+													</i>
+												</a>
+											<?php } ?>
+											<?php if ($antrag->typ == Studierendenantrag_model::TYP_WIEDERHOLUNG
+												&& $antrag->status == Studierendenantragstatus_model::STATUS_APPROVED
+											) { ?>
+												<a
+													class="ms-2"
+													href="#modallv<?= $antrag->studierendenantrag_id; ?>"
+													data-bs-toggle="modal"
+													>
+													<?= $this->p->t('studierendenantrag', 'btn_show_lvs'); ?>
+												</a>
+												<lv-popup
+													id="modallv<?= $antrag->studierendenantrag_id; ?>"
+													antrag-id = "<?= $antrag->studierendenantrag_id; ?>"
+													>
+													<?= $this->p->t('studierendenantrag', 'my_lvs'); ?>
+												</lv-popup>
+											<?php } ?>
+										</td>
+									</tr>
+								<?php } ?>
+
 							<?php } ?>
 						</tbody>
 					</table>

public/js/api/factory/studstatus/leitung.js

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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'
+			)
+		)
+	),
 );