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

codesniffer

Browse Source
This commit is contained in:
ma0068
2024-03-22 13:00:05 +01:00
parent 9038910303
commit 1b3c052c12
3 changed files with 188 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/components/stv/Prestudent.php
+4 -6
View File
@@ -72,7 +72,7 @@ class Prestudent extends FHC_Controller
$stg = $result->studiengang_kz;
if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg) )
if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
{
$result = "Sie haben keine Schreibrechte fuer diesen Studiengang!";
$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -137,7 +137,8 @@ class Prestudent extends FHC_Controller
$update_prestudent['updatevon'] = $uid;
//utf8-decode for special chars (eg tag der offenen Tür, FH-Führer)
function utf8_decode_if_string($value) {
function utf8_decode_if_string($value)
{
if (is_string($value)) {
return utf8_decode($value);
} else {
@@ -165,7 +166,6 @@ class Prestudent extends FHC_Controller
}
return $this->outputJsonSuccess(true);
}
}
public function getHistoryPrestudents($person_id)
@@ -315,6 +315,4 @@ class Prestudent extends FHC_Controller
}
$this->outputJson($result);
}
}
}
application/controllers/components/stv/Status.php
+99 -49
View File
@@ -16,9 +16,9 @@ class Status extends FHC_Controller
$this->load->library('PermissionLib');
// Load language phrases
/* $this->loadPhrases([
'ui'
]);*/
$this->loadPhrases([
'ui', 'bismeldestichtag','lehre'
]);
}
public function getHistoryPrestudent($prestudent_id)
@@ -94,7 +94,7 @@ class Status extends FHC_Controller
$isStudent = false;
if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg) )
if(!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
{
$result = "Sie haben keine Schreibrechte fuer diesen Studiengang!";
$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -132,10 +132,10 @@ class Status extends FHC_Controller
$lastStatusData = current(getData($result));
//Different handling depending on newStatus
//Todo(manu) check if these checks makes sense?
//Todo(manu) check later with multiactions
/* if($status_kurzbz == 'Absolvent' || $status_kurzbz == 'Diplomand')
{
//$studiensemester = $semester_aktuell; //TODO(Manu) oder ist hier defaultsemester gemeint?
//$studiensemester = $semester_aktuell;
$ausbildungssemester = $lastStatusData->ausbildungssemester;
}*/
@@ -145,7 +145,12 @@ class Status extends FHC_Controller
}*/
//check if Rolle already exists
$result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester);
$result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle(
$prestudent_id,
$status_kurzbz,
$studiensemester_kurzbz,
$ausbildungssemester
);
if (isError($result))
{
$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -221,7 +226,7 @@ class Status extends FHC_Controller
//check if studentrolle already exists
//TODO(manu) eigener Code für Diplomand?
if($status_kurzbz == 'Student' || $status_kurzbz == 'Diplomand' )
if($status_kurzbz == 'Student' || $status_kurzbz == 'Diplomand')
{
$this->load->model('crm/Student_model', 'StudentModel');
$result = $this->StudentModel->checkIfExistingStudentRolle($prestudent_id);
@@ -254,7 +259,13 @@ class Status extends FHC_Controller
return $this->outputJson(getError($result));
}
$result = $this->PrestudentstatusModel->checkIfValidStatusHistory($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $new_status_datum, $ausbildungssemester);
$result = $this->PrestudentstatusModel->checkIfValidStatusHistory(
$prestudent_id,
$status_kurzbz,
$studiensemester_kurzbz,
$new_status_datum,
$ausbildungssemester
);
if (isError($result))
{
$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -349,7 +360,14 @@ class Status extends FHC_Controller
//process studentlehrverband
$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
$result = $this->StudentlehrverbandModel->processStudentlehrverband($student_uid, $studiengang_kz, $ausbildungssemester, $verband, $gruppe, $studiensemester_kurzbz);
$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();
@@ -359,7 +377,7 @@ class Status extends FHC_Controller
//Student updaten (fuer Abbrecher und Unterbrecher)
//not active yet: works only for "status ändern" in FAS
//Later for multiactions
//Todo(Manu) Later for multiactions
/*
if($status_kurzbz == 'Abbrecher' || $status_kurzbz == 'Unterbrecher')
@@ -491,7 +509,6 @@ class Status extends FHC_Controller
//Data of current Rolle
$statusData = current(getData($result));
//var_dump($statusData);
$datum = $statusData->datum == '' ? 'null' : $statusData->datum;
$insertamum = $statusData->insertamum == '' ? 'null' : $statusData->insertamum;
@@ -523,25 +540,27 @@ class Status extends FHC_Controller
$quotes_rt_stufe = $rt_stufe == "null" ? " " : "'";
$quotes_statusgrund_id = $statusgrund_id == "null" ? " " : "'";
$sqlundo =
"
INSERT INTO public.tbl_prestudentstatus(prestudent_id, status_kurzbz, studiensemester_kurzbz, ausbildungssemester, datum, insertamum, insertvon, updateamum, updatevon, ext_id, orgform_kurzbz, bestaetigtam, bestaetigtvon, anmerkung, bewerbung_abgeschicktamum, studienplan_id, rt_stufe, statusgrund_id)
VALUES('" . $prestudent_id . "','" . $status_kurzbz . "','" . $studiensemester_kurzbz . "','" . $ausbildungssemester . "',"
. $quotes_datum . $datum . $quotes_datum . ","
. $quotes_insertamum . $insertamum . $quotes_insertamum . ","
. $quotes_insertvon . $insertvon . $quotes_insertvon . ","
. $quotes_updateamum . $updateamum . $quotes_updateamum . ","
. $quotes_updatevon . $updatevon . $quotes_updatevon . ","
. $quotes_ext_id . $ext_id . $quotes_ext_id . ","
. $quotes_orgform_kurzbz . $orgform_kurzbz . $quotes_orgform_kurzbz . ","
. $quotes_bestaetigtam . $bestaetigtam . $quotes_bestaetigtam . ","
. $quotes_bestaetigtvon . $bestaetigtvon . $quotes_bestaetigtvon . ","
. $quotes_anmerkung . $anmerkung . $quotes_anmerkung . ","
. $quotes_bewerbung_abgeschicktamum . $bewerbung_abgeschicktamum . $quotes_bewerbung_abgeschicktamum . ","
. $quotes_studienplan_id . $studienplan_id . $quotes_studienplan_id . ","
. $quotes_rt_stufe . $rt_stufe . $quotes_rt_stufe . ","
. $quotes_statusgrund_id . $statusgrund_id . $quotes_statusgrund_id . ");
";
$sqlundo =
"
INSERT INTO public.tbl_prestudentstatus(prestudent_id, status_kurzbz, studiensemester_kurzbz, ausbildungssemester,
datum, insertamum, insertvon, updateamum, updatevon, ext_id, orgform_kurzbz, bestaetigtam, bestaetigtvon,
anmerkung, bewerbung_abgeschicktamum, studienplan_id, rt_stufe, statusgrund_id)
VALUES('" . $prestudent_id . "','" . $status_kurzbz . "','" . $studiensemester_kurzbz . "','" . $ausbildungssemester . "',"
. $quotes_datum . $datum . $quotes_datum . ","
. $quotes_insertamum . $insertamum . $quotes_insertamum . ","
. $quotes_insertvon . $insertvon . $quotes_insertvon . ","
. $quotes_updateamum . $updateamum . $quotes_updateamum . ","
. $quotes_updatevon . $updatevon . $quotes_updatevon . ","
. $quotes_ext_id . $ext_id . $quotes_ext_id . ","
. $quotes_orgform_kurzbz . $orgform_kurzbz . $quotes_orgform_kurzbz . ","
. $quotes_bestaetigtam . $bestaetigtam . $quotes_bestaetigtam . ","
. $quotes_bestaetigtvon . $bestaetigtvon . $quotes_bestaetigtvon . ","
. $quotes_anmerkung . $anmerkung . $quotes_anmerkung . ","
. $quotes_bewerbung_abgeschicktamum . $bewerbung_abgeschicktamum . $quotes_bewerbung_abgeschicktamum . ","
. $quotes_studienplan_id . $studienplan_id . $quotes_studienplan_id . ","
. $quotes_rt_stufe . $rt_stufe . $quotes_rt_stufe . ","
. $quotes_statusgrund_id . $statusgrund_id . $quotes_statusgrund_id . ");
";
//Delete Status
$result = $this->PrestudentstatusModel->delete(
@@ -553,8 +572,7 @@ $sqlundo =
]
);
if ( $this->db->trans_status() === false || isError($result))
//if (isError($result))
if($this->db->trans_status() === false || isError($result))
{
$this->db->trans_rollback();
$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -698,7 +716,7 @@ $sqlundo =
$uid = getAuthUID();
$beschreibung = 'Loeschen der Prestudent ID ' . $prestudent_id;
$sql = "DELETE FROM public.tbl_prestudent
WHERE prestudent_id = " . $prestudent_id ;
WHERE prestudent_id = " . $prestudent_id;
//load prestudent für LOG sqlundo
$this->load->model('crm/Prestudent_model', 'PrestudentModel');
@@ -874,7 +892,7 @@ $sqlundo =
'prestudent_id' => $prestudent_id
)
);
if ($this->db->trans_status() === FALSE)
if ($this->db->trans_status() === false)
{
$this->db->trans_rollback();
$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -886,7 +904,6 @@ $sqlundo =
}
$this->db->trans_commit();
$this->outputJson($result);
}
$this->db->trans_commit();
return $this->outputJsonSuccess(true);
@@ -911,7 +928,7 @@ $sqlundo =
$stg = $result->studiengang_kz;
if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg) )
if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
{
$result = "Sie haben keine Schreibrechte fuer diesen Studiengang!";
$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -950,7 +967,11 @@ $sqlundo =
$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
//return $this->outputJson($result->code);
//Fehlermeldung überschrieben, passender
return $this->outputJson("Meldestichtag erreicht - Bearbeiten nicht mehr möglich");
//TODO(Manu) phrase
//$this->p->t('bismeldestichtag','meldestichtag_erreicht');
//return $this->outputJson($this->p->t('bismeldestichtag','status_confirm_delete'));
return $this->outputJson($this->p->t('lehre', 'meldestichtag_erreicht'));
//return $this->outputJson("Meldestichtag erreicht - Bearbeiten nicht mehr möglich");
}
}
@@ -958,7 +979,12 @@ $sqlundo =
if(($key_studiensemester_kurzbz != $studiensemester_kurzbz)
|| ($key_ausbildungssemester != $ausbildungssemester))
{
$result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester);
$result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle(
$prestudent_id,
$status_kurzbz,
$studiensemester_kurzbz,
$ausbildungssemester
);
if (isError($result))
{
$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -997,7 +1023,13 @@ $sqlundo =
{
//Block STATUSCHECKS
$result = $this->PrestudentstatusModel->checkIfValidStatusHistory($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $datum, $ausbildungssemester);
$result = $this->PrestudentstatusModel->checkIfValidStatusHistory(
$prestudent_id,
$status_kurzbz,
$studiensemester_kurzbz,
$datum,
$ausbildungssemester
);
if (isError($result))
{
$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -1073,7 +1105,14 @@ $sqlundo =
$studentlvbData = current(getData($result));
$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
$result = $this->StudentlehrverbandModel->processStudentlehrverband($student_uid, $studentlvbData->studiengang_kz, $ausbildungssemester, $studentlvbData->verband, $studentlvbData->gruppe, $studiensemester_kurzbz);
$result = $this->StudentlehrverbandModel->processStudentlehrverband(
$student_uid,
$studentlvbData->studiengang_kz,
$ausbildungssemester,
$studentlvbData->verband,
$studentlvbData->gruppe,
$studiensemester_kurzbz
);
if ($this->db->trans_status() === false || isError($result))
{
$this->db->trans_rollback();
@@ -1104,7 +1143,7 @@ $sqlundo =
$stg = $result->studiengang_kz;
if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg) )
if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
{
$result = "Sie haben keine Schreibrechte fuer diesen Studiengang!";
$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -1151,7 +1190,12 @@ $sqlundo =
$ausbildungssem_next = $key_ausbildungssemester+1;
//check if Rolle already exists
$result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle($key_prestudent_id, $key_status_kurzbz, $studiensem_next, $ausbildungssem_next);
$result = $this->PrestudentstatusModel->checkIfExistingPrestudentRolle(
$key_prestudent_id,
$key_status_kurzbz,
$studiensem_next,
$ausbildungssem_next
);
if (isError($result))
{
$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -1239,7 +1283,14 @@ $sqlundo =
$studentlvbData = current($result);
$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
$result = $this->StudentlehrverbandModel->processStudentlehrverband($student_uid, $studentlvbData->studiengang_kz, $ausbildungssem_next, $studentlvbData->verband, $studentlvbData->gruppe, $studiensem_next);
$result = $this->StudentlehrverbandModel->processStudentlehrverband(
$student_uid,
$studentlvbData->studiengang_kz,
$ausbildungssem_next,
$studentlvbData->verband,
$studentlvbData->gruppe,
$studiensem_next
);
if ($this->db->trans_status() === false || isError($result))
{
$this->db->trans_rollback();
@@ -1270,7 +1321,7 @@ $sqlundo =
$stg = $result->studiengang_kz;
if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg) )
if (!$this->permissionlib->isBerechtigt('admin', 'suid', $stg) && !$this->permissionlib->isBerechtigt('assistenz', 'suid', $stg))
{
$result = "Sie haben keine Schreibrechte fuer diesen Studiengang!";
$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -1301,8 +1352,8 @@ $sqlundo =
$statusData = current(getData($result));
}
//check if Status is unconfirmed.. TODO(manu) check further conditions? Status < Student
if($statusData->bestaetigtam != NULL)
//check if Status is unconfirmed..
if($statusData->bestaetigtam != null)
{
$result = "Der Status ist bereits bestätigt!";
$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -1310,7 +1361,7 @@ $sqlundo =
}
//check if Bewerbung abgeschickt
if($statusData->bewerbung_abgeschicktamum == NULL)
if($statusData->bewerbung_abgeschicktamum == null)
{
$result = "Die Bewerbung wurde noch nicht abgeschickt und kann deshalb nicht bestaetigt werden!";
$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
@@ -1344,6 +1395,5 @@ $sqlundo =
return error('No Statusdata vorhanden');
}
return $this->outputJsonSuccess(true);
}
}
public/js/components/Stv/Studentenverwaltung/Details/Prestudent/Status.js
+85 -83
View File
@@ -88,7 +88,9 @@ export default{
button.className = 'btn btn-outline-secondary btn-action';
button.innerHTML = '<i class="fa fa-forward"></i>';
button.title = 'Status vorrücken';
button.addEventListener('click', () =>
button.addEventListener(
'click',
() =>
this.actionAdvanceStatus(cell.getData().status_kurzbz, cell.getData().studiensemester_kurzbz, cell.getData().ausbildungssemester)
);
container.append(button);
@@ -528,9 +530,9 @@ export default{
<div class="row mb-3">
<label for="status_kurzbz" class="form-label col-sm-4">{{$p.t('lehre', 'status_rolle')}}</label>
<div class="col-sm-6">
<!-- <form-input type="text" :readonly="readonly" class="form-control" id="status_kurzbz" v-model="statusData['status_kurzbz']">-->
<!--<form-input type="text" :readonly="readonly" class="form-control" id="status_kurzbz" v-model="statusData['status_kurzbz']">-->
<form-input
required
required
v-model="statusData['status_kurzbz']"
name="status_kurzbz"
type="select"
@@ -547,13 +549,13 @@ export default{
</form-input>
</div>
</div>
<div class="row mb-3">
<div class="row mb-3">
<label for="studiensemester_kurzbz" class="form-label col-sm-4">{{$p.t('lehre', 'studiensemester')}}</label>
<div class="col-sm-6">
<form-input
:readonly="readonly"
<form-input
:readonly="readonly"
type="select"
name="studiensemester_kurzbz"
name="studiensemester_kurzbz"
v-model="statusData['studiensemester_kurzbz']"
>
<option v-for="sem in listStudiensemester" :key="sem.studiensemester_kurzbz" :value="sem.studiensemester_kurzbz" :selected="sem.studiensemester_kurzbz === defaultSemester">{{sem.studiensemester_kurzbz}}</option>
@@ -564,10 +566,10 @@ export default{
<div class="row mb-3">
<label for="ausbildungssemester" class="form-label col-sm-4">{{$p.t('lehre', 'ausbildungssemester')}}</label>
<div class="col-sm-6">
<form-input
type="select"
:readonly="readonly"
name="ausbildungssemester"
<form-input
type="select"
:readonly="readonly"
name="ausbildungssemester"
v-model="statusData.ausbildungssemester"
>
<option v-for="number in maxSem" :key="number" :value="number">{{ number }}</option>
@@ -578,10 +580,10 @@ export default{
<div class="row mb-3">
<label for="datum" class="form-label col-sm-4">{{$p.t('global', 'datum')}}</label>
<div class="col-sm-6">
<form-input
type="DatePicker"
:readonly="readonly"
name="datum"
<form-input
type="DatePicker"
:readonly="readonly"
name="datum"
v-model="statusData.datum"
auto-apply
:enable-time-picker="false"
@@ -591,13 +593,13 @@ export default{
></form-input>
</div>
</div>
<div class="row mb-3">
<div class="row mb-3">
<label for="bestaetigtam" class="form-label col-sm-4">{{$p.t('lehre', 'bestaetigt_am')}}</label>
<div class="col-sm-6">
<form-input
type="DatePicker"
:readonly="readonly"
name="datum"
<form-input
type="DatePicker"
:readonly="readonly"
name="datum"
v-model="statusData.bestaetigtam"
auto-apply
:enable-time-picker="false"
@@ -610,10 +612,10 @@ export default{
<div class="row mb-3">
<label for="bewerbung_abgeschicktamum" class="form-label col-sm-4">{{$p.t('lehre', 'bewerbung_abgeschickt_am')}}</label>
<div class="col-sm-6">
<form-input
type="DatePicker"
:readonly="readonly"
name="datum"
<form-input
type="DatePicker"
:readonly="readonly"
name="datum"
v-model="statusData['bewerbung_abgeschicktamum']"
auto-apply
:enable-time-picker="false"
@@ -626,12 +628,12 @@ export default{
<div class="row mb-3">
<label for="bezeichnung" class="form-label col-sm-4">{{$p.t('lehre', 'studienplan')}}</label>
<div class="col-sm-6">
<form-input
:readonly="readonly"
<form-input
:readonly="readonly"
type="select"
name="studienplan"
name="studienplan"
v-model="statusData['studienplan_id']"
>
>
<option v-for="sp in listStudienplaene" :key="sp.studienplan_id" :value="sp.studienplan_id">{{sp.bezeichnung}}</option>
</form-input>
</div>
@@ -639,22 +641,22 @@ export default{
<div class="row mb-3">
<label for="anmerkung" class="form-label col-sm-4">{{$p.t('global', 'anmerkung')}}</label>
<div class="col-sm-6">
<form-input
<form-input
type="text"
name="anmerkung"
name="anmerkung"
v-model="statusData['anmerkung']"
>
>
</form-input>
</div>
</div>
<div class="row mb-3">
<div class="row mb-3">
<label for="aufnahmestufe" class="form-label col-sm-4">{{$p.t('lehre', 'aufnahmestufe')}}</label>
<div class="col-sm-6">
<form-input
type="select"
:readonly="readonly"
name="aufnahmestufe"
<form-input
type="select"
:readonly="readonly"
name="aufnahmestufe"
v-model="statusData['rt_stufe']"
>
<option v-for="entry in aufnahmestufen" :key="entry" :value="entry">{{entry}}</option>
@@ -665,10 +667,10 @@ export default{
<div v-if="gruende.length > 0" class="row mb-3">
<label for="grund" class="form-label col-sm-4">{{$p.t('studierendenantrag', 'antrag_grund')}}</label>
<div class="col-sm-6">
<form-input
type="select"
:readonly="readonly"
name="statusgrund"
<form-input
type="select"
:readonly="readonly"
name="statusgrund"
v-model="statusData['statusgrund_id']"
>
<option v-for="grund in gruende" :key="grund.statusgrund_id" :value="grund.statusgrund_id">{{grund.beschreibung[0]}}</option>
@@ -689,7 +691,7 @@ export default{
<template #title>{{$p.t('lehre', 'status_edit')}}</template>
<form-form class="row g-3" ref="statusData">
<div v-if="statusData.datum < dataMeldestichtag ">
<div v-if="statusData.datum < dataMeldestichtag">
<b>{{$p.t('bismeldestichtag', 'meldestichtag_erreicht')}}</b>
</div>
@@ -700,7 +702,7 @@ export default{
<div class="col-sm-6">
<!-- <form-input type="text" :readonly="readonly" class="form-control" id="status_kurzbz" v-model="statusData['status_kurzbz']">-->
<form-input
required
required
v-model="statusData['status_kurzbz']"
name="status_kurzbz"
type="select"
@@ -718,13 +720,13 @@ export default{
</form-input>
</div>
</div>
<div class="row mb-3">
<div class="row mb-3">
<label for="studiensemester_kurzbz" class="form-label col-sm-4">{{$p.t('lehre', 'studiensemester')}}</label>
<div class="col-sm-6">
<form-input
:readonly="readonly"
<form-input
:readonly="readonly"
type="select"
name="studiensemester_kurzbz"
name="studiensemester_kurzbz"
v-model="statusData['studiensemester_kurzbz']"
>
<option v-for="sem in listStudiensemester" :key="sem.studiensemester_kurzbz" :value="sem.studiensemester_kurzbz">{{sem.studiensemester_kurzbz}}</option>
@@ -735,10 +737,10 @@ export default{
<div class="row mb-3">
<label for="ausbildungssemester" class="form-label col-sm-4">{{$p.t('lehre', 'ausbildungssemester')}}</label>
<div class="col-sm-6">
<form-input
type="select"
:readonly="readonly"
name="ausbildungssemester"
<form-input
type="select"
:readonly="readonly"
name="ausbildungssemester"
v-model="statusData['ausbildungssemester']"
>
<option v-for="number in maxSem" :key="number" :value="number">{{ number }}</option>
@@ -749,10 +751,10 @@ export default{
<div class="row mb-3">
<label for="datum" class="form-label col-sm-4">{{$p.t('global', 'datum')}}</label>
<div class="col-sm-6">
<form-input
type="DatePicker"
:readonly="readonly"
name="datum"
<form-input
type="DatePicker"
:readonly="readonly"
name="datum"
v-model="statusData['datum']"
auto-apply
:enable-time-picker="false"
@@ -762,13 +764,13 @@ export default{
></form-input>
</div>
</div>
<div class="row mb-3">
<div class="row mb-3">
<label for="bestaetigtam" class="form-label col-sm-4">{{$p.t('lehre', 'bestaetigt_am')}}</label>
<div class="col-sm-6">
<form-input
type="DatePicker"
:readonly="readonly"
name="datum"
<form-input
type="DatePicker"
:readonly="readonly"
name="datum"
v-model="statusData['bestaetigtam']"
auto-apply
:enable-time-picker="false"
@@ -781,10 +783,10 @@ export default{
<div class="row mb-3">
<label for="bewerbung_abgeschicktamum" class="form-label col-sm-4">{{$p.t('lehre', 'bewerbung_abgeschickt_am')}}</label>
<div class="col-sm-6">
<form-input
type="DatePicker"
:readonly="readonly"
name="datum"
<form-input
type="DatePicker"
:readonly="readonly"
name="datum"
v-model="statusData['bewerbung_abgeschicktamum']"
auto-apply
:enable-time-picker="false"
@@ -797,12 +799,12 @@ export default{
<div class="row mb-3">
<label for="bezeichnung" class="form-label col-sm-4">{{$p.t('lehre', 'studienplan')}}</label>
<div class="col-sm-6">
<form-input
:readonly="readonly"
<form-input
:readonly="readonly"
type="select"
name="studienplan"
name="studienplan"
v-model="statusData['studienplan_id']"
>
>
<option v-for="sp in listStudienplaene" :key="sp.studienplan_id" :value="sp.studienplan_id">{{sp.bezeichnung}}</option>
</form-input>
</div>
@@ -810,22 +812,22 @@ export default{
<div class="row mb-3">
<label for="anmerkung" class="form-label col-sm-4">{{$p.t('global', 'anmerkung')}}</label>
<div class="col-sm-6">
<form-input
<form-input
type="text"
name="anmerkung"
name="anmerkung"
v-model="statusData['anmerkung']"
>
>
</form-input>
</div>
</div>
<div class="row mb-3">
<div class="row mb-3">
<label for="aufnahmestufe" class="form-label col-sm-4">{{$p.t('lehre', 'aufnahmestufe')}}</label>
<div class="col-sm-6">
<form-input
type="select"
:readonly="readonly"
name="aufnahmestufe"
<form-input
type="select"
:readonly="readonly"
name="aufnahmestufe"
v-model="statusData['rt_stufe']"
>
<option v-for="entry in aufnahmestufen" :key="entry" :value="entry">{{entry}}</option>
@@ -836,10 +838,10 @@ export default{
<div v-if="gruende.length > 0" class="row mb-3">
<label for="grund" class="form-label col-sm-4">{{$p.t('studierendenantrag', 'antrag_grund')}}</label>
<div class="col-sm-6">
<form-input
type="select"
:readonly="readonly"
name="statusgrund"
<form-input
type="select"
:readonly="readonly"
name="statusgrund"
v-model="statusData['statusgrund_id']"
>
<option v-for="grund in gruende" :key="grund.statusgrund_id" :value="grund.statusgrund_id">{{grund.beschreibung[0]}}</option>
@@ -857,7 +859,7 @@ export default{
<!--Modal: Delete Status-->
<BsModal ref="deleteStatusModal">
<template #title>{{$p.t('lehre', 'status_edit')}}</template>
<template #title>{{$p.t('lehre', 'status_edit')}}</template>
<template #default>
<div v-if="isLastStatus == 1">
<p>{{$p.t('lehre', 'last_status_confirm_delete')}}</p>
@@ -866,13 +868,12 @@ export default{
<p>{{$p.t('lehre', 'status_confirm_delete')}}</p>
</div>
</template>
</template>
<template #footer>
<button ref="Close" type="button" class="btn btn-primary" @click="deleteStatus(statusId)">OK</button>
</template>
</BsModal>
<core-filter-cmpt
ref="table"
:tabulator-options="tabulatorOptions"
@@ -887,4 +888,5 @@ export default{
</core-filter-cmpt>
</div>`
};