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

Merge branch 'feature-34883/bestaetigtvon_bei_Abbrechern'

Browse Source
This commit is contained in:
Harald Bamberger
2023-11-22 17:08:20 +01:00
parent ad8a18ed7d 8142982ac7
commit 594dbdca21
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/jobs/AntragJob.php
+3 -2
View File
@@ -349,6 +349,7 @@ class AntragJob extends JOB_Controller
$this->StudierendenantragModel->addSelect('prestudent_id');
$this->StudierendenantragModel->addSelect('studiensemester_kurzbz');
$this->StudierendenantragModel->addSelect('s.insertamum');
$this->StudierendenantragModel->addSelect('s.insertvon');
$this->StudierendenantragModel->db->where_in('public.get_rolle_prestudent(prestudent_id, studiensemester_kurzbz)', $this->config->item('antrag_prestudentstatus_whitelist'));
@@ -372,7 +373,7 @@ class AntragJob extends JOB_Controller
$result = $this->prestudentlib->setAbbrecher(
$antrag->prestudent_id,
$antrag->studiensemester_kurzbz,
$insertvon,
$antrag->insertvon ?: $insertvon,
'abbrecherStgl',
$antrag->insertamum
);
@@ -413,7 +414,7 @@ class AntragJob extends JOB_Controller
}
}
}
$this->logInfo($count . " Students set to Abbrecher");
$this->logInfo($count . "/" . count($antraege) . " Students set to Abbrecher");
}
$this->logInfo('Ende Job handleAbmeldungenStglDeadline');
}
public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
+11 -11
View File
@@ -30,7 +30,7 @@ export default {
},
computed: {
statusSeverity() {
switch (this.data.status)
switch (this.data?.status)
{
case 'Erstellt': return 'info';
case 'Genehmigt': return 'success';
@@ -141,39 +141,39 @@ export default {
<table class="table">
<tr>
<th>{{p.t('lehre', 'studiengang')}}</th>
<td align="right">{{data.bezeichnung}}</td>
<td align="right">{{data?.bezeichnung}}</td>
</tr>
<tr>
<th>{{p.t('lehre', 'organisationsform')}}</th>
<td align="right">{{data.orgform_bezeichnung}}</td>
<td align="right">{{data?.orgform_bezeichnung}}</td>
</tr>
<tr>
<th>{{p.t('projektarbeitsbeurteilung', 'nameStudierende')}}</th>
<td align="right">{{data.name}}</td>
<td align="right">{{data?.name}}</td>
</tr>
<tr>
<th>{{p.t('person', 'personenkennzeichen')}}</th>
<td align="right">{{data.matrikelnr}}</td>
<td align="right">{{data?.matrikelnr}}</td>
</tr>
<tr>
<th>{{p.t('lehre', 'studienjahr')}}</th>
<td align="right">{{data.studienjahr_kurzbz}}</td>
<td align="right">{{data?.studienjahr_kurzbz}}</td>
</tr>
<tr>
<th>{{p.t('lehre', 'studiensemester')}}</th>
<td align="right">{{data.studiensemester_kurzbz}}</td>
<td align="right">{{data?.studiensemester_kurzbz}}</td>
</tr>
<tr>
<th>{{p.t('lehre', 'semester')}}</th>
<td align="right">{{data.semester}}</td>
<td align="right">{{data?.semester}}</td>
</tr>
</table>
</div>
<div v-if="data.grund" class="mb-3">
<div v-if="data?.grund" class="mb-3">
<h5>{{p.t('studierendenantrag', 'antrag_grund')}}:</h5>
<pre class="text-prewrap">{{data.grund}}</pre>
<pre class="text-prewrap">{{data?.grund}}</pre>
</div>
<div v-else class="col-sm-6 mb-3">
<label :for="'studierendenantrag-form-abmeldung-' + uuid + '-grund'" class="form-label">Grund:</label>
@@ -211,7 +211,7 @@ export default {
<div class="col-12 text-end">
<button
v-if="!data.studierendenantrag_id"
v-if="!data?.studierendenantrag_id"
type="button"
class="btn btn-primary"
data-bs-toggle="modal"